From dd5d10a534487ed0a08897663806c35cd52ddda0 Mon Sep 17 00:00:00 2001
From: LLL <15374889135@163.com>
Date: Sat, 17 May 2025 20:02:03 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/departments/Departments.php    |   4 +
 .../LessonCourseTeaching.php                  | 718 ++++++++++++++++++
 niucloud/app/adminapi/route/departments.php   |  24 +
 .../adminapi/route/lesson_course_teaching.php | 122 +++
 .../app/model/departments/Departments.php     |  22 +-
 .../LessonCourseTeaching.php                  | 124 +++
 .../model/personnel_data/PersonnelData.php    |  55 ++
 .../admin/departments/DepartmentsService.php  |  14 +-
 .../LessonCourseTeachingService.php           | 634 ++++++++++++++++
 .../LessonCourseTeaching.php                  |  35 +
 10 files changed, 1744 insertions(+), 8 deletions(-)
 create mode 100644 niucloud/app/adminapi/controller/lesson_course_teaching/LessonCourseTeaching.php
 create mode 100644 niucloud/app/adminapi/route/lesson_course_teaching.php
 create mode 100644 niucloud/app/model/lesson_course_teaching/LessonCourseTeaching.php
 create mode 100644 niucloud/app/model/personnel_data/PersonnelData.php
 create mode 100644 niucloud/app/service/admin/lesson_course_teaching/LessonCourseTeachingService.php
 create mode 100644 niucloud/app/validate/lesson_course_teaching/LessonCourseTeaching.php

diff --git a/niucloud/app/adminapi/controller/departments/Departments.php b/niucloud/app/adminapi/controller/departments/Departments.php
index d0912fe4..66bd8e7f 100644
--- a/niucloud/app/adminapi/controller/departments/Departments.php
+++ b/niucloud/app/adminapi/controller/departments/Departments.php
@@ -85,4 +85,8 @@ class Departments extends BaseAdminController
     }
 
     
+    public function getDepartmentsAll(){
+         return success(( new DepartmentsService())->getDepartmentsAll());
+    }
+
 }
diff --git a/niucloud/app/adminapi/controller/lesson_course_teaching/LessonCourseTeaching.php b/niucloud/app/adminapi/controller/lesson_course_teaching/LessonCourseTeaching.php
new file mode 100644
index 00000000..fda2fa88
--- /dev/null
+++ b/niucloud/app/adminapi/controller/lesson_course_teaching/LessonCourseTeaching.php
@@ -0,0 +1,718 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace app\adminapi\controller\lesson_course_teaching;
+
+use core\base\BaseAdminController;
+use app\service\admin\lesson_course_teaching\LessonCourseTeachingService;
+
+
+/**
+ * 教研管理控制器
+ * Class LessonCourseTeaching
+ * @package app\adminapi\controller\lesson_course_teaching
+ */
+class LessonCourseTeaching extends BaseAdminController
+{
+   /**
+    * 获取教研管理列表
+    * @return \think\Response
+    */
+    public function lists(){
+        $data = $this->request->params([
+             ["title",""],
+             ["status",""],
+             ["create_time",["",""]],
+             ["update_time",["",""]],
+             ["table_type",1]
+        ]);
+        return success((new LessonCourseTeachingService())->getPage($data));
+    }
+
+
+    /**
+     * 添加教研管理
+     * @return \think\Response
+     */
+    public function add(){
+        $data = $this->request->params([
+             ["title",""],
+             ["image",""],
+             ["type",0],
+             ["content",""],
+             ["status",0],
+             ["table_type",1]
+        ]);
+        $this->validate($data, 'app\validate\lesson_course_teaching\LessonCourseTeaching.add');
+        $id = (new LessonCourseTeachingService())->add($data);
+        return success('ADD_SUCCESS', ['id' => $id]);
+    }
+
+    /**
+     * 教研管理编辑
+     * @param $id  教研管理id
+     * @return \think\Response
+     */
+    public function edit(int $id){
+        $data = $this->request->params([
+             ["title",""],
+             ["image",""],
+             ["type",0],
+             ["content",""],
+             ["status",0],
+        ]);
+        $this->validate($data, 'app\validate\lesson_course_teaching\LessonCourseTeaching.edit');
+        (new LessonCourseTeachingService())->edit($id, $data);
+        return success('EDIT_SUCCESS');
+    }
+
+    /**
+     * 获取跳绳教案库列表
+     * @return \think\Response
+     */
+    public function jumpLists(){
+        $data = $this->request->params([
+            ["title",""],
+            ["status",""],
+            ["create_time",["",""]],
+            ["update_time",["",""]],
+            ["table_type",2]
+        ]);
+        return success((new LessonCourseTeachingService())->jumpPetPage($data));
+    }
+
+
+    /**
+     * 添加跳绳教案库
+     * @return \think\Response
+     */
+    public function jumpAdd(){
+        $data = $this->request->params([
+            ["title",""],
+            ["image",""],
+            ["type",0],
+            ["content",""],
+            ["status",0],
+            ["table_type",2]
+        ]);
+        $this->validate($data, 'app\validate\lesson_course_teaching\LessonCourseTeaching.add');
+        $id = (new LessonCourseTeachingService())->jumpAdd($data);
+        return success('ADD_SUCCESS', ['id' => $id]);
+    }
+
+    /**
+     * 跳绳教案库编辑
+     * @param $id  教研管理id
+     * @return \think\Response
+     */
+    public function jumpEdit(int $id){
+        $data = $this->request->params([
+            ["title",""],
+            ["image",""],
+            ["type",0],
+            ["content",""],
+            ["status",0],
+        ]);
+        $this->validate($data, 'app\validate\lesson_course_teaching\LessonCourseTeaching.edit');
+        (new LessonCourseTeachingService())->jumpEdit($id, $data);
+        return success('EDIT_SUCCESS');
+    }
+
+
+    /**
+     * 获取增高教案库列表
+     * @return \think\Response
+     */
+    public function enLists(){
+        $data = $this->request->params([
+            ["title",""],
+            ["status",""],
+            ["create_time",["",""]],
+            ["update_time",["",""]],
+            ["table_type",3]
+        ]);
+        return success((new LessonCourseTeachingService())->enPetPage($data));
+    }
+
+
+    /**
+     * 添加增高教案库
+     * @return \think\Response
+     */
+    public function enAdd(){
+        $data = $this->request->params([
+            ["title",""],
+            ["image",""],
+            ["type",0],
+            ["content",""],
+            ["status",0],
+            ["table_type",3]
+        ]);
+        $this->validate($data, 'app\validate\lesson_course_teaching\LessonCourseTeaching.add');
+        $id = (new LessonCourseTeachingService())->enAdd($data);
+        return success('ADD_SUCCESS', ['id' => $id]);
+    }
+
+    /**
+     * 跳绳增高教案库
+     * @param $id  教研管理id
+     * @return \think\Response
+     */
+    public function enEdit(int $id){
+        $data = $this->request->params([
+            ["title",""],
+            ["image",""],
+            ["type",0],
+            ["content",""],
+            ["status",0],
+        ]);
+        $this->validate($data, 'app\validate\lesson_course_teaching\LessonCourseTeaching.edit');
+        (new LessonCourseTeachingService())->enEdit($id, $data);
+        return success('EDIT_SUCCESS');
+    }
+
+
+    /**
+     * 获取篮球教案库列表
+     * @return \think\Response
+     */
+    public function basketballLists(){
+        $data = $this->request->params([
+            ["title",""],
+            ["status",""],
+            ["create_time",["",""]],
+            ["update_time",["",""]],
+            ["table_type",4]
+        ]);
+        return success((new LessonCourseTeachingService())->basketballPetPage($data));
+    }
+
+
+    /**
+     * 添加篮球教案库
+     * @return \think\Response
+     */
+    public function basketballAdd(){
+        $data = $this->request->params([
+            ["title",""],
+            ["image",""],
+            ["type",0],
+            ["content",""],
+            ["status",0],
+            ["table_type",4]
+        ]);
+        $this->validate($data, 'app\validate\lesson_course_teaching\LessonCourseTeaching.add');
+        $id = (new LessonCourseTeachingService())->basketballAdd($data);
+        return success('ADD_SUCCESS', ['id' => $id]);
+    }
+
+    /**
+     * 跳绳篮球教案库
+     * @param $id  教研管理id
+     * @return \think\Response
+     */
+    public function basketballEdit(int $id){
+        $data = $this->request->params([
+            ["title",""],
+            ["image",""],
+            ["type",0],
+            ["content",""],
+            ["status",0],
+        ]);
+        $this->validate($data, 'app\validate\lesson_course_teaching\LessonCourseTeaching.edit');
+        (new LessonCourseTeachingService())->basketballEdit($id, $data);
+        return success('EDIT_SUCCESS');
+    }
+
+
+    /**
+     * 获取强化教案库列表
+     * @return \think\Response
+     */
+    public function strengLists(){
+        $data = $this->request->params([
+            ["title",""],
+            ["status",""],
+            ["create_time",["",""]],
+            ["update_time",["",""]],
+            ["table_type",5]
+        ]);
+        return success((new LessonCourseTeachingService())->strengPetPage($data));
+    }
+
+
+    /**
+     * 添加强化教案库
+     * @return \think\Response
+     */
+    public function strengAdd(){
+        $data = $this->request->params([
+            ["title",""],
+            ["image",""],
+            ["type",0],
+            ["content",""],
+            ["status",0],
+            ["table_type",5]
+        ]);
+        $this->validate($data, 'app\validate\lesson_course_teaching\LessonCourseTeaching.add');
+        $id = (new LessonCourseTeachingService())->strengAdd($data);
+        return success('ADD_SUCCESS', ['id' => $id]);
+    }
+
+    /**
+     * 跳绳强化教案库
+     * @param $id  教研管理id
+     * @return \think\Response
+     */
+    public function strengEdit(int $id){
+        $data = $this->request->params([
+            ["title",""],
+            ["image",""],
+            ["type",0],
+            ["content",""],
+            ["status",0],
+        ]);
+        $this->validate($data, 'app\validate\lesson_course_teaching\LessonCourseTeaching.edit');
+        (new LessonCourseTeachingService())->strengEdit($id, $data);
+        return success('EDIT_SUCCESS');
+    }
+
+    /**
+     * 获取空中忍者教案库列表
+     * @return \think\Response
+     */
+    public function ninjaLists(){
+        $data = $this->request->params([
+            ["title",""],
+            ["status",""],
+            ["create_time",["",""]],
+            ["update_time",["",""]],
+            ["table_type",6]
+        ]);
+        return success((new LessonCourseTeachingService())->ninjaPetPage($data));
+    }
+
+
+    /**
+     * 添加空中忍者教案库
+     * @return \think\Response
+     */
+    public function ninjaAdd(){
+        $data = $this->request->params([
+            ["title",""],
+            ["image",""],
+            ["type",0],
+            ["content",""],
+            ["status",0],
+            ["table_type",6]
+        ]);
+        $this->validate($data, 'app\validate\lesson_course_teaching\LessonCourseTeaching.add');
+        $id = (new LessonCourseTeachingService())->ninjaAdd($data);
+        return success('ADD_SUCCESS', ['id' => $id]);
+    }
+
+    /**
+     * 跳绳空中忍者教案库
+     * @param $id  教研管理id
+     * @return \think\Response
+     */
+    public function ninjaEdit(int $id){
+        $data = $this->request->params([
+            ["title",""],
+            ["image",""],
+            ["type",0],
+            ["content",""],
+            ["status",0],
+        ]);
+        $this->validate($data, 'app\validate\lesson_course_teaching\LessonCourseTeaching.edit');
+        (new LessonCourseTeachingService())->ninjaEdit($id, $data);
+        return success('EDIT_SUCCESS');
+    }
+
+    /**
+     * 获取空中忍者教案库列表
+     * @return \think\Response
+     */
+    public function securityLists(){
+        $data = $this->request->params([
+            ["title",""],
+            ["status",""],
+            ["create_time",["",""]],
+            ["update_time",["",""]],
+            ["table_type",7]
+        ]);
+        return success((new LessonCourseTeachingService())->securityPetPage($data));
+    }
+
+
+    /**
+     * 添加空中忍者教案库
+     * @return \think\Response
+     */
+    public function securityAdd(){
+        $data = $this->request->params([
+            ["title",""],
+            ["image",""],
+            ["type",0],
+            ["content",""],
+            ["status",0],
+            ["table_type",7]
+        ]);
+        $this->validate($data, 'app\validate\lesson_course_teaching\LessonCourseTeaching.add');
+        $id = (new LessonCourseTeachingService())->securityAdd($data);
+        return success('ADD_SUCCESS', ['id' => $id]);
+    }
+
+    /**
+     * 跳绳空中忍者教案库
+     * @param $id  教研管理id
+     * @return \think\Response
+     */
+    public function securityEdit(int $id){
+        $data = $this->request->params([
+            ["title",""],
+            ["image",""],
+            ["type",0],
+            ["content",""],
+            ["status",0],
+        ]);
+        $this->validate($data, 'app\validate\lesson_course_teaching\LessonCourseTeaching.edit');
+        (new LessonCourseTeachingService())->securityEdit($id, $data);
+        return success('EDIT_SUCCESS');
+    }
+
+
+    /**
+     * 获取体能教案库列表
+     * @return \think\Response
+     */
+    public function physicalLists(){
+        $data = $this->request->params([
+            ["title",""],
+            ["status",""],
+            ["create_time",["",""]],
+            ["update_time",["",""]],
+            ["table_type",8]
+        ]);
+        return success((new LessonCourseTeachingService())->physicalPetPage($data));
+    }
+
+
+    /**
+     * 添加体能教案库
+     * @return \think\Response
+     */
+    public function physicalAdd(){
+        $data = $this->request->params([
+            ["title",""],
+            ["image",""],
+            ["type",0],
+            ["content",""],
+            ["status",0],
+            ["table_type",8]
+        ]);
+        $this->validate($data, 'app\validate\lesson_course_teaching\LessonCourseTeaching.add');
+        $id = (new LessonCourseTeachingService())->physicalAdd($data);
+        return success('ADD_SUCCESS', ['id' => $id]);
+    }
+
+    /**
+     * 跳绳体能教案库
+     * @param $id  教研管理id
+     * @return \think\Response
+     */
+    public function physicalEdit(int $id){
+        $data = $this->request->params([
+            ["title",""],
+            ["image",""],
+            ["type",0],
+            ["content",""],
+            ["status",0],
+        ]);
+        $this->validate($data, 'app\validate\lesson_course_teaching\LessonCourseTeaching.edit');
+        (new LessonCourseTeachingService())->physicalEdit($id, $data);
+        return success('EDIT_SUCCESS');
+    }
+
+    /**
+     * 获取体能教案库列表
+     * @return \think\Response
+     */
+    public function actionLists(){
+        $data = $this->request->params([
+            ["title",""],
+            ["status",""],
+            ["create_time",["",""]],
+            ["update_time",["",""]],
+            ["table_type",9]
+        ]);
+        return success((new LessonCourseTeachingService())->actionPetPage($data));
+    }
+
+
+    /**
+     * 热身动作
+     * @return \think\Response
+     */
+    public function actionAdd(){
+        $data = $this->request->params([
+            ["title",""],
+            ["image",""],
+            ["type",0],
+            ["content",""],
+            ["status",0],
+            ["table_type",9]
+        ]);
+        $this->validate($data, 'app\validate\lesson_course_teaching\LessonCourseTeaching.add');
+        $id = (new LessonCourseTeachingService())->actionAdd($data);
+        return success('ADD_SUCCESS', ['id' => $id]);
+    }
+
+    /**
+     * 热身动作
+     * @param $id  教研管理id
+     * @return \think\Response
+     */
+    public function actionEdit(int $id){
+        $data = $this->request->params([
+            ["title",""],
+            ["image",""],
+            ["type",0],
+            ["content",""],
+            ["status",0],
+        ]);
+        $this->validate($data, 'app\validate\lesson_course_teaching\LessonCourseTeaching.edit');
+        (new LessonCourseTeachingService())->actionEdit($id, $data);
+        return success('EDIT_SUCCESS');
+    }
+
+    /**
+     * 获取体能教案库列表
+     * @return \think\Response
+     */
+    public function fitnessLists(){
+        $data = $this->request->params([
+            ["title",""],
+            ["status",""],
+            ["create_time",["",""]],
+            ["update_time",["",""]],
+            ["table_type",10]
+        ]);
+        return success((new LessonCourseTeachingService())->fitnessPetPage($data));
+    }
+
+
+    /**
+     * 热身动作
+     * @return \think\Response
+     */
+    public function fitnessAdd(){
+        $data = $this->request->params([
+            ["title",""],
+            ["image",""],
+            ["type",0],
+            ["content",""],
+            ["status",0],
+            ["table_type",10]
+        ]);
+        $this->validate($data, 'app\validate\lesson_course_teaching\LessonCourseTeaching.add');
+        $id = (new LessonCourseTeachingService())->fitnessAdd($data);
+        return success('ADD_SUCCESS', ['id' => $id]);
+    }
+
+    /**
+     * 热身动作
+     * @param $id  教研管理id
+     * @return \think\Response
+     */
+    public function fitnessEdit(int $id){
+        $data = $this->request->params([
+            ["title",""],
+            ["image",""],
+            ["type",0],
+            ["content",""],
+            ["status",0],
+        ]);
+        $this->validate($data, 'app\validate\lesson_course_teaching\LessonCourseTeaching.edit');
+        (new LessonCourseTeachingService())->fitnessEdit($id, $data);
+        return success('EDIT_SUCCESS');
+    }
+
+    /**
+     * 获取体能教案库列表
+     * @return \think\Response
+     */
+    public function gamesLists(){
+        $data = $this->request->params([
+            ["title",""],
+            ["status",""],
+            ["create_time",["",""]],
+            ["update_time",["",""]],
+            ["table_type",11]
+        ]);
+        return success((new LessonCourseTeachingService())->gamesPetPage($data));
+    }
+
+
+    /**
+     * 热身动作
+     * @return \think\Response
+     */
+    public function gamesAdd(){
+        $data = $this->request->params([
+            ["title",""],
+            ["image",""],
+            ["type",0],
+            ["content",""],
+            ["status",0],
+            ["table_type",11]
+        ]);
+        $this->validate($data, 'app\validate\lesson_course_teaching\LessonCourseTeaching.add');
+        $id = (new LessonCourseTeachingService())->gamesAdd($data);
+        return success('ADD_SUCCESS', ['id' => $id]);
+    }
+
+    /**
+     * 热身动作
+     * @param $id  教研管理id
+     * @return \think\Response
+     */
+    public function gamesEdit(int $id){
+        $data = $this->request->params([
+            ["title",""],
+            ["image",""],
+            ["type",0],
+            ["content",""],
+            ["status",0],
+        ]);
+        $this->validate($data, 'app\validate\lesson_course_teaching\LessonCourseTeaching.edit');
+        (new LessonCourseTeachingService())->gamesEdit($id, $data);
+        return success('EDIT_SUCCESS');
+    }
+
+
+    /**
+     * 获取体能教案库列表
+     * @return \think\Response
+     */
+    public function relaxationLists(){
+        $data = $this->request->params([
+            ["title",""],
+            ["status",""],
+            ["create_time",["",""]],
+            ["update_time",["",""]],
+            ["table_type",12]
+        ]);
+        return success((new LessonCourseTeachingService())->relaxationPetPage($data));
+    }
+
+    /**
+     * 热身动作
+     * @return \think\Response
+     */
+    public function relaxationAdd(){
+        $data = $this->request->params([
+            ["title",""],
+            ["image",""],
+            ["type",0],
+            ["content",""],
+            ["status",0],
+            ["table_type",12]
+        ]);
+        $this->validate($data, 'app\validate\lesson_course_teaching\LessonCourseTeaching.add');
+        $id = (new LessonCourseTeachingService())->relaxationAdd($data);
+        return success('ADD_SUCCESS', ['id' => $id]);
+    }
+
+    /**
+     * 热身动作
+     * @param $id  教研管理id
+     * @return \think\Response
+     */
+    public function relaxationEdit(int $id){
+        $data = $this->request->params([
+            ["title",""],
+            ["image",""],
+            ["type",0],
+            ["content",""],
+            ["status",0],
+        ]);
+        $this->validate($data, 'app\validate\lesson_course_teaching\LessonCourseTeaching.edit');
+        (new LessonCourseTeachingService())->relaxationEdit($id, $data);
+        return success('EDIT_SUCCESS');
+    }
+
+
+
+    public function publicLists(){
+        $data = $this->request->params([
+            ["title",""],
+            ["status",""],
+            ["create_time",["",""]],
+            ["update_time",["",""]],
+            ["table_type",0],
+        ]);
+        return success((new LessonCourseTeachingService())->publicPetPage($data));
+    }
+    public function publicAdd(){
+        $data = $this->request->params([
+            ["title",""],
+            ["image",""],
+            ["type",0],
+            ["content",""],
+            ["status",0],
+            ["table_type",0]
+        ]);
+        $this->validate($data, 'app\validate\lesson_course_teaching\LessonCourseTeaching.add');
+        $id = (new LessonCourseTeachingService())->publicAdd($data);
+        return success('ADD_SUCCESS', ['id' => $id]);
+    }
+    public function publicEdit(int $id){
+        $data = $this->request->params([
+            ["title",""],
+            ["image",""],
+            ["type",0],
+            ["content",""],
+            ["status",0],
+        ]);
+        $this->validate($data, 'app\validate\lesson_course_teaching\LessonCourseTeaching.edit');
+        (new LessonCourseTeachingService())->publicEdit($id, $data);
+        return success('EDIT_SUCCESS');
+    }
+
+
+
+    /**
+     * 教研管理详情
+     * @param int $id
+     * @return \think\Response
+     */
+    public function info(int $id){
+        return success((new LessonCourseTeachingService())->getInfo($id));
+    }
+
+
+    /**
+     * 教研管理删除
+     * @param $id  教研管理id
+     * @return \think\Response
+     */
+    public function del(int $id){
+        (new LessonCourseTeachingService())->del($id);
+        return success('DELETE_SUCCESS');
+    }
+
+
+    public function getPersonnelDataAll(){
+         return success(( new LessonCourseTeachingService())->getPersonnelDataAll());
+    }
+
+}
diff --git a/niucloud/app/adminapi/route/departments.php b/niucloud/app/adminapi/route/departments.php
index 2e9a4c1f..2301021a 100644
--- a/niucloud/app/adminapi/route/departments.php
+++ b/niucloud/app/adminapi/route/departments.php
@@ -35,3 +35,27 @@ Route::group('departments', function () {
     AdminLog::class
 ]);
 // USER_CODE_END -- departments
+
+// USER_CODE_BEGIN -- departments
+
+Route::group('departments', function () {
+
+    //部门列表
+    Route::get('departments', 'departments.Departments/lists');
+    //部门详情
+    Route::get('departments/:id', 'departments.Departments/info');
+    //添加部门
+    Route::post('departments', 'departments.Departments/add');
+    //编辑部门
+    Route::put('departments/:id', 'departments.Departments/edit');
+    //删除部门
+    Route::delete('departments/:id', 'departments.Departments/del');
+    
+    Route::get('departments_all','departments.Departments/getDepartmentsAll');
+
+})->middleware([
+    AdminCheckToken::class,
+    AdminCheckRole::class,
+    AdminLog::class
+]);
+// USER_CODE_END -- departments
diff --git a/niucloud/app/adminapi/route/lesson_course_teaching.php b/niucloud/app/adminapi/route/lesson_course_teaching.php
new file mode 100644
index 00000000..4e23c846
--- /dev/null
+++ b/niucloud/app/adminapi/route/lesson_course_teaching.php
@@ -0,0 +1,122 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+use think\facade\Route;
+
+use app\adminapi\middleware\AdminCheckRole;
+use app\adminapi\middleware\AdminCheckToken;
+use app\adminapi\middleware\AdminLog;
+// USER_CODE_BEGIN -- lesson_course_teaching
+
+Route::group('lesson_course_teaching', function () {
+
+    //课程教学大纲列表
+    Route::get('lesson_course_teaching', 'lesson_course_teaching.LessonCourseTeaching/lists');
+    //添加课程教学大纲
+    Route::post('lesson_course_teaching', 'lesson_course_teaching.LessonCourseTeaching/add');
+    //编辑课程教学大纲
+    Route::put('lesson_course_teaching/:id', 'lesson_course_teaching.LessonCourseTeaching/edit');
+
+    //跳绳教案库列表
+    Route::get('jump_lesson_library', 'lesson_course_teaching.LessonCourseTeaching/jumpLists');
+    //添加跳绳教案库
+    Route::post('jump_lesson_library', 'lesson_course_teaching.LessonCourseTeaching/jumpAdd');
+    //编辑跳绳教案库
+    Route::put('jump_lesson_library/:id', 'lesson_course_teaching.LessonCourseTeaching/jumpEdit');
+
+    //高数教案库列表
+    Route::get('en_teaching_library', 'lesson_course_teaching.LessonCourseTeaching/enLists');
+    //添加高数教案库
+    Route::post('en_teaching_library', 'lesson_course_teaching.LessonCourseTeaching/enAdd');
+    //编辑高数教案库
+    Route::put('en_teaching_library/:id', 'lesson_course_teaching.LessonCourseTeaching/enEdit');
+
+    //篮球教案库列表
+    Route::get('basketball_teaching_library', 'lesson_course_teaching.LessonCourseTeaching/basketballLists');
+    //添加篮球教案库
+    Route::post('basketball_teaching_library', 'lesson_course_teaching.LessonCourseTeaching/basketballAdd');
+    //编辑篮球教案库
+    Route::put('basketball_teaching_library/:id', 'lesson_course_teaching.LessonCourseTeaching/basketballEdit');
+
+    //强化教案库列表
+    Route::get('streng_teaching_library', 'lesson_course_teaching.LessonCourseTeaching/strengLists');
+    //添加强化教案库
+    Route::post('streng_teaching_library', 'lesson_course_teaching.LessonCourseTeaching/strengAdd');
+    //编辑强化教案库
+    Route::put('streng_teaching_library/:id', 'lesson_course_teaching.LessonCourseTeaching/strengEdit');
+
+    //空中忍者教案库列表
+    Route::get('ninja_teaching_library', 'lesson_course_teaching.LessonCourseTeaching/ninjaLists');
+    //添加空中忍者教案库
+    Route::post('ninja_teaching_library', 'lesson_course_teaching.LessonCourseTeaching/ninjaAdd');
+    //编辑空中忍者教案库
+    Route::put('ninja_teaching_library/:id', 'lesson_course_teaching.LessonCourseTeaching/ninjaEdit');
+
+    //少儿安防教案库列表
+    Route::get('security_teaching_library', 'lesson_course_teaching.LessonCourseTeaching/securityLists');
+    //添加少儿安防教案库
+    Route::post('security_teaching_library', 'lesson_course_teaching.LessonCourseTeaching/securityAdd');
+    //编辑少儿安防教案库
+    Route::put('security_teaching_library/:id', 'lesson_course_teaching.LessonCourseTeaching/securityEdit');
+
+    //体能教案库列表
+    Route::get('physical_teaching_library', 'lesson_course_teaching.LessonCourseTeaching/physicalLists');
+    //添加体能教案库
+    Route::post('physical_teaching_library', 'lesson_course_teaching.LessonCourseTeaching/physicalAdd');
+    //编辑体能教案库
+    Route::put('physical_teaching_library/:id', 'lesson_course_teaching.LessonCourseTeaching/physicalEdit');
+
+    //热身动作列表
+    Route::get('action_library', 'lesson_course_teaching.LessonCourseTeaching/actionLists');
+    //添加热身动作库
+    Route::post('action_library', 'lesson_course_teaching.LessonCourseTeaching/actionAdd');
+    //编辑热身动作库
+    Route::put('action_library/:id', 'lesson_course_teaching.LessonCourseTeaching/actionEdit');
+
+    //体能动作列表
+    Route::get('fitness_library', 'lesson_course_teaching.LessonCourseTeaching/fitnessLists');
+    //添加体能动作
+    Route::post('fitness_library', 'lesson_course_teaching.LessonCourseTeaching/fitnessAdd');
+    //编辑体能动作
+    Route::put('fitness_library/:id', 'lesson_course_teaching.LessonCourseTeaching/fitnessEdit');
+
+    //趣味游戏列表
+    Route::get('games_library', 'lesson_course_teaching.LessonCourseTeaching/gamesLists');
+    //趣味游戏动作
+    Route::post('games_library', 'lesson_course_teaching.LessonCourseTeaching/gamesAdd');
+    //趣味游戏动作
+    Route::put('games_library/:id', 'lesson_course_teaching.LessonCourseTeaching/gamesEdit');
+
+    //放松游戏列表
+    Route::get('relaxation_library', 'lesson_course_teaching.LessonCourseTeaching/relaxationLists');
+    //放松游戏
+    Route::post('relaxation_library', 'lesson_course_teaching.LessonCourseTeaching/relaxationAdd');
+    //放松游戏
+    Route::put('relaxation_library/:id', 'lesson_course_teaching.LessonCourseTeaching/relaxationEdit');
+
+
+    Route::get('public_library', 'lesson_course_teaching.LessonCourseTeaching/publicLists');
+    Route::post('public_library', 'lesson_course_teaching.LessonCourseTeaching/publicAdd');
+    Route::put('public_library/:id', 'lesson_course_teaching.LessonCourseTeaching/publicEdit');
+
+    //教研管理详情
+    Route::get('lesson_course_teaching/:id', 'lesson_course_teaching.LessonCourseTeaching/info');
+    //删除教研管理
+    Route::delete('lesson_course_teaching/:id', 'lesson_course_teaching.LessonCourseTeaching/del');
+
+    Route::get('personnel_data_all','lesson_course_teaching.LessonCourseTeaching/getPersonnelDataAll');
+
+})->middleware([
+    AdminCheckToken::class,
+    AdminCheckRole::class,
+    AdminLog::class
+]);
+// USER_CODE_END -- lesson_course_teaching
diff --git a/niucloud/app/model/departments/Departments.php b/niucloud/app/model/departments/Departments.php
index ef6f3d72..a990e5a1 100644
--- a/niucloud/app/model/departments/Departments.php
+++ b/niucloud/app/model/departments/Departments.php
@@ -16,6 +16,8 @@ use think\model\concern\SoftDelete;
 use think\model\relation\HasMany;
 use think\model\relation\HasOne;
 
+use app\model\departments\Departments;
+
 /**
  * 部门模型
  * Class Departments
@@ -24,7 +26,7 @@ use think\model\relation\HasOne;
 class Departments extends BaseModel
 {
 
-    
+     use SoftDelete;
 
     /**
      * 数据表主键
@@ -38,9 +40,17 @@ class Departments extends BaseModel
      */
     protected $name = 'departments';
 
-    
+    /**
+    * 定义软删除标记字段.
+    * @var string
+    */
+    protected $deleteTime = 'deleted_at';
 
-    
+    /**
+    * 定义软删除字段的默认值.
+    * @var int
+    */
+    protected $defaultSoftDelete = 0;
 
     /**
      * 搜索器:部门部门编号
@@ -67,7 +77,7 @@ class Departments extends BaseModel
     }
     
     /**
-     * 搜索器:部门上级部门
+     * 搜索器:部门上级部门ID
      * @param $value
      * @param $data
      */
@@ -83,4 +93,8 @@ class Departments extends BaseModel
     
 
     
+    public function departments(){
+       return $this->hasOne(Departments::class, 'id', 'parent_department_id')->joinType('left')->withField('department_name,id')->bind(['parent_department_id_name'=>'department_name']);
+    }
+
 }
diff --git a/niucloud/app/model/lesson_course_teaching/LessonCourseTeaching.php b/niucloud/app/model/lesson_course_teaching/LessonCourseTeaching.php
new file mode 100644
index 00000000..33533667
--- /dev/null
+++ b/niucloud/app/model/lesson_course_teaching/LessonCourseTeaching.php
@@ -0,0 +1,124 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace app\model\lesson_course_teaching;
+
+use core\base\BaseModel;
+use think\model\concern\SoftDelete;
+use think\model\relation\HasMany;
+use think\model\relation\HasOne;
+
+use app\model\personnel_data\PersonnelData;
+
+/**
+ * 教研管理模型
+ * Class LessonCourseTeaching
+ * @package app\model\lesson_course_teaching
+ */
+class LessonCourseTeaching extends BaseModel
+{
+
+     use SoftDelete;
+
+    /**
+     * 数据表主键
+     * @var string
+     */
+    protected $pk = 'id';
+
+    /**
+     * 模型名称
+     * @var string
+     */
+    protected $name = 'lesson_course_teaching';
+
+    /**
+    * 定义软删除标记字段.
+    * @var string
+    */
+    protected $deleteTime = 'delete_time';
+
+    /**
+    * 定义软删除字段的默认值.
+    * @var int
+    */
+    protected $defaultSoftDelete = 0;
+
+    /**
+     * 搜索器:教研管理课程标题
+     * @param $value
+     * @param $data
+     */
+    public function searchTitleAttr($query, $value, $data)
+    {
+       if ($value) {
+            $query->where("title", "like", "%".$value."%");
+        }
+    }
+    
+    /**
+     * 搜索器:教研管理状态
+     * @param $value
+     * @param $data
+     */
+    public function searchStatusAttr($query, $value, $data)
+    {
+       if ($value) {
+            $query->where("status", $value);
+        }
+    }
+    
+    /**
+     * 搜索器:教研管理创建时间
+     * @param $value
+     * @param $data
+     */
+    public function searchCreateTimeAttr($query, $value, $data)
+    {
+        $start = empty($value[0]) ? 0 : strtotime($value[0]);
+        $end = empty($value[1]) ? 0 : strtotime($value[1]);
+        if ($start > 0 && $end > 0) {
+             $query->where([["create_time", "between", [$start, $end]]]);
+        } else if ($start > 0 && $end == 0) {
+            $query->where([["create_time", ">=", $start]]);
+        } else if ($start == 0 && $end > 0) {
+            $query->where([["create_time", "<=", $end]]);
+        }
+    }
+    
+    /**
+     * 搜索器:教研管理修改时间
+     * @param $value
+     * @param $data
+     */
+    public function searchUpdateTimeAttr($query, $value, $data)
+    {
+        $start = empty($value[0]) ? 0 : strtotime($value[0]);
+        $end = empty($value[1]) ? 0 : strtotime($value[1]);
+        if ($start > 0 && $end > 0) {
+             $query->where([["update_time", "between", [$start, $end]]]);
+        } else if ($start > 0 && $end == 0) {
+            $query->where([["update_time", ">=", $start]]);
+        } else if ($start == 0 && $end > 0) {
+            $query->where([["update_time", "<=", $end]]);
+        }
+    }
+    
+    
+
+    
+
+    
+    public function personnelData(){
+       return $this->hasOne(PersonnelData::class, 'sys_user_id', 'user_permission')->joinType('left')->withField('name,sys_user_id')->bind(['user_permission_name'=>'name']);
+    }
+
+}
diff --git a/niucloud/app/model/personnel_data/PersonnelData.php b/niucloud/app/model/personnel_data/PersonnelData.php
new file mode 100644
index 00000000..4cb7dcec
--- /dev/null
+++ b/niucloud/app/model/personnel_data/PersonnelData.php
@@ -0,0 +1,55 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace app\model\personnel_data;
+
+use core\base\BaseModel;
+use think\model\concern\SoftDelete;
+use think\model\relation\HasMany;
+use think\model\relation\HasOne;
+
+/**
+ * 课程教学大纲模型
+ * Class LessonCourseTeaching
+ * @package app\model\lesson_course_teaching
+ */
+class PersonnelData extends BaseModel
+{
+
+    use SoftDelete;
+
+    /**
+     * 数据表主键
+     * @var string
+     */
+    protected $pk = 'id';
+
+    /**
+     * 模型名称
+     * @var string
+     */
+    protected $name = 'personnel';
+
+    /**
+     * 定义软删除标记字段.
+     * @var string
+     */
+    protected $deleteTime = 'delete_time';
+
+    /**
+     * 定义软删除字段的默认值.
+     * @var int
+     */
+    protected $defaultSoftDelete = 0;
+
+
+}
+
diff --git a/niucloud/app/service/admin/departments/DepartmentsService.php b/niucloud/app/service/admin/departments/DepartmentsService.php
index 2bf0b484..26e00cf9 100644
--- a/niucloud/app/service/admin/departments/DepartmentsService.php
+++ b/niucloud/app/service/admin/departments/DepartmentsService.php
@@ -11,6 +11,7 @@
 
 namespace app\service\admin\departments;
 
+use app\model\departments\Departments;
 use app\model\departments\Departments;
 
 use core\base\BaseAdminService;
@@ -36,10 +37,10 @@ class DepartmentsService extends BaseAdminService
      */
     public function getPage(array $where = [])
     {
-        $field = 'id,department_name,parent_department_id,created_at,updated_at';
+        $field = 'id,department_name,parent_department_id,created_at,updated_at,deleted_at';
         $order = 'id desc';
 
-        $search_model = $this->model->withSearch(["id","department_name","parent_department_id"], $where)->field($field)->order($order);
+        $search_model = $this->model->withSearch(["id","department_name","parent_department_id"], $where)->with(['departments'])->field($field)->order($order);
         $list = $this->pageQuery($search_model);
         return $list;
     }
@@ -51,9 +52,9 @@ class DepartmentsService extends BaseAdminService
      */
     public function getInfo(int $id)
     {
-        $field = 'id,department_name,parent_department_id,created_at,updated_at';
+        $field = 'id,department_name,parent_department_id,created_at,updated_at,deleted_at';
 
-        $info = $this->model->field($field)->where([['id', "=", $id]])->findOrEmpty()->toArray();
+        $info = $this->model->field($field)->where([['id', "=", $id]])->with(['departments'])->findOrEmpty()->toArray();
         return $info;
     }
 
@@ -95,5 +96,10 @@ class DepartmentsService extends BaseAdminService
     }
 
     
+    public function getDepartmentsAll(){
+       $departmentsModel = new Departments();
+       return $departmentsModel->select()->toArray();
+    }
+
 
 }
diff --git a/niucloud/app/service/admin/lesson_course_teaching/LessonCourseTeachingService.php b/niucloud/app/service/admin/lesson_course_teaching/LessonCourseTeachingService.php
new file mode 100644
index 00000000..d320b945
--- /dev/null
+++ b/niucloud/app/service/admin/lesson_course_teaching/LessonCourseTeachingService.php
@@ -0,0 +1,634 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace app\service\admin\lesson_course_teaching;
+
+use app\model\lesson_course_teaching\LessonCourseTeaching;
+use app\model\personnel_data\PersonnelData;
+
+use core\base\BaseAdminService;
+
+
+/**
+ * 教研管理服务层
+ * Class LessonCourseTeachingService
+ * @package app\service\admin\lesson_course_teaching
+ */
+class LessonCourseTeachingService extends BaseAdminService
+{
+    public function __construct()
+    {
+        parent::__construct();
+        $this->model = new LessonCourseTeaching();
+    }
+
+    /**
+     * 获取课程教学大纲列表
+     * @param array $where
+     * @return array
+     */
+    public function getPage(array $where = [])
+    {
+        $field = 'id,title,image,type,content,status,create_time,update_time,delete_time,table_type,user_permission';
+        $order = 'id desc';
+
+        $search_model = $this->model->withSearch(["title","status","create_time","update_time","table_type"], $where)->with(['personnelData'])->field($field)->order($order);
+        $list = $this->pageQuery($search_model);
+        return $list;
+    }
+
+
+    /**
+     * 添加课程教学大纲
+     * @param array $data
+     * @return mixed
+     */
+    public function add(array $data)
+    {
+        if (isset($data['user_permission']) && is_array($data['user_permission'])) {
+            $data['user_permission'] = implode(',', $data['user_permission']);
+        }
+        $res = $this->model->create($data);
+        return $res->id;
+
+    }
+
+    /**
+     * 课程教学大纲编辑
+     * @param int $id
+     * @param array $data
+     * @return bool
+     */
+    public function edit(int $id, array $data)
+    {
+        if (isset($data['user_permission']) && is_array($data['user_permission'])) {
+            $data['user_permission'] = implode(',', $data['user_permission']);
+        }
+        $this->model->where([['id', '=', $id]])->update($data);
+        return true;
+    }
+
+
+    /**
+     * 获取跳绳教案库列表
+     * @param array $where
+     * @return array
+     */
+    public function jumpPetPage(array $where = [])
+    {
+        $field = 'id,title,image,type,content,status,create_time,update_time,delete_time,table_type,user_permission';
+        $order = 'id desc';
+        $search_model = $this->model->withSearch(["title","status","create_time","update_time","table_type"], $where)->with(['personnelData'])->field($field)->order($order);
+        $list = $this->pageQuery($search_model);
+        return $list;
+    }
+
+    /**
+     * 添加跳绳教案库
+     * @param array $data
+     * @return mixed
+     */
+    public function jumpAdd(array $data)
+    {
+        if (isset($data['user_permission']) && is_array($data['user_permission'])) {
+            $data['user_permission'] = implode(',', $data['user_permission']);
+        }
+        $res = $this->model->create($data);
+        return $res->id;
+
+    }
+
+    /**
+     * 跳绳教案库编辑
+     * @param int $id
+     * @param array $data
+     * @return bool
+     */
+    public function jumpEdit(int $id, array $data)
+    {
+        if (isset($data['user_permission']) && is_array($data['user_permission'])) {
+            $data['user_permission'] = implode(',', $data['user_permission']);
+        }
+        $this->model->where([['id', '=', $id]])->update($data);
+        return true;
+    }
+
+    /**
+     * 获取增高教案库列表
+     * @param array $where
+     * @return array
+     */
+    public function enPetPage(array $where = [])
+    {
+        $field = 'id,title,image,type,content,status,create_time,update_time,delete_time,table_type,user_permission';
+        $order = 'id desc';
+        $search_model = $this->model->withSearch(["title","status","create_time","update_time","table_type"], $where)->with(['personnelData'])->field($field)->order($order);
+        $list = $this->pageQuery($search_model);
+        return $list;
+    }
+
+    /**
+     * 添加增高教案库
+     * @param array $data
+     * @return mixed
+     */
+    public function enAdd(array $data)
+    {
+        if (isset($data['user_permission']) && is_array($data['user_permission'])) {
+            $data['user_permission'] = implode(',', $data['user_permission']);
+        }
+        $res = $this->model->create($data);
+        return $res->id;
+
+    }
+
+    /**
+     * 跳绳增高教案库
+     * @param int $id
+     * @param array $data
+     * @return bool
+     */
+    public function enEdit(int $id, array $data)
+    {
+        if (isset($data['user_permission']) && is_array($data['user_permission'])) {
+            $data['user_permission'] = implode(',', $data['user_permission']);
+        }
+        $this->model->where([['id', '=', $id]])->update($data);
+        return true;
+    }
+
+
+    /**
+     * 获取跳高教案库列表
+     * @param array $where
+     * @return array
+     */
+    public function basketballPetPage(array $where = [])
+    {
+        $field = 'id,title,image,type,content,status,create_time,update_time,delete_time,table_type,user_permission';
+        $order = 'id desc';
+        $search_model = $this->model->withSearch(["title","status","create_time","update_time","table_type"], $where)->with(['personnelData'])->field($field)->order($order);
+        $list = $this->pageQuery($search_model);
+        return $list;
+    }
+
+    /**
+     * 添加跳高教案库
+     * @param array $data
+     * @return mixed
+     */
+    public function basketballAdd(array $data)
+    {
+        if (isset($data['user_permission']) && is_array($data['user_permission'])) {
+            $data['user_permission'] = implode(',', $data['user_permission']);
+        }
+        $res = $this->model->create($data);
+        return $res->id;
+
+    }
+
+    /**
+     * 跳绳跳高教案库
+     * @param int $id
+     * @param array $data
+     * @return bool
+     */
+    public function basketballEdit(int $id, array $data)
+    {
+        if (isset($data['user_permission']) && is_array($data['user_permission'])) {
+            $data['user_permission'] = implode(',', $data['user_permission']);
+        }
+        $this->model->where([['id', '=', $id]])->update($data);
+        return true;
+    }
+
+    /**
+     * 获取跳高教案库列表
+     * @param array $where
+     * @return array
+     */
+    public function strengPetPage(array $where = [])
+    {
+        $field = 'id,title,image,type,content,status,create_time,update_time,delete_time,table_type,user_permission';
+        $order = 'id desc';
+        $search_model = $this->model->withSearch(["title","status","create_time","update_time","table_type"], $where)->with(['personnelData'])->field($field)->order($order);
+        $list = $this->pageQuery($search_model);
+        return $list;
+    }
+
+    /**
+     * 添加跳高教案库
+     * @param array $data
+     * @return mixed
+     */
+    public function strengAdd(array $data)
+    {
+        if (isset($data['user_permission']) && is_array($data['user_permission'])) {
+            $data['user_permission'] = implode(',', $data['user_permission']);
+        }
+        $res = $this->model->create($data);
+        return $res->id;
+
+    }
+
+    /**
+     * 跳绳跳高教案库
+     * @param int $id
+     * @param array $data
+     * @return bool
+     */
+    public function strengEdit(int $id, array $data)
+    {
+        if (isset($data['user_permission']) && is_array($data['user_permission'])) {
+            $data['user_permission'] = implode(',', $data['user_permission']);
+        }
+        $this->model->where([['id', '=', $id]])->update($data);
+        return true;
+    }
+
+    /**
+     * 获取跳高教案库列表
+     * @param array $where
+     * @return array
+     */
+    public function ninjaPetPage(array $where = [])
+    {
+        $field = 'id,title,image,type,content,status,create_time,update_time,delete_time,table_type,user_permission';
+        $order = 'id desc';
+        $search_model = $this->model->withSearch(["title","status","create_time","update_time","table_type"], $where)->with(['personnelData'])->field($field)->order($order);
+        $list = $this->pageQuery($search_model);
+        return $list;
+    }
+
+    /**
+     * 添加跳高教案库
+     * @param array $data
+     * @return mixed
+     */
+    public function ninjaAdd(array $data)
+    {
+        if (isset($data['user_permission']) && is_array($data['user_permission'])) {
+            $data['user_permission'] = implode(',', $data['user_permission']);
+        }
+        $res = $this->model->create($data);
+        return $res->id;
+
+    }
+
+    /**
+     * 跳绳跳高教案库
+     * @param int $id
+     * @param array $data
+     * @return bool
+     */
+    public function ninjaEdit(int $id, array $data)
+    {
+        if (isset($data['user_permission']) && is_array($data['user_permission'])) {
+            $data['user_permission'] = implode(',', $data['user_permission']);
+        }
+        $this->model->where([['id', '=', $id]])->update($data);
+        return true;
+    }
+
+    /**
+     * 获取跳高教案库列表
+     * @param array $where
+     * @return array
+     */
+    public function securityPetPage(array $where = [])
+    {
+        $field = 'id,title,image,type,content,status,create_time,update_time,delete_time,table_type,user_permission';
+        $order = 'id desc';
+        $search_model = $this->model->withSearch(["title","status","create_time","update_time","table_type"], $where)->with(['personnelData'])->field($field)->order($order);
+        $list = $this->pageQuery($search_model);
+        return $list;
+    }
+
+    /**
+     * 添加跳高教案库
+     * @param array $data
+     * @return mixed
+     */
+    public function securityAdd(array $data)
+    {
+        if (isset($data['user_permission']) && is_array($data['user_permission'])) {
+            $data['user_permission'] = implode(',', $data['user_permission']);
+        }
+        $res = $this->model->create($data);
+        return $res->id;
+
+    }
+
+    /**
+     * 跳绳跳高教案库
+     * @param int $id
+     * @param array $data
+     * @return bool
+     */
+    public function securityEdit(int $id, array $data)
+    {
+        if (isset($data['user_permission']) && is_array($data['user_permission'])) {
+            $data['user_permission'] = implode(',', $data['user_permission']);
+        }
+        $this->model->where([['id', '=', $id]])->update($data);
+        return true;
+    }
+
+    /**
+     * 获取体能教案库列表
+     * @param array $where
+     * @return array
+     */
+    public function physicalPetPage(array $where = [])
+    {
+        $field = 'id,title,image,type,content,status,create_time,update_time,delete_time,table_type,user_permission';
+        $order = 'id desc';
+        $search_model = $this->model->withSearch(["title","status","create_time","update_time","table_type"], $where)->with(['personnelData'])->field($field)->order($order);
+        $list = $this->pageQuery($search_model);
+        return $list;
+    }
+
+    /**
+     * 添加体能教案库
+     * @param array $data
+     * @return mixed
+     */
+    public function physicalAdd(array $data)
+    {
+        if (isset($data['user_permission']) && is_array($data['user_permission'])) {
+            $data['user_permission'] = implode(',', $data['user_permission']);
+        }
+        $res = $this->model->create($data);
+        return $res->id;
+
+    }
+
+    /**
+     * 跳绳体能教案库
+     * @param int $id
+     * @param array $data
+     * @return bool
+     */
+    public function physicalEdit(int $id, array $data)
+    {
+        if (isset($data['user_permission']) && is_array($data['user_permission'])) {
+            $data['user_permission'] = implode(',', $data['user_permission']);
+        }
+        $this->model->where([['id', '=', $id]])->update($data);
+        return true;
+    }
+
+
+
+
+
+    /**
+     * 获取热身动做列表
+     * @param array $where
+     * @return array
+     */
+    public function actionPetPage(array $where = [])
+    {
+        $field = 'id,title,image,type,content,status,create_time,update_time,delete_time,table_type,user_permission';
+        $order = 'id desc';
+        $search_model = $this->model->withSearch(["title","status","create_time","update_time","table_type"], $where)->with(['personnelData'])->field($field)->order($order);
+        $list = $this->pageQuery($search_model);
+        return $list;
+    }
+
+    /**
+     * 添加热身动做
+     * @param array $data
+     * @return mixed
+     */
+    public function actionAdd(array $data)
+    {
+        if (isset($data['user_permission']) && is_array($data['user_permission'])) {
+            $data['user_permission'] = implode(',', $data['user_permission']);
+        }
+        $res = $this->model->create($data);
+        return $res->id;
+
+    }
+
+    /**
+     * 热身动做
+     * @param int $id
+     * @param array $data
+     * @return bool
+     */
+    public function actionEdit(int $id, array $data)
+    {
+        if (isset($data['user_permission']) && is_array($data['user_permission'])) {
+            $data['user_permission'] = implode(',', $data['user_permission']);
+        }
+        $this->model->where([['id', '=', $id]])->update($data);
+        return true;
+    }
+
+
+    /**
+     * 获取趣味游戏列表
+     * @param array $where
+     * @return array
+     */
+    public function gamesPetPage(array $where = [])
+    {
+        $field = 'id,title,image,type,content,status,create_time,update_time,delete_time,table_type,user_permission';
+        $order = 'id desc';
+        $search_model = $this->model->withSearch(["title","status","create_time","update_time","table_type"], $where)->with(['personnelData'])->field($field)->order($order);
+        $list = $this->pageQuery($search_model);
+        return $list;
+    }
+
+    /**
+     * 添加趣味游戏
+     * @param array $data
+     * @return mixed
+     */
+    public function gamesAdd(array $data)
+    {
+        if (isset($data['user_permission']) && is_array($data['user_permission'])) {
+            $data['user_permission'] = implode(',', $data['user_permission']);
+        }
+        $res = $this->model->create($data);
+        return $res->id;
+
+    }
+
+    /**
+     * 趣味游戏
+     * @param int $id
+     * @param array $data
+     * @return bool
+     */
+    public function gamesEdit(int $id, array $data)
+    {
+        if (isset($data['user_permission']) && is_array($data['user_permission'])) {
+            $data['user_permission'] = implode(',', $data['user_permission']);
+        }
+        $this->model->where([['id', '=', $id]])->update($data);
+        return true;
+    }
+
+
+
+    /**
+     * 获取趣味游戏列表
+     * @param array $where
+     * @return array
+     */
+    public function fitnessPetPage(array $where = [])
+    {
+        $field = 'id,title,image,type,content,status,create_time,update_time,delete_time,table_type,user_permission';
+        $order = 'id desc';
+        $search_model = $this->model->withSearch(["title","status","create_time","update_time","table_type"], $where)->with(['personnelData'])->field($field)->order($order);
+        $list = $this->pageQuery($search_model);
+        return $list;
+    }
+
+    /**
+     * 添加趣味游戏
+     * @param array $data
+     * @return mixed
+     */
+    public function fitnessAdd(array $data)
+    {
+        if (isset($data['user_permission']) && is_array($data['user_permission'])) {
+            $data['user_permission'] = implode(',', $data['user_permission']);
+        }
+        $res = $this->model->create($data);
+        return $res->id;
+
+    }
+
+    /**
+     * 趣味游戏
+     * @param int $id
+     * @param array $data
+     * @return bool
+     */
+    public function fitnessEdit(int $id, array $data)
+    {
+        if (isset($data['user_permission']) && is_array($data['user_permission'])) {
+            $data['user_permission'] = implode(',', $data['user_permission']);
+        }
+        $this->model->where([['id', '=', $id]])->update($data);
+        return true;
+    }
+
+
+    /**
+     * 获取趣味游戏列表
+     * @param array $where
+     * @return array
+     */
+    public function relaxationPetPage(array $where = [])
+    {
+        $field = 'id,title,image,type,content,status,create_time,update_time,delete_time,table_type,user_permission';
+        $order = 'id desc';
+        $search_model = $this->model->withSearch(["title","status","create_time","update_time","table_type"], $where)->with(['personnelData'])->field($field)->order($order);
+        $list = $this->pageQuery($search_model);
+        return $list;
+    }
+
+    /**
+     * 添加趣味游戏
+     * @param array $data
+     * @return mixed
+     */
+    public function relaxationAdd(array $data)
+    {
+        if (isset($data['user_permission']) && is_array($data['user_permission'])) {
+            $data['user_permission'] = implode(',', $data['user_permission']);
+        }
+        $res = $this->model->create($data);
+        return $res->id;
+
+    }
+
+    /**
+     * 趣味游戏
+     * @param int $id
+     * @param array $data
+     * @return bool
+     */
+    public function relaxationEdit(int $id, array $data)
+    {
+        if (isset($data['user_permission']) && is_array($data['user_permission'])) {
+            $data['user_permission'] = implode(',', $data['user_permission']);
+        }
+        $this->model->where([['id', '=', $id]])->update($data);
+        return true;
+    }
+
+
+    public function publicPetPage(array $where = [])
+    {
+        $field = 'id,title,image,type,content,status,create_time,update_time,delete_time,table_type,user_permission';
+        $order = 'id desc';
+        $search_model = $this->model->withSearch(["title","status","create_time","update_time","table_type"], $where)->with(['personnelData'])->field($field)->order($order);
+        $list = $this->pageQuery($search_model);
+        return $list;
+    }
+    public function publicAdd(array $data)
+    {
+        if (isset($data['user_permission']) && is_array($data['user_permission'])) {
+            $data['user_permission'] = implode(',', $data['user_permission']);
+        }
+        $res = $this->model->create($data);
+        return $res->id;
+
+    }
+    public function publicEdit(int $id, array $data)
+    {
+        if (isset($data['user_permission']) && is_array($data['user_permission'])) {
+            $data['user_permission'] = implode(',', $data['user_permission']);
+        }
+        $this->model->where([['id', '=', $id]])->update($data);
+        return true;
+    }
+
+
+    /**
+     * 获取教研管理信息
+     * @param int $id
+     * @return array
+     */
+    public function getInfo(int $id)
+    {
+        $field = 'id,title,image,type,content,status,create_time,update_time,delete_time,table_type,user_permission';
+
+        $info = $this->model->field($field)->where([['id', "=", $id]])->with(['personnelData'])->findOrEmpty()->toArray();
+        $info['status'] = strval($info['status']);
+        return $info;
+    }
+
+    /**
+     * 删除教研管理
+     * @param int $id
+     * @return bool
+     */
+    public function del(int $id)
+    {
+        $model = $this->model->where([['id', '=', $id]])->find();
+        $res = $model->delete();
+        return $res;
+    }
+
+
+    public function getPersonnelDataAll(){
+       $personnelDataModel = new PersonnelData();
+       return $personnelDataModel->where('is_sys_user',1)->select()->toArray();
+    }
+
+
+}
diff --git a/niucloud/app/validate/lesson_course_teaching/LessonCourseTeaching.php b/niucloud/app/validate/lesson_course_teaching/LessonCourseTeaching.php
new file mode 100644
index 00000000..1c589ac9
--- /dev/null
+++ b/niucloud/app/validate/lesson_course_teaching/LessonCourseTeaching.php
@@ -0,0 +1,35 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace app\validate\lesson_course_teaching;
+use core\base\BaseValidate;
+/**
+ * 课程教学大纲验证器
+ * Class LessonCourseTeaching
+ * @package addon\app\validate\lesson_course_teaching
+ */
+class LessonCourseTeaching extends BaseValidate
+{
+
+       protected $rule = [
+            
+        ];
+
+       protected $message = [
+            
+        ];
+
+       protected $scene = [
+            "add" => ['title', 'image', 'type', 'content', 'status'],
+            "edit" => ['title', 'image', 'type', 'content', 'status']
+        ];
+
+}

From 604a255055f977c6f9ac9cfa2ff0d76939847e42 Mon Sep 17 00:00:00 2001
From: LLL <15374889135@163.com>
Date: Sun, 18 May 2025 10:03:38 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/.env.development                        |    8 +
 admin/.env.production                         |    8 +
 admin/.gitignore                              |    3 -
 admin/components.d.ts                         |   16 +-
 admin/package.json                            |   17 +-
 admin/src/App.vue                             |   24 +-
 admin/src/addon/shop/api/delivery.ts          |  106 +-
 admin/src/addon/shop/api/electronic_sheet.ts  |   60 +-
 admin/src/addon/shop/api/goods.ts             |  325 +-
 admin/src/addon/shop/api/marketing.ts         |  231 +-
 admin/src/addon/shop/api/order.ts             |   77 +-
 admin/src/addon/shop/api/shop.ts              |   12 +-
 admin/src/addon/shop/api/shop_address.ts      |   25 +-
 admin/src/addon/shop/api/stat.ts              |    8 +-
 .../addon/shop/lang/zh-cn/address.edit.json   |   68 +-
 .../addon/shop/lang/zh-cn/address.list.json   |    2 +-
 admin/src/addon/shop/lang/zh-cn/common.json   |   58 +-
 .../shop/lang/zh-cn/delivery.company.json     |   38 +-
 .../lang/zh-cn/delivery.company_edit.json     |   85 +-
 .../shop/lang/zh-cn/delivery.config.json      |   20 +-
 .../lang/zh-cn/delivery.electronic_sheet.json |    2 +-
 .../delivery.electronic_sheet_config.json     |    2 +-
 .../zh-cn/delivery.electronic_sheet_edit.json |    2 +-
 .../addon/shop/lang/zh-cn/delivery.local.json |  108 +-
 .../shop/lang/zh-cn/delivery.search.json      |   38 +-
 .../addon/shop/lang/zh-cn/delivery.staff.json |   16 +-
 .../addon/shop/lang/zh-cn/delivery.store.json |   34 +-
 .../shop/lang/zh-cn/delivery.store_edit.json  |   74 +-
 .../shop/lang/zh-cn/delivery.template.json    |   22 +-
 .../lang/zh-cn/delivery.template_edit.json    |   76 +-
 .../src/addon/shop/lang/zh-cn/goods.attr.json |    4 +-
 .../shop/lang/zh-cn/goods.attr_edit.json      |    2 +-
 .../shop/lang/zh-cn/goods.brand_list.json     |   28 +-
 .../addon/shop/lang/zh-cn/goods.category.json |   50 +-
 .../lang/zh-cn/goods.category_config.json     |   52 +-
 .../addon/shop/lang/zh-cn/goods.evaluate.json |   96 +-
 .../shop/lang/zh-cn/goods.evaluate_edit.json  |   72 +-
 .../lang/zh-cn/goods.label_group_list.json    |    2 +-
 .../shop/lang/zh-cn/goods.label_list.json     |    2 +-
 .../src/addon/shop/lang/zh-cn/goods.list.json |   13 +-
 .../shop/lang/zh-cn/goods.real_edit.json      |   30 +-
 .../addon/shop/lang/zh-cn/goods.service.json  |   18 +-
 .../shop/lang/zh-cn/goods.virtual_edit.json   |   30 +-
 .../addon/shop/lang/zh-cn/index.index.json    |   38 +-
 .../shop/lang/zh-cn/marketing.coupon.add.json |   82 +-
 .../lang/zh-cn/marketing.coupon.edit.json     |   82 +-
 .../lang/zh-cn/marketing.coupon.list.json     |   90 +-
 .../lang/zh-cn/marketing.discount.add.json    |   72 +-
 .../lang/zh-cn/marketing.discount.config.json |   14 +-
 .../lang/zh-cn/marketing.discount.detail.json |    2 +-
 .../lang/zh-cn/marketing.discount.edit.json   |   72 +-
 .../lang/zh-cn/marketing.discount.list.json   |   98 +-
 .../zh-cn/marketing.exchange.goods_add.json   |  124 +-
 .../zh-cn/marketing.exchange.goods_edit.json  |  123 +-
 .../zh-cn/marketing.exchange.goods_list.json  |   52 +-
 .../zh-cn/marketing.exchange.order_list.json  |  106 +-
 .../lang/zh-cn/marketing.manjian.detail.json  |   72 +-
 .../lang/zh-cn/marketing.manjian.edit.json    |    2 +-
 .../lang/zh-cn/marketing.newcomer.config.json |   88 +-
 .../zh-cn/marketing.newcomer.order_list.json  |  110 +-
 .../shop/lang/zh-cn/order.batch_delivery.json |   48 +-
 .../addon/shop/lang/zh-cn/order.config.json   |   76 +-
 .../addon/shop/lang/zh-cn/order.detail.json   |    2 +-
 .../addon/shop/lang/zh-cn/order.invoice.json  |   78 +-
 .../addon/shop/lang/zh-cn/order.refund.json   |  210 +-
 .../shop/lang/zh-cn/order.refund_detail.json  |    2 +-
 .../src/addon/shop/lang/zh-cn/stat.goods.json |   72 +-
 admin/src/addon/shop/views/address/edit.vue   |  726 ++--
 admin/src/addon/shop/views/address/list.vue   |  275 +-
 .../src/addon/shop/views/delivery/company.vue |  281 +-
 .../shop/views/delivery/company_edit.vue      |  626 ++--
 .../components/delivery-personnel-edit.vue    |  171 +-
 .../src/addon/shop/views/delivery/config.vue  |  248 +-
 .../shop/views/delivery/electronic_sheet.vue  |  350 +-
 .../delivery/electronic_sheet_config.vue      |  341 +-
 .../views/delivery/electronic_sheet_edit.vue  |  626 ++--
 admin/src/addon/shop/views/delivery/local.vue |  773 ++---
 .../src/addon/shop/views/delivery/search.vue  |  260 +-
 admin/src/addon/shop/views/delivery/staff.vue |  228 +-
 admin/src/addon/shop/views/delivery/store.vue |  288 +-
 .../addon/shop/views/delivery/store_edit.vue  |  688 ++--
 .../addon/shop/views/delivery/template.vue    |  256 +-
 .../shop/views/delivery/template_edit.vue     |  937 ++---
 .../diy/components/edit-goods-coupon.vue      |  494 ++-
 .../views/diy/components/edit-goods-list.vue  |  742 ++--
 .../diy/components/edit-many-goods-list.vue   | 1054 +++---
 .../components/edit-shop-exchange-goods.vue   |  211 +-
 .../components/edit-shop-exchange-info.vue    |   41 +-
 .../components/edit-shop-goods-ranking.vue    |  281 +-
 .../components/edit-shop-goods-recommend.vue  |  388 +--
 .../diy/components/edit-shop-member-info.vue  |   71 +-
 .../diy/components/edit-shop-newcomer.vue     |  609 ++--
 .../diy/components/edit-shop-order-info.vue   |  205 +-
 .../views/diy/components/edit-shop-search.vue |   43 +-
 .../diy/components/edit-single-recommend.vue  |  639 ++--
 admin/src/addon/shop/views/goods/attr.vue     |  444 +--
 .../src/addon/shop/views/goods/attr_edit.vue  |  862 ++---
 .../src/addon/shop/views/goods/brand_list.vue |  328 +-
 admin/src/addon/shop/views/goods/category.vue |  399 +--
 .../shop/views/goods/category_config.vue      |  439 +--
 .../views/goods/components/brand-edit.vue     |  197 +-
 .../views/goods/components/category-edit.vue  |  232 +-
 .../goods/components/coupon-select-popup.vue  |  487 ++-
 .../views/goods/components/evaluate-add.vue   |  254 +-
 .../components/goods-batch-settings-popup.vue | 1136 +++----
 .../goods-category-spread-popup.vue           |  124 +-
 .../components/goods-member-price-popup.vue   |  535 ++-
 .../components/goods-price-edit-popup.vue     |  522 ++-
 .../goods/components/goods-select-popup.vue   | 1302 +++----
 .../goods/components/goods-spread-popup.vue   |  140 +-
 .../components/goods-stock-edit-popup.vue     |  388 +--
 .../views/goods/components/label-edit.vue     |  336 +-
 .../goods/components/label-group-edit.vue     |  153 +-
 .../newcomer-goods-select-popup.vue           | 1302 +++----
 .../views/goods/components/service-edit.vue   |  156 +-
 admin/src/addon/shop/views/goods/evaluate.vue |  555 ++-
 .../shop/views/goods/label_group_list.vue     |  317 +-
 .../src/addon/shop/views/goods/label_list.vue |  459 +--
 admin/src/addon/shop/views/goods/list.vue     | 1330 +++-----
 .../views/goods/public/js/useGoodsEdit.ts     | 3027 ++++++++---------
 .../src/addon/shop/views/goods/real_edit.vue  | 2279 +++++--------
 admin/src/addon/shop/views/goods/recycle.vue  |  599 ++--
 admin/src/addon/shop/views/goods/service.vue  |  243 +-
 .../addon/shop/views/goods/virtual_edit.vue   | 1964 ++++-------
 admin/src/addon/shop/views/index/index.vue    |  709 ++--
 .../addon/shop/views/marketing/coupon/add.vue |  695 ++--
 .../coupon/components/coupon-collection.vue   |  331 +-
 .../coupon/components/coupon-spread-popup.vue |  128 +-
 .../shop/views/marketing/coupon/edit.vue      |  746 ++--
 .../shop/views/marketing/coupon/list.vue      |  431 +--
 .../shop/views/marketing/discount/add.vue     | 1567 ++++-----
 .../discount/components/discount-detail.vue   |  871 ++---
 .../discount/components/goods-sku-popup.vue   | 1146 +++----
 .../shop/views/marketing/discount/config.vue  |  248 +-
 .../shop/views/marketing/discount/detail.vue  |  826 ++---
 .../shop/views/marketing/discount/edit.vue    | 1558 ++++-----
 .../shop/views/marketing/discount/list.vue    |  354 +-
 .../components/goods-select-popup.vue         |  381 +--
 .../exchange/components/goods-sku-select.vue  |  219 +-
 .../views/marketing/exchange/goods_add.vue    | 1839 ++++------
 .../views/marketing/exchange/goods_edit.vue   | 1736 ++++------
 .../views/marketing/exchange/goods_list.vue   |  403 +--
 .../views/marketing/exchange/order_list.vue   |  430 +--
 .../components/rank-select-popup.vue          |  464 ++-
 .../views/marketing/goods_rank/config.vue     |  206 +-
 .../shop/views/marketing/goods_rank/edit.vue  |  822 ++---
 .../shop/views/marketing/goods_rank/list.vue  |  469 +--
 .../src/addon/shop/views/marketing/index.vue  |  122 +-
 .../shop/views/marketing/manjian/detail.vue   |  572 ++--
 .../shop/views/marketing/manjian/edit.vue     | 2065 ++++-------
 .../shop/views/marketing/manjian/list.vue     |  565 ++-
 .../shop/views/marketing/newcomer/config.vue  |  948 ++----
 .../views/marketing/newcomer/order_list.vue   |  566 ++-
 .../components/benefits-free-shipping.vue     |   76 +-
 .../views/member/components/gift-coupon.vue   |  268 +-
 .../components/growth-rule-buygoods.vue       |  165 +-
 .../components/growth-rule-buyorder.vue       |  137 +-
 .../member/components/point-rule-buygoods.vue |  169 +-
 .../components/point-rule-orderdeduction.vue  |  167 +-
 .../components/recharge-detail-coupon.vue     |  242 +-
 .../components/recharge-gift-coupon.vue       |  328 +-
 .../addon/shop/views/order/batch_delivery.vue |  377 +-
 .../views/order/components/adjust-money.vue   |  333 +-
 .../order/components/delivery-action.vue      |  608 ++--
 .../order/components/delivery-package.vue     |  225 +-
 .../components/electronic-sheet-print.vue     |  819 ++---
 .../views/order/components/form-detail.vue    |  102 +-
 .../views/order/components/import-data.vue    |  143 +-
 .../views/order/components/invoice-detail.vue |  181 +-
 .../views/order/components/invoice-dialog.vue |  122 +-
 .../views/order/components/order-detail.vue   |  808 ++---
 .../order/components/order-edit-address.vue   |  914 ++---
 .../order/components/order-export-select.vue  |   70 +-
 .../views/order/components/order-notes.vue    |  110 +-
 .../views/order/components/refund-detail.vue  | 1105 +++---
 .../order/components/shop-active-refund.vue   |  402 +--
 admin/src/addon/shop/views/order/config.vue   |  601 ++--
 admin/src/addon/shop/views/order/detail.vue   |  912 ++---
 admin/src/addon/shop/views/order/invoice.vue  |  331 +-
 admin/src/addon/shop/views/order/list.vue     | 1102 +++---
 admin/src/addon/shop/views/order/refund.vue   |  542 ++-
 .../poster/components/edit-goods-image.vue    |   13 +-
 .../components/edit-goods-market-price.vue    |   13 +-
 .../poster/components/edit-goods-name.vue     |   13 +-
 .../poster/components/edit-goods-price.vue    |   13 +-
 .../poster/components/preview-goods-image.vue |   29 +-
 .../components/preview-goods-market-price.vue |   62 +-
 .../poster/components/preview-goods-name.vue  |   62 +-
 .../poster/components/preview-goods-price.vue |   64 +-
 .../components/preview-goods-order.vue        |  456 +--
 admin/src/addon/shop/views/stat/goods.vue     | 1196 +++----
 admin/src/addon/shop/views/stat/index.vue     |  557 ++-
 admin/src/addon/shop/views/stat/member.vue    |  366 +-
 admin/src/addon/shop/views/stat/order.vue     |  707 ++--
 admin/src/addon/shop/views/stat/visit.vue     |  479 ++-
 admin/src/app/api/addon.ts                    |   30 +-
 admin/src/app/api/aliapp.ts                   |    6 +-
 admin/src/app/api/auth.ts                     |   13 +-
 admin/src/app/api/cloud.ts                    |   10 +-
 admin/src/app/api/departments.ts              |    2 -
 admin/src/app/api/dict.ts                     |   36 +-
 admin/src/app/api/diy.ts                      |   65 +-
 admin/src/app/api/diy_form.ts                 |   64 +-
 admin/src/app/api/future_ontent.ts            |   40 +
 admin/src/app/api/h5.ts                       |    4 +-
 admin/src/app/api/instructional_material.ts   |  140 +
 admin/src/app/api/lesson_course_teaching.ts   |  249 ++
 admin/src/app/api/member.ts                   |  180 +-
 admin/src/app/api/module.ts                   |   18 +-
 admin/src/app/api/notice.ts                   |   24 +-
 admin/src/app/api/pay.ts                      |   34 +-
 admin/src/app/api/pc.ts                       |    4 +-
 admin/src/app/api/personal.ts                 |    5 +-
 admin/src/app/api/poster.ts                   |   40 +-
 admin/src/app/api/printer.ts                  |   94 +-
 admin/src/app/api/sys.ts                      |  224 +-
 admin/src/app/api/tools.ts                    |   52 +-
 admin/src/app/api/upgrade.ts                  |   13 +-
 admin/src/app/api/user.ts                     |   18 +-
 admin/src/app/api/verify.ts                   |   18 +-
 admin/src/app/api/weapp.ts                    |   40 +-
 admin/src/app/api/web.ts                      |   73 +-
 admin/src/app/api/wechat.ts                   |   48 +-
 .../src/app/components/cloud-build/index.vue  |  433 +--
 admin/src/app/components/upgrade/index.vue    |  593 ++--
 .../app/components/user-info-edit/index.vue   |  119 +-
 admin/src/app/lang/en/403.json                |    4 +-
 admin/src/app/lang/en/auth.menu.json          |   40 +-
 admin/src/app/lang/en/index.json              |   48 +-
 admin/src/app/lang/en/login.json              |   12 +-
 admin/src/app/lang/en/member.member.json      |   49 +-
 admin/src/app/lang/en/user.center.json        |   26 +-
 admin/src/app/lang/zh-cn/403.json             |    4 +-
 admin/src/app/lang/zh-cn/app.authorize.json   |   34 +-
 admin/src/app/lang/zh-cn/app.index.json       |    8 +-
 admin/src/app/lang/zh-cn/app.store.json       |  130 +-
 admin/src/app/lang/zh-cn/auth.log.json        |   36 +-
 admin/src/app/lang/zh-cn/auth.menu.json       |   62 +-
 admin/src/app/lang/zh-cn/auth.role.json       |   20 +-
 admin/src/app/lang/zh-cn/auth.user.json       |   62 +-
 .../app/lang/zh-cn/channel.aliapp.access.json |   44 +-
 .../app/lang/zh-cn/channel.aliapp.config.json |   65 +-
 .../app/lang/zh-cn/channel.aliapp.course.json |   18 +-
 .../src/app/lang/zh-cn/channel.h5.config.json |   11 +-
 .../src/app/lang/zh-cn/channel.pc.config.json |   14 +-
 .../app/lang/zh-cn/channel.weapp.access.json  |   50 +-
 .../app/lang/zh-cn/channel.weapp.code.json    |   88 +-
 .../app/lang/zh-cn/channel.weapp.config.json  |   74 +-
 .../app/lang/zh-cn/channel.weapp.course.json  |   18 +-
 .../lang/zh-cn/channel.weapp.template.json    |   40 +-
 .../app/lang/zh-cn/channel.wechat.access.json |   44 +-
 .../app/lang/zh-cn/channel.wechat.config.json |   64 +-
 .../app/lang/zh-cn/channel.wechat.course.json |   18 +-
 .../channel.wechat.keyword_reply_edit.json    |   26 +-
 .../app/lang/zh-cn/channel.wechat.menu.json   |   46 +-
 .../app/lang/zh-cn/channel.wechat.reply.json  |   20 +-
 .../zh-cn/children_like.children_like.json    |   27 +
 .../src/app/lang/zh-cn/decorate.preview.json  |    2 +-
 .../lang/zh-cn/departments.departments.json   |    2 +
 admin/src/app/lang/zh-cn/dict.list.json       |   44 +-
 admin/src/app/lang/zh-cn/diy.list.json        |    2 +-
 admin/src/app/lang/zh-cn/diy.preview.json     |    2 +-
 admin/src/app/lang/zh-cn/diy.route.json       |    2 +-
 admin/src/app/lang/zh-cn/diy.tabbar.json      |    2 +-
 admin/src/app/lang/zh-cn/diy.tabbar_edit.json |    2 +-
 admin/src/app/lang/zh-cn/diy_form.edit.json   |   76 +-
 admin/src/app/lang/zh-cn/diy_form.list.json   |  139 +-
 admin/src/app/lang/zh-cn/finance.account.json |   50 +-
 .../src/app/lang/zh-cn/finance.cash_out.json  |  124 +-
 .../app/lang/zh-cn/finance.offlinepay.json    |   32 +-
 .../app/lang/zh-cn/finance.pay_detail.json    |   32 +-
 .../app/lang/zh-cn/finance.pay_refund.json    |   30 +-
 .../app/lang/zh-cn/finance.refund_detail.json |   30 +-
 .../zh-cn/future_ontent.future_ontent.json    |   27 +
 .../src/app/lang/zh-cn/index.app_manage.json  |    6 +-
 admin/src/app/lang/zh-cn/index.index.json     |  102 +-
 admin/src/app/lang/zh-cn/index.preview.json   |    2 +-
 .../src/app/lang/zh-cn/index.site_index.json  |  132 +-
 admin/src/app/lang/zh-cn/index.store.json     |  148 +-
 ...ional_material.instructional_material.json |   30 +
 ...ourse_teaching.lesson_course_teaching.json |   37 +
 admin/src/app/lang/zh-cn/login.json           |   20 +-
 .../app/lang/zh-cn/marketing.sign_config.json |   80 +-
 .../app/lang/zh-cn/marketing.sign_list.json   |   28 +-
 .../app/lang/zh-cn/marketing.verifier.json    |   60 +-
 .../src/app/lang/zh-cn/marketing.verify.json  |   62 +-
 admin/src/app/lang/zh-cn/member.balance.json  |   66 +-
 .../src/app/lang/zh-cn/member.commission.json |   63 +-
 admin/src/app/lang/zh-cn/member.growth.json   |   58 +-
 .../src/app/lang/zh-cn/member.label.edit.json |   20 +-
 admin/src/app/lang/zh-cn/member.label.json    |   31 +-
 admin/src/app/lang/zh-cn/member.level.json    |   24 +-
 .../src/app/lang/zh-cn/member.level_edit.json |   46 +-
 admin/src/app/lang/zh-cn/member.member.json   |  159 +-
 .../app/lang/zh-cn/member.member_detail.json  |  106 +-
 admin/src/app/lang/zh-cn/member.point.json    |   58 +-
 .../app/lang/zh-cn/order.recharge.detail.json |   36 +-
 .../app/lang/zh-cn/order.recharge.list.json   |   44 +-
 .../app/lang/zh-cn/order.recharge.refund.json |   44 +-
 .../physical_testing.physical_testing.json    |   29 +
 admin/src/app/lang/zh-cn/poster.edit.json     |    4 +-
 admin/src/app/lang/zh-cn/poster.list.json     |    2 +-
 admin/src/app/lang/zh-cn/printer.edit.json    |    2 +-
 admin/src/app/lang/zh-cn/printer.list.json    |    2 +-
 .../app/lang/zh-cn/printer.template_edit.json |    2 +-
 .../app/lang/zh-cn/printer.template_list.json |    2 +-
 ...ofessional_skills.professional_skills.json |   35 +
 .../app/lang/zh-cn/setting.adminlogin.json    |   10 +-
 .../src/app/lang/zh-cn/setting.agreement.json |   10 +-
 .../lang/zh-cn/setting.agreement_edit.json    |   12 +-
 .../src/app/lang/zh-cn/setting.cash_out.json  |   40 +-
 .../src/app/lang/zh-cn/setting.copyright.json |   35 +-
 .../lang/zh-cn/setting.developer_token.json   |    6 +-
 admin/src/app/lang/zh-cn/setting.export.json  |   28 +-
 .../app/lang/zh-cn/setting.growth_rule.json   |    6 +-
 admin/src/app/lang/zh-cn/setting.layout.json  |   14 +-
 admin/src/app/lang/zh-cn/setting.login.json   |    2 +-
 admin/src/app/lang/zh-cn/setting.map.json     |   20 +-
 admin/src/app/lang/zh-cn/setting.member.json  |   20 +-
 admin/src/app/lang/zh-cn/setting.notice.json  |   42 +-
 .../lang/zh-cn/setting.notice_records.json    |   68 +-
 admin/src/app/lang/zh-cn/setting.pay.json     |  170 +-
 admin/src/app/lang/zh-cn/setting.sms.json     |   40 +-
 .../app/lang/zh-cn/setting.sms_records.json   |   68 +-
 admin/src/app/lang/zh-cn/setting.storage.json |   80 +-
 admin/src/app/lang/zh-cn/setting.system.json  |   66 +-
 .../src/app/lang/zh-cn/setting.transfer.json  |   61 +-
 admin/src/app/lang/zh-cn/setting.weapp.json   |   22 +-
 .../app/lang/zh-cn/setting.wxoplatform.json   |   36 +-
 .../src/app/lang/zh-cn/tools.addon.edit.json  |   64 +-
 .../src/app/lang/zh-cn/tools.addon.index.json |   58 +-
 admin/src/app/lang/zh-cn/tools.code.edit.json |  284 +-
 .../src/app/lang/zh-cn/tools.code.index.json  |   96 +-
 admin/src/app/lang/zh-cn/tools.detection.json |   30 +-
 admin/src/app/lang/zh-cn/tools.schedule.json  |   66 +-
 .../app/lang/zh-cn/tools.schedule_log.json    |   34 +-
 .../src/app/lang/zh-cn/tools.updatecache.json |   12 +-
 admin/src/app/lang/zh-cn/user.center.json     |   10 +-
 .../src/app/lang/zh-cn/user.edit_center.json  |   34 +-
 admin/src/app/views/app/authorize.vue         |  486 +--
 admin/src/app/views/app/index.vue             |  150 +-
 .../app/views/auth/components/edit-menu.vue   |  473 +--
 .../app/views/auth/components/edit-role.vue   |  302 +-
 .../app/views/auth/components/edit-user.vue   |  344 +-
 .../auth/components/select-menu-item.vue      |   44 +-
 .../views/auth/components/user-log-detail.vue |   89 +-
 admin/src/app/views/auth/log.vue              |  215 +-
 admin/src/app/views/auth/menu.vue             |  351 +-
 admin/src/app/views/auth/role.vue             |  217 +-
 admin/src/app/views/auth/user.vue             |  364 +-
 admin/src/app/views/channel/aliapp/access.vue |  185 +-
 admin/src/app/views/channel/aliapp/config.vue |  305 +-
 admin/src/app/views/channel/aliapp/course.vue |  259 +-
 admin/src/app/views/channel/h5/config.vue     |  156 +-
 admin/src/app/views/channel/pc/config.vue     |  163 +-
 admin/src/app/views/channel/weapp/access.vue  |  229 +-
 admin/src/app/views/channel/weapp/code.vue    |  493 ++-
 admin/src/app/views/channel/weapp/config.vue  |  505 ++-
 admin/src/app/views/channel/weapp/course.vue  |  149 +-
 .../src/app/views/channel/weapp/template.vue  |  286 +-
 admin/src/app/views/channel/wechat/access.vue |  199 +-
 .../channel/wechat/components/menu-form.vue   |  252 +-
 .../channel/wechat/components/news-card.vue   |  100 +-
 .../channel/wechat/components/reply-form.vue  |  574 ++--
 .../wechat/components/select-wechat-media.vue |  467 ++-
 .../wechat/components/upload-media.vue        |   56 +-
 admin/src/app/views/channel/wechat/config.vue |  467 +--
 admin/src/app/views/channel/wechat/course.vue |  157 +-
 .../channel/wechat/keyword_reply_edit.vue     |  322 +-
 admin/src/app/views/channel/wechat/menu.vue   |  455 ++-
 admin/src/app/views/channel/wechat/reply.vue  |  318 +-
 .../src/app/views/channel/wechat/template.vue |  329 +-
 .../app/views/children_like/children_like.vue |  564 +++
 .../components/Jump-lesson-library-edit.vue   |  229 ++
 .../basketball-course-teaching-edit.vue       |  224 ++
 .../components/en-course-teaching-edit.vue    |  223 ++
 .../lesson-course-teaching-edit.vue           |  224 ++
 .../components/ninja-teaching-edit.vue        |  224 ++
 .../components/physical-teaching-edit.vue     |  223 ++
 .../components/security-teaching-edit.vue     |  224 ++
 .../strengthen-course-teaching-edit.vue       |  223 ++
 .../components/departments-edit.vue           |  332 +-
 .../src/app/views/departments/departments.vue |  362 +-
 admin/src/app/views/dict/components/dict.vue  |  270 +-
 admin/src/app/views/dict/components/edit.vue  |  257 +-
 admin/src/app/views/dict/list.vue             |  237 +-
 .../app/views/diy/components/add-theme.vue    |  176 +-
 .../views/diy/components/edit-active-cube.vue | 1225 +++----
 .../diy/components/edit-carousel-search.vue   | 1318 +++----
 .../views/diy/components/edit-float-btn.vue   |  315 +-
 .../views/diy/components/edit-graphic-nav.vue |  548 ++-
 .../views/diy/components/edit-horz-blank.vue  |   43 +-
 .../views/diy/components/edit-horz-line.vue   |   74 +-
 .../views/diy/components/edit-hot-area.vue    |   92 +-
 .../views/diy/components/edit-image-ads.vue   |  283 +-
 .../views/diy/components/edit-member-info.vue |   49 +-
 .../diy/components/edit-member-level.vue      |  201 +-
 .../app/views/diy/components/edit-notice.vue  |  404 +--
 .../app/views/diy/components/edit-page.vue    |  477 +--
 .../diy/components/edit-picture-show.vue      |  352 +-
 .../views/diy/components/edit-rich-text.vue   |   45 +-
 .../views/diy/components/edit-rubik-cube.vue  | 1252 ++++---
 .../app/views/diy/components/edit-text.vue    |  306 +-
 .../app/views/diy/components/edit-theme.vue   |  430 +--
 .../app/views/diy/components/theme-list.vue   |  295 +-
 admin/src/app/views/diy/edit.vue              | 1599 ++++-----
 admin/src/app/views/diy/index.vue             |  594 ++--
 admin/src/app/views/diy/list.vue              |  708 ++--
 admin/src/app/views/diy/member.vue            |  663 ++--
 admin/src/app/views/diy/route.vue             |  543 ++-
 admin/src/app/views/diy/tabbar.vue            |  187 +-
 admin/src/app/views/diy/tabbar_edit.vue       |  496 ++-
 admin/src/app/views/diy/theme_style.vue       |  142 +-
 .../diy_form/components/detail-form-image.vue |   43 +-
 .../components/detail-form-render.vue         |   22 +-
 .../diy_form/components/edit-form-address.vue |  112 +-
 .../components/edit-form-checkbox.vue         |  339 +-
 .../components/edit-form-date-scope.vue       |  391 +--
 .../diy_form/components/edit-form-date.vue    |  189 +-
 .../diy_form/components/edit-form-email.vue   |   61 +-
 .../diy_form/components/edit-form-file.vue    |   55 +-
 .../components/edit-form-identity.vue         |  131 +-
 .../diy_form/components/edit-form-image.vue   |  125 +-
 .../diy_form/components/edit-form-input.vue   |  165 +-
 .../components/edit-form-location.vue         |  101 +-
 .../diy_form/components/edit-form-mobile.vue  |  131 +-
 .../diy_form/components/edit-form-number.vue  |  205 +-
 .../diy_form/components/edit-form-radio.vue   |  343 +-
 .../diy_form/components/edit-form-submit.vue  |  218 +-
 .../diy_form/components/edit-form-table.vue   |   47 +-
 .../components/edit-form-textarea.vue         |  105 +-
 .../components/edit-form-time-scope.vue       |  370 +-
 .../diy_form/components/edit-form-time.vue    |  142 +-
 .../diy_form/components/edit-form-video.vue   |   49 +-
 .../components/edit-form-wechat-name.vue      |   61 +-
 .../diy_form/components/form-spread-popup.vue |  212 +-
 .../diy_form/components/form-submit-popup.vue |  858 ++---
 .../diy_form/components/form-write-popup.vue  |  686 ++--
 admin/src/app/views/diy_form/edit.vue         | 2050 +++++------
 admin/src/app/views/diy_form/list.vue         |  987 +++---
 admin/src/app/views/diy_form/records.vue      |  542 +--
 admin/src/app/views/error/404.vue             |   85 +-
 admin/src/app/views/finance/account.vue       |  516 ++-
 admin/src/app/views/finance/cash_out.vue      | 1672 ++++-----
 .../finance/components/refund-detail.vue      |  272 +-
 admin/src/app/views/finance/offlinepay.vue    |  325 +-
 admin/src/app/views/finance/pay_detail.vue    |  197 +-
 admin/src/app/views/finance/pay_refund.vue    |  207 +-
 admin/src/app/views/finance/refund_detail.vue |  260 +-
 .../components/Jump-lesson-library-edit.vue   |  229 ++
 .../basketball-course-teaching-edit.vue       |  223 ++
 .../components/en-course-teaching-edit.vue    |  223 ++
 .../lesson-course-teaching-edit.vue           |  224 ++
 .../components/ninja-teaching-edit.vue        |  223 ++
 .../components/physical-teaching-edit.vue     |  223 ++
 .../components/security-teaching-edit.vue     |  223 ++
 .../strengthen-course-teaching-edit.vue       |  222 ++
 .../app/views/future_ontent/future_ontent.vue |  567 +++
 admin/src/app/views/index/app_manage.vue      |  228 +-
 admin/src/app/views/index/edit_personal.vue   |  143 +-
 admin/src/app/views/index/personal.vue        |  139 +-
 admin/src/app/views/index/preview.vue         |  350 +-
 admin/src/app/views/index/store.vue           | 1879 ++++------
 .../components/Jump-lesson-library-edit.vue   |  228 ++
 .../basketball-course-teaching-edit.vue       |  223 ++
 .../components/en-course-teaching-edit.vue    |  222 ++
 .../lesson-course-teaching-edit.vue           |  224 ++
 .../components/ninja-teaching-edit.vue        |  223 ++
 .../components/physical-teaching-edit.vue     |  223 ++
 .../components/security-teaching-edit.vue     |  223 ++
 .../strengthen-course-teaching-edit.vue       |  222 ++
 .../instructional_material.vue                |  713 ++++
 .../components/Jump-lesson-library-edit.vue   |  227 ++
 .../basketball-course-teaching-edit.vue       |  223 ++
 .../components/en-course-teaching-edit.vue    |  222 ++
 .../lesson-course-teaching-edit.vue           |  223 ++
 .../components/ninja-teaching-edit.vue        |  223 ++
 .../components/physical-teaching-edit.vue     |  223 ++
 .../components/security-teaching-edit.vue     |  223 ++
 .../strengthen-course-teaching-edit.vue       |  222 ++
 .../lesson_course_teaching.vue                | 1341 ++++++++
 admin/src/app/views/login/index.vue           |  195 +-
 .../marketing/components/sign-continue.vue    |  234 +-
 .../views/marketing/components/sign-day.vue   |   80 +-
 .../marketing/components/verify-detail.vue    |  280 +-
 admin/src/app/views/marketing/sign_config.vue |  654 ++--
 admin/src/app/views/marketing/sign_list.vue   |  273 +-
 admin/src/app/views/marketing/verifier.vue    |  377 +-
 admin/src/app/views/marketing/verify.vue      |  296 +-
 .../src/app/views/marketing/verify_detail.vue |  235 +-
 admin/src/app/views/member/balance.vue        |  516 ++-
 admin/src/app/views/member/commission.vue     |  458 +--
 .../views/member/components/add-member.vue    |  289 +-
 .../member/components/benefits-discount.vue   |  148 +-
 .../views/member/components/detail-member.vue |  750 ++--
 .../views/member/components/edit-label.vue    |  202 +-
 .../views/member/components/edit-member.vue   |  324 +-
 .../views/member/components/gift-balance.vue  |  135 +-
 .../views/member/components/gift-point.vue    |  133 +-
 .../components/growth-rule-register.vue       |  137 +-
 .../member/components/member-balance-edit.vue |  223 +-
 .../member/components/member-balance-info.vue |  168 +-
 .../member/components/member-benefits.vue     |   79 +-
 .../components/member-commission-info.vue     |  168 +-
 .../views/member/components/member-gift.vue   |   79 +-
 .../member/components/member-money-info.vue   |  154 +-
 .../member/components/member-point-edit.vue   |  223 +-
 .../member/components/member-point-info.vue   |  170 +-
 .../member/components/point-rule-register.vue |  137 +-
 admin/src/app/views/member/growth.vue         |  304 +-
 admin/src/app/views/member/label.vue          |  230 +-
 admin/src/app/views/member/level.vue          |  267 +-
 admin/src/app/views/member/level_edit.vue     |  263 +-
 admin/src/app/views/member/member.vue         |  535 +--
 admin/src/app/views/member/member_detail.vue  |  754 ++--
 admin/src/app/views/member/point.vue          |  391 +--
 .../components/Jump-lesson-library-edit.vue   |  229 ++
 .../basketball-course-teaching-edit.vue       |  224 ++
 .../components/en-course-teaching-edit.vue    |  223 ++
 .../lesson-course-teaching-edit.vue           |  224 ++
 .../components/ninja-teaching-edit.vue        |  224 ++
 .../components/physical-teaching-edit.vue     |  223 ++
 .../components/security-teaching-edit.vue     |  224 ++
 .../strengthen-course-teaching-edit.vue       |  223 ++
 .../physical_testing/physical_testing.vue     |  724 ++++
 .../app/views/poster/components/edit-draw.vue |   13 +-
 .../components/edit-friendspay-message.vue    |   13 +-
 .../components/edit-friendspay-money.vue      |   13 +-
 .../views/poster/components/edit-headimg.vue  |   54 +-
 .../views/poster/components/edit-image.vue    |   59 +-
 .../views/poster/components/edit-nickname.vue |   21 +-
 .../app/views/poster/components/edit-page.vue |   79 +-
 .../views/poster/components/edit-qrcode.vue   |   13 +-
 .../app/views/poster/components/edit-text.vue |   50 +-
 .../views/poster/components/preview-draw.vue  |   35 +-
 .../components/preview-friendspay-message.vue |   62 +-
 .../components/preview-friendspay-money.vue   |   62 +-
 .../poster/components/preview-headimg.vue     |   38 +-
 .../views/poster/components/preview-image.vue |   35 +-
 .../poster/components/preview-nickname.vue    |   62 +-
 .../poster/components/preview-qrcode.vue      |   32 +-
 .../views/poster/components/preview-text.vue  |   62 +-
 admin/src/app/views/poster/edit.vue           | 1360 ++++----
 admin/src/app/views/poster/list.vue           |  552 ++-
 admin/src/app/views/printer/edit.vue          |  796 ++---
 admin/src/app/views/printer/list.vue          |  398 +--
 admin/src/app/views/printer/template_edit.vue |  759 ++---
 admin/src/app/views/printer/template_list.vue |  282 +-
 .../components/Jump-lesson-library-edit.vue   |  229 ++
 .../basketball-course-teaching-edit.vue       |  224 ++
 .../components/en-course-teaching-edit.vue    |  223 ++
 .../lesson-course-teaching-edit.vue           |  224 ++
 .../components/ninja-teaching-edit.vue        |  224 ++
 .../components/physical-teaching-edit.vue     |  223 ++
 .../components/security-teaching-edit.vue     |  224 ++
 .../strengthen-course-teaching-edit.vue       |  223 ++
 .../professional_skills.vue                   | 1200 +++++++
 admin/src/app/views/setting/adminlogin.vue    |   88 +-
 admin/src/app/views/setting/agreement.vue     |  118 +-
 .../src/app/views/setting/agreement_edit.vue  |  171 +-
 admin/src/app/views/setting/cash_out.vue      |  256 +-
 .../views/setting/components/cron-info.vue    |  170 +-
 .../components/notice-records-info.vue        |  124 +-
 .../views/setting/components/notice-sms.vue   |  178 +-
 .../views/setting/components/notice-weapp.vue |  167 +-
 .../setting/components/notice-wechat.vue      |  205 +-
 .../views/setting/components/pay-alipay.vue   |  270 +-
 .../setting/components/pay-friendspay.vue     |  385 +--
 .../setting/components/pay-offlinepay.vue     |  190 +-
 .../setting/components/pay-wechatpay.vue      |  414 +--
 .../app/views/setting/components/sms-ali.vue  |  190 +-
 .../setting/components/sms-records-info.vue   |  110 +-
 .../views/setting/components/sms-tencent.vue  |  222 +-
 .../views/setting/components/storage-ali.vue  |  240 +-
 .../setting/components/storage-local.vue      |  115 +-
 .../setting/components/storage-qiniu.vue      |  223 +-
 .../setting/components/storage-tencent.vue    |  242 +-
 admin/src/app/views/setting/copyright.vue     |  195 +-
 admin/src/app/views/setting/cron.vue          |  246 +-
 .../src/app/views/setting/developer_token.vue |   83 +-
 admin/src/app/views/setting/export.vue        |  342 +-
 admin/src/app/views/setting/growth_rule.vue   |  157 +-
 admin/src/app/views/setting/login.vue         |  251 +-
 admin/src/app/views/setting/map.vue           |  171 +-
 admin/src/app/views/setting/member.vue        |  171 +-
 admin/src/app/views/setting/notice.vue        |  348 +-
 .../src/app/views/setting/notice_records.vue  |  343 +-
 admin/src/app/views/setting/pay.vue           |  329 +-
 admin/src/app/views/setting/point_rule.vue    |  221 +-
 admin/src/app/views/setting/sms.vue           |  120 +-
 admin/src/app/views/setting/sms_records.vue   |  319 +-
 admin/src/app/views/setting/storage.vue       |  124 +-
 admin/src/app/views/setting/system.vue        |  288 +-
 admin/src/app/views/setting/transfer.vue      |  267 +-
 admin/src/app/views/setting/weapp.vue         |  329 +-
 admin/src/app/views/tools/addon/edit.vue      |  443 +--
 admin/src/app/views/tools/addon/index.vue     |  482 +--
 admin/src/app/views/tools/attachment.vue      |   99 +-
 .../views/tools/code/components/add-table.vue |  126 +-
 .../tools/code/components/edit-associated.vue |  273 +-
 .../tools/code/components/edit-verify.vue     |  242 +-
 .../tools/code/components/edit-view-type.vue  |  410 +--
 admin/src/app/views/tools/code/edit.vue       | 1231 +++----
 admin/src/app/views/tools/code/index.vue      |  695 ++--
 admin/src/app/views/tools/detection.vue       |  188 +-
 admin/src/app/views/tools/schedule.vue        |  636 ++--
 admin/src/app/views/tools/schedule_log.vue    |  606 ++--
 admin/src/app/views/tools/updatecache.vue     |   83 +-
 admin/src/app/views/web/adv.vue               |  254 +-
 admin/src/app/views/web/adv_position.vue      |   75 +-
 .../src/app/views/web/components/adv-edit.vue |  220 +-
 .../web/components/friendly-link-edit.vue     |  234 +-
 .../src/app/views/web/components/nav-edit.vue |  233 +-
 admin/src/app/views/web/friendly_link.vue     |  283 +-
 admin/src/app/views/web/nav.vue               |  304 +-
 admin/src/components/diy-link/index.vue       |  543 ++-
 admin/src/components/editor/index.vue         |  108 +-
 admin/src/components/export-sure/index.vue    |  108 +-
 admin/src/components/heat-map/index.vue       | 1154 +++----
 admin/src/components/icon/index.vue           |   61 +-
 admin/src/components/popover-input/index.vue  |   98 +-
 admin/src/components/range-input/index.vue    |   56 +-
 admin/src/components/select-area/index.vue    |  210 +-
 admin/src/components/select-icon/index.vue    |  245 +-
 .../upload-attachment/attachment.vue          | 1159 +++----
 .../components/upload-attachment/index.vue    |  105 +-
 admin/src/components/upload-file/index.vue    |   67 +-
 admin/src/components/upload-image/index.vue   |  348 +-
 admin/src/components/upload-video/index.vue   |  280 +-
 admin/src/components/verifition/Verify.vue    |  883 +++--
 .../verifition/Verify/VerifyPoints.vue        |  536 ++-
 .../verifition/Verify/VerifySlide.vue         |  808 ++---
 admin/src/components/verifition/api/index.js  |   28 +-
 admin/src/components/verifition/utils/ase.js  |   13 +-
 .../src/components/verifition/utils/axios.js  |   17 +-
 admin/src/components/verifition/utils/util.js |  126 +-
 admin/src/components/video-player/index.vue   |    2 +-
 admin/src/components/web-link/web-link.vue    |  334 +-
 admin/src/lang/en/common.json                 |   74 +-
 admin/src/lang/i18n.ts                        |   42 +-
 admin/src/lang/index.ts                       |   27 +-
 admin/src/lang/language.ts                    |  107 +-
 admin/src/lang/zh-cn/common.json              |    2 +-
 admin/src/layout/decorate/index.vue           |    9 +-
 .../layout/default/components/aside/index.vue |   78 +-
 .../default/components/aside/menu-item.vue    |  181 +-
 .../layout/default/components/aside/side.vue  |  150 +-
 .../default/components/header/index.vue       |  247 +-
 .../components/header/layout-setting.vue      |  130 +-
 .../default/components/header/switch-lang.vue |   36 +-
 .../default/components/header/user-info.vue   |  255 +-
 admin/src/layout/default/components/tabs.vue  |  164 +-
 admin/src/layout/default/index.vue            |   55 +-
 admin/src/layout/index.vue                    |   21 +-
 .../layout/major/components/aside/index.vue   |   60 +-
 .../major/components/aside/menu-item.vue      |  119 +-
 .../layout/major/components/aside/side.vue    |  414 +--
 .../layout/major/components/header/index.vue  |  225 +-
 .../components/header/layout-setting.vue      |  130 +-
 .../major/components/header/switch-lang.vue   |   36 +-
 .../major/components/header/user-info.vue     |  248 +-
 admin/src/layout/major/components/tabs.vue    |  165 +-
 admin/src/layout/major/index.vue              |   48 +-
 admin/src/main.ts                             |   20 +-
 admin/src/router/index.ts                     |  189 +-
 admin/src/router/routers.ts                   |  196 +-
 admin/src/stores/index.ts                     |    2 +-
 admin/src/stores/modules/app.ts               |   40 +-
 admin/src/stores/modules/diy.ts               | 1010 +++---
 admin/src/stores/modules/poster.ts            | 1564 +++++----
 admin/src/stores/modules/style.ts             |   26 +-
 admin/src/stores/modules/system.ts            |   88 +-
 admin/src/stores/modules/tabbar.ts            |   80 +-
 admin/src/stores/modules/user.ts              |  140 +-
 admin/src/styles/icon/official-iconfont.json  |    2 +-
 admin/src/types/global.d.ts                   |   22 +-
 admin/src/utils/common.ts                     |  465 ++-
 admin/src/utils/lodop.ts                      |  414 +--
 admin/src/utils/qqmap.ts                      |  269 +-
 admin/src/utils/request.ts                    |  375 +-
 admin/src/utils/storage.ts                    |   97 +-
 admin/src/utils/test.ts                       |  483 ++-
 admin/vite.config.ts                          |    1 -
 683 files changed, 84355 insertions(+), 96673 deletions(-)
 create mode 100644 admin/.env.development
 create mode 100644 admin/.env.production
 create mode 100644 admin/src/app/api/future_ontent.ts
 create mode 100644 admin/src/app/api/instructional_material.ts
 create mode 100644 admin/src/app/api/lesson_course_teaching.ts
 create mode 100644 admin/src/app/lang/zh-cn/children_like.children_like.json
 create mode 100644 admin/src/app/lang/zh-cn/future_ontent.future_ontent.json
 create mode 100644 admin/src/app/lang/zh-cn/instructional_material.instructional_material.json
 create mode 100644 admin/src/app/lang/zh-cn/lesson_course_teaching.lesson_course_teaching.json
 create mode 100644 admin/src/app/lang/zh-cn/physical_testing.physical_testing.json
 create mode 100644 admin/src/app/lang/zh-cn/professional_skills.professional_skills.json
 create mode 100644 admin/src/app/views/children_like/children_like.vue
 create mode 100644 admin/src/app/views/children_like/components/Jump-lesson-library-edit.vue
 create mode 100644 admin/src/app/views/children_like/components/basketball-course-teaching-edit.vue
 create mode 100644 admin/src/app/views/children_like/components/en-course-teaching-edit.vue
 create mode 100644 admin/src/app/views/children_like/components/lesson-course-teaching-edit.vue
 create mode 100644 admin/src/app/views/children_like/components/ninja-teaching-edit.vue
 create mode 100644 admin/src/app/views/children_like/components/physical-teaching-edit.vue
 create mode 100644 admin/src/app/views/children_like/components/security-teaching-edit.vue
 create mode 100644 admin/src/app/views/children_like/components/strengthen-course-teaching-edit.vue
 create mode 100644 admin/src/app/views/future_ontent/components/Jump-lesson-library-edit.vue
 create mode 100644 admin/src/app/views/future_ontent/components/basketball-course-teaching-edit.vue
 create mode 100644 admin/src/app/views/future_ontent/components/en-course-teaching-edit.vue
 create mode 100644 admin/src/app/views/future_ontent/components/lesson-course-teaching-edit.vue
 create mode 100644 admin/src/app/views/future_ontent/components/ninja-teaching-edit.vue
 create mode 100644 admin/src/app/views/future_ontent/components/physical-teaching-edit.vue
 create mode 100644 admin/src/app/views/future_ontent/components/security-teaching-edit.vue
 create mode 100644 admin/src/app/views/future_ontent/components/strengthen-course-teaching-edit.vue
 create mode 100644 admin/src/app/views/future_ontent/future_ontent.vue
 create mode 100644 admin/src/app/views/instructional_material/components/Jump-lesson-library-edit.vue
 create mode 100644 admin/src/app/views/instructional_material/components/basketball-course-teaching-edit.vue
 create mode 100644 admin/src/app/views/instructional_material/components/en-course-teaching-edit.vue
 create mode 100644 admin/src/app/views/instructional_material/components/lesson-course-teaching-edit.vue
 create mode 100644 admin/src/app/views/instructional_material/components/ninja-teaching-edit.vue
 create mode 100644 admin/src/app/views/instructional_material/components/physical-teaching-edit.vue
 create mode 100644 admin/src/app/views/instructional_material/components/security-teaching-edit.vue
 create mode 100644 admin/src/app/views/instructional_material/components/strengthen-course-teaching-edit.vue
 create mode 100644 admin/src/app/views/instructional_material/instructional_material.vue
 create mode 100644 admin/src/app/views/lesson_course_teaching/components/Jump-lesson-library-edit.vue
 create mode 100644 admin/src/app/views/lesson_course_teaching/components/basketball-course-teaching-edit.vue
 create mode 100644 admin/src/app/views/lesson_course_teaching/components/en-course-teaching-edit.vue
 create mode 100644 admin/src/app/views/lesson_course_teaching/components/lesson-course-teaching-edit.vue
 create mode 100644 admin/src/app/views/lesson_course_teaching/components/ninja-teaching-edit.vue
 create mode 100644 admin/src/app/views/lesson_course_teaching/components/physical-teaching-edit.vue
 create mode 100644 admin/src/app/views/lesson_course_teaching/components/security-teaching-edit.vue
 create mode 100644 admin/src/app/views/lesson_course_teaching/components/strengthen-course-teaching-edit.vue
 create mode 100644 admin/src/app/views/lesson_course_teaching/lesson_course_teaching.vue
 create mode 100644 admin/src/app/views/physical_testing/components/Jump-lesson-library-edit.vue
 create mode 100644 admin/src/app/views/physical_testing/components/basketball-course-teaching-edit.vue
 create mode 100644 admin/src/app/views/physical_testing/components/en-course-teaching-edit.vue
 create mode 100644 admin/src/app/views/physical_testing/components/lesson-course-teaching-edit.vue
 create mode 100644 admin/src/app/views/physical_testing/components/ninja-teaching-edit.vue
 create mode 100644 admin/src/app/views/physical_testing/components/physical-teaching-edit.vue
 create mode 100644 admin/src/app/views/physical_testing/components/security-teaching-edit.vue
 create mode 100644 admin/src/app/views/physical_testing/components/strengthen-course-teaching-edit.vue
 create mode 100644 admin/src/app/views/physical_testing/physical_testing.vue
 create mode 100644 admin/src/app/views/professional_skills/components/Jump-lesson-library-edit.vue
 create mode 100644 admin/src/app/views/professional_skills/components/basketball-course-teaching-edit.vue
 create mode 100644 admin/src/app/views/professional_skills/components/en-course-teaching-edit.vue
 create mode 100644 admin/src/app/views/professional_skills/components/lesson-course-teaching-edit.vue
 create mode 100644 admin/src/app/views/professional_skills/components/ninja-teaching-edit.vue
 create mode 100644 admin/src/app/views/professional_skills/components/physical-teaching-edit.vue
 create mode 100644 admin/src/app/views/professional_skills/components/security-teaching-edit.vue
 create mode 100644 admin/src/app/views/professional_skills/components/strengthen-course-teaching-edit.vue
 create mode 100644 admin/src/app/views/professional_skills/professional_skills.vue

diff --git a/admin/.env.development b/admin/.env.development
new file mode 100644
index 00000000..3eb397bf
--- /dev/null
+++ b/admin/.env.development
@@ -0,0 +1,8 @@
+# api请求地址
+VITE_APP_BASE_URL='http://146.56.228.75:20024/adminapi/'
+
+# 图片服务器地址
+VITE_IMG_DOMAIN=''
+
+# 请求时header中token的参数名
+VITE_REQUEST_HEADER_TOKEN_KEY='token'
diff --git a/admin/.env.production b/admin/.env.production
new file mode 100644
index 00000000..3eb397bf
--- /dev/null
+++ b/admin/.env.production
@@ -0,0 +1,8 @@
+# api请求地址
+VITE_APP_BASE_URL='http://146.56.228.75:20024/adminapi/'
+
+# 图片服务器地址
+VITE_IMG_DOMAIN=''
+
+# 请求时header中token的参数名
+VITE_REQUEST_HEADER_TOKEN_KEY='token'
diff --git a/admin/.gitignore b/admin/.gitignore
index 812d3c12..a547bf36 100644
--- a/admin/.gitignore
+++ b/admin/.gitignore
@@ -22,6 +22,3 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
-
-.env.development
-.env.production
diff --git a/admin/components.d.ts b/admin/components.d.ts
index 6fdfa48f..d3104f82 100644
--- a/admin/components.d.ts
+++ b/admin/components.d.ts
@@ -17,13 +17,20 @@ declare module '@vue/runtime-core' {
     ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
     ElButton: typeof import('element-plus/es')['ElButton']
     ElCard: typeof import('element-plus/es')['ElCard']
+    ElCarousel: typeof import('element-plus/es')['ElCarousel']
+    ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
+    ElCascader: typeof import('element-plus/es')['ElCascader']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
     ElCol: typeof import('element-plus/es')['ElCol']
+    ElCollapse: typeof import('element-plus/es')['ElCollapse']
+    ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem']
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     ElContainer: typeof import('element-plus/es')['ElContainer']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
+    ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
+    ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElDrawer: typeof import('element-plus/es')['ElDrawer']
     ElDropdown: typeof import('element-plus/es')['ElDropdown']
@@ -47,12 +54,17 @@ declare module '@vue/runtime-core' {
     ElPageHeader: typeof import('element-plus/es')['ElPageHeader']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElPopover: typeof import('element-plus/es')['ElPopover']
+    ElProgress: typeof import('element-plus/es')['ElProgress']
     ElRadio: typeof import('element-plus/es')['ElRadio']
+    ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
+    ElRate: typeof import('element-plus/es')['ElRate']
     ElResult: typeof import('element-plus/es')['ElResult']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
+    ElSlider: typeof import('element-plus/es')['ElSlider']
+    ElStatistic: typeof import('element-plus/es')['ElStatistic']
     ElStep: typeof import('element-plus/es')['ElStep']
     ElSteps: typeof import('element-plus/es')['ElSteps']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
@@ -62,6 +74,9 @@ declare module '@vue/runtime-core' {
     ElTabPane: typeof import('element-plus/es')['ElTabPane']
     ElTabs: typeof import('element-plus/es')['ElTabs']
     ElTag: typeof import('element-plus/es')['ElTag']
+    ElTimeline: typeof import('element-plus/es')['ElTimeline']
+    ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
+    ElTimePicker: typeof import('element-plus/es')['ElTimePicker']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
     ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
@@ -75,7 +90,6 @@ declare module '@vue/runtime-core' {
     RouterView: typeof import('vue-router')['RouterView']
     SelectArea: typeof import('./src/components/select-area/index.vue')['default']
     SelectIcon: typeof import('./src/components/select-icon/index.vue')['default']
-    TencentMapPicker: typeof import('./src/components/TencentMapPicker.vue')['default']
     UploadAttachment: typeof import('./src/components/upload-attachment/index.vue')['default']
     UploadFile: typeof import('./src/components/upload-file/index.vue')['default']
     UploadImage: typeof import('./src/components/upload-image/index.vue')['default']
diff --git a/admin/package.json b/admin/package.json
index 7b46e528..a113a30d 100644
--- a/admin/package.json
+++ b/admin/package.json
@@ -6,10 +6,7 @@
     "scripts": {
         "dev": "vite",
         "build": "vite build && node publish.cjs",
-        "preview": "vite preview",
-        "lint": "eslint .",
-        "lint:fix": "eslint . --ext .ts --ext .vue --ext .js --fix",
-        "format": "prettier --write src/**/*.{ts,vue,js,json}"
+        "preview": "vite preview"
     },
     "dependencies": {
         "@element-plus/icons-vue": "2.0.10",
@@ -41,25 +38,21 @@
         "@tailwindcss/line-clamp": "0.4.2",
         "@types/qrcode": "1.5.0",
         "@types/sortablejs": "1.15.0",
-        "@typescript-eslint/eslint-plugin": "^8.32.1",
-        "@typescript-eslint/parser": "^8.32.1",
+        "@typescript-eslint/eslint-plugin": "5.53.0",
         "@vitejs/plugin-vue": "4.0.0",
         "autoprefixer": "10.4.13",
-        "eslint": "^9.26.0",
-        "eslint-config-prettier": "^10.1.5",
+        "eslint": "8.34.0",
         "eslint-config-standard-with-typescript": "34.0.0",
         "eslint-plugin-import": "2.27.5",
         "eslint-plugin-n": "15.6.1",
         "eslint-plugin-promise": "6.1.1",
-        "eslint-plugin-vue": "^10.1.0",
+        "eslint-plugin-vue": "9.9.0",
         "postcss": "8.4.21",
-        "prettier": "^3.5.3",
         "tailwindcss": "3.2.4",
         "typescript": "4.9.5",
         "unplugin-auto-import": "0.13.0",
         "unplugin-vue-components": "0.23.0",
         "vite": "4.1.0",
-        "vue-eslint-parser": "^10.1.3",
         "vue-tsc": "1.0.24"
     }
-}
+}
\ No newline at end of file
diff --git a/admin/src/App.vue b/admin/src/App.vue
index 5ecb1cdd..b3376ded 100644
--- a/admin/src/App.vue
+++ b/admin/src/App.vue
@@ -1,7 +1,7 @@
 <template>
-  <el-config-provider :locale="locale">
-    <router-view></router-view>
-  </el-config-provider>
+    <el-config-provider :locale="locale">
+        <router-view></router-view>
+    </el-config-provider>
 </template>
 
 <script lang="ts" setup>
@@ -22,20 +22,16 @@ const locale = computed(() => (systemStore.lang === 'zh-cn' ? zhCn : en))
 
 const toggleDark = useToggle(useDark())
 
-watch(
-  route,
-  () => {
-    useAppStore().$patch((state) => {
-      state.route = route
+watch(route, () => {
+    useAppStore().$patch(state => {
+        state.route = route
     })
-  },
-  { immediate: true }
-)
+}, { immediate: true })
 
 onMounted(() => {
-  // 设置主题色
-  toggleDark(systemStore.dark)
-  setThemeColor(systemStore.theme, systemStore.dark ? 'dark' : 'light')
+    // 设置主题色
+    toggleDark(systemStore.dark)
+    setThemeColor(systemStore.theme, systemStore.dark ? 'dark' : 'light')
 })
 </script>
 
diff --git a/admin/src/addon/shop/api/delivery.ts b/admin/src/addon/shop/api/delivery.ts
index bed958fc..370404aa 100644
--- a/admin/src/addon/shop/api/delivery.ts
+++ b/admin/src/addon/shop/api/delivery.ts
@@ -7,7 +7,7 @@ import request from '@/utils/request'
  * @returns
  */
 export function getCompanyPageList(params: Record<string, any>) {
-  return request.get(`shop/delivery/company`, { params })
+    return request.get(`shop/delivery/company`, { params })
 }
 
 /**
@@ -16,7 +16,7 @@ export function getCompanyPageList(params: Record<string, any>) {
  * @returns
  */
 export function getCompanyList(params: Record<string, any>) {
-  return request.get(`shop/delivery/company/list`, { params })
+    return request.get(`shop/delivery/company/list`, { params })
 }
 
 /**
@@ -25,7 +25,7 @@ export function getCompanyList(params: Record<string, any>) {
  * @returns
  */
 export function getCompanyInfo(company_id: number) {
-  return request.get(`shop/delivery/company/${company_id}`)
+    return request.get(`shop/delivery/company/${ company_id }`);
 }
 
 /**
@@ -34,10 +34,7 @@ export function getCompanyInfo(company_id: number) {
  * @returns
  */
 export function addCompany(params: Record<string, any>) {
-  return request.post('shop/delivery/company', params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.post('shop/delivery/company', params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -46,10 +43,10 @@ export function addCompany(params: Record<string, any>) {
  * @returns
  */
 export function editCompany(params: Record<string, any>) {
-  return request.put(`shop/delivery/company/${params.company_id}`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/delivery/company/${ params.company_id }`, params, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
 }
 
 /**
@@ -58,12 +55,10 @@ export function editCompany(params: Record<string, any>) {
  * @returns
  */
 export function deleteCompany(company_id: number) {
-  return request.delete(`shop/delivery/company/${company_id}`, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.delete(`shop/delivery/company/${ company_id }`, { showErrorMessage: true, showSuccessMessage: true })
 }
 
+
 /*********************************  运费模版  ***************************************/
 /**
  * 获取运费模版分页列表
@@ -71,7 +66,7 @@ export function deleteCompany(company_id: number) {
  * @returns
  */
 export function getShippingTemplatePageList(params: Record<string, any>) {
-  return request.get(`shop/shipping/template`, { params })
+    return request.get(`shop/shipping/template`, { params })
 }
 
 /**
@@ -80,7 +75,7 @@ export function getShippingTemplatePageList(params: Record<string, any>) {
  * @returns
  */
 export function getShippingTemplateList(params: Record<string, any>) {
-  return request.get(`shop/shipping/template/list`, { params })
+    return request.get(`shop/shipping/template/list`, { params })
 }
 
 /**
@@ -89,7 +84,7 @@ export function getShippingTemplateList(params: Record<string, any>) {
  * @returns
  */
 export function getShippingTemplateInfo(template_id: number) {
-  return request.get(`shop/shipping/template/${template_id}`)
+    return request.get(`shop/shipping/template/${ template_id }`);
 }
 
 /**
@@ -98,10 +93,7 @@ export function getShippingTemplateInfo(template_id: number) {
  * @returns
  */
 export function addShippingTemplate(params: Record<string, any>) {
-  return request.post('shop/shipping/template', params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.post('shop/shipping/template', params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -110,10 +102,10 @@ export function addShippingTemplate(params: Record<string, any>) {
  * @returns
  */
 export function editShippingTemplate(params: Record<string, any>) {
-  return request.put(`shop/shipping/template/${params.template_id}`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/shipping/template/${ params.template_id }`, params, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
 }
 
 /**
@@ -122,12 +114,13 @@ export function editShippingTemplate(params: Record<string, any>) {
  * @returns
  */
 export function deleteShippingTemplate(template_id: number) {
-  return request.delete(`shop/shipping/template/${template_id}`, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.delete(`shop/shipping/template/${ template_id }`, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
 }
 
+
 /*********************************  自提门店  ***************************************/
 /**
  * 获取自提门店列表
@@ -135,7 +128,7 @@ export function deleteShippingTemplate(template_id: number) {
  * @returns
  */
 export function getStoreList(params: Record<string, any>) {
-  return request.get(`shop/delivery/store`, { params })
+    return request.get(`shop/delivery/store`, { params })
 }
 
 /**
@@ -144,7 +137,7 @@ export function getStoreList(params: Record<string, any>) {
  * @returns
  */
 export function getStoreInfo(store_id: number) {
-  return request.get(`shop/delivery/store/${store_id}`)
+    return request.get(`shop/delivery/store/${ store_id }`);
 }
 
 /**
@@ -153,10 +146,7 @@ export function getStoreInfo(store_id: number) {
  * @returns
  */
 export function addStore(params: Record<string, any>) {
-  return request.post('shop/delivery/store', params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.post('shop/delivery/store', params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -165,10 +155,10 @@ export function addStore(params: Record<string, any>) {
  * @returns
  */
 export function editStore(params: Record<string, any>) {
-  return request.put(`shop/delivery/store/${params.store_id}`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/delivery/store/${ params.store_id }`, params, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
 }
 
 /**
@@ -177,10 +167,7 @@ export function editStore(params: Record<string, any>) {
  * @returns
  */
 export function deleteStore(store_id: number) {
-  return request.delete(`shop/delivery/store/${store_id}`, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.delete(`shop/delivery/store/${ store_id }`, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /*********************************  物流查询  ***************************************/
@@ -190,10 +177,7 @@ export function deleteStore(store_id: number) {
  * @returns
  */
 export function setDeliverySearch(params: Record<string, any>) {
-  return request.post('shop/delivery/search', params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.post('shop/delivery/search', params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -201,7 +185,7 @@ export function setDeliverySearch(params: Record<string, any>) {
  * @returns
  */
 export function getDeliverySearch() {
-  return request.get('shop/delivery/search')
+    return request.get('shop/delivery/search')
 }
 
 /**
@@ -209,7 +193,7 @@ export function getDeliverySearch() {
  * @returns
  */
 export function getShopDeliveryList() {
-  return request.get('shop/delivery/deliveryList')
+    return request.get('shop/delivery/deliveryList')
 }
 
 /**
@@ -218,7 +202,7 @@ export function getShopDeliveryList() {
  * @returns
  */
 export function setShopDeliveryConfig(params: Record<string, any>) {
-  return request.put(`shop/delivery/setConfig`, params)
+    return request.put(`shop/delivery/setConfig`, params)
 }
 
 /**
@@ -227,7 +211,7 @@ export function setShopDeliveryConfig(params: Record<string, any>) {
  * @returns
  */
 export function getShopDelivery(params: Record<string, any>) {
-  return request.get('shop/delivery/staff', { params })
+    return request.get('shop/delivery/staff', { params })
 }
 
 /**
@@ -236,7 +220,7 @@ export function getShopDelivery(params: Record<string, any>) {
  * @returns
  */
 export function getShopDeliverInfo(staff_id: number) {
-  return request.get(`shop/delivery/staff/${staff_id}`)
+    return request.get(`shop/delivery/staff/${ staff_id }`);
 }
 
 /**
@@ -245,9 +229,7 @@ export function getShopDeliverInfo(staff_id: number) {
  * @returns
  */
 export function addShopDeliver(params: Record<string, any>) {
-  return request.post('shop/delivery/staff', params, {
-    showSuccessMessage: true,
-  })
+    return request.post('shop/delivery/staff', params, { showSuccessMessage: true })
 }
 
 /**
@@ -256,9 +238,7 @@ export function addShopDeliver(params: Record<string, any>) {
  * @returns
  */
 export function editShopDeliver(params: Record<string, any>) {
-  return request.put(`shop/delivery/staff/${params.deliver_id}`, params, {
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/delivery/staff/${ params.deliver_id }`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -267,7 +247,7 @@ export function editShopDeliver(params: Record<string, any>) {
  * @returns
  */
 export function deleteShopDeliver(staff_id: number) {
-  return request.delete(`shop/delivery/staff/${staff_id}`)
+    return request.delete(`shop/delivery/staff/${ staff_id }`)
 }
 
 /**
@@ -275,7 +255,7 @@ export function deleteShopDeliver(staff_id: number) {
  * @returns
  */
 export function getLocal() {
-  return request.get('shop/local')
+    return request.get('shop/local');
 }
 
 /**
@@ -284,5 +264,5 @@ export function getLocal() {
  * @returns
  */
 export function setLocal(params: Record<string, any>) {
-  return request.put('shop/local', params, { showSuccessMessage: true })
-}
+    return request.put('shop/local', params, { showSuccessMessage: true })
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/api/electronic_sheet.ts b/admin/src/addon/shop/api/electronic_sheet.ts
index ec23bc81..7f75c124 100644
--- a/admin/src/addon/shop/api/electronic_sheet.ts
+++ b/admin/src/addon/shop/api/electronic_sheet.ts
@@ -6,7 +6,7 @@ import request from '@/utils/request'
  * @returns
  */
 export function getElectronicSheetPageList(params: Record<string, any>) {
-  return request.get(`shop/electronic_sheet`, { params })
+    return request.get(`shop/electronic_sheet`, { params })
 }
 
 /**
@@ -15,7 +15,7 @@ export function getElectronicSheetPageList(params: Record<string, any>) {
  * @returns
  */
 export function getElectronicSheetList(params: Record<string, any>) {
-  return request.get(`shop/electronic_sheet/list`, { params })
+    return request.get(`shop/electronic_sheet/list`, { params })
 }
 
 /**
@@ -24,7 +24,7 @@ export function getElectronicSheetList(params: Record<string, any>) {
  * @returns
  */
 export function getElectronicSheetInfo(id: number) {
-  return request.get(`shop/electronic_sheet/${id}`)
+    return request.get(`shop/electronic_sheet/${ id }`);
 }
 
 /**
@@ -33,10 +33,10 @@ export function getElectronicSheetInfo(id: number) {
  * @returns
  */
 export function addElectronicSheet(params: Record<string, any>) {
-  return request.post('shop/electronic_sheet', params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.post('shop/electronic_sheet', params, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
 }
 
 /**
@@ -45,10 +45,10 @@ export function addElectronicSheet(params: Record<string, any>) {
  * @returns
  */
 export function editElectronicSheet(params: Record<string, any>) {
-  return request.put(`shop/electronic_sheet/${params.id}`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/electronic_sheet/${ params.id }`, params, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
 }
 
 /**
@@ -57,10 +57,10 @@ export function editElectronicSheet(params: Record<string, any>) {
  * @returns
  */
 export function deleteElectronicSheet(id: number) {
-  return request.delete(`shop/electronic_sheet/${id}`, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.delete(`shop/electronic_sheet/${ id }`, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
 }
 
 /**
@@ -69,10 +69,10 @@ export function deleteElectronicSheet(id: number) {
  * @returns
  */
 export function setDefaultElectronicSheet(params: Record<string, any>) {
-  return request.put(`shop/electronic_sheet/setDefault/${params.id}`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/electronic_sheet/setDefault/${ params.id }`, params, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
 }
 
 /**
@@ -81,10 +81,10 @@ export function setDefaultElectronicSheet(params: Record<string, any>) {
  * @returns
  */
 export function setElectronicSheetConfig(params: Record<string, any>) {
-  return request.post('shop/electronic_sheet/config', params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.post('shop/electronic_sheet/config', params, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
 }
 
 /**
@@ -92,7 +92,7 @@ export function setElectronicSheetConfig(params: Record<string, any>) {
  * @returns
  */
 export function getElectronicSheetConfig() {
-  return request.get(`shop/electronic_sheet/config`)
+    return request.get(`shop/electronic_sheet/config`)
 }
 
 /**
@@ -100,7 +100,7 @@ export function getElectronicSheetConfig() {
  * @returns
  */
 export function getElectronicSheetPayType() {
-  return request.get(`shop/electronic_sheet/paytype`)
+    return request.get(`shop/electronic_sheet/paytype`)
 }
 
 /**
@@ -109,8 +109,8 @@ export function getElectronicSheetPayType() {
  * @returns
  */
 export function printElectronicSheet(params: Record<string, any>) {
-  return request.post('shop/electronic_sheet/print', params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
-}
+    return request.post('shop/electronic_sheet/print', params, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/api/goods.ts b/admin/src/addon/shop/api/goods.ts
index c9a0f091..ff78ff46 100644
--- a/admin/src/addon/shop/api/goods.ts
+++ b/admin/src/addon/shop/api/goods.ts
@@ -6,7 +6,7 @@ import request from '@/utils/request'
  * @returns
  */
 export function getGoodsPageList(params: Record<string, any>) {
-  return request.get(`shop/goods`, { params })
+    return request.get(`shop/goods`, { params })
 }
 
 /**
@@ -15,7 +15,7 @@ export function getGoodsPageList(params: Record<string, any>) {
  * @returns
  */
 export function getGoodsInfo(goods_id: number) {
-  return request.get(`shop/goods/${goods_id}`)
+    return request.get(`shop/goods/${ goods_id }`);
 }
 
 /**
@@ -24,10 +24,7 @@ export function getGoodsInfo(goods_id: number) {
  * @returns
  */
 export function addGoods(params: Record<string, any>) {
-  return request.post('shop/goods', params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.post('shop/goods', params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -35,10 +32,7 @@ export function addGoods(params: Record<string, any>) {
  * @param params
  */
 export function editGoods(params: Record<string, any>) {
-  return request.put(`shop/goods/${params.goods_id}`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/goods/${ params.goods_id }`, params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -46,7 +40,7 @@ export function editGoods(params: Record<string, any>) {
  * @param params
  */
 export function getGoodsInit(params: Record<string, any>) {
-  return request.get(`shop/goods/init`, { params })
+    return request.get(`shop/goods/init`, { params });
 }
 
 /**
@@ -55,10 +49,7 @@ export function getGoodsInit(params: Record<string, any>) {
  * @returns
  */
 export function addVirtualGoods(params: Record<string, any>) {
-  return request.post('shop/goods/virtual', params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.post('shop/goods/virtual', params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -66,10 +57,10 @@ export function addVirtualGoods(params: Record<string, any>) {
  * @param params
  */
 export function editVirtualGoods(params: Record<string, any>) {
-  return request.put(`shop/goods/virtual/${params.goods_id}`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/goods/virtual/${ params.goods_id }`, params, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
 }
 
 /**
@@ -77,7 +68,7 @@ export function editVirtualGoods(params: Record<string, any>) {
  * @param params
  */
 export function getVirtualGoodsInit(params: Record<string, any>) {
-  return request.get(`shop/goods/virtual/init`, { params })
+    return request.get(`shop/goods/virtual/init`, { params });
 }
 
 /**
@@ -86,10 +77,7 @@ export function getVirtualGoodsInit(params: Record<string, any>) {
  * @returns
  */
 export function deleteGoods(params: Record<string, any>) {
-  return request.put(`shop/goods/delete`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/goods/delete`, params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -98,7 +86,7 @@ export function deleteGoods(params: Record<string, any>) {
  * @returns
  */
 export function getRecycleGoodsPageList(params: Record<string, any>) {
-  return request.get(`shop/goods/recycle`, { params })
+    return request.get(`shop/goods/recycle`, { params })
 }
 
 /**
@@ -107,10 +95,7 @@ export function getRecycleGoodsPageList(params: Record<string, any>) {
  * @returns
  */
 export function recycleGoods(params: Record<string, any>) {
-  return request.put(`shop/goods/recycle`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/goods/recycle`, params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -118,7 +103,7 @@ export function recycleGoods(params: Record<string, any>) {
  * @param params
  */
 export function editGoodsSort(params: Record<string, any>) {
-  return request.put(`shop/goods/sort`, params, { showSuccessMessage: true })
+    return request.put(`shop/goods/sort`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -126,7 +111,7 @@ export function editGoodsSort(params: Record<string, any>) {
  * @param params
  */
 export function editGoodsStatus(params: Record<string, any>) {
-  return request.put(`shop/goods/status`, params, { showSuccessMessage: true })
+    return request.put(`shop/goods/status`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -134,9 +119,7 @@ export function editGoodsStatus(params: Record<string, any>) {
  * @param params
  */
 export function copyGoods(params: Record<string, any>) {
-  return request.put(`shop/goods/copy/${params.goods_id}`, params, {
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/goods/copy/${ params.goods_id }`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -145,7 +128,7 @@ export function copyGoods(params: Record<string, any>) {
  * @returns
  */
 export function getGoodsSelectPageList(params: Record<string, any>) {
-  return request.get(`shop/goods/select`, { params })
+    return request.get(`shop/goods/select`, { params })
 }
 
 /**
@@ -154,7 +137,7 @@ export function getGoodsSelectPageList(params: Record<string, any>) {
  * @returns
  */
 export function getGoodsSkuList(params: Record<string, any>) {
-  return request.get(`shop/goods/sku`, { params })
+    return request.get(`shop/goods/sku`, { params })
 }
 
 /**
@@ -163,7 +146,7 @@ export function getGoodsSkuList(params: Record<string, any>) {
  * @returns
  */
 export function getGoodsSkuNoPageList(params: Record<string, any>) {
-  return request.get(`shop/goods/selectgoodssku`, { params })
+    return request.get(`shop/goods/selectgoodssku`, { params })
 }
 
 /** 查询商品参与营销活动的数量
@@ -171,7 +154,7 @@ export function getGoodsSkuNoPageList(params: Record<string, any>) {
  * @returns
  */
 export function getActiveGoodsCount(params: Record<string, any>) {
-  return request.get(`shop/goods/active/count`, { params })
+    return request.get(`shop/goods/active/count`, { params })
 }
 
 /**
@@ -180,9 +163,7 @@ export function getActiveGoodsCount(params: Record<string, any>) {
  * @returns
  */
 export function editGoodsListStock(params: Record<string, any>) {
-  return request.put(`shop/goods/sku/stock`, params, {
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/goods/sku/stock`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -191,9 +172,7 @@ export function editGoodsListStock(params: Record<string, any>) {
  * @returns
  */
 export function editGoodsListPrice(params: Record<string, any>) {
-  return request.put(`shop/goods/sku/price`, params, {
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/goods/sku/price`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -202,9 +181,7 @@ export function editGoodsListPrice(params: Record<string, any>) {
  * @returns
  */
 export function editGoodsListMemberPrice(params: Record<string, any>) {
-  return request.put(`shop/goods/sku/member_price`, params, {
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/goods/sku/member_price`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -212,7 +189,7 @@ export function editGoodsListMemberPrice(params: Record<string, any>) {
  * @returns
  */
 export function getGoodsType() {
-  return request.get(`shop/goods/type`)
+    return request.get(`shop/goods/type`);
 }
 
 /**
@@ -221,7 +198,7 @@ export function getGoodsType() {
  * @returns
  */
 export function getLabelPageList(params: Record<string, any>) {
-  return request.get(`shop/goods/label`, { params })
+    return request.get(`shop/goods/label`, { params })
 }
 
 /**
@@ -230,7 +207,7 @@ export function getLabelPageList(params: Record<string, any>) {
  * @returns
  */
 export function getLabelList(params: Record<string, any>) {
-  return request.get(`shop/goods/label/list`, { params })
+    return request.get(`shop/goods/label/list`, { params })
 }
 
 /**
@@ -239,7 +216,7 @@ export function getLabelList(params: Record<string, any>) {
  * @returns
  */
 export function getLabelInfo(label_id: number) {
-  return request.get(`shop/goods/label/${label_id}`)
+    return request.get(`shop/goods/label/${ label_id }`);
 }
 
 /**
@@ -248,10 +225,7 @@ export function getLabelInfo(label_id: number) {
  * @returns
  */
 export function addLabel(params: Record<string, any>) {
-  return request.post('shop/goods/label', params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.post('shop/goods/label', params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -260,10 +234,10 @@ export function addLabel(params: Record<string, any>) {
  * @returns
  */
 export function editLabel(params: Record<string, any>) {
-  return request.put(`shop/goods/label/${params.label_id}`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/goods/label/${ params.label_id }`, params, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
 }
 
 /**
@@ -271,9 +245,7 @@ export function editLabel(params: Record<string, any>) {
  * @param params
  */
 export function modifyLabelStatus(params: Record<string, any>) {
-  return request.put(`shop/goods/label/status`, params, {
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/goods/label/status`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -282,10 +254,7 @@ export function modifyLabelStatus(params: Record<string, any>) {
  * @returns
  */
 export function deleteLabel(label_id: number) {
-  return request.delete(`shop/goods/label/${label_id}`, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.delete(`shop/goods/label/${ label_id }`, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -293,9 +262,7 @@ export function deleteLabel(label_id: number) {
  * @param params
  */
 export function modifyLabelSort(params: Record<string, any>) {
-  return request.put(`shop/goods/label/sort`, params, {
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/goods/label/sort`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -304,7 +271,7 @@ export function modifyLabelSort(params: Record<string, any>) {
  * @returns
  */
 export function getLabelGroupPageList(params: Record<string, any>) {
-  return request.get(`shop/goods/label/group`, { params })
+    return request.get(`shop/goods/label/group`, { params })
 }
 
 /**
@@ -313,7 +280,7 @@ export function getLabelGroupPageList(params: Record<string, any>) {
  * @returns
  */
 export function getLabelGroupList(params: Record<string, any>) {
-  return request.get(`shop/goods/label/group/list`, { params })
+    return request.get(`shop/goods/label/group/list`, { params })
 }
 
 /**
@@ -322,7 +289,7 @@ export function getLabelGroupList(params: Record<string, any>) {
  * @returns
  */
 export function getLabelGroupInfo(label_id: number) {
-  return request.get(`shop/goods/label/group/${label_id}`)
+    return request.get(`shop/goods/label/group/${ label_id }`);
 }
 
 /**
@@ -331,10 +298,7 @@ export function getLabelGroupInfo(label_id: number) {
  * @returns
  */
 export function addLabelGroup(params: Record<string, any>) {
-  return request.post('shop/goods/label/group', params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.post('shop/goods/label/group', params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -343,10 +307,10 @@ export function addLabelGroup(params: Record<string, any>) {
  * @returns
  */
 export function editLabelGroup(params: Record<string, any>) {
-  return request.put(`shop/goods/label/group/${params.group_id}`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/goods/label/group/${ params.group_id }`, params, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
 }
 
 /**
@@ -355,10 +319,7 @@ export function editLabelGroup(params: Record<string, any>) {
  * @returns
  */
 export function deleteLabelGroup(group_id: number) {
-  return request.delete(`shop/goods/label/group/${group_id}`, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.delete(`shop/goods/label/group/${ group_id }`, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -366,9 +327,7 @@ export function deleteLabelGroup(group_id: number) {
  * @param params
  */
 export function modifyLabelGroupSort(params: Record<string, any>) {
-  return request.put(`shop/goods/label/group/sort`, params, {
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/goods/label/group/sort`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -377,7 +336,7 @@ export function modifyLabelGroupSort(params: Record<string, any>) {
  * @returns
  */
 export function getBrandPageList(params: Record<string, any>) {
-  return request.get(`shop/goods/brand`, { params })
+    return request.get(`shop/goods/brand`, { params })
 }
 
 /**
@@ -386,7 +345,7 @@ export function getBrandPageList(params: Record<string, any>) {
  * @returns
  */
 export function getBrandList(params: Record<string, any>) {
-  return request.get(`shop/goods/brand/list`, { params })
+    return request.get(`shop/goods/brand/list`, { params })
 }
 
 /**
@@ -395,7 +354,7 @@ export function getBrandList(params: Record<string, any>) {
  * @returns
  */
 export function getBrandInfo(brand_id: number) {
-  return request.get(`shop/goods/brand/${brand_id}`)
+    return request.get(`shop/goods/brand/${ brand_id }`);
 }
 
 /**
@@ -404,10 +363,7 @@ export function getBrandInfo(brand_id: number) {
  * @returns
  */
 export function addBrand(params: Record<string, any>) {
-  return request.post('shop/goods/brand', params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.post('shop/goods/brand', params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -416,10 +372,10 @@ export function addBrand(params: Record<string, any>) {
  * @returns
  */
 export function editBrand(params: Record<string, any>) {
-  return request.put(`shop/goods/brand/${params.brand_id}`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/goods/brand/${ params.brand_id }`, params, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
 }
 
 /**
@@ -427,9 +383,7 @@ export function editBrand(params: Record<string, any>) {
  * @param params
  */
 export function modifyBrandSort(params: Record<string, any>) {
-  return request.put(`shop/goods/brand/sort`, params, {
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/goods/brand/sort`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -438,10 +392,7 @@ export function modifyBrandSort(params: Record<string, any>) {
  * @returns
  */
 export function deleteBrand(brand_id: number) {
-  return request.delete(`shop/goods/brand/${brand_id}`, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.delete(`shop/goods/brand/${ brand_id }`, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -450,7 +401,7 @@ export function deleteBrand(brand_id: number) {
  * @returns
  */
 export function getServePageList(params: Record<string, any>) {
-  return request.get(`shop/goods/service`, { params })
+    return request.get(`shop/goods/service`, { params })
 }
 
 /**
@@ -459,7 +410,7 @@ export function getServePageList(params: Record<string, any>) {
  * @returns
  */
 export function getServeList(params: Record<string, any>) {
-  return request.get(`shop/goods/service/list`, { params })
+    return request.get(`shop/goods/service/list`, { params })
 }
 
 /**
@@ -468,7 +419,7 @@ export function getServeList(params: Record<string, any>) {
  * @returns
  */
 export function getServeInfo(service_id: number) {
-  return request.get(`shop/goods/service/${service_id}`)
+    return request.get(`shop/goods/service/${ service_id }`);
 }
 
 /**
@@ -477,10 +428,7 @@ export function getServeInfo(service_id: number) {
  * @returns
  */
 export function addServe(params: Record<string, any>) {
-  return request.post('shop/goods/service', params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.post('shop/goods/service', params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -489,10 +437,10 @@ export function addServe(params: Record<string, any>) {
  * @returns
  */
 export function editServe(params: Record<string, any>) {
-  return request.put(`shop/goods/service/${params.service_id}`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/goods/service/${ params.service_id }`, params, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
 }
 
 /**
@@ -501,10 +449,7 @@ export function editServe(params: Record<string, any>) {
  * @returns
  */
 export function deleteServe(service_id: number) {
-  return request.delete(`shop/goods/service/${service_id}`, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.delete(`shop/goods/service/${ service_id }`, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -512,7 +457,7 @@ export function deleteServe(service_id: number) {
  * @returns
  */
 export function getCategoryTree() {
-  return request.get(`shop/goods/tree`)
+    return request.get(`shop/goods/tree`)
 }
 
 /**
@@ -521,7 +466,7 @@ export function getCategoryTree() {
  * @returns
  */
 export function getCategoryList(params: Record<string, any>) {
-  return request.get(`shop/goods/category`, { params })
+    return request.get(`shop/goods/category`, { params })
 }
 
 /**
@@ -530,7 +475,7 @@ export function getCategoryList(params: Record<string, any>) {
  * @returns
  */
 export function getCategoryInfo(category_id: number) {
-  return request.get(`shop/goods/category/${category_id}`)
+    return request.get(`shop/goods/category/${ category_id }`);
 }
 
 /**
@@ -539,10 +484,7 @@ export function getCategoryInfo(category_id: number) {
  * @returns
  */
 export function addCategory(params: Record<string, any>) {
-  return request.post('shop/goods/category', params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.post('shop/goods/category', params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -551,10 +493,10 @@ export function addCategory(params: Record<string, any>) {
  * @returns
  */
 export function editCategory(params: Record<string, any>) {
-  return request.put(`shop/goods/category/${params.category_id}`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/goods/category/${ params.category_id }`, params, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
 }
 
 /**
@@ -563,10 +505,7 @@ export function editCategory(params: Record<string, any>) {
  * @returns
  */
 export function deleteCategory(category_id: number) {
-  return request.delete(`shop/goods/category/${category_id}`, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.delete(`shop/goods/category/${ category_id }`, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -575,10 +514,7 @@ export function deleteCategory(category_id: number) {
  * @returns
  */
 export function updateCategory(params: Record<string, any>) {
-  return request.post(`shop/goods/category/update`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.post(`shop/goods/category/update`, params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -587,10 +523,7 @@ export function updateCategory(params: Record<string, any>) {
  * @returns
  */
 export function setCategoryConfig(params: Record<string, any>) {
-  return request.post(`shop/goods/category/config`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.post(`shop/goods/category/config`, params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -598,7 +531,7 @@ export function setCategoryConfig(params: Record<string, any>) {
  * @returns
  */
 export function getCategoryConfig() {
-  return request.get(`shop/goods/category/config`)
+    return request.get(`shop/goods/category/config`);
 }
 
 /**
@@ -606,7 +539,7 @@ export function getCategoryConfig() {
  * @returns
  */
 export function getCategoryTreeComponents() {
-  return request.get(`shop/goods/category/components`)
+    return request.get(`shop/goods/category/components`)
 }
 
 /**
@@ -615,7 +548,7 @@ export function getCategoryTreeComponents() {
  * @returns
  */
 export function getSupplierList(params: Record<string, any>) {
-  return request.get(`shop_supplier/supplier/list`, { params })
+    return request.get(`shop_supplier/supplier/list`, { params })
 }
 
 /**
@@ -624,7 +557,7 @@ export function getSupplierList(params: Record<string, any>) {
  * @returns
  */
 export function getEvaluateList(params: Record<string, any>) {
-  return request.get(`shop/goods/evaluate`, { params })
+    return request.get(`shop/goods/evaluate`, { params })
 }
 
 /**
@@ -633,10 +566,7 @@ export function getEvaluateList(params: Record<string, any>) {
  * @returns
  */
 export function addEvaluate(params: Record<string, any>) {
-  return request.post('shop/goods/evaluate', params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.post('shop/goods/evaluate', params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -645,10 +575,7 @@ export function addEvaluate(params: Record<string, any>) {
  * @returns
  */
 export function deleteEvaluate(evaluate_id: number) {
-  return request.delete(`shop/goods/evaluate/${evaluate_id}`, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.delete(`shop/goods/evaluate/${ evaluate_id }`, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -657,10 +584,10 @@ export function deleteEvaluate(evaluate_id: number) {
  * @returns
  */
 export function adoptEvaluate(evaluate_id: number) {
-  return request.put(`shop/goods/evaluate/adopt/${evaluate_id}`, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/goods/evaluate/adopt/${ evaluate_id }`, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
 }
 
 /**
@@ -669,10 +596,10 @@ export function adoptEvaluate(evaluate_id: number) {
  * @returns
  */
 export function refuseEvaluate(evaluate_id: number) {
-  return request.put(`shop/goods/evaluate/refuse/${evaluate_id}`, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/goods/evaluate/refuse/${ evaluate_id }`, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
 }
 
 /**
@@ -681,14 +608,10 @@ export function refuseEvaluate(evaluate_id: number) {
  * @returns
  */
 export function replyEvaluate(params: Record<string, any>) {
-  return request.put(
-    `shop/goods/evaluate/reply/${params.evaluate_id}`,
-    params,
-    {
-      showErrorMessage: true,
-      showSuccessMessage: true,
-    }
-  )
+    return request.put(`shop/goods/evaluate/reply/${ params.evaluate_id }`, params, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
 }
 
 /**
@@ -697,10 +620,10 @@ export function replyEvaluate(params: Record<string, any>) {
  * @returns
  */
 export function toppingEvaluate(evaluate_id: number) {
-  return request.put(`shop/goods/evaluate/topping/${evaluate_id}`, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/goods/evaluate/topping/${ evaluate_id }`, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
 }
 
 /**
@@ -709,10 +632,10 @@ export function toppingEvaluate(evaluate_id: number) {
  * @returns
  */
 export function cancelToppingEvaluate(evaluate_id: number) {
-  return request.put(`shop/goods/evaluate/cancel_topping/${evaluate_id}`, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/goods/evaluate/cancel_topping/${ evaluate_id }`, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
 }
 
 /**
@@ -721,7 +644,7 @@ export function cancelToppingEvaluate(evaluate_id: number) {
  * @returns
  */
 export function getAttrPageList(params: Record<string, any>) {
-  return request.get(`shop/goods/attr`, { params })
+    return request.get(`shop/goods/attr`, { params })
 }
 
 /**
@@ -730,7 +653,7 @@ export function getAttrPageList(params: Record<string, any>) {
  * @returns
  */
 export function getAttrList(params: Record<string, any>) {
-  return request.get(`shop/goods/attr/list`, { params })
+    return request.get(`shop/goods/attr/list`, { params })
 }
 
 /**
@@ -739,7 +662,7 @@ export function getAttrList(params: Record<string, any>) {
  * @returns
  */
 export function getAttrInfo(attr_id: number) {
-  return request.get(`shop/goods/attr/${attr_id}`)
+    return request.get(`shop/goods/attr/${ attr_id }`);
 }
 
 /**
@@ -748,10 +671,7 @@ export function getAttrInfo(attr_id: number) {
  * @returns
  */
 export function addAttr(params: Record<string, any>) {
-  return request.post('shop/goods/attr', params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.post('shop/goods/attr', params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -760,10 +680,10 @@ export function addAttr(params: Record<string, any>) {
  * @returns
  */
 export function editAttr(params: Record<string, any>) {
-  return request.put(`shop/goods/attr/${params.attr_id}`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/goods/attr/${ params.attr_id }`, params, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
 }
 
 /**
@@ -772,10 +692,7 @@ export function editAttr(params: Record<string, any>) {
  * @returns
  */
 export function deleteAttr(attr_id: number) {
-  return request.delete(`shop/goods/attr/${attr_id}`, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.delete(`shop/goods/attr/${ attr_id }`, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -783,9 +700,7 @@ export function deleteAttr(attr_id: number) {
  * @param params
  */
 export function modifyAttrSort(params: Record<string, any>) {
-  return request.put(`shop/goods/attr/sort`, params, {
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/goods/attr/sort`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -793,9 +708,7 @@ export function modifyAttrSort(params: Record<string, any>) {
  * @param params
  */
 export function modifyAttrName(params: Record<string, any>) {
-  return request.put(`shop/goods/attr/attr_name`, params, {
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/goods/attr/attr_name`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -803,9 +716,7 @@ export function modifyAttrName(params: Record<string, any>) {
  * @param params
  */
 export function modifyAttrValue(params: Record<string, any>) {
-  return request.put(`shop/goods/attr/attr_value`, params, {
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/goods/attr/attr_value`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -813,7 +724,7 @@ export function modifyAttrValue(params: Record<string, any>) {
  * @returns
  */
 export function getGoodsBatchSetDict() {
-  return request.get(`shop/goods/batchSet/dict`)
+    return request.get(`shop/goods/batchSet/dict`)
 }
 
 /**
@@ -821,7 +732,5 @@ export function getGoodsBatchSetDict() {
  * @param params
  */
 export function goodsBatchSet(params: Record<string, any>) {
-  return request.put(`shop/goods/batchSet`, params, {
-    showSuccessMessage: true,
-  })
-}
+    return request.put(`shop/goods/batchSet`, params, { showSuccessMessage: true })
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/api/marketing.ts b/admin/src/addon/shop/api/marketing.ts
index d94114f4..b48dd32f 100644
--- a/admin/src/addon/shop/api/marketing.ts
+++ b/admin/src/addon/shop/api/marketing.ts
@@ -6,7 +6,7 @@ import request from '@/utils/request'
  * @returns
  */
 export function getMarketingIndex(params: Record<string, any>) {
-  return request.get(`shop/marketing`, { params })
+    return request.get(`shop/marketing`, { params })
 }
 
 /**
@@ -15,7 +15,7 @@ export function getMarketingIndex(params: Record<string, any>) {
  * @returns
  */
 export function getGoodsCategoryList(params: Record<string, any>) {
-  return request.get(`shop/goods/coupon/init`, { params })
+    return request.get(`shop/goods/coupon/init`, { params })
 }
 
 /**
@@ -24,10 +24,7 @@ export function getGoodsCategoryList(params: Record<string, any>) {
  * @returns
  */
 export function addCoupon(params: Record<string, any>) {
-  return request.post(`shop/goods/coupon`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.post(`shop/goods/coupon`, params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -35,7 +32,7 @@ export function addCoupon(params: Record<string, any>) {
  * @returns
  */
 export function getCouponStatusList() {
-  return request.get(`shop/goods/coupon/status`)
+    return request.get(`shop/goods/coupon/status`)
 }
 
 /**
@@ -44,7 +41,7 @@ export function getCouponStatusList() {
  * @returns
  */
 export function getCouponList(params: Record<string, any>) {
-  return request.get(`shop/goods/coupon`, { params })
+    return request.get(`shop/goods/coupon`, { params })
 }
 
 /**
@@ -53,7 +50,7 @@ export function getCouponList(params: Record<string, any>) {
  * @returns
  */
 export function getCouponSelectList(params: Record<string, any>) {
-  return request.get(`shop/goods/coupon/select`, { params })
+    return request.get(`shop/goods/coupon/select`, { params })
 }
 
 /**
@@ -62,7 +59,7 @@ export function getCouponSelectList(params: Record<string, any>) {
  * @returns
  */
 export function getCouponRecords(params: Record<string, any>) {
-  return request.get(`shop/goods/coupon/records`, { params })
+    return request.get(`shop/goods/coupon/records`, { params });
 }
 
 /**
@@ -71,7 +68,7 @@ export function getCouponRecords(params: Record<string, any>) {
  * @returns
  */
 export function getCouponInfo(id: number) {
-  return request.get(`shop/goods/coupon/detail/${id}`)
+    return request.get(`shop/goods/coupon/detail/${ id }`);
 }
 
 /**
@@ -80,9 +77,7 @@ export function getCouponInfo(id: number) {
  * @returns
  */
 export function editCouponStatus(params: Record<string, any>) {
-  return request.put(`shop/goods/coupon/setstatus/${params.status}`, params, {
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/goods/coupon/setstatus/${ params.status }`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -91,10 +86,10 @@ export function editCouponStatus(params: Record<string, any>) {
  * @returns
  */
 export function editCoupon(params: Record<string, any>) {
-  return request.put(`shop/goods/coupon/edit/${params.id}`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/goods/coupon/edit/${ params.id }`, params, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
 }
 
 /**
@@ -103,7 +98,7 @@ export function editCoupon(params: Record<string, any>) {
  * @returns
  */
 export function deleteCoupon(id: number) {
-  return request.delete(`shop/goods/coupon/${id}`, { showSuccessMessage: true })
+    return request.delete(`shop/goods/coupon/${ id }`, { showSuccessMessage: true })
 }
 
 /**
@@ -112,9 +107,7 @@ export function deleteCoupon(id: number) {
  * @returns
  */
 export function closeCoupon(id: number) {
-  return request.put(`shop/goods/coupon/invalid/${id}`, {
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/goods/coupon/invalid/${ id }`, { showSuccessMessage: true })
 }
 
 /**
@@ -123,7 +116,7 @@ export function closeCoupon(id: number) {
  * @returns
  */
 export function getSelectedCouponList(params: Record<string, any>) {
-  return request.get(`shop/goods/coupon/selected`, { params })
+    return request.get(`shop/goods/coupon/selected`, { params })
 }
 
 /************ 限时折扣 ****************/
@@ -133,7 +126,7 @@ export function getSelectedCouponList(params: Record<string, any>) {
  * @returns
  */
 export function getActiveDiscountPageList(params: Record<string, any>) {
-  return request.get(`shop/active/discount`, { params })
+    return request.get(`shop/active/discount`, { params })
 }
 
 /**
@@ -141,7 +134,7 @@ export function getActiveDiscountPageList(params: Record<string, any>) {
  * @returns
  */
 export function getActiveDiscountStatusList() {
-  return request.get(`shop/active/status`)
+    return request.get(`shop/active/status`)
 }
 
 /**
@@ -150,7 +143,7 @@ export function getActiveDiscountStatusList() {
  * @returns
  */
 export function getActiveDiscountInfo(active_id: number) {
-  return request.get(`shop/active/discount/${active_id}`)
+    return request.get(`shop/active/discount/${ active_id }`);
 }
 
 /**
@@ -159,10 +152,7 @@ export function getActiveDiscountInfo(active_id: number) {
  * @returns
  */
 export function addActiveDiscount(params: Record<string, any>) {
-  return request.post('shop/active/discount', params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.post('shop/active/discount', params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -171,10 +161,10 @@ export function addActiveDiscount(params: Record<string, any>) {
  * @returns
  */
 export function editActiveDiscount(params: Record<string, any>) {
-  return request.put(`shop/active/discount/${params.active_id}`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/active/discount/${ params.active_id }`, params, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
 }
 
 /**
@@ -183,14 +173,10 @@ export function editActiveDiscount(params: Record<string, any>) {
  * @returns
  */
 export function closeActiveDiscount(active_id: number) {
-  return request.put(
-    `shop/active/discount/close/${active_id}`,
-    {},
-    {
-      showErrorMessage: true,
-      showSuccessMessage: true,
-    }
-  )
+    return request.put(`shop/active/discount/close/${ active_id }`, {}, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
 }
 
 /**
@@ -199,9 +185,7 @@ export function closeActiveDiscount(active_id: number) {
  * @returns
  */
 export function deleteActiveDiscount(active_id: number) {
-  return request.delete(`shop/active/discount/${active_id}`, {
-    showSuccessMessage: true,
-  })
+    return request.delete(`shop/active/discount/${ active_id }`, { showSuccessMessage: true })
 }
 
 /**
@@ -210,9 +194,7 @@ export function deleteActiveDiscount(active_id: number) {
  * @returns
  */
 export function getActiveDiscountGoodsPageList(params: Record<string, any>) {
-  return request.get(`shop/active/discount/goods/${params.active_id}`, {
-    params,
-  })
+    return request.get(`shop/active/discount/goods/${ params.active_id }`, { params })
 }
 
 /**
@@ -221,9 +203,7 @@ export function getActiveDiscountGoodsPageList(params: Record<string, any>) {
  * @returns
  */
 export function getActiveDiscountOrderPageList(params: Record<string, any>) {
-  return request.get(`shop/active/discount/order/${params.active_id}`, {
-    params,
-  })
+    return request.get(`shop/active/discount/order/${ params.active_id }`, { params })
 }
 
 /**
@@ -232,9 +212,7 @@ export function getActiveDiscountOrderPageList(params: Record<string, any>) {
  * @returns
  */
 export function getActiveDiscountMemberPageList(params: Record<string, any>) {
-  return request.get(`shop/active/discount/member/${params.active_id}`, {
-    params,
-  })
+    return request.get(`shop/active/discount/member/${ params.active_id }`, { params })
 }
 
 /**
@@ -242,7 +220,7 @@ export function getActiveDiscountMemberPageList(params: Record<string, any>) {
  * @returns
  */
 export function getActiveDiscountConfig() {
-  return request.get(`shop/active/discount/config`)
+    return request.get(`shop/active/discount/config`);
 }
 
 /**
@@ -251,10 +229,10 @@ export function getActiveDiscountConfig() {
  * @returns
  */
 export function editActiveDiscountConfig(params: Record<string, any>) {
-  return request.put(`shop/active/discount/config`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/active/discount/config`, params, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
 }
 
 /********** 积分商品 ***********/
@@ -265,7 +243,7 @@ export function editActiveDiscountConfig(params: Record<string, any>) {
  * @returns
  */
 export function getActiveExchangePageList(params: Record<string, any>) {
-  return request.get(`shop/active/exchange`, { params })
+    return request.get(`shop/active/exchange`, { params })
 }
 
 /**
@@ -274,7 +252,7 @@ export function getActiveExchangePageList(params: Record<string, any>) {
  * @returns
  */
 export function getActiveExchangeInfo(id: number) {
-  return request.get(`shop/active/exchange/${id}`)
+    return request.get(`shop/active/exchange/${ id }`);
 }
 
 /**
@@ -283,10 +261,7 @@ export function getActiveExchangeInfo(id: number) {
  * @returns
  */
 export function addActiveExchange(params: Record<string, any>) {
-  return request.post('shop/active/exchange', params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.post('shop/active/exchange', params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -295,10 +270,10 @@ export function addActiveExchange(params: Record<string, any>) {
  * @returns
  */
 export function editActiveExchange(params: Record<string, any>) {
-  return request.put(`shop/active/exchange/${params.id}`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/active/exchange/${ params.id }`, params, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
 }
 
 /**
@@ -307,10 +282,10 @@ export function editActiveExchange(params: Record<string, any>) {
  * @returns
  */
 export function editActiveExchangeStatus(params: Record<string, any>) {
-  return request.put(`shop/active/exchange/status/${params.id}`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/active/exchange/status/${ params.id }`, params, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
 }
 
 /**
@@ -319,9 +294,7 @@ export function editActiveExchangeStatus(params: Record<string, any>) {
  * @returns
  */
 export function deleteActiveExchange(id: number) {
-  return request.delete(`shop/active/exchange/${id}`, {
-    showSuccessMessage: true,
-  })
+    return request.delete(`shop/active/exchange/${ id }`, { showSuccessMessage: true })
 }
 
 /**
@@ -329,7 +302,7 @@ export function deleteActiveExchange(id: number) {
  * @returns
  */
 export function getActiveExchangeStatus() {
-  return request.get(`shop/active/exchange/status`)
+    return request.get(`shop/active/exchange/status`)
 }
 
 /************ 新人专享 ****************/
@@ -339,7 +312,7 @@ export function getActiveExchangeStatus() {
  * @returns
  */
 export function getActiveNewcomerConfig() {
-  return request.get(`shop/active/newcomer/config`)
+    return request.get(`shop/active/newcomer/config`);
 }
 
 /**
@@ -348,10 +321,10 @@ export function getActiveNewcomerConfig() {
  * @returns
  */
 export function editActiveNewcomerConfig(params: Record<string, any>) {
-  return request.put(`shop/active/newcomer/config`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/active/newcomer/config`, params, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
 }
 
 /**
@@ -360,7 +333,7 @@ export function editActiveNewcomerConfig(params: Record<string, any>) {
  * @returns
  */
 export function getNewcomerGoodsList(params: Record<string, any>) {
-  return request.get('shop/active/newcomer/goods/select', { params })
+    return request.get('shop/active/newcomer/goods/select', { params })
 }
 
 /**
@@ -369,7 +342,7 @@ export function getNewcomerGoodsList(params: Record<string, any>) {
  * @returns
  */
 export function getNewcomerSelectGoodsList(params: Record<string, any>) {
-  return request.get('shop/active/newcomer/goods/selectgoodssku', { params })
+    return request.get('shop/active/newcomer/goods/selectgoodssku', { params })
 }
 
 /************ 商品榜单 ****************/
@@ -380,10 +353,7 @@ export function getNewcomerSelectGoodsList(params: Record<string, any>) {
  * @returns
  */
 export function setRankConfig(params: Record<string, any>) {
-  return request.post('shop/good/rank/config', params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.post('shop/good/rank/config', params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -391,7 +361,7 @@ export function setRankConfig(params: Record<string, any>) {
  * @returns
  */
 export function getRankConfig() {
-  return request.get(`shop/good/rank/config`)
+    return request.get(`shop/good/rank/config`)
 }
 
 /**
@@ -400,7 +370,7 @@ export function getRankConfig() {
  * @returns
  */
 export function getRankPageList(params: Record<string, any>) {
-  return request.get(`shop/good/rank`, { params })
+    return request.get(`shop/good/rank`, { params })
 }
 
 /**
@@ -408,7 +378,7 @@ export function getRankPageList(params: Record<string, any>) {
  * @returns
  */
 export function optionData() {
-  return request.get(`shop/good/rank/dict`)
+    return request.get(`shop/good/rank/dict`)
 }
 
 /**
@@ -417,7 +387,7 @@ export function optionData() {
  * @returns
  */
 export function getRankInfo(rank_id: number) {
-  return request.get(`shop/good/rank/${rank_id}`)
+    return request.get(`shop/good/rank/${ rank_id }`);
 }
 
 /**
@@ -426,10 +396,7 @@ export function getRankInfo(rank_id: number) {
  * @returns
  */
 export function addGoodRank(params: Record<string, any>) {
-  return request.post('shop/good/rank', params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.post('shop/good/rank', params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -438,10 +405,10 @@ export function addGoodRank(params: Record<string, any>) {
  * @returns
  */
 export function editGoodRank(params: Record<string, any>) {
-  return request.put(`shop/good/rank/${params.id}`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/good/rank/${ params.id }`, params, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
 }
 
 /**
@@ -450,10 +417,10 @@ export function editGoodRank(params: Record<string, any>) {
  * @returns
  */
 export function editRankStatus(params: Record<string, any>) {
-  return request.put(`shop/goods/rank/status`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/goods/rank/status`, params, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
 }
 
 /**
@@ -462,7 +429,7 @@ export function editRankStatus(params: Record<string, any>) {
  * @returns
  */
 export function deleteGoodRank(id: number) {
-  return request.delete(`shop/good/rank/${id}`, { showSuccessMessage: true })
+    return request.delete(`shop/good/rank/${ id }`, { showSuccessMessage: true })
 }
 
 /**
@@ -471,9 +438,7 @@ export function deleteGoodRank(id: number) {
  * @returns
  */
 export function batchDelete(params: Record<string, any>) {
-  return request.put(`shop/good/rank/batchDelete`, params, {
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/good/rank/batchDelete`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -482,9 +447,7 @@ export function batchDelete(params: Record<string, any>) {
  * @returns
  */
 export function modifyGoodsRankSort(params: Record<string, any>) {
-  return request.put(`shop/good/rank/sort`, params, {
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/good/rank/sort`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -493,7 +456,7 @@ export function modifyGoodsRankSort(params: Record<string, any>) {
  * @returns
  */
 export function getSelectRankPageList(params: Record<string, any>) {
-  return request.get(`shop/good/rank/select`, { params })
+    return request.get(`shop/good/rank/select`, { params })
 }
 
 /************ 满减 ****************/
@@ -504,7 +467,7 @@ export function getSelectRankPageList(params: Record<string, any>) {
  * @returns
  */
 export function getManjianList(params: Record<string, any>) {
-  return request.get(`shop/manjian`, { params })
+    return request.get(`shop/manjian`, { params })
 }
 
 /**
@@ -512,7 +475,7 @@ export function getManjianList(params: Record<string, any>) {
  * @returns
  */
 export function getManjianStatusList() {
-  return request.get(`shop/manjian/status`)
+    return request.get(`shop/manjian/status`)
 }
 
 /**
@@ -521,7 +484,7 @@ export function getManjianStatusList() {
  * @returns
  */
 export function addManjian(params: Record<string, any>) {
-  return request.post('shop/manjian', params)
+    return request.post('shop/manjian', params)
 }
 
 /**
@@ -530,7 +493,7 @@ export function addManjian(params: Record<string, any>) {
  * @returns
  */
 export function editManjian(params: Record<string, any>) {
-  return request.put(`shop/manjian/${params.id}`, params)
+    return request.put(`shop/manjian/${ params.id }`, params)
 }
 
 /**
@@ -539,7 +502,7 @@ export function editManjian(params: Record<string, any>) {
  * @returns
  */
 export function getManjianInfo(params: Record<string, any>) {
-  return request.get(`shop/manjian/init`, { params })
+    return request.get(`shop/manjian/init`, { params });
 }
 
 /**
@@ -548,7 +511,7 @@ export function getManjianInfo(params: Record<string, any>) {
  * @returns
  */
 export function goodsCheck(params: Record<string, any>) {
-  return request.post('shop/manjian/goods/check', params)
+    return request.post('shop/manjian/goods/check', params)
 }
 
 /**
@@ -557,7 +520,7 @@ export function goodsCheck(params: Record<string, any>) {
  * @returns
  */
 export function getManjianMemberPageList(params: Record<string, any>) {
-  return request.get(`shop/manjian/member/${params.id}`, { params })
+    return request.get(`shop/manjian/member/${ params.id }`, { params })
 }
 
 /**
@@ -566,14 +529,10 @@ export function getManjianMemberPageList(params: Record<string, any>) {
  * @returns
  */
 export function closeManjian(manjian_id: number) {
-  return request.put(
-    `shop/manjian/close/${manjian_id}`,
-    {},
-    {
-      showErrorMessage: true,
-      showSuccessMessage: true,
-    }
-  )
+    return request.put(`shop/manjian/close/${ manjian_id }`, {}, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
 }
 
 /**
@@ -582,7 +541,7 @@ export function closeManjian(manjian_id: number) {
  * @returns
  */
 export function getGoodsSelectByReplaceBuy(params: Record<string, any>) {
-  return request.get(`shop/goods/buy/goods/select`, { params })
+    return request.get(`shop/goods/buy/goods/select`, { params })
 }
 
 /**
@@ -591,7 +550,7 @@ export function getGoodsSelectByReplaceBuy(params: Record<string, any>) {
  * @returns
  */
 export function getGoodsSelectedByReplaceBuy(params: Record<string, any>) {
-  return request.get(`shop/goods/buy/goods/selected`, { params })
+    return request.get(`shop/goods/buy/goods/selected`, { params })
 }
 
 /**
@@ -600,7 +559,7 @@ export function getGoodsSelectedByReplaceBuy(params: Record<string, any>) {
  * @returns
  */
 export function getGoodsSkuInfo(params: Record<string, any>) {
-  return request.get(`shop/goods/buy/sku/select`, { params })
+    return request.get(`shop/goods/buy/sku/select`, { params })
 }
 
 /*
@@ -609,9 +568,7 @@ export function getGoodsSkuInfo(params: Record<string, any>) {
  * @returns
  */
 export function deleteManjian(manjian_id: number) {
-  return request.delete(`shop/manjian/${manjian_id}`, {
-    showSuccessMessage: true,
-  })
+    return request.delete(`shop/manjian/${ manjian_id }`, { showSuccessMessage: true })
 }
 
 /**
@@ -620,9 +577,7 @@ export function deleteManjian(manjian_id: number) {
  * @returns
  */
 export function batchDeleteManjian(params: Record<string, any>) {
-  return request.put(`shop/manjian/goods/batchDelete`, params, {
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/manjian/goods/batchDelete`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -631,7 +586,5 @@ export function batchDeleteManjian(params: Record<string, any>) {
  * @returns
  */
 export function batchCloseMajian(params: Record<string, any>) {
-  return request.put(`shop/manjian/goods/batchClose`, params, {
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/manjian/goods/batchClose`, params, { showSuccessMessage: true })
 }
diff --git a/admin/src/addon/shop/api/order.ts b/admin/src/addon/shop/api/order.ts
index dd96bf3e..787c9e7c 100644
--- a/admin/src/addon/shop/api/order.ts
+++ b/admin/src/addon/shop/api/order.ts
@@ -5,7 +5,7 @@ import request from '@/utils/request'
  * @returns
  */
 export function getConfig() {
-  return request.get('shop/order/config')
+    return request.get('shop/order/config')
 }
 
 /**
@@ -13,7 +13,7 @@ export function getConfig() {
  * @returns
  */
 export function setConfig(param: any) {
-  return request.post('shop/order/config', param, { showSuccessMessage: true })
+    return request.post('shop/order/config', param, { showSuccessMessage: true })
 }
 
 /**
@@ -21,7 +21,7 @@ export function setConfig(param: any) {
  * @returns
  */
 export function getOrderList(params: Record<string, any>) {
-  return request.get('shop/order/list', { params })
+    return request.get('shop/order/list', { params })
 }
 
 /**
@@ -29,7 +29,7 @@ export function getOrderList(params: Record<string, any>) {
  * @returns
  */
 export function getOrderDetail(order_id: number) {
-  return request.get(`shop/order/detail/${order_id}`)
+    return request.get(`shop/order/detail/${ order_id }`)
 }
 
 /**
@@ -37,7 +37,7 @@ export function getOrderDetail(order_id: number) {
  * @return
  */
 export function getOrderStatus() {
-  return request.get(`shop/order/status`)
+    return request.get(`shop/order/status`)
 }
 
 /**
@@ -45,7 +45,7 @@ export function getOrderStatus() {
  * @return
  */
 export function getOrderType() {
-  return request.get(`shop/order/type`)
+    return request.get(`shop/order/type`)
 }
 
 /**
@@ -53,7 +53,7 @@ export function getOrderType() {
  * @return
  */
 export function orderClose(order_id: number) {
-  return request.put(`shop/order/close/${order_id}`)
+    return request.put(`shop/order/close/${ order_id }`)
 }
 
 /**
@@ -61,7 +61,7 @@ export function orderClose(order_id: number) {
  * @return
  */
 export function getOrderDeliveryType(params: Record<string, any>) {
-  return request.get(`shop/order/delivery_type`, { params })
+    return request.get(`shop/order/delivery_type`, { params })
 }
 
 /**
@@ -69,7 +69,7 @@ export function getOrderDeliveryType(params: Record<string, any>) {
  * @return
  */
 export function orderDelivery(params: Record<string, any>) {
-  return request.put(`shop/order/delivery`, params)
+    return request.put(`shop/order/delivery`, params)
 }
 
 /**
@@ -77,7 +77,7 @@ export function orderDelivery(params: Record<string, any>) {
  * @return
  */
 export function setShopRemark(params: Record<string, any>) {
-  return request.put(`shop/order/shop_remark`, params)
+    return request.put(`shop/order/shop_remark`, params)
 }
 
 /**
@@ -85,7 +85,7 @@ export function setShopRemark(params: Record<string, any>) {
  * @return
  */
 export function orderFinish(order_id: number) {
-  return request.put(`shop/order/finish/${order_id}`)
+    return request.put(`shop/order/finish/${ order_id }`)
 }
 
 /**
@@ -93,7 +93,7 @@ export function orderFinish(order_id: number) {
  * @return
  */
 export function deliveryPackage(params: Record<string, any>) {
-  return request.get(`shop/order/delivery/package`, { params })
+    return request.get(`shop/order/delivery/package`, { params })
 }
 
 /**
@@ -101,7 +101,7 @@ export function deliveryPackage(params: Record<string, any>) {
  * @return
  */
 export function deliveryPackageList(params: Record<string, any>) {
-  return request.get(`shop/order/delivery/package/list`, { params })
+    return request.get(`shop/order/delivery/package/list`, { params })
 }
 
 /**
@@ -110,14 +110,14 @@ export function deliveryPackageList(params: Record<string, any>) {
  * @return
  */
 export function orderRefund(params: Record<string, any>) {
-  return request.get(`shop/order/refund`, { params })
+    return request.get(`shop/order/refund`, { params })
 }
 
 /**
  * 退款维权详情
  */
 export function orderRefundDetail(refund_id: number) {
-  return request.get(`shop/order/refund/${refund_id}`)
+    return request.get(`shop/order/refund/${ refund_id }`)
 }
 
 /**
@@ -125,10 +125,7 @@ export function orderRefundDetail(refund_id: number) {
  * @return
  */
 export function auditRefund(params: Record<string, any>) {
-  return request.put(
-    `shop/order/refund/audit/${params.order_refund_no}`,
-    params
-  )
+    return request.put(`shop/order/refund/audit/${ params.order_refund_no }`, params)
 }
 
 /**
@@ -136,61 +133,56 @@ export function auditRefund(params: Record<string, any>) {
  * @return
  */
 export function refundDelivery(params: Record<string, any>) {
-  return request.put(
-    `shop/order/refund/delivery/${params.order_refund_no}`,
-    params
-  )
+    return request.put(`shop/order/refund/delivery/${ params.order_refund_no }`, params)
 }
 
 /**
  * 获取可退款金额
  */
 export function getRefundMoney(params: Record<string, any>) {
-  return request.get(`shop/order/refund/refund_money`, { params })
+    return request.get(`shop/order/refund/refund_money`, { params })
 }
 
 /**
  * 商家主动退款
  */
 export function shopActiveRefund(params: Record<string, any>) {
-  return request.post(`shop/order/refund/active`, params, {
-    showSuccessMessage: true,
-  })
+    return request.post(`shop/order/refund/active`, params, { showSuccessMessage: true })
 }
 
 /**
  * 获取发票列表
  */
 export function getInvoiceList(params: Record<string, any>) {
-  return request.get(`shop/invoice`, { params })
+    return request.get(`shop/invoice`, { params })
 }
 
 /**
  * 获取发票列表
  */
 export function getInvoiceDetail(id: number) {
-  return request.get(`shop/invoice/${id}`)
+    return request.get(`shop/invoice/${ id }`)
 }
 
 /**
  * 开具发票
  */
 export function setInvoice(id: number, params: Record<string, any>) {
-  return request.put(`shop/invoice/${id}`, params, { showSuccessMessage: true })
+    return request.put(`shop/invoice/${ id }`, params, { showSuccessMessage: true })
 }
 
 /**
  * 获取支付类型
  */
 export function getOrderPayType() {
-  return request.get(`shop/order/pay/type`)
+    return request.get(`shop/order/pay/type`)
 }
 
 /**
  * 获取订单来源
  */
 export function getOrderFrom() {
-  return request.get(`shop/order/from`)
+    return request.get(`shop/order/from`)
 }
 
 /**
@@ -198,9 +190,7 @@ export function getOrderFrom() {
  * @return
  */
 export function orderEditPrice(params: Record<string, any>) {
-  return request.put(`shop/order/edit_price`, params, {
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/order/edit_price`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -208,7 +198,7 @@ export function orderEditPrice(params: Record<string, any>) {
  * @return
  */
 export function getOrderEditAddress(params: Record<string, any>) {
-  return request.get(`shop/order/edit_delivery`, { params })
+    return request.get(`shop/order/edit_delivery`, { params })
 }
 
 /**
@@ -216,7 +206,7 @@ export function getOrderEditAddress(params: Record<string, any>) {
  * @return
  */
 export function getDeliveryList() {
-  return request.get(`shop/delivery/store/list`)
+    return request.get(`shop/delivery/store/list`)
 }
 
 /**
@@ -224,7 +214,7 @@ export function getDeliveryList() {
  * @return
  */
 export function orderEditAddress(params: Record<string, any>) {
-  return request.put(`shop/order/edit_delivery`, params)
+    return request.put(`shop/order/edit_delivery`, params)
 }
 
 /**
@@ -232,7 +222,7 @@ export function orderEditAddress(params: Record<string, any>) {
  * @return
  */
 export function getOrderBatchDeliveryList(params: Record<string, any>) {
-  return request.get(`shop/order_batch_delivery`, { params })
+    return request.get(`shop/order_batch_delivery`, { params })
 }
 
 /**
@@ -240,10 +230,7 @@ export function getOrderBatchDeliveryList(params: Record<string, any>) {
  * @return
  */
 export function addBatchOrderDelivery(params: Record<string, any>) {
-  return request.put(
-    `shop/order_batch_delivery/add_batch_order_delivery`,
-    params
-  )
+    return request.put(`shop/order_batch_delivery/add_batch_order_delivery`, params)
 }
 
 /**
@@ -251,7 +238,7 @@ export function addBatchOrderDelivery(params: Record<string, any>) {
  * @return
  */
 export function getOrderBatchDeliveryState() {
-  return request.get(`shop/order_batch_delivery/get_status`)
+    return request.get(`shop/order_batch_delivery/get_status`)
 }
 
 /**
@@ -259,5 +246,5 @@ export function getOrderBatchDeliveryState() {
  * @return
  */
 export function getOrderBatchDeliveryType() {
-  return request.get(`shop/order_batch_delivery/get_type`)
+    return request.get(`shop/order_batch_delivery/get_type`)
 }
diff --git a/admin/src/addon/shop/api/shop.ts b/admin/src/addon/shop/api/shop.ts
index 5e56b4c8..b2bea12c 100644
--- a/admin/src/addon/shop/api/shop.ts
+++ b/admin/src/addon/shop/api/shop.ts
@@ -4,40 +4,40 @@ import request from '@/utils/request'
  * 获取统计总数
  */
 export function getShopCountList() {
-  return request.get(`shop/stat/total`)
+    return request.get(`shop/stat/total`)
 }
 
 /**
  * 获取今日统计总数
  */
 export function getShopTodayCountList() {
-  return request.get(`shop/stat/today`)
+    return request.get(`shop/stat/today`)
 }
 
 /**
  * 获取昨日统计总数
  */
 export function getShopYesterdayCountList() {
-  return request.get(`shop/stat/yesterday`)
+    return request.get(`shop/stat/yesterday`)
 }
 
 /**
  * 获取统计图数据
  */
 export function getShopStat() {
-  return request.get(`shop/stat`)
+    return request.get(`shop/stat`)
 }
 
 /**
  * 获取订单统计
  */
 export function getShopOrderStat() {
-  return request.get(`shop/stat/order`)
+    return request.get(`shop/stat/order`)
 }
 
 /**
  * 获取商品统计
  */
 export function getShopGoodsStat() {
-  return request.get(`shop/stat/goods`)
+    return request.get(`shop/stat/goods`)
 }
diff --git a/admin/src/addon/shop/api/shop_address.ts b/admin/src/addon/shop/api/shop_address.ts
index 563deacd..450d2ddc 100644
--- a/admin/src/addon/shop/api/shop_address.ts
+++ b/admin/src/addon/shop/api/shop_address.ts
@@ -6,7 +6,7 @@ import request from '@/utils/request'
  * @returns
  */
 export function getShopAddressList(params: Record<string, any>) {
-  return request.get(`shop/shop_address`, { params })
+    return request.get(`shop/shop_address`, { params })
 }
 
 /**
@@ -15,7 +15,7 @@ export function getShopAddressList(params: Record<string, any>) {
  * @returns
  */
 export function getShopAddressInfo(id: number) {
-  return request.get(`shop/shop_address/${id}`)
+    return request.get(`shop/shop_address/${ id }`);
 }
 
 /**
@@ -24,10 +24,7 @@ export function getShopAddressInfo(id: number) {
  * @returns
  */
 export function addShopAddress(params: Record<string, any>) {
-  return request.post('shop/shop_address', params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.post('shop/shop_address', params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -36,10 +33,7 @@ export function addShopAddress(params: Record<string, any>) {
  * @returns
  */
 export function editShopAddress(params: Record<string, any>) {
-  return request.put(`shop/shop_address/${params.id}`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`shop/shop_address/${ params.id }`, params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -48,10 +42,7 @@ export function editShopAddress(params: Record<string, any>) {
  * @returns
  */
 export function deleteShopAddress(id: number) {
-  return request.delete(`shop/shop_address/${id}`, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.delete(`shop/shop_address/${ id }`, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -59,7 +50,7 @@ export function deleteShopAddress(id: number) {
  * @returns
  */
 export function getShopDefaultDeliveryAddressInfo() {
-  return request.get('shop/shop_address/default/delivery')
+    return request.get('shop/shop_address/default/delivery');
 }
 
 /**
@@ -67,5 +58,5 @@ export function getShopDefaultDeliveryAddressInfo() {
  * @returns
  */
 export function getOrderRefundAddress() {
-  return request.get('shop/order/refund/address')
-}
+    return request.get('shop/order/refund/address');
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/api/stat.ts b/admin/src/addon/shop/api/stat.ts
index 8759bc56..b0e49c1d 100644
--- a/admin/src/addon/shop/api/stat.ts
+++ b/admin/src/addon/shop/api/stat.ts
@@ -4,7 +4,7 @@ import request from '@/utils/request'
  * @returns
  */
 export function getGoodsStatisticsBasic(params: Record<string, any>) {
-  return request.get('shop/goods/statistics/basic', { params })
+    return request.get('shop/goods/statistics/basic', { params })
 }
 
 /**
@@ -12,13 +12,13 @@ export function getGoodsStatisticsBasic(params: Record<string, any>) {
  * @returns
  */
 export function getGoodsStatisticsTrend(params: Record<string, any>) {
-  return request.get('shop/goods/statistics/trend', { params })
+    return request.get('shop/goods/statistics/trend', { params })
 }
 /**
  * 获取商品排行榜统计类型
  */
 export function getGoodsStatisticsType() {
-  return request.get(`shop/goods/statistics/type`)
+    return request.get(`shop/goods/statistics/type`)
 }
 
 /**
@@ -26,5 +26,5 @@ export function getGoodsStatisticsType() {
  * @returns
  */
 export function getGoodsStatisticsRank(params: Record<string, any>) {
-  return request.get('shop/goods/statistics/rank', { params })
+    return request.get('shop/goods/statistics/rank', { params })
 }
diff --git a/admin/src/addon/shop/lang/zh-cn/address.edit.json b/admin/src/addon/shop/lang/zh-cn/address.edit.json
index 503f3b68..43e5ec4a 100644
--- a/admin/src/addon/shop/lang/zh-cn/address.edit.json
+++ b/admin/src/addon/shop/lang/zh-cn/address.edit.json
@@ -1,35 +1,35 @@
 {
-  "contactName": "联系人",
-  "mobile": "联系方式",
-  "provinceId": "省",
-  "cityId": "市",
-  "districtId": "区",
-  "address": "详细地址",
-  "fullAddress": "地址",
-  "lat": "纬度",
-  "lng": "经度",
-  "isDeliveryAddress": "是否是发货地址",
-  "isRefundAddress": "是否是退货地址",
-  "isDefaultDelivery": "默认发货地址",
-  "isDefaultRefund": "默认收货地址",
-  "contactNamePlaceholder": "请输入联系人",
-  "mobilePlaceholder": "请输入联系方式",
-  "mobileTips": "请输入正确的手机号",
-  "addressPlaceholder": "请输入详细地址",
-  "fullAddressPlaceholder": "请输入地址",
-  "latPlaceholder": "请输入纬度",
-  "lngPlaceholder": "请输入经度",
-  "isDeliveryAddressPlaceholder": "请输入是否是发货地址",
-  "isRefundAddressPlaceholder": "请输入是否是退货地址",
-  "isDefaultDeliveryPlaceholder": "请输入默认发货地址",
-  "isDefaultRefundPlaceholder": "请输入默认收货地址",
-  "addShopAddress": "添加商家地址库",
-  "updateShopAddress": "编辑商家地址库",
-  "shopAddressDeleteTips": "确定要删除该商家地址库吗？",
-  "addressType": "地址类型",
-  "deliveryAddress": "发货地址",
-  "refundAddress": "收货地址",
-  "defaultDeliveryAddress": "是否设为默认发货地址",
-  "defaultRefundAddress": "是否设为默认收货地址",
-  "addressTypeRequire": "至少需设置一项类型"
-}
+	"contactName":"联系人",
+	"mobile":"联系方式",
+	"provinceId":"省",
+	"cityId":"市",
+	"districtId":"区",
+	"address":"详细地址",
+	"fullAddress":"地址",
+	"lat":"纬度",
+	"lng":"经度",
+	"isDeliveryAddress":"是否是发货地址",
+	"isRefundAddress":"是否是退货地址",
+	"isDefaultDelivery":"默认发货地址",
+	"isDefaultRefund":"默认收货地址",
+	"contactNamePlaceholder":"请输入联系人",
+	"mobilePlaceholder":"请输入联系方式",
+	"mobileTips":"请输入正确的手机号",
+	"addressPlaceholder":"请输入详细地址",
+	"fullAddressPlaceholder":"请输入地址",
+	"latPlaceholder":"请输入纬度",
+	"lngPlaceholder":"请输入经度",
+	"isDeliveryAddressPlaceholder":"请输入是否是发货地址",
+	"isRefundAddressPlaceholder":"请输入是否是退货地址",
+	"isDefaultDeliveryPlaceholder":"请输入默认发货地址",
+	"isDefaultRefundPlaceholder":"请输入默认收货地址",
+	"addShopAddress":"添加商家地址库",
+	"updateShopAddress":"编辑商家地址库",
+	"shopAddressDeleteTips":"确定要删除该商家地址库吗？",
+	"addressType": "地址类型",
+	"deliveryAddress": "发货地址",
+	"refundAddress": "收货地址",
+	"defaultDeliveryAddress": "是否设为默认发货地址",
+	"defaultRefundAddress": "是否设为默认收货地址",
+	"addressTypeRequire": "至少需设置一项类型"
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/address.list.json b/admin/src/addon/shop/lang/zh-cn/address.list.json
index 29bd5fa0..17372d2e 100644
--- a/admin/src/addon/shop/lang/zh-cn/address.list.json
+++ b/admin/src/addon/shop/lang/zh-cn/address.list.json
@@ -22,4 +22,4 @@
   "deliveryAddress": "发货地址",
   "refundAddress": "收货地址",
   "default": "默认"
-}
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/common.json b/admin/src/addon/shop/lang/zh-cn/common.json
index 0a5c41da..f53e8247 100644
--- a/admin/src/addon/shop/lang/zh-cn/common.json
+++ b/admin/src/addon/shop/lang/zh-cn/common.json
@@ -88,41 +88,41 @@
   "goodsSearchSet": "搜索设置",
   "goodsSearchText": "搜索内容",
   "goodsSearchTextPlaceholder": "请输入搜索内容",
-  "shopMemberInfoComponentUidTextColor": "编号颜色",
-  "shopMemberInfoComponentAccount": "账号信息",
-  "shopGoodsRecommendComponentTag": "标签",
-  "shopGoodsRecommendComponentTagcolor": "标签颜色",
-  "shopGoodsRecommendComponentTagPlaceholder": "请输入标签内容",
-  "shopGoodsRecommendComponentButtonBorderColor": "按钮边框颜色",
-  "carouselStyle": "轮播样式",
-  "recommendIndicatorStyle": "指示器设置",
-  "recommendIndicatorColor": "常规颜色",
-  "recommendIndicatorActiveColor": "选中颜色",
-  "activeCubeBlockContent": "板块内容",
-  "bgImage": "背景图片",
-  "rankingTitleIcon": "图标",
-  "rankSelect": "榜单选择",
-  "rankName": "榜单名称",
-  "rankNamePlaceholder": "请输入榜单名称",
-  "showGoodsNum": "榜单商品数量",
-  "goodsSourceName": "商品来源",
-  "ruleTypeName": "排序规则",
-  "rankTypeName": "排行周期",
+  "shopMemberInfoComponentUidTextColor":"编号颜色",
+  "shopMemberInfoComponentAccount":"账号信息",
+  "shopGoodsRecommendComponentTag":"标签",
+  "shopGoodsRecommendComponentTagcolor":"标签颜色",
+  "shopGoodsRecommendComponentTagPlaceholder":"请输入标签内容",
+  "shopGoodsRecommendComponentButtonBorderColor":"按钮边框颜色",
+  "carouselStyle":"轮播样式",
+  "recommendIndicatorStyle":"指示器设置",
+  "recommendIndicatorColor":"常规颜色",
+  "recommendIndicatorActiveColor":"选中颜色",
+  "activeCubeBlockContent":"板块内容" ,
+  "bgImage":"背景图片",
+  "rankingTitleIcon":"图标" ,
+  "rankSelect":"榜单选择",
+  "rankName":"榜单名称",
+  "rankNamePlaceholder":"请输入榜单名称",
+  "showGoodsNum":"榜单商品数量",
+  "goodsSourceName":"商品来源",
+  "ruleTypeName":"排序规则",
+  "rankTypeName":"排行周期",
   "rankSelectPopupAfterTip": "个榜单",
   "rankSelectPopupGoodsMinTip": "所选榜单数量不能少于",
   "rankSelectPopupGoodsMaxTip": "所选榜单数量不能超过",
-  "rankingTitleImage": "头部图片",
-  "rankingSubTitle": "副标题",
-  "rankingSubTitleTextColor": "副标题颜色",
-  "rankTextColor": "名称颜色",
-  "rankingSubTitleLink": "副标题链接",
-  "listFrameColor": "背景颜色",
-  "topRounded": "上圆角",
-  "bottomRounded": "下圆角",
+  "rankingTitleImage":"头部图片" ,
+  "rankingSubTitle":"副标题",
+  "rankingSubTitleTextColor":"副标题颜色",
+  "rankTextColor":"名称颜色",
+  "rankingSubTitleLink":"副标题链接",
+  "listFrameColor":"背景颜色",
+  "topRounded":"上圆角",
+  "bottomRounded":"下圆角",
   "rankingStyle": "板块样式",
   "styleRecommend": "风格推荐",
   "countDownStyle": "倒计时样式",
   "newcomerNumberColor": "数字颜色",
   "newcomerNumberBg": "数字背景色",
   "newcomerOtherColor": "文字颜色"
-}
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/delivery.company.json b/admin/src/addon/shop/lang/zh-cn/delivery.company.json
index 79ab26be..7f74fd91 100644
--- a/admin/src/addon/shop/lang/zh-cn/delivery.company.json
+++ b/admin/src/addon/shop/lang/zh-cn/delivery.company.json
@@ -1,20 +1,20 @@
 {
-  "companyId": "",
-  "companyIdPlaceholder": "请输入",
-  "companyName": "名称",
-  "companyNamePlaceholder": "请输入物流公司名称",
-  "logo": "LOGO",
-  "logoPlaceholder": "请输入物流公司logo",
-  "url": "网址",
-  "urlPlaceholder": "请输入物流公司网址",
-  "expressNoPlaceholder": "请输入物流公司编号",
-  "expressNoTips": "物流公司编号作用于物流查询，请根据物流跟踪对应配置设置编号",
-  "expressNoKd100": "快递100编码",
-  "expressNoKd100Placeholder": "请输入快递100编码",
-  "addCompany": "添加物流公司",
-  "updateCompany": "编辑物流公司",
-  "electronicSheetSwitchName": "是否支持电子面单",
-  "expressNoElectronicSheet": "电子面单编号",
-  "expressNo": "物流跟踪编号",
-  "companyDeleteTips": "确定要删除该数据吗？"
-}
+      "companyId":"",
+      "companyIdPlaceholder":"请输入",
+      "companyName":"名称",
+      "companyNamePlaceholder":"请输入物流公司名称",
+      "logo":"LOGO",
+      "logoPlaceholder":"请输入物流公司logo",
+      "url":"网址",
+      "urlPlaceholder":"请输入物流公司网址",
+      "expressNoPlaceholder":"请输入物流公司编号",
+	  "expressNoTips": "物流公司编号作用于物流查询，请根据物流跟踪对应配置设置编号",
+      "expressNoKd100":"快递100编码",
+      "expressNoKd100Placeholder":"请输入快递100编码",
+      "addCompany":"添加物流公司",
+      "updateCompany":"编辑物流公司",
+      "electronicSheetSwitchName": "是否支持电子面单",
+      "expressNoElectronicSheet":"电子面单编号",
+      "expressNo":"物流跟踪编号",
+      "companyDeleteTips":"确定要删除该数据吗？"
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/delivery.company_edit.json b/admin/src/addon/shop/lang/zh-cn/delivery.company_edit.json
index 33676130..207333dc 100644
--- a/admin/src/addon/shop/lang/zh-cn/delivery.company_edit.json
+++ b/admin/src/addon/shop/lang/zh-cn/delivery.company_edit.json
@@ -1,43 +1,44 @@
 {
-  "companyId": "",
-  "companyIdPlaceholder": "请输入",
-  "companyName": "名称",
-  "companyNamePlaceholder": "请输入物流公司名称",
-  "logo": "LOGO",
-  "logoPlaceholder": "请输入物流公司logo",
-  "url": "网址",
-  "urlPlaceholder": "请输入物流公司网址",
-  "expressNo": "物流跟踪编号",
-  "expressNoPlaceholder": "请输入物流公司编号",
-  "expressNoTips": "物流公司编号作用于物流查询，请根据物流跟踪对应配置设置编号",
-  "expressNoKd100": "快递100编码",
-  "expressNoKd100Placeholder": "请输入快递100编码",
-  "addCompany": "添加物流公司",
-  "updateCompany": "编辑物流公司",
-  "expressNoElectronicSheet": "电子面单编号",
-  "expressNoElectronicSheetTips": "电子面单编号作用于电子面单查询，请根据电子面单对应配置设置编号",
-  "printStyle": "模板样式",
-  "addPrintStyle": "添加模板样式",
-  "expType": "业务类型",
-  "addExpType": "添加业务类型",
-  "expTypeName": "业务名称",
-  "expTypeTextTips": "业务名称不能为空",
-  "expTypeValueTips": "业务值不能为空",
-  "expTypeTextRepeatTips": "业务名称不可以重复，请重新填写",
-  "expTypeValueRepeatTips": "业务值不可以重复，请重新填写",
-  "expTypeValueNullTips": "业务值不可以为零",
-  "expTypeValue": "业务值",
-  "electronicSheetSwitch": "是否支持电子面单",
-  "printStyleName": "模板名称",
-  "printStyleNameTips": "模板名称不能为空",
-  "printStyleSizeTips": "模板尺寸不能为空",
-  "printStyleNameRepeatTips": "模板名称不可以重复，请重新填写",
-  "printStyleSizeRepeatTips": "模板尺寸不可以重复，请重新填写",
-  "printStyleId": "模板尺寸",
-  "expTypeTips": "快递鸟业务类型",
-  "expTypeTips1": "不填默认为1",
-  "printStyleTips": "快递鸟模版规格(常用)",
-  "printStyleTips1": "主流快递单打印纸尺寸一般为：76*130，100*180（单位mm）",
-  "printStyleTips2": "不填写则取物流公司的默认模板",
-  "examine": "点击查看"
-}
+      "companyId":"",
+      "companyIdPlaceholder":"请输入",
+      "companyName":"名称",
+      "companyNamePlaceholder":"请输入物流公司名称",
+      "logo":"LOGO",
+      "logoPlaceholder":"请输入物流公司logo",
+      "url":"网址",
+      "urlPlaceholder":"请输入物流公司网址",
+      "expressNo":"物流跟踪编号",
+      "expressNoPlaceholder":"请输入物流公司编号",
+	  "expressNoTips": "物流公司编号作用于物流查询，请根据物流跟踪对应配置设置编号",
+      "expressNoKd100":"快递100编码",
+      "expressNoKd100Placeholder":"请输入快递100编码",
+      "addCompany":"添加物流公司",
+      "updateCompany":"编辑物流公司",
+      "expressNoElectronicSheet":"电子面单编号",
+      "expressNoElectronicSheetTips":"电子面单编号作用于电子面单查询，请根据电子面单对应配置设置编号",
+      "printStyle": "模板样式",
+      "addPrintStyle": "添加模板样式",
+      "expType": "业务类型",
+      "addExpType": "添加业务类型",
+      "expTypeName": "业务名称",
+      "expTypeTextTips": "业务名称不能为空",
+      "expTypeValueTips": "业务值不能为空",
+      "expTypeTextRepeatTips": "业务名称不可以重复，请重新填写",
+      "expTypeValueRepeatTips": "业务值不可以重复，请重新填写",
+      "expTypeValueNullTips": "业务值不可以为零",
+      "expTypeValue": "业务值",
+      "electronicSheetSwitch": "是否支持电子面单",
+      "printStyleName": "模板名称" ,
+      "printStyleNameTips": "模板名称不能为空",
+      "printStyleSizeTips": "模板尺寸不能为空",
+      "printStyleNameRepeatTips": "模板名称不可以重复，请重新填写",
+      "printStyleSizeRepeatTips": "模板尺寸不可以重复，请重新填写",
+      "printStyleId": "模板尺寸",
+      "expTypeTips": "快递鸟业务类型" ,
+      "expTypeTips1": "不填默认为1" ,
+      "printStyleTips": "快递鸟模版规格(常用)",
+      "printStyleTips1": "主流快递单打印纸尺寸一般为：76*130，100*180（单位mm）",
+      "printStyleTips2": "不填写则取物流公司的默认模板",
+      "examine": "点击查看" 
+      
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/delivery.config.json b/admin/src/addon/shop/lang/zh-cn/delivery.config.json
index 6f845c75..e502b15f 100644
--- a/admin/src/addon/shop/lang/zh-cn/delivery.config.json
+++ b/admin/src/addon/shop/lang/zh-cn/delivery.config.json
@@ -1,11 +1,11 @@
 {
-  "store": "启动门店自提后，买家可选择自提点提货。",
-  "express": "启用物流配送后，买家下单可以选择快递发货。",
-  "local_delivery": "启用同城配送后，在配送范围内的买家可以选择同城配送。",
-  "deliveryStaff": "配送员",
-  "deliveryCompany": "物流公司",
-  "deliveryTemplate": "运费模版",
-  "deliverySearch": "物流跟踪",
-  "deliveryStore": "自提点",
-  "localConfig": "同城配送设置"
-}
+    "store":"启动门店自提后，买家可选择自提点提货。",
+    "express":"启用物流配送后，买家下单可以选择快递发货。",
+    "local_delivery":"启用同城配送后，在配送范围内的买家可以选择同城配送。",
+    "deliveryStaff":"配送员",
+    "deliveryCompany":"物流公司",
+    "deliveryTemplate":"运费模版",
+    "deliverySearch":"物流跟踪",
+    "deliveryStore":"自提点",
+    "localConfig": "同城配送设置"
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/delivery.electronic_sheet.json b/admin/src/addon/shop/lang/zh-cn/delivery.electronic_sheet.json
index 1c50cc68..4b72fa8b 100644
--- a/admin/src/addon/shop/lang/zh-cn/delivery.electronic_sheet.json
+++ b/admin/src/addon/shop/lang/zh-cn/delivery.electronic_sheet.json
@@ -14,4 +14,4 @@
   "setDefault": "设为默认",
   "electronicSheetDeleteTips": "确定要删除该数据吗？",
   "electronicSheetSetDefaultTips": "确定要设置为默认模版吗？"
-}
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/delivery.electronic_sheet_config.json b/admin/src/addon/shop/lang/zh-cn/delivery.electronic_sheet_config.json
index b51d2662..b8fdb16a 100644
--- a/admin/src/addon/shop/lang/zh-cn/delivery.electronic_sheet_config.json
+++ b/admin/src/addon/shop/lang/zh-cn/delivery.electronic_sheet_config.json
@@ -18,4 +18,4 @@
   "serverPort2Placeholder": "请输入服务器端口2",
   "httpsPort": "HTTPS端口",
   "httpsPortPlaceholder": "请输入HTTPS端口"
-}
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/delivery.electronic_sheet_edit.json b/admin/src/addon/shop/lang/zh-cn/delivery.electronic_sheet_edit.json
index ce79ed5c..2b1bee70 100644
--- a/admin/src/addon/shop/lang/zh-cn/delivery.electronic_sheet_edit.json
+++ b/admin/src/addon/shop/lang/zh-cn/delivery.electronic_sheet_edit.json
@@ -31,4 +31,4 @@
   "examine": "点击查看",
   "customerNameTips": "快递鸟电子面单账号申请",
   "customerNameTips1": "电子面单账号对照表"
-}
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/delivery.local.json b/admin/src/addon/shop/lang/zh-cn/delivery.local.json
index 1c34ebb2..321ec0cd 100644
--- a/admin/src/addon/shop/lang/zh-cn/delivery.local.json
+++ b/admin/src/addon/shop/lang/zh-cn/delivery.local.json
@@ -1,55 +1,55 @@
 {
-  "basicSettings": "同城配送基础设置",
-  "timeIsOpen": "配送时间设置",
-  "timeIsOpenTips": "开启后，买家下单选择同城配送时，可选择配送时间，提交订单后，将在买家备注中显示。",
-  "close": "关闭",
-  "open": "开启",
-  "everyDay": "每天",
-  "monday": "周一",
-  "tuesday": "周二",
-  "wednesday": "周三",
-  "thursday": "周四",
-  "friday": "周五",
-  "saturday": "周六",
-  "sunday": "周日",
-  "timeWeekRequire": "请选择配送时间",
-  "deliveryTimeSetting": "配送时间设置",
-  "feeType": "收费标准",
-  "region": "按区域收取配送费",
-  "distance": "按距离收取配送费",
-  "district": "按行政区域收取配送费",
-  "feeSetting": "费用设置",
-  "weightFee": "续重收费",
-  "feeSettingTextOne": "km内按",
-  "feeSettingTextTwo": "元收取配送费，每超出",
-  "feeSettingTextThree": "km费用增加",
-  "priceUnit": "元",
-  "weightFeeTextOne": "商品重量",
-  "weightFeeTextTwo": "kg 内不额外收费，每超出",
-  "weightFeeTextThree": "kg 费用增加",
-  "areaName": "区域名称",
-  "startPrice": "起送价",
-  "deliveryPrice": "配送费",
-  "areaType": "划分方式",
-  "radius": "半径",
-  "custom": "自定义",
-  "addDeliveryArea": "添加配送区域",
-  "baseDistRequire": "请输入起始公里数",
-  "gradDistRequire": "请输入超出公里数",
-  "basePriceRequire": "请输入起始公里内的配送费用",
-  "gradPriceRequire": "请输入每超出公里部分的费用",
-  "areaNameRequire": "请输入区域名称",
-  "startPriceRequire": "请输入起送价",
-  "startPriceMin": "起送价不能小于0",
-  "deliveryPriceRequire": "请输入配送费",
-  "deliveryPriceMin": "配送费不能小于0",
-  "areaPlaceholder": "请添加配送区域",
-  "deliveryType": "配送方式",
-  "business": "商家自配送",
-  "deliveryTypeRequire": "至少需选择一种配送方式",
-  "deliveryAddress": "取货地址",
-  "defaultDeliveryAddressEmpty": "请先配置默认发货地址",
-  "toSetting": "去配置",
-  "update": "修改",
-  "deliveryAddressChange": "取货地址已变更请注意是否需重新调整配送区域"
-}
+    "basicSettings":"同城配送基础设置",
+    "timeIsOpen":"配送时间设置",
+    "timeIsOpenTips":"开启后，买家下单选择同城配送时，可选择配送时间，提交订单后，将在买家备注中显示。",
+    "close": "关闭",
+    "open": "开启",
+    "everyDay": "每天",
+    "monday": "周一",
+    "tuesday": "周二",
+    "wednesday": "周三",
+    "thursday": "周四",
+    "friday": "周五",
+    "saturday": "周六",
+    "sunday": "周日",
+    "timeWeekRequire": "请选择配送时间",
+    "deliveryTimeSetting": "配送时间设置",
+    "feeType": "收费标准",
+    "region": "按区域收取配送费",
+    "distance": "按距离收取配送费",
+    "district": "按行政区域收取配送费",
+    "feeSetting": "费用设置",
+    "weightFee": "续重收费",
+    "feeSettingTextOne": "km内按",
+    "feeSettingTextTwo": "元收取配送费，每超出",
+    "feeSettingTextThree": "km费用增加",
+    "priceUnit": "元",
+    "weightFeeTextOne": "商品重量",
+    "weightFeeTextTwo": "kg 内不额外收费，每超出",
+    "weightFeeTextThree": "kg 费用增加",
+    "areaName": "区域名称",
+    "startPrice": "起送价",
+    "deliveryPrice": "配送费",
+    "areaType": "划分方式",
+    "radius": "半径",
+    "custom": "自定义",
+    "addDeliveryArea": "添加配送区域",
+    "baseDistRequire": "请输入起始公里数",
+    "gradDistRequire": "请输入超出公里数",
+    "basePriceRequire": "请输入起始公里内的配送费用",
+    "gradPriceRequire": "请输入每超出公里部分的费用",
+    "areaNameRequire": "请输入区域名称",
+    "startPriceRequire": "请输入起送价",
+    "startPriceMin": "起送价不能小于0",
+    "deliveryPriceRequire": "请输入配送费",
+    "deliveryPriceMin": "配送费不能小于0",
+    "areaPlaceholder": "请添加配送区域",
+    "deliveryType": "配送方式",
+    "business": "商家自配送",
+    "deliveryTypeRequire": "至少需选择一种配送方式",
+    "deliveryAddress": "取货地址",
+    "defaultDeliveryAddressEmpty": "请先配置默认发货地址",
+    "toSetting": "去配置",
+    "update": "修改",
+    "deliveryAddressChange": "取货地址已变更请注意是否需重新调整配送区域"
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/delivery.search.json b/admin/src/addon/shop/lang/zh-cn/delivery.search.json
index 0b0e6436..ccfb3e43 100644
--- a/admin/src/addon/shop/lang/zh-cn/delivery.search.json
+++ b/admin/src/addon/shop/lang/zh-cn/delivery.search.json
@@ -1,20 +1,20 @@
 {
-  "prompt": "提示",
-  "promptTips1-1": "请到快递鸟官网申请",
-  "promptTips1-2": "快递鸟接口：目前只支持“申通，圆通、百世，极兔”免费查询。",
-  "promptTips2": "请到快递100官网申请",
-  "interfaceType": "接口类型",
-  "kdn": "快递鸟",
-  "kd100": "快递100",
-  "kdnEBusinessIDPlaceholder": "请输入快递鸟EBusinessID",
-  "kdnEBusinessIDTips": "快递鸟电商ID",
-  "kdnAppKeyPlaceholder": "请输入快递鸟AppKey",
-  "kdnAppKeyTips": "快递鸟分配的电商加密私钥",
-  "isPayEdition": "快递鸟套餐",
-  "free": "免费",
-  "pay": "付费",
-  "kd100AppKeyPlaceholder": "请输入快递100AppKey",
-  "kd100AppKeyTips": "快递100应用密钥",
-  "kd100CustomerPlaceholder": "请输入快递100Customer",
-  "kd100CustomerTips": "快递100分配给的公司编号"
-}
+	"prompt": "提示",
+	"promptTips1-1": "请到快递鸟官网申请",
+	"promptTips1-2": "快递鸟接口：目前只支持“申通，圆通、百世，极兔”免费查询。",
+	"promptTips2": "请到快递100官网申请",
+	"interfaceType": "接口类型",
+	"kdn": "快递鸟",
+	"kd100": "快递100",
+	"kdnEBusinessIDPlaceholder": "请输入快递鸟EBusinessID",
+	"kdnEBusinessIDTips": "快递鸟电商ID",
+	"kdnAppKeyPlaceholder": "请输入快递鸟AppKey",
+	"kdnAppKeyTips": "快递鸟分配的电商加密私钥",
+	"isPayEdition": "快递鸟套餐",
+	"free": "免费",
+	"pay": "付费",
+	"kd100AppKeyPlaceholder": "请输入快递100AppKey",
+	"kd100AppKeyTips": "快递100应用密钥",
+	"kd100CustomerPlaceholder": "请输入快递100Customer",
+	"kd100CustomerTips": "快递100分配给的公司编号"
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/delivery.staff.json b/admin/src/addon/shop/lang/zh-cn/delivery.staff.json
index a2f139bd..2d285388 100644
--- a/admin/src/addon/shop/lang/zh-cn/delivery.staff.json
+++ b/admin/src/addon/shop/lang/zh-cn/delivery.staff.json
@@ -1,9 +1,9 @@
 {
-  "addDeliveryPersonnel": "添加配送员",
-  "updateDeliver": "编辑配送员",
-  "deliverName": "配送员名称",
-  "deliverMobile": "配送员手机号",
-  "deliverNamePlaceholder": "请输入配送员名称",
-  "deliverMobilePlaceholder": "请输入配送员手机号",
-  "deliverDeleteTips": "确定要删除该数据吗？"
-}
+    "addDeliveryPersonnel":"添加配送员",
+    "updateDeliver":"编辑配送员",
+    "deliverName":"配送员名称",
+    "deliverMobile":"配送员手机号",
+    "deliverNamePlaceholder":"请输入配送员名称",
+    "deliverMobilePlaceholder":"请输入配送员手机号",
+    "deliverDeleteTips":"确定要删除该数据吗？"
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/delivery.store.json b/admin/src/addon/shop/lang/zh-cn/delivery.store.json
index a20008d8..d3e0d04c 100644
--- a/admin/src/addon/shop/lang/zh-cn/delivery.store.json
+++ b/admin/src/addon/shop/lang/zh-cn/delivery.store.json
@@ -1,18 +1,18 @@
 {
-  "storeId": "",
-  "storeName": "自提点信息",
-  "storeNamePlaceholder": "请输入自提点名称",
-  "storeLogo": "自提点logo",
-  "storeMobile": "联系电话",
-  "address": "详细地址",
-  "fullAddress": "联系地址",
-  "longitude": "经度",
-  "latitude": "纬度",
-  "tradeTime": "营业时间",
-  "createTime": "添加时间",
-  "createTimePlaceholder": "请输入添加时间",
-  "addStore": "添加自提点",
-  "updateStore": "编辑自提点",
-  "storeDeleteTips": "确定要删除该数据吗？",
-  "storeInfo": "自提点信息"
-}
+      "storeId":"",
+      "storeName":"自提点信息",
+      "storeNamePlaceholder":"请输入自提点名称",
+      "storeLogo":"自提点logo",
+      "storeMobile":"联系电话",
+      "address":"详细地址",
+      "fullAddress":"联系地址",
+      "longitude":"经度",
+      "latitude":"纬度",
+      "tradeTime":"营业时间",
+      "createTime":"添加时间",
+      "createTimePlaceholder":"请输入添加时间",
+      "addStore":"添加自提点",
+      "updateStore":"编辑自提点",
+      "storeDeleteTips":"确定要删除该数据吗？",
+	  "storeInfo": "自提点信息"
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/delivery.store_edit.json b/admin/src/addon/shop/lang/zh-cn/delivery.store_edit.json
index 48798606..861f59d2 100644
--- a/admin/src/addon/shop/lang/zh-cn/delivery.store_edit.json
+++ b/admin/src/addon/shop/lang/zh-cn/delivery.store_edit.json
@@ -1,38 +1,38 @@
 {
-  "storeName": "自提点名称",
-  "storeDesc": "简介",
-  "storeLogo": "自提点logo",
-  "storeMobile": "手机号",
-  "provinceId": "省id",
-  "cityId": "市",
-  "districtId": "县（区）",
-  "address": "详细地址",
-  "fullAddress": "完整地址",
-  "longitude": "经度",
-  "latitude": "纬度",
-  "tradeTime": "营业时间",
-  "createTime": "下单时间",
-  "updateTime": "更新时间",
-  "storeNamePlaceholder": "请输入自提点名称",
-  "storeDescPlaceholder": "请输入简介",
-  "storeLogoPlaceholder": "请上传自提点logo",
-  "storeMobilePlaceholder": "请输入手机号",
-  "provinceIdPlaceholder": "请选择省id",
-  "cityIdPlaceholder": "请选择市",
-  "districtIdPlaceholder": "请选择县（区）",
-  "addressPlaceholder": "请输入详细地址",
-  "fullAddressPlaceholder": "请输入完整地址",
-  "longitudePlaceholder": "请输入经度",
-  "latitudePlaceholder": "请输入纬度",
-  "tradeTimePlaceholder": "请输入营业时间",
-  "tradeTimeTips": "例：上午9:00-12:00，下午2:00-6:00",
-  "createTimePlaceholder": "请选择添加时间",
-  "updateTimePlaceholder": "请输入更新时间",
-  "addStore": "添加自提点",
-  "updateStore": "编辑自提点",
-  "storeDeleteTips": "确定要删除该自提点吗？",
-  "storeAddress": "自提点地址",
-  "storeAddressPlaceholder": "请选择自提点地址",
-  "storeAddressDetail": "自提点详细地址",
-  "storeAddressDetailPlaceholder": "请输入自提点详细地址"
-}
+      "storeName":"自提点名称",
+      "storeDesc":"简介",
+      "storeLogo":"自提点logo",
+      "storeMobile":"手机号",
+      "provinceId":"省id",
+      "cityId":"市",
+      "districtId":"县（区）",
+      "address":"详细地址",
+      "fullAddress":"完整地址",
+      "longitude":"经度",
+      "latitude":"纬度",
+      "tradeTime":"营业时间",
+      "createTime":"下单时间",
+      "updateTime":"更新时间",
+      "storeNamePlaceholder":"请输入自提点名称",
+      "storeDescPlaceholder":"请输入简介",
+      "storeLogoPlaceholder":"请上传自提点logo",
+      "storeMobilePlaceholder":"请输入手机号",
+      "provinceIdPlaceholder":"请选择省id",
+      "cityIdPlaceholder":"请选择市",
+      "districtIdPlaceholder":"请选择县（区）",
+      "addressPlaceholder":"请输入详细地址",
+      "fullAddressPlaceholder":"请输入完整地址",
+      "longitudePlaceholder":"请输入经度",
+      "latitudePlaceholder":"请输入纬度",
+      "tradeTimePlaceholder":"请输入营业时间",
+	  "tradeTimeTips": "例：上午9:00-12:00，下午2:00-6:00",
+      "createTimePlaceholder":"请选择添加时间",
+      "updateTimePlaceholder":"请输入更新时间",
+      "addStore":"添加自提点",
+      "updateStore":"编辑自提点",
+      "storeDeleteTips":"确定要删除该自提点吗？",
+	  "storeAddress": "自提点地址",
+	  "storeAddressPlaceholder": "请选择自提点地址",
+	  "storeAddressDetail": "自提点详细地址",
+	  "storeAddressDetailPlaceholder": "请输入自提点详细地址"
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/delivery.template.json b/admin/src/addon/shop/lang/zh-cn/delivery.template.json
index 4f6ba643..4508f1eb 100644
--- a/admin/src/addon/shop/lang/zh-cn/delivery.template.json
+++ b/admin/src/addon/shop/lang/zh-cn/delivery.template.json
@@ -1,12 +1,12 @@
 {
-  "templateName": "运费模板名称",
-  "templateNamePlaceholder": "请输入运费模板名称",
-  "createTime": "创建时间",
-  "addTemplate": "添加运费模板",
-  "updateTemplate": "编辑运费模板",
-  "templateDeleteTips": "确定要删除该模板吗？",
-  "feeTypeName": "计费类型",
-  "freeShipping": "指定区域包邮",
-  "open": "启用",
-  "close": "关闭"
-}
+	"templateName":"运费模板名称",
+	"templateNamePlaceholder":"请输入运费模板名称",
+	"createTime":"创建时间",
+	"addTemplate":"添加运费模板",
+	"updateTemplate":"编辑运费模板",
+	"templateDeleteTips":"确定要删除该模板吗？",
+	"feeTypeName": "计费类型",
+	"freeShipping": "指定区域包邮",
+	"open": "启用",
+	"close": "关闭"
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/delivery.template_edit.json b/admin/src/addon/shop/lang/zh-cn/delivery.template_edit.json
index 5da4c502..1cd0689e 100644
--- a/admin/src/addon/shop/lang/zh-cn/delivery.template_edit.json
+++ b/admin/src/addon/shop/lang/zh-cn/delivery.template_edit.json
@@ -1,39 +1,39 @@
 {
-  "templateName": "运费模板名称",
-  "templateNamePlaceholder": "请输入运费模板名称",
-  "createTime": "创建时间",
-  "addTemplate": "添加运费模板",
-  "updateTemplate": "编辑运费模板",
-  "templateDeleteTips": "确定要删除该模板吗？",
-  "feeTypeName": "计费类型",
-  "isDefault": "默认模板",
-  "num": "按件",
-  "weight": "按重量",
-  "volume": "按体积",
-  "feeSetting": "费用设置",
-  "selectArea": "选择地区",
-  "firstNum": "首件（件）",
-  "continueNum": "续件（件）",
-  "firstWeight": "首件重量（kg）",
-  "fee": "运费（元）",
-  "continueFee": "续费（元）",
-  "continueWeight": "续件重量（kg）",
-  "firstVolume": "首件体积（m³）",
-  "continueVolume": "续件体积（m³）",
-  "deliveryArea": "配送区域",
-  "addDeliveryArea": "添加单独配送区域",
-  "freeShipping": "指定区域包邮",
-  "freeShippingArea": "包邮区域",
-  "addFreeShippingArea": "添加包邮区域",
-  "freeShippingAreaTips": "两个条件满足其一便可以包邮",
-  "noDelivery": "不配送区域",
-  "addNoDelivery": "添加不配送区域",
-  "freeShippingNum": "包邮件数",
-  "freeShippingWeight": "包邮重量（kg）",
-  "freeShippingVolume": "包邮体积（m³）",
-  "freeShippingPrice": "包邮金额",
-  "areaPlaceholder": "请选择地区",
-  "noDeliveryPlaceholder": "请选择不配送的地区",
-  "freeShippingPlaceholder": "请选择包邮的地区",
-  "notUnderZero": "不能小于等于0"
-}
+	"templateName":"运费模板名称",
+	"templateNamePlaceholder":"请输入运费模板名称",
+	"createTime":"创建时间",
+	"addTemplate":"添加运费模板",
+	"updateTemplate":"编辑运费模板",
+	"templateDeleteTips":"确定要删除该模板吗？",
+	"feeTypeName": "计费类型",
+	"isDefault": "默认模板",
+	"num": "按件",
+	"weight": "按重量",
+	"volume": "按体积",
+	"feeSetting": "费用设置",
+	"selectArea": "选择地区",
+	"firstNum": "首件（件）",
+	"continueNum": "续件（件）",
+	"firstWeight": "首件重量（kg）",
+	"fee": "运费（元）",
+	"continueFee": "续费（元）",
+	"continueWeight": "续件重量（kg）",
+	"firstVolume": "首件体积（m³）",
+	"continueVolume": "续件体积（m³）",
+	"deliveryArea": "配送区域",
+	"addDeliveryArea": "添加单独配送区域",
+	"freeShipping": "指定区域包邮",
+	"freeShippingArea": "包邮区域",
+	"addFreeShippingArea": "添加包邮区域",
+	"freeShippingAreaTips": "两个条件满足其一便可以包邮",
+	"noDelivery": "不配送区域",
+	"addNoDelivery": "添加不配送区域",
+	"freeShippingNum": "包邮件数",
+	"freeShippingWeight": "包邮重量（kg）",
+	"freeShippingVolume": "包邮体积（m³）",
+	"freeShippingPrice": "包邮金额",
+	"areaPlaceholder":"请选择地区",
+	"noDeliveryPlaceholder": "请选择不配送的地区",
+	"freeShippingPlaceholder": "请选择包邮的地区",
+	"notUnderZero": "不能小于等于0"
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/goods.attr.json b/admin/src/addon/shop/lang/zh-cn/goods.attr.json
index d0f352b9..e0290cdc 100644
--- a/admin/src/addon/shop/lang/zh-cn/goods.attr.json
+++ b/admin/src/addon/shop/lang/zh-cn/goods.attr.json
@@ -5,6 +5,6 @@
   "addShopGoodsAttr": "添加参数模板",
   "updateShopGoodsAttr": "编辑参数模板",
   "goodsAttrDeleteTips": "确定要删除该数据吗？",
-  "sortTips": "排序号格式输入错误",
+  "sortTips":"排序号格式输入错误",
   "manage": "管理"
-}
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/goods.attr_edit.json b/admin/src/addon/shop/lang/zh-cn/goods.attr_edit.json
index d127a986..0c03e2ae 100644
--- a/admin/src/addon/shop/lang/zh-cn/goods.attr_edit.json
+++ b/admin/src/addon/shop/lang/zh-cn/goods.attr_edit.json
@@ -15,4 +15,4 @@
   "attrValueName": "参数名称",
   "addAttrValue": "添加参数",
   "attrValueNamePlaceholder": "请输入参数名称"
-}
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/goods.brand_list.json b/admin/src/addon/shop/lang/zh-cn/goods.brand_list.json
index 24733403..71be5bba 100644
--- a/admin/src/addon/shop/lang/zh-cn/goods.brand_list.json
+++ b/admin/src/addon/shop/lang/zh-cn/goods.brand_list.json
@@ -1,15 +1,15 @@
 {
-  "brandId": "品牌ID",
-  "brandIdPlaceholder": "请输入品牌ID",
-  "brandName": "品牌名称",
-  "brandNamePlaceholder": "请输入品牌名称",
-  "logo": "品牌logo",
-  "logoPlaceholder": "请输入品牌logo",
-  "desc": "品牌介绍",
-  "descPlaceholder": "请输入品牌介绍",
-  "sort": "排序",
-  "sortPlaceholder": "请输入排序",
-  "addBrand": "添加商品品牌",
-  "updateBrand": "编辑商品品牌",
-  "brandDeleteTips": "确定要删除该数据吗？"
-}
+      "brandId":"品牌ID",
+      "brandIdPlaceholder":"请输入品牌ID",
+      "brandName":"品牌名称",
+      "brandNamePlaceholder":"请输入品牌名称",
+      "logo":"品牌logo",
+      "logoPlaceholder":"请输入品牌logo",
+      "desc":"品牌介绍",
+      "descPlaceholder":"请输入品牌介绍",
+      "sort":"排序",
+      "sortPlaceholder":"请输入排序",
+      "addBrand":"添加商品品牌",
+      "updateBrand":"编辑商品品牌",
+      "brandDeleteTips":"确定要删除该数据吗？"
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/goods.category.json b/admin/src/addon/shop/lang/zh-cn/goods.category.json
index c2d44c2f..fd8f9f7f 100644
--- a/admin/src/addon/shop/lang/zh-cn/goods.category.json
+++ b/admin/src/addon/shop/lang/zh-cn/goods.category.json
@@ -1,26 +1,26 @@
 {
-  "categoryId": "商品分类id",
-  "categoryIdPlaceholder": "请输入商品分类id",
-  "categoryName": "分类名称",
-  "categoryNamePlaceholder": "请输入分类名称",
-  "image": "分类图片",
-  "imagePlaceholder": "请输入分类图片",
-  "pid": "上级分类",
-  "pidPlaceholder": "请选择上级分类",
-  "categoryFullName": "组装分类名称",
-  "categoryFullNamePlaceholder": "请输入组装分类名称",
-  "isShow": "是否显示",
-  "sort": "排序号",
-  "sortPlaceholder": "请输入排序号",
-  "addCategory": "添加商品分类",
-  "updateCategory": "编辑商品分类",
-  "categoryDeleteTips": "确定要删除该数据吗？",
-  "categoryDeleteTips1": "子级分类也会删除，确定要删除该数据吗？",
-  "spreadGoodsCategory": "推广",
-  "goodsCategorySpreadTitle": "商品分类推广",
-  "spreadLink": "推广链接",
-  "copy": "复制",
-  "downloadQrcode": "下载二维码",
-  "tabGoodsCategory": "商品分类",
-  "tabGoodsCategoryConfig": "分类设置"
-}
+      "categoryId":"商品分类id",
+      "categoryIdPlaceholder":"请输入商品分类id",
+      "categoryName":"分类名称",
+      "categoryNamePlaceholder":"请输入分类名称",
+      "image":"分类图片",
+      "imagePlaceholder":"请输入分类图片",
+      "pid":"上级分类",
+      "pidPlaceholder":"请选择上级分类",
+      "categoryFullName":"组装分类名称",
+      "categoryFullNamePlaceholder":"请输入组装分类名称",
+      "isShow":"是否显示",
+      "sort":"排序号",
+      "sortPlaceholder":"请输入排序号",
+      "addCategory":"添加商品分类",
+      "updateCategory":"编辑商品分类",
+      "categoryDeleteTips":"确定要删除该数据吗？",
+      "categoryDeleteTips1":"子级分类也会删除，确定要删除该数据吗？",
+      "spreadGoodsCategory": "推广",
+      "goodsCategorySpreadTitle": "商品分类推广",
+      "spreadLink": "推广链接",
+      "copy": "复制",
+      "downloadQrcode": "下载二维码",
+      "tabGoodsCategory": "商品分类",
+      "tabGoodsCategoryConfig": "分类设置"
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/goods.category_config.json b/admin/src/addon/shop/lang/zh-cn/goods.category_config.json
index 7a9978d9..041cb29f 100644
--- a/admin/src/addon/shop/lang/zh-cn/goods.category_config.json
+++ b/admin/src/addon/shop/lang/zh-cn/goods.category_config.json
@@ -1,27 +1,27 @@
 {
-  "categoryTemplate": "分类模板",
-  "categoryType": "分类类型",
-  "categorystyleOne": "一级分类",
-  "categorystyleTwo": "二级分类",
-  "pageSettings": "页面设置",
-  "pageTitle": "页面名称",
-  "pageTitlePlaceholder": "请输入页面名称",
-  "searchControl": "搜索栏",
-  "searchTitle": "搜索栏文字",
-  "searchTitlePlaceholder": "请输入搜索栏文字",
-  "open": "开启",
-  "close": "关闭",
-  "goodsStyle": "商品排列",
-  "singleCols": "单列",
-  "doubleCols": "双列",
-  "sort": "商品排序",
-  "sortPlaceholder": "请选择商品排序",
-  "cartControl": "购物车显示",
-  "cartStyle": "购物车样式",
-  "cartTextPlaceholder": "请输入购物车按钮文字",
-  "cartEvent": "点击按钮",
-  "detail": "跳转商品详情",
-  "cart": "加入购物车",
-  "tabGoodsCategory": "商品分类",
-  "tabGoodsCategoryConfig": "分类设置"
-}
+    "categoryTemplate":"分类模板",
+    "categoryType":"分类类型",
+    "categorystyleOne":"一级分类",
+    "categorystyleTwo":"二级分类",
+    "pageSettings":"页面设置",
+    "pageTitle":"页面名称",
+    "pageTitlePlaceholder":"请输入页面名称",
+    "searchControl":"搜索栏",
+    "searchTitle":"搜索栏文字",
+    "searchTitlePlaceholder":"请输入搜索栏文字",
+    "open":"开启",
+    "close":"关闭",
+    "goodsStyle":"商品排列",
+    "singleCols": "单列",
+    "doubleCols": "双列",
+    "sort":"商品排序",
+    "sortPlaceholder":"请选择商品排序",
+    "cartControl":"购物车显示",
+    "cartStyle":"购物车样式",
+    "cartTextPlaceholder":"请输入购物车按钮文字",
+    "cartEvent":"点击按钮",
+    "detail": "跳转商品详情",
+    "cart": "加入购物车",
+    "tabGoodsCategory": "商品分类",
+    "tabGoodsCategoryConfig": "分类设置"
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/goods.evaluate.json b/admin/src/addon/shop/lang/zh-cn/goods.evaluate.json
index ffee2f50..731211ce 100644
--- a/admin/src/addon/shop/lang/zh-cn/goods.evaluate.json
+++ b/admin/src/addon/shop/lang/zh-cn/goods.evaluate.json
@@ -1,49 +1,49 @@
 {
-  "evaluateId": "",
-  "evaluateIdPlaceholder": "请输入",
-  "orderId": "订单id",
-  "orderIdPlaceholder": "请输入订单id",
-  "orderGoodsId": "订单项ID",
-  "orderGoodsIdPlaceholder": "请输入订单项ID",
-  "goodsId": "商品ID",
-  "goodsIdPlaceholder": "请选择商品",
-  "memberId": "会员ID",
-  "memberIdPlaceholder": "请输入会员ID",
-  "content": "评价内容",
-  "contentPlaceholder": "请输入评价内容",
-  "images": "评价图片",
-  "imagesPlaceholder": "请输入评价图片",
-  "isAnonymous": "是否匿名",
-  "anonymous": "匿名",
-  "notAnonymous": "不匿名",
-  "scores": "评价等级",
-  "scoresPlaceholder": "请输入评价分数 1-5",
-  "auditName": "审核状态",
-  "explainFirst": "商家回复",
-  "explainFirstPlaceholder": "请输入商家回复",
-  "createTime": "评价时间",
-  "createTimePlaceholder": "请输入评价时间",
-  "again": "追评",
-  "againTime": "追评时间",
-  "againTimePlaceholder": "请输入追评时间",
-  "isShow": "是否显示",
-  "show": "显示",
-  "notShow": "不显示",
-  "isShowPlaceholder": "请输入是否显示 1显示 2不显示",
-  "addEvaluate": "添加自评",
-  "updateEvaluate": "编辑商品评价",
-  "evaluateDeleteTips": "确定要删除该数据吗？",
-  "goodsInfo": "商品信息",
-  "memberHead": "会员头像",
-  "memberName": "会员名称",
-  "memberNamePlaceholder": "请输入会员名称",
-  "adopt": "通过",
-  "refuse": "拒绝",
-  "auditAdoptTips": "确定要通过审核吗？",
-  "reply": "回复",
-  "goodsName": "商品名称",
-  "goodsNamePlaceholder": "请输入商品名称",
-  "topping": "置顶",
-  "cancelTopping": "取消置顶",
-  "memberHeadPlaceholder": "请上传会员头像"
-}
+      "evaluateId":"",
+      "evaluateIdPlaceholder":"请输入",
+      "orderId":"订单id",
+      "orderIdPlaceholder":"请输入订单id",
+      "orderGoodsId":"订单项ID",
+      "orderGoodsIdPlaceholder":"请输入订单项ID",
+      "goodsId":"商品ID",
+      "goodsIdPlaceholder":"请选择商品",
+      "memberId":"会员ID",
+      "memberIdPlaceholder":"请输入会员ID",
+      "content":"评价内容",
+      "contentPlaceholder":"请输入评价内容",
+      "images":"评价图片",
+      "imagesPlaceholder":"请输入评价图片",
+      "isAnonymous":"是否匿名",
+      "anonymous": "匿名",
+	  "notAnonymous": "不匿名",
+      "scores":"评价等级",
+      "scoresPlaceholder":"请输入评价分数 1-5",
+      "auditName":"审核状态",
+      "explainFirst":"商家回复",
+	  "explainFirstPlaceholder": "请输入商家回复",
+      "createTime":"评价时间",
+      "createTimePlaceholder":"请输入评价时间",
+	  "again": "追评",
+      "againTime":"追评时间",
+      "againTimePlaceholder":"请输入追评时间",
+      "isShow":"是否显示",
+	  "show": "显示",
+	  "notShow": "不显示",
+      "isShowPlaceholder":"请输入是否显示 1显示 2不显示",
+      "addEvaluate":"添加自评",
+      "updateEvaluate":"编辑商品评价",
+      "evaluateDeleteTips":"确定要删除该数据吗？",
+	  "goodsInfo": "商品信息",
+	  "memberHead": "会员头像",
+	  "memberName": "会员名称",
+	  "memberNamePlaceholder": "请输入会员名称",
+	  "adopt": "通过",
+	  "refuse": "拒绝",
+	  "auditAdoptTips": "确定要通过审核吗？",
+	  "reply": "回复",
+	  "goodsName": "商品名称",
+	  "goodsNamePlaceholder": "请输入商品名称",
+	  "topping": "置顶", 
+	  "cancelTopping": "取消置顶",
+	  "memberHeadPlaceholder": "请上传会员头像"
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/goods.evaluate_edit.json b/admin/src/addon/shop/lang/zh-cn/goods.evaluate_edit.json
index f9347a12..e9224851 100644
--- a/admin/src/addon/shop/lang/zh-cn/goods.evaluate_edit.json
+++ b/admin/src/addon/shop/lang/zh-cn/goods.evaluate_edit.json
@@ -1,37 +1,37 @@
 {
-  "orderId": "订单id",
-  "orderGoodsId": "订单项ID",
-  "goodsId": "商品ID",
-  "memberId": "会员ID",
-  "content": "评价内容",
-  "images": "评价图片",
-  "isAnonymous": "0 匿名  1不匿名",
-  "scores": "评价分数 1-5",
-  "isAudit": "审核状态 1待审 2通过 3拒绝",
-  "explainFirst": "解释内容",
-  "againContent": "追评内容",
-  "againImages": "追评图片",
-  "againExplain": "追评解释",
-  "againTime": "追评时间",
-  "againIsAudit": "审核状态 1待审 2通过 3拒绝",
-  "isShow": "是否显示 1显示 2不显示",
-  "orderIdPlaceholder": "请输入订单id",
-  "orderGoodsIdPlaceholder": "请输入订单项ID",
-  "goodsIdPlaceholder": "请输入商品ID",
-  "memberIdPlaceholder": "请输入会员ID",
-  "contentPlaceholder": "请输入评价内容",
-  "imagesPlaceholder": "请上传评价图片",
-  "isAnonymousPlaceholder": "请输入0 匿名  1不匿名",
-  "scoresPlaceholder": "请输入评价分数 1-5",
-  "isAuditPlaceholder": "请输入审核状态 1待审 2通过 3拒绝",
-  "explainFirstPlaceholder": "请输入解释内容",
-  "againContentPlaceholder": "请输入追评内容",
-  "againImagesPlaceholder": "请上传追评图片",
-  "againExplainPlaceholder": "请输入追评解释",
-  "againTimePlaceholder": "请输入追评时间",
-  "againIsAuditPlaceholder": "请输入审核状态 1待审 2通过 3拒绝",
-  "isShowPlaceholder": "请输入是否显示 1显示 2不显示",
-  "addEvaluate": "添加商品评价",
-  "updateEvaluate": "编辑商品评价",
-  "evaluateDeleteTips": "确定要删除该商品评价吗？"
-}
+      "orderId":"订单id",
+      "orderGoodsId":"订单项ID",
+      "goodsId":"商品ID",
+      "memberId":"会员ID",
+      "content":"评价内容",
+      "images":"评价图片",
+      "isAnonymous":"0 匿名  1不匿名",
+      "scores":"评价分数 1-5",
+      "isAudit":"审核状态 1待审 2通过 3拒绝",
+      "explainFirst":"解释内容",
+      "againContent":"追评内容",
+      "againImages":"追评图片",
+      "againExplain":"追评解释",
+      "againTime":"追评时间",
+      "againIsAudit":"审核状态 1待审 2通过 3拒绝",
+      "isShow":"是否显示 1显示 2不显示",
+      "orderIdPlaceholder":"请输入订单id",
+      "orderGoodsIdPlaceholder":"请输入订单项ID",
+      "goodsIdPlaceholder":"请输入商品ID",
+      "memberIdPlaceholder":"请输入会员ID",
+      "contentPlaceholder":"请输入评价内容",
+      "imagesPlaceholder":"请上传评价图片",
+      "isAnonymousPlaceholder":"请输入0 匿名  1不匿名",
+      "scoresPlaceholder":"请输入评价分数 1-5",
+      "isAuditPlaceholder":"请输入审核状态 1待审 2通过 3拒绝",
+      "explainFirstPlaceholder":"请输入解释内容",
+      "againContentPlaceholder":"请输入追评内容",
+      "againImagesPlaceholder":"请上传追评图片",
+      "againExplainPlaceholder":"请输入追评解释",
+      "againTimePlaceholder":"请输入追评时间",
+      "againIsAuditPlaceholder":"请输入审核状态 1待审 2通过 3拒绝",
+      "isShowPlaceholder":"请输入是否显示 1显示 2不显示",
+      "addEvaluate":"添加商品评价",
+      "updateEvaluate":"编辑商品评价",
+      "evaluateDeleteTips":"确定要删除该商品评价吗？"
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/goods.label_group_list.json b/admin/src/addon/shop/lang/zh-cn/goods.label_group_list.json
index 91990e86..dfceabec 100644
--- a/admin/src/addon/shop/lang/zh-cn/goods.label_group_list.json
+++ b/admin/src/addon/shop/lang/zh-cn/goods.label_group_list.json
@@ -9,4 +9,4 @@
   "updateLabelGroup": "编辑标签分组",
   "sortTips": "排序号格式输入错误",
   "labelGroupDeleteTips": "确定要删除该数据吗？"
-}
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/goods.label_list.json b/admin/src/addon/shop/lang/zh-cn/goods.label_list.json
index 0fe25d86..c5230b4c 100644
--- a/admin/src/addon/shop/lang/zh-cn/goods.label_list.json
+++ b/admin/src/addon/shop/lang/zh-cn/goods.label_list.json
@@ -27,4 +27,4 @@
   "status": "状态",
   "label": "标签",
   "createTime": "创建时间"
-}
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/goods.list.json b/admin/src/addon/shop/lang/zh-cn/goods.list.json
index db15b77e..2fc98f61 100644
--- a/admin/src/addon/shop/lang/zh-cn/goods.list.json
+++ b/admin/src/addon/shop/lang/zh-cn/goods.list.json
@@ -14,13 +14,13 @@
   "startSaleNumTips": "最低销量输入错误",
   "endSaleNumPlaceholder": "最高销量",
   "endSaleNumTips": "最高销量输入错误",
-  "shopSaleNumTips": "最低销量不能大于最高销量",
+  "shopSaleNumTips":"最低销量不能大于最高销量",
   "skuPrice": "价格",
   "startPricePlaceholder": "最低价格",
   "startPriceTips": "最低价格输入错误",
   "endPricePlaceholder": "最高价格",
   "endPriceTips": "最高价格输入错误",
-  "shopPriceTips": "最低价格不能大于最高价格",
+  "shopPriceTips":"最低价格不能大于最高价格",
   "statusOn": "销售中",
   "statusOff": "仓库中",
   "statusAll": "全部商品",
@@ -40,7 +40,7 @@
   "addGoods": "添加商品",
   "statusActionOn": "上架",
   "statusActionOff": "下架",
-  "statusChangeTips": "确定要下架该商品吗？",
+  "statusChangeTips":"确定要下架该商品吗？",
   "spreadGoods": "推广",
   "copyGoods": "复制",
 
@@ -105,6 +105,7 @@
   "discountHint": "会员折扣说明：按照默认会员等级折扣优惠",
   "fixedPriceHint": "会员价说明：指定优惠价格，商品未参与活动时，按照会员价优惠，若商品参与活动，则以活动价为准",
 
+
   "addGoodsLabel": "添加商品标签",
   "addGoodsService": "添加商品服务",
   "addGoodsCategory": "添加分类",
@@ -132,9 +133,9 @@
   "addDeliveryTemplateId": "添加运费模板",
   "deliveryType": "配送方式",
   "deliveryTypePlaceholder": "请选择配送方式",
-  "yuan": "元",
-  "label": "商品标签",
-  "service": "商品服务",
+  "yuan":"元",
+  "label":"商品标签",
+  "service":"商品服务",
   "virtualSaleNum": "虚拟销量",
   "goodsBrand": "商品品牌",
   "goodsPoster": "商品海报",
diff --git a/admin/src/addon/shop/lang/zh-cn/goods.real_edit.json b/admin/src/addon/shop/lang/zh-cn/goods.real_edit.json
index ce01c9ba..67b335b4 100644
--- a/admin/src/addon/shop/lang/zh-cn/goods.real_edit.json
+++ b/admin/src/addon/shop/lang/zh-cn/goods.real_edit.json
@@ -11,9 +11,9 @@
   "subTitlePlaceholder": "请输入副标题",
   "subTitleMaxLengthTips": "副标题不能超过80个字符",
   "goodsImage": "商品图片",
-  "goodsImagePlaceholder": "请上传商品图片",
+  "goodsImagePlaceholder":"请上传商品图片",
   "goodsVideo": "商品视频",
-  "goodsVideoPlaceholder": "请上传商品视频",
+  "goodsVideoPlaceholder":"请上传商品视频",
   "goodsCategory": "商品分类",
   "refresh": "刷新",
   "addGoodsCategory": "添加分类",
@@ -87,21 +87,21 @@
   "deliveryTab": "配送设置",
   "deliveryType": "配送方式",
   "deliveryTypePlaceholder": "请选择配送方式",
-  "pleaseSelectSku": "请先选择商品规格",
-  "isLimit": "是否限购",
-  "isLimitTips": "启用限购后，购买商品时，会对该商品购买量做限制判断。",
-  "limitType": "限购类型",
-  "limitTypeTips": "单次限购是针对于每次下单不能超过限购数量，单人限购是针对于会员账号购买这个商品的总数不能超过限购数量。",
-  "singleTime": "单次限购",
-  "singlePerson": "单人限购",
-  "maxBuy": "限购数量",
-  "maxBuyPlaceholder": "请输入限购数量",
+  "pleaseSelectSku":"请先选择商品规格",
+  "isLimit":"是否限购",
+  "isLimitTips":"启用限购后，购买商品时，会对该商品购买量做限制判断。",
+  "limitType":"限购类型",
+  "limitTypeTips":"单次限购是针对于每次下单不能超过限购数量，单人限购是针对于会员账号购买这个商品的总数不能超过限购数量。",
+  "singleTime":"单次限购",
+  "singlePerson":"单人限购",
+  "maxBuy":"限购数量",
+  "maxBuyPlaceholder":"请输入限购数量",
   "maxBuyTips": "[限购数量]格式输入错误",
-  "maxBuyWarnTips": "限购数量超出商品库存时，买家将无法购买该商品",
+  "maxBuyWarnTips":"限购数量超出商品库存时，买家将无法购买该商品",
   "maxBuyNotZeroTips": "限购数量不能小于1",
-  "minBuy": "起购数量",
-  "minBuyTips": "起购数量超出商品库存时，买家将无法购买该商品",
-  "minBuyFormatErrorTips": "[起购数量]格式输入错误",
+  "minBuy":"起购数量",
+  "minBuyTips":"起购数量超出商品库存时，买家将无法购买该商品",
+  "minBuyFormatErrorTips":"[起购数量]格式输入错误",
   "minBuyNotZeroTips": "起购数量不能小于0",
   "minBuyGreaterThanMaxBuyTips": "起购数量不能大于限购数量",
 
diff --git a/admin/src/addon/shop/lang/zh-cn/goods.service.json b/admin/src/addon/shop/lang/zh-cn/goods.service.json
index 18515ce1..95510240 100644
--- a/admin/src/addon/shop/lang/zh-cn/goods.service.json
+++ b/admin/src/addon/shop/lang/zh-cn/goods.service.json
@@ -1,10 +1,10 @@
 {
-  "serviceName": "服务名称",
-  "serviceNamePlaceholder": "请输入服务名称",
-  "desc": "描述",
-  "descPlaceholder": "请输入描述",
-  "addServe": "添加商品服务",
-  "updateServe": "编辑商品服务",
-  "serveDeleteTips": "确定要删除该数据吗？",
-  "imagePlaceholder": "请上传服务图片"
-}
+      "serviceName":"服务名称",
+      "serviceNamePlaceholder":"请输入服务名称",
+      "desc":"描述",
+      "descPlaceholder":"请输入描述",
+      "addServe":"添加商品服务",
+      "updateServe":"编辑商品服务",
+      "serveDeleteTips":"确定要删除该数据吗？",
+	  "imagePlaceholder": "请上传服务图片"
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/goods.virtual_edit.json b/admin/src/addon/shop/lang/zh-cn/goods.virtual_edit.json
index 79043fa3..40fbe3c3 100644
--- a/admin/src/addon/shop/lang/zh-cn/goods.virtual_edit.json
+++ b/admin/src/addon/shop/lang/zh-cn/goods.virtual_edit.json
@@ -11,9 +11,9 @@
   "subTitlePlaceholder": "请输入副标题",
   "subTitleMaxLengthTips": "副标题不能超过80个字符",
   "goodsImage": "商品图片",
-  "goodsImagePlaceholder": "请上传商品图片",
+  "goodsImagePlaceholder":"请上传商品图片",
   "goodsVideo": "商品视频",
-  "goodsVideoPlaceholder": "请上传商品视频",
+  "goodsVideoPlaceholder":"请上传商品视频",
   "goodsCategory": "商品分类",
   "refresh": "刷新",
   "addGoodsCategory": "添加分类",
@@ -81,20 +81,20 @@
   "maxAddSpecTips": "最多添加5个规格项",
   "pleaseEditSpecPlaceholder": "请编辑规格信息",
   "refreshSuccess": "刷新成功",
-  "isLimit": "是否限购",
-  "isLimitTips": "启用限购后，购买商品时，会对该商品购买量做限制判断。",
-  "limitType": "限购类型",
-  "limitTypeTips": "单次限购是针对于每次下单不能超过限购数量，单人限购是针对于会员账号购买这个商品的总数不能超过限购数量。",
-  "singleTime": "单次限购",
-  "singlePerson": "单人限购",
-  "maxBuy": "限购数量",
-  "maxBuyPlaceholder": "请输入限购数量",
+  "isLimit":"是否限购",
+  "isLimitTips":"启用限购后，购买商品时，会对该商品购买量做限制判断。",
+  "limitType":"限购类型",
+  "limitTypeTips":"单次限购是针对于每次下单不能超过限购数量，单人限购是针对于会员账号购买这个商品的总数不能超过限购数量。",
+  "singleTime":"单次限购",
+  "singlePerson":"单人限购",
+  "maxBuy":"限购数量",
+  "maxBuyPlaceholder":"请输入限购数量",
   "maxBuyTips": "[限购数量]格式输入错误",
-  "maxBuyWarnTips": "限购数量超出商品库存时，买家将无法购买该商品",
+  "maxBuyWarnTips":"限购数量超出商品库存时，买家将无法购买该商品",
   "maxBuyNotZeroTips": "限购数量不能小于1",
-  "minBuy": "起购数量",
-  "minBuyTips": "起购数量超出商品库存时，买家将无法购买该商品",
-  "minBuyFormatErrorTips": "[起购数量]格式输入错误",
+  "minBuy":"起购数量",
+  "minBuyTips":"起购数量超出商品库存时，买家将无法购买该商品",
+  "minBuyFormatErrorTips":"[起购数量]格式输入错误",
   "minBuyNotZeroTips": "起购数量不能小于0",
   "minBuyGreaterThanMaxBuyTips": "起购数量不能大于限购数量",
 
@@ -124,6 +124,7 @@
   "specValueNameRepeat": "规格值不能重复",
   "lackDefaultSpec": "商品缺少默认规格",
 
+
   "setDeliverGoods": "发货设置",
   "autoDeliverGoods": "自动发货",
   "handDeliverGoods": "手动发货",
@@ -162,4 +163,5 @@
   "fixedPriceHint": "会员价说明：指定优惠价格，商品未参与活动时，按照会员价优惠，若商品参与活动，则以活动价为准",
 
   "participateInActiveDisableTips": "商品正在参与营销活动，禁止操作"
+
 }
diff --git a/admin/src/addon/shop/lang/zh-cn/index.index.json b/admin/src/addon/shop/lang/zh-cn/index.index.json
index 94c20f58..88e23253 100644
--- a/admin/src/addon/shop/lang/zh-cn/index.index.json
+++ b/admin/src/addon/shop/lang/zh-cn/index.index.json
@@ -1,20 +1,20 @@
 {
-  "realtimeOverview": "实时概况",
-  "updateTime": "更新时间:",
-  "todayOrderCount": "今日订单数",
-  "todayOrderSale": "今日销售额",
-  "todayAddMemberCount": "今日退款金额",
-  "todayBrowseCount": "今日浏览量",
-  "yesterday": "昨日:",
-  "orderCount": "订单总数",
-  "salesTotal": "销售总额(元)",
-  "memberTotal": "退款金额",
-  "browseTotal": "总浏览量",
-  "agentMatters": "待办事项",
-  "waitPayOrder": "待付款订单",
-  "waitDeliveryOrder": "待发货订单",
-  "waitTakeOrder": "待收货订单",
-  "refundOrder": "退款订单",
-  "saleGoodsNum": "出售商品数量",
-  "warehouseGoodsNum": "仓库商品数量"
-}
+	"realtimeOverview":"实时概况",
+	"updateTime":"更新时间:",
+	"todayOrderCount":"今日订单数",
+	"todayOrderSale":"今日销售额",
+	"todayAddMemberCount":"今日退款金额",
+	"todayBrowseCount":"今日浏览量",
+	"yesterday":"昨日:",
+	"orderCount":"订单总数",
+	"salesTotal":"销售总额(元)",
+	"memberTotal":"退款金额",
+	"browseTotal":"总浏览量",
+	"agentMatters":"待办事项",
+	"waitPayOrder":"待付款订单",
+	"waitDeliveryOrder":"待发货订单",
+	"waitTakeOrder":"待收货订单",
+	"refundOrder":"退款订单",
+	"saleGoodsNum":"出售商品数量",
+	"warehouseGoodsNum":"仓库商品数量"
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.coupon.add.json b/admin/src/addon/shop/lang/zh-cn/marketing.coupon.add.json
index 4cb995a6..6b7d33f5 100644
--- a/admin/src/addon/shop/lang/zh-cn/marketing.coupon.add.json
+++ b/admin/src/addon/shop/lang/zh-cn/marketing.coupon.add.json
@@ -1,42 +1,42 @@
 {
-  "addCoupon": "添加优惠券",
-  "title": "名称",
-  "titlePlaceholder": "请如：XXX优惠券，最多20个字",
-  "type": "类型",
-  "price": "面值",
-  "receiveType": "是否手动领取",
-  "startTime": "开始时间",
-  "endTime": "结束时间",
-  "remainCount": "剩余数量",
-  "limitCount": "已领取数量",
-  "receive": "领取记录",
-  "user": "是",
-  "grant": "否",
-  "limit": "限量",
-  "unlimited": "不限量",
-  "receiveNumber": "发放数量",
-  "pricePlaceholder": "请输入优惠券面值",
-  "remainCountPlaceholder": "最多发放100000张",
-  "reduction": "满减券",
-  "noThreshold": "无门槛券",
-  "threshold": "使用门槛",
-  "minConditionMoneyPlaceholder": "请输入优惠券的最低消费金额",
-  "userLimitCount": "限领张数",
-  "userLimitCountPlaceholder": "请输入限领张数",
-  "receiveTime": "领取时间",
-  "limitedTime": "限时",
-  "unlimitedTime": "不限时",
-  "days": "天数",
-  "times": "固定时间",
-  "validType": "有效期",
-  "lengthPlaceholder": "请输入使用时间",
-  "status": "状态",
-  "open": "开启",
-  "close": "关闭",
-  "cancel": "取消",
-  "save": "保存",
-  "startDate": "开始时间",
-  "endDate": "结束时间",
-  "validTimePlaceholder": "用券截止时间",
-  "arrivalTimePlaceholder": "领券截止时间"
-}
+    "addCoupon": "添加优惠券",
+    "title": "名称",
+    "titlePlaceholder": "请如：XXX优惠券，最多20个字",
+    "type": "类型",
+    "price": "面值",
+    "receiveType": "是否手动领取",
+    "startTime": "开始时间",
+    "endTime": "结束时间",
+    "remainCount": "剩余数量",
+    "limitCount": "已领取数量",
+    "receive": "领取记录",
+    "user": "是",
+    "grant": "否",
+    "limit": "限量",
+    "unlimited": "不限量",
+    "receiveNumber": "发放数量",
+    "pricePlaceholder": "请输入优惠券面值",
+    "remainCountPlaceholder": "最多发放100000张",
+    "reduction": "满减券",
+    "noThreshold": "无门槛券",
+    "threshold": "使用门槛",
+    "minConditionMoneyPlaceholder": "请输入优惠券的最低消费金额",
+    "userLimitCount": "限领张数",
+    "userLimitCountPlaceholder": "请输入限领张数",
+    "receiveTime": "领取时间",
+    "limitedTime": "限时",
+    "unlimitedTime": "不限时",
+    "days":"天数",
+    "times": "固定时间",
+    "validType": "有效期",
+    "lengthPlaceholder": "请输入使用时间",
+    "status": "状态",
+    "open": "开启",
+    "close": "关闭",
+    "cancel": "取消",
+    "save": "保存",
+    "startDate": "开始时间",
+    "endDate": "结束时间",
+    "validTimePlaceholder": "用券截止时间",
+    "arrivalTimePlaceholder": "领券截止时间"
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.coupon.edit.json b/admin/src/addon/shop/lang/zh-cn/marketing.coupon.edit.json
index 4a29925f..5d4a3c78 100644
--- a/admin/src/addon/shop/lang/zh-cn/marketing.coupon.edit.json
+++ b/admin/src/addon/shop/lang/zh-cn/marketing.coupon.edit.json
@@ -1,42 +1,42 @@
 {
-  "editCoupon": "编辑优惠券",
-  "title": "名称",
-  "titlePlaceholder": "请如：XXX优惠券，最多20个字",
-  "type": "类型",
-  "price": "面值",
-  "receiveType": "是否手动领取",
-  "startTime": "开始时间",
-  "endTime": "结束时间",
-  "remainCount": "剩余数量",
-  "limitCount": "已领取数量",
-  "receive": "领取记录",
-  "user": "是",
-  "grant": "否",
-  "limit": "限量",
-  "unlimited": "不限量",
-  "receiveNumber": "发放数量",
-  "pricePlaceholder": "请输入优惠券面值",
-  "remainCountPlaceholder": "最多发放100000张",
-  "reduction": "满减券",
-  "noThreshold": "无门槛券",
-  "threshold": "使用门槛",
-  "minConditionMoneyPlaceholder": "请输入优惠券的最低消费金额",
-  "userLimitCount": "限领张数",
-  "userLimitCountPlaceholder": "请输入限领张数",
-  "receiveTime": "领取时间",
-  "limitedTime": "限时",
-  "unlimitedTime": "不限时",
-  "days": "天数",
-  "times": "固定时间",
-  "validType": "使用时间",
-  "lengthPlaceholder": "请输入使用时间",
-  "status": "状态",
-  "open": "开启",
-  "close": "关闭",
-  "cancel": "取消",
-  "save": "保存",
-  "startDate": "开始时间",
-  "endDate": "结束时间",
-  "validTimePlaceholder": "用券截止时间",
-  "arrivalTimePlaceholder": "领券截止时间"
-}
+    "editCoupon": "编辑优惠券",
+    "title": "名称",
+    "titlePlaceholder": "请如：XXX优惠券，最多20个字",
+    "type": "类型",
+    "price": "面值",
+    "receiveType": "是否手动领取",
+    "startTime": "开始时间",
+    "endTime": "结束时间",
+    "remainCount": "剩余数量",
+    "limitCount": "已领取数量",
+    "receive": "领取记录",
+    "user": "是",
+    "grant": "否",
+    "limit": "限量",
+    "unlimited": "不限量",
+    "receiveNumber": "发放数量",
+    "pricePlaceholder": "请输入优惠券面值",
+    "remainCountPlaceholder": "最多发放100000张",
+    "reduction": "满减券",
+    "noThreshold": "无门槛券",
+    "threshold": "使用门槛",
+    "minConditionMoneyPlaceholder": "请输入优惠券的最低消费金额",
+    "userLimitCount": "限领张数",
+    "userLimitCountPlaceholder": "请输入限领张数",
+    "receiveTime": "领取时间",
+    "limitedTime": "限时",
+    "unlimitedTime": "不限时",
+    "days":"天数",
+    "times": "固定时间",
+    "validType": "使用时间",
+    "lengthPlaceholder": "请输入使用时间",
+    "status": "状态",
+    "open": "开启",
+    "close": "关闭",
+    "cancel": "取消",
+    "save": "保存",
+    "startDate": "开始时间",
+    "endDate": "结束时间",
+    "validTimePlaceholder": "用券截止时间",
+    "arrivalTimePlaceholder": "领券截止时间"
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.coupon.list.json b/admin/src/addon/shop/lang/zh-cn/marketing.coupon.list.json
index f1afeb9b..91ecaa41 100644
--- a/admin/src/addon/shop/lang/zh-cn/marketing.coupon.list.json
+++ b/admin/src/addon/shop/lang/zh-cn/marketing.coupon.list.json
@@ -1,47 +1,47 @@
 {
-  "addCoupon": "添加优惠券",
-  "title": "名称",
-  "titlePlaceholder": "请输入优惠券名称",
-  "type": "类型",
-  "price": "面值",
-  "receiveType": "是否手动领取",
-  "startTime": "开始时间",
-  "endTime": "结束时间",
-  "sumCount": "剩余数量/发放数量",
-  "remainCount": "已领用/已使用",
-  "receive": "领取记录",
-  "edit": "编辑",
-  "Status": "是否关闭领取",
-  "threshold": "使用门槛",
-  "reduction": "满减券",
-  "noThreshold": "无门槛券",
-  "couponDeleteTips": "确定要删除该优惠券吗？",
-  "couponColseTips": "确定要关闭该优惠券吗？关闭后将不可领取，若会员已领取将变为失效",
-  "validType": "有效期",
-  "statusName": "状态",
-  "receiveTypeTime": "领取有效期",
-  "spreadGoods": "推广",
-  "close": "关闭",
-  "couponSpreadTitle": "优惠券推广",
-  "downloadQrcode": "下载二维码",
-  "spreadLink": "推广链接",
-  "receiveUseCount": "已使用",
+    "addCoupon": "添加优惠券",
+    "title": "名称",
+    "titlePlaceholder": "请输入优惠券名称",
+    "type": "类型",
+    "price": "面值",
+    "receiveType": "是否手动领取",
+    "startTime": "开始时间",
+    "endTime": "结束时间",
+    "sumCount": "剩余数量/发放数量",
+    "remainCount": "已领用/已使用",
+    "receive": "领取记录",
+    "edit": "编辑",
+    "Status": "是否关闭领取",
+    "threshold": "使用门槛",
+    "reduction": "满减券",
+    "noThreshold": "无门槛券",
+    "couponDeleteTips": "确定要删除该优惠券吗？",
+    "couponColseTips": "确定要关闭该优惠券吗？关闭后将不可领取，若会员已领取将变为失效",
+    "validType": "有效期",
+    "statusName":"状态",
+    "receiveTypeTime": "领取有效期",
+    "spreadGoods":"推广",
+    "close":"关闭",
+    "couponSpreadTitle":"优惠券推广",
+    "downloadQrcode": "下载二维码",
+    "spreadLink": "推广链接",
+    "receiveUseCount": "已使用",
 
-  "collectionCoupon": "领取记录",
-  "collectionTtitle": "优惠券名称",
-  "userName": "领用会员",
-  "collectionReceiveType": "领用方式",
-  "createTime": "领取时间",
-  "expireTime": "到期时间",
-  "status": "当前状态",
-  "useTime": "使用时间",
-  "validity": "使用有效期",
-  "mobile": "手机号",
-  "memberInfo": "会员信息",
-  "memberInfoPlaceholder": "请输入会员昵称/手机号",
-  "collectionSumCount": "发放数量",
-  "couponInfo": "优惠券基本信息",
-  "receiveCount": "已领取",
-  "receiveExpireCount": "已过期",
-  "showOrder": "查看订单"
-}
+    "collectionCoupon":"领取记录",
+    "collectionTtitle": "优惠券名称",
+    "userName": "领用会员",
+    "collectionReceiveType": "领用方式",
+    "createTime": "领取时间",
+    "expireTime": "到期时间",
+    "status":"当前状态",
+    "useTime": "使用时间",
+    "validity":"使用有效期",
+    "mobile": "手机号",
+    "memberInfo": "会员信息",
+    "memberInfoPlaceholder":"请输入会员昵称/手机号",
+    "collectionSumCount": "发放数量",
+    "couponInfo": "优惠券基本信息",
+    "receiveCount":"已领取",
+    "receiveExpireCount":"已过期",
+    "showOrder": "查看订单"
+} 
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.discount.add.json b/admin/src/addon/shop/lang/zh-cn/marketing.discount.add.json
index 3ebb9e9b..a67d7e6d 100644
--- a/admin/src/addon/shop/lang/zh-cn/marketing.discount.add.json
+++ b/admin/src/addon/shop/lang/zh-cn/marketing.discount.add.json
@@ -1,38 +1,38 @@
 {
-  "editDiscount": "添加限时折扣",
-  "name": "活动名称",
-  "namePlaceholder": "请输入活动名称",
-  "nameTip": "活动标题用于在手机或者电脑前端，建议输入长度不要大于5",
-  "title": "标题",
-  "titlePlaceholder": "请输入活动标题",
-  "titleTip": "活动标题用户展示在手机或者电脑前端展示使用，建议输入长度不要大于5",
-  "activityTime": "活动时间",
-  "discountTimePlaceholder": "请选择活动时间",
-  "selectProduct": "选择商品",
-  "selectProductPlaceholder": "请选择商品",
-  "noSpaceAllowed": "内容不能为空",
-  "batchOperation": "批量设置",
-  "batchEmptySelectedGoodsTips": "请选择要操作的商品",
-  "discountType": "折扣类型",
-  "price": "原价",
-  "discounts": "打折",
-  "discountsTips": "[打折]格式错误",
-  "discountsTipsTwo": "打折折扣不可小于0",
-  "discountsTipsThree": "打折折扣不可大于9.9",
-  "discountsPlaceholder": "请输入打折折扣",
-  "reduceMoney": "减钱",
-  "reduceMoneyTips": "[减钱]格式错误",
-  "reduceMoneyTipsTwo": "减钱金额不可小于等于0",
-  "reduceMoneyTipsThree": "减钱金额不可大于等于原价金额",
-  "reduceMoneyPlaceholder": "请输入减钱金额",
-  "promotional": "促销价",
-  "promotionalTips": "[促销价]格式错误",
-  "promotionalTipsTwo": "促销价金额不可小于等于0",
-  "promotionalTipsThree": "促销价金额不可大于等于原价金额",
-  "promotionalPlaceholder": "请输入促销价",
-  "delete": "删除",
-  "enabled": "设为参与",
-  "noEnabled": "设为不参与",
-  "skuDiscountSettings": "规格折扣设置",
-  "skuDiscountSettingsPlaceholder": "请输入规格折扣设置"
+    "editDiscount":"添加限时折扣",
+    "name": "活动名称",
+    "namePlaceholder":"请输入活动名称",
+    "nameTip":"活动标题用于在手机或者电脑前端，建议输入长度不要大于5",
+    "title":"标题",
+    "titlePlaceholder":"请输入活动标题",
+    "titleTip":"活动标题用户展示在手机或者电脑前端展示使用，建议输入长度不要大于5",
+    "activityTime": "活动时间",
+    "discountTimePlaceholder":"请选择活动时间",
+    "selectProduct": "选择商品",
+    "selectProductPlaceholder": "请选择商品",
+    "noSpaceAllowed": "内容不能为空",
+    "batchOperation": "批量设置",
+    "batchEmptySelectedGoodsTips": "请选择要操作的商品",
+    "discountType":"折扣类型",
+    "price":"原价",
+    "discounts":"打折",
+    "discountsTips":"[打折]格式错误",
+    "discountsTipsTwo":"打折折扣不可小于0",
+    "discountsTipsThree":"打折折扣不可大于9.9",
+    "discountsPlaceholder":"请输入打折折扣",
+    "reduceMoney":"减钱",
+    "reduceMoneyTips":"[减钱]格式错误",
+    "reduceMoneyTipsTwo":"减钱金额不可小于等于0",
+    "reduceMoneyTipsThree":"减钱金额不可大于等于原价金额",
+    "reduceMoneyPlaceholder":"请输入减钱金额",
+    "promotional":"促销价",
+    "promotionalTips":"[促销价]格式错误",
+    "promotionalTipsTwo":"促销价金额不可小于等于0",
+    "promotionalTipsThree":"促销价金额不可大于等于原价金额",
+    "promotionalPlaceholder":"请输入促销价",
+    "delete":"删除",
+    "enabled":"设为参与",
+    "noEnabled":"设为不参与",
+    "skuDiscountSettings":"规格折扣设置",
+    "skuDiscountSettingsPlaceholder":"请输入规格折扣设置"
 }
diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.discount.config.json b/admin/src/addon/shop/lang/zh-cn/marketing.discount.config.json
index 3bbcf8a9..2781754d 100644
--- a/admin/src/addon/shop/lang/zh-cn/marketing.discount.config.json
+++ b/admin/src/addon/shop/lang/zh-cn/marketing.discount.config.json
@@ -1,8 +1,8 @@
 {
-  "headTitle": "顶部广告图",
-  "image": "图片上传",
-  "imagePlaceholder": "请上传图片",
-  "toLink": "跳转链接",
-  "toLinkPlaceholder": "请输入跳转链接",
-  "addConfigList": "添加广告图"
-}
+    "headTitle":"顶部广告图",
+    "image":"图片上传",
+    "imagePlaceholder":"请上传图片",
+    "toLink":"跳转链接",
+    "toLinkPlaceholder":"请输入跳转链接",
+    "addConfigList":"添加广告图"
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.discount.detail.json b/admin/src/addon/shop/lang/zh-cn/marketing.discount.detail.json
index 80fa2653..b3364c6f 100644
--- a/admin/src/addon/shop/lang/zh-cn/marketing.discount.detail.json
+++ b/admin/src/addon/shop/lang/zh-cn/marketing.discount.detail.json
@@ -34,4 +34,4 @@
   "participationNum": "参与次数",
   "orderTime": "最后下单时间",
   "memberInfo": "会员信息"
-}
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.discount.edit.json b/admin/src/addon/shop/lang/zh-cn/marketing.discount.edit.json
index 3088051f..7dec8b59 100644
--- a/admin/src/addon/shop/lang/zh-cn/marketing.discount.edit.json
+++ b/admin/src/addon/shop/lang/zh-cn/marketing.discount.edit.json
@@ -1,38 +1,38 @@
 {
-  "editDiscount": "编辑限时折扣",
-  "name": "活动名称",
-  "namePlaceholder": "请输入活动名称",
-  "nameTip": "活动名称用于展示在商家后台管理",
-  "title": "标题",
-  "titlePlaceholder": "请输入活动标题",
-  "titleTip": "活动标题用于在手机或者电脑前端，建议输入长度不要大于5",
-  "activityTime": "活动时间",
-  "discountTimePlaceholder": "请选择活动时间",
-  "noSpaceAllowed": "内容不能为空",
-  "selectProduct": "选择商品",
-  "selectProductPlaceholder": "请选择商品",
-  "batchOperation": "批量设置",
-  "batchEmptySelectedGoodsTips": "请选择要操作的商品",
-  "discountType": "折扣类型",
-  "price": "原价",
-  "discounts": "打折",
-  "discountsTips": "[打折]格式错误",
-  "discountsTipsTwo": "打折折扣不可小于0",
-  "discountsTipsThree": "打折折扣不可大于9.9",
-  "discountsPlaceholder": "请输入打折折扣",
-  "reduceMoney": "减钱",
-  "reduceMoneyTips": "[减钱]格式错误",
-  "reduceMoneyTipsTwo": "减钱金额不可小于等于0",
-  "reduceMoneyTipsThree": "减钱金额不可大于等于原价金额",
-  "reduceMoneyPlaceholder": "请输入减钱金额",
-  "promotional": "促销价",
-  "promotionalTips": "[促销价]格式错误",
-  "promotionalTipsTwo": "促销价金额不可小于等于0",
-  "promotionalTipsThree": "促销价金额不可大于等于原价金额",
-  "promotionalPlaceholder": "请输入促销价",
-  "delete": "删除",
-  "enabled": "设为参与",
-  "noEnabled": "设为不参与",
-  "skuDiscountSettings": "规格折扣设置",
-  "skuDiscountSettingsPlaceholder": "请输入规格折扣设置"
+    "editDiscount":"编辑限时折扣",
+    "name": "活动名称",
+    "namePlaceholder":"请输入活动名称",
+    "nameTip":"活动名称用于展示在商家后台管理",
+    "title":"标题",
+    "titlePlaceholder":"请输入活动标题",
+    "titleTip":"活动标题用于在手机或者电脑前端，建议输入长度不要大于5",
+    "activityTime": "活动时间",
+    "discountTimePlaceholder":"请选择活动时间",
+    "noSpaceAllowed":"内容不能为空",
+    "selectProduct": "选择商品",
+    "selectProductPlaceholder": "请选择商品",
+    "batchOperation": "批量设置",
+    "batchEmptySelectedGoodsTips": "请选择要操作的商品",
+    "discountType":"折扣类型",
+    "price":"原价",
+    "discounts":"打折",
+    "discountsTips":"[打折]格式错误",
+    "discountsTipsTwo":"打折折扣不可小于0",
+    "discountsTipsThree":"打折折扣不可大于9.9",
+    "discountsPlaceholder":"请输入打折折扣",
+    "reduceMoney":"减钱",
+    "reduceMoneyTips":"[减钱]格式错误",
+    "reduceMoneyTipsTwo":"减钱金额不可小于等于0",
+    "reduceMoneyTipsThree":"减钱金额不可大于等于原价金额",
+    "reduceMoneyPlaceholder":"请输入减钱金额",
+    "promotional":"促销价",
+    "promotionalTips":"[促销价]格式错误",
+    "promotionalTipsTwo":"促销价金额不可小于等于0",
+    "promotionalTipsThree":"促销价金额不可大于等于原价金额",
+    "promotionalPlaceholder":"请输入促销价",
+    "delete":"删除",
+    "enabled":"设为参与",
+    "noEnabled":"设为不参与",
+    "skuDiscountSettings":"规格折扣设置",
+    "skuDiscountSettingsPlaceholder":"请输入规格折扣设置"
 }
diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.discount.list.json b/admin/src/addon/shop/lang/zh-cn/marketing.discount.list.json
index 06ac4282..0b76eb16 100644
--- a/admin/src/addon/shop/lang/zh-cn/marketing.discount.list.json
+++ b/admin/src/addon/shop/lang/zh-cn/marketing.discount.list.json
@@ -1,50 +1,50 @@
 {
-  "addDiscount": "添加限时折扣",
-  "name": "名称",
-  "namePlaceholder": "请输入活动名称",
-  "title": "标题",
-  "status": "状态",
-  "statusPlaceholder": "请选择状态",
-  "paymentAmount": "支付金额",
-  "memberCount": "会员数",
-  "orderCount": "订单数",
-  "discountTime": "活动时间",
-  "detail": "详情",
-  "close": "关闭",
-  "closeTips": "活动正在进行中，是否确认关闭当前活动？",
-  "deleteTips": "是否确认删除当前活动",
-  "baseInfo": "基础信息",
-  "createTime": "创建时间",
-  "startTime": "活动开始时间",
-  "endTime": "活动结束时间",
-  "keywordPlaceholder": "请输入商品名称",
-  "keyword": "商品名称",
-  "goodsInfo": "商品信息",
-  "price": "商品价格",
-  "activeOrderMoney": "累计订单金额",
-  "activeOrderNum": "累计订单数",
-  "activeMemberNum": "参与会员数",
-  "activeSuccessNum": "支付销量",
-  "orderInfo": "订单编号",
-  "payTime": "支付时间",
-  "orderNo": "订单编号",
-  "orderMoney": "订单金额",
-  "buyInfo": "买家/收货人",
-  "payType": "支付类型",
-  "orderStatus": "订单状态",
-  "toBePaid": "待支付",
-  "toBeShipped": "待发货",
-  "shipped": "已发货",
-  "receivedGoods": "已收货",
-  "completed": "已完成",
-  "closed": "已关闭",
-  "consumptionMoney": "消费总额",
-  "participationNum": "参与次数",
-  "orderTime": "最后下单时间",
-  "memberInfo": "会员信息",
-  "activeName": "活动名称",
-  "participationMemberCount": "参与会员数",
-  "payOrderCount": "支付订单数",
-  "startDate": "开始时间",
-  "endDate": "结束时间"
-}
+    "addDiscount":"添加限时折扣",
+    "name":"名称",
+    "namePlaceholder":"请输入活动名称",
+    "title":"标题",
+    "status":"状态",
+    "statusPlaceholder":"请选择状态",
+    "paymentAmount":"支付金额",
+    "memberCount":"会员数",
+    "orderCount":"订单数",
+    "discountTime":"活动时间",
+    "detail":"详情",
+    "close":"关闭",
+    "closeTips":"活动正在进行中，是否确认关闭当前活动？",
+    "deleteTips":"是否确认删除当前活动",
+    "baseInfo": "基础信息",
+    "createTime": "创建时间",
+    "startTime": "活动开始时间",
+    "endTime": "活动结束时间",
+    "keywordPlaceholder": "请输入商品名称",
+    "keyword": "商品名称",
+    "goodsInfo": "商品信息",
+    "price": "商品价格",
+    "activeOrderMoney": "累计订单金额",
+    "activeOrderNum": "累计订单数",
+    "activeMemberNum": "参与会员数",
+    "activeSuccessNum": "支付销量",
+    "orderInfo": "订单编号",
+    "payTime": "支付时间",
+    "orderNo": "订单编号",
+    "orderMoney": "订单金额",
+    "buyInfo": "买家/收货人",
+    "payType": "支付类型",
+    "orderStatus": "订单状态",
+    "toBePaid": "待支付",
+    "toBeShipped": "待发货",
+    "shipped": "已发货",
+    "receivedGoods": "已收货",
+    "completed": "已完成",
+    "closed": "已关闭",
+    "consumptionMoney": "消费总额",
+    "participationNum": "参与次数",
+    "orderTime": "最后下单时间",
+    "memberInfo": "会员信息",
+    "activeName": "活动名称",
+    "participationMemberCount": "参与会员数",
+    "payOrderCount": "支付订单数",
+    "startDate": "开始时间",
+    "endDate": "结束时间"
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.exchange.goods_add.json b/admin/src/addon/shop/lang/zh-cn/marketing.exchange.goods_add.json
index 8f4c86e3..66ddcb71 100644
--- a/admin/src/addon/shop/lang/zh-cn/marketing.exchange.goods_add.json
+++ b/admin/src/addon/shop/lang/zh-cn/marketing.exchange.goods_add.json
@@ -1,66 +1,66 @@
 {
-  "addGoods": "添加商品",
-  "baseInfo": "基础设置",
-  "goodsType": "商品类型",
-  "goodsName": "商品名称",
-  "goodsNamePlaceholder": "请输入商品名称",
-  "goodsTitle": "副标题",
-  "goodsTitlePlaceholder": "请输入副标题",
-  "image": "商品图片",
-  "imagePlaceholder": "请选择商品图片",
-  "selectProduct": "选择商品",
-  "selectGoodsPlaceholder": "请选择商品",
-  "goodsStatus": "商品状态",
-  "goodsSelect": "选择商品",
-  "redemptionSettings": "积分设置",
+    "addGoods":"添加商品",
+    "baseInfo":"基础设置",
+    "goodsType":"商品类型",
+    "goodsName":"商品名称",
+    "goodsNamePlaceholder":"请输入商品名称",
+    "goodsTitle":"副标题",
+    "goodsTitlePlaceholder":"请输入副标题",
+    "image":"商品图片",
+    "imagePlaceholder":"请选择商品图片",
+    "selectProduct": "选择商品",
+    "selectGoodsPlaceholder": "请选择商品",
+    "goodsStatus":"商品状态",
+    "goodsSelect":"选择商品",
+    "redemptionSettings":"积分设置",
 
-  "batchOperation": "批量设置",
-  "batchEmptySelectedGoodsTips": "请选择要操作的商品",
-  "goodsSelectPopupGoodsInfo": "商品信息",
-  "price": "销售价",
-  "stock": "兑换库存",
-  "stockPlaceholder": "请输入兑换库存",
-  "stockTips": "[兑换库存]格式错误",
-  "stockTipsTwo": "兑换库存不可小于等于0",
-  "stockTipsThree": "兑换限制数量不可大于商品库存",
-  "limit": "兑换限制",
-  "limitPlaceholder": "请输入兑换限制",
-  "limitTips": "[兑换限制]格式错误",
-  "limitTipsTwo": "兑换限制数量不可小于等于0",
-  "limitTipsThree": "兑换限制数量不能大于兑换库存",
-  "limitUnit": "件/人",
-  "integralUnit": "积分",
-  "prickUnit": "元",
-  "pointPlaceholder": "请输入积分积分",
-  "pointTips": "[积分]格式错误",
-  "pointTipsTwo": "积分不可小于等于0",
-  "money": "兑换价",
-  "newPrice": "价格",
-  "moneyTips": "[价格]格式错误",
-  "moneyTipsTwo": "价格不可小于0",
-  "limitRules": "每人每单可兑换件数",
+    "batchOperation": "批量设置",
+    "batchEmptySelectedGoodsTips": "请选择要操作的商品",
+    "goodsSelectPopupGoodsInfo":"商品信息",
+    "price":"销售价",
+    "stock":"兑换库存",
+    "stockPlaceholder":"请输入兑换库存",
+    "stockTips":"[兑换库存]格式错误",
+    "stockTipsTwo":"兑换库存不可小于等于0",
+    "stockTipsThree":"兑换限制数量不可大于商品库存",
+    "limit":"兑换限制",
+    "limitPlaceholder":"请输入兑换限制",
+    "limitTips":"[兑换限制]格式错误",
+    "limitTipsTwo":"兑换限制数量不可小于等于0",
+    "limitTipsThree":"兑换限制数量不能大于兑换库存",
+    "limitUnit":"件/人",
+    "integralUnit":"积分",
+    "prickUnit":"元",
+    "pointPlaceholder":"请输入积分积分",
+    "pointTips":"[积分]格式错误",
+    "pointTipsTwo":"积分不可小于等于0",
+    "money":"兑换价",
+    "newPrice":"价格",
+    "moneyTips":"[价格]格式错误",
+    "moneyTipsTwo":"价格不可小于0",
+    "limitRules":"每人每单可兑换件数",
+    
+    "couponSelect":"选择优惠券",
+    "couponSelectPlaceholder":"请选择优惠券",
+    "couponName":"优惠券名称",
+    "couponType":"类型",
+    "couponPrice":"面值",
+    "sumCount":"总库存",
+    "threshold": "使用门槛",
+    "validType": "有效期",
+    "receiveTypeTime": "领取有效期",
 
-  "couponSelect": "选择优惠券",
-  "couponSelectPlaceholder": "请选择优惠券",
-  "couponName": "优惠券名称",
-  "couponType": "类型",
-  "couponPrice": "面值",
-  "sumCount": "总库存",
-  "threshold": "使用门槛",
-  "validType": "有效期",
-  "receiveTypeTime": "领取有效期",
+    "balance":"兑换余额",
+    "balancePlaceholder":"请输入兑换余额",
+    "balanceTips":"[兑换余额]格式错误",
+    "balanceTipsTwo":"兑换余额不可小于等于0",
+    "balanceType":"余额类型",
 
-  "balance": "兑换余额",
-  "balancePlaceholder": "请输入兑换余额",
-  "balanceTips": "[兑换余额]格式错误",
-  "balanceTipsTwo": "兑换余额不可小于等于0",
-  "balanceType": "余额类型",
-
-  "goodsSkuTitle": "选择商品规格",
-  "goodsSkuPlaceholder": "请选择商品规格",
-  "goodsStock": "库存",
-  "enabled": "设为参与",
-  "noEnabled": "设为不参与",
-  "noEnabledTip": "请至少设置一个规格参与",
-  "goodsDetail": "商品详情"
-}
+    "goodsSkuTitle":"选择商品规格",
+    "goodsSkuPlaceholder":"请选择商品规格",
+    "goodsStock":"库存",
+    "enabled":"设为参与",
+    "noEnabled":"设为不参与",
+    "noEnabledTip":"请至少设置一个规格参与",
+    "goodsDetail":"商品详情"
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.exchange.goods_edit.json b/admin/src/addon/shop/lang/zh-cn/marketing.exchange.goods_edit.json
index 0f812f57..ace24e94 100644
--- a/admin/src/addon/shop/lang/zh-cn/marketing.exchange.goods_edit.json
+++ b/admin/src/addon/shop/lang/zh-cn/marketing.exchange.goods_edit.json
@@ -1,66 +1,67 @@
 {
-  "editGoods": "编辑商品",
-  "baseInfo": "基础设置",
-  "goodsType": "商品类型",
-  "goodsName": "商品名称",
-  "goodsNamePlaceholder": "请输入商品名称",
-  "goodsTitle": "副标题",
-  "goodsTitlePlaceholder": "请输入副标题",
-  "image": "商品图片",
-  "imagePlaceholder": "请选择商品图片",
-  "selectProduct": "选择商品",
-  "selectGoodsPlaceholder": "请选择商品",
-  "goodsStatus": "商品状态",
-  "goodsSelect": "选择商品",
-  "redemptionSettings": "积分设置",
+    "editGoods":"编辑商品",
+    "baseInfo":"基础设置",
+    "goodsType":"商品类型",
+    "goodsName":"商品名称",
+    "goodsNamePlaceholder":"请输入商品名称",
+    "goodsTitle":"副标题",
+    "goodsTitlePlaceholder":"请输入副标题",
+    "image":"商品图片",
+    "imagePlaceholder":"请选择商品图片",
+    "selectProduct": "选择商品",
+    "selectGoodsPlaceholder": "请选择商品",
+    "goodsStatus":"商品状态",
+    "goodsSelect":"选择商品",
+    "redemptionSettings":"积分设置",
 
-  "batchOperation": "批量设置",
-  "batchEmptySelectedGoodsTips": "请选择要操作的商品",
-  "goodsSelectPopupGoodsInfo": "商品信息",
-  "price": "销售价",
-  "stock": "兑换库存",
-  "stockPlaceholder": "请输入兑换库存",
-  "stockTips": "[兑换库存]格式错误",
-  "stockTipsTwo": "兑换库存不可小于等于0",
-  "stockTipsThree": "兑换限制数量不可大于商品库存",
-  "limit": "兑换限制",
-  "limitPlaceholder": "请输入兑换限制",
-  "limitTips": "[兑换限制]格式错误",
-  "limitTipsTwo": "兑换限制数量不可小于等于0",
-  "limitTipsThree": "兑换限制数量不能大于兑换库存",
-  "limitUnit": "件/人",
-  "integralUnit": "积分",
-  "prickUnit": "元",
-  "pointPlaceholder": "请输入积分积分",
-  "pointTips": "[积分]格式错误",
-  "pointTipsTwo": "积分不可小于等于0",
-  "money": "兑换价",
-  "newPrice": "价格",
-  "moneyTips": "[价格]格式错误",
-  "moneyTipsTwo": "价格不可小于0",
-  "limitRules": "每人每单可兑换件数",
+    "batchOperation": "批量设置",
+    "batchEmptySelectedGoodsTips": "请选择要操作的商品",
+    "goodsSelectPopupGoodsInfo":"商品信息",
+    "price":"销售价",
+    "stock":"兑换库存",
+    "stockPlaceholder":"请输入兑换库存",
+    "stockTips":"[兑换库存]格式错误",
+    "stockTipsTwo":"兑换库存不可小于等于0",
+    "stockTipsThree":"兑换限制数量不可大于商品库存",
+    "limit":"兑换限制",
+    "limitPlaceholder":"请输入兑换限制",
+    "limitTips":"[兑换限制]格式错误",
+    "limitTipsTwo":"兑换限制数量不可小于等于0",
+    "limitTipsThree":"兑换限制数量不能大于兑换库存",
+    "limitUnit":"件/人",
+    "integralUnit":"积分",
+    "prickUnit":"元",
+    "pointPlaceholder":"请输入积分积分",
+    "pointTips":"[积分]格式错误",
+    "pointTipsTwo":"积分不可小于等于0",
+    "money":"兑换价",
+    "newPrice":"价格",
+    "moneyTips":"[价格]格式错误",
+    "moneyTipsTwo":"价格不可小于0",
+    "limitRules":"每人每单可兑换件数",
 
-  "couponSelect": "选择优惠券",
-  "couponSelectPlaceholder": "请选择优惠券",
-  "couponName": "优惠券名称",
-  "couponType": "类型",
-  "couponPrice": "面值",
-  "sumCount": "总库存",
-  "threshold": "使用门槛",
-  "validType": "有效期",
-  "receiveTypeTime": "领取有效期",
+    
+    "couponSelect":"选择优惠券",
+    "couponSelectPlaceholder":"请选择优惠券",
+    "couponName":"优惠券名称",
+    "couponType":"类型",
+    "couponPrice":"面值",
+    "sumCount":"总库存",
+    "threshold": "使用门槛",
+    "validType": "有效期",
+    "receiveTypeTime": "领取有效期",
 
-  "balance": "兑换余额",
-  "balancePlaceholder": "请输入兑换余额",
-  "balanceTips": "[兑换余额]格式错误",
-  "balanceTipsTwo": "兑换余额不可小于等于0",
-  "balanceType": "余额类型",
+    "balance":"兑换余额",
+    "balancePlaceholder":"请输入兑换余额",
+    "balanceTips":"[兑换余额]格式错误",
+    "balanceTipsTwo":"兑换余额不可小于等于0",
+    "balanceType":"余额类型",
 
-  "goodsSkuTitle": "选择商品规格",
-  "goodsSkuPlaceholder": "请选择商品规格",
-  "goodsStock": "库存",
-  "enabled": "设为参与",
-  "noEnabled": "设为不参与",
-  "noEnabledTip": "请至少设置一个规格参与",
-  "goodsDetail": "商品详情"
-}
+    "goodsSkuTitle":"选择商品规格",
+    "goodsSkuPlaceholder":"请选择商品规格",
+    "goodsStock":"库存",
+    "enabled":"设为参与",
+    "noEnabled":"设为不参与",
+    "noEnabledTip":"请至少设置一个规格参与",
+    "goodsDetail":"商品详情"
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.exchange.goods_list.json b/admin/src/addon/shop/lang/zh-cn/marketing.exchange.goods_list.json
index b11282fd..1b2a030a 100644
--- a/admin/src/addon/shop/lang/zh-cn/marketing.exchange.goods_list.json
+++ b/admin/src/addon/shop/lang/zh-cn/marketing.exchange.goods_list.json
@@ -1,27 +1,27 @@
 {
-  "addGoods": "添加商品",
-  "goods": "商品",
-  "goodsName": "商品名称",
-  "goodsNamePlaceholder": "请输入商品名称",
-  "status": "状态",
-  "statusPlaceholder": "请选择状态",
-  "goodsType": "商品类型",
-  "exchangePrice": "兑换价格",
-  "pointUnit": "积分",
-  "priceUnit": "元",
-  "redeemedAndSurplus": "已兑/剩余",
-  "deleteTips": "是否确认删除当前商品",
-  "createTime": "创建时间",
-  "spreadGoods": "推广",
-  "copyGoods": "复制",
-  "spreadLink": "推广链接",
-  "copy": "复制",
-  "downloadQrcode": "下载二维码",
-  "goodsSpreadTitle": "积分商品推广",
-  "up": "上架",
-  "upTips": "是否确认上架当前商品",
-  "down": "下架",
-  "downTips": "是否确认下架当前商品",
-  "startDate": "开始时间",
-  "endDate": "结束时间"
-}
+    "addGoods":"添加商品",
+    "goods":"商品",
+    "goodsName":"商品名称",
+    "goodsNamePlaceholder":"请输入商品名称",
+    "status":"状态",
+    "statusPlaceholder":"请选择状态",
+    "goodsType":"商品类型",
+    "exchangePrice":"兑换价格",
+    "pointUnit":"积分",
+    "priceUnit":"元",
+    "redeemedAndSurplus":"已兑/剩余",
+    "deleteTips":"是否确认删除当前商品",
+    "createTime":"创建时间",
+    "spreadGoods": "推广",
+    "copyGoods": "复制",
+    "spreadLink": "推广链接",
+    "copy": "复制",
+    "downloadQrcode": "下载二维码",
+    "goodsSpreadTitle": "积分商品推广",
+    "up":"上架",
+    "upTips":"是否确认上架当前商品",
+    "down":"下架",
+    "downTips":"是否确认下架当前商品",
+    "startDate":"开始时间",
+    "endDate":"结束时间"
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.exchange.order_list.json b/admin/src/addon/shop/lang/zh-cn/marketing.exchange.order_list.json
index 05f05b5f..ddb11dfd 100644
--- a/admin/src/addon/shop/lang/zh-cn/marketing.exchange.order_list.json
+++ b/admin/src/addon/shop/lang/zh-cn/marketing.exchange.order_list.json
@@ -1,55 +1,55 @@
 {
-  "orderNo": "订单编号",
-  "orderNoPlaceholder": "请输入订单编号",
-  "orderStatus": "订单状态",
-  "orderStatusPlaceholder": "请选择订单状态",
-  "orderFrom": "订单类型",
-  "orderFromPlaceholder": "请选择订单类型",
-  "payTime": "支付时间",
-  "orderGoods": "商品",
-  "goodsPriceNumber": "单价（元）/数量",
-  "orderMoney": "实付金额（元）",
-  "startDate": "开始时间",
-  "endDate": "结束时间",
-  "piece": "件",
-  "activeRefund": "主动退款",
-  "notes": "备注",
-  "offlinePayment": "线下支付",
-  "orderClose": "关闭订单",
-  "editPrice": "修改价格",
-  "editAddress": "修改地址",
-  "sendOutGoods": "发货",
-  "confirmTakeDelivery": "确认收货",
-  "all": "全部",
-  "toBeShipped": "待发货",
-  "shipped": "已发货",
-  "receivedGoods": "已收货",
-  "completed": "已完成",
-  "closed": "已关闭",
-  "refunding": "退款中",
-  "notesDetail": "备注信息",
+    "orderNo":"订单编号",
+    "orderNoPlaceholder": "请输入订单编号",
+    "orderStatus": "订单状态",
+    "orderStatusPlaceholder": "请选择订单状态",
+    "orderFrom": "订单类型",
+    "orderFromPlaceholder": "请选择订单类型",
+    "payTime": "支付时间",
+    "orderGoods": "商品",
+    "goodsPriceNumber": "单价（元）/数量",
+    "orderMoney": "实付金额（元）",
+    "startDate": "开始时间",
+    "endDate": "结束时间",
+    "piece": "件",
+    "activeRefund": "主动退款",
+    "notes": "备注",
+    "offlinePayment": "线下支付",
+    "orderClose": "关闭订单",
+    "editPrice": "修改价格",
+    "editAddress": "修改地址",
+    "sendOutGoods": "发货",
+    "confirmTakeDelivery": "确认收货",
+    "all": "全部",
+    "toBeShipped": "待发货",
+    "shipped": "已发货",
+    "receivedGoods": "已收货",
+    "completed": "已完成",
+    "closed": "已关闭",
+    "refunding": "退款中",
+    "notesDetail": "备注信息",
+    
+    "delivery": "订单发货",
+    "company": "物流公司",
+    "companyPlaceholder": "请选择物流公司",
+    "expressNumber": "物流单号",
+    "expressNumberPlaceholder": "请输入物流单号",
+    "orderGoodsIdsPlaceholder": "请选择订单项",
+    "virtualDelivery": "虚拟发货",
+    "goodsName": "商品名称",
+    "num": "商品数量",
+    "orderCloseTips": "关闭订单后该订单将无法支付，是否确认关闭?",
+    "orderFinishTips": "是否确认用户已经收货？",
+    "orderGoodsPlaceholder": "请选择要发货的商品",
+    "deliveryStatusName": "发货状态",
+    "fromType": "订单来源",
+    "payType": "支付类型",
+    "orderInfo": "订单信息",
+    "refundStatusName": "退款状态",
+    "outTradeNo": "交易流水号",
 
-  "delivery": "订单发货",
-  "company": "物流公司",
-  "companyPlaceholder": "请选择物流公司",
-  "expressNumber": "物流单号",
-  "expressNumberPlaceholder": "请输入物流单号",
-  "orderGoodsIdsPlaceholder": "请选择订单项",
-  "virtualDelivery": "虚拟发货",
-  "goodsName": "商品名称",
-  "num": "商品数量",
-  "orderCloseTips": "关闭订单后该订单将无法支付，是否确认关闭?",
-  "orderFinishTips": "是否确认用户已经收货？",
-  "orderGoodsPlaceholder": "请选择要发货的商品",
-  "deliveryStatusName": "发货状态",
-  "fromType": "订单来源",
-  "payType": "支付类型",
-  "orderInfo": "订单信息",
-  "refundStatusName": "退款状态",
-  "outTradeNo": "交易流水号",
-
-  "exportOrderType": "导出订单类型",
-  "shopOrder": "订单数据表",
-  "shopOrderGoods": "订单商品表",
-  "point": "积分"
-}
+    "exportOrderType": "导出订单类型",
+    "shopOrder": "订单数据表",
+    "shopOrderGoods": "订单商品表",
+    "point":"积分"
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.manjian.detail.json b/admin/src/addon/shop/lang/zh-cn/marketing.manjian.detail.json
index 80fa2653..7ba75abb 100644
--- a/admin/src/addon/shop/lang/zh-cn/marketing.manjian.detail.json
+++ b/admin/src/addon/shop/lang/zh-cn/marketing.manjian.detail.json
@@ -1,37 +1,37 @@
 {
-  "baseInfo": "基础信息",
-  "name": "活动名称",
-  "title": "标题",
-  "status": "状态",
-  "paymentAmount": "支付金额",
-  "memberCount": "参与会员数",
-  "orderCount": "支付订单数",
-  "createTime": "创建时间",
-  "startTime": "活动开始时间",
-  "endTime": "活动结束时间",
-  "keywordPlaceholder": "请输入商品名称",
-  "keyword": "商品名称",
-  "goodsInfo": "商品信息",
-  "price": "商品价格",
-  "activeOrderMoney": "累计订单金额",
-  "activeOrderNum": "累计订单数",
-  "activeMemberNum": "参与会员数",
-  "activeSuccessNum": "支付销量",
-  "orderInfo": "订单编号",
-  "payTime": "支付时间",
-  "orderNo": "订单编号",
-  "orderMoney": "订单金额",
-  "buyInfo": "买家/收货人",
-  "payType": "支付类型",
-  "orderStatus": "订单状态",
-  "toBePaid": "待支付",
-  "toBeShipped": "待发货",
-  "shipped": "已发货",
-  "receivedGoods": "已收货",
-  "completed": "已完成",
-  "closed": "已关闭",
-  "consumptionMoney": "消费总额",
-  "participationNum": "参与次数",
-  "orderTime": "最后下单时间",
-  "memberInfo": "会员信息"
-}
+    "baseInfo": "基础信息",
+    "name": "活动名称",
+    "title": "标题",
+    "status": "状态",
+    "paymentAmount": "支付金额",
+    "memberCount": "参与会员数",
+    "orderCount": "支付订单数",
+    "createTime": "创建时间",
+    "startTime": "活动开始时间",
+    "endTime": "活动结束时间",
+    "keywordPlaceholder": "请输入商品名称",
+    "keyword": "商品名称",
+    "goodsInfo": "商品信息",
+    "price": "商品价格",
+    "activeOrderMoney": "累计订单金额",
+    "activeOrderNum": "累计订单数",
+    "activeMemberNum": "参与会员数",
+    "activeSuccessNum": "支付销量",
+    "orderInfo": "订单编号",
+    "payTime": "支付时间",
+    "orderNo": "订单编号",
+    "orderMoney": "订单金额",
+    "buyInfo": "买家/收货人",
+    "payType": "支付类型",
+    "orderStatus": "订单状态",
+    "toBePaid": "待支付",
+    "toBeShipped": "待发货",
+    "shipped": "已发货",
+    "receivedGoods": "已收货",
+    "completed": "已完成",
+    "closed": "已关闭",
+    "consumptionMoney": "消费总额",
+    "participationNum": "参与次数",
+    "orderTime": "最后下单时间",
+    "memberInfo": "会员信息"
+}   
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.manjian.edit.json b/admin/src/addon/shop/lang/zh-cn/marketing.manjian.edit.json
index e966425e..2d526265 100644
--- a/admin/src/addon/shop/lang/zh-cn/marketing.manjian.edit.json
+++ b/admin/src/addon/shop/lang/zh-cn/marketing.manjian.edit.json
@@ -84,5 +84,5 @@
   "limitTipsThree": "必须大于上一层级的优惠门槛",
   "ruleTypeTips": "阶梯优惠根据设定的门槛逐级增加优惠，达到特定层级门槛即可享受对应优惠，最高可设5个层级。",
   "ruleTypeTipsTwo": "循环优惠指每次达到门槛即获赠一次优惠，无次数上限，需合理设置门槛。",
-  "goodsOffTips": "该商品已下架"
+  "goodsOffTips":"该商品已下架"
 }
diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.newcomer.config.json b/admin/src/addon/shop/lang/zh-cn/marketing.newcomer.config.json
index 6d6f631f..162a3fad 100644
--- a/admin/src/addon/shop/lang/zh-cn/marketing.newcomer.config.json
+++ b/admin/src/addon/shop/lang/zh-cn/marketing.newcomer.config.json
@@ -1,45 +1,45 @@
 {
-  "basicInfoTab": "基础设置",
-  "bannerList": "顶部广告图",
-  "activeStatus": "是否启用",
-  "validityType": "有效期",
-  "validityDay": "天数",
-  "validityDayPlaceholder": "请输入有效天数",
-  "validityDayTips": "有效天数不可小于等于0",
-  "validityDayTipsLeft": "达成门槛立即生效，",
-  "validityDayTipsRight": "天有效期",
-  "validityTime": "固定时间",
-  "validityTimePlaceholder": "请选择有效期截止时间",
-  "validityTimePlaceholderTwo": "请先选择参与门槛时间",
-  "validityTimePlaceholderThree": "有效期截止时间不可小于参与门槛时间",
-  "validityTimeTips": "达成门槛立即生效，有效期截止为",
-  "validityTimeTipsTwo": "修改有效期将同步更新所有未参与活动用户的结束时间",
-  "participationWay": "参与门槛",
-  "neverOrder": "从未下过单的会员",
-  "assignTimeOrder": "指定时间内未下过单的会员",
-  "assignTimeRegister": "指定时间内注册的会员",
-  "appointTimePlaceholder": "请选择指定时间",
-  "activityGoods": "活动商品",
-  "selectGoods": "选择商品",
-  "goodsSkuIdsPlaceholder": "请选择商品",
-  "limitNum": "限购数量",
-  "limitNumPlaceholder": "请输入限购数量",
-  "limitNumTips": "限购数量不可小于等于0",
-  "limitNumTipsThree": "限购数量不可超过已选商品数量",
-  "oldPrice": "原价",
-  "newcomerPrice": "新人价",
-  "newcomerPricePlaceholder": "请输入新人价",
-  "newcomerPriceTips": "[新人价]格式错误",
-  "newcomerPriceTipsOne": "新人价不可小于0",
-  "newcomerPriceTipsTwo": "新人价不可大于原价",
-  "batchOperation": "批量操作",
-  "batchEmptySelectedGoodsTips": "请选择要操作的商品",
-  "activeDesc": "规则说明",
-  "activeDescPlaceholder": "请输入规则说明",
-  "useDefaultActiveDesc": "使用默认说明",
-  "image": "图片上传",
-  "imagePlaceholder": "请上传图片",
-  "toLink": "跳转链接",
-  "toLinkPlaceholder": "请输入跳转链接",
-  "addConfigList": "添加广告图"
-}
+    "basicInfoTab":"基础设置",
+    "bannerList":"顶部广告图",
+    "activeStatus":"是否启用",
+    "validityType":"有效期",
+    "validityDay":"天数",
+    "validityDayPlaceholder":"请输入有效天数",
+    "validityDayTips":"有效天数不可小于等于0",
+    "validityDayTipsLeft":"达成门槛立即生效，",
+    "validityDayTipsRight":"天有效期",
+    "validityTime":"固定时间",
+    "validityTimePlaceholder":"请选择有效期截止时间",
+    "validityTimePlaceholderTwo":"请先选择参与门槛时间",
+    "validityTimePlaceholderThree":"有效期截止时间不可小于参与门槛时间",
+    "validityTimeTips":"达成门槛立即生效，有效期截止为",
+    "validityTimeTipsTwo":"修改有效期将同步更新所有未参与活动用户的结束时间",
+    "participationWay":"参与门槛",
+    "neverOrder":"从未下过单的会员",
+    "assignTimeOrder":"指定时间内未下过单的会员",
+    "assignTimeRegister":"指定时间内注册的会员",
+    "appointTimePlaceholder":"请选择指定时间",
+    "activityGoods":"活动商品",
+    "selectGoods":"选择商品",
+    "goodsSkuIdsPlaceholder":"请选择商品",
+    "limitNum":"限购数量",
+    "limitNumPlaceholder":"请输入限购数量",
+    "limitNumTips":"限购数量不可小于等于0",
+    "limitNumTipsThree":"限购数量不可超过已选商品数量",
+    "oldPrice":"原价",
+    "newcomerPrice":"新人价",
+    "newcomerPricePlaceholder":"请输入新人价",
+    "newcomerPriceTips":"[新人价]格式错误",
+    "newcomerPriceTipsOne":"新人价不可小于0",
+    "newcomerPriceTipsTwo":"新人价不可大于原价",
+    "batchOperation":"批量操作",
+    "batchEmptySelectedGoodsTips": "请选择要操作的商品",
+    "activeDesc":"规则说明",
+    "activeDescPlaceholder":"请输入规则说明",
+    "useDefaultActiveDesc": "使用默认说明",
+    "image":"图片上传",
+    "imagePlaceholder":"请上传图片",
+    "toLink":"跳转链接",
+    "toLinkPlaceholder":"请输入跳转链接",
+    "addConfigList":"添加广告图"
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.newcomer.order_list.json b/admin/src/addon/shop/lang/zh-cn/marketing.newcomer.order_list.json
index 3a15fc4f..3bcab31f 100644
--- a/admin/src/addon/shop/lang/zh-cn/marketing.newcomer.order_list.json
+++ b/admin/src/addon/shop/lang/zh-cn/marketing.newcomer.order_list.json
@@ -1,57 +1,57 @@
 {
-  "orderNo": "订单编号",
-  "orderNoPlaceholder": "请输入订单编号",
-  "orderStatus": "订单状态",
-  "orderStatusPlaceholder": "请选择订单状态",
-  "orderFrom": "订单类型",
-  "orderFromPlaceholder": "请选择订单类型",
-  "payTime": "支付时间",
-  "orderGoods": "商品",
-  "goodsPriceNumber": "单价（元）/数量",
-  "goodsPriceNumberTips": "新人价商品购买数量为1时，单价显示新人价，购买数量大于1时，单价显示原价或折扣价或会员价",
-  "orderMoney": "实付金额（元）",
-  "startDate": "开始时间",
-  "endDate": "结束时间",
-  "piece": "件",
-  "createTime": "创建时间",
-  "activeRefund": "主动退款",
-  "notes": "备注",
-  "offlinePayment": "线下支付",
-  "orderClose": "关闭订单",
-  "editPrice": "修改价格",
-  "editAddress": "修改地址",
-  "sendOutGoods": "发货",
-  "confirmTakeDelivery": "确认收货",
-  "all": "全部",
-  "toBeShipped": "待发货",
-  "shipped": "已发货",
-  "receivedGoods": "已收货",
-  "completed": "已完成",
-  "closed": "已关闭",
-  "refunding": "退款中",
-  "notesDetail": "备注信息",
+    "orderNo":"订单编号",
+    "orderNoPlaceholder": "请输入订单编号",
+    "orderStatus": "订单状态",
+    "orderStatusPlaceholder": "请选择订单状态",
+    "orderFrom": "订单类型",
+    "orderFromPlaceholder": "请选择订单类型",
+    "payTime": "支付时间",
+    "orderGoods": "商品",
+    "goodsPriceNumber": "单价（元）/数量",
+    "goodsPriceNumberTips": "新人价商品购买数量为1时，单价显示新人价，购买数量大于1时，单价显示原价或折扣价或会员价",
+    "orderMoney": "实付金额（元）",
+    "startDate": "开始时间",
+    "endDate": "结束时间",
+    "piece": "件",
+    "createTime": "创建时间",
+    "activeRefund": "主动退款",
+    "notes": "备注",
+    "offlinePayment": "线下支付",
+    "orderClose": "关闭订单",
+    "editPrice": "修改价格",
+    "editAddress": "修改地址",
+    "sendOutGoods": "发货",
+    "confirmTakeDelivery": "确认收货",
+    "all": "全部",
+    "toBeShipped": "待发货",
+    "shipped": "已发货",
+    "receivedGoods": "已收货",
+    "completed": "已完成",
+    "closed": "已关闭",
+    "refunding": "退款中",
+    "notesDetail": "备注信息",
+    
+    "delivery": "订单发货",
+    "company": "物流公司",
+    "companyPlaceholder": "请选择物流公司",
+    "expressNumber": "物流单号",
+    "expressNumberPlaceholder": "请输入物流单号",
+    "orderGoodsIdsPlaceholder": "请选择订单项",
+    "virtualDelivery": "虚拟发货",
+    "goodsName": "商品名称",
+    "num": "商品数量",
+    "orderCloseTips": "关闭订单后该订单将无法支付，是否确认关闭?",
+    "orderFinishTips": "是否确认用户已经收货？",
+    "orderGoodsPlaceholder": "请选择要发货的商品",
+    "deliveryStatusName": "发货状态",
+    "fromType": "订单来源",
+    "payType": "支付类型",
+    "orderInfo": "订单信息",
+    "refundStatusName": "退款状态",
+    "outTradeNo": "交易流水号",
 
-  "delivery": "订单发货",
-  "company": "物流公司",
-  "companyPlaceholder": "请选择物流公司",
-  "expressNumber": "物流单号",
-  "expressNumberPlaceholder": "请输入物流单号",
-  "orderGoodsIdsPlaceholder": "请选择订单项",
-  "virtualDelivery": "虚拟发货",
-  "goodsName": "商品名称",
-  "num": "商品数量",
-  "orderCloseTips": "关闭订单后该订单将无法支付，是否确认关闭?",
-  "orderFinishTips": "是否确认用户已经收货？",
-  "orderGoodsPlaceholder": "请选择要发货的商品",
-  "deliveryStatusName": "发货状态",
-  "fromType": "订单来源",
-  "payType": "支付类型",
-  "orderInfo": "订单信息",
-  "refundStatusName": "退款状态",
-  "outTradeNo": "交易流水号",
-
-  "exportOrderType": "导出订单类型",
-  "shopOrder": "订单数据表",
-  "shopOrderGoods": "订单商品表",
-  "point": "积分"
-}
+    "exportOrderType": "导出订单类型",
+    "shopOrder": "订单数据表",
+    "shopOrderGoods": "订单商品表",
+    "point":"积分"
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/order.batch_delivery.json b/admin/src/addon/shop/lang/zh-cn/order.batch_delivery.json
index b7fdddad..85ffdf8a 100644
--- a/admin/src/addon/shop/lang/zh-cn/order.batch_delivery.json
+++ b/admin/src/addon/shop/lang/zh-cn/order.batch_delivery.json
@@ -1,25 +1,25 @@
 {
-  "failuresNum": "发货失败单数",
-  "succeedNum": "发货成功单数",
-  "totalNum": "总发货单数",
-  "operationTime": "操作时间",
-  "operationType": "操作类型",
-  "state": "状态",
-  "operator": "操作人",
-  "importData": "批量发货",
-  "templateType": "模板类型",
-  "fullOrderDelivery": "整单发货模板",
-  "openOrderDelivery": "拆单发货模板",
-  "uploadFile": "上传文件",
-  "createTime": "时间",
-  "uploadFilePlaceholder": "请上传文件",
-  "operatorPlaceholder": "请选择操作人",
-  "causeFailure": "下载失败记录",
-  "downloadRecord": "下载记录",
-  "orderTemplate": "下载整单发货模板.xls",
-  "orderGoodsTemplate": "下载拆单发货模板.xls",
-  "checkCause": "查看失败原因",
-  "startTime": "开始时间",
-  "endTime": "结束时间",
-  "checkCause1": "失败原因"
-}
+    "failuresNum":"发货失败单数",
+    "succeedNum":"发货成功单数",
+    "totalNum":"总发货单数",
+    "operationTime":"操作时间",
+    "operationType":"操作类型",
+    "state":"状态",
+    "operator":"操作人",
+    "importData":"批量发货",
+    "templateType":"模板类型",
+    "fullOrderDelivery":"整单发货模板",
+    "openOrderDelivery":"拆单发货模板",
+    "uploadFile":"上传文件",
+    "createTime":"时间",
+    "uploadFilePlaceholder":"请上传文件",
+    "operatorPlaceholder":"请选择操作人",
+    "causeFailure":"下载失败记录",
+    "downloadRecord":"下载记录",
+    "orderTemplate":"下载整单发货模板.xls",
+    "orderGoodsTemplate":"下载拆单发货模板.xls",
+    "checkCause": "查看失败原因",
+    "startTime": "开始时间",
+    "endTime": "结束时间",
+    "checkCause1": "失败原因"
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/order.config.json b/admin/src/addon/shop/lang/zh-cn/order.config.json
index 6d0d9425..dea0f710 100644
--- a/admin/src/addon/shop/lang/zh-cn/order.config.json
+++ b/admin/src/addon/shop/lang/zh-cn/order.config.json
@@ -1,41 +1,41 @@
 {
-  "closeOrderInfo": "自动取消订单",
-  "closeOrderInfoLeft": "提交订单",
-  "closeOrderInfoRight": "分钟未付款，自动取消订单",
-  "closeOrderInfoBottom": "订单取消时间必须在10-1440分钟之间",
-  "CloseLengthPlaceholder": "请输入订单取消时间",
-  "isClose": "自动取消订单",
-  "confirm": "自动确认收货",
-  "confirmLeft": "发货后",
-  "confirmRight": "天，自动确认收货",
-  "confirmBottom": "自动确认收货时间必须在1-30天之间",
-  "finishLengthPlaceholder": "请输入自动确认收货时间",
-  "isFinish": "自动确认收货",
-  "refund": "确认收货后售后",
-  "refundLeft": "确认收货",
-  "refundRight": "天内，可申请售后",
-  "refundBottom": "确认收货后售后时间必须在1-30天之间",
-  "noAllowRefund": "确认收货后不支持售后",
-  "validRefundLengthPlaceholder": "请输入确认收货后售后时间",
-  "invoice": "发票设置",
-  "isInvoice": "发票开关",
-  "isInvoiceClose": "关闭",
-  "isInvoiceOpen": "开启",
-  "invoiceContent": "发票内容",
-  "insert": "添加",
-  "paperInvoice": "纸质发票",
-  "electronicInvoice": "电子发票",
-  "invoicePlaceholder": "所有发票内容不能为空",
-  "invoiceType": "发票类型",
-  "invoiceTypePlaceholder": "请至少选择一个发票类型",
-  "evaluate": "评价设置",
-  "isEvaluate": "评价开关",
-  "evaluateIsToExamine": "评价审核",
-  "evaluateIsShow": "评价显示",
-  "isEvaluateOpen": "开启",
-  "isEvaluateClose": "关闭",
+    "closeOrderInfo":"自动取消订单",
+    "closeOrderInfoLeft":"提交订单",
+    "closeOrderInfoRight":"分钟未付款，自动取消订单",
+    "closeOrderInfoBottom":"订单取消时间必须在10-1440分钟之间",
+    "CloseLengthPlaceholder":"请输入订单取消时间",
+    "isClose":"自动取消订单",
+    "confirm":"自动确认收货",
+    "confirmLeft":"发货后",
+    "confirmRight":"天，自动确认收货",
+    "confirmBottom":"自动确认收货时间必须在1-30天之间",
+    "finishLengthPlaceholder":"请输入自动确认收货时间",
+    "isFinish":"自动确认收货",
+    "refund":"确认收货后售后",
+    "refundLeft":"确认收货",
+    "refundRight":"天内，可申请售后",
+    "refundBottom":"确认收货后售后时间必须在1-30天之间",
+    "noAllowRefund":"确认收货后不支持售后",
+    "validRefundLengthPlaceholder":"请输入确认收货后售后时间",
+    "invoice":"发票设置",
+    "isInvoice":"发票开关",
+    "isInvoiceClose":"关闭",
+    "isInvoiceOpen":"开启",
+    "invoiceContent":"发票内容",
+    "insert":"添加",
+    "paperInvoice":"纸质发票",
+    "electronicInvoice":"电子发票",
+    "invoicePlaceholder":"所有发票内容不能为空",
+    "invoiceType":"发票类型",
+    "invoiceTypePlaceholder":"请至少选择一个发票类型",
+	"evaluate": "评价设置",
+	"isEvaluate": "评价开关",
+	"evaluateIsToExamine": "评价审核",
+	"evaluateIsShow": "评价显示",
+	"isEvaluateOpen": "开启",
+	"isEvaluateClose": "关闭",
 
-  "diyForm": "万能表单",
-  "diyFormPlaceholder": "请选择万能表单",
-  "addDiyForm": "添加表单"
+    "diyForm": "万能表单",
+    "diyFormPlaceholder": "请选择万能表单",
+    "addDiyForm": "添加表单"
 }
diff --git a/admin/src/addon/shop/lang/zh-cn/order.detail.json b/admin/src/addon/shop/lang/zh-cn/order.detail.json
index bba63d6a..1f7e80a1 100644
--- a/admin/src/addon/shop/lang/zh-cn/order.detail.json
+++ b/admin/src/addon/shop/lang/zh-cn/order.detail.json
@@ -131,4 +131,4 @@
   "refundGoodsNum": "数量",
   "refundGoodsPlaceholder": "请选择退款的商品",
   "formDetail": "表单详情"
-}
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/order.invoice.json b/admin/src/addon/shop/lang/zh-cn/order.invoice.json
index 456514da..b91598cd 100644
--- a/admin/src/addon/shop/lang/zh-cn/order.invoice.json
+++ b/admin/src/addon/shop/lang/zh-cn/order.invoice.json
@@ -1,40 +1,40 @@
 {
-  "isInvoice": "是否开票",
-  "isInvoicePlaceholder": "请输入开票类型",
-  "startDate": "开始时间",
-  "endDate": "结束时间",
-  "headType": "抬头类型",
-  "headerTypeName": "抬头类型",
-  "person": "个人",
-  "firm": "企业",
-  "headTypePlaceholder": "请输入抬头类型",
-  "headerName": "发票抬头",
-  "headerNamePlaceholder": "请输入发票抬头",
-  "name": "发票内容",
-  "tradeType": "发票类型",
-  "typeName": "发票名称",
-  "headTypeName": "抬头类型",
-  "taxNumber": "纳税人识别号",
-  "mobile": "手机号",
-  "email": "邮件",
-  "telephone": "电话号",
-  "address": "地址",
-  "bankTame": "开户银行",
-  "bankCardNumber": "开户行账号",
-  "money": "开票金额",
-  "invoiceNumber": "发票号码",
-  "invoiceVoucher": "发票凭证",
-  "remark": "备注",
-  "createTime": "创建时间",
-  "invoiceTime": "开票时间",
-  "status": "状态",
-  "operation": "操作",
-  "detail": "详情",
-  "hasInvoice": "已开票",
-  "noInvoice": "未开票",
-  "all": "全部",
-  "invoice": "开票",
-  "viewOrder": "查看订单",
-  "invoiceNumberPlaceholder": "请输入发票号码",
-  "invoiceVoucherPlaceholder": "请输入发票凭证"
-}
+    "isInvoice":"是否开票",
+    "isInvoicePlaceholder":"请输入开票类型",
+    "startDate":"开始时间",
+    "endDate":"结束时间",
+    "headType":"抬头类型",
+    "headerTypeName":"抬头类型",
+    "person":"个人",
+    "firm":"企业",
+    "headTypePlaceholder":"请输入抬头类型",
+    "headerName":"发票抬头",
+    "headerNamePlaceholder":"请输入发票抬头",
+    "name":"发票内容",
+    "tradeType":"发票类型",
+    "typeName":"发票名称",
+    "headTypeName":"抬头类型",
+    "taxNumber":"纳税人识别号",
+    "mobile":"手机号",
+    "email":"邮件",
+    "telephone":"电话号",
+    "address":"地址",
+    "bankTame":"开户银行",
+    "bankCardNumber":"开户行账号",
+    "money":"开票金额",
+    "invoiceNumber":"发票号码",
+    "invoiceVoucher":"发票凭证",
+    "remark":"备注",
+    "createTime":"创建时间",
+    "invoiceTime":"开票时间",
+    "status":"状态",
+    "operation":"操作",
+    "detail":"详情",
+    "hasInvoice":"已开票",
+    "noInvoice":"未开票",
+    "all":"全部",
+    "invoice":"开票",
+    "viewOrder":"查看订单",
+    "invoiceNumberPlaceholder":"请输入发票号码",
+    "invoiceVoucherPlaceholder":"请输入发票凭证"
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/order.refund.json b/admin/src/addon/shop/lang/zh-cn/order.refund.json
index bd4756c1..b07aea9e 100644
--- a/admin/src/addon/shop/lang/zh-cn/order.refund.json
+++ b/admin/src/addon/shop/lang/zh-cn/order.refund.json
@@ -1,106 +1,106 @@
 {
-  "goodsName": "商品名称",
-  "orderNo": "订单编号",
-  "orderRefundNo": "退款编号",
-  "refundTime": "退款时间",
-  "startDate": "开始时间",
-  "endDate": "结束时间",
-  "goodsNamePlaceholder": "请输入商品名称",
-  "orderNoPlaceholder": "请输入订单编号",
-  "orderRefundNoPlaceholder": "请输入退款编号",
-  "goodsInfo": "商品信息",
-  "orderMoney": "订单金额",
-  "realityMoney": "实付金额",
-  "goodsMoney": "商品金额",
-  "buyMember": "买家",
-  "refundMoney": "退款金额",
-  "createTime": "申请时间",
-  "refundStatus": "退款状态",
-  "all": "全部",
-  "refundType": "退款方式",
-  "applyForRefund": "申请退款",
-  "refundEnd": "维权结束",
-  "toBeReturned": "买家待退货",
-  "receivedGoods": "卖家待收货",
-  "refundRefuse": "卖家拒绝",
-  "orderInfo": "订单信息",
-  "outTradeNo": "交易流水号",
-  "orderType": "订单类型",
-  "orderForm": "订单来源",
-  "takerName": "收货人",
-  "takerMobile": "收货人手机号",
-  "takerFullAddress": "收货地址",
-  "goodsDetail": "商品信息",
-  "price": "价格",
-  "num": "数量",
-  "preferentialMoney": "优惠金额",
-  "deliveryMoney": "配送金额",
-  "operateLog": "订单日志",
-  "orderStatus": "订单状态",
-  "orderStatusPlaceholder": "请选择订单状态",
-  "orderFrom": "订单类型",
-  "orderFromPlaceholder": "请选择订单类型",
-  "payTime": "支付时间",
-  "orderGoods": "商品",
-  "goodsPriceNumber": "单价（元）/数量",
-  "detailOrderMoney": "实付金额（元）",
-  "buyInfo": "买家/收货人",
-  "deliveryType": "配送方式",
-  "piece": "件",
-  "payType": "支付方式",
-  "notes": "备注",
-  "editAddress": "修改地址",
-  "remind": "提醒",
-  "remindTips1": "如果未发货，请点击同意退款给买家。",
-  "remindTips2": "如果实际已发货，请主动与买家联系。",
-  "remindTips3": "如果订单整体退款后，优惠券和余额会退还给买家。",
-  "close": "关闭订单",
-  "finish": "确认收货",
-  "delivery": "订单发货",
-  "deliveryTypePlaceholder": "请选择配送方式",
-  "company": "物流公司",
-  "companyPlaceholder": "请选择物流公司",
-  "expressNumber": "物流单号",
-  "expressNumberPlaceholder": "请输入物流单号",
-  "orderGoodsIdsPlaceholder": "请选择订单项",
-  "virtualDelivery": "虚拟发货",
-  "orderCloseTips": "关闭订单后该订单将无法支付，是否确认关闭？",
-  "orderFinishTips": "是否确认用户已经收货？",
-  "orderGoodsPlaceholder": "请选择要发货的商品",
-  "memberRemark": "买家留言",
-  "discountMoney": "订单详情",
-  "orderDelivery": "物流信息",
-  "devliveryTime": "发货时间",
-  "companyName": "物流公司",
-  "logisticNo": "物流单号",
-  "packageInfo": "物流包裹信息",
-  "deliveryInfo": "发货信息",
-  "logisticInfo": "物流信息",
-  "storeName": "自提点名称",
-  "storeAddress": "自提点地址",
-  "storeMobile": "自提点电话",
-  "tradeTime": "营业时间",
-  "deliveryStatusName": "发货状态",
-  "refundReason": "退款原因",
-  "afterSales": "售后信息",
-  "orderRefundRefuse": "退款拒绝",
-  "orderRefundAgree": "同意退款",
-  "agree": "同意",
-  "applyMoney": "申请金额",
-  "refuse": "拒绝",
-  "transferAccounts": "转账",
-  "refuseReason": "拒绝原因",
-  "shopReasonPlaceholder": "请输入拒绝原因",
-  "confirmDelivery": "确认收货",
-  "orderDeliveryTips": "确定商品收到了吗？",
-  "agreeRefundDelivery": "同意买家收货",
-  "refundDeliveryAddress": "退货地址",
-  "refundVoucher": "申请凭证",
-  "refundRemark": "退款描述",
-  "agreeMoney": "退款金额",
-  "moneyPlaceholder": "请输入退款金额",
-  "refundaddressPlaceholder": "请输入退货地址",
-  "expressCompany": "物流公司",
-  "expressRemark": "物流说明",
-  "orderInfoEmpty": "暂无数据"
-}
+	"goodsName": "商品名称",
+	"orderNo": "订单编号",
+	"orderRefundNo": "退款编号",
+	"refundTime": "退款时间",
+	"startDate": "开始时间",
+	"endDate": "结束时间",
+	"goodsNamePlaceholder": "请输入商品名称",
+	"orderNoPlaceholder": "请输入订单编号",
+	"orderRefundNoPlaceholder": "请输入退款编号",
+	"goodsInfo": "商品信息",
+	"orderMoney": "订单金额",
+	"realityMoney":"实付金额",
+	"goodsMoney": "商品金额",
+	"buyMember": "买家",
+	"refundMoney": "退款金额",
+	"createTime": "申请时间",
+	"refundStatus": "退款状态",
+	"all": "全部",
+	"refundType": "退款方式",
+	"applyForRefund": "申请退款",
+	"refundEnd": "维权结束",
+	"toBeReturned": "买家待退货",
+	"receivedGoods": "卖家待收货",
+    "refundRefuse": "卖家拒绝",
+    "orderInfo": "订单信息",
+    "outTradeNo": "交易流水号",
+    "orderType": "订单类型",
+    "orderForm": "订单来源",
+    "takerName": "收货人",
+    "takerMobile": "收货人手机号",
+    "takerFullAddress": "收货地址",
+    "goodsDetail": "商品信息",
+    "price": "价格",
+    "num": "数量",
+    "preferentialMoney": "优惠金额",
+    "deliveryMoney": "配送金额",
+    "operateLog": "订单日志",
+    "orderStatus": "订单状态",
+    "orderStatusPlaceholder": "请选择订单状态",
+    "orderFrom": "订单类型",
+    "orderFromPlaceholder": "请选择订单类型",
+    "payTime": "支付时间",
+    "orderGoods": "商品",
+    "goodsPriceNumber": "单价（元）/数量",
+    "detailOrderMoney": "实付金额（元）",
+    "buyInfo": "买家/收货人",
+    "deliveryType": "配送方式",
+    "piece": "件",
+    "payType": "支付方式",
+    "notes": "备注",
+    "editAddress": "修改地址",
+    "remind": "提醒",
+    "remindTips1": "如果未发货，请点击同意退款给买家。",
+    "remindTips2": "如果实际已发货，请主动与买家联系。",
+    "remindTips3": "如果订单整体退款后，优惠券和余额会退还给买家。",
+    "close": "关闭订单",
+    "finish": "确认收货",
+    "delivery": "订单发货",
+    "deliveryTypePlaceholder": "请选择配送方式",
+    "company": "物流公司",
+    "companyPlaceholder": "请选择物流公司",
+    "expressNumber": "物流单号",
+    "expressNumberPlaceholder": "请输入物流单号",
+    "orderGoodsIdsPlaceholder": "请选择订单项",
+    "virtualDelivery": "虚拟发货",
+    "orderCloseTips": "关闭订单后该订单将无法支付，是否确认关闭？",
+    "orderFinishTips": "是否确认用户已经收货？",
+    "orderGoodsPlaceholder": "请选择要发货的商品",
+    "memberRemark": "买家留言",
+    "discountMoney": "订单详情",
+    "orderDelivery": "物流信息",
+    "devliveryTime": "发货时间",
+    "companyName": "物流公司",
+    "logisticNo": "物流单号",
+    "packageInfo": "物流包裹信息",
+    "deliveryInfo": "发货信息",
+    "logisticInfo": "物流信息",
+    "storeName": "自提点名称",
+    "storeAddress": "自提点地址",
+    "storeMobile": "自提点电话",
+    "tradeTime": "营业时间",
+    "deliveryStatusName": "发货状态",
+    "refundReason": "退款原因",
+    "afterSales": "售后信息",
+    "orderRefundRefuse": "退款拒绝",
+    "orderRefundAgree": "同意退款",
+    "agree": "同意",
+    "applyMoney": "申请金额",
+    "refuse": "拒绝",
+    "transferAccounts": "转账",
+    "refuseReason": "拒绝原因",
+    "shopReasonPlaceholder": "请输入拒绝原因",
+    "confirmDelivery": "确认收货",
+    "orderDeliveryTips": "确定商品收到了吗？",
+    "agreeRefundDelivery": "同意买家收货",
+    "refundDeliveryAddress": "退货地址",
+    "refundVoucher": "申请凭证",
+    "refundRemark": "退款描述",
+    "agreeMoney": "退款金额",
+    "moneyPlaceholder": "请输入退款金额",
+    "refundaddressPlaceholder": "请输入退货地址",
+    "expressCompany": "物流公司",
+    "expressRemark": "物流说明",
+    "orderInfoEmpty": "暂无数据"
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/order.refund_detail.json b/admin/src/addon/shop/lang/zh-cn/order.refund_detail.json
index 220216af..89c5d0f4 100644
--- a/admin/src/addon/shop/lang/zh-cn/order.refund_detail.json
+++ b/admin/src/addon/shop/lang/zh-cn/order.refund_detail.json
@@ -91,4 +91,4 @@
   "expressCompany": "物流公司",
   "expressRemark": "物流说明",
   "orderInfoEmpty": "暂无数据"
-}
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/lang/zh-cn/stat.goods.json b/admin/src/addon/shop/lang/zh-cn/stat.goods.json
index ea3bcd05..172d17ed 100644
--- a/admin/src/addon/shop/lang/zh-cn/stat.goods.json
+++ b/admin/src/addon/shop/lang/zh-cn/stat.goods.json
@@ -1,37 +1,37 @@
 {
-  "goodsOverview": "商品概况",
-  "timeFilter": "时间筛选",
-  "startTime": "开始时间",
-  "endTime": "结束时间",
-  "search": "搜索",
-  "goodsAccessNum": "商品浏览量",
-  "goodsAccessNumTip": "统计时间内，所有商品详情页被访问的次数，一个人在统计时间内访问多次记为多次",
-  "goodsVisitCount": "商品访客数",
-  "goodsVisitCountTips": "统计时间内，访问任何商品详情页的人数，一个人在统计时间范围内访问多次只记为一个",
-  "cartNum": "加购件数",
-  "cartNumTips": "统计时间内，添加商品进入购物车的商品件数",
-  "saleNum": "下单件数",
-  "saleNumTips": "统计时间内，成功下单的商品件数之和（不剔除退款订单）",
-  "payNum": "支付件数",
-  "payNumTips": "统计时间内， 成功付款订单的商品件数之和（不剔除退款订单）",
-  "payMoney": "支付金额",
-  "payMoneyTips": "统计时间内，成功付款订单的商品金额之和（不剔除退款订单）",
-  "refundMoney": "退款金额",
-  "refundMoneyTips": "统计时间内，成功退款的商品金额之和",
-  "refundNum": "退款件数",
-  "refundNumTips": "统计时间内，成功退款的商品件数之和",
-  "goodsRank": "商品排行",
-  "goodsName": "商品名称",
-  "goodsNamePlaceholder": "请输入商品名称",
-  "goodsCategory": "商品分类",
-  "all": "全部",
-  "totalType": "统计类型",
-  "totalTypePlaceholder": "请选择统计类型",
-  "goodsInfo": "商品信息",
-  "accessNum": "访问次数",
-  "visitCount": "访客数",
-  "cartNumber": "加入购物车数量",
-  "saleNumber": "商品销量",
-  "payTotal": "支付总金额",
-  "collectNum": "收藏数量"
-}
+    "goodsOverview": "商品概况",
+    "timeFilter": "时间筛选",
+    "startTime": "开始时间",
+    "endTime": "结束时间",
+    "search": "搜索",
+    "goodsAccessNum": "商品浏览量",
+    "goodsAccessNumTip": "统计时间内，所有商品详情页被访问的次数，一个人在统计时间内访问多次记为多次",
+    "goodsVisitCount": "商品访客数",
+    "goodsVisitCountTips":"统计时间内，访问任何商品详情页的人数，一个人在统计时间范围内访问多次只记为一个",
+    "cartNum":"加购件数",
+    "cartNumTips":"统计时间内，添加商品进入购物车的商品件数",
+    "saleNum": "下单件数",
+    "saleNumTips": "统计时间内，成功下单的商品件数之和（不剔除退款订单）",
+    "payNum": "支付件数",
+    "payNumTips": "统计时间内， 成功付款订单的商品件数之和（不剔除退款订单）",
+    "payMoney":"支付金额",
+    "payMoneyTips":"统计时间内，成功付款订单的商品金额之和（不剔除退款订单）",
+    "refundMoney":"退款金额",
+    "refundMoneyTips":"统计时间内，成功退款的商品金额之和",
+    "refundNum":"退款件数",
+    "refundNumTips":"统计时间内，成功退款的商品件数之和",
+    "goodsRank": "商品排行",
+    "goodsName":"商品名称",
+    "goodsNamePlaceholder":"请输入商品名称",
+    "goodsCategory": "商品分类",
+    "all":"全部",
+    "totalType":"统计类型",
+    "totalTypePlaceholder":"请选择统计类型",
+    "goodsInfo":"商品信息",
+    "accessNum":"访问次数",
+    "visitCount":"访客数",
+    "cartNumber":"加入购物车数量",
+    "saleNumber":"商品销量",
+    "payTotal":"支付总金额",
+    "collectNum":"收藏数量"
+}
\ No newline at end of file
diff --git a/admin/src/addon/shop/views/address/edit.vue b/admin/src/addon/shop/views/address/edit.vue
index 8d676f6c..fad35649 100644
--- a/admin/src/addon/shop/views/address/edit.vue
+++ b/admin/src/addon/shop/views/address/edit.vue
@@ -1,158 +1,69 @@
 <template>
-  <div class="main-container">
-    <el-card class="card !border-none mb-[15px]" shadow="never">
-      <el-page-header :content="pageName" :icon="ArrowLeft" @back="back" />
-    </el-card>
-    <el-card class="box-card !border-none" shadow="never" v-loading="loading">
-      <el-form
-        :model="formData"
-        label-width="90px"
-        ref="formRef"
-        :rules="formRules"
-        class="page-form"
-      >
-        <el-form-item :label="t('addressType')" prop="address_type">
-          <div class="flex flex-col">
-            <div>
-              <el-checkbox
-                v-model="formData.is_delivery_address"
-                :label="t('deliveryAddress')"
-                :true-label="1"
-                :false-label="0"
-              />
-              <el-checkbox
-                v-model="formData.is_default_delivery"
-                :label="t('defaultDeliveryAddress')"
-                :true-label="1"
-                :false-label="0"
-                v-show="formData.is_delivery_address"
-              />
-            </div>
-            <div>
-              <el-checkbox
-                v-model="formData.is_refund_address"
-                :label="t('refundAddress')"
-                :true-label="1"
-                :false-label="0"
-              />
-              <el-checkbox
-                v-model="formData.is_default_refund"
-                :label="t('defaultRefundAddress')"
-                :true-label="1"
-                :false-label="0"
-                v-show="formData.is_refund_address"
-              />
-            </div>
-          </div>
-        </el-form-item>
-
-        <el-form-item :label="t('contactName')" prop="contact_name">
-          <el-input
-            v-model.trim="formData.contact_name"
-            clearable
-            :placeholder="t('contactNamePlaceholder')"
-            class="input-width"
-            maxlength="10"
-          />
-        </el-form-item>
-
-        <el-form-item :label="t('mobile')" prop="mobile">
-          <el-input
-            v-model.trim="formData.mobile"
-            clearable
-            :placeholder="t('mobilePlaceholder')"
-            class="input-width"
-            @keyup="filterNumber($event)"
-            @blur="formData.mobile = $event.target.value"
-          />
-        </el-form-item>
-
-        <el-form-item :label="t('fullAddress')" prop="address_area">
-          <el-select
-            v-model="formData.province_id"
-            value-key="id"
-            clearable
-            class="w-[200px]"
-            ref="provinceRef"
-          >
-            <el-option :label="t('provincePlaceholder')" :value="0" />
-            <el-option
-              v-for="(item, index) in areaList.province"
-              :key="index"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-          <el-select
-            v-model="formData.city_id"
-            value-key="id"
-            clearable
-            class="w-[200px] ml-3"
-            ref="cityRef"
-          >
-            <el-option :label="t('cityPlaceholder')" :value="0" />
-            <el-option
-              v-for="(item, index) in areaList.city"
-              :key="index"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-          <el-select
-            v-model="formData.district_id"
-            value-key="id"
-            clearable
-            class="w-[200px] ml-3"
-            ref="districtRef"
-          >
-            <el-option :label="t('districtPlaceholder')" :value="0" />
-            <el-option
-              v-for="(item, index) in areaList.district"
-              :key="index"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </el-form-item>
-
-        <el-form-item prop="address">
-          <el-input
-            v-model.trim="formData.address"
-            clearable
-            :placeholder="t('addressPlaceholder')"
-            class="input-width"
-          />
-        </el-form-item>
-
-        <el-form-item>
-          <div
-            id="container"
-            class="w-[800px] h-[520px] relative"
-            v-loading="mapLoading"
-          ></div>
-        </el-form-item>
-      </el-form>
-    </el-card>
-    <div class="fixed-footer-wrap">
-      <div class="fixed-footer !z-[9999]">
-        <el-button type="primary" @click="onSave(formRef)">{{
-          t('save')
-        }}</el-button>
-        <el-button @click="back()">{{ t('cancel') }}</el-button>
-      </div>
-    </div>
-  </div>
+	<div class="main-container">
+        <el-card class="card !border-none mb-[15px]" shadow="never">
+            <el-page-header :content="pageName" :icon="ArrowLeft" @back="back" />
+        </el-card>
+		<el-card class="box-card !border-none" shadow="never" v-loading="loading">
+			<el-form :model="formData" label-width="90px" ref="formRef" :rules="formRules" class="page-form">
+				<el-form-item :label="t('addressType')" prop="address_type">
+					<div class="flex flex-col">
+						<div>
+							<el-checkbox v-model="formData.is_delivery_address" :label="t('deliveryAddress')" :true-label="1" :false-label="0"/>
+							<el-checkbox v-model="formData.is_default_delivery" :label="t('defaultDeliveryAddress')" :true-label="1" :false-label="0" v-show="formData.is_delivery_address"/>
+						</div>
+						<div>
+							<el-checkbox v-model="formData.is_refund_address" :label="t('refundAddress')" :true-label="1" :false-label="0"/>
+							<el-checkbox v-model="formData.is_default_refund" :label="t('defaultRefundAddress')" :true-label="1" :false-label="0" v-show="formData.is_refund_address"/>
+						</div>
+					</div>
+				</el-form-item>
+
+				<el-form-item :label="t('contactName')" prop="contact_name">
+					<el-input v-model.trim="formData.contact_name" clearable :placeholder="t('contactNamePlaceholder')" class="input-width" maxlength="10" />
+				</el-form-item>
+
+				<el-form-item :label="t('mobile')" prop="mobile">
+					<el-input v-model.trim="formData.mobile" clearable :placeholder="t('mobilePlaceholder')" class="input-width"  @keyup="filterNumber($event)" @blur="formData.mobile = $event.target.value"/>
+				</el-form-item>
+
+				<el-form-item :label="t('fullAddress')" prop="address_area">
+					<el-select v-model="formData.province_id" value-key="id" clearable class="w-[200px]"  ref="provinceRef">
+						<el-option :label="t('provincePlaceholder')" :value="0"/>
+						<el-option v-for="(item, index) in areaList.province" :key="index" :label="item.name"  :value="item.id"/>
+					</el-select>
+					<el-select v-model="formData.city_id" value-key="id" clearable class="w-[200px] ml-3" ref="cityRef">
+						<el-option :label="t('cityPlaceholder')" :value="0"/>
+						<el-option v-for="(item, index) in areaList.city " :key="index" :label="item.name"  :value="item.id"/>
+					</el-select>
+					<el-select v-model="formData.district_id" value-key="id" clearable class="w-[200px] ml-3"  ref="districtRef">
+						<el-option :label="t('districtPlaceholder')" :value="0"/>
+						<el-option v-for="(item, index) in areaList.district " :key="index" :label="item.name"  :value="item.id"/>
+					</el-select>
+				</el-form-item>
+
+				<el-form-item prop="address">
+					<el-input v-model.trim="formData.address" clearable :placeholder="t('addressPlaceholder')"  class="input-width"/>
+				</el-form-item>
+
+				<el-form-item>
+					<div id="container" class="w-[800px] h-[520px] relative" v-loading="mapLoading"></div>
+				</el-form-item>
+			</el-form>
+		</el-card>
+		<div class="fixed-footer-wrap">
+			<div class="fixed-footer !z-[9999]">
+				<el-button type="primary" @click="onSave(formRef)">{{ t('save') }}</el-button>
+				<el-button @click="back()">{{ t('cancel') }}</el-button>
+			</div>
+		</div>
+	</div>
 </template>
 
 <script lang="ts" setup>
 import { ref, reactive, computed, onMounted, watch } from 'vue'
 import { t } from '@/lang'
 import type { FormInstance } from 'element-plus'
-import {
-  getShopAddressInfo,
-  addShopAddress,
-  editShopAddress,
-} from '@/addon/shop/api/shop_address'
+import { getShopAddressInfo, addShopAddress, editShopAddress } from '@/addon/shop/api/shop_address'
 import { getMap, getAreaListByPid, getAreaByCode } from '@/app/api/sys'
 import { useRoute } from 'vue-router'
 import { createMarker, latLngToAddress, addressToLatLng } from '@/utils/qqmap'
@@ -162,15 +73,15 @@ const route = useRoute()
 const id: number = parseInt(route.query.id as string)
 const loading = ref(false)
 const pageName = route.meta.title
-interface areaType {
-  province: any[]
-  city: any[]
-  district: any[]
+interface areaType{
+    province: any[],
+    city: any[],
+    district: any[]
 }
 const areaList = reactive<areaType>({
-  province: [],
-  city: [],
-  district: [],
+    province: [],
+    city: [],
+    district: []
 })
 const provinceRef = ref()
 const cityRef = ref()
@@ -179,120 +90,116 @@ const districtRef = ref()
 /**
  * 获取省
  */
-getAreaListByPid(0).then((res) => {
-  areaList.province = res.data
+getAreaListByPid(0).then(res => {
+    areaList.province = res.data
 })
 
 let mapKey: string = ''
 onMounted(() => {
-  const mapScript = document.createElement('script')
-  getMap().then((res) => {
-    mapKey = res.data.key
-    mapScript.type = 'text/javascript'
-    mapScript.src =
-      'https://map.qq.com/api/gljs?libraries=tools,service&v=1.exp&key=' +
-      res.data.key
-    document.body.appendChild(mapScript)
-  })
-  mapScript.onload = () => {
-    setTimeout(() => {
-      initMap()
-    }, 500)
-  }
+    const mapScript = document.createElement('script')
+    getMap().then(res => {
+        mapKey = res.data.key
+        mapScript.type = 'text/javascript'
+        mapScript.src = 'https://map.qq.com/api/gljs?libraries=tools,service&v=1.exp&key=' + res.data.key
+        document.body.appendChild(mapScript)
+    })
+    mapScript.onload = () => {
+        setTimeout(() => {
+            initMap()
+        }, 500)
+    }
 })
 
 /**
- * 初始化地图
+* 初始化地图
  */
 let map: any
 let marker: any
 const mapLoading = ref(true)
 const initMap = () => {
-  const TMap = (window as any).TMap
-  const LatLng = TMap.LatLng
-  const center = new LatLng(formData.lat, formData.lng)
-
-  map = new TMap.Map('container', {
-    center,
-    zoom: 14,
-  })
-
-  map.on('tilesloaded', () => {
-    mapLoading.value = false
-  })
-
-  marker = createMarker(map)
-
-  map.on('click', (evt: any) => {
-    map.setCenter(evt.latLng)
-    marker.updateGeometries({
-      id: 'center',
-      position: evt.latLng,
+    const TMap = (window as any).TMap
+    const LatLng = TMap.LatLng
+    const center = new LatLng(formData.lat, formData.lng)
+
+    map = new TMap.Map('container', {
+        center,
+        zoom: 14
+    })
+
+    map.on('tilesloaded', () => {
+        mapLoading.value = false
     })
-    latLngChange(evt.latLng.lat, evt.latLng.lng)
-  })
 
-  latLngChange(center.lat, center.lng)
+    marker = createMarker(map)
+
+    map.on('click', (evt: any) => {
+        map.setCenter(evt.latLng)
+        marker.updateGeometries({
+            id: 'center',
+            position: evt.latLng
+        })
+        latLngChange(evt.latLng.lat, evt.latLng.lng)
+    })
+
+    latLngChange(center.lat, center.lng)
 }
 
 const storeArea = reactive({
-  province_id: 0,
-  city_id: 0,
-  district_id: 0,
+    province_id: 0,
+    city_id: 0,
+    district_id: 0
 })
 
 const latLngChange = (lat: number, lng: number) => {
-  latLngToAddress({ mapKey, lat, lng })
-    .then(({ message, result }) => {
-      if (message == 'query ok' || message == 'Success') {
-        formData.lat = result.location.lat
-        formData.lng = result.location.lng
-        formData.address = result.formatted_addresses.recommend
-
-        getAreaByCode(result.ad_info.adcode).then(({ data }) => {
-          storeArea.province_id = data.province ? data.province.id : 0
-          storeArea.city_id = data.city ? data.city.id : 0
-          storeArea.district_id = data.district ? data.district.id : 0
-        })
-      } else {
-        console.error(message, result)
-      }
-    })
-    .catch((err) => {
-      console.log(err)
+    latLngToAddress({ mapKey, lat, lng }).then(({ message, result }) => {
+        if (message == 'query ok' || message == 'Success') {
+            formData.lat = result.location.lat
+            formData.lng = result.location.lng
+            formData.address = result.formatted_addresses.recommend
+
+            getAreaByCode(result.ad_info.adcode).then(({ data }) => {
+                storeArea.province_id = data.province ? data.province.id : 0
+                storeArea.city_id = data.city ? data.city.id : 0
+                storeArea.district_id = data.district ? data.district.id : 0
+            })
+        } else {
+            console.error(message, result)
+        }
+    }).catch(err => {
+        console.log(err)
     })
 }
 
 /**
- * 表单数据
- */
+* 表单数据
+*/
 const initialFormData = {
-  id: 0,
-  contact_name: '',
-  mobile: '',
-  province_id: 0,
-  city_id: 0,
-  district_id: 0,
-  address: '',
-  full_address: '',
-  lat: 39.908626,
-  lng: 116.39719,
-  is_delivery_address: 0,
-  is_refund_address: 0,
-  is_default_delivery: 0,
-  is_default_refund: 0,
+    id: 0,
+    contact_name: '',
+    mobile: '',
+    province_id: 0,
+    city_id: 0,
+    district_id: 0,
+    address: '',
+    full_address: '',
+    lat: 39.908626,
+    lng: 116.397190,
+    is_delivery_address: 0,
+    is_refund_address: 0,
+    is_default_delivery: 0,
+    is_default_refund: 0
 }
 
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
 const setFormData = async (id: number = 0) => {
-  loading.value = true
-  Object.assign(formData, initialFormData)
-  const data = await (await getShopAddressInfo(id)).data
-  Object.keys(formData).forEach((key: string) => {
-    if (data[key] != undefined) formData[key] = data[key]
-  })
-  loading.value = false
+    loading.value = true
+    Object.assign(formData, initialFormData)
+    const data = await (await getShopAddressInfo(id)).data
+    Object.keys(formData).forEach((key: string) => {
+        if (data[key] != undefined) formData[key] = data[key]
+    })
+    loading.value = false
 }
 if (id) setFormData(id)
 
@@ -300,233 +207,208 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    address_type: [
-      {
-        validator: (rule: any, value: any, callback: any) => {
-          if (!formData.is_delivery_address && !formData.is_refund_address) {
-            callback(new Error(t('addressTypeRequire')))
-          }
-          callback()
-        },
-      },
-    ],
-    contact_name: [
-      { required: true, message: t('contactNamePlaceholder'), trigger: 'blur' },
-    ],
-    mobile: [
-      { required: true, message: t('mobilePlaceholder'), trigger: 'blur' },
-      {
-        trigger: 'blur',
-        validator: (rule: any, value: any, callback: any) => {
-          if (value && !/^1[3-9]\d{9}$/.test(value)) {
-            callback(new Error(t('mobileTips')))
-          }
-          callback()
-        },
-      },
-    ],
-    address_area: [
-      {
-        validator: (rule: any, value: any, callback: any) => {
-          if (!formData.province_id) {
-            callback(new Error(t('provincePlaceholder')))
-          }
-          if (!formData.city_id) {
-            callback(new Error(t('cityPlaceholder')))
-          }
-          if (areaList.district.length && !formData.district_id) {
-            callback(new Error(t('districtPlaceholder')))
-          }
-          callback()
-        },
-      },
-    ],
-    address: [
-      { required: true, message: t('addressPlaceholder'), trigger: 'blur' },
-    ],
-  }
+    return {
+        address_type: [
+            {
+                validator: (rule: any, value: any, callback: any) => {
+                    if (!formData.is_delivery_address && !formData.is_refund_address) {
+                        callback(new Error(t('addressTypeRequire')))
+                    }
+                    callback()
+                }
+            }
+        ],
+        contact_name: [
+            { required: true, message: t('contactNamePlaceholder'), trigger: 'blur' }
+        ],
+        mobile: [
+            { required: true, message: t('mobilePlaceholder'), trigger: 'blur' },
+            {
+                trigger: 'blur',
+                validator: (rule: any, value: any, callback: any) => {
+                    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+                        callback(new Error(t('mobileTips')))
+                    }
+                    callback()
+                }
+            }
+        ],
+        address_area: [
+            {
+                validator: (rule: any, value: any, callback: any) => {
+                    if (!formData.province_id) {
+                        callback(new Error(t('provincePlaceholder')))
+                    }
+                    if (!formData.city_id) {
+                        callback(new Error(t('cityPlaceholder')))
+                    }
+                    if (areaList.district.length && !formData.district_id) {
+                        callback(new Error(t('districtPlaceholder')))
+                    }
+                    callback()
+                }
+            }
+        ],
+        address: [
+            { required: true, message: t('addressPlaceholder'), trigger: 'blur' }
+        ]
+    }
 })
 
 /**
  * 获取市
  */
-watch(
-  () => formData.province_id,
-  (nval) => {
+watch(() => formData.province_id, (nval) => {
     if (nval) {
-      getAreaListByPid(formData.province_id).then((res) => {
-        areaList.city = res.data
-
-        const cityId = formData.city_id
-        if (cityId) {
-          let isExist = false
-          for (let i = 0; i < res.data.length; i++) {
-            if (cityId == res.data[i].id) {
-              isExist = true
-              break
+        getAreaListByPid(formData.province_id).then(res => {
+            areaList.city = res.data
+
+            const cityId = formData.city_id
+            if (cityId) {
+                let isExist = false
+                for (let i = 0; i < res.data.length; i++) {
+                    if (cityId == res.data[i].id) {
+                        isExist = true
+                        break
+                    }
+                }
+                if (isExist) {
+                    formData.city_id = cityId
+                    return
+                }
             }
-          }
-          if (isExist) {
-            formData.city_id = cityId
-            return
-          }
-        }
-        formData.city_id = 0
-        areaChange()
-      })
+            formData.city_id = 0
+            areaChange()
+        })
     } else {
-      formData.city_id = 0
+        formData.city_id = 0
     }
-  }
-)
+})
 
 /**
- * 获取区
+* 获取区
  */
-watch(
-  () => formData.city_id,
-  (nval) => {
+watch(() => formData.city_id, (nval) => {
     if (nval) {
-      getAreaListByPid(formData.city_id).then((res) => {
-        areaList.district = res.data
-
-        const districtId = formData.district_id
-        if (districtId) {
-          let isExist = false
-          for (let i = 0; i < res.data.length; i++) {
-            if (districtId == res.data[i].id) {
-              isExist = true
-              break
+        getAreaListByPid(formData.city_id).then(res => {
+            areaList.district = res.data
+
+            const districtId = formData.district_id
+            if (districtId) {
+                let isExist = false
+                for (let i = 0; i < res.data.length; i++) {
+                    if (districtId == res.data[i].id) {
+                        isExist = true
+                        break
+                    }
+                }
+                if (isExist) {
+                    formData.district_id = districtId
+                    return
+                }
             }
-          }
-          if (isExist) {
-            formData.district_id = districtId
-            return
-          }
-        }
-        areaChange()
-        formData.district_id = 0
-      })
+            areaChange()
+            formData.district_id = 0
+        })
     } else {
-      formData.district_id = 0
+        formData.district_id = 0
     }
-  }
-)
+})
 
-watch(
-  () => formData.district_id,
-  (nval) => {
+watch(() => formData.district_id, (nval) => {
     if (nval) {
-      areaChange()
+        areaChange()
     }
-  }
-)
+})
 
 const areaChange = debounce(() => {
-  setTimeout(() => {
-    const address = [
-      formData.province_id ? provinceRef.value.selectedLabel : '',
-      formData.city_id ? cityRef.value.selectedLabel : '',
-      formData.district_id ? districtRef.value.selectedLabel : '',
-    ]
-
-    addressToLatLng({ mapKey, address: address.join('') }).then(
-      ({ message, result }) => {
-        if (message == 'Success' || message == 'query ok') {
-          const latLng = new (window as any).TMap.LatLng(
-            result.location.lat,
-            result.location.lng
-          )
-          map.setCenter(latLng)
-          marker.updateGeometries({
-            id: 'center',
-            position: latLng,
-          })
-          formData.lat = result.location.lat
-          formData.lng = result.location.lng
-        } else {
-          console.error(message, result)
-        }
-      }
-    )
-  }, 500)
+    setTimeout(() => {
+        const address = [
+            formData.province_id ? provinceRef.value.selectedLabel : '',
+            formData.city_id ? cityRef.value.selectedLabel : '',
+            formData.district_id ? districtRef.value.selectedLabel : ''
+        ]
+
+        addressToLatLng({ mapKey, address: address.join('') }).then(({ message, result }) => {
+            if (message == 'Success' || message == 'query ok') {
+                const latLng = new (window as any).TMap.LatLng(result.location.lat, result.location.lng)
+                map.setCenter(latLng)
+                marker.updateGeometries({
+                    id: 'center',
+                    position: latLng
+                })
+                formData.lat = result.location.lat
+                formData.lng = result.location.lng
+            } else {
+                console.error(message, result)
+            }
+        })
+    }, 500)
 }, 500)
 
 /**
  * 地图点选获取市
  */
-watch(
-  () => storeArea.province_id,
-  (nval) => {
+watch(() => storeArea.province_id, (nval) => {
     if (nval) {
-      getAreaListByPid(storeArea.province_id).then((res) => {
-        areaList.city = res.data
-        formData.province_id = storeArea.province_id
-        formData.city_id = storeArea.city_id
-      })
+        getAreaListByPid(storeArea.province_id).then(res => {
+            areaList.city = res.data
+            formData.province_id = storeArea.province_id
+            formData.city_id = storeArea.city_id
+        })
     }
-  }
-)
+})
 
 /**
- * 地图点选获取区
+* 地图点选获取区
  */
-watch(
-  () => storeArea.city_id,
-  (nval) => {
+watch(() => storeArea.city_id, (nval) => {
     if (nval) {
-      getAreaListByPid(storeArea.city_id).then((res) => {
-        areaList.district = res.data
-        formData.city_id = storeArea.city_id
-        formData.district_id = storeArea.district_id
-      })
+        getAreaListByPid(storeArea.city_id).then(res => {
+            areaList.district = res.data
+            formData.city_id = storeArea.city_id
+            formData.district_id = storeArea.district_id
+        })
     }
-  }
-)
+})
 
 /**
  * 地图点选获取区
  */
-watch(
-  () => storeArea.district_id,
-  (nval) => {
+watch(() => storeArea.district_id, (nval) => {
     if (nval) {
-      formData.district_id = storeArea.district_id
+        formData.district_id = storeArea.district_id
     }
-  }
-)
+})
 
 const onSave = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-
-      const data = formData
-      const address = [
-        data.province_id ? provinceRef.value.selectedLabel : '',
-        data.city_id ? cityRef.value.selectedLabel : '',
-        data.district_id ? districtRef.value.selectedLabel : '',
-        data.address,
-      ]
-      data.full_address = address.join('')
-
-      const save = id ? editShopAddress : addShopAddress
-      save(data)
-        .then((res) => {
-          loading.value = false
-          history.back()
-        })
-        .catch(() => {
-          loading.value = false
-        })
-    }
-  })
+    if (loading.value || !formEl) return
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            const data = formData
+            const address = [
+                data.province_id ? provinceRef.value.selectedLabel : '',
+                data.city_id ? cityRef.value.selectedLabel : '',
+                data.district_id ? districtRef.value.selectedLabel : '',
+                data.address
+            ]
+            data.full_address = address.join('')
+
+            const save = id ? editShopAddress : addShopAddress
+            save(data).then(res => {
+                loading.value = false
+                history.back()
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
 }
 
 const back = () => {
-  history.back()
+    history.back()
 }
 </script>
 
diff --git a/admin/src/addon/shop/views/address/list.vue b/admin/src/addon/shop/views/address/list.vue
index d9fa670d..7d8b73d3 100644
--- a/admin/src/addon/shop/views/address/list.vue
+++ b/admin/src/addon/shop/views/address/list.vue
@@ -1,144 +1,89 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-        <el-button type="primary" @click="addEvent">
-          {{ t('addShopAddress') }}
-        </el-button>
-      </div>
-
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="shopAddressTable.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('mobile')" prop="mobile">
-            <el-input
-              v-model.trim="shopAddressTable.searchParam.mobile"
-              :placeholder="t('mobilePlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('fullAddress')" prop="full_address">
-            <el-input
-              v-model.trim="shopAddressTable.searchParam.full_address"
-              :placeholder="t('fullAddressPlaceholder')"
-            />
-          </el-form-item>
-
-          <el-form-item>
-            <el-button type="primary" @click="loadShopAddressList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
-
-      <div class="mt-[10px]">
-        <el-table
-          :data="shopAddressTable.data"
-          size="large"
-          v-loading="shopAddressTable.loading"
-        >
-          <template #empty>
-            <span>{{ !shopAddressTable.loading ? t('emptyData') : '' }}</span>
-          </template>
-          <el-table-column
-            prop="contact_name"
-            :label="t('contactName')"
-            min-width="120"
-          />
-          <el-table-column prop="mobile" :label="t('mobile')" min-width="120" />
-          <el-table-column
-            prop="full_address"
-            :label="t('fullAddress')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            prop="is_delivery_address"
-            :label="t('addressType')"
-            min-width="120"
-            align="left"
-          >
-            <template #default="{ row }">
-              <div v-if="row.is_delivery_address">
-                {{ t('deliveryAddress') }}
-                <el-tag size="small" v-if="row.is_default_delivery">{{
-                  t('default')
-                }}</el-tag>
-              </div>
-              <div v-if="row.is_refund_address">
-                {{ t('refundAddress') }}
-                <el-tag size="small" v-if="row.is_default_refund">{{
-                  t('default')
-                }}</el-tag>
-              </div>
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            :label="t('operation')"
-            fixed="right"
-            min-width="120"
-            align="right"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="editEvent(row)">{{
-                t('edit')
-              }}</el-button>
-              <el-button type="primary" link @click="deleteEvent(row.id)">{{
-                t('delete')
-              }}</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="shopAddressTable.page"
-            v-model:page-size="shopAddressTable.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="shopAddressTable.total"
-            @size-change="loadShopAddressList()"
-            @current-change="loadShopAddressList"
-          />
-        </div>
-      </div>
-    </el-card>
-  </div>
+	<div class="main-container">
+		<el-card class="box-card !border-none" shadow="never">
+
+			<div class="flex justify-between items-center">
+				<span class="text-page-title">{{ pageName }}</span>
+				<el-button type="primary" @click="addEvent">
+					{{ t('addShopAddress') }}
+				</el-button>
+			</div>
+
+			<el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+				<el-form :inline="true" :model="shopAddressTable.searchParam" ref="searchFormRef">
+					<el-form-item :label="t('mobile')" prop="mobile">
+						<el-input v-model.trim="shopAddressTable.searchParam.mobile" :placeholder="t('mobilePlaceholder')"/>
+					</el-form-item>
+					<el-form-item :label="t('fullAddress')" prop="full_address">
+						<el-input v-model.trim="shopAddressTable.searchParam.full_address"  :placeholder="t('fullAddressPlaceholder')"/>
+					</el-form-item>
+
+					<el-form-item>
+						<el-button type="primary" @click="loadShopAddressList()">{{ t('search') }}</el-button>
+						<el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+					</el-form-item>
+				</el-form>
+			</el-card>
+
+			<div class="mt-[10px]">
+				<el-table :data="shopAddressTable.data" size="large" v-loading="shopAddressTable.loading">
+					<template #empty>
+						<span>{{ !shopAddressTable.loading ? t('emptyData') : '' }}</span>
+					</template>
+					<el-table-column prop="contact_name" :label="t('contactName')" min-width="120"/>
+					<el-table-column prop="mobile" :label="t('mobile')" min-width="120"/>
+					<el-table-column prop="full_address" :label="t('fullAddress')" min-width="120" :show-overflow-tooltip="true"/>
+					<el-table-column prop="is_delivery_address" :label="t('addressType')" min-width="120" align="left">
+						<template #default="{ row }">
+							<div v-if="row.is_delivery_address">
+								{{ t('deliveryAddress') }}
+								<el-tag size="small" v-if="row.is_default_delivery">{{ t('default') }}</el-tag>
+							</div>
+							<div v-if="row.is_refund_address">
+								{{ t('refundAddress') }}
+								<el-tag size="small" v-if="row.is_default_refund">{{ t('default') }}</el-tag>
+							</div>
+						</template>
+					</el-table-column>
+
+					<el-table-column :label="t('operation')" fixed="right" min-width="120" align="right">
+						<template #default="{ row }">
+							<el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+							<el-button type="primary" link @click="deleteEvent(row.id)">{{ t('delete') }}</el-button>
+						</template>
+					</el-table-column>
+
+				</el-table>
+				<div class="mt-[16px] flex justify-end">
+					<el-pagination v-model:current-page="shopAddressTable.page" v-model:page-size="shopAddressTable.limit" layout="total, sizes, prev, pager, next, jumper" :total="shopAddressTable.total"  @size-change="loadShopAddressList()" @current-change="loadShopAddressList"/>
+				</div>
+			</div>
+
+		</el-card>
+	</div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
 import { t } from '@/lang'
-import {
-  getShopAddressList,
-  deleteShopAddress,
-} from '@/addon/shop/api/shop_address'
+import { getShopAddressList, deleteShopAddress } from '@/addon/shop/api/shop_address'
 import { ElMessageBox, FormInstance } from 'element-plus'
 import { useRouter, useRoute } from 'vue-router'
-import { setTablePageStorage, getTablePageStorage } from '@/utils/common'
+import { setTablePageStorage,getTablePageStorage } from "@/utils/common";
 
 const route = useRoute()
 const pageName = route.meta.title
 
 const shopAddressTable = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    mobile: '',
-    full_address: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        mobile: '',
+        full_address: ''
+    }
 })
 
 const searchFormRef = ref<FormInstance>()
@@ -147,29 +92,23 @@ const searchFormRef = ref<FormInstance>()
  * 获取商家地址库列表
  */
 const loadShopAddressList = (page: number = 1) => {
-  shopAddressTable.loading = true
-  shopAddressTable.page = page
-
-  getShopAddressList({
-    page: shopAddressTable.page,
-    limit: shopAddressTable.limit,
-    ...shopAddressTable.searchParam,
-  })
-    .then((res) => {
-      shopAddressTable.loading = false
-      shopAddressTable.data = res.data.data
-      shopAddressTable.total = res.data.total
-      setTablePageStorage(
-        shopAddressTable.page,
-        shopAddressTable.limit,
-        shopAddressTable.searchParam
-      )
-    })
-    .catch(() => {
-      shopAddressTable.loading = false
+    shopAddressTable.loading = true
+    shopAddressTable.page = page
+
+    getShopAddressList({
+        page: shopAddressTable.page,
+        limit: shopAddressTable.limit,
+        ...shopAddressTable.searchParam
+    }).then(res => {
+        shopAddressTable.loading = false
+        shopAddressTable.data = res.data.data
+        shopAddressTable.total = res.data.total
+	    setTablePageStorage(shopAddressTable.page, shopAddressTable.limit, shopAddressTable.searchParam);
+    }).catch(() => {
+        shopAddressTable.loading = false
     })
 }
-loadShopAddressList(getTablePageStorage(shopAddressTable.searchParam).page)
+loadShopAddressList(getTablePageStorage(shopAddressTable.searchParam).page);
 
 const router = useRouter()
 
@@ -177,39 +116,41 @@ const router = useRouter()
  * 添加商家地址库
  */
 const addEvent = () => {
-  router.push('/shop/order/address/edit')
+    router.push('/shop/order/address/edit')
 }
 
 /**
- * 编辑商家地址库
+* 编辑商家地址库
  * @param data
  */
 const editEvent = (data: any) => {
-  router.push('/shop/order/address/edit?id=' + data.id)
+    router.push('/shop/order/address/edit?id=' + data.id)
 }
 
 /**
  * 删除商家地址库
  */
 const deleteEvent = (id: number) => {
-  ElMessageBox.confirm(t('shopAddressDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    deleteShopAddress(id)
-      .then(() => {
-        loadShopAddressList()
-      })
-      .catch(() => {})
-  })
+    ElMessageBox.confirm(t('shopAddressDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        deleteShopAddress(id).then(() => {
+            loadShopAddressList()
+        }).catch(() => {
+        })
+    })
 }
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadShopAddressList()
+    if (!formEl) return
+    formEl.resetFields()
+    loadShopAddressList()
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
diff --git a/admin/src/addon/shop/views/delivery/company.vue b/admin/src/addon/shop/views/delivery/company.vue
index 24b07db2..ee9a86fd 100644
--- a/admin/src/addon/shop/views/delivery/company.vue
+++ b/admin/src/addon/shop/views/delivery/company.vue
@@ -1,124 +1,67 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <div class="detail-head !m-0">
-          <div class="left" @click="router.push('/shop/order/delivery')">
-            <span class="iconfont iconxiangzuojiantou !text-xs"></span>
-            <span class="ml-[1px]">{{ t('returnToPreviousPage') }}</span>
-          </div>
-          <span class="adorn">|</span>
-          <span class="right">{{ pageName }}</span>
-        </div>
-        <el-button type="primary" @click="addEvent">{{
-          t('addCompany')
-        }}</el-button>
-      </div>
-
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="companyTable.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('companyName')" prop="company_name">
-            <el-input
-              v-model.trim="companyTable.searchParam.company_name"
-              :placeholder="t('companyNamePlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="loadCompanyList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
-
-      <div class="mt-[10px]">
-        <el-table
-          :data="companyTable.data"
-          size="large"
-          v-loading="companyTable.loading"
-        >
-          <template #empty>
-            <span>{{ !companyTable.loading ? t('emptyData') : '' }}</span>
-          </template>
-          <el-table-column
-            prop="company_name"
-            :label="t('companyName')"
-            min-width="120"
-          />
-          <el-table-column prop="logo" :label="t('logo')" min-width="120">
-            <template #default="{ row }">
-              <div class="w-[50px] h-[50px] flex items-center justify-center">
-                <img
-                  v-if="row.logo"
-                  class="max-w-[100%] max-h-[100%]"
-                  :src="img(row.logo)"
-                />
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="url" :label="t('url')" min-width="120" />
-          <el-table-column
-            prop="express_no"
-            :label="t('expressNo')"
-            min-width="120"
-          />
-          <el-table-column
-            prop="express_no_electronic_sheet"
-            :label="t('expressNoElectronicSheet')"
-            min-width="120"
-          />
-          <el-table-column
-            :label="t('electronicSheetSwitchName')"
-            min-width="120"
-          >
-            <template #default="{ row }">
-              <span>{{
-                row.electronic_sheet_switch == 1 ? '支持' : '不支持'
-              }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            :label="t('operation')"
-            fixed="right"
-            align="right"
-            min-width="120"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="editEvent(row)">{{
-                t('edit')
-              }}</el-button>
-              <el-button
-                type="primary"
-                link
-                @click="deleteEvent(row.company_id)"
-                >{{ t('delete') }}
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="companyTable.page"
-            v-model:page-size="companyTable.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="companyTable.total"
-            @size-change="loadCompanyList()"
-            @current-change="loadCompanyList"
-          />
-        </div>
-      </div>
-    </el-card>
-  </div>
+	<div class="main-container">
+		<el-card class="box-card !border-none" shadow="never">
+
+			<div class="flex justify-between items-center">
+				<div class="detail-head !m-0">
+					<div class="left" @click="router.push('/shop/order/delivery')">
+						<span class="iconfont iconxiangzuojiantou !text-xs"></span>
+						<span class="ml-[1px]">{{ t('returnToPreviousPage') }}</span>
+					</div>
+					<span class="adorn">|</span>
+					<span class="right">{{ pageName }}</span>
+				</div>
+				<el-button type="primary" @click="addEvent">{{ t('addCompany') }}</el-button>
+			</div>
+
+			<el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+				<el-form :inline="true" :model="companyTable.searchParam" ref="searchFormRef">
+					<el-form-item :label="t('companyName')" prop="company_name">
+						<el-input v-model.trim="companyTable.searchParam.company_name"  :placeholder="t('companyNamePlaceholder')"/>
+					</el-form-item>
+					<el-form-item>
+						<el-button type="primary" @click="loadCompanyList()">{{ t('search') }}</el-button>
+						<el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+					</el-form-item>
+				</el-form>
+			</el-card>
+
+			<div class="mt-[10px]">
+				<el-table :data="companyTable.data" size="large" v-loading="companyTable.loading">
+					<template #empty>
+						<span>{{ !companyTable.loading ? t('emptyData') : '' }}</span>
+					</template>
+					<el-table-column prop="company_name" :label="t('companyName')" min-width="120"/>
+					<el-table-column prop="logo" :label="t('logo')" min-width="120">
+						<template #default="{ row }">
+							<div class="w-[50px] h-[50px] flex items-center justify-center">
+                                <img v-if="row.logo" class="max-w-[100%] max-h-[100%]" :src="img(row.logo)"/>
+                            </div>
+						</template>
+					</el-table-column>
+					<el-table-column prop="url" :label="t('url')" min-width="120"/>
+					<el-table-column prop="express_no" :label="t('expressNo')" min-width="120"/>
+					<el-table-column prop="express_no_electronic_sheet" :label="t('expressNoElectronicSheet')" min-width="120"/>
+					<el-table-column :label="t('electronicSheetSwitchName')" min-width="120">
+                        <template #default="{ row }">
+                            <span>{{row.electronic_sheet_switch == 1 ? '支持' : '不支持'}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column :label="t('operation')" fixed="right" align="right" min-width="120">
+						<template #default="{ row }">
+							<el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+							<el-button type="primary" link @click="deleteEvent(row.company_id)">{{ t('delete') }}
+							</el-button>
+						</template>
+					</el-table-column>
+
+				</el-table>
+				<div class="mt-[16px] flex justify-end">
+					<el-pagination v-model:current-page="companyTable.page" v-model:page-size="companyTable.limit"   layout="total, sizes, prev, pager, next, jumper" :total="companyTable.total"   @size-change="loadCompanyList()" @current-change="loadCompanyList"/>
+				</div>
+			</div>
+		</el-card>
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -128,25 +71,25 @@ import { getCompanyPageList, deleteCompany } from '@/addon/shop/api/delivery'
 import { img } from '@/utils/common'
 import { ElMessageBox, FormInstance } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
-import { setTablePageStorage, getTablePageStorage } from '@/utils/common'
+import { setTablePageStorage,getTablePageStorage } from "@/utils/common";
 
 const route = useRoute()
 const router = useRouter()
 const pageName = route.meta.title
 
 const companyTable = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    company_name: '',
-    logo: '',
-    url: '',
-    create_time: '',
-    modify_time: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        company_name: '',
+        logo: '',
+        url: '',
+        create_time: '',
+        modify_time: ''
+    }
 })
 
 const searchFormRef = ref<FormInstance>()
@@ -155,36 +98,30 @@ const searchFormRef = ref<FormInstance>()
  * 获取物流公司列表
  */
 const loadCompanyList = (page: number = 1) => {
-  companyTable.loading = true
-  companyTable.page = page
-
-  getCompanyPageList({
-    page: companyTable.page,
-    limit: companyTable.limit,
-    ...companyTable.searchParam,
-  })
-    .then((res) => {
-      companyTable.loading = false
-      companyTable.data = res.data.data
-      companyTable.total = res.data.total
-      setTablePageStorage(
-        companyTable.page,
-        companyTable.limit,
-        companyTable.searchParam
-      )
-    })
-    .catch(() => {
-      companyTable.loading = false
+    companyTable.loading = true
+    companyTable.page = page
+
+    getCompanyPageList({
+        page: companyTable.page,
+        limit: companyTable.limit,
+        ...companyTable.searchParam
+    }).then(res => {
+        companyTable.loading = false
+        companyTable.data = res.data.data
+        companyTable.total = res.data.total
+	    setTablePageStorage(companyTable.page, companyTable.limit, companyTable.searchParam);
+    }).catch(() => {
+        companyTable.loading = false
     })
 }
 
-loadCompanyList(getTablePageStorage(companyTable.searchParam).page)
+loadCompanyList(getTablePageStorage(companyTable.searchParam).page);
 
 /**
  * 添加物流公司
  */
 const addEvent = () => {
-  router.push('/shop/order/delivery/company_add')
+    router.push('/shop/order/delivery/company_add')
 }
 
 /**
@@ -192,31 +129,33 @@ const addEvent = () => {
  * @param data
  */
 const editEvent = (data: any) => {
-  router.push('/shop/order/delivery/company_edit?company_id=' + data.company_id)
+    router.push('/shop/order/delivery/company_edit?company_id=' + data.company_id)
 }
 
 /**
  * 删除物流公司
  */
 const deleteEvent = (id: number) => {
-  ElMessageBox.confirm(t('companyDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    deleteCompany(id)
-      .then(() => {
-        loadCompanyList()
-      })
-      .catch(() => {})
-  })
+    ElMessageBox.confirm(t('companyDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        deleteCompany(id).then(() => {
+            loadCompanyList()
+        }).catch(() => {
+        })
+    })
 }
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadCompanyList()
+    if (!formEl) return
+    formEl.resetFields()
+    loadCompanyList()
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
diff --git a/admin/src/addon/shop/views/delivery/company_edit.vue b/admin/src/addon/shop/views/delivery/company_edit.vue
index 7ffced3e..c3298eb5 100644
--- a/admin/src/addon/shop/views/delivery/company_edit.vue
+++ b/admin/src/addon/shop/views/delivery/company_edit.vue
@@ -1,281 +1,122 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <el-page-header
-        :content="formData.company_id ? t('updateCompany') : t('addCompany')"
-        :icon="ArrowLeft"
-        @back="back()"
-      />
-    </el-card>
-    <el-card class="box-card mt-[15px] !border-none" shadow="never">
-      <el-form
-        :model="formData"
-        label-width="130px"
-        ref="formRef"
-        :rules="formRules"
-        class="page-form"
-        v-loading="loading"
-      >
-        <el-form-item :label="t('companyName')" prop="company_name">
-          <el-input
-            v-model.trim="formData.company_name"
-            maxlength="20"
-            clearable
-            :placeholder="t('companyNamePlaceholder')"
-            class="input-width"
-          />
-        </el-form-item>
-        <el-form-item :label="t('logo')">
-          <upload-image v-model="formData.logo" />
-        </el-form-item>
-        <el-form-item :label="t('url')">
-          <el-input
-            v-model.trim="formData.url"
-            clearable
-            :placeholder="t('urlPlaceholder')"
-            class="input-width"
-          />
-        </el-form-item>
-        <el-form-item :label="t('expressNo')">
-          <div>
-            <el-input
-              v-model.trim="formData.express_no"
-              clearable
-              :placeholder="t('expressNoPlaceholder')"
-              class="input-width"
-            />
-            <p
-              class="w-[380px] text-[12px] text-[#999] mt-[5px] leading-[20px]"
-            >
-              {{ t('expressNoTips') }}
-            </p>
-          </div>
-        </el-form-item>
-        <el-form-item :label="t('expressNoElectronicSheet')">
-          <div>
-            <el-input
-              v-model.trim="formData.express_no_electronic_sheet"
-              clearable
-              :placeholder="t('expressNoPlaceholder')"
-              class="input-width"
-            />
-            <p
-              class="w-[380px] text-[12px] text-[#999] mt-[5px] leading-[20px]"
-            >
-              {{ t('expressNoElectronicSheetTips') }}
-            </p>
-          </div>
-        </el-form-item>
-        <el-form-item :label="t('electronicSheetSwitch')">
-          <el-switch
-            v-model="formData.electronic_sheet_switch"
-            :active-value="1"
-            :inactive-value="0"
-          />
-        </el-form-item>
+	<div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+            <el-page-header :content="formData.company_id ? t('updateCompany') : t('addCompany')" :icon="ArrowLeft" @back="back()" />
+        </el-card>
+		<el-card class="box-card mt-[15px] !border-none" shadow="never">
+            <el-form :model="formData" label-width="130px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('companyName')" prop="company_name">
+                    <el-input v-model.trim="formData.company_name" maxlength="20" clearable :placeholder="t('companyNamePlaceholder')"  class="input-width"/>
+                </el-form-item>
+                <el-form-item :label="t('logo')">
+                    <upload-image v-model="formData.logo"/>
+                </el-form-item>
+                <el-form-item :label="t('url')">
+                    <el-input v-model.trim="formData.url" clearable :placeholder="t('urlPlaceholder')" class="input-width"/>
+                </el-form-item>
+                <el-form-item :label="t('expressNo')">
+                    <div>
+                        <el-input v-model.trim="formData.express_no" clearable :placeholder="t('expressNoPlaceholder')"  class="input-width"/>
+                        <p class="w-[380px] text-[12px] text-[#999] mt-[5px] leading-[20px]">{{ t('expressNoTips') }}</p>
+                    </div>
+                </el-form-item>
+                <el-form-item :label="t('expressNoElectronicSheet')">
+                    <div>
+                        <el-input v-model.trim="formData.express_no_electronic_sheet" clearable :placeholder="t('expressNoPlaceholder')"  class="input-width"/>
+                        <p class="w-[380px] text-[12px] text-[#999] mt-[5px] leading-[20px]">{{ t('expressNoElectronicSheetTips') }}</p>
+                    </div>
+                </el-form-item>
+                <el-form-item :label="t('electronicSheetSwitch')">
+                    <el-switch v-model="formData.electronic_sheet_switch" :active-value="1" :inactive-value="0" />
+                </el-form-item>
 
-        <el-form-item
-          :label="t('expType')"
-          prop="exp_type"
-          v-show="formData.electronic_sheet_switch"
-        >
-          <div class="w-[600px]">
-            <el-table
-              :data="formData.exp_type"
-              size="large"
-              v-show="formData.exp_type.length"
-            >
-              <template #empty>
-                <span>{{
-                  formData.exp_type.length == 0 ? t('emptyData') : ''
-                }}</span>
-              </template>
+                 <el-form-item :label="t('expType')" prop="exp_type" v-show="formData.electronic_sheet_switch">
+                    <div class="w-[600px]">
+                        <el-table :data="formData.exp_type" size="large" v-show="formData.exp_type.length">
+                            <template #empty>
+                                <span>{{ formData.exp_type.length == 0 ? t('emptyData') : '' }}</span>
+                            </template>
 
-              <el-table-column
-                prop="name"
-                :label="t('expTypeName')"
-                min-width="200"
-              >
-                <template #default="{ row }">
-                  <el-input
-                    v-model.trim="row.text"
-                    class="input-width"
-                    maxlength="20"
-                    clearable
-                    show-word-limit
-                  />
-                </template>
-              </el-table-column>
+                            <el-table-column prop="name" :label="t('expTypeName')" min-width="200">
+                                <template #default="{ row }">
+                                    <el-input v-model.trim="row.text" class="input-width" maxlength="20" clearable show-word-limit />
+                                </template>
+                            </el-table-column>
 
-              <el-table-column
-                prop="name"
-                :label="t('expTypeValue')"
-                min-width="120"
-              >
-                <template #default="{ row }">
-                  <el-input
-                    v-model.trim="row.value"
-                    class="!w-[150px]"
-                    maxlength="6"
-                    clearable
-                    show-word-limit
-                    @keyup="filterNumber($event)"
-                  />
-                </template>
-              </el-table-column>
+                            <el-table-column prop="name" :label="t('expTypeValue')" min-width="120">
+                                <template #default="{ row }">
+                                    <el-input v-model.trim="row.value" class="!w-[150px]" maxlength="6" clearable show-word-limit @keyup="filterNumber($event)" />
+                                </template>
+                            </el-table-column>
 
-              <el-table-column
-                :label="t('operation')"
-                fixed="right"
-                align="right"
-                min-width="60"
-              >
-                <template #default="{ row, $index }">
-                  <el-button
-                    type="primary"
-                    link
-                    @click="deleteExpTypeValueEvent($index)"
-                    >{{ t('delete') }}</el-button
-                  >
-                </template>
-              </el-table-column>
-            </el-table>
+                            <el-table-column :label="t('operation')" fixed="right" align="right" min-width="60">
+                                <template #default="{ row,$index }">
+                                    <el-button type="primary" link @click="deleteExpTypeValueEvent($index)">{{ t('delete') }}</el-button>
+                                </template>
+                            </el-table-column>
+                        </el-table>
 
-            <el-button
-              type="primary"
-              plain
-              @click="addExpTypeValueEvent"
-              :class="{ 'mt-[10px]': formData.exp_type.length }"
-              v-show="formData.exp_type.length < expTypeMaxLength"
-              >{{ t('addExpType') }}</el-button
-            >
-            <div class="text-[12px] text-[#999] mt-[5px] leading-[20px]">
-              <span>{{ t('expTypeTips') }}</span>
-              <a
-                class="ml-[3px] text-[var(--el-color-primary)]"
-                target="_blank"
-                href="https://www.yuque.com/kdnjishuzhichi/dfcrg1/hgx758hom5p6wz0l"
-                >{{ t('examine') }}</a
-              >
-            </div>
-            <p class="text-[12px] text-[#999] mt-[3px] leading-[20px]">
-              {{ t('expTypeTips1') }}
-            </p>
-          </div>
-        </el-form-item>
+                        <el-button type="primary" plain @click="addExpTypeValueEvent" :class="{'mt-[10px]': formData.exp_type.length}" v-show="formData.exp_type.length < expTypeMaxLength">{{ t('addExpType') }}</el-button>
+                        <div class="text-[12px] text-[#999] mt-[5px] leading-[20px]">
+                            <span>{{ t('expTypeTips') }}</span>
+                            <a class="ml-[3px] text-[var(--el-color-primary)]" target="_blank" href="https://www.yuque.com/kdnjishuzhichi/dfcrg1/hgx758hom5p6wz0l">{{t('examine')}}</a>
+                        </div>
+                        <p class="text-[12px] text-[#999] mt-[3px] leading-[20px]">{{ t('expTypeTips1') }}</p>
+                    </div>
+                </el-form-item>
+                
+                <el-form-item :label="t('printStyle')" prop="print_style" v-show="formData.electronic_sheet_switch">
+                    <div class="w-[600px]">
+                        <el-table :data="formData.print_style" size="large" v-show="formData.print_style.length">
+                            <template #empty>
+                                <span>{{ formData.print_style.length == 0 ? t('emptyData') : '' }}</span>
+                            </template>
+
+                            <el-table-column prop="name" :label="t('printStyleName')" min-width="200">
+                                <template #default="{ row }">
+                                    <el-input v-model.trim="row.template_name" class="input-width" maxlength="20" clearable show-word-limit />
+                                </template>
+                            </el-table-column>
 
-        <el-form-item
-          :label="t('printStyle')"
-          prop="print_style"
-          v-show="formData.electronic_sheet_switch"
-        >
-          <div class="w-[600px]">
-            <el-table
-              :data="formData.print_style"
-              size="large"
-              v-show="formData.print_style.length"
-            >
-              <template #empty>
-                <span>{{
-                  formData.print_style.length == 0 ? t('emptyData') : ''
-                }}</span>
-              </template>
+                            <el-table-column prop="name" :label="t('printStyleId')" min-width="120">
+                                <template #default="{ row }">
+                                    <el-input v-model.trim="row.template_size" class="!w-[150px]" maxlength="6" clearable show-word-limit />
+                                </template>
+                            </el-table-column>
 
-              <el-table-column
-                prop="name"
-                :label="t('printStyleName')"
-                min-width="200"
-              >
-                <template #default="{ row }">
-                  <el-input
-                    v-model.trim="row.template_name"
-                    class="input-width"
-                    maxlength="20"
-                    clearable
-                    show-word-limit
-                  />
-                </template>
-              </el-table-column>
+                            <el-table-column :label="t('operation')" fixed="right" align="right" min-width="60">
+                                <template #default="{ row,$index }">
+                                    <el-button type="primary" link @click="deletePrintStyleValueEvent($index)">{{ t('delete') }}</el-button>
+                                </template>
+                            </el-table-column>
 
-              <el-table-column
-                prop="name"
-                :label="t('printStyleId')"
-                min-width="120"
-              >
-                <template #default="{ row }">
-                  <el-input
-                    v-model.trim="row.template_size"
-                    class="!w-[150px]"
-                    maxlength="6"
-                    clearable
-                    show-word-limit
-                  />
-                </template>
-              </el-table-column>
+                        </el-table>
 
-              <el-table-column
-                :label="t('operation')"
-                fixed="right"
-                align="right"
-                min-width="60"
-              >
-                <template #default="{ row, $index }">
-                  <el-button
-                    type="primary"
-                    link
-                    @click="deletePrintStyleValueEvent($index)"
-                    >{{ t('delete') }}</el-button
-                  >
-                </template>
-              </el-table-column>
-            </el-table>
+                        <el-button type="primary" plain @click="addPrintStyleValueEvent" :class="{'mt-[10px]': formData.print_style.length}" v-show="formData.print_style.length < printStyleMaxLength">{{ t('addPrintStyle') }}</el-button>
+                        <div class="text-[12px] text-[#999] mt-[5px] leading-[20px]">
+                            <span>{{ t('printStyleTips') }}</span>
+                            <a class="ml-[3px] text-[var(--el-color-primary)]" target="_blank" href="https://www.yuque.com/kdnjishuzhichi/dfcrg1/vpptucr1q5ahcxa7">{{t('examine')}}</a>
+                        </div>
+                        <p class="text-[12px] text-[#999] mt-[3px] leading-[20px]">{{ t('printStyleTips1') }}</p>
+                        <p class="text-[12px] text-[#999] mt-[3px] leading-[20px]">{{ t('printStyleTips2') }}</p>
+                    </div>
+                </el-form-item>
 
-            <el-button
-              type="primary"
-              plain
-              @click="addPrintStyleValueEvent"
-              :class="{ 'mt-[10px]': formData.print_style.length }"
-              v-show="formData.print_style.length < printStyleMaxLength"
-              >{{ t('addPrintStyle') }}</el-button
-            >
-            <div class="text-[12px] text-[#999] mt-[5px] leading-[20px]">
-              <span>{{ t('printStyleTips') }}</span>
-              <a
-                class="ml-[3px] text-[var(--el-color-primary)]"
-                target="_blank"
-                href="https://www.yuque.com/kdnjishuzhichi/dfcrg1/vpptucr1q5ahcxa7"
-                >{{ t('examine') }}</a
-              >
+            </el-form>
+        </el-card>
+        <div class="fixed-footer-wrap">
+            <div class="fixed-footer">
+                <el-button type="primary" @click="save(formRef)">{{ t('save') }}</el-button>
+                <el-button @click="back()">{{ t('back') }}</el-button>
             </div>
-            <p class="text-[12px] text-[#999] mt-[3px] leading-[20px]">
-              {{ t('printStyleTips1') }}
-            </p>
-            <p class="text-[12px] text-[#999] mt-[3px] leading-[20px]">
-              {{ t('printStyleTips2') }}
-            </p>
-          </div>
-        </el-form-item>
-      </el-form>
-    </el-card>
-    <div class="fixed-footer-wrap">
-      <div class="fixed-footer">
-        <el-button type="primary" @click="save(formRef)">{{
-          t('save')
-        }}</el-button>
-        <el-button @click="back()">{{ t('back') }}</el-button>
-      </div>
-    </div>
-  </div>
+        </div>
+	</div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref, computed } from 'vue'
 import { t } from '@/lang'
-import {
-  addCompany,
-  editCompany,
-  getCompanyInfo,
-} from '@/addon/shop/api/delivery'
+import { addCompany, editCompany, getCompanyInfo } from '@/addon/shop/api/delivery'
 import { FormInstance } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 import { filterNumber } from '@/utils/common'
@@ -286,22 +127,22 @@ const pageName = route.meta.title
 const loading = ref(true)
 
 const back = () => {
-  router.push('/shop/order/delivery/company')
+    router.push('/shop/order/delivery/company')
 }
 
 /**
  * 表单数据
  */
 const initialFormData = {
-  company_id: '',
-  company_name: '',
-  logo: '',
-  url: '',
-  express_no: '',
-  express_no_electronic_sheet: '',
-  print_style: [],
-  exp_type: [],
-  electronic_sheet_switch: 1,
+    company_id: '',
+    company_name: '',
+    logo: '',
+    url: '',
+    express_no: '',
+    express_no_electronic_sheet: "",
+    print_style: [],
+    exp_type: [],
+    electronic_sheet_switch: 1
 }
 
 const printStyleMaxLength = ref(10)
@@ -310,156 +151,157 @@ const expTypeMaxLength = ref(10)
 const formData: Record<string, any> = reactive({ ...initialFormData })
 formData.company_id = ref(route.query.company_id)
 
-const getCompanyInfoFn = () => {
-  getCompanyInfo(formData.company_id).then((res) => {
-    loading.value = false
-    let data = res.data
-    if (data) {
-      Object.keys(formData).forEach((key: string) => {
-        if (data[key] != undefined) formData[key] = data[key]
-      })
-    }
-  })
+const getCompanyInfoFn = ()=>{
+    getCompanyInfo(formData.company_id).then(res => {
+        loading.value = false;
+        let data = res.data;       
+        if (data) {
+            Object.keys(formData).forEach((key: string) => {
+                if (data[key] != undefined) formData[key] = data[key]
+            })
+        }
+    })
 }
-if (formData.company_id) {
-  getCompanyInfoFn()
-} else {
-  loading.value = false
+if(formData.company_id){
+    getCompanyInfoFn();
+}else{
+    loading.value = false;
 }
 
 const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    company_name: [
-      { required: true, message: t('companyNamePlaceholder'), trigger: 'blur' },
-    ],
-    exp_type: [
-      {
-        trigger: 'blur',
-        validator: (rule: any, value: any, callback: any) => {
-          if (!value.length) {
-            callback()
-            return false
-          }
-          let textArr = [] //业务名称集合
-          let valArr = [] //业务值集合
-          for (let i = 0; i < value.length; i++) {
-            if (!value[i].text) {
-              callback(new Error(t('expTypeTextTips')))
-              break
-            } else if (value[i].text) {
-              textArr.push(value[i].text)
-            }
-            if (!value[i].value) {
-              callback(new Error(t('expTypeValueTips')))
-              break
-            } else if (parseFloat(value[i].value) == 0) {
-              callback(new Error(t('expTypeValueNullTips')))
-              break
-            } else if (value[i].value) {
-              valArr.push(value[i].value)
-            }
-          }
-          if (new Set(textArr).size !== textArr.length) {
-            callback(new Error(t('expTypeTextRepeatTips')))
-          }
-          if (new Set(valArr).size !== valArr.length) {
-            callback(new Error(t('expTypeValueRepeatTips')))
-          }
-          callback()
-        },
-      },
-    ],
-    print_style: [
-      {
-        trigger: 'blur',
-        validator: (rule: any, value: any, callback: any) => {
-          if (!value.length) {
-            callback()
-            return false
-          }
-          let nameArr = [] //业务名称集合
-          let sizeArr = [] //业务值集合
-          for (let i = 0; i < value.length; i++) {
-            if (!value[i].template_name) {
-              callback(new Error(t('printStyleNameTips')))
-              break
-            } else if (value[i].template_name) {
-              nameArr.push(value[i].template_name)
+    return {
+        company_name: [
+            { required: true, message: t('companyNamePlaceholder'), trigger: 'blur' }
+        ],
+        exp_type: [
+            {
+                trigger: 'blur',
+                validator: (rule: any, value: any, callback: any) => {
+                    if(!value.length){
+                        callback()
+                        return false;
+                    }
+                    let textArr = []; //业务名称集合
+                    let valArr = []; //业务值集合
+                    for(let i = 0; i < value.length; i++){
+                        if(!value[i].text){
+                            callback(new Error(t('expTypeTextTips')))
+                            break;
+                        }else if(value[i].text){
+                            textArr.push(value[i].text);
+                        }
+                        if(!value[i].value){
+                            callback(new Error(t('expTypeValueTips')))
+                            break;
+                        }else if(parseFloat(value[i].value) == 0 ){
+                            callback(new Error(t('expTypeValueNullTips')))
+                            break;
+                        }else if(value[i].value){
+                            valArr.push(value[i].value);
+                        }
+                    }
+                    if(new Set(textArr).size !== textArr.length){
+                        callback(new Error(t('expTypeTextRepeatTips')))
+                    }
+                    if(new Set(valArr).size !== valArr.length){
+                        callback(new Error(t('expTypeValueRepeatTips')))
+                    }
+                    callback()
+                }
             }
-            if (!value[i].template_size) {
-              callback(new Error(t('printStyleSizeTips')))
-              break
-            } else if (value[i].template_size) {
-              sizeArr.push(value[i].template_size)
+        ],
+        print_style: [
+            {
+                trigger: 'blur',
+                validator: (rule: any, value: any, callback: any) => {
+                    if(!value.length){
+                        callback()
+                        return false;
+                    }
+                    let nameArr = []; //业务名称集合
+                    let sizeArr = []; //业务值集合
+                    for(let i = 0; i < value.length; i++){
+                        if(!value[i].template_name){
+                            callback(new Error(t('printStyleNameTips')))
+                            break;
+                        }else if(value[i].template_name){
+                            nameArr.push(value[i].template_name);
+                        }
+                        if(!value[i].template_size){
+                            callback(new Error(t('printStyleSizeTips')))
+                            break;
+                        }else if(value[i].template_size){
+                            sizeArr.push(value[i].template_size);
+                        }
+                    }
+                    if(new Set(nameArr).size !== nameArr.length){
+                        callback(new Error(t('printStyleNameRepeatTips')))
+                    }
+                    if(new Set(sizeArr).size !== sizeArr.length){
+                        callback(new Error(t('printStyleSizeRepeatTips')))
+                    }
+                    callback()
+                }
             }
-          }
-          if (new Set(nameArr).size !== nameArr.length) {
-            callback(new Error(t('printStyleNameRepeatTips')))
-          }
-          if (new Set(sizeArr).size !== sizeArr.length) {
-            callback(new Error(t('printStyleSizeRepeatTips')))
-          }
-          callback()
-        },
-      },
-    ],
-  }
+        ]
+    }
 })
 
 // 添加模版样式
-const addPrintStyleValueEvent = () => {
-  formData.print_style.push({
-    template_name: '',
-    template_size: '',
-  })
+const addPrintStyleValueEvent = ()=>{
+    formData.print_style.push({
+        template_name: '',
+        template_size: ''
+    })
 }
 
 // 添加业务类型
-const addExpTypeValueEvent = () => {
-  formData.exp_type.push({
-    text: '',
-    value: '',
-  })
+const addExpTypeValueEvent = ()=>{
+    formData.exp_type.push({
+        text: '',
+        value: ''
+    })
 }
 
 // 删除模版样式
-const deletePrintStyleValueEvent = (index: any) => {
-  formData.print_style.splice(index, 1)
+const deletePrintStyleValueEvent = (index:any)=>{
+    formData.print_style.splice(index,1)
 }
 
 // 删除业务类型
-const deleteExpTypeValueEvent = (index: any) => {
-  formData.exp_type.splice(index, 1)
+const deleteExpTypeValueEvent = (index:any)=>{
+    formData.exp_type.splice(index,1)
 }
 
 /**
  * 确认
  * @param formEl
- */
+*/
 const repeat = ref(false)
 const save = async (formEl: FormInstance | undefined) => {
-  if (repeat.value || !formEl) return
-  const api = formData.company_id ? editCompany : addCompany
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      repeat.value = true
+    if (repeat.value || !formEl) return
+    const api = formData.company_id ? editCompany : addCompany
+    
+    await formEl.validate(async (valid) => {
+        
+        if (valid) {
+            repeat.value = true
 
-      const data = formData
-      api(data)
-        .then((res) => {
-          router.push('/shop/order/delivery/company')
-          repeat.value = false
-        })
-        .catch(() => {
-          repeat.value = false
-        })
-    }
-  })
+            const data = formData
+            api(data).then(res => {
+                router.push('/shop/order/delivery/company')
+                repeat.value = false
+            }).catch(() => {
+                repeat.value = false
+            })
+        }
+    })
 }
+
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
diff --git a/admin/src/addon/shop/views/delivery/components/delivery-personnel-edit.vue b/admin/src/addon/shop/views/delivery/components/delivery-personnel-edit.vue
index 9571496a..3951874b 100644
--- a/admin/src/addon/shop/views/delivery/components/delivery-personnel-edit.vue
+++ b/admin/src/addon/shop/views/delivery/components/delivery-personnel-edit.vue
@@ -1,64 +1,27 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="
-      formData.deliver_id ? t('updateDeliver') : t('addDeliveryPersonnel')
-    "
-    width="480"
-    class="diy-dialog-wrap"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="120px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('deliverName')" prop="deliver_name">
-        <el-input
-          v-model.trim="formData.deliver_name"
-          clearable
-          :placeholder="t('deliverNamePlaceholder')"
-          class="input-width"
-          maxlength="10"
-        />
-      </el-form-item>
-      <el-form-item :label="t('deliverMobile')" prop="deliver_mobile">
-        <el-input
-          v-model.trim="formData.deliver_mobile"
-          clearable
-          :placeholder="t('deliverMobilePlaceholder')"
-          class="input-width"
-          @keyup="filterNumber($event)"
-          @blur="formData.deliver_mobile = $event.target.value"
-        />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+	<el-dialog v-model="showDialog" :title="formData.deliver_id ? t('updateDeliver') : t('addDeliveryPersonnel')"   width="480" class="diy-dialog-wrap" :destroy-on-close="true">
+		<el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+			<el-form-item :label="t('deliverName')" prop="deliver_name">
+				<el-input v-model.trim="formData.deliver_name" clearable :placeholder="t('deliverNamePlaceholder')"  class="input-width" maxlength="10"/>
+			</el-form-item>
+			<el-form-item :label="t('deliverMobile')" prop="deliver_mobile">
+				<el-input v-model.trim="formData.deliver_mobile" clearable :placeholder="t('deliverMobilePlaceholder')"  class="input-width" @keyup="filterNumber($event)" @blur="formData.deliver_mobile = $event.target.value" />
+			</el-form-item>
+		</el-form>
+		<template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+            </span>
+		</template>
+	</el-dialog>
 </template>
 
 <script lang="ts" setup>
 import { ref, reactive, computed } from 'vue'
 import { t } from '@/lang'
 import type { FormInstance } from 'element-plus'
-import {
-  addShopDeliver,
-  editShopDeliver,
-  getShopDeliverInfo,
-} from '@/addon/shop/api/delivery'
+import { addShopDeliver, editShopDeliver, getShopDeliverInfo } from '@/addon/shop/api/delivery'
 import { filterNumber } from '@/utils/common'
 
 const showDialog = ref(false)
@@ -68,9 +31,9 @@ const loading = ref(false)
  * 表单数据
  */
 const initialFormData = {
-  deliver_id: '',
-  deliver_name: '',
-  deliver_mobile: '',
+    deliver_id: '',
+    deliver_name: '',
+    deliver_mobile: ''
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -78,24 +41,20 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    deliver_name: [
-      { required: true, message: t('deliverNamePlaceholder'), trigger: 'blur' },
-    ],
-    deliver_mobile: [
-      {
-        required: true,
-        message: t('deliverMobilePlaceholder'),
-        trigger: 'blur',
-      },
-      { min: 11, max: 11, message: '请输入11位手机号码', trigger: 'blur' },
-      {
-        pattern: /^1[23456789]\d{9}$/,
-        message: '请输入正确的手机号码',
-        trigger: 'blur',
-      },
-    ],
-  }
+    return {
+        deliver_name: [
+            { required: true, message: t('deliverNamePlaceholder'), trigger: 'blur' }
+        ],
+        deliver_mobile: [
+            { required: true, message: t('deliverMobilePlaceholder'), trigger: 'blur' },
+            { min: 11, max: 11, message: '请输入11位手机号码', trigger: 'blur' },
+            {
+                pattern :/^1[23456789]\d{9}$/,
+                message: '请输入正确的手机号码',
+                trigger: 'blur'
+            }
+        ]
+    }
 })
 
 const emit = defineEmits(['complete'])
@@ -105,51 +64,49 @@ const emit = defineEmits(['complete'])
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  const save = formData.deliver_id ? editShopDeliver : addShopDeliver
+    if (loading.value || !formEl) return
+    const save = formData.deliver_id ? editShopDeliver : addShopDeliver
 
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
 
-      const data = formData
+            const data = formData
 
-      save(data)
-        .then((res) => {
-          loading.value = false
-          showDialog.value = false
-          emit('complete')
-        })
-        .catch(() => {
-          loading.value = false
-        })
-    }
-  })
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
 }
 
 const setFormData = async (row: any = null) => {
-  Object.assign(formData, initialFormData)
-  loading.value = true
-  if (row) {
-    const data = await (await getShopDeliverInfo(row.deliver_id)).data
-    if (data) {
-      Object.keys(formData).forEach((key: string) => {
-        if (data[key] != undefined) formData[key] = data[key]
-      })
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if (row) {
+        const data = await (await getShopDeliverInfo(row.deliver_id)).data
+        if (data) {
+            Object.keys(formData).forEach((key: string) => {
+                if (data[key] != undefined) formData[key] = data[key]
+            })
+        }
     }
-  }
-  loading.value = false
+    loading.value = false
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
 <style lang="scss" scoped></style>
 <style lang="scss">
-.diy-dialog-wrap .el-form-item__label {
-  height: auto !important;
-}
+	.diy-dialog-wrap .el-form-item__label {
+		height: auto !important;
+	}
 </style>
diff --git a/admin/src/addon/shop/views/delivery/config.vue b/admin/src/addon/shop/views/delivery/config.vue
index 0981e497..15041102 100644
--- a/admin/src/addon/shop/views/delivery/config.vue
+++ b/admin/src/addon/shop/views/delivery/config.vue
@@ -1,108 +1,53 @@
 <template>
-  <div class="main-container" v-loading="loading">
-    <div class="flex ml-[18px] justify-between items-center mt-[20px]">
-      <span class="text-page-title">{{ pageName }}</span>
-    </div>
-    <div
-      class="p-[18px] logistics-body"
-      ref="tableRef"
-      :key="toggleIndex"
-      v-if="!loading"
-    >
-      <template v-for="(item, index) in tableData" :key="item.key">
-        <div class="mb-[20px] bg-[#fff]">
-          <el-card shadow="never">
-            <template #header>
-              <div class="flex items-center justify-between">
-                <div class="flex items-center">
-                  <i class="iconfont icontuodong vues-rank mr-[5px]"></i>
-                  <el-input
-                    v-focus
-                    v-if="index === activeIndex"
-                    v-model.trim="inputValue"
-                    class="w-[120px]"
-                    maxlength="10"
-                    @blur="inputBlur"
-                  />
-                  <span v-else class="font-600 text-[14px]">{{
-                    item.name
-                  }}</span>
-                  <el-icon
-                    class="text-color ml-[10px] cursor-pointer"
-                    @click="edit(index)"
-                  >
-                    <EditPen />
-                  </el-icon>
-                </div>
-                <el-switch
-                  v-model="item.status"
-                  active-value="1"
-                  inactive-value="2"
-                  @change="update(item)"
-                />
-              </div>
-            </template>
-            <div class="flex items-center justify-between">
-              <span class="text-[#666666] text-[14px]">{{ t(item.key) }}</span>
-              <div>
-                <template v-if="item.key === 'local_delivery'">
-                  <el-button
-                    type="primary"
-                    link
-                    @click="goRouter('/shop/order/delivery/staff')"
-                    >{{ t('deliveryStaff') }}</el-button
-                  >
-                  <el-button
-                    type="primary"
-                    link
-                    @click="goRouter('/shop/order/delivery/local')"
-                    >{{ t('localConfig') }}</el-button
-                  >
-                </template>
-                <template v-if="item.key === 'express'">
-                  <el-button
-                    type="primary"
-                    link
-                    @click="goRouter('/shop/order/delivery/company')"
-                    >{{ t('deliveryCompany') }}</el-button
-                  >
-                  <el-button
-                    type="primary"
-                    link
-                    @click="goRouter('/shop/order/shipping/template')"
-                    >{{ t('deliveryTemplate') }}</el-button
-                  >
-                  <el-button
-                    type="primary"
-                    link
-                    @click="goRouter('/shop/order/delivery/search')"
-                    >{{ t('deliverySearch') }}</el-button
-                  >
-                </template>
-                <template v-if="item.key === 'store'">
-                  <el-button
-                    type="primary"
-                    link
-                    @click="goRouter('/shop/order/delivery/store')"
-                    >{{ t('deliveryStore') }}</el-button
-                  >
-                </template>
-              </div>
-            </div>
-          </el-card>
-        </div>
-      </template>
-    </div>
-  </div>
+	<div class="main-container" v-loading="loading">
+		<div class="flex ml-[18px] justify-between items-center mt-[20px]">
+			<span class="text-page-title">{{ pageName }}</span>
+		</div>
+		<div class="p-[18px] logistics-body" ref="tableRef" :key="toggleIndex" v-if="!loading">
+			<template v-for="(item, index) in tableData" :key="item.key">
+				<div class="mb-[20px] bg-[#fff]">
+					<el-card shadow="never">
+						<template #header>
+							<div class="flex items-center justify-between">
+								<div class="flex items-center">
+									<i class="iconfont icontuodong vues-rank mr-[5px]"></i>
+									<el-input v-focus v-if="index === activeIndex" v-model.trim="inputValue"  class="w-[120px]"  maxlength="10"  @blur="inputBlur"/>
+									<span v-else class="font-600 text-[14px]">{{ item.name }}</span>
+									<el-icon class="text-color ml-[10px] cursor-pointer" @click="edit(index)">
+										<EditPen/>
+									</el-icon>
+								</div>
+								<el-switch v-model="item.status" active-value="1" inactive-value="2" @change="update(item)"/>
+							</div>
+						</template>
+						<div class="flex items-center justify-between">
+							<span class="text-[#666666] text-[14px]">{{ t(item.key) }}</span>
+							<div>
+								<template v-if="item.key === 'local_delivery'">
+									<el-button type="primary" link @click="goRouter('/shop/order/delivery/staff')">{{ t('deliveryStaff') }}</el-button>
+									<el-button type="primary" link @click="goRouter('/shop/order/delivery/local')">{{ t('localConfig') }}</el-button>
+								</template>
+								<template v-if="item.key === 'express'">
+									<el-button type="primary" link @click="goRouter('/shop/order/delivery/company')">{{ t('deliveryCompany') }}</el-button>
+									<el-button type="primary" link @click="goRouter('/shop/order/shipping/template')">{{ t('deliveryTemplate') }}</el-button>
+									<el-button type="primary" link @click="goRouter('/shop/order/delivery/search')">{{ t('deliverySearch') }}</el-button>
+								</template>
+								<template v-if="item.key === 'store'">
+									<el-button type="primary" link @click="goRouter('/shop/order/delivery/store')">{{ t('deliveryStore') }}</el-button>
+								</template>
+							</div>
+						</div>
+					</el-card>
+				</div>
+			</template>
+		</div>
+	</div>
 </template>
 <script lang="ts" setup>
 import { onMounted, nextTick, ref, toRaw } from 'vue'
 import { t } from '@/lang'
 import Sortable from 'sortablejs'
-import {
-  getShopDeliveryList,
-  setShopDeliveryConfig,
-} from '@/addon/shop/api/delivery'
+import { getShopDeliveryList, setShopDeliveryConfig } from '@/addon/shop/api/delivery'
 import { useRoute, useRouter } from 'vue-router'
 
 const route = useRoute()
@@ -110,87 +55,82 @@ const router = useRouter()
 const pageName = route.meta.title
 const loading = ref(false)
 interface TableDataType {
-  key: string
-  name: string
-  status: number
+    key: string
+    name: string
+    status: number
 }
 const tableData = ref<TableDataType[]>([])
 const getShopDeliveryListFn = () => {
-  loading.value = true
-  getShopDeliveryList()
-    .then((res) => {
-      tableData.value = res.data
-      loading.value = false
-      nextTick(() => {
-        if (rowDrop) rowDrop()
-      })
-    })
-    .catch(() => {
-      loading.value = false
+    loading.value = true
+    getShopDeliveryList().then(res => {
+        tableData.value = res.data
+        loading.value = false
+        nextTick(() => {
+            if(rowDrop) rowDrop()
+        })
+    }).catch(() => {
+        loading.value = false
     })
 }
 onMounted(() => {
-  getShopDeliveryListFn()
+    getShopDeliveryListFn()
 })
 // 拖拽排序
 const toggleIndex = ref(0)
 const tableRef = ref()
 const rowDrop = () => {
-  Sortable.create(tableRef.value, {
-    handle: '.vues-rank',
-    animation: 300,
-    onEnd({ newIndex, oldIndex }) {
-      const currRow = tableData.value.splice(oldIndex, 1)[0]
-      tableData.value.splice(newIndex, 0, currRow)
-      toggleIndex.value += 1
-      nextTick(() => {
-        rowDrop()
-      })
-      update()
-    },
-  })
+    Sortable.create(tableRef.value, {
+        handle: '.vues-rank',
+        animation: 300,
+        onEnd ({ newIndex, oldIndex }) {
+            const currRow = tableData.value.splice(oldIndex, 1)[0]
+            tableData.value.splice(newIndex, 0, currRow)
+            toggleIndex.value += 1
+            nextTick(() => {
+                rowDrop()
+            })
+            update()
+        }
+    })
 }
 
 // 编辑名称
-const activeIndex = ref<number | null>(null)
+const activeIndex = ref<number|null>(null)
 const inputValue = ref('')
 const edit = (index: number) => {
-  activeIndex.value = index
-  inputValue.value = toRaw(tableData.value[index].name)
+    activeIndex.value = index
+    inputValue.value = toRaw(tableData.value[index].name)
 }
 const inputBlur = () => {
-  if (
-    inputValue.value == '' ||
-    tableData.value[activeIndex.value].name === inputValue.value
-  ) {
+    if (inputValue.value == '' || tableData.value[activeIndex.value].name === inputValue.value) {
+        activeIndex.value = null
+        inputValue.value = ''
+        return false
+    }
+    tableData.value[activeIndex.value].name = inputValue.value
     activeIndex.value = null
-    inputValue.value = ''
-    return false
-  }
-  tableData.value[activeIndex.value].name = inputValue.value
-  activeIndex.value = null
-  update()
+    update()
 }
 const update = () => {
-  setShopDeliveryConfig({
-    value: tableData.value,
-  })
+    setShopDeliveryConfig({
+        value: tableData.value
+    })
 }
 const goRouter = (path: string) => {
-  router.push({ path })
+    router.push({ path })
 }
 </script>
 <style lang="scss" scoped>
-.main-container {
-  min-height: calc(100vh - 64px);
-}
+	.main-container {
+		min-height: calc(100vh - 64px);
+	}
 
-.text-color {
-  color: var(--el-color-primary);
-}
+	.text-color {
+		color: var(--el-color-primary);
+	}
 
-:deep(.el-card__header) {
-  padding-top: 5px !important;
-  padding-bottom: 5px !important;
-}
+	:deep(.el-card__header) {
+		padding-top: 5px !important;
+		padding-bottom: 5px !important;
+	}
 </style>
diff --git a/admin/src/addon/shop/views/delivery/electronic_sheet.vue b/admin/src/addon/shop/views/delivery/electronic_sheet.vue
index 8977289e..15add295 100644
--- a/admin/src/addon/shop/views/delivery/electronic_sheet.vue
+++ b/admin/src/addon/shop/views/delivery/electronic_sheet.vue
@@ -1,216 +1,131 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center mb-[5px]">
-        <span class="text-lg">{{ pageName }}</span>
-        <el-button type="primary" @click="addEvent">
-          {{ t('addElectronicSheet') }}
-        </el-button>
-      </div>
-
-      <el-tabs
-        model-value="/shop/delivery/electronic_sheet"
-        @tab-change="handleClick"
-      >
-        <el-tab-pane
-          :label="t('tabESTemplate')"
-          name="/shop/delivery/electronic_sheet"
-        />
-        <el-tab-pane
-          :label="t('tabESConfig')"
-          name="/shop/delivery/electronic_sheet/config"
-        />
-      </el-tabs>
-
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="tableData.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('templateName')" prop="template_name">
-            <el-input
-              v-model.trim="tableData.searchParam.template_name"
-              :placeholder="t('templateNamePlaceholder')"
-              maxlength="30"
-            />
-          </el-form-item>
-
-          <el-form-item :label="t('expressCompany')" prop="express_company_id">
-            <el-select
-              v-model="tableData.searchParam.express_company_id"
-              :placeholder="t('expressCompanyPlaceholder')"
-              clearable
-            >
-              <el-option
-                v-for="item in companyList"
-                :key="item.company_id"
-                :label="item.company_name"
-                :value="item.company_id"
-              />
-            </el-select>
-          </el-form-item>
-
-          <el-form-item>
-            <el-button type="primary" @click="loadList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
-
-      <div class="mt-[10px]">
-        <el-table
-          :data="tableData.data"
-          size="large"
-          v-loading="tableData.loading"
-        >
-          <template #empty>
-            <span>{{ !tableData.loading ? t('emptyData') : '' }}</span>
-          </template>
-          <el-table-column
-            :label="t('templateName')"
-            min-width="200"
-            :show-overflow-tooltip="true"
-          >
-            <template #default="{ row }">
-              <el-tag size="small" v-if="row.is_default">{{
-                t('isDefault')
-              }}</el-tag>
-              <span class="ml-[8px]">{{ row.template_name }}</span>
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            prop="express_company_id"
-            :label="t('expressCompany')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          >
-            <template #default="{ row }">
-              <div>{{ row.company.company_name }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="pay_type_name"
-            :label="t('payType')"
-            min-width="80"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="status"
-            :label="t('status')"
-            min-width="80"
-            :show-overflow-tooltip="true"
-          >
-            <template #default="{ row }">
-              <div v-if="row.status == 1">{{ t('statusOn') }}</div>
-              <div v-if="row.status == 0">{{ t('statusOff') }}</div>
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            :label="t('operation')"
-            fixed="right"
-            min-width="80"
-            align="right"
-          >
-            <template #default="{ row }">
-              <el-button
-                type="primary"
-                link
-                v-if="!row.is_default"
-                @click="setDefaultEvent(row.id)"
-                >{{ t('setDefault') }}</el-button
-              >
-              <el-button type="primary" link @click="editEvent(row)">{{
-                t('edit')
-              }}</el-button>
-              <el-button
-                type="primary"
-                link
-                v-if="!row.is_default"
-                @click="deleteEvent(row.id)"
-                >{{ t('delete') }}</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="tableData.page"
-            v-model:page-size="tableData.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="tableData.total"
-            @size-change="loadList()"
-            @current-change="loadList"
-          />
-        </div>
-      </div>
-    </el-card>
-  </div>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+
+            <div class="flex justify-between items-center mb-[5px]">
+                <span class="text-lg">{{pageName}}</span>
+                <el-button type="primary" @click="addEvent">
+                    {{ t('addElectronicSheet') }}
+                </el-button>
+            </div>
+
+            <el-tabs model-value="/shop/delivery/electronic_sheet" @tab-change="handleClick">
+                <el-tab-pane :label="t('tabESTemplate')" name="/shop/delivery/electronic_sheet" />
+                <el-tab-pane :label="t('tabESConfig')" name="/shop/delivery/electronic_sheet/config" />
+            </el-tabs>
+
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="tableData.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('templateName')" prop="template_name">
+                        <el-input v-model.trim="tableData.searchParam.template_name" :placeholder="t('templateNamePlaceholder')" maxlength="30" />
+                    </el-form-item>
+
+                    <el-form-item :label="t('expressCompany')" prop="express_company_id">
+                        <el-select v-model="tableData.searchParam.express_company_id" :placeholder="t('expressCompanyPlaceholder')" clearable>
+                            <el-option v-for="item in companyList" :key="item.company_id" :label="item.company_name" :value="item.company_id" />
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item>
+                        <el-button type="primary" @click="loadList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+
+            <div class="mt-[10px]">
+                <el-table :data="tableData.data" size="large" v-loading="tableData.loading">
+                    <template #empty>
+                        <span>{{ !tableData.loading ? t('emptyData') : '' }}</span>
+                    </template>
+                    <el-table-column :label="t('templateName')" min-width="200" :show-overflow-tooltip="true">
+                        <template #default="{ row }">
+                            <el-tag size="small" v-if="row.is_default">{{ t('isDefault') }}</el-tag>
+                            <span class="ml-[8px]">{{row.template_name}}</span>
+                       </template>
+                    </el-table-column>
+                        
+                    <el-table-column prop="express_company_id" :label="t('expressCompany')" min-width="120" :show-overflow-tooltip="true">
+                        <template #default="{ row }">
+                            <div>{{ row.company.company_name }}</div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="pay_type_name" :label="t('payType')" min-width="80" :show-overflow-tooltip="true"/>
+
+                    <el-table-column prop="status" :label="t('status')" min-width="80" :show-overflow-tooltip="true" >
+                        <template #default="{ row }">
+                            <div v-if="row.status == 1">{{ t('statusOn') }}</div>
+                            <div v-if="row.status == 0">{{ t('statusOff') }}</div>
+                        </template>
+                    </el-table-column>
+                    
+                    <el-table-column :label="t('operation')" fixed="right" min-width="80" align="right">
+                       <template #default="{ row }">
+                           <el-button type="primary" link v-if="!row.is_default" @click="setDefaultEvent(row.id)">{{ t('setDefault') }}</el-button>
+                           <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+                           <el-button type="primary" link v-if="!row.is_default" @click="deleteEvent(row.id)">{{ t('delete') }}</el-button>
+                       </template>
+                    </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="tableData.page" v-model:page-size="tableData.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="tableData.total"
+                        @size-change="loadList()" @current-change="loadList" />
+                </div>
+            </div>
+
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
 import { t } from '@/lang'
-import {
-  getElectronicSheetPageList,
-  deleteElectronicSheet,
-  setDefaultElectronicSheet,
-} from '@/addon/shop/api/electronic_sheet'
-import { ElMessageBox, FormInstance } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { getElectronicSheetPageList, deleteElectronicSheet, setDefaultElectronicSheet } from '@/addon/shop/api/electronic_sheet'
+import { ElMessageBox,FormInstance } from 'element-plus'
+import { useRoute,useRouter } from 'vue-router'
 import { getCompanyList } from '@/addon/shop/api/delivery'
 
 const route = useRoute()
 const router = useRouter()
-const pageName = route.meta.title
+const pageName = route.meta.title;
 
 const tableData = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    template_name: '',
-    express_company_id: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        template_name: "",
+        express_company_id: "",
+    }
 })
 
 const searchFormRef = ref<FormInstance>()
 
 const handleClick = (path: string) => {
-  router.push({ path })
+    router.push({ path })
 }
 
 /**
  * 获取电子面单列表
  */
 const loadList = (page: number = 1) => {
-  tableData.loading = true
-  tableData.page = page
-
-  getElectronicSheetPageList({
-    page: tableData.page,
-    limit: tableData.limit,
-    ...tableData.searchParam,
-  })
-    .then((res) => {
-      tableData.loading = false
-      tableData.data = res.data.data
-      tableData.total = res.data.total
-    })
-    .catch(() => {
-      tableData.loading = false
+    tableData.loading = true
+    tableData.page = page
+
+    getElectronicSheetPageList({
+        page: tableData.page,
+        limit: tableData.limit,
+         ...tableData.searchParam
+    }).then(res => {
+        tableData.loading = false
+        tableData.data = res.data.data
+        tableData.total = res.data.total
+    }).catch(() => {
+        tableData.loading = false
     })
 }
 
@@ -219,16 +134,16 @@ loadList()
 const companyList = ref([])
 
 getCompanyList({
-  electronic_sheet_switch: 1,
-}).then((res: any) => {
-  companyList.value = res.data
+    electronic_sheet_switch: 1
+}).then((res:any)=>{
+    companyList.value = res.data;
 })
 
 /**
  * 添加电子面单
  */
 const addEvent = () => {
-  router.push('/shop/delivery/electronic_sheet_add')
+    router.push('/shop/delivery/electronic_sheet_add')
 }
 
 /**
@@ -236,43 +151,48 @@ const addEvent = () => {
  * @param data
  */
 const editEvent = (data: any) => {
-  router.push('/shop/delivery/electronic_sheet_edit?id=' + data.id)
+    router.push('/shop/delivery/electronic_sheet_edit?id=' + data.id)
 }
 
 /**
  * 删除电子面单
  */
 const deleteEvent = (id: number) => {
-  ElMessageBox.confirm(t('electronicSheetDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    deleteElectronicSheet(id).then(() => {
-      loadList()
+    ElMessageBox.confirm(t('electronicSheetDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning',
+        }
+    ).then(() => {
+        deleteElectronicSheet(id).then(() => {
+            loadList()
+        })
     })
-  })
 }
 /**
  * 设置默认电子面单模版
  */
 const setDefaultEvent = (id: number) => {
-  ElMessageBox.confirm(t('electronicSheetSetDefaultTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    setDefaultElectronicSheet({ id }).then(() => {
-      loadList()
+    ElMessageBox.confirm(t('electronicSheetSetDefaultTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning',
+        }
+    ).then(() => {
+        setDefaultElectronicSheet({id}).then(() => {
+            loadList()
+        })
     })
-  })
 }
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadList()
+    if (!formEl) return
+    formEl.resetFields()
+    loadList()
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
diff --git a/admin/src/addon/shop/views/delivery/electronic_sheet_config.vue b/admin/src/addon/shop/views/delivery/electronic_sheet_config.vue
index bf3d5fb3..f09e4aae 100644
--- a/admin/src/addon/shop/views/delivery/electronic_sheet_config.vue
+++ b/admin/src/addon/shop/views/delivery/electronic_sheet_config.vue
@@ -1,257 +1,184 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center mb-[5px] h-[32px]">
-        <span class="text-lg">{{ pageName }}</span>
-      </div>
-
-      <el-tabs
-        model-value="/shop/delivery/electronic_sheet/config"
-        @tab-change="handleClick"
-      >
-        <el-tab-pane
-          :label="t('tabESTemplate')"
-          name="/shop/delivery/electronic_sheet"
-        />
-        <el-tab-pane
-          :label="t('tabESConfig')"
-          name="/shop/delivery/electronic_sheet/config"
-        />
-      </el-tabs>
-
-      <el-form
-        class="page-form"
-        :model="formData"
-        :rules="formRules"
-        label-width="150px"
-        ref="formRef"
-        v-loading="loading"
-      >
-        <el-card class="box-card !border-none" shadow="never">
-          <h3 class="panel-title !text-sm">{{ t('apiSet') }}</h3>
-
-          <el-form-item :label="t('interfaceType')" prop="interface_type">
-            <div>
-              <el-radio-group v-model="formData.interface_type">
-                <el-radio label="kdbird" size="large">{{ t('kdn') }}</el-radio>
-              </el-radio-group>
-              <template v-if="formData.interface_type == 'kdbird'">
-                <p class="text-[12px] text-[#b2b2b2]">
-                  {{ t('promptTips1-1')
-                  }}<el-button
-                    class="button-size"
-                    type="primary"
-                    link
-                    @click="kdnEvent('https://www.kdniao.com')"
-                    >https://www.kdniao.com</el-button
-                  >
-                </p>
-              </template>
-            </div>
-          </el-form-item>
-          <div v-if="formData.interface_type == 'kdbird'">
-            <el-form-item :label="t('kdnEBusinessIDLabel')" class="input-item">
-              <div>
-                <el-input
-                  v-model.trim="formData.kdniao_id"
-                  :placeholder="t('kdnEBusinessIDPlaceholder')"
-                  class="input-width"
-                  clearable
-                />
-                <p class="text-[12px] text-[#b2b2b2]">
-                  {{ t('kdnEBusinessIDTips') }}
-                </p>
-              </div>
-            </el-form-item>
-
-            <el-form-item label="API key" class="input-item">
-              <div>
-                <el-input
-                  v-model.trim="formData.kdniao_api_key"
-                  clearable
-                  :placeholder="t('kdnAppKeyPlaceholder')"
-                  class="input-width"
-                />
-                <p class="text-[12px] text-[#b2b2b2]">
-                  {{ t('kdnAppKeyTips') }}
-                </p>
-              </div>
-            </el-form-item>
-          </div>
-        </el-card>
-
-        <el-card class="box-card !border-none" shadow="never">
-          <h3 class="panel-title !text-sm">{{ t('printerSet') }}</h3>
-
-          <el-alert type="warning" :closable="false" class="!mb-[10px]">
-            <template #default>
-              <p>
-                用双端口加载主JS文件Lodop.js（或CLodopfuncs.js兼容老版本）以防其中某端口被占
-              </p>
-              <p>HTTP推荐端口：8000/18000，HTTPS推荐端口：8443</p>
-              <p>1. 请将打印机连接至本机。</p>
-              <p>
-                2. 在本机上安装打印控件。下载链接：<a
-                  href="http://www.lodop.net/download.html"
-                  target="_blank"
-                  class="text-primary"
-                  >http://www.lodop.net/download.html</a
-                >
-              </p>
-              <p>3. 将打印控件中的打印端口下面的打印端口设为相同。</p>
-            </template>
-          </el-alert>
-
-          <el-form-item
-            :label="t('serverPort1')"
-            class="input-item-required"
-            prop="server_port1"
-          >
-            <div>
-              <el-input
-                v-model.trim="formData.server_port1"
-                :placeholder="t('serverPort1Placeholder')"
-                class="input-width"
-                clearable
-              />
-            </div>
-          </el-form-item>
-
-          <el-form-item
-            :label="t('serverPort2')"
-            class="input-item-required"
-            prop="server_port2"
-          >
-            <div>
-              <el-input
-                v-model.trim="formData.server_port2"
-                :placeholder="t('serverPort2Placeholder')"
-                class="input-width"
-                clearable
-              />
-            </div>
-          </el-form-item>
-
-          <el-form-item
-            :label="t('httpsPort')"
-            class="input-item-required"
-            prop="https_port"
-          >
-            <div>
-              <el-input
-                v-model.trim="formData.https_port"
-                :placeholder="t('httpsPortPlaceholder')"
-                class="input-width"
-                clearable
-              />
-            </div>
-          </el-form-item>
-        </el-card>
-      </el-form>
-
-      <div class="fixed-footer-wrap">
-        <div class="fixed-footer">
-          <el-button type="primary" :loading="loading" @click="save(formRef)">{{
-            t('save')
-          }}</el-button>
-        </div>
-      </div>
-    </el-card>
-  </div>
+	<div class="main-container">
+		<el-card class="box-card !border-none" shadow="never">
+
+			<div class="flex justify-between items-center mb-[5px] h-[32px]">
+				<span class="text-lg">{{pageName}}</span>
+			</div>
+
+			<el-tabs model-value="/shop/delivery/electronic_sheet/config" @tab-change="handleClick">
+				<el-tab-pane :label="t('tabESTemplate')" name="/shop/delivery/electronic_sheet" />
+				<el-tab-pane :label="t('tabESConfig')" name="/shop/delivery/electronic_sheet/config" />
+			</el-tabs>
+
+			<el-form class="page-form" :model="formData" :rules="formRules" label-width="150px" ref="formRef" v-loading="loading">
+				<el-card class="box-card !border-none" shadow="never">
+					<h3 class="panel-title !text-sm">{{ t('apiSet') }}</h3>
+
+					<el-form-item :label="t('interfaceType')" prop="interface_type">
+						<div>
+							<el-radio-group v-model="formData.interface_type">
+								<el-radio label="kdbird" size="large">{{ t('kdn') }}</el-radio>
+							</el-radio-group>
+							<template v-if="formData.interface_type == 'kdbird'">
+								<p class="text-[12px] text-[#b2b2b2]">
+									{{ t('promptTips1-1') }}<el-button class="button-size" type="primary" link @click="kdnEvent('https://www.kdniao.com')">https://www.kdniao.com</el-button>
+								</p>
+							</template>
+						</div>
+					</el-form-item>
+					<div v-if="formData.interface_type == 'kdbird'">
+
+						<el-form-item :label="t('kdnEBusinessIDLabel')" class="input-item">
+							<div>
+								<el-input v-model.trim="formData.kdniao_id" :placeholder="t('kdnEBusinessIDPlaceholder')" class="input-width" clearable />
+								<p class="text-[12px] text-[#b2b2b2]">{{ t('kdnEBusinessIDTips') }}</p>
+							</div>
+						</el-form-item>
+
+						<el-form-item label="API key" class="input-item">
+							<div>
+								<el-input v-model.trim="formData.kdniao_api_key" clearable :placeholder="t('kdnAppKeyPlaceholder')" class="input-width" />
+								<p class="text-[12px] text-[#b2b2b2]">{{ t('kdnAppKeyTips') }}</p>
+							</div>
+						</el-form-item>
+
+					</div>
+
+				</el-card>
+
+				<el-card class="box-card !border-none" shadow="never">
+					<h3 class="panel-title !text-sm">{{ t('printerSet') }}</h3>
+
+					<el-alert type="warning" :closable="false" class="!mb-[10px]">
+						<template #default>
+							<p>用双端口加载主JS文件Lodop.js（或CLodopfuncs.js兼容老版本）以防其中某端口被占</p>
+							<p>HTTP推荐端口：8000/18000，HTTPS推荐端口：8443</p>
+							<p>1. 请将打印机连接至本机。 </p>
+							<p>2. 在本机上安装打印控件。下载链接：<a href="http://www.lodop.net/download.html" target="_blank" class="text-primary">http://www.lodop.net/download.html</a></p>
+							<p>3. 将打印控件中的打印端口下面的打印端口设为相同。</p>
+						</template>
+					</el-alert>
+
+					<el-form-item :label="t('serverPort1')" class="input-item-required" prop="server_port1">
+						<div>
+							<el-input v-model.trim="formData.server_port1" :placeholder="t('serverPort1Placeholder')" class="input-width" clearable />
+						</div>
+					</el-form-item>
+
+					<el-form-item :label="t('serverPort2')" class="input-item-required" prop="server_port2">
+						<div>
+							<el-input v-model.trim="formData.server_port2" :placeholder="t('serverPort2Placeholder')" class="input-width" clearable />
+						</div>
+					</el-form-item>
+
+					<el-form-item :label="t('httpsPort')" class="input-item-required" prop="https_port">
+						<div>
+							<el-input v-model.trim="formData.https_port" :placeholder="t('httpsPortPlaceholder')" class="input-width" clearable />
+						</div>
+					</el-form-item>
+
+				</el-card>
+			</el-form>
+
+			<div class="fixed-footer-wrap">
+				<div class="fixed-footer">
+					<el-button type="primary" :loading="loading" @click="save(formRef)">{{ t('save') }}</el-button>
+				</div>
+			</div>
+		</el-card>
+
+	</div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
 import { t } from '@/lang'
 import { FormInstance, FormRules } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
-import {
-  setElectronicSheetConfig,
-  getElectronicSheetConfig,
-} from '@/addon/shop/api/electronic_sheet'
+import { useRoute,useRouter } from 'vue-router'
+import { setElectronicSheetConfig, getElectronicSheetConfig } from '@/addon/shop/api/electronic_sheet'
 
 const route = useRoute()
 const router = useRouter()
-const pageName = route.meta.title
+const pageName = route.meta.title;
 const loading = ref(true)
 
 const handleClick = (path: string) => {
-  router.push({ path })
+    router.push({ path })
 }
 
-const formData: any = reactive({
-  interface_type: 'kdbird',
-  kdniao_id: '',
-  kdniao_api_key: '',
-  server_port1: '8000',
-  server_port2: '18000',
-  https_port: '8443',
+const formData:any = reactive({
+    interface_type: 'kdbird',
+    kdniao_id: '',
+    kdniao_api_key: '',
+    server_port1: '8000',
+    server_port2: '18000',
+    https_port: '8443'
 })
 
 const setFormData = async () => {
-  const data = await (await getElectronicSheetConfig()).data
-  Object.keys(formData).forEach((key: string) => {
-    if (data[key] != undefined) formData[key] = data[key]
-  })
+    const data = await (await getElectronicSheetConfig()).data
+    Object.keys(formData).forEach((key: string) => {
+        if (data[key] != undefined) formData[key] = data[key]
+    })
 
-  loading.value = false
+    loading.value = false
 }
 setFormData()
 
-const kdnEvent = (url: any) => {
-  window.open(url, '_blank')
+const kdnEvent = (url:any) => {
+    window.open(url, '_blank')
 }
 
 const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = reactive<FormRules>({
-  server_port1: [
-    { required: true, message: t('serverPort1Placeholder'), trigger: 'blur' },
-  ],
-  server_port2: [
-    { required: true, message: t('serverPort2Placeholder'), trigger: 'blur' },
-  ],
-  https_port: [
-    { required: true, message: t('httpsPortPlaceholder'), trigger: 'blur' },
-  ],
+    server_port1: [
+        { required: true, message: t('serverPort1Placeholder'), trigger: 'blur' },
+    ],
+    server_port2: [
+        { required: true, message: t('serverPort2Placeholder'), trigger: 'blur' },
+    ],
+    https_port: [
+        { required: true, message: t('httpsPortPlaceholder'), trigger: 'blur' },
+    ],
 })
 
 /**
  * 保存
  */
 const save = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      setElectronicSheetConfig(formData)
-        .then(() => {
-          loading.value = false
-        })
-        .catch(() => {
-          loading.value = false
-        })
-    }
-  })
+    if (loading.value || !formEl) return
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+            setElectronicSheetConfig(formData).then(() => {
+                loading.value = false
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
 }
+
 </script>
 
 <style lang="scss" scoped>
 .input-item {
-  margin-bottom: 10px !important;
+	margin-bottom: 10px !important
 }
 
 .input-item-required {
-  margin-bottom: 20px !important;
+	margin-bottom: 20px !important
 }
 
 .button-size {
-  font-size: 12px !important;
+	font-size: 12px !important;
 }
 
 .el-radio.el-radio--large {
-  height: auto !important;
+	height: auto !important
 }
 </style>
diff --git a/admin/src/addon/shop/views/delivery/electronic_sheet_edit.vue b/admin/src/addon/shop/views/delivery/electronic_sheet_edit.vue
index d0988dc9..0a37ae2b 100644
--- a/admin/src/addon/shop/views/delivery/electronic_sheet_edit.vue
+++ b/admin/src/addon/shop/views/delivery/electronic_sheet_edit.vue
@@ -1,384 +1,270 @@
 <template>
-  <div class="main-container">
-    <el-card class="card !border-none mb-[15px]" shadow="never">
-      <el-page-header :content="pageName" :icon="ArrowLeft" @back="back" />
-    </el-card>
-
-    <el-form
-      class="page-form"
-      :model="formData"
-      :rules="formRules"
-      label-width="150px"
-      ref="formRef"
-      v-loading="loading"
-    >
-      <el-card class="box-card !border-none" shadow="never">
-        <h3 class="panel-title !text-sm">{{ t('basicSettings') }}</h3>
-        <el-form-item :label="t('templateName')" prop="template_name">
-          <el-input
-            v-model.trim="formData.template_name"
-            clearable
-            :placeholder="t('templateNamePlaceholder')"
-            class="input-width"
-            maxlength="30"
-          />
-        </el-form-item>
-
-        <el-form-item :label="t('expressCompany')" prop="express_company_id">
-          <el-select
-            v-model="formData.express_company_id"
-            :placeholder="t('expressCompanyPlaceholder')"
-            clearable
-            @change="handleSelectCompanyChange"
-          >
-            <el-option
-              v-for="item in companyList"
-              :key="item.company_id"
-              :label="item.company_name"
-              :value="item.company_id"
-            />
-          </el-select>
-        </el-form-item>
-
-        <el-form-item
-          :label="t('expType')"
-          prop="exp_type"
-          v-show="expTypeList.length"
-        >
-          <el-radio-group v-model="formData.exp_type">
-            <el-radio
-              v-for="(item, index) in expTypeList"
-              :key="index"
-              :value="item.value"
-              >{{ item.text }}</el-radio
-            >
-          </el-radio-group>
-        </el-form-item>
-
-        <el-form-item :label="t('printStyle')" v-show="printStyleList.length">
-          <div>
-            <el-select
-              v-model="formData.print_style"
-              :placeholder="t('printStylePlaceholder')"
-              clearable
-            >
-              <el-option
-                v-for="(item, index) in printStyleList"
-                :key="index"
-                :label="item.template_name"
-                :value="item.template_size"
-              />
-            </el-select>
-            <div class="text-[12px] text-[#999] mt-[3px] leading-[20px]">
-              {{ t('printStyleTips1') }}
-            </div>
-            <div class="text-[12px] text-[#999] mt-[3px] leading-[20px]">
-              {{ t('printStyleTips2') }}
-            </div>
-          </div>
-        </el-form-item>
-      </el-card>
-      <el-card class="box-card !border-none" shadow="never">
-        <h3 class="panel-title !text-sm">{{ t('otherSettings') }}</h3>
-
-        <el-form-item :label="t('customerName')">
-          <div>
-            <el-input
-              v-model.trim="formData.customer_name"
-              clearable
-              class="input-width"
-              maxlength="20"
-            />
-            <div
-              class="flex items-center mt-[5px] text-[12px] text-[#999] leading-[20px]"
-            >
-              <span>{{ t('customerNameTips') }}</span>
-              <a
-                class="ml-[3px] text-[var(--el-color-primary)]"
-                target="_blank"
-                href="https://www.yuque.com/kdnjishuzhichi/rg4owd"
-                >{{ t('examine') }}</a
-              >
-            </div>
-            <div
-              class="flex items-center mt-[3px] text-[12px] text-[#999] leading-[20px]"
-            >
-              <span>{{ t('customerNameTips1') }}</span>
-              <a
-                class="ml-[3px] text-[var(--el-color-primary)]"
-                target="_blank"
-                href="https://www.yuque.com/kdnjishuzhichi/dfcrg1/hrfw43"
-                >{{ t('examine') }}</a
-              >
-            </div>
-          </div>
-        </el-form-item>
-
-        <el-form-item :label="t('customerPwd')">
-          <div>
-            <el-input
-              v-model.trim="formData.customer_pwd"
-              clearable
-              class="input-width"
-              maxlength="20"
-            />
-            <div class="mt-[5px] text-[12px] text-[#999] leading-[20px]">
-              {{ t('customerPwdTips') }}
-            </div>
-          </div>
-        </el-form-item>
-
-        <el-form-item :label="t('sendSite')">
-          <div>
-            <el-input
-              v-model.trim="formData.send_site"
-              clearable
-              class="input-width"
-              maxlength="20"
-            />
-            <div class="mt-[5px] text-[12px] text-[#999] leading-[20px]">
-              {{ t('sendSiteTips') }}
-            </div>
-          </div>
-        </el-form-item>
-
-        <el-form-item :label="t('sendStaff')">
-          <div>
-            <el-input
-              v-model.trim="formData.send_staff"
-              clearable
-              class="input-width"
-              maxlength="20"
-            />
-            <div class="mt-[5px] text-[12px] text-[#999] leading-[20px]">
-              {{ t('sendStaffTips') }}
-            </div>
-          </div>
-        </el-form-item>
-
-        <el-form-item :label="t('monthCode')">
-          <div>
-            <el-input
-              v-model.trim="formData.month_code"
-              clearable
-              class="input-width"
-              maxlength="20"
-            />
-            <div class="mt-[5px] text-[12px] text-[#999] leading-[20px]">
-              {{ t('monthCodeTips') }}
-            </div>
-          </div>
-        </el-form-item>
-
-        <el-form-item :label="t('payType')">
-          <el-radio-group v-model="formData.pay_type">
-            <el-radio
-              v-for="(item, index) in payType"
-              :value="parseInt(index)"
-              >{{ item }}</el-radio
-            >
-          </el-radio-group>
-        </el-form-item>
-
-        <el-form-item :label="t('isNotice')">
-          <div>
-            <el-radio-group v-model="formData.is_notice">
-              <el-radio :value="1">{{ t('yes') }}</el-radio>
-              <el-radio :value="0">{{ t('no') }}</el-radio>
-            </el-radio-group>
-            <div class="mt-[5px] text-[12px] text-[#999] leading-[20px]">
-              {{ t('isNoticeTips') }}
-            </div>
-          </div>
-        </el-form-item>
-
-        <el-form-item :label="t('status')">
-          <el-switch
-            v-model="formData.status"
-            :active-value="1"
-            :inactive-value="0"
-          />
-        </el-form-item>
-
-        <el-form-item :label="t('isDefault')">
-          <el-switch
-            v-model="formData.is_default"
-            :active-value="1"
-            :inactive-value="0"
-          />
-        </el-form-item>
-      </el-card>
-    </el-form>
-
-    <div class="fixed-footer-wrap">
-      <div class="fixed-footer">
-        <el-button type="primary" :loading="repeat" @click="confirm(formRef)">{{
-          t('save')
-        }}</el-button>
-        <el-button @click="back()">{{ t('cancel') }}</el-button>
-      </div>
-    </div>
-  </div>
+	<div class="main-container">
+        <el-card class="card !border-none mb-[15px]" shadow="never">
+            <el-page-header :content="pageName" :icon="ArrowLeft" @back="back" />
+        </el-card>
+
+		<el-form class="page-form" :model="formData" :rules="formRules" label-width="150px" ref="formRef" v-loading="loading">
+			<el-card class="box-card !border-none" shadow="never">
+
+				<h3 class="panel-title !text-sm">{{ t('basicSettings') }}</h3>
+				<el-form-item :label="t('templateName')" prop="template_name">
+					<el-input v-model.trim="formData.template_name" clearable :placeholder="t('templateNamePlaceholder')" class="input-width" maxlength="30" />
+				</el-form-item>
+
+				<el-form-item :label="t('expressCompany')" prop="express_company_id">
+					<el-select v-model="formData.express_company_id" :placeholder="t('expressCompanyPlaceholder')" clearable @change="handleSelectCompanyChange">
+						<el-option v-for="item in companyList" :key="item.company_id" :label="item.company_name" :value="item.company_id" />
+					</el-select>
+				</el-form-item>
+
+				<el-form-item :label="t('expType')" prop="exp_type" v-show="expTypeList.length">
+					<el-radio-group v-model="formData.exp_type">
+						<el-radio v-for="(item,index) in expTypeList" :key="index" :value="item.value">{{ item.text }}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+
+				<el-form-item :label="t('printStyle')" v-show="printStyleList.length">
+					<div>
+						<el-select v-model="formData.print_style" :placeholder="t('printStylePlaceholder')" clearable>
+							<el-option v-for="(item,index) in printStyleList" :key="index" :label="item.template_name" :value="item.template_size" />
+						</el-select>
+						<div class="text-[12px] text-[#999] mt-[3px] leading-[20px]">{{ t('printStyleTips1') }}</div>
+						<div class="text-[12px] text-[#999] mt-[3px] leading-[20px]">{{ t('printStyleTips2') }}</div>
+					</div>
+				</el-form-item>
+
+			</el-card>
+			<el-card class="box-card !border-none" shadow="never">
+				<h3 class="panel-title !text-sm">{{ t('otherSettings') }}</h3>
+
+				<el-form-item :label="t('customerName')">
+					<div>
+                        <el-input v-model.trim="formData.customer_name" clearable class="input-width" maxlength="20" />
+                        <div class="flex items-center mt-[5px] text-[12px] text-[#999] leading-[20px]">
+                            <span>{{ t('customerNameTips') }}</span>
+                            <a class="ml-[3px] text-[var(--el-color-primary)]" target="_blank" href="https://www.yuque.com/kdnjishuzhichi/rg4owd">{{t('examine')}}</a>
+                        </div>
+                        <div class="flex items-center mt-[3px] text-[12px] text-[#999] leading-[20px]">
+                            <span>{{ t('customerNameTips1') }}</span>
+                            <a class="ml-[3px] text-[var(--el-color-primary)]" target="_blank" href="https://www.yuque.com/kdnjishuzhichi/dfcrg1/hrfw43">{{t('examine')}}</a>
+                        </div>
+                    </div>
+				</el-form-item>
+
+				<el-form-item :label="t('customerPwd')">
+					<div>
+						<el-input v-model.trim="formData.customer_pwd" clearable class="input-width" maxlength="20" />
+						<div class="mt-[5px] text-[12px] text-[#999] leading-[20px]">{{ t('customerPwdTips') }}</div>
+					</div>
+				</el-form-item>
+
+				<el-form-item :label="t('sendSite')">
+					<div>
+						<el-input v-model.trim="formData.send_site" clearable class="input-width" maxlength="20" />
+						<div class="mt-[5px] text-[12px] text-[#999] leading-[20px]">{{ t('sendSiteTips') }}</div>
+					</div>
+				</el-form-item>
+
+				<el-form-item :label="t('sendStaff')">
+					<div>
+						<el-input v-model.trim="formData.send_staff" clearable class="input-width" maxlength="20" />
+						<div class="mt-[5px] text-[12px] text-[#999] leading-[20px]">{{ t('sendStaffTips') }}</div>
+					</div>
+				</el-form-item>
+
+				<el-form-item :label="t('monthCode')">
+					<div>
+						<el-input v-model.trim="formData.month_code" clearable class="input-width" maxlength="20" />
+						<div class="mt-[5px] text-[12px] text-[#999] leading-[20px]">{{ t('monthCodeTips') }}</div>
+					</div>
+				</el-form-item>
+
+				<el-form-item :label="t('payType')">
+					<el-radio-group v-model="formData.pay_type">
+						<el-radio v-for="(item,index) in payType" :value="parseInt(index)">{{ item }}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+
+				<el-form-item :label="t('isNotice')">
+					<div>
+                        <el-radio-group v-model="formData.is_notice">
+                            <el-radio :value="1">{{ t('yes') }}</el-radio>
+                            <el-radio :value="0">{{ t('no') }}</el-radio>
+                        </el-radio-group>
+                        <div class="mt-[5px] text-[12px] text-[#999] leading-[20px]">{{ t('isNoticeTips') }}</div>
+                    </div>
+				</el-form-item>
+
+				<el-form-item :label="t('status')">
+					<el-switch v-model="formData.status" :active-value="1" :inactive-value="0" />
+				</el-form-item>
+
+				<el-form-item :label="t('isDefault')">
+					<el-switch v-model="formData.is_default" :active-value="1" :inactive-value="0" />
+				</el-form-item>
+
+			</el-card>
+		</el-form>
+
+		<div class="fixed-footer-wrap">
+			<div class="fixed-footer">
+				<el-button type="primary" :loading="repeat" @click="confirm(formRef)">{{ t('save') }}</el-button>
+				<el-button @click="back()">{{ t('cancel') }}</el-button>
+			</div>
+		</div>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { ref, reactive, computed } from 'vue'
-import { t } from '@/lang'
-import type { FormInstance } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
-import {
-  addElectronicSheet,
-  editElectronicSheet,
-  getElectronicSheetInfo,
-  getElectronicSheetPayType,
-} from '@/addon/shop/api/electronic_sheet'
-import { getCompanyList } from '@/addon/shop/api/delivery'
-
-const loading = ref(false)
-const route = useRoute()
-const router = useRouter()
-const repeat = ref(false)
-
-const pageName = route.meta.title
-
-/**
- * 表单数据
- */
-const initialFormData: any = {
-  id: route.query.id || 0,
-  template_name: '',
-  express_company_id: '',
-  customer_name: '',
-  customer_pwd: '',
-  send_site: '',
-  send_staff: '',
-  month_code: '',
-  pay_type: 1,
-  is_notice: 0,
-  status: 1,
-  exp_type: 1,
-  print_style: '',
-  is_default: '',
-}
-
-const formData: Record<string, any> = reactive({ ...initialFormData })
-
-const formRef = ref<FormInstance>()
-
-// 表单验证规则
-const formRules = computed(() => {
-  return {
-    template_name: [
-      {
-        required: true,
-        message: t('templateNamePlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    express_company_id: [
-      {
-        required: true,
-        message: t('expressCompanyPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-  }
-})
-
-const companyList: any = ref([]) // 物流公司列表
-const expTypeList: any = ref([]) // 业务类型
-const printStyleList: any = ref([]) // 模版样式
-const payType = ref([])
-
-const init = async () => {
-  getElectronicSheetPayType().then((res: any) => {
-    payType.value = res.data
-  })
-
-  await getCompanyList({ electronic_sheet_switch: 1 }).then((res: any) => {
-    companyList.value = res.data
-  })
-
-  if (formData.id) {
-    loading.value = true
-    getElectronicSheetInfo(formData.id).then((res: any) => {
-      let data = res.data
-      if (data)
-        Object.keys(formData).forEach((key: string) => {
-          if (data[key] != undefined) formData[key] = data[key]
-        })
-      loading.value = false
-      handleSelectCompanyChange(formData.express_company_id, true)
+    import { ref, reactive, computed } from 'vue'
+    import { t } from '@/lang'
+    import type { FormInstance } from 'element-plus'
+    import { useRoute, useRouter } from 'vue-router'
+    import {
+        addElectronicSheet,
+        editElectronicSheet,
+        getElectronicSheetInfo,
+        getElectronicSheetPayType
+    } from '@/addon/shop/api/electronic_sheet'
+    import { getCompanyList } from '@/addon/shop/api/delivery'
+
+    const loading = ref(false)
+    const route = useRoute()
+    const router = useRouter()
+    const repeat = ref(false)
+
+    const pageName = route.meta.title
+
+    /**
+     * 表单数据
+     */
+    const initialFormData:any = {
+        id: route.query.id || 0,
+        template_name: '',
+        express_company_id: '',
+        customer_name: '',
+        customer_pwd: '',
+        send_site: '',
+        send_staff: '',
+        month_code: '',
+        pay_type: 1,
+        is_notice: 0,
+        status: 1,
+        exp_type: 1,
+        print_style: '',
+        is_default: '',
+    }
+
+    const formData: Record<string, any> = reactive({ ...initialFormData })
+
+    const formRef = ref<FormInstance>()
+
+    // 表单验证规则
+    const formRules = computed(() => {
+        return {
+            template_name: [
+                { required: true, message: t('templateNamePlaceholder'), trigger: 'blur' },
+            ],
+            express_company_id: [
+                { required: true, message: t('expressCompanyPlaceholder'), trigger: 'blur' },
+            ]
+        }
     })
-  }
-}
-
-init()
-
-const handleSelectCompanyChange = (value: any, load: any = false) => {
-  if (!value) {
-    expTypeList.value = []
-    printStyleList.value = []
-    return
-  }
-
-  for (let i = 0; i < companyList.value.length; i++) {
-    if (companyList.value[i].company_id == value) {
-      expTypeList.value = companyList.value[i].exp_type
-      expTypeList.value.forEach((item: any) => {
-        if (item.value) item.value = parseInt(item.value)
-      })
-      printStyleList.value = companyList.value[i].print_style
-
-      if (!load) {
-        if (expTypeList.value.length) {
-          formData.exp_type = expTypeList.value[0].value
-        } else {
-          formData.exp_type = 1 // 默认为1
+
+    const companyList: any = ref([]) // 物流公司列表
+    const expTypeList: any = ref([]) // 业务类型
+    const printStyleList: any = ref([]) // 模版样式
+    const payType = ref([])
+
+    const init = async ()=> {
+	    getElectronicSheetPayType().then((res: any) => {
+		    payType.value = res.data;
+	    })
+
+	    await getCompanyList({ electronic_sheet_switch: 1 }).then((res: any) => {
+		    companyList.value = res.data;
+	    })
+
+	    if (formData.id) {
+		    loading.value = true
+		    getElectronicSheetInfo(formData.id).then((res: any) => {
+			    let data = res.data;
+			    if (data) Object.keys(formData).forEach((key: string) => {
+				    if (data[key] != undefined) formData[key] = data[key]
+			    })
+			    loading.value = false
+			    handleSelectCompanyChange(formData.express_company_id, true)
+		    })
+	    }
+    }
+
+    init();
+
+    const handleSelectCompanyChange = (value: any,load: any = false) => {
+        if (!value) {
+            expTypeList.value = [];
+            printStyleList.value = [];
+            return;
         }
-        if (printStyleList.value.length) {
-          formData.print_style = printStyleList.value[0].value
-        } else {
-          formData.print_style = '' // 默认为空
+
+        for (let i = 0; i < companyList.value.length; i++) {
+            if (companyList.value[i].company_id == value) {
+                expTypeList.value = companyList.value[i].exp_type;
+                expTypeList.value.forEach((item: any) => {
+                    if (item.value) item.value = parseInt(item.value);
+                })
+                printStyleList.value = companyList.value[i].print_style;
+
+                if (!load) {
+                    if (expTypeList.value.length) {
+                        formData.exp_type = expTypeList.value[0].value
+                    } else {
+                        formData.exp_type = 1; // 默认为1
+                    }
+                    if (printStyleList.value.length) {
+                        formData.print_style = printStyleList.value[0].value
+                    } else {
+                        formData.print_style = ''; // 默认为空
+                    }
+                }
+                break;
+            }
         }
-      }
-      break
+
     }
-  }
-}
-
-/**
- * 确认
- * @param formEl
- */
-const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  let save = formData.id ? editElectronicSheet : addElectronicSheet
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      if (repeat.value) return
-      repeat.value = true
-
-      let data = formData
-
-      save(data)
-        .then((res) => {
-          repeat.value = false
-          if (!formData.id) {
-            router.push('/shop/delivery/electronic_sheet')
-          }
-        })
-        .catch((err) => {
-          repeat.value = false
+
+    /**
+     * 确认
+     * @param formEl
+     */
+    const confirm = async(formEl: FormInstance | undefined) => {
+        if (loading.value || !formEl) return
+        let save = formData.id ? editElectronicSheet : addElectronicSheet
+
+        await formEl.validate(async(valid) => {
+            if (valid) {
+
+                if (repeat.value) return
+                repeat.value = true
+
+                let data = formData
+
+                save(data).then(res => {
+                    repeat.value = false
+                    if (!formData.id) {
+                        router.push('/shop/delivery/electronic_sheet')
+                    }
+                }).catch(err => {
+                    repeat.value = false
+                })
+            }
         })
     }
-  })
-}
 
-const back = () => {
-  router.push('/shop/delivery/electronic_sheet')
-}
+    const back = () => {
+        router.push('/shop/delivery/electronic_sheet')
+    }
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/addon/shop/views/delivery/local.vue b/admin/src/addon/shop/views/delivery/local.vue
index 3b977bd7..c3d35606 100644
--- a/admin/src/addon/shop/views/delivery/local.vue
+++ b/admin/src/addon/shop/views/delivery/local.vue
@@ -1,25 +1,18 @@
 <template>
-  <div class="main-container">
-    <el-card class="card !border-none mb-[15px]" shadow="never">
-      <el-page-header :content="pageName" :icon="ArrowLeft" @back="back" />
-    </el-card>
-
-    <el-card class="box-card !border-none" shadow="never">
-      <el-form
-        label-width="120px"
-        ref="formRef"
-        :rules="formRules"
-        :model="formData"
-        class="page-form"
-        v-loading="loading"
-      >
-        <!-- <h3 class="panel-title">{{t('basicSettings')}}</h3> -->
-        <el-form-item :label="t('deliveryType')" prop="delivery_type">
-          <el-checkbox-group v-model="formData.delivery_type">
-            <el-checkbox label="business">{{ t('business') }}</el-checkbox>
-          </el-checkbox-group>
-        </el-form-item>
-        <!-- <el-form-item :label="t('timeIsOpen')" prop="time_is_open">
+    <div class="main-container">
+        <el-card class="card !border-none mb-[15px]" shadow="never">
+            <el-page-header :content="pageName" :icon="ArrowLeft" @back="back" />
+        </el-card>
+        
+        <el-card class="box-card !border-none" shadow="never">
+            <el-form label-width="120px" ref="formRef" :rules="formRules" :model="formData" class="page-form" v-loading="loading">
+                <!-- <h3 class="panel-title">{{t('basicSettings')}}</h3> -->
+                <el-form-item :label="t('deliveryType')" prop="delivery_type">
+                    <el-checkbox-group v-model="formData.delivery_type">
+                        <el-checkbox label="business">{{ t('business') }}</el-checkbox>
+                    </el-checkbox-group>
+                </el-form-item>
+                <!-- <el-form-item :label="t('timeIsOpen')" prop="time_is_open">
                     <div>
                         <el-radio-group v-model="formData.time_is_open">
                             <el-radio :label="1">{{ t('open') }}</el-radio>
@@ -47,233 +40,116 @@
                     </el-checkbox-group>
                 </el-form-item>
                 </template> -->
-        <el-form-item :label="t('deliveryAddress')" prop="delivery_address">
-          <div class="flex flex-col">
-            <div class="flex">
-              {{
-                defaultDeliveryAddress
-                  ? defaultDeliveryAddress.full_address
-                  : t('defaultDeliveryAddressEmpty')
-              }}
-              <el-button
-                type="primary"
-                @click="router.push('/shop/order/address')"
-                link
-                class="ml-[10px]"
-                >{{
-                  defaultDeliveryAddress ? t('update') : t('toSetting')
-                }}</el-button
-              >
-            </div>
-            <div
-              class="text-error leading-none"
-              v-if="
-                formData.center.lat &&
-                defaultDeliveryAddress &&
-                (formData.center.lat != defaultDeliveryAddress.lat ||
-                  formData.center.lng != defaultDeliveryAddress.lng)
-              "
-            >
-              {{ t('deliveryAddressChange') }}
-            </div>
-          </div>
-        </el-form-item>
-        <el-form-item :label="t('feeType')">
-          <el-radio-group v-model="formData.fee_type">
-            <el-radio label="region">{{ t('region') }}</el-radio>
-            <el-radio label="distance">{{ t('distance') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item
-          :label="t('feeSetting')"
-          prop="distance"
-          v-show="formData.fee_type == 'distance'"
-        >
-          <div class="flex">
-            <div class="w-[60px] mx-[5px]">
-              <el-input
-                v-model.number="formData.base_dist"
-                type="text"
-                @keyup="filterDigit($event)"
-              />
-            </div>
-            {{ t('feeSettingTextOne') }}
-            <div class="w-[60px] mx-[5px]">
-              <el-input
-                v-model.trim="formData.base_price"
-                type="text"
-                @keyup="filterDigit($event)"
-              />
-            </div>
-            {{ t('feeSettingTextTwo') }}
-            <div class="w-[60px] mx-[5px]">
-              <el-input
-                v-model.number="formData.grad_dist"
-                type="text"
-                @keyup="filterDigit($event)"
-              />
-            </div>
-            {{ t('feeSettingTextThree') }}
-            <div class="w-[60px] mx-[5px]">
-              <el-input
-                v-model.trim="formData.grad_price"
-                type="text"
-                @keyup="filterDigit($event)"
-              />
-            </div>
-            {{ t('priceUnit') }}
-          </div>
-        </el-form-item>
-        <el-form-item :label="t('weightFee')" prop="">
-          <div class="flex">
-            {{ t('weightFeeTextOne') }}
-            <div class="w-[60px] mx-[5px]">
-              <el-input
-                v-model.trim="formData.weight_start"
-                type="text"
-                @keyup="filterDigit($event)"
-              />
-            </div>
-            {{ t('weightFeeTextTwo') }}
-            <div class="w-[60px] mx-[5px]">
-              <el-input
-                v-model.trim="formData.weight_unit"
-                type="text"
-                @keyup="filterDigit($event)"
-              />
-            </div>
-            {{ t('weightFeeTextThree') }}
-            <div class="w-[60px] mx-[5px]">
-              <el-input
-                v-model.trim="formData.weight_price"
-                type="text"
-                @keyup="filterDigit($event)"
-              />
-            </div>
-            {{ t('priceUnit') }}
-          </div>
-        </el-form-item>
-
-        <el-form-item prop="area" v-loading="mapLoading">
-          <div class="relative w-full">
-            <div id="container" class="w-full h-[520px]"></div>
-            <div
-              class="absolute bg-white w-[270px] h-[500px] top-[10px] left-[10px] region-list"
-            >
-              <el-scrollbar>
-                <div
-                  class="p-[10px] region-item pr-[50px] relative"
-                  v-for="(item, index) in formData.area"
-                  :key="index"
-                  :class="{ '!border-primary': index == currArea }"
-                  @click="selectArea(index)"
-                >
-                  <el-form
-                    label-width="80px"
-                    :model="item"
-                    :rules="formRules"
-                    class="page-form"
-                    ref="areaFromRef"
-                  >
-                    <div class="pb-[18px]">
-                      <el-form-item :label="t('areaName')" prop="area_name">
-                        <el-input
-                          v-model.trim="formData.area[index].area_name"
-                          type="text"
-                        />
-                      </el-form-item>
+                <el-form-item :label="t('deliveryAddress')" prop="delivery_address">
+                    <div class="flex flex-col">
+                        <div class="flex">
+                            {{ defaultDeliveryAddress ? defaultDeliveryAddress.full_address : t('defaultDeliveryAddressEmpty') }}
+                            <el-button type="primary" @click="router.push('/shop/order/address')" link class="ml-[10px]">{{ defaultDeliveryAddress ? t('update') : t('toSetting') }}</el-button>
+                        </div>
+                        <div class="text-error leading-none" v-if="formData.center.lat && defaultDeliveryAddress && (formData.center.lat != defaultDeliveryAddress.lat || formData.center.lng != defaultDeliveryAddress.lng)">
+                            {{ t('deliveryAddressChange') }}</div>
                     </div>
-                    <div class="pb-[18px]">
-                      <el-form-item :label="t('startPrice')" prop="start_price">
-                        <el-input
-                          v-model.trim="formData.area[index].start_price"
-                          type="text"
-                          @keyup="filterDigit($event)"
-                        />
-                      </el-form-item>
+                </el-form-item>
+                <el-form-item :label="t('feeType')">
+                    <el-radio-group v-model="formData.fee_type">
+                        <el-radio label="region">{{ t('region') }}</el-radio>
+                        <el-radio label="distance">{{ t('distance') }}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item :label="t('feeSetting')" prop="distance" v-show="formData.fee_type == 'distance'">
+                    <div class="flex">
+                        <div class="w-[60px] mx-[5px]">
+                            <el-input v-model.number="formData.base_dist" type="text" @keyup="filterDigit($event)" />
+                        </div>
+                        {{ t('feeSettingTextOne') }}
+                        <div class="w-[60px] mx-[5px]">
+                            <el-input v-model.trim="formData.base_price" type="text" @keyup="filterDigit($event)"/>
+                        </div>
+                        {{ t('feeSettingTextTwo') }}
+                        <div class="w-[60px] mx-[5px]">
+                            <el-input v-model.number="formData.grad_dist" type="text" @keyup="filterDigit($event)"/>
+                        </div>
+                        {{ t('feeSettingTextThree') }}
+                        <div class="w-[60px] mx-[5px]">
+                            <el-input v-model.trim="formData.grad_price" type="text" @keyup="filterDigit($event)"/>
+                        </div>
+                        {{ t('priceUnit') }}
                     </div>
-                    <div
-                      class="pb-[10px]"
-                      v-show="formData.fee_type == 'region'"
-                    >
-                      <el-form-item
-                        :label="t('deliveryPrice')"
-                        prop="delivery_price"
-                      >
-                        <el-input
-                          v-model.trim="formData.area[index].delivery_price"
-                          type="text"
-                          @keyup="filterDigit($event)"
-                        />
-                      </el-form-item>
+                </el-form-item>
+                <el-form-item :label="t('weightFee')" prop="">
+                    <div class="flex">
+                        {{ t('weightFeeTextOne') }}
+                        <div class="w-[60px] mx-[5px]">
+                            <el-input v-model.trim="formData.weight_start" type="text"  @keyup="filterDigit($event)"/>
+                        </div>
+                        {{ t('weightFeeTextTwo') }}
+                        <div class="w-[60px] mx-[5px]">
+                            <el-input v-model.trim="formData.weight_unit" type="text"  @keyup="filterDigit($event)"/>
+                        </div>
+                        {{ t('weightFeeTextThree') }}
+                        <div class="w-[60px] mx-[5px]">
+                            <el-input v-model.trim="formData.weight_price" type="text"  @keyup="filterDigit($event)" />
+                        </div>
+                        {{ t('priceUnit') }}
                     </div>
-                    <el-form-item :label="t('areaType')">
-                      <el-radio-group
-                        v-model="formData.area[index].area_type"
-                        @click.stop=""
-                        @change="areaTypeChange(index)"
-                      >
-                        <el-radio
-                          label="radius"
-                          size="large"
-                          class="!mr-[10px]"
-                          >{{ t('radius') }}</el-radio
-                        >
-                        <el-radio
-                          label="custom"
-                          size="large"
-                          class="!mr-[0px]"
-                          >{{ t('custom') }}</el-radio
-                        >
-                      </el-radio-group>
-                    </el-form-item>
-                  </el-form>
-                  <el-button
-                    type="primary"
-                    link
-                    class="absolute z-1 top-[10px] right-[10px]"
-                    @click.stop="deleteArea(index)"
-                    >{{ t('delete') }}</el-button
-                  >
-                </div>
-                <div class="p-[10px] text-center">
-                  <el-button type="default" plain @click="addArea">{{
-                    t('addDeliveryArea')
-                  }}</el-button>
-                </div>
-              </el-scrollbar>
+                </el-form-item>
+
+                <el-form-item prop="area" v-loading="mapLoading">
+                    <div class="relative w-full">
+                        <div id="container" class="w-full h-[520px]"></div>
+                        <div class="absolute bg-white w-[270px] h-[500px] top-[10px] left-[10px] region-list">
+                            <el-scrollbar>
+                                <div class="p-[10px] region-item pr-[50px] relative" v-for="(item, index) in formData.area" :key="index" :class="{ '!border-primary': index == currArea }" @click="selectArea(index)">
+                                    <el-form label-width="80px" :model="item" :rules="formRules" class="page-form" ref="areaFromRef">
+                                        <div class="pb-[18px]">
+                                            <el-form-item :label="t('areaName')" prop="area_name">
+                                                <el-input v-model.trim="formData.area[index].area_name" type="text" />
+                                            </el-form-item>
+                                        </div>
+                                        <div class="pb-[18px]">
+                                            <el-form-item :label="t('startPrice')" prop="start_price">
+                                                <el-input v-model.trim="formData.area[index].start_price" type="text"  @keyup="filterDigit($event)" />
+                                            </el-form-item>
+                                        </div>
+                                        <div class="pb-[10px]" v-show="formData.fee_type == 'region'">
+                                            <el-form-item :label="t('deliveryPrice')" prop="delivery_price">
+                                                <el-input v-model.trim="formData.area[index].delivery_price" type="text"   @keyup="filterDigit($event)"/>
+                                            </el-form-item>
+                                        </div>
+                                        <el-form-item :label="t('areaType')">
+                                            <el-radio-group v-model="formData.area[index].area_type" @click.stop="" @change="areaTypeChange(index)">
+                                                <el-radio label="radius" size="large" class="!mr-[10px]">{{ t('radius') }}</el-radio>
+                                                <el-radio label="custom" size="large" class="!mr-[0px]">{{ t('custom') }}</el-radio>
+                                            </el-radio-group>
+                                        </el-form-item>
+                                    </el-form>
+                                    <el-button type="primary" link class="absolute z-1 top-[10px] right-[10px]" @click.stop="deleteArea(index)">{{ t('delete') }}</el-button>
+                                </div>
+                                <div class="p-[10px] text-center">
+                                    <el-button type="default" plain @click="addArea">{{ t('addDeliveryArea') }}</el-button>
+                                </div>
+                            </el-scrollbar>
+                        </div>
+                    </div>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <div class="fixed-footer-wrap">
+            <div class="fixed-footer">
+                <el-button type="primary" @click="onSave(formRef)" :disabled="loading">{{ t('save') }}</el-button>
+                <el-button @click="back()">{{ t('cancel') }}</el-button>
             </div>
-          </div>
-        </el-form-item>
-      </el-form>
-    </el-card>
-    <div class="fixed-footer-wrap">
-      <div class="fixed-footer">
-        <el-button
-          type="primary"
-          @click="onSave(formRef)"
-          :disabled="loading"
-          >{{ t('save') }}</el-button
-        >
-        <el-button @click="back()">{{ t('cancel') }}</el-button>
-      </div>
+        </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
-import { ref, computed, onMounted, onBeforeUnmount, toRaw } from 'vue'
+import { ref, computed, onMounted, onBeforeUnmount,toRaw } from 'vue'
 import { t } from '@/lang'
 import { useRoute, useRouter } from 'vue-router'
 import { getMap } from '@/app/api/sys'
 import { guid, filterDigit, deepClone } from '@/utils/common'
-import {
-  createCircle,
-  deleteGeometry,
-  createPolygon,
-  selectGeometry,
-  createMarker,
-} from '@/utils/qqmap'
+import { createCircle, deleteGeometry, createPolygon, selectGeometry, createMarker } from '@/utils/qqmap'
 import { setLocal, getLocal } from '@/addon/shop/api/delivery'
 import { FormInstance } from 'element-plus'
 import Test from '@/utils/test'
@@ -285,170 +161,154 @@ const loading = ref(true)
 const pageName = route.meta.title
 const formRef = ref<FormInstance>()
 const areaFromRef: any = ref<FormInstance[]>()
-interface addressType {
-  full_address: string
-  lat: string
-  lng: string
+interface addressType{
+    full_address:string
+    lat:string
+    lng:string
 }
-const defaultDeliveryAddress: any = ref<addressType | null>(null)
+const defaultDeliveryAddress:any = ref<addressType|null>(null)
 const getDefaultDeliveryAddress = async () => {
-  await getShopDefaultDeliveryAddressInfo()
-    .then(({ data }) => {
-      defaultDeliveryAddress.value = data
-    })
-    .catch()
+    await getShopDefaultDeliveryAddressInfo().then(({ data }) => {
+        defaultDeliveryAddress.value = data
+    }).catch()
 }
 getDefaultDeliveryAddress()
 
 const formData = ref({
-  center: {
-    lat: '',
-    lng: '',
-  },
-  delivery_type: ['business'],
-  fee_type: 'region',
-  time_is_open: 1,
-  time_type: 0,
-  time_week: <any>[],
-  base_dist: '',
-  base_price: '',
-  grad_dist: '',
-  grad_price: '',
-  weight_start: 0.0,
-  weight_unit: 0,
-  weight_price: 0,
-  area: [
-    {
-      area_name: '',
-      area_type: 'radius',
-      start_price: 0,
-      delivery_price: 0,
-      area_json: {
-        key: guid(),
-      },
+    center: {
+        lat: '',
+        lng: ''
     },
-  ],
+    delivery_type: ['business'],
+    fee_type: 'region',
+    time_is_open:1,
+    time_type:0,
+    time_week: <any>[],
+    base_dist: '',
+    base_price: '',
+    grad_dist: '',
+    grad_price: '',
+    weight_start: 0.000,
+    weight_unit: 0,
+    weight_price: 0,
+    area: [
+        {
+            area_name: '',
+            area_type: 'radius',
+            start_price: 0,
+            delivery_price: 0,
+            area_json: {
+                key: guid()
+            }
+        }
+    ]
 })
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    time_week: [
-      { required: true, message: t('timeWeekRequire'), trigger: 'change' },
-    ],
-    delivery_address: [
-      {
-        validator: (rule: any, value: any, callback: any) => {
-          if (!defaultDeliveryAddress.value) {
-            callback(new Error(t('defaultDeliveryAddressEmpty')))
-          }
-          callback()
-        },
-      },
-    ],
-    delivery_type: [
-      {
-        validator: (rule: any, value: any, callback: any) => {
-          if (!formData.value.delivery_type.length) {
-            callback(new Error(t('deliveryTypeRequire')))
-          }
-          callback()
-        },
-      },
-    ],
-    distance: [
-      {
-        validator: (rule: any, value: any, callback: any) => {
-          if (formData.value.fee_type == 'distance') {
-            if (Test.require(formData.value.base_dist)) {
-              callback(new Error(t('baseDistRequire')))
+    return {
+        time_week: [{ required: true, message: t('timeWeekRequire'), trigger: 'change' }],
+        delivery_address: [
+            {
+                validator: (rule: any, value: any, callback: any) => {
+                    if (!defaultDeliveryAddress.value) {
+                        callback(new Error(t('defaultDeliveryAddressEmpty')))
+                    }
+                    callback()
+                }
             }
-            if (Test.require(formData.value.base_price)) {
-              callback(new Error(t('basePriceRequire')))
+        ],
+        delivery_type: [
+            {
+                validator: (rule: any, value: any, callback: any) => {
+                    if (!formData.value.delivery_type.length) {
+                        callback(new Error(t('deliveryTypeRequire')))
+                    }
+                    callback()
+                }
             }
-            if (Test.require(formData.value.grad_dist)) {
-              callback(new Error(t('gradDistRequire')))
+        ],
+        distance: [
+            {
+                validator: (rule: any, value: any, callback: any) => {
+                    if (formData.value.fee_type == 'distance') {
+                        if (Test.require(formData.value.base_dist)) {
+                            callback(new Error(t('baseDistRequire')))
+                        }
+                        if (Test.require(formData.value.base_price)) {
+                            callback(new Error(t('basePriceRequire')))
+                        }
+                        if (Test.require(formData.value.grad_dist)) {
+                            callback(new Error(t('gradDistRequire')))
+                        }
+                        if (Test.require(formData.value.grad_price)) {
+                            callback(new Error(t('gradPriceRequire')))
+                        }
+                    }
+                    callback()
+                },
+                trigger: 'blur'
             }
-            if (Test.require(formData.value.grad_price)) {
-              callback(new Error(t('gradPriceRequire')))
+        ],
+        area_name: [{ required: true, message: t('areaNameRequire'), trigger: 'blur' }],
+        start_price: [
+            { required: true, message: t('startPriceRequire'), trigger: 'blur' },
+            {
+                validator: (rule: any, value: any, callback: any) => {
+                    if (parseInt(value) < 0) {
+                        callback(new Error(t('startPriceMin')))
+                    }
+                    callback()
+                },
+                trigger: 'blur'
             }
-          }
-          callback()
-        },
-        trigger: 'blur',
-      },
-    ],
-    area_name: [
-      { required: true, message: t('areaNameRequire'), trigger: 'blur' },
-    ],
-    start_price: [
-      { required: true, message: t('startPriceRequire'), trigger: 'blur' },
-      {
-        validator: (rule: any, value: any, callback: any) => {
-          if (parseInt(value) < 0) {
-            callback(new Error(t('startPriceMin')))
-          }
-          callback()
-        },
-        trigger: 'blur',
-      },
-    ],
-    delivery_price: [
-      {
-        required: formData.value.fee_type == 'region',
-        message: t('deliveryPriceRequire'),
-        trigger: 'blur',
-      },
-      {
-        validator: (rule: any, value: any, callback: any) => {
-          if (parseInt(value) < 0) {
-            callback(new Error(t('deliveryPriceMin')))
-          }
-          callback()
-        },
-        trigger: 'blur',
-      },
-    ],
-    area: [
-      {
-        validator: (rule: any, value: any, callback: any) => {
-          if (Test.empty(formData.value.area)) {
-            callback(new Error(t('areaPlaceholder')))
-          }
-          callback()
-        },
-        trigger: 'blur',
-      },
-    ],
-  }
+        ],
+        delivery_price: [
+            { required: formData.value.fee_type == 'region', message: t('deliveryPriceRequire'), trigger: 'blur' },
+            {
+                validator: (rule: any, value: any, callback: any) => {
+                    if (parseInt(value) < 0) {
+                        callback(new Error(t('deliveryPriceMin')))
+                    }
+                    callback()
+                },
+                trigger: 'blur'
+            }
+        ],
+        area: [
+            {
+                validator: (rule: any, value: any, callback: any) => {
+                    if (Test.empty(formData.value.area)) {
+                        callback(new Error(t('areaPlaceholder')))
+                    }
+                    callback()
+                },
+                trigger: 'blur'
+            }
+        ]
+    }
 })
 
-getLocal()
-  .then(({ data }) => {
+getLocal().then(({ data }) => {
     loading.value = false
     if (data) Object.assign(formData.value, data)
-    formData.value.time_week = formData.value.time_week
-      ? formData.value.time_week.split(',')
-      : []
-  })
-  .catch(() => {
-    loading.value = false
-  })
+    formData.value.time_week = formData.value.time_week?formData.value.time_week.split(','):[]
+}).catch(()=>{
+    loading.value = false 
+})
 
 onMounted(() => {
-  const mapScript = document.createElement('script')
-  getMap().then((res) => {
-    mapScript.type = 'text/javascript'
-    mapScript.src =
-      'https://map.qq.com/api/gljs?libraries=tools,service&v=1.exp&key=' +
-      res.data.key
-    document.body.appendChild(mapScript)
-  })
-  mapScript.onload = () => {
-    setTimeout(() => {
-      initMap()
-    }, 500)
-  }
+    const mapScript = document.createElement('script')
+    getMap().then(res => {
+        mapScript.type = 'text/javascript'
+        mapScript.src = 'https://map.qq.com/api/gljs?libraries=tools,service&v=1.exp&key=' + res.data.key
+        document.body.appendChild(mapScript)
+    })
+    mapScript.onload = () => {
+        setTimeout(() => {
+            initMap()
+        }, 500)
+    }
 })
 
 /**
@@ -457,28 +317,23 @@ onMounted(() => {
 let map: any
 const mapLoading = ref(true)
 const initMap = () => {
-  const TMap = (window as any).TMap
-  const LatLng = TMap.LatLng
-  const center = new LatLng(
-    defaultDeliveryAddress.value ? defaultDeliveryAddress.value.lat : 39.980619,
-    defaultDeliveryAddress.value ? defaultDeliveryAddress.value.lng : 116.321277
-  )
+    const TMap = (window as any).TMap
+    const LatLng = TMap.LatLng
+    const center = new LatLng(defaultDeliveryAddress.value ? defaultDeliveryAddress.value.lat : 39.980619, defaultDeliveryAddress.value ? defaultDeliveryAddress.value.lng : 116.321277)
 
-  map = new TMap.Map('container', {
-    center,
-    zoom: 14,
-  })
-  createMarker(map)
+    map = new TMap.Map('container', {
+        center,
+        zoom: 14
+    })
+    createMarker(map)
 
-  map.on('tilesloaded', () => {
-    mapLoading.value = false
-  })
+    map.on('tilesloaded', () => {
+        mapLoading.value = false
+    })
 
-  formData.value.area.forEach((item) => {
-    item.area_type == 'radius'
-      ? createCircle(map, item.area_json)
-      : createPolygon(map, item.area_json)
-  })
+    formData.value.area.forEach(item => {
+        item.area_type == 'radius' ? createCircle(map, item.area_json) : createPolygon(map, item.area_json)
+    })
 }
 
 const currArea = ref<number>(0)
@@ -487,100 +342,96 @@ const currArea = ref<number>(0)
  * 添加配送区域
  */
 const addArea = () => {
-  formData.value.area.push({
-    area_name: '',
-    area_type: 'radius',
-    start_price: 0,
-    delivery_price: 0,
-    area_json: {
-      key: guid(),
-    },
-  })
-  const index = formData.value.area.length - 1
-  createCircle(map, formData.value.area[index].area_json)
+    formData.value.area.push({
+        area_name: '',
+        area_type: 'radius',
+        start_price: 0,
+        delivery_price: 0,
+        area_json: {
+            key: guid()
+        }
+    })
+    const index = formData.value.area.length - 1
+    createCircle(map, formData.value.area[index].area_json)
 }
 
 /**
  * 删除配送区域
  */
 const deleteArea = (index: number) => {
-  const data = formData.value.area[index]
-  deleteGeometry(data.area_json.key)
-  formData.value.area.splice(index, 1)
+    const data = formData.value.area[index]
+    deleteGeometry(data.area_json.key)
+    formData.value.area.splice(index, 1)
 }
 
 const selectArea = (index: number) => {
-  currArea.value = index
-  const data = formData.value.area[index]
-  selectGeometry(data.area_json.key)
+    currArea.value = index
+    const data = formData.value.area[index]
+    selectGeometry(data.area_json.key)
 }
 
 const areaTypeChange = (index: number) => {
-  const data = formData.value.area[index]
-  deleteGeometry(data.area_json.key)
-  data.area_type == 'radius'
-    ? createCircle(map, data.area_json)
-    : createPolygon(map, data.area_json)
+    const data = formData.value.area[index]
+    deleteGeometry(data.area_json.key)
+    data.area_type == 'radius' ? createCircle(map, data.area_json) : createPolygon(map, data.area_json)
 }
 
 onBeforeUnmount(() => {
-  map.destroy()
+    map.destroy()
 })
 
 const onSave = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-
-  await formEl.validate(async (valid) => {
-    let areaValidate = true
+    if (loading.value || !formEl) return
 
-    for (let i = 0; i < areaFromRef.value?.length; i++) {
-      const ref = areaFromRef.value[i]
-      await ref.validate(async (valid) => {
-        areaValidate = valid
-      })
-      if (!areaValidate) break
-    }
-    if (!areaValidate) return
+    await formEl.validate(async (valid) => {
+        let areaValidate = true
 
-    if (valid) {
-      loading.value = true
+        for (let i = 0; i < areaFromRef.value?.length; i++) {
+            const ref = areaFromRef.value[i]
+            await ref.validate(async (valid) => {
+                areaValidate = valid
+            })
+            if (!areaValidate) break
+        }
+        if (!areaValidate) return
 
-      formData.value.center = {
-        lat: defaultDeliveryAddress.value.lat,
-        lng: defaultDeliveryAddress.value.lng,
-      }
+        if (valid) {
+            loading.value = true
+            
+            formData.value.center = {
+                lat: defaultDeliveryAddress.value.lat,
+                lng: defaultDeliveryAddress.value.lng
+            }
 
-      await formEl.validate(async (valid) => {
-        const param = deepClone(toRaw(formData.value))
-        param.time_week = param.time_week.toString()
-        setLocal(param)
-          .then(() => {
-            loading.value = false
-          })
-          .catch(() => {
-            loading.value = false
-          })
-      })
-    }
-  })
+            await formEl.validate(async (valid) => {
+                const param = deepClone(toRaw(formData.value))
+                param.time_week = param.time_week.toString()
+                setLocal(param).then(() => {
+                    loading.value = false
+                }).catch(() => {
+                    loading.value = false
+                })
+            })
+        }
+    })
 }
 
 const back = () => {
-  router.push({ path: '/shop/order/delivery' })
+    router.push({ path: '/shop/order/delivery' })
 }
 </script>
 
 <style lang="scss" scoped>
 .region-list {
-  border: 1px solid var(--el-border-color-lighter);
-  z-index: 3;
+    border: 1px solid var(--el-border-color-lighter);
+    z-index: 3;
 
-  .region-item {
-    border: 1px solid transparent;
-    border-bottom-color: var(--el-border-color-lighter);
-  }
+    .region-item {
+        border: 1px solid transparent;
+        border-bottom-color: var(--el-border-color-lighter);
+    }
 }
-#container :deep(div) {
-  z-index: 2 !important;
+#container :deep(div){
+    z-index: 2 !important;
 }
 </style>
diff --git a/admin/src/addon/shop/views/delivery/search.vue b/admin/src/addon/shop/views/delivery/search.vue
index 39b643ad..6a80f470 100644
--- a/admin/src/addon/shop/views/delivery/search.vue
+++ b/admin/src/addon/shop/views/delivery/search.vue
@@ -1,116 +1,76 @@
 <template>
-  <div class="main-container">
-    <el-card class="card !border-none mb-[15px]" shadow="never">
-      <el-page-header
-        :content="pageName"
-        :icon="ArrowLeft"
-        @back="router.push({ path: '/shop/order/delivery' })"
-      />
-    </el-card>
-    <el-form
-      :model="formData"
-      label-width="150px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-card class="box-card !border-none" shadow="never">
-        <el-form-item :label="t('interfaceType')" prop="interface_type">
-          <div>
-            <el-radio-group v-model="formData.interface_type">
-              <el-radio :label="1" size="large">{{ t('kdn') }}</el-radio>
-              <!--							<el-radio :label="2" size="large">{{ t('kd100') }}</el-radio>-->
-            </el-radio-group>
-            <p
-              class="text-[12px] text-[#b2b2b2]"
-              v-if="formData.interface_type == 1"
-            >
-              {{ t('promptTips1-1')
-              }}<el-button
-                class="button-size"
-                type="primary"
-                link
-                @click="openEvent('https://www.kdniao.com')"
-                >https://www.kdniao.com</el-button
-              >
-            </p>
-            <p
-              class="text-[12px] text-[#b2b2b2]"
-              v-if="formData.interface_type == 1"
-            >
-              {{ t('promptTips1-2') }}
-            </p>
-            <!--						<p class="text-[12px] text-[#b2b2b2]" v-if="formData.interface_type == 2">-->
-            <!--							{{ t('promptTips2') }}<el-button class="button-size" type="primary" link @click="openEvent('https://www.kuaidi100.com')">https://www.kuaidi100.com</el-button>-->
-            <!--						</p>-->
-          </div>
-        </el-form-item>
-        <div v-if="formData.interface_type == 1">
-          <el-form-item
-            :label="t('isPayEdition')"
-            prop="kdn_is_pay"
-            class="items-center"
-          >
-            <el-radio-group v-model="formData.kdniao_is_pay">
-              <el-radio :label="1" size="large">{{ t('free') }}</el-radio>
-              <el-radio :label="2" size="large">{{ t('pay') }}</el-radio>
-            </el-radio-group>
-          </el-form-item>
-
-          <el-form-item label="EBusinessID" class="input-item">
-            <div>
-              <el-input
-                v-model.trim="formData.kdniao_id"
-                :placeholder="t('kdnEBusinessIDPlaceholder')"
-                class="input-width"
-                clearable
-              />
-              <p class="text-[12px] text-[#b2b2b2]">
-                {{ t('kdnEBusinessIDTips') }}
-              </p>
-            </div>
-          </el-form-item>
-
-          <el-form-item label="APPKEY" class="input-item">
-            <div>
-              <el-input
-                v-model.trim="formData.kdniao_app_key"
-                clearable
-                :placeholder="t('kdnAppKeyPlaceholder')"
-                class="input-width"
-              />
-              <p class="text-[12px] text-[#b2b2b2]">{{ t('kdnAppKeyTips') }}</p>
-            </div>
-          </el-form-item>
-        </div>
-
-        <!--				<div v-if="formData.interface_type == 2">-->
-        <!--					<el-form-item label="APPKEY" class="input-item">-->
-        <!--						<div>-->
-        <!--							<el-input v-model.trim="formData.kd100_app_key" clearable :placeholder="t('kd100AppKeyPlaceholder')" class="input-width" />-->
-        <!--							<p class="text-[12px] text-[#b2b2b2]">{{ t('kd100AppKeyTips') }}</p>-->
-        <!--						</div>-->
-        <!--					</el-form-item>-->
-
-        <!--					<el-form-item label="CUSTOMER" class="input-item">-->
-        <!--						<div>-->
-        <!--							<el-input v-model.trim="formData.kd100_customer" :placeholder="t('kd100CustomerPlaceholder')" class="input-width" clearable />-->
-        <!--							<p class="text-[12px] text-[#b2b2b2]">{{ t('kd100CustomerTips') }}</p>-->
-        <!--						</div>-->
-        <!--					</el-form-item>-->
-        <!--				</div>-->
-      </el-card>
-    </el-form>
-
-    <div class="fixed-footer-wrap">
-      <div class="fixed-footer">
-        <el-button type="primary" :loading="loading" @click="save(formRef)">{{
-          t('save')
-        }}</el-button>
-      </div>
-    </div>
-  </div>
+	<div class="main-container">
+		<el-card class="card !border-none mb-[15px]" shadow="never">
+            <el-page-header :content="pageName" :icon="ArrowLeft" @back="router.push({ path: '/shop/order/delivery' })" />
+        </el-card>
+		<el-form :model="formData" label-width="150px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+			<el-card class="box-card !border-none" shadow="never">
+				<el-form-item :label="t('interfaceType')" prop="interface_type">
+					<div>
+						<el-radio-group v-model="formData.interface_type">
+							<el-radio :label="1" size="large">{{ t('kdn') }}</el-radio>
+<!--							<el-radio :label="2" size="large">{{ t('kd100') }}</el-radio>-->
+						</el-radio-group>
+						<p class="text-[12px] text-[#b2b2b2]" v-if="formData.interface_type == 1">
+							{{ t('promptTips1-1') }}<el-button class="button-size" type="primary" link @click="openEvent('https://www.kdniao.com')">https://www.kdniao.com</el-button>
+						</p>
+						<p class="text-[12px] text-[#b2b2b2]" v-if="formData.interface_type == 1">
+							{{ t('promptTips1-2') }}
+						</p>
+<!--						<p class="text-[12px] text-[#b2b2b2]" v-if="formData.interface_type == 2">-->
+<!--							{{ t('promptTips2') }}<el-button class="button-size" type="primary" link @click="openEvent('https://www.kuaidi100.com')">https://www.kuaidi100.com</el-button>-->
+<!--						</p>-->
+					</div>
+				</el-form-item>
+				<div v-if="formData.interface_type == 1">
+					<el-form-item :label="t('isPayEdition')" prop="kdn_is_pay" class="items-center">
+						<el-radio-group v-model="formData.kdniao_is_pay">
+							<el-radio :label="1" size="large">{{ t('free') }}</el-radio>
+							<el-radio :label="2" size="large">{{ t('pay') }}</el-radio>
+						</el-radio-group>
+					</el-form-item>
+
+					<el-form-item label="EBusinessID" class="input-item">
+						<div>
+							<el-input v-model.trim="formData.kdniao_id" :placeholder="t('kdnEBusinessIDPlaceholder')" class="input-width" clearable />
+							<p class="text-[12px] text-[#b2b2b2]">{{ t('kdnEBusinessIDTips') }}</p>
+						</div>
+					</el-form-item>
+
+					<el-form-item label="APPKEY" class="input-item">
+						<div>
+							<el-input v-model.trim="formData.kdniao_app_key" clearable :placeholder="t('kdnAppKeyPlaceholder')" class="input-width" />
+							<p class="text-[12px] text-[#b2b2b2]">{{ t('kdnAppKeyTips') }}</p>
+						</div>
+					</el-form-item>
+
+				</div>
+
+<!--				<div v-if="formData.interface_type == 2">-->
+<!--					<el-form-item label="APPKEY" class="input-item">-->
+<!--						<div>-->
+<!--							<el-input v-model.trim="formData.kd100_app_key" clearable :placeholder="t('kd100AppKeyPlaceholder')" class="input-width" />-->
+<!--							<p class="text-[12px] text-[#b2b2b2]">{{ t('kd100AppKeyTips') }}</p>-->
+<!--						</div>-->
+<!--					</el-form-item>-->
+
+<!--					<el-form-item label="CUSTOMER" class="input-item">-->
+<!--						<div>-->
+<!--							<el-input v-model.trim="formData.kd100_customer" :placeholder="t('kd100CustomerPlaceholder')" class="input-width" clearable />-->
+<!--							<p class="text-[12px] text-[#b2b2b2]">{{ t('kd100CustomerTips') }}</p>-->
+<!--						</div>-->
+<!--					</el-form-item>-->
+<!--				</div>-->
+
+			</el-card>
+		</el-form>
+
+		<div class="fixed-footer-wrap">
+			<div class="fixed-footer">
+				<el-button type="primary" :loading="loading" @click="save(formRef)">{{ t('save') }}</el-button>
+			</div>
+		</div>
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -127,72 +87,72 @@ const pageName = route.meta.title
 const loading = ref(true)
 
 interface formDataType {
-  interface_type: number
-  kdniao_id: string
-  kdniao_app_key: string
-  kdniao_is_pay: number
-  kd100_app_key: string
-  kd100_customer: string
+    interface_type: number
+    kdniao_id: string
+    kdniao_app_key: string
+    kdniao_is_pay: number
+    kd100_app_key: string
+    kd100_customer: string
 }
-const formData = reactive<formDataType | any>({
-  interface_type: 1,
-  kdniao_id: '',
-  kdniao_app_key: '',
-  kdniao_is_pay: 1,
-  kd100_app_key: '',
-  kd100_customer: '',
+const formData = reactive<formDataType|any>({
+    interface_type: 1,
+    kdniao_id: '',
+    kdniao_app_key: '',
+    kdniao_is_pay: 1,
+    kd100_app_key: '',
+    kd100_customer: ''
 })
 
 const setFormData = async () => {
-  const data = await (await getDeliverySearch()).data
-  Object.keys(formData).forEach((key: string) => {
-    if (data[key] != undefined) formData[key] = data[key]
-  })
+    const data = await (await getDeliverySearch()).data
+    Object.keys(formData).forEach((key: string) => {
+        if (data[key] != undefined) formData[key] = data[key]
+    })
 
-  loading.value = false
+    loading.value = false
 }
 setFormData()
 
-const openEvent = (url: any) => {
-  window.open(url, '_blank')
+const openEvent = (url:any) => {
+    window.open(url, '_blank')
 }
 
 const formRef = ref<FormInstance>()
 
 // 表单验证规则
-const formRules = reactive<FormRules>({})
+const formRules = reactive<FormRules>({
+})
 
 /**
  * 保存
  */
 const save = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      setDeliverySearch(formData)
-        .then(() => {
-          loading.value = false
-        })
-        .catch(() => {
-          loading.value = false
-        })
-    }
-  })
+    if (loading.value || !formEl) return
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+            setDeliverySearch(formData).then(() => {
+                loading.value = false
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
 }
+
 </script>
 
 <style lang="scss" scoped>
 .input-item {
-  margin-bottom: 10px !important;
+	margin-bottom: 10px !important
 }
 
 .button-size {
-  font-size: 12px !important;
+	font-size: 12px !important;
 }
 
 .el-radio.el-radio--large {
-  height: auto !important;
+	height: auto !important
 }
 </style>
diff --git a/admin/src/addon/shop/views/delivery/staff.vue b/admin/src/addon/shop/views/delivery/staff.vue
index 97a75df9..691ae3d8 100644
--- a/admin/src/addon/shop/views/delivery/staff.vue
+++ b/admin/src/addon/shop/views/delivery/staff.vue
@@ -1,98 +1,57 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <div class="detail-head !m-0">
-          <div class="left" @click="router.push('/shop/order/delivery')">
-            <span class="iconfont iconxiangzuojiantou !text-xs"></span>
-            <span class="ml-[1px]">{{ t('returnToPreviousPage') }}</span>
-          </div>
-          <span class="adorn">|</span>
-          <span class="right">{{ pageName }}</span>
-        </div>
-        <el-button type="primary" @click="addEvent">
-          {{ t('addDeliveryPersonnel') }}
-        </el-button>
-      </div>
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="tableData.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('deliverName')" prop="deliver_name">
-            <el-input
-              v-model.trim="tableData.searchParam.deliver_name"
-              :placeholder="t('deliverNamePlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('deliverMobile')" prop="deliver_mobile">
-            <el-input
-              v-model.trim="tableData.searchParam.deliver_mobile"
-              :placeholder="t('deliverMobilePlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="getShopDeliveryFn()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
-      <div class="mt-[10px]">
-        <el-table
-          :data="tableData.data"
-          ref="tableRef"
-          size="large"
-          v-loading="tableData.loading"
-        >
-          <template #empty>
-            <span>{{ !tableData.loading ? t('emptyData') : '' }}</span>
-          </template>
-          <el-table-column prop="deliver_name" :label="t('deliverName')" />
-          <el-table-column prop="deliver_mobile" :label="t('deliverMobile')" />
-          <el-table-column
-            :label="t('operation')"
-            fixed="right"
-            align="right"
-            width="120"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="editEvent(row)">{{
-                t('edit')
-              }}</el-button>
-              <el-button
-                type="primary"
-                link
-                @click="deleteEvent(row.deliver_id)"
-                >{{ t('delete') }}</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="tableData.page"
-            v-model:page-size="tableData.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="tableData.total"
-            @size-change="getShopDeliveryFn()"
-            @current-change="getShopDeliveryFn"
-          />
-        </div>
-      </div>
-    </el-card>
-    <delivery-personnel-edit
-      ref="editCategoryDialog"
-      @complete="getShopDeliveryFn"
-    />
-  </div>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+            <div class="flex justify-between items-center">
+                <div class="detail-head !m-0">
+                    <div class="left" @click="router.push('/shop/order/delivery')">
+                        <span class="iconfont iconxiangzuojiantou !text-xs"></span>
+                        <span class="ml-[1px]">{{ t('returnToPreviousPage') }}</span>
+                    </div>
+                    <span class="adorn">|</span>
+                    <span class="right">{{ pageName }}</span>
+                </div>
+                <el-button type="primary" @click="addEvent">
+                    {{ t('addDeliveryPersonnel') }}
+                </el-button>
+            </div>
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="tableData.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('deliverName')" prop="deliver_name">
+                        <el-input v-model.trim="tableData.searchParam.deliver_name" :placeholder="t('deliverNamePlaceholder')"  />
+                    </el-form-item>
+                    <el-form-item :label="t('deliverMobile')" prop="deliver_mobile">
+                        <el-input v-model.trim="tableData.searchParam.deliver_mobile" :placeholder="t('deliverMobilePlaceholder')" />
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="getShopDeliveryFn()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+            <div class="mt-[10px]">
+                <el-table :data="tableData.data" ref="tableRef" size="large" v-loading="tableData.loading">
+                    <template #empty>
+                        <span>{{ !tableData.loading ? t('emptyData') : '' }}</span>
+                    </template>
+                    <el-table-column prop="deliver_name" :label="t('deliverName')" />
+                    <el-table-column prop="deliver_mobile" :label="t('deliverMobile')" />
+                    <el-table-column :label="t('operation')" fixed="right" align="right" width="120">
+                        <template #default="{ row }">
+                            <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+                            <el-button type="primary" link @click="deleteEvent(row.deliver_id)">{{ t('delete') }}</el-button>
+                        </template>
+                    </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="tableData.page" v-model:page-size="tableData.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="tableData.total"
+                        @size-change="getShopDeliveryFn()" @current-change="getShopDeliveryFn" />
+                </div>
+            </div>
+        </el-card>
+        <delivery-personnel-edit ref="editCategoryDialog" @complete="getShopDeliveryFn" />
+    </div>
 </template>
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
@@ -106,36 +65,34 @@ const route = useRoute()
 const router = useRouter()
 const pageName = route.meta.title
 const tableData = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: false,
-  data: [],
-  searchParam: {
-    deliver_name: '',
-    deliver_mobile: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: false,
+    data: [],
+    searchParam: {
+        deliver_name: '',
+        deliver_mobile: ''
+    }
 })
 const searchFormRef = ref<FormInstance>()
 /**
  * 获取配送员列表
  */
 const getShopDeliveryFn = (page: number = 1) => {
-  tableData.loading = true
-  tableData.page = page
+    tableData.loading = true
+    tableData.page = page
 
-  getShopDelivery({
-    page: tableData.page,
-    limit: tableData.limit,
-    ...tableData.searchParam,
-  })
-    .then((res) => {
-      tableData.loading = false
-      tableData.data = res.data.data
-      tableData.total = res.data.total
-    })
-    .catch(() => {
-      tableData.loading = false
+    getShopDelivery({
+        page: tableData.page,
+        limit: tableData.limit,
+        ...tableData.searchParam
+    }).then(res => {
+        tableData.loading = false
+        tableData.data = res.data.data
+        tableData.total = res.data.total
+    }).catch(() => {
+        tableData.loading = false
     })
 }
 getShopDeliveryFn()
@@ -145,8 +102,8 @@ const editCategoryDialog: Record<string, any> | null = ref(null)
  * 添加配送员
  */
 const addEvent = () => {
-  editCategoryDialog.value.setFormData()
-  editCategoryDialog.value.showDialog = true
+    editCategoryDialog.value.setFormData()
+    editCategoryDialog.value.showDialog = true
 }
 
 /**
@@ -154,29 +111,30 @@ const addEvent = () => {
  * @param data
  */
 const editEvent = (data: any) => {
-  editCategoryDialog.value.setFormData(data)
-  editCategoryDialog.value.showDialog = true
+    editCategoryDialog.value.setFormData(data)
+    editCategoryDialog.value.showDialog = true
 }
 /**
  * 删除配送员
  */
 const deleteEvent = (id: number) => {
-  ElMessageBox.confirm(t('deliverDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    deleteShopDeliver(id)
-      .then(() => {
-        getShopDeliveryFn()
-      })
-      .catch(() => {})
-  })
+    ElMessageBox.confirm(t('deliverDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        deleteShopDeliver(id).then(() => {
+            getShopDeliveryFn()
+        }).catch(() => {
+        })
+    })
 }
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  getShopDeliveryFn()
+    if (!formEl) return
+    formEl.resetFields()
+    getShopDeliveryFn()
 }
 </script>
 <style lang="scss" scoped></style>
diff --git a/admin/src/addon/shop/views/delivery/store.vue b/admin/src/addon/shop/views/delivery/store.vue
index a27fc36a..ad71b5b6 100644
--- a/admin/src/addon/shop/views/delivery/store.vue
+++ b/admin/src/addon/shop/views/delivery/store.vue
@@ -1,129 +1,77 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <div class="detail-head !m-0">
-          <div class="left" @click="router.push('/shop/order/delivery')">
-            <span class="iconfont iconxiangzuojiantou !text-xs"></span>
-            <span class="ml-[1px]">{{ t('returnToPreviousPage') }}</span>
-          </div>
-          <span class="adorn">|</span>
-          <span class="right">{{ pageName }}</span>
-        </div>
-        <el-button type="primary" @click="addEvent">
-          {{ t('addStore') }}
-        </el-button>
-      </div>
-
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="storeTable.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('storeName')" prop="store_name">
-            <el-input
-              v-model.trim="storeTable.searchParam.store_name"
-              :placeholder="t('storeNamePlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="loadStoreList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
-
-      <div class="mt-[10px]">
-        <el-table
-          :data="storeTable.data"
-          size="large"
-          v-loading="storeTable.loading"
-        >
-          <template #empty>
-            <span>{{ !storeTable.loading ? t('emptyData') : '' }}</span>
-          </template>
-          <el-table-column :label="t('storeInfo')" min-width="170" align="left">
-            <template #default="{ row }">
-              <div class="h-[50px] flex items-center">
-                <el-image
-                  class="w-[50px] h-[50px]"
-                  :src="img(row.store_logo)"
-                  fit="contain"
-                >
-                  <template #error>
-                    <div class="image-slot">
-                      <img
-                        class="w-[50px] h-[50px]"
-                        src="@/addon/shop/assets/store_default.png"
-                      />
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+            <div class="flex justify-between items-center">
+                <div class="detail-head !m-0">
+                    <div class="left" @click="router.push('/shop/order/delivery')">
+                        <span class="iconfont iconxiangzuojiantou !text-xs"></span>
+                        <span class="ml-[1px]">{{ t('returnToPreviousPage') }}</span>
                     </div>
-                  </template>
-                </el-image>
-                <p class="ml-[10px] text-[14px]">{{ row.store_name }}</p>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="store_mobile"
-            :label="t('storeMobile')"
-            min-width="120"
-          />
-          <el-table-column
-            prop="full_address"
-            :label="t('fullAddress')"
-            min-width="180"
-          />
-          <el-table-column
-            prop="trade_time"
-            :label="t('tradeTime')"
-            min-width="120"
-          />
-          <el-table-column :label="t('createTime')" min-width="120">
-            <template #default="{ row }">
-              {{ row.create_time || '' }}
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            :label="t('operation')"
-            fixed="right"
-            align="right"
-            min-width="120"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="editEvent(row)">{{
-                t('edit')
-              }}</el-button>
-              <el-button
-                type="primary"
-                link
-                @click="deleteEvent(row.store_id)"
-                >{{ t('delete') }}</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="storeTable.page"
-            v-model:page-size="storeTable.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="storeTable.total"
-            @size-change="loadStoreList()"
-            @current-change="loadStoreList"
-          />
-        </div>
-      </div>
-    </el-card>
-  </div>
+                    <span class="adorn">|</span>
+                    <span class="right">{{ pageName }}</span>
+                </div>
+                <el-button type="primary" @click="addEvent">
+                    {{ t('addStore') }}
+                </el-button>
+            </div>
+
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="storeTable.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('storeName')" prop="store_name">
+                        <el-input v-model.trim="storeTable.searchParam.store_name" :placeholder="t('storeNamePlaceholder')" />
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="loadStoreList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+
+            <div class="mt-[10px]">
+                <el-table :data="storeTable.data" size="large" v-loading="storeTable.loading">
+                    <template #empty>
+                        <span>{{ !storeTable.loading ? t('emptyData') : '' }}</span>
+                    </template>
+                    <el-table-column :label="t('storeInfo')" min-width="170" align="left">
+                        <template #default="{ row }">
+                            <div class="h-[50px] flex items-center">
+                                <el-image class="w-[50px] h-[50px] " :src="img(row.store_logo)" fit="contain">
+                                    <template #error>
+                                        <div class="image-slot">
+                                            <img class="w-[50px] h-[50px]" src="@/addon/shop/assets/store_default.png" />
+                                        </div>
+                                    </template>
+                                </el-image>
+                                <p class="ml-[10px] text-[14px]">{{ row.store_name }}</p>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="store_mobile" :label="t('storeMobile')" min-width="120" />
+                    <el-table-column prop="full_address" :label="t('fullAddress')" min-width="180" />
+                    <el-table-column prop="trade_time" :label="t('tradeTime')" min-width="120" />
+                    <el-table-column :label="t('createTime')" min-width="120">
+                        <template #default="{ row }">
+                            {{ row.create_time || '' }}
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column :label="t('operation')" fixed="right" align="right" min-width="120">
+                        <template #default="{ row }">
+                            <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+                            <el-button type="primary" link @click="deleteEvent(row.store_id)">{{ t('delete') }}</el-button>
+                        </template>
+                    </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="storeTable.page" v-model:page-size="storeTable.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="storeTable.total"
+                        @size-change="loadStoreList()" @current-change="loadStoreList" />
+                </div>
+            </div>
+
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -133,21 +81,21 @@ import { getStoreList, deleteStore } from '@/addon/shop/api/delivery'
 import { img } from '@/utils/common'
 import { ElMessageBox, FormInstance } from 'element-plus'
 import { useRouter, useRoute } from 'vue-router'
-import { setTablePageStorage, getTablePageStorage } from '@/utils/common'
+import { setTablePageStorage,getTablePageStorage } from "@/utils/common";
 
 const route = useRoute()
 const pageName = route.meta.title
 
 const storeTable = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    store_name: '',
-    create_time: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        store_name: '',
+        create_time: ''
+    }
 })
 
 const searchFormRef = ref<FormInstance>()
@@ -156,29 +104,23 @@ const searchFormRef = ref<FormInstance>()
  * 获取自提门店列表
  */
 const loadStoreList = (page: number = 1) => {
-  storeTable.loading = true
-  storeTable.page = page
-
-  getStoreList({
-    page: storeTable.page,
-    limit: storeTable.limit,
-    ...storeTable.searchParam,
-  })
-    .then((res) => {
-      storeTable.loading = false
-      storeTable.data = res.data.data
-      storeTable.total = res.data.total
-      setTablePageStorage(
-        storeTable.page,
-        storeTable.limit,
-        storeTable.searchParam
-      )
-    })
-    .catch(() => {
-      storeTable.loading = false
+    storeTable.loading = true
+    storeTable.page = page
+
+    getStoreList({
+        page: storeTable.page,
+        limit: storeTable.limit,
+        ...storeTable.searchParam
+    }).then(res => {
+        storeTable.loading = false
+        storeTable.data = res.data.data
+        storeTable.total = res.data.total
+        setTablePageStorage(storeTable.page, storeTable.limit, storeTable.searchParam);
+    }).catch(() => {
+        storeTable.loading = false
     })
 }
-loadStoreList(getTablePageStorage(storeTable.searchParam).page)
+loadStoreList(getTablePageStorage(storeTable.searchParam).page);
 
 const router = useRouter()
 
@@ -186,7 +128,7 @@ const router = useRouter()
  * 添加自提门店
  */
 const addEvent = () => {
-  router.push('/shop/order/delivery/store/edit')
+    router.push('/shop/order/delivery/store/edit')
 }
 
 /**
@@ -194,31 +136,33 @@ const addEvent = () => {
  * @param data
  */
 const editEvent = (data: any) => {
-  router.push('/shop/order/delivery/store/edit?id=' + data.store_id)
+    router.push('/shop/order/delivery/store/edit?id=' + data.store_id)
 }
 
 /**
  * 删除自提门店
  */
 const deleteEvent = (id: number) => {
-  ElMessageBox.confirm(t('storeDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    deleteStore(id)
-      .then(() => {
-        loadStoreList()
-      })
-      .catch(() => {})
-  })
+    ElMessageBox.confirm(t('storeDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        deleteStore(id).then(() => {
+            loadStoreList()
+        }).catch(() => {
+        })
+    })
 }
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadStoreList()
+    if (!formEl) return
+    formEl.resetFields()
+    loadStoreList()
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
diff --git a/admin/src/addon/shop/views/delivery/store_edit.vue b/admin/src/addon/shop/views/delivery/store_edit.vue
index cb9bb25c..76c0f635 100644
--- a/admin/src/addon/shop/views/delivery/store_edit.vue
+++ b/admin/src/addon/shop/views/delivery/store_edit.vue
@@ -1,136 +1,63 @@
 <template>
-  <div class="main-container">
-    <el-card class="card !border-none mb-[15px]" shadow="never">
-      <el-page-header
-        :content="id ? t('updateStore') : t('addStore')"
-        :icon="ArrowLeft"
-        @back="back"
-      />
-    </el-card>
-    <el-card class="box-card !border-none" shadow="never" v-loading="loading">
-      <el-form
-        :model="formData"
-        label-width="140px"
-        ref="formRef"
-        :rules="formRules"
-        class="page-form"
-      >
-        <el-form-item :label="t('storeName')" prop="store_name">
-          <el-input
-            v-model.trim="formData.store_name"
-            clearable
-            :placeholder="t('storeNamePlaceholder')"
-            class="input-width"
-          />
-        </el-form-item>
-        <el-form-item :label="t('storeDesc')">
-          <el-input
-            v-model.trim="formData.store_desc"
-            type="textarea"
-            rows="4"
-            clearable
-            :placeholder="t('storeDescPlaceholder')"
-            class="input-width"
-          />
-        </el-form-item>
-        <el-form-item :label="t('storeLogo')">
-          <upload-image v-model="formData.store_logo" />
-        </el-form-item>
-        <el-form-item :label="t('storeMobile')" prop="store_mobile">
-          <el-input
-            v-model.trim="formData.store_mobile"
-            clearable
-            :placeholder="t('storeMobilePlaceholder')"
-            class="input-width"
-            @keyup="filterNumber($event)"
-            @blur="formData.store_mobile = $event.target.value"
-          />
-        </el-form-item>
-        <el-form-item :label="t('tradeTime')" prop="trade_time">
-          <div>
-            <el-input
-              v-model.trim="formData.trade_time"
-              clearable
-              :placeholder="t('tradeTimePlaceholder')"
-              class="input-width"
-            />
-            <p class="text-[12px] text-[#999]">{{ t('tradeTimeTips') }}</p>
-          </div>
-        </el-form-item>
-        <el-form-item :label="t('storeAddress')" prop="address_area">
-          <el-select
-            v-model="formData.province_id"
-            value-key="id"
-            clearable
-            class="w-[200px]"
-            ref="provinceRef"
-          >
-            <el-option :label="t('provincePlaceholder')" :value="0" />
-            <el-option
-              v-for="(item, index) in areaList.province"
-              :key="index"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-          <el-select
-            v-model="formData.city_id"
-            value-key="id"
-            clearable
-            class="w-[200px] ml-3"
-            ref="cityRef"
-          >
-            <el-option :label="t('cityPlaceholder')" :value="0" />
-            <el-option
-              v-for="(item, index) in areaList.city"
-              :key="index"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-          <el-select
-            v-model="formData.district_id"
-            value-key="id"
-            clearable
-            class="w-[200px] ml-3"
-            ref="districtRef"
-          >
-            <el-option :label="t('districtPlaceholder')" :value="0" />
-            <el-option
-              v-for="(item, index) in areaList.district"
-              :key="index"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item prop="address">
-          <el-input
-            v-model.trim="formData.address"
-            clearable
-            :placeholder="t('addressPlaceholder')"
-            class="input-width"
-          />
-        </el-form-item>
-
-        <el-form-item>
-          <div
-            id="container"
-            class="w-[800px] h-[520px] relative"
-            v-loading="mapLoading"
-          ></div>
-        </el-form-item>
-      </el-form>
-    </el-card>
-    <div class="fixed-footer-wrap">
-      <div class="fixed-footer !z-[9999]">
-        <el-button type="primary" @click="onSave(formRef)">{{
-          t('save')
-        }}</el-button>
-        <el-button @click="back()">{{ t('cancel') }}</el-button>
-      </div>
+    <div class="main-container">
+        <el-card class="card !border-none mb-[15px]" shadow="never">
+            <el-page-header :content="id ? t('updateStore') : t('addStore')" :icon="ArrowLeft" @back="back" />
+        </el-card>
+        <el-card class="box-card !border-none" shadow="never" v-loading="loading">
+            <el-form :model="formData" label-width="140px" ref="formRef" :rules="formRules" class="page-form">
+                <el-form-item :label="t('storeName')" prop="store_name">
+                    <el-input v-model.trim="formData.store_name" clearable :placeholder="t('storeNamePlaceholder')"
+                              class="input-width" />
+                </el-form-item>
+                <el-form-item :label="t('storeDesc')">
+                    <el-input v-model.trim="formData.store_desc" type="textarea" rows="4" clearable
+                              :placeholder="t('storeDescPlaceholder')" class="input-width" />
+                </el-form-item>
+                <el-form-item :label="t('storeLogo')">
+                    <upload-image v-model="formData.store_logo" />
+                </el-form-item>
+                <el-form-item :label="t('storeMobile')" prop="store_mobile">
+                    <el-input v-model.trim="formData.store_mobile" clearable :placeholder="t('storeMobilePlaceholder')"
+                              class="input-width" @keyup="filterNumber($event)"
+                              @blur="formData.store_mobile = $event.target.value" />
+                </el-form-item>
+                <el-form-item :label="t('tradeTime')" prop="trade_time">
+                    <div>
+                        <el-input v-model.trim="formData.trade_time" clearable :placeholder="t('tradeTimePlaceholder')"
+                                  class="input-width" />
+                        <p class="text-[12px] text-[#999]">{{ t('tradeTimeTips') }}</p>
+                    </div>
+                </el-form-item>
+                <el-form-item :label="t('storeAddress')" prop="address_area">
+                    <el-select v-model="formData.province_id" value-key="id" clearable class="w-[200px]"  ref="provinceRef">
+                        <el-option :label="t('provincePlaceholder')" :value="0"/>
+                        <el-option v-for="(item, index) in areaList.province" :key="index" :label="item.name"  :value="item.id"/>
+                    </el-select>
+                    <el-select v-model="formData.city_id" value-key="id" clearable class="w-[200px] ml-3" ref="cityRef">
+                        <el-option :label="t('cityPlaceholder')" :value="0"/>
+                        <el-option v-for="(item, index) in areaList.city " :key="index" :label="item.name"  :value="item.id"/>
+                    </el-select>
+                    <el-select v-model="formData.district_id" value-key="id" clearable class="w-[200px] ml-3"  ref="districtRef">
+                        <el-option :label="t('districtPlaceholder')" :value="0"/>
+                        <el-option v-for="(item, index) in areaList.district " :key="index" :label="item.name"  :value="item.id"/>
+                    </el-select>
+                </el-form-item>
+                <el-form-item prop="address">
+                    <el-input v-model.trim="formData.address" clearable :placeholder="t('addressPlaceholder')"  class="input-width"/>
+                </el-form-item>
+
+                <el-form-item>
+                    <div id="container" class="w-[800px] h-[520px] relative" v-loading="mapLoading"></div>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <div class="fixed-footer-wrap">
+            <div class="fixed-footer !z-[9999]">
+                <el-button type="primary" @click="onSave(formRef)">{{ t('save') }}</el-button>
+                <el-button @click="back()">{{ t('cancel') }}</el-button>
+            </div>
+        </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
@@ -147,15 +74,15 @@ const route = useRoute()
 const id: number = parseInt(route.query.id as string)
 const loading = ref(false)
 const pageName = route.meta.title
-interface areaType {
-  province: any[]
-  city: any[]
-  district: any[]
+interface areaType{
+    province: any[],
+    city: any[],
+    district: any[]
 }
 const areaList = reactive<areaType>({
-  province: [],
-  city: [],
-  district: [],
+    province: [],
+    city: [],
+    district: []
 })
 const provinceRef = ref()
 const cityRef = ref()
@@ -164,26 +91,24 @@ const districtRef = ref()
 /**
  * 获取省
  */
-getAreaListByPid(0).then((res) => {
-  areaList.province = res.data
+getAreaListByPid(0).then(res => {
+    areaList.province = res.data
 })
 
 let mapKey: string = ''
 onMounted(() => {
-  const mapScript = document.createElement('script')
-  getMap().then((res) => {
-    mapKey = res.data.key
-    mapScript.type = 'text/javascript'
-    mapScript.src =
-      'https://map.qq.com/api/gljs?libraries=tools,service&v=1.exp&key=' +
-      res.data.key
-    document.body.appendChild(mapScript)
-  })
-  mapScript.onload = () => {
-    setTimeout(() => {
-      initMap()
-    }, 500)
-  }
+    const mapScript = document.createElement('script')
+    getMap().then(res => {
+        mapKey = res.data.key
+        mapScript.type = 'text/javascript'
+        mapScript.src = 'https://map.qq.com/api/gljs?libraries=tools,service&v=1.exp&key=' + res.data.key
+        document.body.appendChild(mapScript)
+    })
+    mapScript.onload = () => {
+        setTimeout(() => {
+            initMap()
+        }, 500)
+    }
 })
 
 /**
@@ -193,58 +118,56 @@ let map: any
 let marker: any
 const mapLoading = ref(true)
 const initMap = () => {
-  const TMap = (window as any).TMap
-  const LatLng = TMap.LatLng
-  const center = new LatLng(formData.latitude, formData.longitude)
-
-  map = new TMap.Map('container', {
-    center,
-    zoom: 14,
-  })
-
-  map.on('tilesloaded', () => {
-    mapLoading.value = false
-  })
-
-  marker = createMarker(map)
-
-  map.on('click', (evt: any) => {
-    map.setCenter(evt.latLng)
-    marker.updateGeometries({
-      id: 'center',
-      position: evt.latLng,
+    const TMap = (window as any).TMap
+    const LatLng = TMap.LatLng
+    const center = new LatLng(formData.latitude, formData.longitude)
+
+    map = new TMap.Map('container', {
+        center,
+        zoom: 14
+    })
+
+    map.on('tilesloaded', () => {
+        mapLoading.value = false
     })
-    latLngChange(evt.latLng.lat, evt.latLng.lng)
-  })
 
-  latLngChange(center.lat, center.lng)
+    marker = createMarker(map)
+
+    map.on('click', (evt: any) => {
+        map.setCenter(evt.latLng)
+        marker.updateGeometries({
+            id: 'center',
+            position: evt.latLng
+        })
+        latLngChange(evt.latLng.lat, evt.latLng.lng)
+    })
+
+    latLngChange(center.lat, center.lng)
 }
 
 const storeArea = reactive({
-  province_id: 0,
-  city_id: 0,
-  district_id: 0,
+    province_id: 0,
+    city_id: 0,
+    district_id: 0
 })
 
 const latLngChange = (lat: number, lng: number) => {
-  latLngToAddress({ mapKey, lat, lng })
-    .then(({ message, result }) => {
-      if (message == 'query ok' || message == 'Success') {
-        formData.latitude = result.location.lat
-        formData.longitude = result.location.lng
-        formData.address = result.formatted_addresses.recommend
-
-        getAreaByCode(result.ad_info.adcode).then(({ data }) => {
-          storeArea.province_id = data.province ? data.province.id : 0
-          storeArea.city_id = data.city ? data.city.id : 0
-          storeArea.district_id = data.district ? data.district.id : 0
-        })
-      } else {
-        console.error(message, result)
-      }
-    })
-    .catch((err) => {
-      console.log(err)
+    latLngToAddress({ mapKey, lat, lng }).then(({ message, result }) => {
+        if (message == 'query ok' || message == 'Success') {
+            formData.latitude = result.location.lat
+            formData.longitude = result.location.lng
+            formData.address = result.formatted_addresses.recommend
+
+            getAreaByCode(result.ad_info.adcode).then(({ data }) => {
+                storeArea.province_id = data.province ? data.province.id : 0
+                storeArea.city_id = data.city ? data.city.id : 0
+                storeArea.district_id = data.district ? data.district.id : 0
+            })
+        } else {
+            console.error(message, result)
+        }
+    }).catch(err => {
+        console.log(err)
     })
 }
 
@@ -252,34 +175,34 @@ const latLngChange = (lat: number, lng: number) => {
  * 表单数据
  */
 const initialFormData = {
-  store_id: 0,
-  store_name: '',
-  store_desc: '',
-  store_logo: '',
-  store_mobile: '',
-  province_id: 0,
-  province_name: '',
-  city_id: 0,
-  city_name: '',
-  district_id: 0,
-  district_name: '',
-  address: '',
-  full_address: '',
-  longitude: 116.39719,
-  latitude: 39.908626,
-  trade_time: '',
+    store_id: 0,
+    store_name: '',
+    store_desc: '',
+    store_logo: '',
+    store_mobile: '',
+    province_id: 0,
+    province_name: '',
+    city_id: 0,
+    city_name: '',
+    district_id: 0,
+    district_name: '',
+    address: '',
+    full_address: '',
+    longitude: 116.397190,
+    latitude: 39.908626,
+    trade_time: ''
 }
 
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
 const setFormData = async (id: number = 0) => {
-  loading.value = true
-  Object.assign(formData, initialFormData)
-  const data = await (await getStoreInfo(id)).data
-  Object.keys(formData).forEach((key: string) => {
-    if (data[key] != undefined) formData[key] = data[key]
-  })
-  loading.value = false
+    loading.value = true
+    Object.assign(formData, initialFormData)
+    const data = await (await getStoreInfo(id)).data
+    Object.keys(formData).forEach((key: string) => {
+        if (data[key] != undefined) formData[key] = data[key]
+    })
+    loading.value = false
 }
 if (id) setFormData(id)
 
@@ -287,229 +210,198 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    store_name: [
-      { required: true, message: t('storeNamePlaceholder'), trigger: 'blur' },
-    ],
-    store_logo: [
-      { required: true, message: t('storeLogoPlaceholder'), trigger: 'blur' },
-    ],
-    store_mobile: [
-      { required: true, message: t('storeMobilePlaceholder'), trigger: 'blur' },
-    ],
-    trade_time: [
-      { required: true, message: t('tradeTimePlaceholder'), trigger: 'blur' },
-    ],
-    address_area: [
-      {
-        validator: (rule: any, value: any, callback: any) => {
-          if (!formData.province_id) {
-            callback(new Error(t('provincePlaceholder')))
-          }
-          if (!formData.city_id) {
-            callback(new Error(t('cityPlaceholder')))
-          }
-          if (areaList.district.length && !formData.district_id) {
-            callback(new Error(t('districtPlaceholder')))
-          }
-          callback()
-        },
-      },
-    ],
-    address: [
-      { required: true, message: t('addressPlaceholder'), trigger: 'blur' },
-    ],
-  }
+    return {
+        store_name: [
+            { required: true, message: t('storeNamePlaceholder'), trigger: 'blur' }
+        ],
+        store_logo: [
+            { required: true, message: t('storeLogoPlaceholder'), trigger: 'blur' }
+        ],
+        store_mobile: [
+            { required: true, message: t('storeMobilePlaceholder'), trigger: 'blur' }
+        ],
+        trade_time: [
+            { required: true, message: t('tradeTimePlaceholder'), trigger: 'blur' }
+        ],
+        address_area: [
+            {
+                validator: (rule: any, value: any, callback: any) => {
+                    if (!formData.province_id) {
+                        callback(new Error(t('provincePlaceholder')))
+                    }
+                    if (!formData.city_id) {
+                        callback(new Error(t('cityPlaceholder')))
+                    }
+                    if (areaList.district.length && !formData.district_id) {
+                        callback(new Error(t('districtPlaceholder')))
+                    }
+                    callback()
+                }
+            }
+        ],
+        address: [
+            { required: true, message: t('addressPlaceholder'), trigger: 'blur' }
+        ]
+    }
 })
 
 /**
  * 获取市
  */
-watch(
-  () => formData.province_id,
-  (nval) => {
+watch(() => formData.province_id, (nval) => {
     if (nval) {
-      getAreaListByPid(formData.province_id).then((res) => {
-        areaList.city = res.data
-
-        const cityId = formData.city_id
-        if (cityId) {
-          let isExist = false
-          for (let i = 0; i < res.data.length; i++) {
-            if (cityId == res.data[i].id) {
-              isExist = true
-              break
+        getAreaListByPid(formData.province_id).then(res => {
+            areaList.city = res.data
+
+            const cityId = formData.city_id
+            if (cityId) {
+                let isExist = false
+                for (let i = 0; i < res.data.length; i++) {
+                    if (cityId == res.data[i].id) {
+                        isExist = true
+                        break
+                    }
+                }
+                if (isExist) {
+                    formData.city_id = cityId
+                    return
+                }
             }
-          }
-          if (isExist) {
-            formData.city_id = cityId
-            return
-          }
-        }
-        formData.city_id = 0
-        areaChange()
-      })
+            formData.city_id = 0
+            areaChange()
+        })
     } else {
-      formData.city_id = 0
+        formData.city_id = 0
     }
-  }
-)
+})
 
 /**
  * 获取区
  */
-watch(
-  () => formData.city_id,
-  (nval) => {
+watch(() => formData.city_id, (nval) => {
     if (nval) {
-      getAreaListByPid(formData.city_id).then((res) => {
-        areaList.district = res.data
-
-        const districtId = formData.district_id
-        if (districtId) {
-          let isExist = false
-          for (let i = 0; i < res.data.length; i++) {
-            if (districtId == res.data[i].id) {
-              isExist = true
-              break
+        getAreaListByPid(formData.city_id).then(res => {
+            areaList.district = res.data
+
+            const districtId = formData.district_id
+            if (districtId) {
+                let isExist = false
+                for (let i = 0; i < res.data.length; i++) {
+                    if (districtId == res.data[i].id) {
+                        isExist = true
+                        break
+                    }
+                }
+                if (isExist) {
+                    formData.district_id = districtId
+                    return
+                }
             }
-          }
-          if (isExist) {
-            formData.district_id = districtId
-            return
-          }
-        }
-        areaChange()
-        formData.district_id = 0
-      })
+            areaChange()
+            formData.district_id = 0
+        })
     } else {
-      formData.district_id = 0
+        formData.district_id = 0
     }
-  }
-)
+})
 
-watch(
-  () => formData.district_id,
-  (nval) => {
+watch(() => formData.district_id, (nval) => {
     if (nval) {
-      areaChange()
+        areaChange()
     }
-  }
-)
+})
 
 const areaChange = debounce(() => {
-  setTimeout(() => {
-    const address = [
-      formData.province_id ? provinceRef.value.states.selectedLabel : '',
-      formData.city_id ? cityRef.value.states.selectedLabel : '',
-      formData.district_id ? districtRef.value.states.selectedLabel : '',
-    ]
-
-    addressToLatLng({ mapKey, address: address.join('') }).then(
-      ({ message, result }) => {
-        if (message == 'Success' || message == 'query ok') {
-          const latLng = new (window as any).TMap.LatLng(
-            result.location.lat,
-            result.location.lng
-          )
-          map.setCenter(latLng)
-          marker.updateGeometries({
-            id: 'center',
-            position: latLng,
-          })
-          formData.latitude = result.location.lat
-          formData.longitude = result.location.lng
-        } else {
-          console.error(message, result)
-        }
-      }
-    )
-  }, 500)
+    setTimeout(() => {
+        const address = [
+            formData.province_id ? provinceRef.value.states.selectedLabel : '',
+            formData.city_id ? cityRef.value.states.selectedLabel : '',
+            formData.district_id ? districtRef.value.states.selectedLabel : ''
+        ]
+
+        addressToLatLng({ mapKey, address: address.join('') }).then(({ message, result }) => {
+            if (message == 'Success' || message == 'query ok') {
+                const latLng = new (window as any).TMap.LatLng(result.location.lat, result.location.lng)
+                map.setCenter(latLng)
+                marker.updateGeometries({
+                    id: 'center',
+                    position: latLng
+                })
+                formData.latitude = result.location.lat
+                formData.longitude = result.location.lng
+            } else {
+                console.error(message, result)
+            }
+        })
+    }, 500)
 }, 500)
 
 /**
  * 地图点选获取市
  */
-watch(
-  () => storeArea.province_id,
-  (nval) => {
+watch(() => storeArea.province_id, (nval) => {
     if (nval) {
-      getAreaListByPid(storeArea.province_id).then((res) => {
-        areaList.city = res.data
-        formData.province_id = storeArea.province_id
-        formData.city_id = storeArea.city_id
-      })
+        getAreaListByPid(storeArea.province_id).then(res => {
+            areaList.city = res.data
+            formData.province_id = storeArea.province_id
+            formData.city_id = storeArea.city_id
+        })
     }
-  }
-)
+})
 
 /**
  * 地图点选获取区
  */
-watch(
-  () => storeArea.city_id,
-  (nval) => {
+watch(() => storeArea.city_id, (nval) => {
     if (nval) {
-      getAreaListByPid(storeArea.city_id).then((res) => {
-        areaList.district = res.data
-        formData.city_id = storeArea.city_id
-        formData.district_id = storeArea.district_id
-      })
+        getAreaListByPid(storeArea.city_id).then(res => {
+            areaList.district = res.data
+            formData.city_id = storeArea.city_id
+            formData.district_id = storeArea.district_id
+        })
     }
-  }
-)
+})
 
 /**
  * 地图点选获取区
  */
-watch(
-  () => storeArea.district_id,
-  (nval) => {
+watch(() => storeArea.district_id, (nval) => {
     if (nval) {
-      formData.district_id = storeArea.district_id
+        formData.district_id = storeArea.district_id
     }
-  }
-)
+})
 
 const onSave = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-
-      const data = formData
-      ;(formData.province_name = formData.province_id
-        ? provinceRef.value.states.selectedLabel
-        : ''),
-        (formData.city_name = formData.city_id
-          ? cityRef.value.states.selectedLabel
-          : ''),
-        (formData.district_name = formData.district_id
-          ? districtRef.value.states.selectedLabel
-          : '')
-      const address = [
-        data.province_id ? provinceRef.value.states.selectedLabel : '',
-        data.city_id ? cityRef.value.states.selectedLabel : '',
-        data.district_id ? districtRef.value.states.selectedLabel : '',
-        data.address,
-      ]
-      data.full_address = address.join('')
-
-      const save = id ? editStore : addStore
-      save(data)
-        .then((res) => {
-          loading.value = false
-          history.back()
-        })
-        .catch(() => {
-          loading.value = false
-        })
-    }
-  })
+    if (loading.value || !formEl) return
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            const data = formData
+            formData.province_name = formData.province_id ? provinceRef.value.states.selectedLabel : '',
+                formData.city_name = formData.city_id ? cityRef.value.states.selectedLabel : '',
+                formData.district_name = formData.district_id ? districtRef.value.states.selectedLabel : ''
+            const address = [
+                data.province_id ? provinceRef.value.states.selectedLabel : '',
+                data.city_id ? cityRef.value.states.selectedLabel : '',
+                data.district_id ? districtRef.value.states.selectedLabel : '',
+                data.address
+            ]
+            data.full_address = address.join('')
+
+            const save = id ? editStore : addStore
+            save(data).then(res => {
+                loading.value = false
+                history.back()
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
 }
 
 const back = () => {
-  history.back()
+    history.back()
 }
 </script>
 
diff --git a/admin/src/addon/shop/views/delivery/template.vue b/admin/src/addon/shop/views/delivery/template.vue
index 166648c8..31e450d7 100644
--- a/admin/src/addon/shop/views/delivery/template.vue
+++ b/admin/src/addon/shop/views/delivery/template.vue
@@ -1,137 +1,84 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <div class="detail-head !m-0">
-          <div class="left" @click="router.push('/shop/order/delivery')">
-            <span class="iconfont iconxiangzuojiantou !text-xs"></span>
-            <span class="ml-[1px]">{{ t('returnToPreviousPage') }}</span>
-          </div>
-          <span class="adorn">|</span>
-          <span class="right">{{ pageName }}</span>
-        </div>
-        <el-button type="primary" @click="addEvent">
-          {{ t('addTemplate') }}
-        </el-button>
-      </div>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
 
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="templateTable.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('templateName')" prop="template_name">
-            <el-input
-              v-model.trim="templateTable.searchParam.template_name"
-              :placeholder="t('templateNamePlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="loadTemplateList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
+            <div class="flex justify-between items-center">
+                <div class="detail-head !m-0">
+                    <div class="left" @click="router.push('/shop/order/delivery')">
+                        <span class="iconfont iconxiangzuojiantou !text-xs"></span>
+                        <span class="ml-[1px]">{{ t('returnToPreviousPage') }}</span>
+                    </div>
+                    <span class="adorn">|</span>
+                    <span class="right">{{ pageName }}</span>
+                </div>
+                <el-button type="primary" @click="addEvent">
+                    {{ t('addTemplate') }}
+                </el-button>
+            </div>
 
-      <div class="mt-[10px]">
-        <el-table
-          :data="templateTable.data"
-          size="large"
-          v-loading="templateTable.loading"
-        >
-          <template #empty>
-            <span>{{ !templateTable.loading ? t('emptyData') : '' }}</span>
-          </template>
-          <el-table-column
-            prop="template_name"
-            :label="t('templateName')"
-            min-width="120"
-          />
-          <el-table-column
-            prop="fee_type_name"
-            :label="t('feeTypeName')"
-            min-width="120"
-          />
-          <el-table-column
-            :label="t('freeShipping')"
-            min-width="120"
-            align="center"
-          >
-            <template #default="{ row }">
-              {{ row.is_free_shipping ? t('open') : t('close') }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="create_time"
-            :label="t('createTime')"
-            min-width="120"
-          />
-          <el-table-column
-            :label="t('operation')"
-            fixed="right"
-            min-width="120"
-            align="right"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="editEvent(row)">{{
-                t('edit')
-              }}</el-button>
-              <el-button
-                type="primary"
-                link
-                @click="deleteEvent(row.template_id)"
-                >{{ t('delete') }}</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="templateTable.page"
-            v-model:page-size="templateTable.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="templateTable.total"
-            @size-change="loadTemplateList()"
-            @current-change="loadTemplateList"
-          />
-        </div>
-      </div>
-    </el-card>
-  </div>
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="templateTable.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('templateName')" prop="template_name">
+                        <el-input v-model.trim="templateTable.searchParam.template_name" :placeholder="t('templateNamePlaceholder')" />
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="loadTemplateList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+
+            <div class="mt-[10px]">
+                <el-table :data="templateTable.data" size="large" v-loading="templateTable.loading">
+                    <template #empty>
+                        <span>{{ !templateTable.loading ? t('emptyData') : '' }}</span>
+                    </template>
+                    <el-table-column prop="template_name" :label="t('templateName')" min-width="120" />
+                    <el-table-column prop="fee_type_name" :label="t('feeTypeName')" min-width="120" />
+                    <el-table-column :label="t('freeShipping')" min-width="120" align="center">
+                        <template #default="{ row }">
+                            {{ row.is_free_shipping ? t('open') : t('close') }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="create_time" :label="t('createTime')" min-width="120" />
+                    <el-table-column :label="t('operation')" fixed="right" min-width="120" align="right">
+                        <template #default="{ row }">
+                            <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+                            <el-button type="primary" link @click="deleteEvent(row.template_id)">{{ t('delete') }}</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="templateTable.page" v-model:page-size="templateTable.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="templateTable.total"
+                        @size-change="loadTemplateList()" @current-change="loadTemplateList" />
+                </div>
+            </div>
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
 import { t } from '@/lang'
-import {
-  getShippingTemplatePageList,
-  deleteShippingTemplate,
-} from '@/addon/shop/api/delivery'
+import { getShippingTemplatePageList, deleteShippingTemplate } from '@/addon/shop/api/delivery'
 import { ElMessageBox, FormInstance } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
-import { setTablePageStorage, getTablePageStorage } from '@/utils/common'
+import { setTablePageStorage,getTablePageStorage } from "@/utils/common";
 
 const route = useRoute()
 const router = useRouter()
 const pageName = route.meta.title
 
 const templateTable = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    template_name: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        template_name: ''
+    }
 })
 
 const searchFormRef = ref<FormInstance>()
@@ -140,35 +87,29 @@ const searchFormRef = ref<FormInstance>()
  * 获取运费模板列表
  */
 const loadTemplateList = (page: number = 1) => {
-  templateTable.loading = true
-  templateTable.page = page
+    templateTable.loading = true
+    templateTable.page = page
 
-  getShippingTemplatePageList({
-    page: templateTable.page,
-    limit: templateTable.limit,
-    ...templateTable.searchParam,
-  })
-    .then((res) => {
-      templateTable.loading = false
-      templateTable.data = res.data.data
-      templateTable.total = res.data.total
-      setTablePageStorage(
-        templateTable.page,
-        templateTable.limit,
-        templateTable.searchParam
-      )
-    })
-    .catch(() => {
-      templateTable.loading = false
+    getShippingTemplatePageList({
+        page: templateTable.page,
+        limit: templateTable.limit,
+        ...templateTable.searchParam
+    }).then(res => {
+        templateTable.loading = false
+        templateTable.data = res.data.data
+        templateTable.total = res.data.total
+        setTablePageStorage(templateTable.page, templateTable.limit, templateTable.searchParam);
+    }).catch(() => {
+        templateTable.loading = false
     })
 }
-loadTemplateList(getTablePageStorage(templateTable.searchParam).page)
+loadTemplateList(getTablePageStorage(templateTable.searchParam).page);
 
 /**
  * 添加运费模板
  */
 const addEvent = () => {
-  router.push({ path: '/shop/order/shipping/template_edit' })
+    router.push({ path: '/shop/order/shipping/template_edit' })
 }
 
 /**
@@ -176,34 +117,33 @@ const addEvent = () => {
  * @param data
  */
 const editEvent = (data: any) => {
-  router.push({
-    path: '/shop/order/shipping/template_edit',
-    query: { id: data.template_id },
-  })
+    router.push({ path: '/shop/order/shipping/template_edit', query: { id: data.template_id } })
 }
 
 /**
  * 删除运费模板
  */
 const deleteEvent = (id: number) => {
-  ElMessageBox.confirm(t('templateDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    deleteShippingTemplate(id)
-      .then(() => {
-        loadTemplateList()
-      })
-      .catch(() => {})
-  })
+    ElMessageBox.confirm(t('templateDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        deleteShippingTemplate(id).then(() => {
+            loadTemplateList()
+        }).catch(() => {
+        })
+    })
 }
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadTemplateList()
+    if (!formEl) return
+    formEl.resetFields()
+    loadTemplateList()
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
diff --git a/admin/src/addon/shop/views/delivery/template_edit.vue b/admin/src/addon/shop/views/delivery/template_edit.vue
index 1e92ff86..6209cd5e 100644
--- a/admin/src/addon/shop/views/delivery/template_edit.vue
+++ b/admin/src/addon/shop/views/delivery/template_edit.vue
@@ -1,286 +1,149 @@
 <template>
-  <div class="main-container">
-    <el-card class="card !border-none mb-[15px]" shadow="never">
-      <el-page-header :content="pageName" :icon="ArrowLeft" @back="back" />
-    </el-card>
-
-    <el-card class="box-card !border-none" shadow="never">
-      <el-form
-        :model="formData"
-        label-width="120px"
-        ref="formRef"
-        :rules="formRules"
-        class="page-form"
-        v-loading="loading"
-      >
-        <el-form-item :label="t('templateName')" prop="template_name">
-          <el-input
-            v-model.trim="formData.template_name"
-            clearable
-            :placeholder="t('templateNamePlaceholder')"
-            class="input-width"
-            maxlength="60"
-          />
-        </el-form-item>
-        <el-form-item :label="t('feeTypeName')" prop="fee_type">
-          <el-radio-group v-model="formData.fee_type">
-            <el-radio label="num" size="large">{{ t('num') }}</el-radio>
-            <el-radio label="weight" size="large">{{ t('weight') }}</el-radio>
-            <el-radio label="volume" size="large">{{ t('volume') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item :label="t('feeSetting')" prop="fee_data">
-          <el-table :data="feeData" style="width: 100%" size="default">
-            <el-table-column :label="t('deliveryArea')">
-              <template #default="{ row, $index }">
-                <div class="area-input">
-                  <span
-                    v-if="$index"
-                    @click="selectArea('fee', $index)"
-                    class="cursor-pointer"
-                    >{{
-                      row.fee_area_names
-                        ? row.fee_area_names
-                        : t('areaPlaceholder')
-                    }}</span
-                  >
-                  <span v-else>{{
-                    row.fee_area_names
-                      ? row.fee_area_names
-                      : t('areaPlaceholder')
-                  }}</span>
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column :label="feeLabel.first">
-              <template #default="{ $index }">
-                <el-input
-                  v-model.trim="feeData[$index].snum"
-                  maxlength="8"
-                  @keyup="filterDigit($event)"
-                  @blur="feeData[$index].snum = $event.target.value"
-                />
-              </template>
-            </el-table-column>
-            <el-table-column :label="t('fee')">
-              <template #default="{ $index }">
-                <el-input
-                  v-model.trim="feeData[$index].sprice"
-                  maxlength="8"
-                  @keyup="filterDigit($event)"
-                  @blur="feeData[$index].sprice = $event.target.value"
-                />
-              </template>
-            </el-table-column>
-            <el-table-column :label="feeLabel.continue">
-              <template #default="{ $index }">
-                <el-input
-                  v-model.trim="feeData[$index].xnum"
-                  maxlength="8"
-                  @keyup="filterDigit($event)"
-                  @blur="feeData[$index].xnum = $event.target.value"
-                />
-              </template>
-            </el-table-column>
-            <el-table-column :label="t('continueFee')">
-              <template #default="{ $index }">
-                <el-input
-                  v-model.trim="feeData[$index].xprice"
-                  @keyup="filterDigit($event)"
-                  maxlength="8"
-                  @blur="feeData[$index].xprice = $event.target.value"
-                />
-              </template>
-            </el-table-column>
-            <el-table-column :label="t('operation')" align="right" width="150">
-              <template #default="{ $index }">
-                <el-button
-                  type="primary"
-                  @click="delArea('fee', $index)"
-                  link
-                  v-if="$index"
-                  >{{ t('delete') }}</el-button
-                >
-              </template>
-            </el-table-column>
-          </el-table>
-          <div class="mt-[10px]">
-            <el-button type="primary" @click="addArea('fee')">{{
-              t('addDeliveryArea')
-            }}</el-button>
-          </div>
-        </el-form-item>
-        <!-- 指定区域包邮 -->
-        <el-form-item :label="t('freeShipping')" prop="is_free_shipping">
-          <el-switch
-            v-model="formData.is_free_shipping"
-            size="small"
-            :inactive-value="0"
-            :active-value="1"
-          />
-        </el-form-item>
-        <el-form-item
-          v-show="formData.is_free_shipping"
-          prop="free_shipping_data"
-        >
-          <el-table :data="freeShippingData" style="width: 100%" size="default">
-            <el-table-column :label="t('freeShippingArea')">
-              <template #default="{ row, $index }">
-                <div class="area-input">
-                  <el-input
-                    v-model.trim="row.free_shipping_area_names"
-                    :placeholder="t('areaPlaceholder')"
-                    readonly
-                    @click="selectArea('free_shipping', $index)"
-                  />
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column :label="freeShippingLabel">
-              <template #default="{ $index }">
-                <el-input
-                  v-model.trim="freeShippingData[$index].free_shipping_num"
-                  @keyup="filterDigit($event)"
-                  maxlength="8"
-                  @blur="
-                    freeShippingData[$index].free_shipping_num =
-                      $event.target.value
-                  "
-                />
-              </template>
-            </el-table-column>
-            <el-table-column :label="t('freeShippingPrice')">
-              <template #default="{ $index }">
-                <el-input
-                  v-model.trim="freeShippingData[$index].free_shipping_price"
-                  @keyup="filterDigit($event)"
-                  maxlength="8"
-                  @blur="
-                    freeShippingData[$index].free_shipping_price =
-                      $event.target.value
-                  "
-                />
-              </template>
-            </el-table-column>
-            <el-table-column :label="t('operation')" align="right" width="150">
-              <template #default="{ $index }">
-                <el-button
-                  type="primary"
-                  @click="delArea('free_shipping', $index)"
-                  link
-                  >{{ t('delete') }}</el-button
-                >
-              </template>
-            </el-table-column>
-          </el-table>
-          <div class="form-tip">{{ t('freeShippingAreaTips') }}</div>
-          <div class="mt-[10px]">
-            <el-button type="primary" @click="addArea('free_shipping')">{{
-              t('addFreeShippingArea')
-            }}</el-button>
-          </div>
-        </el-form-item>
-        <!-- 指定区域不配送 -->
-        <el-form-item :label="t('noDelivery')" prop="no_delivery">
-          <el-switch
-            v-model="formData.no_delivery"
-            size="small"
-            :inactive-value="0"
-            :active-value="1"
-          />
-        </el-form-item>
-        <el-form-item v-show="formData.no_delivery" prop="no_delivery_data">
-          <el-table :data="noDeliveryData" style="width: 100%" size="default">
-            <el-table-column :label="t('noDelivery')">
-              <template #default="{ row, $index }">
-                <div class="area-input">
-                  <el-input
-                    v-model.trim="row.no_delivery_area_names"
-                    readonly
-                    @click="selectArea('no_delivery', $index)"
-                    :placeholder="t('areaPlaceholder')"
-                  />
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column :label="t('operation')" align="right" width="150">
-              <template #default="{ $index }">
-                <el-button
-                  type="primary"
-                  @click="delArea('no_delivery', $index)"
-                  link
-                  >{{ t('delete') }}</el-button
-                >
-              </template>
-            </el-table-column>
-          </el-table>
-          <div class="mt-[10px]">
-            <el-button type="primary" @click="addArea('no_delivery')">{{
-              t('addNoDelivery')
-            }}</el-button>
-          </div>
-        </el-form-item>
-      </el-form>
-    </el-card>
-    <div class="fixed-footer-wrap">
-      <div class="fixed-footer">
-        <el-button
-          type="primary"
-          @click="onSave(formRef)"
-          :disabled="loading"
-          >{{ t('save') }}</el-button
-        >
-        <el-button @click="back()">{{ t('cancel') }}</el-button>
-      </div>
+    <div class="main-container">
+        <el-card class="card !border-none mb-[15px]" shadow="never">
+            <el-page-header :content="pageName" :icon="ArrowLeft" @back="back" />
+        </el-card>
+        
+        <el-card class="box-card !border-none" shadow="never">
+            <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('templateName')" prop="template_name">
+                    <el-input v-model.trim="formData.template_name" clearable :placeholder="t('templateNamePlaceholder')" class="input-width" maxlength="60" />
+                </el-form-item>
+                <el-form-item :label="t('feeTypeName')" prop="fee_type">
+                    <el-radio-group v-model="formData.fee_type">
+                        <el-radio label="num" size="large">{{ t('num') }}</el-radio>
+                        <el-radio label="weight" size="large">{{ t('weight') }}</el-radio>
+                        <el-radio label="volume" size="large">{{ t('volume') }}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item :label="t('feeSetting')" prop="fee_data">
+                    <el-table :data="feeData" style="width: 100%" size="default">
+                        <el-table-column :label="t('deliveryArea')">
+                            <template #default="{ row, $index }">
+                                <div class="area-input">
+                                    <span v-if="$index" @click="selectArea('fee', $index)" class="cursor-pointer">{{ row.fee_area_names ? row.fee_area_names : t('areaPlaceholder') }}</span>
+                                    <span v-else>{{ row.fee_area_names ? row.fee_area_names : t('areaPlaceholder') }}</span>
+                                </div>
+                            </template>
+                        </el-table-column>
+                        <el-table-column :label="feeLabel.first">
+                            <template #default="{ $index }">
+                                <el-input v-model.trim="feeData[$index].snum"  maxlength="8"  @keyup="filterDigit($event)" @blur="feeData[$index].snum = $event.target.value"/>
+                            </template>
+                        </el-table-column>
+                        <el-table-column :label="t('fee')">
+                            <template #default="{ $index }">
+                                <el-input v-model.trim="feeData[$index].sprice"  maxlength="8" @keyup="filterDigit($event)" @blur="feeData[$index].sprice = $event.target.value"/>
+                            </template>
+                        </el-table-column>
+                        <el-table-column :label="feeLabel.continue">
+                            <template #default="{ $index }">
+                                <el-input v-model.trim="feeData[$index].xnum" maxlength="8" @keyup="filterDigit($event)" @blur="feeData[$index].xnum = $event.target.value"/>
+                            </template>
+                        </el-table-column>
+                        <el-table-column :label="t('continueFee')">
+                            <template #default="{ $index }">
+                                <el-input v-model.trim="feeData[$index].xprice" @keyup="filterDigit($event)"  maxlength="8"  @blur="feeData[$index].xprice = $event.target.value"/>
+                            </template>
+                        </el-table-column>
+                        <el-table-column :label="t('operation')" align="right" width="150">
+                            <template #default="{ $index }">
+                                <el-button type="primary" @click="delArea('fee', $index)" link v-if="$index">{{ t('delete') }}</el-button>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                    <div class="mt-[10px]">
+                        <el-button type="primary" @click="addArea('fee')">{{ t('addDeliveryArea') }}</el-button>
+                    </div>
+                </el-form-item>
+                <!-- 指定区域包邮 -->
+                <el-form-item :label="t('freeShipping')" prop="is_free_shipping">
+                    <el-switch v-model="formData.is_free_shipping" size="small" :inactive-value="0" :active-value="1" />
+                </el-form-item>
+                <el-form-item v-show="formData.is_free_shipping" prop="free_shipping_data">
+                    <el-table :data="freeShippingData" style="width: 100%" size="default">
+                        <el-table-column :label="t('freeShippingArea')">
+                            <template #default="{ row, $index }">
+                                <div class="area-input">
+                                    <el-input v-model.trim="row.free_shipping_area_names" :placeholder="t('areaPlaceholder')" readonly @click="selectArea('free_shipping', $index)" />
+                                </div>
+                            </template>
+                        </el-table-column>
+                        <el-table-column :label="freeShippingLabel">
+                            <template #default="{ $index }">
+                                <el-input v-model.trim="freeShippingData[$index].free_shipping_num" @keyup="filterDigit($event)"  maxlength="8" @blur="freeShippingData[$index].free_shipping_num = $event.target.value"/>
+                            </template>
+                        </el-table-column>
+                        <el-table-column :label="t('freeShippingPrice')">
+                            <template #default="{ $index }">
+                                <el-input v-model.trim="freeShippingData[$index].free_shipping_price"  @keyup="filterDigit($event)"  maxlength="8"  @blur="freeShippingData[$index].free_shipping_price = $event.target.value"/>
+                            </template>
+                        </el-table-column>
+                        <el-table-column :label="t('operation')" align="right" width="150">
+                            <template #default="{ $index }">
+                                <el-button type="primary" @click="delArea('free_shipping', $index)" link>{{ t('delete') }}</el-button>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                    <div class="form-tip">{{ t('freeShippingAreaTips') }}</div>
+                    <div class="mt-[10px]">
+                        <el-button type="primary" @click="addArea('free_shipping')">{{ t('addFreeShippingArea') }}</el-button>
+                    </div>
+                </el-form-item>
+                <!-- 指定区域不配送 -->
+                <el-form-item :label="t('noDelivery')" prop="no_delivery">
+                    <el-switch v-model="formData.no_delivery" size="small" :inactive-value="0" :active-value="1" />
+                </el-form-item>
+                <el-form-item v-show="formData.no_delivery" prop="no_delivery_data">
+                    <el-table :data="noDeliveryData" style="width: 100%" size="default">
+                        <el-table-column :label="t('noDelivery')">
+                            <template #default="{ row, $index }">
+                                <div class="area-input">
+                                    <el-input v-model.trim="row.no_delivery_area_names" readonly @click="selectArea('no_delivery', $index)" :placeholder="t('areaPlaceholder')" />
+                                </div>
+                            </template>
+                        </el-table-column>
+                        <el-table-column :label="t('operation')" align="right" width="150">
+                            <template #default="{ $index }">
+                                <el-button type="primary" @click="delArea('no_delivery', $index)" link>{{ t('delete') }}</el-button>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                    <div class="mt-[10px]">
+                        <el-button type="primary" @click="addArea('no_delivery')">{{ t('addNoDelivery') }}</el-button>
+                    </div>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <div class="fixed-footer-wrap">
+            <div class="fixed-footer">
+                <el-button type="primary" @click="onSave(formRef)" :disabled="loading">{{ t('save') }}</el-button>
+                <el-button @click="back()">{{ t('cancel') }}</el-button>
+            </div>
+        </div>
     </div>
-  </div>
-
-  <!-- 选择地区弹窗 -->
-  <el-dialog
-    v-model="showSelectAreaDialog"
-    :title="t('selectArea')"
-    width="80%"
-    class="diy-dialog-wrap"
-    :destroy-on-close="true"
-    @opened="showSelectOpened"
-  >
-    <el-scrollbar height="50vh">
-      <el-tree
-        :data="areaTreeData"
-        :props="{ children: 'child', label: 'name' }"
-        default-expand-all
-        show-checkbox
-        ref="areaTreeRef"
-        :default-checked-keys="selectedArea"
-        node-key="id"
-      />
-    </el-scrollbar>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showSelectAreaDialog = false">{{
-          t('cancel')
-        }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirmSelectArea"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+
+    <!-- 选择地区弹窗 -->
+    <el-dialog v-model="showSelectAreaDialog" :title="t('selectArea')" width="80%" class="diy-dialog-wrap" :destroy-on-close="true" @opened="showSelectOpened">
+
+        <el-scrollbar height="50vh">
+            <el-tree :data="areaTreeData" :props="{ children: 'child', label: 'name' }" default-expand-all show-checkbox ref="areaTreeRef" :default-checked-keys="selectedArea" node-key="id" />
+        </el-scrollbar>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showSelectAreaDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirmSelectArea">{{ t('confirm') }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
 import { ref, reactive, computed } from 'vue'
 import { t } from '@/lang'
 import { ElTree, FormInstance, ElMessage } from 'element-plus'
-import {
-  addShippingTemplate,
-  editShippingTemplate,
-  getShippingTemplateInfo,
-} from '@/addon/shop/api/delivery'
+import { addShippingTemplate, editShippingTemplate, getShippingTemplateInfo } from '@/addon/shop/api/delivery'
 import { AnyObject } from '@/types/global'
 import { useRoute, useRouter } from 'vue-router'
 import { getAreatree } from '@/app/api/sys'
@@ -295,15 +158,15 @@ const loading = ref(false)
  * 表单数据
  */
 const initialFormData = {
-  template_id: '',
-  template_name: '',
-  fee_type: 'num',
-  area: [],
-  no_delivery: 0,
-  is_free_shipping: 0,
-  fee_data: [],
-  free_shipping_data: [],
-  no_delivery_data: [],
+    template_id: '',
+    template_name: '',
+    fee_type: 'num',
+    area: [],
+    no_delivery: 0,
+    is_free_shipping: 0,
+    fee_data: [],
+    free_shipping_data: [],
+    no_delivery_data: []
 }
 const pageName = route.meta.title
 const formData: Record<string, any> = reactive({ ...initialFormData })
@@ -311,145 +174,130 @@ const formRef = ref<FormInstance>()
 const areaTree = ref<AnyObject[]>([])
 
 if (route.query.id) {
-  loading.value = true
-  getShippingTemplateInfo(route.query.id)
-    .then(({ data }) => {
-      if (data) {
-        Object.keys(formData).forEach((key: string) => {
-          if (data[key] != undefined) formData[key] = data[key]
-        })
-        feeData.value = data.fee_data
-        noDeliveryData.value = data.no_delivery_data
-        freeShippingData.value = data.free_shipping_data
-      }
-      loading.value = false
-    })
-    .catch(() => {
-      loading.value = false
+    loading.value = true
+    getShippingTemplateInfo(route.query.id).then(({ data }) => {
+        if (data) {
+            Object.keys(formData).forEach((key: string) => {
+                if (data[key] != undefined) formData[key] = data[key]
+            })
+            feeData.value = data.fee_data
+            noDeliveryData.value = data.no_delivery_data
+            freeShippingData.value = data.free_shipping_data
+        }
+        loading.value = false
+    }).catch(() => {
+        loading.value = false
     })
 }
 
-getAreatree(2)
-  .then((res) => {
+getAreatree(2).then(res => {
     areaTree.value = res.data
-  })
-  .catch()
+}).catch()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    template_name: [
-      {
-        required: true,
-        message: t('templateNamePlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    fee_data: [{ validator: feeDataValidate }],
-    free_shipping_data: [{ validator: freeShippingDataValidate }],
-    no_delivery_data: [{ validator: noDeliveryDataValidate }],
-  }
+    return {
+        template_name: [
+            { required: true, message: t('templateNamePlaceholder'), trigger: 'blur' }
+        ],
+        fee_data: [{ validator: feeDataValidate }],
+        free_shipping_data: [{ validator: freeShippingDataValidate }],
+        no_delivery_data: [{ validator: noDeliveryDataValidate }]
+    }
 })
 
 /**
  * 运费模板运费数据校验
  */
 const feeDataValidate = (rule: any, value: any, callback: any) => {
-  for (let i = 0; i < feeData.value.length; i++) {
-    const item = feeData.value[i]
-    if (!item.area_ids.length) {
-      callback(new Error(t('areaPlaceholder')))
-      break
-    }
-    if (Test.empty(item.snum) || item.snum < 0) {
-      callback(new Error(feeLabel.value.first + t('notUnderZero')))
-      break
-    }
-    if (Test.empty(item.xnum) || item.snum < 0) {
-      callback(new Error(feeLabel.value.continue + t('notUnderZero')))
-      break
+    for (let i = 0; i < feeData.value.length; i++) {
+        const item = feeData.value[i]
+        if (!item.area_ids.length) {
+            callback(new Error(t('areaPlaceholder')))
+            break
+        }
+        if (Test.empty(item.snum) || item.snum < 0) {
+            callback(new Error(feeLabel.value.first + t('notUnderZero')))
+            break
+        }
+        if (Test.empty(item.xnum) || item.snum < 0) {
+            callback(new Error(feeLabel.value.continue + t('notUnderZero')))
+            break
+        }
     }
-  }
-  callback()
+    callback()
 }
 
 /**
  * 运费模板包邮数据校验
  */
 const freeShippingDataValidate = (rule: any, value: any, callback: any) => {
-  if (formData.is_free_shipping) {
-    for (let i = 0; i < freeShippingData.value.length; i++) {
-      const item = freeShippingData.value[i]
-      if (!item.area_ids.length) {
-        callback(new Error(t('freeShippingPlaceholder')))
-        break
-      }
-      if (Test.empty(item.free_shipping_num) || item.free_shipping_num < 0) {
-        callback(new Error(freeShippingLabel.value + t('notUnderZero')))
-        break
-      }
+    if (formData.is_free_shipping) {
+        for (let i = 0; i < freeShippingData.value.length; i++) {
+            const item = freeShippingData.value[i]
+            if (!item.area_ids.length) {
+                callback(new Error(t('freeShippingPlaceholder')))
+                break
+            }
+            if (Test.empty(item.free_shipping_num) || item.free_shipping_num < 0) {
+                callback(new Error(freeShippingLabel.value + t('notUnderZero')))
+                break
+            }
+        }
+        callback()
+    } else {
+        callback()
     }
-    callback()
-  } else {
-    callback()
-  }
 }
 
 /**
  * 运费模板不配送地区校验
  */
 const noDeliveryDataValidate = (rule: any, value: any, callback: any) => {
-  if (formData.no_delivery) {
-    for (let i = 0; i < noDeliveryData.value.length; i++) {
-      const item = noDeliveryData.value[i]
-      if (!item.area_ids.length) {
-        callback(new Error(t('noDeliveryPlaceholder')))
-        break
-      }
+    if (formData.no_delivery) {
+        for (let i = 0; i < noDeliveryData.value.length; i++) {
+            const item = noDeliveryData.value[i]
+            if (!item.area_ids.length) {
+                callback(new Error(t('noDeliveryPlaceholder')))
+                break
+            }
+        }
+        callback()
+    } else {
+        callback()
     }
-    callback()
-  } else {
-    callback()
-  }
 }
 
 const feeLabel = computed(() => {
-  const label: AnyObject = {
-    num: {
-      first: t('firstNum'),
-      continue: t('continueNum'),
-    },
-    weight: {
-      first: t('firstWeight'),
-      continue: t('continueWeight'),
-    },
-    volume: {
-      first: t('firstVolume'),
-      continue: t('continueVolume'),
-    },
-  }
-  return label[formData.fee_type]
+    const label: AnyObject = {
+        num: {
+            first: t('firstNum'),
+            continue: t('continueNum')
+        },
+        weight: {
+            first: t('firstWeight'),
+            continue: t('continueWeight')
+        },
+        volume: {
+            first: t('firstVolume'),
+            continue: t('continueVolume')
+        }
+    }
+    return label[formData.fee_type]
 })
 
 const freeShippingLabel = computed(() => {
-  const label: AnyObject = {
-    num: t('freeShippingNum'),
-    weight: t('freeShippingWeight'),
-    volume: t('freeShippingVolume'),
-  }
-  return label[formData.fee_type]
+    const label: AnyObject = {
+        num: t('freeShippingNum'),
+        weight: t('freeShippingWeight'),
+        volume: t('freeShippingVolume')
+    }
+    return label[formData.fee_type]
 })
 
 // 运费数据
 const feeData = ref<AnyObject[]>([
-  {
-    area_ids: [0],
-    fee_area_names: '全国',
-    snum: 1,
-    sprice: 0,
-    xnum: 1,
-    xprice: 0,
-  },
+    { area_ids: [0], fee_area_names: '全国', snum: 1, sprice: 0, xnum: 1, xprice: 0 }
 ])
 // 包邮区域数据
 const freeShippingData = ref<AnyObject[]>([])
@@ -461,29 +309,17 @@ const noDeliveryData = ref<AnyObject[]>([])
  * @param type
  */
 const addArea = (type: string) => {
-  switch (type) {
-    case 'fee':
-      feeData.value.push({
-        area_ids: [],
-        fee_area_names: '',
-        snum: 1,
-        sprice: 0,
-        xnum: 1,
-        xprice: 0,
-      })
-      break
-    case 'free_shipping':
-      freeShippingData.value.push({
-        area_ids: [],
-        free_shipping_area_names: '',
-        free_shipping_num: 0,
-        free_shipping_price: 0,
-      })
-      break
-    case 'no_delivery':
-      noDeliveryData.value.push({ area_ids: [], no_delivery_area_names: '' })
-      break
-  }
+    switch (type) {
+        case 'fee':
+            feeData.value.push({ area_ids: [], fee_area_names: '', snum: 1, sprice: 0, xnum: 1, xprice: 0 })
+            break
+        case 'free_shipping':
+            freeShippingData.value.push({ area_ids: [], free_shipping_area_names: '', free_shipping_num: 0, free_shipping_price: 0 })
+            break
+        case 'no_delivery':
+            noDeliveryData.value.push({ area_ids: [], no_delivery_area_names: '' })
+            break
+    }
 }
 
 /**
@@ -492,92 +328,90 @@ const addArea = (type: string) => {
  * @param index
  */
 const delArea = (type: string, index: number) => {
-  switch (type) {
-    case 'fee':
-      feeData.value.splice(index, 1)
-      break
-    case 'free_shipping':
-      freeShippingData.value.splice(index, 1)
-      break
-    case 'no_delivery':
-      noDeliveryData.value.splice(index, 1)
-      break
-  }
+    switch (type) {
+        case 'fee':
+            feeData.value.splice(index, 1)
+            break
+        case 'free_shipping':
+            freeShippingData.value.splice(index, 1)
+            break
+        case 'no_delivery':
+            noDeliveryData.value.splice(index, 1)
+            break
+    }
 }
 
 // 选中的区域
 let selectedArea: number[] = []
 // 禁止选择的区域
-const disabledArea = ref<Array<string | number>>([])
+const disabledArea = ref <Array<string|number>>([])
 
 let currSelect = { type: '', index: 0 }
 
 const selectArea = (type: string, index: number) => {
-  currSelect = { type, index }
-
-  let data: AnyObject[] = []
-  switch (type) {
-    case 'fee':
-      data = feeData.value
-      break
-    case 'free_shipping':
-      data = freeShippingData.value
-      break
-    case 'no_delivery':
-      data = noDeliveryData.value
-      break
-  }
-  selectedArea = data[index].area_ids
-  disabledArea.value = []
-  data.forEach((item, $index) => {
-    if (index != $index) disabledArea.value.push(...item.area_ids)
-  })
-  showSelectAreaDialog.value = true
+    currSelect = { type, index }
+
+    let data: AnyObject[] = []
+    switch (type) {
+        case 'fee':
+            data = feeData.value
+            break
+        case 'free_shipping':
+            data = freeShippingData.value
+            break
+        case 'no_delivery':
+            data = noDeliveryData.value
+            break
+    }
+    selectedArea = data[index].area_ids
+    disabledArea.value = []
+    data.forEach((item, $index) => {
+        if (index != $index) disabledArea.value.push(...item.area_ids)
+    })
+    showSelectAreaDialog.value = true
 }
 
 const areaTreeData = computed(() => {
-  areaTree.value.forEach((province) => {
-    province.child.forEach((city: any) => {
-      city.disabled = disabledArea.value.includes(city.id)
+    areaTree.value.forEach(province => {
+        province.child.forEach((city:any) => {
+            city.disabled = disabledArea.value.includes(city.id)
+        })
     })
-  })
-  return areaTree.value
+    return areaTree.value
 })
 
 const areaTreeRef = ref<InstanceType<typeof ElTree>>()
 const confirmSelectArea = () => {
-  const nodes = areaTreeRef.value!.getCheckedNodes(false, false)
-  const areaIds: number[] = []
-  const areaNames: string[] = []
-
-  nodes.forEach((item) => {
-    if (item.level == 2) {
-      areaIds.push(item.id)
-      areaNames.push(item.name)
+    const nodes = areaTreeRef.value!.getCheckedNodes(false, false)
+    const areaIds: number[] = []
+    const areaNames: string[] = []
+
+    nodes.forEach(item => {
+        if (item.level == 2) {
+            areaIds.push(item.id)
+            areaNames.push(item.name)
+        }
+    })
+
+    switch (currSelect.type) {
+        case 'fee':
+            feeData.value[currSelect.index].area_ids = areaIds
+            feeData.value[currSelect.index].fee_area_names = areaNames.toString()
+            break
+        case 'free_shipping':
+            freeShippingData.value[currSelect.index].area_ids = areaIds
+            freeShippingData.value[currSelect.index].free_shipping_area_names = areaNames.toString()
+            break
+        case 'no_delivery':
+            noDeliveryData.value[currSelect.index].area_ids = areaIds
+            noDeliveryData.value[currSelect.index].no_delivery_area_names = areaNames.toString()
+            break
     }
-  })
-
-  switch (currSelect.type) {
-    case 'fee':
-      feeData.value[currSelect.index].area_ids = areaIds
-      feeData.value[currSelect.index].fee_area_names = areaNames.toString()
-      break
-    case 'free_shipping':
-      freeShippingData.value[currSelect.index].area_ids = areaIds
-      freeShippingData.value[currSelect.index].free_shipping_area_names =
-        areaNames.toString()
-      break
-    case 'no_delivery':
-      noDeliveryData.value[currSelect.index].area_ids = areaIds
-      noDeliveryData.value[currSelect.index].no_delivery_area_names =
-        areaNames.toString()
-      break
-  }
-  showSelectAreaDialog.value = false
+    showSelectAreaDialog.value = false
 }
 
 const showSelectOpened = () => {
-  areaTreeRef.value!.setCheckedKeys(selectedArea, false)
+    areaTreeRef.value!.setCheckedKeys(selectedArea, false)
 }
 
 /**
@@ -585,110 +419,83 @@ const showSelectOpened = () => {
  * @param formEl
  */
 const onSave = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  const save = formData.template_id ? editShippingTemplate : addShippingTemplate
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      if (formData.is_free_shipping && freeShippingData.value.length == 0) {
-        ElMessage.error(t('freeShippingPlaceholder'))
-        return
-      }
-      if (formData.no_delivery && noDeliveryData.value.length == 0) {
-        ElMessage.error('noDeliveryPlaceholder')
-        return
-      }
-      loading.value = true
-
-      const data: AnyObject = {
-        template_id: formData.template_id,
-        template_name: formData.template_name,
-        fee_type: formData.fee_type,
-        no_delivery: formData.no_delivery,
-        is_free_shipping: formData.is_free_shipping,
-      }
-      const area: AnyObject = {}
-
-      feeData.value.forEach((item) => {
-        item.area_ids.forEach((city: number) => {
-          area['city_' + city] = {
-            city_id: city,
-            fee_area_ids: item.area_ids.toString(),
-            fee_area_names: item.fee_area_names,
-            snum: item.snum,
-            sprice: item.sprice,
-            xnum: item.xnum,
-            xprice: item.xprice,
-          }
-        })
-      })
-      freeShippingData.value.forEach((item) => {
-        item.area_ids.forEach((city: number) => {
-          if (area['city_' + city]) {
-            Object.assign(area['city_' + city], {
-              free_shipping_area_ids: item.area_ids.toString(),
-              free_shipping_area_names: item.free_shipping_area_names,
-              free_shipping_num: item.free_shipping_num,
-              free_shipping_price: item.free_shipping_price,
-            })
-          } else {
-            area['city_' + city] = {
-              city_id: city,
-              free_shipping_area_ids: item.area_ids.toString(),
-              free_shipping_area_names: item.free_shipping_area_names,
-              free_shipping_num: item.free_shipping_num,
-              free_shipping_price: item.free_shipping_price,
+    if (loading.value || !formEl) return
+    const save = formData.template_id ? editShippingTemplate : addShippingTemplate
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            if (formData.is_free_shipping && freeShippingData.value.length == 0) {
+                ElMessage.error(t('freeShippingPlaceholder'))
+                return
             }
-          }
-        })
-      })
-      noDeliveryData.value.forEach((item) => {
-        item.area_ids.forEach((city: number) => {
-          if (area['city_' + city]) {
-            Object.assign(area['city_' + city], {
-              no_delivery_area_ids: item.area_ids.toString(),
-              no_delivery_area_names: item.no_delivery_area_names,
-            })
-          } else {
-            area['city_' + city] = {
-              city_id: city,
-              no_delivery_area_ids: item.area_ids.toString(),
-              no_delivery_area_names: item.no_delivery_area_names,
+            if (formData.no_delivery && noDeliveryData.value.length == 0) {
+                ElMessage.error('noDeliveryPlaceholder')
+                return
             }
-          }
-        })
-      })
-      data.area = Object.values(area)
-      save(data)
-        .then(() => {
-          loading.value = false
-          router.push({ path: '/shop/order/shipping/template' })
-        })
-        .catch(() => {
-          loading.value = false
-        })
-    }
-  })
+            loading.value = true
+
+
+            const data:AnyObject = {
+                template_id: formData.template_id,
+                template_name: formData.template_name,
+                fee_type: formData.fee_type,
+                no_delivery: formData.no_delivery,
+                is_free_shipping: formData.is_free_shipping
+            }
+            const area: AnyObject = {}
+
+            feeData.value.forEach(item => {
+                item.area_ids.forEach((city: number) => {
+                    area['city_' + city] = { city_id: city, fee_area_ids: item.area_ids.toString(), fee_area_names: item.fee_area_names, snum: item.snum, sprice: item.sprice, xnum: item.xnum, xprice: item.xprice }
+                })
+            })
+            freeShippingData.value.forEach(item => {
+                item.area_ids.forEach((city: number) => {
+                    if (area['city_' + city]) {
+                        Object.assign(area['city_' + city], { free_shipping_area_ids: item.area_ids.toString(), free_shipping_area_names: item.free_shipping_area_names, free_shipping_num: item.free_shipping_num, free_shipping_price: item.free_shipping_price })
+                    } else {
+                        area['city_' + city] = { city_id: city, free_shipping_area_ids: item.area_ids.toString(), free_shipping_area_names: item.free_shipping_area_names, free_shipping_num: item.free_shipping_num, free_shipping_price: item.free_shipping_price }
+                    }
+                })
+            })
+            noDeliveryData.value.forEach(item => {
+                item.area_ids.forEach((city: number) => {
+                    if (area['city_' + city]) {
+                        Object.assign(area['city_' + city], { no_delivery_area_ids: item.area_ids.toString(), no_delivery_area_names: item.no_delivery_area_names })
+                    } else {
+                        area['city_' + city] = { city_id: city, no_delivery_area_ids: item.area_ids.toString(), no_delivery_area_names: item.no_delivery_area_names }
+                    }
+                })
+            })
+            data.area = Object.values(area)
+            save(data).then(() => {
+                loading.value = false
+                router.push({ path: '/shop/order/shipping/template' })
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
 }
 
 const back = () => {
-  router.push({ path: '/shop/order/shipping/template' })
+    router.push({ path: '/shop/order/shipping/template' })
 }
 </script>
 
 <style lang="scss" scoped>
-:deep(.el-tree-node.is-expanded > .el-tree-node__children) {
-  display: flex !important;
-  flex-wrap: wrap;
+:deep(.el-tree-node.is-expanded>.el-tree-node__children) {
+    display: flex !important;
+    flex-wrap: wrap;
 }
 
 :deep(.area-input .el-input__wrapper) {
-  box-shadow: none !important;
-  padding: 0 !important;
-  background: none;
+    box-shadow: none !important;
+    padding: 0 !important;
+    background: none;
 
-  input {
-    cursor: pointer;
-  }
+    input {
+        cursor: pointer;
+    }
 }
 </style>
diff --git a/admin/src/addon/shop/views/diy/components/edit-goods-coupon.vue b/admin/src/addon/shop/views/diy/components/edit-goods-coupon.vue
index df934dfb..63321032 100644
--- a/admin/src/addon/shop/views/diy/components/edit-goods-coupon.vue
+++ b/admin/src/addon/shop/views/diy/components/edit-goods-coupon.vue
@@ -1,203 +1,119 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('selectStyle') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('selectStyle')" class="flex">
-          <span
-            class="text-primary flex-1 cursor-pointer"
-            @click="showCouponStyle"
-            >{{ diyStore.editComponent.styleName }}</span
-          >
-          <el-icon>
-            <ArrowRight />
-          </el-icon>
-        </el-form-item>
-      </el-form>
-
-      <el-dialog
-        v-model="showCouponDialog"
-        :title="t('selectStyle')"
-        width="500px"
-      >
-        <div class="flex flex-wrap">
-          <template v-for="(item, index) in couponStyleList" :key="index">
-            <div
-              :class="{
-                'border-primary': selectCouponStyle.value == item.value,
-              }"
-              @click="changeCouponStyle(item)"
-              class="flex items-center justify-center overflow-hidden w-[200px] h-[100px] m-[6px] cursor-pointer border bg-gray-50"
-            >
-              <img :src="img(item.url)" />
-            </div>
-          </template>
-        </div>
-
-        <template #footer>
-          <span class="dialog-footer">
-            <el-button @click="showCouponDialog = false">{{
-              t('cancel')
-            }}</el-button>
-            <el-button type="primary" @click="confirmCouponStyle">{{
-              t('confirm')
-            }}</el-button>
-          </span>
-        </template>
-      </el-dialog>
-    </div>
-
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('couponContent') }}</h3>
-      <el-form label-width="90px" class="px-[10px]">
-        <el-form-item :label="t('couponTitle')">
-          <el-input
-            v-model.trim="diyStore.editComponent.couponTitle"
-            clearable
-            :maxlength="diyStore.editComponent.style == 'style-3' ? 4 : 8"
-            show-word-limit
-          />
-        </el-form-item>
-
-        <el-form-item :label="t('couponSubTitle')">
-          <el-input
-            v-model.trim="diyStore.editComponent.couponSubTitle"
-            clearable
-            :maxlength="diyStore.editComponent.style == 'style-3' ? 7 : 10"
-            show-word-limit
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('couponData') }}</h3>
-      <el-form label-width="90px" class="px-[10px]">
-        <el-form-item :label="t('selectCoupon')">
-          <el-radio-group
-            v-model="diyStore.editComponent.source"
-            :title="t('goodsSelectPopupSelectGoodsButton')"
-          >
-            <el-radio label="all">{{ t('allSources') }}</el-radio>
-            <el-radio label="custom">{{
-              t('manualSelectionSources')
-            }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item
-          :label="t('manualSelectionSources')"
-          v-if="diyStore.editComponent.source == 'custom'"
-        >
-          <coupon-select-popup
-            ref="couponSelectPopupRef"
-            v-model="diyStore.editComponent.couponIds"
-            :min="1"
-            :max="20"
-          />
-        </el-form-item>
-        <el-form-item
-          :label="t('couponNum')"
-          v-if="diyStore.editComponent.source == 'all'"
-        >
-          <el-slider
-            show-input
-            v-model="diyStore.editComponent.num"
-            :min="1"
-            max="20"
-            size="small"
-            class="goods-coupon-slider"
-          />
-        </el-form-item>
-        <el-form-item
-          :label="t('couponBtnText')"
-          v-if="diyStore.editComponent.style != 'style-4'"
-        >
-          <el-input
-            v-model.trim="diyStore.editComponent.btnText"
-            clearable
-            maxlength="5"
-            show-word-limit
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-  </div>
-
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <div
-      class="edit-attr-item-wrap"
-      v-if="diyStore.editComponent.style == 'style-4'"
-    >
-      <h3 class="mb-[10px]">{{ t('couponTitleStyle') }}</h3>
-      <el-form label-width="90px" class="px-[10px]">
-        <el-form-item :label="t('couponTitleColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.titleColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-        <el-form-item :label="t('couponSubTitleColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.subTitleColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <div
-      class="edit-attr-item-wrap"
-      v-if="diyStore.editComponent.style == 'style-4'"
-    >
-      <h3 class="mb-[10px]">{{ t('couponItemStyle') }}</h3>
-      <el-form label-width="90px" class="px-[10px]">
-        <el-form-item :label="t('couponMoney')">
-          <el-color-picker
-            v-model="diyStore.editComponent.couponItem.moneyColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-        <el-form-item :label="t('textColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.couponItem.textColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-        <el-form-item :label="t('subTextColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.couponItem.subTextColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-        <el-form-item :label="t('listFrameColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.couponItem.bgColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-        <el-form-item :label="t('goodsRounded')">
-          <el-slider
-            v-model="diyStore.editComponent.couponItem.aroundRadius"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-            :max="50"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
+
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('selectStyle') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('selectStyle')" class="flex">
+					<span class="text-primary flex-1 cursor-pointer" @click="showCouponStyle">{{ diyStore.editComponent.styleName }}</span>
+					<el-icon>
+						<ArrowRight />
+					</el-icon>
+				</el-form-item>
+			</el-form>
+
+			<el-dialog v-model="showCouponDialog" :title="t('selectStyle')" width="500px">
+				<div class="flex flex-wrap">
+					<template v-for="(item,index) in couponStyleList" :key="index">
+						<div :class="{ 'border-primary': selectCouponStyle.value == item.value }" @click="changeCouponStyle(item)" class="flex items-center justify-center overflow-hidden w-[200px] h-[100px] m-[6px] cursor-pointer border bg-gray-50">
+							<img :src="img(item.url)" />
+						</div>
+					</template>
+				</div>
+
+				<template #footer>
+					<span class="dialog-footer">
+						<el-button @click="showCouponDialog = false">{{ t('cancel') }}</el-button>
+						<el-button type="primary" @click="confirmCouponStyle">{{ t('confirm') }}</el-button>
+					</span>
+				</template>
+
+			</el-dialog>
+		</div>
+
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('couponContent') }}</h3>
+			<el-form label-width="90px" class="px-[10px]">
+
+				<el-form-item :label="t('couponTitle')">
+					<el-input v-model.trim="diyStore.editComponent.couponTitle" clearable :maxlength="diyStore.editComponent.style == 'style-3' ? 4 : 8" show-word-limit/>
+				</el-form-item>
+
+				<el-form-item :label="t('couponSubTitle')">
+					<el-input v-model.trim="diyStore.editComponent.couponSubTitle" clearable :maxlength="diyStore.editComponent.style == 'style-3' ? 7 : 10" show-word-limit/>
+				</el-form-item>
+
+			</el-form>
+
+		</div>
+
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('couponData') }}</h3>
+			<el-form label-width="90px" class="px-[10px]">
+
+				<el-form-item :label="t('selectCoupon')">
+					<el-radio-group v-model="diyStore.editComponent.source" :title="t('goodsSelectPopupSelectGoodsButton')">
+						<el-radio label="all">{{ t('allSources') }}</el-radio>
+						<el-radio label="custom">{{ t('manualSelectionSources') }}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+				<el-form-item :label="t('manualSelectionSources')" v-if="diyStore.editComponent.source == 'custom'">
+					<coupon-select-popup ref="couponSelectPopupRef" v-model="diyStore.editComponent.couponIds" :min="1" :max="20" />
+				</el-form-item>
+				<el-form-item :label="t('couponNum')" v-if="diyStore.editComponent.source == 'all'">
+					<el-slider show-input v-model="diyStore.editComponent.num" :min="1" max="20" size="small" class="goods-coupon-slider" />
+				</el-form-item>
+				<el-form-item :label="t('couponBtnText')" v-if="diyStore.editComponent.style != 'style-4'">
+					<el-input v-model.trim="diyStore.editComponent.btnText" clearable maxlength="5" show-word-limit/>
+				</el-form-item>
+
+			</el-form>
+
+		</div>
+
+	</div>
+
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+
+        <div class="edit-attr-item-wrap" v-if="diyStore.editComponent.style == 'style-4'">
+			<h3 class="mb-[10px]">{{ t("couponTitleStyle") }}</h3>
+			<el-form label-width="90px" class="px-[10px]">
+                <el-form-item :label="t('couponTitleColor')">
+					<el-color-picker v-model="diyStore.editComponent.titleColor" show-alpha :predefine="diyStore.predefineColors" />
+				</el-form-item>
+                <el-form-item :label="t('couponSubTitleColor')">
+					<el-color-picker v-model="diyStore.editComponent.subTitleColor" show-alpha :predefine="diyStore.predefineColors" />
+				</el-form-item>
+			</el-form>
+		</div>
+
+        <div class="edit-attr-item-wrap" v-if="diyStore.editComponent.style == 'style-4'">
+			<h3 class="mb-[10px]">{{ t("couponItemStyle") }}</h3>
+			<el-form label-width="90px" class="px-[10px]">
+                <el-form-item :label="t('couponMoney')">
+					<el-color-picker v-model="diyStore.editComponent.couponItem.moneyColor" show-alpha :predefine="diyStore.predefineColors" />
+				</el-form-item>
+                <el-form-item :label="t('textColor')">
+					<el-color-picker v-model="diyStore.editComponent.couponItem.textColor" show-alpha :predefine="diyStore.predefineColors" />
+				</el-form-item>
+                <el-form-item :label="t('subTextColor')">
+					<el-color-picker v-model="diyStore.editComponent.couponItem.subTextColor" show-alpha :predefine="diyStore.predefineColors" />
+				</el-form-item>
+                <el-form-item :label="t('listFrameColor')">
+					<el-color-picker v-model="diyStore.editComponent.couponItem.bgColor" show-alpha :predefine="diyStore.predefineColors" />
+				</el-form-item>
+				<el-form-item :label="t('goodsRounded')">
+					<el-slider v-model="diyStore.editComponent.couponItem.aroundRadius" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+				</el-form-item>
+			</el-form>
+		</div>
+
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+	</div>
+
 </template>
 
 <script lang="ts" setup>
@@ -211,134 +127,126 @@ import couponSelectPopup from '@/addon/shop/views/goods/components/coupon-select
 import { el } from 'element-plus/es/locale'
 
 const diyStore = useDiyStore()
-diyStore.editComponent.ignore = ['componentBgColor', 'componentBgUrl'] // 忽略公共属性
+diyStore.editComponent.ignore = ['componentBgColor','componentBgUrl'] // 忽略公共属性
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
-  const res = { code: true, message: '' }
+    const res = { code: true, message: '' }
+
+    if(diyStore.value[index].source == 'custom'){
+        if(diyStore.value[index].couponIds.length == 0){
+            res.code = false
+            res.message = t('couponPlaceholder')
+	        return res;
+        }
+    }
 
-  if (diyStore.value[index].source == 'custom') {
-    if (diyStore.value[index].couponIds.length == 0) {
-      res.code = false
-      res.message = t('couponPlaceholder')
-      return res
+    if(diyStore.value[index].btnText == ''){
+        res.code = false
+        res.message = t('couponBtnTextPlaceholder')
+        return res; 
     }
-  }
 
-  if (diyStore.value[index].btnText == '') {
-    res.code = false
-    res.message = t('couponBtnTextPlaceholder')
-    return res
-  }
+    if(diyStore.value[index].couponTitle == ''){
+        res.code = false
+        res.message = t('couponTitlePlaceholder')
+        return res;
+    }
 
-  if (diyStore.value[index].couponTitle == '') {
-    res.code = false
-    res.message = t('couponTitlePlaceholder')
-    return res
-  }
+    if(diyStore.value[index].couponSubTitle == ''){
+        res.code = false
+        res.message = t('couponSubTitlePlaceholder')
+        return res;
+    }
 
-  if (diyStore.value[index].couponSubTitle == '') {
-    res.code = false
-    res.message = t('couponSubTitlePlaceholder')
     return res
-  }
-
-  return res
 }
 
 const selectCouponStyle = reactive({
-  title: diyStore.editComponent.styleName,
-  value: diyStore.editComponent.style,
+    title: diyStore.editComponent.styleName,
+    value: diyStore.editComponent.style
 })
 
 // 风格样式
 const showCouponDialog = ref(false)
 
 const showCouponStyle = () => {
-  showCouponDialog.value = true
-  selectCouponStyle.title = diyStore.editComponent.styleName
-  selectCouponStyle.value = diyStore.editComponent.style
+    showCouponDialog.value = true
+    selectCouponStyle.title = diyStore.editComponent.styleName;
+    selectCouponStyle.value = diyStore.editComponent.style;
 }
 
 const couponStyleList = reactive([
-  {
-    url: 'addon/shop/diy/goods_coupon/style-1.png',
-    title: '风格1',
-    value: 'style-1',
-  },
-  {
-    url: 'addon/shop/diy/goods_coupon/style-2.png',
-    title: '风格2',
-    value: 'style-2',
-  },
-  {
-    url: 'addon/shop/diy/goods_coupon/style-3.png',
-    title: '风格3',
-    value: 'style-3',
-  },
-  {
-    url: 'addon/shop/diy/goods_coupon/style-4.png',
-    title: '风格4',
-    value: 'style-4',
-  },
+    {
+        url: 'addon/shop/diy/goods_coupon/style-1.png',
+        title: '风格1',
+        value: 'style-1'
+    },
+    {
+        url: 'addon/shop/diy/goods_coupon/style-2.png',
+        title: '风格2',
+        value: 'style-2'
+    },
+    {
+        url: 'addon/shop/diy/goods_coupon/style-3.png',
+        title: '风格3',
+        value: 'style-3'
+    },
+    {
+        url: 'addon/shop/diy/goods_coupon/style-4.png',
+        title: '风格4',
+        value: 'style-4'
+    }
 ])
 
-const changeCouponStyle = (item: any) => {
-  selectCouponStyle.title = item.title
-  selectCouponStyle.value = item.value
+const changeCouponStyle = (item:any) => {
+    selectCouponStyle.title = item.title;
+    selectCouponStyle.value = item.value;
 }
 
 const confirmCouponStyle = () => {
-  diyStore.editComponent.styleName = selectCouponStyle.title
-  diyStore.editComponent.style = selectCouponStyle.value
-  if (diyStore.editComponent.style == 'style-3') {
-    if (
-      diyStore.editComponent.couponTitle &&
-      diyStore.editComponent.couponTitle.length > 4
-    ) {
-      diyStore.editComponent.couponTitle =
-        diyStore.editComponent.couponTitle.substring(0, 4)
-    }
-    if (
-      diyStore.editComponent.couponSubTitle &&
-      diyStore.editComponent.couponSubTitle.length > 7
-    ) {
-      diyStore.editComponent.couponSubTitle =
-        diyStore.editComponent.couponSubTitle.substring(0, 7)
+    diyStore.editComponent.styleName = selectCouponStyle.title;
+    diyStore.editComponent.style = selectCouponStyle.value;
+    if(diyStore.editComponent.style == 'style-3'){
+        if(diyStore.editComponent.couponTitle && diyStore.editComponent.couponTitle.length > 4){diyStore.editComponent.couponTitle = diyStore.editComponent.couponTitle.substring(0,4)}
+        if(diyStore.editComponent.couponSubTitle && diyStore.editComponent.couponSubTitle.length > 7){diyStore.editComponent.couponSubTitle = diyStore.editComponent.couponSubTitle.substring(0,7)}
     }
-  }
-  initStyleFn()
-  showCouponDialog.value = false
+    initStyleFn();
+    showCouponDialog.value = false
 }
 
-const initStyleFn = () => {
-  let index = diyStore.editComponent.ignore.indexOf('componentBgColor')
-  if (diyStore.editComponent.style == 'style-4' && index != -1) {
-    diyStore.editComponent.ignore.splice(index, 1)
-    diyStore.editComponent.titleColor = '#ffffff'
-    diyStore.editComponent.subTitleColor = '#ffffff'
-
-    diyStore.editComponent.couponItem.moneyColor = '#fa191d'
-    diyStore.editComponent.couponItem.textColor = '#333333'
-    diyStore.editComponent.couponItem.subTextColor = '#999999'
-    diyStore.editComponent.couponItem.bgColor = '#ffffff'
-    diyStore.editComponent.couponItem.aroundRadius = 10
-    diyStore.editComponent.componentStartBgColor = '#fa191d'
-  } else if (diyStore.editComponent.style != 'style-4' && index == -1) {
-    diyStore.editComponent.ignore.push('componentBgColor')
-  }
+const initStyleFn = ()=>{
+    let index = diyStore.editComponent.ignore.indexOf('componentBgColor');
+    if(diyStore.editComponent.style == 'style-4' && index != -1){
+        diyStore.editComponent.ignore.splice(index,1);
+        diyStore.editComponent.titleColor = "#ffffff";
+        diyStore.editComponent.subTitleColor = "#ffffff";
+        
+        diyStore.editComponent.couponItem.moneyColor = "#fa191d";
+        diyStore.editComponent.couponItem.textColor = "#333333";
+        diyStore.editComponent.couponItem.subTextColor = "#999999";
+        diyStore.editComponent.couponItem.bgColor = "#ffffff";
+        diyStore.editComponent.couponItem.aroundRadius = 10;
+        diyStore.editComponent.componentStartBgColor = "#fa191d";
+
+    }else if(diyStore.editComponent.style != 'style-4' && index == -1){
+        diyStore.editComponent.ignore.push('componentBgColor');
+    }
+	
 }
-initStyleFn()
+initStyleFn();
 
 defineExpose({})
+
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
 
 <style lang="scss">
-.goods-coupon-slider {
-  .el-slider__input {
-    width: 100px;
-  }
+	.goods-coupon-slider {
+	.el-slider__input {
+		width: 100px;
+	}
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/admin/src/addon/shop/views/diy/components/edit-goods-list.vue b/admin/src/addon/shop/views/diy/components/edit-goods-list.vue
index ef567139..47cb6360 100644
--- a/admin/src/addon/shop/views/diy/components/edit-goods-list.vue
+++ b/admin/src/addon/shop/views/diy/components/edit-goods-list.vue
@@ -1,372 +1,196 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('selectStyle') }}</h3>
-      <div class="flex items-center mb-[18px] rounded overflow-hidden">
-        <span
-          class="iconfont iconzuoyoutuwenpc border-[1px] border-solid border-[#eee] cursor-pointer flex-1 flex items-center justify-center py-[5px]"
-          :class="{
-            'border-[var(--el-color-primary)] text-[var(--el-color-primary)]':
-              diyStore.editComponent.style == 'style-1',
-          }"
-          @click="styleChangeFn('style-1')"
-        ></span>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('selectStyle') }}</h3>
+			<div class="flex items-center mb-[18px] rounded overflow-hidden">
+				<span
+					class="iconfont iconzuoyoutuwenpc border-[1px] border-solid border-[#eee] cursor-pointer flex-1 flex items-center justify-center py-[5px]"
+					:class="{ 'border-[var(--el-color-primary)] text-[var(--el-color-primary)]': diyStore.editComponent.style == 'style-1' }"
+					@click="styleChangeFn('style-1')"></span>
+                    
+				<span
+					class="iconfont iconshangxiatuwenpc border-[1px] border-solid border-[#eee] cursor-pointer flex-1 flex items-center justify-center py-[5px]"
+					:class="{ 'border-[var(--el-color-primary)] text-[var(--el-color-primary)]': diyStore.editComponent.style == 'style-2' }"
+					@click="styleChangeFn('style-2')"></span>
+                <span
+					class="iconfont iconliebiaopc border-[1px] border-solid border-[#eee] cursor-pointer flex-1 flex items-center justify-center py-[5px]"
+					:class="{ 'border-[var(--el-color-primary)] text-[var(--el-color-primary)]': diyStore.editComponent.style == 'style-3' }"
+					@click="styleChangeFn('style-3')"></span>
+			</div>
+		</div>
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t("selectSource") }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('sortWay')">
+					<el-radio-group v-model="diyStore.editComponent.sortWay">
+						<el-radio label="default">{{ t('default') }}</el-radio>
+						<el-radio label="sale_num">{{ t('sales') }}</el-radio>
+						<el-radio label="price">{{ t('price') }}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+				<el-form-item :label="t('goodsSelectPopupSelectGoodsButton')">
+					<el-radio-group v-model="diyStore.editComponent.source" :title="t('goodsSelectPopupSelectGoodsButton')">
+						<el-radio label="all">{{ t('goodsSelectPopupAllGoods') }}</el-radio>
+						<el-radio label="category">{{ t('selectCategory') }}</el-radio>
+						<el-radio label="custom">{{ t('manualSelectionSources') }}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+				<el-form-item :label="t('selectCategory')" v-if="diyStore.editComponent.source == 'category'">
+					<div class="flex items-center w-full">
+						<div class="cursor-pointer ml-auto" @click="categoryShowDialogOpen">
+							<span class="text-[var(--el-color-primary)]">{{ diyStore.editComponent.goods_category_name }}</span>
+							<span class="iconfont iconxiangyoujiantou"></span>
+						</div>
+					</div>
+				</el-form-item>
+				<el-form-item :label="t('goodsNum')" v-if="diyStore.editComponent.source == 'all' || diyStore.editComponent.source == 'category'">
+					<el-slider class="goods-list-slider" show-input v-model="diyStore.editComponent.num" :min="1" max="20" size="small" />
+				</el-form-item>
+				<el-form-item :label="t('customGoods')" v-if="diyStore.editComponent.source == 'custom'">
+					<goods-select-popup ref="goodsSelectPopupRef" v-model="diyStore.editComponent.goods_ids" :min="1" :max="99" />
+				</el-form-item>
+			</el-form>
 
-        <span
-          class="iconfont iconshangxiatuwenpc border-[1px] border-solid border-[#eee] cursor-pointer flex-1 flex items-center justify-center py-[5px]"
-          :class="{
-            'border-[var(--el-color-primary)] text-[var(--el-color-primary)]':
-              diyStore.editComponent.style == 'style-2',
-          }"
-          @click="styleChangeFn('style-2')"
-        ></span>
-        <span
-          class="iconfont iconliebiaopc border-[1px] border-solid border-[#eee] cursor-pointer flex-1 flex items-center justify-center py-[5px]"
-          :class="{
-            'border-[var(--el-color-primary)] text-[var(--el-color-primary)]':
-              diyStore.editComponent.style == 'style-3',
-          }"
-          @click="styleChangeFn('style-3')"
-        ></span>
-      </div>
-    </div>
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('selectSource') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('sortWay')">
-          <el-radio-group v-model="diyStore.editComponent.sortWay">
-            <el-radio label="default">{{ t('default') }}</el-radio>
-            <el-radio label="sale_num">{{ t('sales') }}</el-radio>
-            <el-radio label="price">{{ t('price') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item :label="t('goodsSelectPopupSelectGoodsButton')">
-          <el-radio-group
-            v-model="diyStore.editComponent.source"
-            :title="t('goodsSelectPopupSelectGoodsButton')"
-          >
-            <el-radio label="all">{{ t('goodsSelectPopupAllGoods') }}</el-radio>
-            <el-radio label="category">{{ t('selectCategory') }}</el-radio>
-            <el-radio label="custom">{{
-              t('manualSelectionSources')
-            }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item
-          :label="t('selectCategory')"
-          v-if="diyStore.editComponent.source == 'category'"
-        >
-          <div class="flex items-center w-full">
-            <div class="cursor-pointer ml-auto" @click="categoryShowDialogOpen">
-              <span class="text-[var(--el-color-primary)]">{{
-                diyStore.editComponent.goods_category_name
-              }}</span>
-              <span class="iconfont iconxiangyoujiantou"></span>
-            </div>
-          </div>
-        </el-form-item>
-        <el-form-item
-          :label="t('goodsNum')"
-          v-if="
-            diyStore.editComponent.source == 'all' ||
-            diyStore.editComponent.source == 'category'
-          "
-        >
-          <el-slider
-            class="goods-list-slider"
-            show-input
-            v-model="diyStore.editComponent.num"
-            :min="1"
-            max="20"
-            size="small"
-          />
-        </el-form-item>
-        <el-form-item
-          :label="t('customGoods')"
-          v-if="diyStore.editComponent.source == 'custom'"
-        >
-          <goods-select-popup
-            ref="goodsSelectPopupRef"
-            v-model="diyStore.editComponent.goods_ids"
-            :min="1"
-            :max="99"
-          />
-        </el-form-item>
-      </el-form>
+			<el-dialog v-model="categoryShowDialog" :title="t('goodsCategoryTitle')" width="750px" :close-on-press-escape="false" :destroy-on-close="true" :close-on-click-modal="false">
+				<el-table :data="categoryTable.data" ref="categoryTableRef" size="large" v-loading="categoryTable.loading"
+					height="450px" @selection-change="handleSelectionChange" row-key="category_id"
+					:expand-row-keys="expand_category_ids"
+					:tree-props="{ hasChildren: 'hasChildren', children: 'child_list' }">
+					<template #empty>
+						<span>{{ !categoryTable.loading ? t('emptyData') : '' }}</span>
+					</template>
+					<el-table-column type="selection" width="55" />
+					<el-table-column :label="t('categoryName')" min-width="120">
+						<template #default="{ row }">
+							<span class="order-2">{{ row.category_name }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column :label="t('categoryImage')" width="170" align="left">
+						<template #default="{ row }">
+							<div class="h-[30px]">
+								<el-image class="w-[30px] h-[30px] " :src="img(row.image)" fit="contain">
+									<template #error>
+										<div class="image-slot">
+											<img class="w-[30px] h-[30px]" src="@/addon/shop/assets/category_default.png" />
+										</div>
+									</template>
+								</el-image>
+							</div>
+						</template>
+					</el-table-column>
+				</el-table>
+				<div class="flex items-center justify-end mt-[15px]">
+					<el-button type="primary" @click="saveCategoryId">{{ t('confirm') }}</el-button>
+					<el-button @click="categoryShowDialog = false">{{ t('cancel') }}</el-button>
+				</div>
+			</el-dialog>
 
-      <el-dialog
-        v-model="categoryShowDialog"
-        :title="t('goodsCategoryTitle')"
-        width="750px"
-        :close-on-press-escape="false"
-        :destroy-on-close="true"
-        :close-on-click-modal="false"
-      >
-        <el-table
-          :data="categoryTable.data"
-          ref="categoryTableRef"
-          size="large"
-          v-loading="categoryTable.loading"
-          height="450px"
-          @selection-change="handleSelectionChange"
-          row-key="category_id"
-          :expand-row-keys="expand_category_ids"
-          :tree-props="{ hasChildren: 'hasChildren', children: 'child_list' }"
-        >
-          <template #empty>
-            <span>{{ !categoryTable.loading ? t('emptyData') : '' }}</span>
-          </template>
-          <el-table-column type="selection" width="55" />
-          <el-table-column :label="t('categoryName')" min-width="120">
-            <template #default="{ row }">
-              <span class="order-2">{{ row.category_name }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('categoryImage')" width="170" align="left">
-            <template #default="{ row }">
-              <div class="h-[30px]">
-                <el-image
-                  class="w-[30px] h-[30px]"
-                  :src="img(row.image)"
-                  fit="contain"
-                >
-                  <template #error>
-                    <div class="image-slot">
-                      <img
-                        class="w-[30px] h-[30px]"
-                        src="@/addon/shop/assets/category_default.png"
-                      />
+		</div>
+
+        <div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t("goodsBuyBtn") }}</h3>
+			<el-form label-width="90px" class="px-[10px]">
+                <el-form-item :label="t('goodsBtnIsShow')">
+                    <el-switch v-model="diyStore.editComponent.btnStyle.control" />
+                </el-form-item>
+                <el-form-item :label="t('goodsCartIncident')" v-if="diyStore.editComponent.btnStyle.control">
+                    <el-radio-group v-model="diyStore.editComponent.btnStyle.cartEvent">
+						<el-radio label="detail">{{ t('goodsDetail') }}</el-radio>
+					</el-radio-group>
+                </el-form-item>
+                <el-form-item :label="t('goodsBtnStyle')" class="!items-center" v-if="diyStore.editComponent.btnStyle.control">
+                    <div class="flex">
+                        <template v-for="(item,index) in btnStyleList">
+                            <div v-if=" item.isShow == true" class="cursor-pointer flex items-center justify-center border-[1px] border-solid border-transparent rounded-[6px] py-[5px] px-[8px] mr-[10px]" :class="{'!border-[var(--el-color-primary)]': diyStore.editComponent.btnStyle.style == item.value}">
+                                <div v-if="item.type == 'icon'" :class="['nc-iconfont !text-[25px] text-[var(--el-color-primary)]', item.title]" @click="changeBtnStyle(item)"></div>
+                                <div v-if="item.type == 'button'" class="leading-[1] text-[12px] px-[10px] py-[8px] text-[#fff] rounded-[20px] bg-[var(--el-color-primary)]" @click="changeBtnStyle(item)">
+                                    {{item.title}}
+                                </div>
+                            </div>
+                        </template>
                     </div>
-                  </template>
-                </el-image>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="flex items-center justify-end mt-[15px]">
-          <el-button type="primary" @click="saveCategoryId">{{
-            t('confirm')
-          }}</el-button>
-          <el-button @click="categoryShowDialog = false">{{
-            t('cancel')
-          }}</el-button>
-        </div>
-      </el-dialog>
-    </div>
+                </el-form-item>
+                <el-form-item :label="t('goodsBtnText')" v-if="diyStore.editComponent.btnStyle.control && diyStore.editComponent.btnStyle.style == 'button'">
+                    <el-input v-model.trim="diyStore.editComponent.btnStyle.text" :placeholder="t('goodsBtnTextPlaceholder')" clearable maxlength="4" show-word-limit/>
+                </el-form-item>
+			</el-form>
+		</div>
 
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('goodsBuyBtn') }}</h3>
-      <el-form label-width="90px" class="px-[10px]">
-        <el-form-item :label="t('goodsBtnIsShow')">
-          <el-switch v-model="diyStore.editComponent.btnStyle.control" />
-        </el-form-item>
-        <el-form-item
-          :label="t('goodsCartIncident')"
-          v-if="diyStore.editComponent.btnStyle.control"
-        >
-          <el-radio-group v-model="diyStore.editComponent.btnStyle.cartEvent">
-            <el-radio label="detail">{{ t('goodsDetail') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item
-          :label="t('goodsBtnStyle')"
-          class="!items-center"
-          v-if="diyStore.editComponent.btnStyle.control"
-        >
-          <div class="flex">
-            <template v-for="(item, index) in btnStyleList">
-              <div
-                v-if="item.isShow == true"
-                class="cursor-pointer flex items-center justify-center border-[1px] border-solid border-transparent rounded-[6px] py-[5px] px-[8px] mr-[10px]"
-                :class="{
-                  '!border-[var(--el-color-primary)]':
-                    diyStore.editComponent.btnStyle.style == item.value,
-                }"
-              >
-                <div
-                  v-if="item.type == 'icon'"
-                  :class="[
-                    'nc-iconfont !text-[25px] text-[var(--el-color-primary)]',
-                    item.title,
-                  ]"
-                  @click="changeBtnStyle(item)"
-                ></div>
-                <div
-                  v-if="item.type == 'button'"
-                  class="leading-[1] text-[12px] px-[10px] py-[8px] text-[#fff] rounded-[20px] bg-[var(--el-color-primary)]"
-                  @click="changeBtnStyle(item)"
-                >
-                  {{ item.title }}
-                </div>
-              </div>
-            </template>
-          </div>
-        </el-form-item>
-        <el-form-item
-          :label="t('goodsBtnText')"
-          v-if="
-            diyStore.editComponent.btnStyle.control &&
-            diyStore.editComponent.btnStyle.style == 'button'
-          "
-        >
-          <el-input
-            v-model.trim="diyStore.editComponent.btnStyle.text"
-            :placeholder="t('goodsBtnTextPlaceholder')"
-            clearable
-            maxlength="4"
-            show-word-limit
-          />
-        </el-form-item>
-      </el-form>
-    </div>
 
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('goodsShowContent') }}</h3>
-      <el-form label-width="90px" class="px-[10px]">
-        <el-form-item
-          :label="t('goodsSelectPopupGoodsName')"
-          v-if="diyStore.editComponent.goodsNameStyle.isShow"
-        >
-          <el-switch v-model="diyStore.editComponent.goodsNameStyle.control" />
-        </el-form-item>
-        <el-form-item
-          :label="t('goodsPriceColor')"
-          v-if="diyStore.editComponent.priceStyle.isShow"
-        >
-          <el-switch v-model="diyStore.editComponent.priceStyle.control" />
-        </el-form-item>
-        <el-form-item
-          :label="t('goodsSaleNum')"
-          v-if="diyStore.editComponent.saleStyle.isShow"
-        >
-          <el-switch v-model="diyStore.editComponent.saleStyle.control" />
-        </el-form-item>
-        <el-form-item
-          :label="t('goodsLabel')"
-          v-if="diyStore.editComponent.labelStyle.isShow"
-        >
-          <el-switch v-model="diyStore.editComponent.labelStyle.control" />
-        </el-form-item>
-      </el-form>
-    </div>
-  </div>
+        <div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t("goodsShowContent") }}</h3>
+			<el-form label-width="90px" class="px-[10px]">
+                <el-form-item :label="t('goodsSelectPopupGoodsName')" v-if="diyStore.editComponent.goodsNameStyle.isShow">
+                    <el-switch v-model="diyStore.editComponent.goodsNameStyle.control" />
+                </el-form-item>
+                <el-form-item :label="t('goodsPriceColor')" v-if="diyStore.editComponent.priceStyle.isShow">
+                    <el-switch v-model="diyStore.editComponent.priceStyle.control" />
+                </el-form-item>
+                <el-form-item :label="t('goodsSaleNum')" v-if="diyStore.editComponent.saleStyle.isShow">
+                    <el-switch v-model="diyStore.editComponent.saleStyle.control" />
+                </el-form-item>
+                <el-form-item :label="t('goodsLabel')" v-if="diyStore.editComponent.labelStyle.isShow">
+                    <el-switch v-model="diyStore.editComponent.labelStyle.control" />
+                </el-form-item>
+			</el-form>
+		</div>
+	</div>
 
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('goodsStyle') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('goodsBgColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.elementBgColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-        <el-form-item :label="t('goodsNameColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.goodsNameStyle.color"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-          <div class="mr-[20px]"></div>
-          <el-radio-group
-            v-model="diyStore.editComponent.goodsNameStyle.fontWeight"
-          >
-            <el-radio :label="'normal'">{{ t('fontWeightNormal') }}</el-radio>
-            <el-radio :label="'bold'">{{ t('fontWeightBold') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item :label="t('goodsPriceColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.priceStyle.color"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-        <el-form-item :label="t('goodsSaleColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.saleStyle.color"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-        <el-form-item :label="t('topRounded')">
-          <el-slider
-            v-model="diyStore.editComponent.topElementRounded"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-            :max="50"
-          />
-        </el-form-item>
-        <el-form-item :label="t('bottomRounded')">
-          <el-slider
-            v-model="diyStore.editComponent.bottomElementRounded"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-            :max="50"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('goodsStyle') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('goodsBgColor')">
+					<el-color-picker v-model="diyStore.editComponent.elementBgColor" show-alpha :predefine="diyStore.predefineColors" />
+				</el-form-item>
+				<el-form-item :label="t('goodsNameColor')">
+					<el-color-picker v-model="diyStore.editComponent.goodsNameStyle.color" show-alpha :predefine="diyStore.predefineColors" />
+					<div class="mr-[20px]"></div>
+					<el-radio-group v-model="diyStore.editComponent.goodsNameStyle.fontWeight">
+						<el-radio :label="'normal'">{{ t('fontWeightNormal') }}</el-radio>
+						<el-radio :label="'bold'">{{ t('fontWeightBold') }}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+				<el-form-item :label="t('goodsPriceColor')">
+					<el-color-picker v-model="diyStore.editComponent.priceStyle.color" show-alpha :predefine="diyStore.predefineColors" />
+				</el-form-item>
+				<el-form-item :label="t('goodsSaleColor')">
+					<el-color-picker v-model="diyStore.editComponent.saleStyle.color" show-alpha :predefine="diyStore.predefineColors" />
+				</el-form-item>
+				<el-form-item :label="t('topRounded')">
+					<el-slider v-model="diyStore.editComponent.topElementRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+				</el-form-item>
+				<el-form-item :label="t('bottomRounded')">
+					<el-slider v-model="diyStore.editComponent.bottomElementRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+				</el-form-item>
+			</el-form>
+		</div>
 
-    <div
-      class="edit-attr-item-wrap"
-      v-if="diyStore.editComponent.btnStyle.control"
-    >
-      <h3 class="mb-[10px]">{{ t('goodsBuyBtn') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item
-          :label="t('goodsIsBold')"
-          v-if="diyStore.editComponent.btnStyle.style == 'button'"
-        >
-          <el-switch v-model="diyStore.editComponent.btnStyle.fontWeight" />
-        </el-form-item>
-        <el-form-item :label="t('goodsTextColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.btnStyle.textColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-        <el-form-item :label="t('listFrameColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.btnStyle.startBgColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-          <icon
-            name="iconfont iconmap-connect"
-            size="20px"
-            class="block !text-gray-400 mx-[5px]"
-          />
-          <el-color-picker
-            v-model="diyStore.editComponent.btnStyle.endBgColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-        <el-form-item
-          :label="t('goodsRounded')"
-          v-if="diyStore.editComponent.btnStyle.style == 'button'"
-        >
-          <el-slider
-            v-model="diyStore.editComponent.btnStyle.aroundRadius"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-            :max="50"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
+        <div class="edit-attr-item-wrap"  v-if="diyStore.editComponent.btnStyle.control">
+			<h3 class="mb-[10px]">{{ t("goodsBuyBtn") }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('goodsIsBold')" v-if="diyStore.editComponent.btnStyle.style == 'button'">
+					<el-switch v-model="diyStore.editComponent.btnStyle.fontWeight" />
+				</el-form-item>
+                <el-form-item :label="t('goodsTextColor')">
+					<el-color-picker v-model="diyStore.editComponent.btnStyle.textColor" show-alpha :predefine="diyStore.predefineColors" />
+				</el-form-item>
+                <el-form-item :label="t('listFrameColor')">
+					<el-color-picker v-model="diyStore.editComponent.btnStyle.startBgColor" show-alpha :predefine="diyStore.predefineColors" />
+                    <icon name="iconfont iconmap-connect" size="20px" class="block !text-gray-400 mx-[5px]"/>
+					<el-color-picker v-model="diyStore.editComponent.btnStyle.endBgColor" show-alpha :predefine="diyStore.predefineColors"/>
+				</el-form-item>
+				<el-form-item :label="t('goodsRounded')" v-if="diyStore.editComponent.btnStyle.style == 'button'">
+					<el-slider v-model="diyStore.editComponent.btnStyle.aroundRadius" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+				</el-form-item>
+			</el-form>
+		</div>
 
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -374,92 +198,93 @@ import { getCategoryTree } from '@/addon/shop/api/goods'
 import { t } from '@/lang'
 import { img } from '@/utils/common'
 import useDiyStore from '@/stores/modules/diy'
-import { ref, reactive, onMounted, nextTick } from 'vue'
+import { ref, reactive, onMounted,nextTick } from 'vue'
 import { ElTable } from 'element-plus'
 import goodsSelectPopup from '@/addon/shop/views/goods/components/goods-select-popup.vue'
 
-const diyStore: any = useDiyStore()
+const diyStore:any = useDiyStore()
 diyStore.editComponent.ignore = [] // 忽略公共属性
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
-  const res = { code: true, message: '' }
+    const res = { code: true, message: '' }
 
-  if (diyStore.value[index].source == 'category') {
-    if (diyStore.value[index].goods_category == '') {
-      res.code = false
-      res.message = t('goodsCategoryPlaceholder')
-    }
-  } else if (diyStore.value[index].source == 'custom') {
-    if (diyStore.value[index].goods_ids.length == 0) {
-      res.code = false
-      res.message = t('goodsPlaceholder')
+    if(diyStore.value[index].source == 'category'){
+        if(diyStore.value[index].goods_category == ''){
+            res.code = false
+            res.message = t('goodsCategoryPlaceholder')
+        }
+    }else if(diyStore.value[index].source == 'custom'){
+        if(diyStore.value[index].goods_ids.length == 0){
+            res.code = false
+            res.message = t('goodsPlaceholder')
+        }
     }
-  }
-  return res
+    return res
 }
 
 const categoryShowDialog = ref(false)
 
 const categoryTable = reactive({
-  loading: true,
-  data: [],
+    loading: true,
+    data: [],
 })
 onMounted(() => {
-  loadCategoryList()
+    loadCategoryList()
 })
 
-const styleChangeFn = (style) => {
-  btnStyleList.forEach((item, index, arr) => {
-    if (item.type == 'button') {
-      if (style == 'style-3') {
-        item.isShow = false
-      } else {
-        item.isShow = true
-      }
-    }
-  })
 
-  if (style == 'style-3') {
-    diyStore.editComponent.btnStyle.style = btnStyleList[1].value
-  } else {
-    diyStore.editComponent.btnStyle.style = btnStyleList[0].value
-  }
+const styleChangeFn = (style)=>{
+    btnStyleList.forEach((item,index,arr)=>{
+        if(item.type == "button"){
+            if(style == "style-3"){
+                item.isShow = false;
+            }else{
+                item.isShow = true;
+            }
+        }
+    })
+
+    if(style == "style-3"){
+        diyStore.editComponent.btnStyle.style = btnStyleList[1].value
+    }else{
+        diyStore.editComponent.btnStyle.style = btnStyleList[0].value
+    }
 
-  if (style == 'style-3') {
-    diyStore.editComponent.saleStyle.isShow = false
-    diyStore.editComponent.labelStyle.isShow = false
-  } else {
-    diyStore.editComponent.saleStyle.isShow = true
-    diyStore.editComponent.labelStyle.isShow = true
-  }
+    if(style == "style-3"){
+        diyStore.editComponent.saleStyle.isShow = false;
+        diyStore.editComponent.labelStyle.isShow = false;
+    }else{
+        diyStore.editComponent.saleStyle.isShow = true;
+        diyStore.editComponent.labelStyle.isShow = true;
+    }
 
-  diyStore.editComponent.style = style
+    diyStore.editComponent.style = style;
 }
 
 const btnStyleList = reactive([
-  {
-    isShow: true,
-    type: 'button',
-    title: diyStore.editComponent.btnStyle.text,
-    value: 'button',
-  },
-  {
-    isShow: true,
-    type: 'icon',
-    title: 'nc-icon-jiahaoV6xx',
-    value: 'nc-icon-jiahaoV6xx',
-  },
-  {
-    isShow: true,
-    type: 'icon',
-    title: 'nc-icon-gouwuche1',
-    value: 'nc-icon-gouwuche1',
-  },
+    {
+        isShow: true,
+        type: 'button',
+        title: diyStore.editComponent.btnStyle.text,
+        value: 'button'
+    },
+    {
+        isShow: true,
+        type: 'icon',
+        title: 'nc-icon-jiahaoV6xx',
+        value: 'nc-icon-jiahaoV6xx'
+    },
+    {
+        isShow: true,
+        type: 'icon',
+        title: 'nc-icon-gouwuche1',
+        value: 'nc-icon-gouwuche1'
+    }
 ])
 
-const changeBtnStyle = (item: any) => {
-  diyStore.editComponent.btnStyle.style = item.value
+const changeBtnStyle = (item:any) => {
+    diyStore.editComponent.btnStyle.style = item.value
 }
 
 const categoryTableRef = ref<InstanceType<typeof ElTable>>()
@@ -468,66 +293,65 @@ const categoryTableRef = ref<InstanceType<typeof ElTable>>()
  */
 let currCategoryData: any = null
 const loadCategoryList = () => {
-  categoryTable.loading = true
+    categoryTable.loading = true
 
-  getCategoryTree()
-    .then((res) => {
-      categoryTable.loading = false
-      categoryTable.data = res.data
-    })
-    .catch(() => {
-      categoryTable.loading = false
+    getCategoryTree().then(res => {
+        categoryTable.loading = false
+        categoryTable.data = res.data
+    }).catch(() => {
+        categoryTable.loading = false
     })
 }
 
 // 选择商品分类
 const handleSelectionChange = (val: string | any[]) => {
-  let data = ''
-  if (val) data = val[val.length - 1]
-  if (val.length > 1) categoryTableRef.value!.clearSelection()
-  if (data) categoryTableRef.value!.toggleRowSelection(data, true)
-  currCategoryData = data
+    let data = ''
+    if (val) data = val[val.length - 1]
+    if (val.length > 1) categoryTableRef.value!.clearSelection()
+    if (data) categoryTableRef.value!.toggleRowSelection(data, true)
+    currCategoryData = data
 }
 
 const saveCategoryId = () => {
-  diyStore.editComponent.goods_category = currCategoryData.category_id
-  diyStore.editComponent.goods_category_name = currCategoryData.category_name
-  categoryShowDialog.value = false
+    diyStore.editComponent.goods_category = currCategoryData.category_id
+    diyStore.editComponent.goods_category_name = currCategoryData.category_name;
+    categoryShowDialog.value = false
 }
 
 const categoryShowDialogOpen = () => {
-  categoryShowDialog.value = true
-  nextTick(() => {
-    setRowSelection()
-  })
+    categoryShowDialog.value = true
+	nextTick(()=>{
+		setRowSelection()
+	})
 }
 
 //分类数据选中回填,设置展开行
 const expand_category_ids = ref<Array<any>>([])
-const setRowSelection = () => {
-  expand_category_ids.value = []
-  categoryTable.data.forEach((el: any) => {
-    if (diyStore.editComponent.goods_category == el.category_id) {
-      categoryTableRef.value!.toggleRowSelection(el, true)
-    } else if (el.child_list && el.child_list.length) {
-      el.child_list.forEach((v: any) => {
-        if (diyStore.editComponent.goods_category == v.category_id) {
-          expand_category_ids.value.push(el.category_id.toString())
-          categoryTableRef.value!.toggleRowSelection(v, true)
-        }
-      })
-    }
-  })
+const setRowSelection = ()=>{
+	expand_category_ids.value = []
+	categoryTable.data.forEach((el:any)=>{
+		if(diyStore.editComponent.goods_category == el.category_id){
+			categoryTableRef.value!.toggleRowSelection(el, true)
+		}else if(el.child_list&&el.child_list.length){
+			el.child_list.forEach((v:any)=>{
+				if(diyStore.editComponent.goods_category == v.category_id){
+					expand_category_ids.value.push(el.category_id.toString())
+					categoryTableRef.value!.toggleRowSelection(v, true)
+				}
+			})
+		}
+	})
 }
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
 <style lang="scss">
-.goods-list-slider {
-  .el-slider__input {
-    width: 100px;
-  }
-}
+	.goods-list-slider {
+		.el-slider__input {
+			width: 100px;
+		}
+	}
 </style>
diff --git a/admin/src/addon/shop/views/diy/components/edit-many-goods-list.vue b/admin/src/addon/shop/views/diy/components/edit-many-goods-list.vue
index f6c3184e..e344d0c6 100644
--- a/admin/src/addon/shop/views/diy/components/edit-many-goods-list.vue
+++ b/admin/src/addon/shop/views/diy/components/edit-many-goods-list.vue
@@ -1,498 +1,272 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('selectStyle') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('styleLabel')">
-          <el-radio-group v-model="diyStore.editComponent.headStyle">
-            <el-radio label="style-1">{{ t('headStyle1') }}</el-radio>
-            <el-radio label="style-2">{{ t('headStyle2') }}</el-radio>
-            <el-radio label="style-3">{{ t('headStyle3') }}</el-radio>
-            <el-radio label="style-4">{{ t('headStyle4') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item
-          :label="t('manyGoodsListAroundRadius')"
-          v-show="diyStore.editComponent.headStyle == 'style-3'"
-        >
-          <el-slider
-            v-model="diyStore.editComponent.aroundRadius"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-            :max="50"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('goodsSet') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('sortWay')">
-          <el-radio-group v-model="diyStore.editComponent.sortWay">
-            <el-radio label="default">{{ t('default') }}</el-radio>
-            <el-radio label="sale_num">{{ t('sales') }}</el-radio>
-            <el-radio label="price">{{ t('price') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item :label="t('goodsNum')">
-          <el-slider
-            show-input
-            class="diy-nav-slider"
-            v-model="diyStore.editComponent.num"
-            :min="1"
-            max="20"
-            size="small"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('manyGoodsListCategorySet') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('dataSources')">
-          <el-radio-group v-model="diyStore.editComponent.source">
-            <el-radio label="custom">{{
-              t('manyGoodsListSourceDiy')
-            }}</el-radio>
-            <el-radio label="goods_category">{{
-              t('manyGoodsListSourceCategory')
-            }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item
-          :label="t('goodsCategoryTitle')"
-          v-show="diyStore.editComponent.source == 'goods_category'"
-        >
-          <el-input
-            v-model.trim="diyStore.editComponent.goods_category_name"
-            :placeholder="t('selectCategory')"
-            readonly
-            class="select-diy-page-input"
-            @click="firstCategoryShowDialogOpen()"
-          >
-            <template #suffix>
-              <div @click.stop="clearCategory">
-                <el-icon v-if="diyStore.editComponent.goods_category_name">
-                  <Close />
-                </el-icon>
-                <el-icon v-else>
-                  <ArrowRight />
-                </el-icon>
-              </div>
-            </template>
-          </el-input>
-        </el-form-item>
-        <div v-show="diyStore.editComponent.source == 'custom'">
-          <p class="text-sm text-gray-400 mb-[10px]">
-            {{ t('dragMouseAdjustOrder') }}
-          </p>
-
-          <div ref="goodsBoxRef">
-            <div
-              v-for="(item, index) in diyStore.editComponent.list"
-              :key="item.id"
-              class="item-wrap p-[10px] pb-0 relative border border-dashed border-gray-300 mb-[16px]"
-            >
-              <el-form-item :label="t('manyGoodsListCategoryName')">
-                <el-input
-                  v-model.trim="item.title"
-                  clearable
-                  maxlength="4"
-                  show-word-limit
-                />
-              </el-form-item>
-              <el-form-item
-                :label="t('manyGoodsListSubTitle')"
-                v-show="diyStore.editComponent.headStyle == 'style-1'"
-              >
-                <el-input
-                  v-model.trim="item.desc"
-                  clearable
-                  maxlength="5"
-                  show-word-limit
-                />
-              </el-form-item>
-              <el-form-item :label="t('goodsSelectPopupSelectGoodsButton')">
-                <el-radio-group v-model="item.source">
-                  <el-radio label="all">{{
-                    t('goodsSelectPopupAllGoods')
-                  }}</el-radio>
-                  <el-radio label="category">{{
-                    t('selectCategory')
-                  }}</el-radio>
-                  <el-radio label="custom">{{
-                    t('manualSelectionSources')
-                  }}</el-radio>
-                </el-radio-group>
-              </el-form-item>
-              <el-form-item
-                :label="t('selectCategory')"
-                v-if="item.source == 'category'"
-              >
-                <div class="flex items-center w-full">
-                  <div
-                    class="cursor-pointer ml-auto"
-                    @click="categoryShowDialogOpen(index)"
-                  >
-                    <span class="text-[var(--el-color-primary)]">{{
-                      item.goods_category_name
-                    }}</span>
-                    <span class="iconfont iconxiangyoujiantou"></span>
-                  </div>
-                </div>
-              </el-form-item>
-              <el-form-item
-                :label="t('customGoods')"
-                v-if="item.source == 'custom'"
-              >
-                <goods-select-popup
-                  ref="goodsSelectPopupRef"
-                  v-model="item.goods_ids"
-                  :min="1"
-                  :max="99"
-                />
-              </el-form-item>
-              <el-form-item
-                :label="t('image')"
-                v-show="diyStore.editComponent.headStyle == 'style-3'"
-              >
-                <upload-image v-model="item.imageUrl" :limit="1" />
-              </el-form-item>
-
-              <div
-                class="del absolute cursor-pointer z-[2] top-[-8px] right-[-8px]"
-                v-show="diyStore.editComponent.list.length > 1"
-                @click="diyStore.editComponent.list.splice(index, 1)"
-              >
-                <icon
-                  name="element CircleCloseFilled"
-                  color="#bbb"
-                  size="20px"
-                />
-              </div>
-            </div>
-          </div>
-
-          <el-button class="w-full" @click="addItem">{{
-            t('manyGoodsLisAddItem')
-          }}</el-button>
-        </div>
-      </el-form>
-
-      <!-- 选择一级商品分类弹出框 -->
-      <el-dialog
-        v-model="firstCategoryShowDialog"
-        :title="t('goodsCategoryTitle')"
-        width="750px"
-        :close-on-press-escape="false"
-        :destroy-on-close="true"
-        :close-on-click-modal="false"
-      >
-        <el-table
-          :data="firstCategoryTable.data"
-          ref="firstCategoryTableRef"
-          size="large"
-          v-loading="firstCategoryTable.loading"
-          height="450px"
-          @current-change="handleCurrentCategoryChange"
-          row-key="category_id"
-          highlight-current-row
-        >
-          <template #empty>
-            <span>{{ !firstCategoryTable.loading ? t('emptyData') : '' }}</span>
-          </template>
-          <el-table-column :label="t('categoryName')" min-width="120">
-            <template #default="{ row }">
-              <span class="order-2">{{ row.category_name }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('categoryImage')" width="170" align="left">
-            <template #default="{ row }">
-              <div class="h-[30px]">
-                <el-image
-                  class="w-[30px] h-[30px]"
-                  :src="img(row.image)"
-                  fit="contain"
-                >
-                  <template #error>
-                    <div class="image-slot">
-                      <img
-                        class="w-[30px] h-[30px]"
-                        src="@/addon/shop/assets/category_default.png"
-                      />
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('selectStyle') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('styleLabel')">
+					<el-radio-group v-model="diyStore.editComponent.headStyle">
+						<el-radio label="style-1">{{ t('headStyle1') }}</el-radio>
+						<el-radio label="style-2">{{ t('headStyle2') }}</el-radio>
+						<el-radio label="style-3">{{ t('headStyle3') }}</el-radio>
+						<el-radio label="style-4">{{ t('headStyle4') }}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+				<el-form-item :label="t('manyGoodsListAroundRadius')" v-show="diyStore.editComponent.headStyle == 'style-3'">
+					<el-slider v-model="diyStore.editComponent.aroundRadius" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+				</el-form-item>
+			</el-form>
+		</div>
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('goodsSet') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('sortWay')">
+					<el-radio-group v-model="diyStore.editComponent.sortWay">
+						<el-radio label="default">{{ t('default') }}</el-radio>
+						<el-radio label="sale_num">{{ t('sales') }}</el-radio>
+						<el-radio label="price">{{ t('price') }}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+				<el-form-item :label="t('goodsNum')">
+					<el-slider show-input class="diy-nav-slider" v-model="diyStore.editComponent.num" :min="1" max="20" size="small" />
+				</el-form-item>
+			</el-form>
+		</div>
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t("manyGoodsListCategorySet") }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('dataSources')">
+					<el-radio-group v-model="diyStore.editComponent.source">
+						<el-radio label="custom">{{ t('manyGoodsListSourceDiy') }}</el-radio>
+						<el-radio label="goods_category">{{ t('manyGoodsListSourceCategory') }}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+				<el-form-item :label="t('goodsCategoryTitle')" v-show="diyStore.editComponent.source == 'goods_category'">
+					<el-input v-model.trim="diyStore.editComponent.goods_category_name" :placeholder="t('selectCategory')" readonly class="select-diy-page-input" @click="firstCategoryShowDialogOpen()">
+						<template #suffix>
+							<div @click.stop="clearCategory">
+								<el-icon v-if="diyStore.editComponent.goods_category_name">
+									<Close />
+								</el-icon>
+								<el-icon v-else>
+									<ArrowRight />
+								</el-icon>
+							</div>
+						</template>
+					</el-input>
+				</el-form-item>
+				<div v-show="diyStore.editComponent.source == 'custom'">
+
+					<p class="text-sm text-gray-400 mb-[10px]">{{ t('dragMouseAdjustOrder') }}</p>
+
+					<div ref="goodsBoxRef">
+						<div v-for="(item,index) in diyStore.editComponent.list" :key="item.id" class="item-wrap p-[10px] pb-0 relative border border-dashed border-gray-300 mb-[16px]">
+
+							<el-form-item :label="t('manyGoodsListCategoryName')">
+								<el-input v-model.trim="item.title" clearable maxlength="4" show-word-limit/>
+							</el-form-item>
+							<el-form-item :label="t('manyGoodsListSubTitle')" v-show="diyStore.editComponent.headStyle == 'style-1'">
+								<el-input v-model.trim="item.desc" clearable maxlength="5" show-word-limit/>
+							</el-form-item>
+							<el-form-item :label="t('goodsSelectPopupSelectGoodsButton')">
+								<el-radio-group v-model="item.source">
+									<el-radio label="all">{{ t('goodsSelectPopupAllGoods') }}</el-radio>
+									<el-radio label="category">{{ t('selectCategory') }}</el-radio>
+									<el-radio label="custom">{{ t('manualSelectionSources') }}</el-radio>
+								</el-radio-group>
+							</el-form-item>
+							<el-form-item :label="t('selectCategory')" v-if="item.source == 'category'">
+								<div class="flex items-center w-full">
+									<div class="cursor-pointer ml-auto" @click="categoryShowDialogOpen(index)">
+										<span class="text-[var(--el-color-primary)]">{{ item.goods_category_name }}</span>
+										<span class="iconfont iconxiangyoujiantou"></span>
+									</div>
+								</div>
+							</el-form-item>
+							<el-form-item :label="t('customGoods')" v-if="item.source == 'custom'">
+								<goods-select-popup ref="goodsSelectPopupRef" v-model="item.goods_ids" :min="1" :max="99" />
+							</el-form-item>
+							<el-form-item :label="t('image')" v-show="diyStore.editComponent.headStyle == 'style-3'">
+								<upload-image v-model="item.imageUrl" :limit="1" />
+							</el-form-item>
+
+							<div class="del absolute cursor-pointer z-[2] top-[-8px] right-[-8px]" v-show="diyStore.editComponent.list.length > 1" @click="diyStore.editComponent.list.splice(index,1)">
+								<icon name="element CircleCloseFilled" color="#bbb" size="20px"/>
+							</div>
+
+						</div>
+					</div>
+
+					<el-button class="w-full" @click="addItem">{{ t('manyGoodsLisAddItem') }}</el-button>
+				</div>
+
+			</el-form>
+
+			<!-- 选择一级商品分类弹出框 -->
+			<el-dialog v-model="firstCategoryShowDialog" :title="t('goodsCategoryTitle')" width="750px" :close-on-press-escape="false" :destroy-on-close="true" :close-on-click-modal="false">
+				<el-table :data="firstCategoryTable.data" ref="firstCategoryTableRef" size="large" v-loading="firstCategoryTable.loading" height="450px" @current-change="handleCurrentCategoryChange" row-key="category_id" highlight-current-row>
+					<template #empty>
+						<span>{{ !firstCategoryTable.loading ? t('emptyData') : '' }}</span>
+					</template>
+					<el-table-column :label="t('categoryName')" min-width="120">
+						<template #default="{ row }">
+							<span class="order-2">{{ row.category_name }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column :label="t('categoryImage')" width="170" align="left">
+						<template #default="{ row }">
+							<div class="h-[30px]">
+								<el-image class="w-[30px] h-[30px] " :src="img(row.image)" fit="contain">
+									<template #error>
+										<div class="image-slot">
+											<img class="w-[30px] h-[30px]" src="@/addon/shop/assets/category_default.png" />
+										</div>
+									</template>
+								</el-image>
+							</div>
+						</template>
+					</el-table-column>
+				</el-table>
+				<div class="flex items-center justify-end mt-[15px]">
+					<el-button type="primary" @click="saveFirstCategoryId">{{ t('confirm') }}</el-button>
+					<el-button @click="firstCategoryShowDialog = false">{{ t('cancel') }}</el-button>
+				</div>
+			</el-dialog>
+
+			<el-dialog v-model="categoryShowDialog" :title="t('goodsCategoryTitle')" width="750px" :close-on-press-escape="false" :destroy-on-close="true" :close-on-click-modal="false">
+				<el-table :data="categoryTable.data" ref="categoryTableRef" size="large" v-loading="categoryTable.loading"
+					height="490px" @selection-change="handleSelectionChange" row-key="category_id"
+					:expand-row-keys="expand_category_ids"
+					:tree-props="{ hasChildren: 'hasChildren', children: 'child_list' }">
+					<template #empty>
+						<span>{{ !categoryTable.loading ? t('emptyData') : '' }}</span>
+					</template>
+					<el-table-column type="selection" width="55" />
+					<el-table-column :label="t('categoryName')" min-width="120">
+						<template #default="{ row }">
+							<span class="order-2">{{ row.category_name }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column :label="t('categoryImage')" width="170" align="left">
+						<template #default="{ row }">
+							<div class="h-[30px]">
+								<el-image class="w-[30px] h-[30px] " :src="img(row.image)" fit="contain">
+									<template #error>
+										<div class="image-slot">
+											<img class="w-[30px] h-[30px]" src="@/addon/shop/assets/category_default.png" />
+										</div>
+									</template>
+								</el-image>
+							</div>
+						</template>
+					</el-table-column>
+				</el-table>
+				<div class="flex items-center justify-end mt-[15px]">
+					<el-button type="primary" @click="saveCategoryId">{{ t('confirm') }}</el-button>
+					<el-button @click="categoryShowDialog = false">{{ t('cancel') }}</el-button>
+				</div>
+			</el-dialog>
+
+		</div>
+
+        <div class="edit-attr-item-wrap mt-[20px]">
+			<h3 class="mb-[10px]">{{ t("goodsBuyBtn") }}</h3>
+			<el-form label-width="90px" class="px-[10px]">
+                <el-form-item :label="t('goodsBtnIsShow')">
+                    <el-switch v-model="diyStore.editComponent.btnStyle.control" />
+                </el-form-item>
+                <el-form-item :label="t('goodsCartIncident')" v-if="diyStore.editComponent.btnStyle.control">
+                    <el-radio-group v-model="diyStore.editComponent.btnStyle.cartEvent">
+						<el-radio label="detail">{{ t('goodsDetail') }}</el-radio>
+					</el-radio-group>
+                </el-form-item>
+                <el-form-item :label="t('goodsBtnStyle')" class="!items-center" v-if="diyStore.editComponent.btnStyle.control">
+                    <div class="flex">
+                        <template v-for="(item,index) in btnStyleList">
+                            <div v-if=" item.isShow == true" class="cursor-pointer flex items-center justify-center border-[1px] border-solid border-transparent rounded-[6px] py-[5px] px-[8px] mr-[10px]" :class="{'!border-[var(--el-color-primary)]': diyStore.editComponent.btnStyle.style == item.value}">
+                                <div v-if="item.type == 'icon'" :class="['nc-iconfont !text-[25px] text-[var(--el-color-primary)]', item.title]" @click="changeBtnStyle(item)"></div>
+                                <div v-if="item.type == 'button'" class="leading-[1] text-[12px] px-[10px] py-[8px] text-[#fff] rounded-[20px] bg-[var(--el-color-primary)]" @click="changeBtnStyle(item)">
+                                    {{item.title}}
+                                </div>
+                            </div>
+                        </template>
                     </div>
-                  </template>
-                </el-image>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="flex items-center justify-end mt-[15px]">
-          <el-button type="primary" @click="saveFirstCategoryId">{{
-            t('confirm')
-          }}</el-button>
-          <el-button @click="firstCategoryShowDialog = false">{{
-            t('cancel')
-          }}</el-button>
-        </div>
-      </el-dialog>
-
-      <el-dialog
-        v-model="categoryShowDialog"
-        :title="t('goodsCategoryTitle')"
-        width="750px"
-        :close-on-press-escape="false"
-        :destroy-on-close="true"
-        :close-on-click-modal="false"
-      >
-        <el-table
-          :data="categoryTable.data"
-          ref="categoryTableRef"
-          size="large"
-          v-loading="categoryTable.loading"
-          height="490px"
-          @selection-change="handleSelectionChange"
-          row-key="category_id"
-          :expand-row-keys="expand_category_ids"
-          :tree-props="{ hasChildren: 'hasChildren', children: 'child_list' }"
-        >
-          <template #empty>
-            <span>{{ !categoryTable.loading ? t('emptyData') : '' }}</span>
-          </template>
-          <el-table-column type="selection" width="55" />
-          <el-table-column :label="t('categoryName')" min-width="120">
-            <template #default="{ row }">
-              <span class="order-2">{{ row.category_name }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('categoryImage')" width="170" align="left">
-            <template #default="{ row }">
-              <div class="h-[30px]">
-                <el-image
-                  class="w-[30px] h-[30px]"
-                  :src="img(row.image)"
-                  fit="contain"
-                >
-                  <template #error>
-                    <div class="image-slot">
-                      <img
-                        class="w-[30px] h-[30px]"
-                        src="@/addon/shop/assets/category_default.png"
-                      />
-                    </div>
-                  </template>
-                </el-image>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="flex items-center justify-end mt-[15px]">
-          <el-button type="primary" @click="saveCategoryId">{{
-            t('confirm')
-          }}</el-button>
-          <el-button @click="categoryShowDialog = false">{{
-            t('cancel')
-          }}</el-button>
-        </div>
-      </el-dialog>
-    </div>
-
-    <div class="edit-attr-item-wrap mt-[20px]">
-      <h3 class="mb-[10px]">{{ t('goodsBuyBtn') }}</h3>
-      <el-form label-width="90px" class="px-[10px]">
-        <el-form-item :label="t('goodsBtnIsShow')">
-          <el-switch v-model="diyStore.editComponent.btnStyle.control" />
-        </el-form-item>
-        <el-form-item
-          :label="t('goodsCartIncident')"
-          v-if="diyStore.editComponent.btnStyle.control"
-        >
-          <el-radio-group v-model="diyStore.editComponent.btnStyle.cartEvent">
-            <el-radio label="detail">{{ t('goodsDetail') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item
-          :label="t('goodsBtnStyle')"
-          class="!items-center"
-          v-if="diyStore.editComponent.btnStyle.control"
-        >
-          <div class="flex">
-            <template v-for="(item, index) in btnStyleList">
-              <div
-                v-if="item.isShow == true"
-                class="cursor-pointer flex items-center justify-center border-[1px] border-solid border-transparent rounded-[6px] py-[5px] px-[8px] mr-[10px]"
-                :class="{
-                  '!border-[var(--el-color-primary)]':
-                    diyStore.editComponent.btnStyle.style == item.value,
-                }"
-              >
-                <div
-                  v-if="item.type == 'icon'"
-                  :class="[
-                    'nc-iconfont !text-[25px] text-[var(--el-color-primary)]',
-                    item.title,
-                  ]"
-                  @click="changeBtnStyle(item)"
-                ></div>
-                <div
-                  v-if="item.type == 'button'"
-                  class="leading-[1] text-[12px] px-[10px] py-[8px] text-[#fff] rounded-[20px] bg-[var(--el-color-primary)]"
-                  @click="changeBtnStyle(item)"
-                >
-                  {{ item.title }}
-                </div>
-              </div>
-            </template>
-          </div>
-        </el-form-item>
-        <el-form-item
-          :label="t('goodsBtnText')"
-          v-if="
-            diyStore.editComponent.btnStyle.control &&
-            diyStore.editComponent.btnStyle.style == 'button'
-          "
-        >
-          <el-input
-            v-model.trim="diyStore.editComponent.btnStyle.text"
-            :placeholder="t('goodsBtnTextPlaceholder')"
-            clearable
-            maxlength="4"
-            show-word-limit
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('goodsShowContent') }}</h3>
-      <el-form label-width="90px" class="px-[10px]">
-        <el-form-item
-          :label="t('goodsSelectPopupGoodsName')"
-          v-if="diyStore.editComponent.goodsNameStyle.isShow"
-        >
-          <el-switch v-model="diyStore.editComponent.goodsNameStyle.control" />
-        </el-form-item>
-        <el-form-item
-          :label="t('goodsPriceColor')"
-          v-if="diyStore.editComponent.priceStyle.isShow"
-        >
-          <el-switch v-model="diyStore.editComponent.priceStyle.control" />
-        </el-form-item>
-        <el-form-item
-          :label="t('goodsSaleNum')"
-          v-if="diyStore.editComponent.saleStyle.isShow"
-        >
-          <el-switch v-model="diyStore.editComponent.saleStyle.control" />
-        </el-form-item>
-        <el-form-item
-          :label="t('goodsLabel')"
-          v-if="diyStore.editComponent.labelStyle.isShow"
-        >
-          <el-switch v-model="diyStore.editComponent.labelStyle.control" />
-        </el-form-item>
-      </el-form>
-    </div>
-  </div>
-
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('goodsStyle') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('goodsBgColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.elementBgColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-        <el-form-item :label="t('goodsNameColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.goodsNameStyle.color"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-          <div class="mr-[20px]"></div>
-          <el-radio-group
-            v-model="diyStore.editComponent.goodsNameStyle.fontWeight"
-          >
-            <el-radio :label="'normal'">{{ t('fontWeightNormal') }}</el-radio>
-            <el-radio :label="'bold'">{{ t('fontWeightBold') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item :label="t('goodsPriceColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.priceStyle.color"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-        <el-form-item :label="t('goodsSaleColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.saleStyle.color"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-        <el-form-item :label="t('topRounded')">
-          <el-slider
-            v-model="diyStore.editComponent.topElementRounded"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-            :max="50"
-          />
-        </el-form-item>
-        <el-form-item :label="t('bottomRounded')">
-          <el-slider
-            v-model="diyStore.editComponent.bottomElementRounded"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-            :max="50"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <div
-      class="edit-attr-item-wrap"
-      v-if="diyStore.editComponent.btnStyle.control"
-    >
-      <h3 class="mb-[10px]">{{ t('goodsBuyBtn') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('goodsTextColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.btnStyle.textColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-        <el-form-item :label="t('listFrameColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.btnStyle.startBgColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-          <icon
-            name="iconfont iconmap-connect"
-            size="20px"
-            class="block !text-gray-400 mx-[5px]"
-          />
-          <el-color-picker
-            v-model="diyStore.editComponent.btnStyle.endBgColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
+                </el-form-item>
+                <el-form-item :label="t('goodsBtnText')" v-if="diyStore.editComponent.btnStyle.control && diyStore.editComponent.btnStyle.style == 'button'">
+                    <el-input v-model.trim="diyStore.editComponent.btnStyle.text" :placeholder="t('goodsBtnTextPlaceholder')" clearable maxlength="4" show-word-limit/>
+                </el-form-item>
+			</el-form>
+		</div>
+
+
+        <div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t("goodsShowContent") }}</h3>
+			<el-form label-width="90px" class="px-[10px]">
+                <el-form-item :label="t('goodsSelectPopupGoodsName')" v-if="diyStore.editComponent.goodsNameStyle.isShow">
+                    <el-switch v-model="diyStore.editComponent.goodsNameStyle.control" />
+                </el-form-item>
+                <el-form-item :label="t('goodsPriceColor')" v-if="diyStore.editComponent.priceStyle.isShow">
+                    <el-switch v-model="diyStore.editComponent.priceStyle.control" />
+                </el-form-item>
+                <el-form-item :label="t('goodsSaleNum')" v-if="diyStore.editComponent.saleStyle.isShow">
+                    <el-switch v-model="diyStore.editComponent.saleStyle.control" />
+                </el-form-item>
+                <el-form-item :label="t('goodsLabel')" v-if="diyStore.editComponent.labelStyle.isShow">
+                    <el-switch v-model="diyStore.editComponent.labelStyle.control" />
+                </el-form-item>
+			</el-form>
+		</div>
+	</div>
+
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('goodsStyle') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('goodsBgColor')">
+					<el-color-picker v-model="diyStore.editComponent.elementBgColor" show-alpha :predefine="diyStore.predefineColors" />
+				</el-form-item>
+				<el-form-item :label="t('goodsNameColor')">
+					<el-color-picker v-model="diyStore.editComponent.goodsNameStyle.color" show-alpha :predefine="diyStore.predefineColors" />
+					<div class="mr-[20px]"></div>
+					<el-radio-group v-model="diyStore.editComponent.goodsNameStyle.fontWeight">
+						<el-radio :label="'normal'">{{ t('fontWeightNormal') }}</el-radio>
+						<el-radio :label="'bold'">{{ t('fontWeightBold') }}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+				<el-form-item :label="t('goodsPriceColor')">
+					<el-color-picker v-model="diyStore.editComponent.priceStyle.color" show-alpha :predefine="diyStore.predefineColors" />
+				</el-form-item>
+				<el-form-item :label="t('goodsSaleColor')">
+					<el-color-picker v-model="diyStore.editComponent.saleStyle.color" show-alpha :predefine="diyStore.predefineColors" />
+				</el-form-item>
+				<el-form-item :label="t('topRounded')">
+					<el-slider v-model="diyStore.editComponent.topElementRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+				</el-form-item>
+				<el-form-item :label="t('bottomRounded')">
+					<el-slider v-model="diyStore.editComponent.bottomElementRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+				</el-form-item>
+			</el-form>
+		</div>
+
+        <div class="edit-attr-item-wrap"  v-if="diyStore.editComponent.btnStyle.control">
+			<h3 class="mb-[10px]">{{ t("goodsBuyBtn") }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+                <el-form-item :label="t('goodsTextColor')">
+					<el-color-picker v-model="diyStore.editComponent.btnStyle.textColor" show-alpha :predefine="diyStore.predefineColors" />
+				</el-form-item>
+                <el-form-item :label="t('listFrameColor')">
+					<el-color-picker v-model="diyStore.editComponent.btnStyle.startBgColor" show-alpha :predefine="diyStore.predefineColors" />
+                    <icon name="iconfont iconmap-connect" size="20px" class="block !text-gray-400 mx-[5px]"/>
+					<el-color-picker v-model="diyStore.editComponent.btnStyle.endBgColor" show-alpha :predefine="diyStore.predefineColors"/>
+				</el-form-item>
+			</el-form>
+		</div>
+
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -503,55 +277,56 @@ import { ref, reactive, onMounted, nextTick } from 'vue'
 import { ElTable } from 'element-plus'
 import { range } from 'lodash-es'
 import Sortable from 'sortablejs'
-import { getCategoryTree, getCategoryList } from '@/addon/shop/api/goods'
+import { getCategoryTree,getCategoryList } from '@/addon/shop/api/goods'
 import goodsSelectPopup from '@/addon/shop/views/goods/components/goods-select-popup.vue'
 
-const diyStore: any = useDiyStore()
+const diyStore:any = useDiyStore()
 diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
-  const res = { code: true, message: '' }
-
-  if (diyStore.value[index].source == 'custom') {
-    diyStore.value[index].list.forEach((item: any) => {
-      if (item.source === 'category') {
-        if (item.goods_category == '') {
-          res.code = false
-          res.message = t('goodsCategoryPlaceholder')
-          return res
-        }
-      } else if (item.source == 'custom') {
-        if (item.goods_ids.length == 0) {
-          res.code = false
-          res.message = t('goodsPlaceholder')
+    const res = { code: true, message: '' }
+
+    if(diyStore.value[index].source == 'custom') {
+
+        diyStore.value[index].list.forEach((item: any) => {
+            if (item.source === 'category') {
+                if (item.goods_category == '') {
+                    res.code = false
+                    res.message = t('goodsCategoryPlaceholder')
+                    return res
+                }
+            } else if (item.source == 'custom') {
+                if (item.goods_ids.length == 0) {
+                    res.code = false
+                    res.message = t('goodsPlaceholder')
+                }
+            }
+        });
+    }else if(diyStore.value[index].source == 'goods_category') {
+        if (diyStore.value[index].goods_category == '') {
+            res.code = false
+            res.message = t('goodsCategoryPlaceholder')
+            return res
         }
-      }
-    })
-  } else if (diyStore.value[index].source == 'goods_category') {
-    if (diyStore.value[index].goods_category == '') {
-      res.code = false
-      res.message = t('goodsCategoryPlaceholder')
-      return res
     }
-  }
 
-  return res
+    return res
 }
 
 diyStore.editComponent.list.forEach((item: any) => {
-  if (!item.id) item.id = diyStore.generateRandom()
+    if (!item.id) item.id = diyStore.generateRandom()
 })
 
 // 一级商品分类
 const firstCategoryShowDialog = ref(false)
 
 const firstCategoryTable = reactive({
-  loading: true,
-  data: [],
-  searchParam: {
-    level: 1,
-  },
+    loading: true,
+    data: [],
+    searchParam: {
+        level: 1
+    }
 })
 
 const firstCategoryTableRef = ref<InstanceType<typeof ElTable>>()
@@ -560,70 +335,69 @@ const firstCategoryTableRef = ref<InstanceType<typeof ElTable>>()
  * 获取商品分类列表
  */
 const loadCategoryList = () => {
-  firstCategoryTable.loading = true
-
-  getCategoryList({
-    ...firstCategoryTable.searchParam,
-  })
-    .then((res) => {
-      firstCategoryTable.loading = false
-      firstCategoryTable.data = res.data
-    })
-    .catch(() => {
-      firstCategoryTable.loading = false
+    firstCategoryTable.loading = true
+
+    getCategoryList({
+        ...firstCategoryTable.searchParam
+    }).then(res => {
+        firstCategoryTable.loading = false
+        firstCategoryTable.data = res.data
+    }).catch(() => {
+        firstCategoryTable.loading = false
     })
 }
 
 const saveFirstCategoryId = () => {
-  diyStore.editComponent.goods_category = currFirstCategory.category_id
-  diyStore.editComponent.goods_category_name = currFirstCategory.category_name
-  firstCategoryShowDialog.value = false
+    diyStore.editComponent.goods_category = currFirstCategory.category_id
+    diyStore.editComponent.goods_category_name = currFirstCategory.category_name;
+    firstCategoryShowDialog.value = false
 }
 
 const firstCategoryShowDialogOpen = () => {
-  firstCategoryShowDialog.value = true
-  if (currFirstCategory) {
-    setTimeout(() => {
-      firstCategoryTableRef.value!.setCurrentRow(currFirstCategory)
-    }, 200)
-  }
+    firstCategoryShowDialog.value = true
+    if (currFirstCategory) {
+        setTimeout(() => {
+            firstCategoryTableRef.value!.setCurrentRow(currFirstCategory)
+        }, 200)
+    }
 }
 
+
 const btnStyleList = reactive([
-  {
-    isShow: true,
-    type: 'button',
-    title: diyStore.editComponent.btnStyle.text,
-    value: 'button',
-  },
-  {
-    isShow: true,
-    type: 'icon',
-    title: 'nc-icon-jiahaoV6xx',
-    value: 'nc-icon-jiahaoV6xx',
-  },
-  {
-    isShow: true,
-    type: 'icon',
-    title: 'nc-icon-gouwuche1',
-    value: 'nc-icon-gouwuche1',
-  },
+    {
+        isShow: true,
+        type: 'button',
+        title: diyStore.editComponent.btnStyle.text,
+        value: 'button'
+    },
+    {
+        isShow: true,
+        type: 'icon',
+        title: 'nc-icon-jiahaoV6xx',
+        value: 'nc-icon-jiahaoV6xx'
+    },
+    {
+        isShow: true,
+        type: 'icon',
+        title: 'nc-icon-gouwuche1',
+        value: 'nc-icon-gouwuche1'
+    }
 ])
-diyStore.editComponent.btnStyle.style = 'nc-icon-jiahaoV6xx'
+diyStore.editComponent.btnStyle.style = 'nc-icon-jiahaoV6xx';
 
-const changeBtnStyle = (item: any) => {
-  diyStore.editComponent.btnStyle.style = item.value
+const changeBtnStyle = (item:any) => {
+    diyStore.editComponent.btnStyle.style = item.value
 }
 
-const clearCategory = () => {
-  diyStore.editComponent.goods_category = ''
-  diyStore.editComponent.goods_category_name = ''
+const clearCategory = ()=> {
+    diyStore.editComponent.goods_category = ''
+    diyStore.editComponent.goods_category_name = '';
 }
 
 // 选择商品分类
-let currFirstCategory: any = {}
+let currFirstCategory:any = {}
 const handleCurrentCategoryChange = (val: string | any[]) => {
-  currFirstCategory = val
+    currFirstCategory = val
 }
 
 // 商品分类树结构
@@ -632,31 +406,31 @@ const categoryShowDialog = ref(false)
 const goodsBoxRef = ref()
 
 const categoryTable = reactive({
-  loading: true,
-  data: [],
+    loading: true,
+    data: []
 })
 
 onMounted(() => {
-  loadCategoryTree()
-
-  loadCategoryList()
-
-  nextTick(() => {
-    const sortable = Sortable.create(goodsBoxRef.value, {
-      group: 'item-wrap',
-      animation: 200,
-      onEnd: (event) => {
-        const temp = diyStore.editComponent.list[event.oldIndex!]
-        diyStore.editComponent.list.splice(event.oldIndex!, 1)
-        diyStore.editComponent.list.splice(event.newIndex!, 0, temp)
-        sortable.sort(
-          range(diyStore.editComponent.list.length).map((value) => {
-            return value.toString()
-          })
-        )
-      },
+    loadCategoryTree()
+
+    loadCategoryList()
+
+    nextTick(() => {
+        const sortable = Sortable.create(goodsBoxRef.value, {
+            group: 'item-wrap',
+            animation: 200,
+            onEnd: event => {
+                const temp = diyStore.editComponent.list[event.oldIndex!]
+                diyStore.editComponent.list.splice(event.oldIndex!, 1)
+                diyStore.editComponent.list.splice(event.newIndex!, 0, temp)
+                sortable.sort(
+                    range(diyStore.editComponent.list.length).map(value => {
+                        return value.toString()
+                    })
+                )
+            }
+        })
     })
-  })
 })
 
 const categoryTableRef = ref<InstanceType<typeof ElTable>>()
@@ -666,82 +440,74 @@ const categoryTableRef = ref<InstanceType<typeof ElTable>>()
  */
 let currCategoryData: any = null
 const loadCategoryTree = () => {
-  categoryTable.loading = true
+    categoryTable.loading = true
 
-  getCategoryTree()
-    .then((res) => {
-      categoryTable.loading = false
-      categoryTable.data = res.data
-    })
-    .catch(() => {
-      categoryTable.loading = false
+    getCategoryTree().then(res => {
+        categoryTable.loading = false
+        categoryTable.data = res.data
+    }).catch(() => {
+        categoryTable.loading = false
     })
 }
 
 // 选择商品分类
-let selectIndex = 0 // 当前选择的下标
+let selectIndex = 0; // 当前选择的下标
 const handleSelectionChange = (val: string | any[]) => {
-  let data = ''
-  if (val) data = val[val.length - 1]
-  if (val.length > 1) categoryTableRef.value!.clearSelection()
-  if (data) categoryTableRef.value!.toggleRowSelection(data, true)
-  currCategoryData = data
+    let data = ''
+    if (val) data = val[val.length - 1]
+    if (val.length > 1) categoryTableRef.value!.clearSelection()
+    if (data) categoryTableRef.value!.toggleRowSelection(data, true)
+    currCategoryData = data
 }
 
 const saveCategoryId = () => {
-  diyStore.editComponent.list[selectIndex].goods_category =
-    currCategoryData.category_id
-  diyStore.editComponent.list[selectIndex].goods_category_name =
-    currCategoryData.category_name
-  categoryShowDialog.value = false
+    diyStore.editComponent.list[selectIndex].goods_category = currCategoryData.category_id
+    diyStore.editComponent.list[selectIndex].goods_category_name = currCategoryData.category_name;
+    categoryShowDialog.value = false
 }
 
 const categoryShowDialogOpen = (index: any) => {
-  selectIndex = index
-  categoryShowDialog.value = true
+    selectIndex = index;
+    categoryShowDialog.value = true
 
-  nextTick(() => {
-    setRowSelection()
-  })
+	nextTick(()=>{
+		setRowSelection()
+	})
 }
 
 //分类数据选中回填,设置展开行
 const expand_category_ids = ref<Array<any>>([])
-const setRowSelection = () => {
-  expand_category_ids.value = []
-  categoryTable.data.forEach((el: any) => {
-    if (
-      diyStore.editComponent.list[selectIndex].goods_category == el.category_id
-    ) {
-      categoryTableRef.value!.toggleRowSelection(el, true)
-    } else if (el.child_list && el.child_list.length) {
-      el.child_list.forEach((v: any) => {
-        if (
-          diyStore.editComponent.list[selectIndex].goods_category ==
-          v.category_id
-        ) {
-          expand_category_ids.value.push(el.category_id.toString())
-          categoryTableRef.value!.toggleRowSelection(v, true)
-        }
-      })
-    }
-  })
+const setRowSelection = ()=>{
+	expand_category_ids.value = []
+	categoryTable.data.forEach((el:any)=>{
+		if(diyStore.editComponent.list[selectIndex].goods_category == el.category_id){
+			categoryTableRef.value!.toggleRowSelection(el, true)
+		}else if(el.child_list&&el.child_list.length){
+			el.child_list.forEach((v:any)=>{
+				if(diyStore.editComponent.list[selectIndex].goods_category == v.category_id){
+					expand_category_ids.value.push(el.category_id.toString())
+					categoryTableRef.value!.toggleRowSelection(v, true)
+				}
+			})
+		}
+	})
 }
 
 const addItem = () => {
-  diyStore.editComponent.list.push({
-    id: diyStore.generateRandom(),
-    title: '分类',
-    desc: '分类描述',
-    source: 'all',
-    goods_category: '',
-    goods_category_name: '请选择',
-    goods_ids: [],
-    imageUrl: '',
-  })
+    diyStore.editComponent.list.push({
+        id: diyStore.generateRandom(),
+        title : "分类",
+        desc : "分类描述",
+        source : "all",
+        goods_category : '',
+        goods_category_name : '请选择',
+        goods_ids : [],
+        imageUrl:''
+    })
 }
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/addon/shop/views/diy/components/edit-shop-exchange-goods.vue b/admin/src/addon/shop/views/diy/components/edit-shop-exchange-goods.vue
index cbbb3403..e05caee9 100644
--- a/admin/src/addon/shop/views/diy/components/edit-shop-exchange-goods.vue
+++ b/admin/src/addon/shop/views/diy/components/edit-shop-exchange-goods.vue
@@ -1,8 +1,8 @@
 <template>
-  <div>
-    <!-- 内容 -->
-    <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-      <!-- <div class="edit-attr-item-wrap">
+	<div>
+		<!-- 内容 -->
+		<div class="content-wrap" v-show="diyStore.editTab == 'content'">
+			<!-- <div class="edit-attr-item-wrap">
 				<h3 class="mb-[10px]">{{ t('selectStyle') }}</h3>
 				<div class="flex items-center mb-[18px] rounded overflow-hidden">
 					<span
@@ -19,30 +19,23 @@
 						@click="diyStore.editComponent.style = 'style-3'"></span>
 				</div>
 			</div> -->
-      <div class="edit-attr-item-wrap">
-        <h3 class="mb-[10px]">{{ t('selectSource') }}</h3>
-        <el-form label-width="80px" class="px-[10px]">
-          <el-form-item :label="t('sortWay')">
-            <el-radio-group v-model="diyStore.editComponent.sortWay">
-              <el-radio label="total_order_num">{{ t('default') }}</el-radio>
-              <el-radio label="total_exchange_num">{{ t('sales') }}</el-radio>
-              <el-radio label="price">{{ t('price') }}</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item :label="t('goodsSelectPopupSelectGoodsButton')">
-            <el-radio-group
-              v-model="diyStore.editComponent.source"
-              :title="t('goodsSelectPopupSelectGoodsButton')"
-            >
-              <el-radio label="all">{{
-                t('goodsSelectPopupAllGoods')
-              }}</el-radio>
-              <el-radio label="custom">{{
-                t('manualSelectionSources')
-              }}</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <!-- <el-form-item :label="t('selectCategory')" v-if="diyStore.editComponent.source == 'category'">
+			<div class="edit-attr-item-wrap">
+				<h3 class="mb-[10px]">{{ t("selectSource") }}</h3>
+				<el-form label-width="80px" class="px-[10px]">
+					<el-form-item :label="t('sortWay')">
+						<el-radio-group v-model="diyStore.editComponent.sortWay">
+							<el-radio label="total_order_num">{{ t('default') }}</el-radio>
+							<el-radio label="total_exchange_num">{{ t('sales') }}</el-radio>
+							<el-radio label="price">{{ t('price') }}</el-radio>
+						</el-radio-group>
+					</el-form-item>
+					<el-form-item :label="t('goodsSelectPopupSelectGoodsButton')">
+						<el-radio-group v-model="diyStore.editComponent.source" :title="t('goodsSelectPopupSelectGoodsButton')">
+							<el-radio label="all">{{ t('goodsSelectPopupAllGoods') }}</el-radio>
+							<el-radio label="custom">{{ t('manualSelectionSources') }}</el-radio>
+						</el-radio-group>
+					</el-form-item>
+					<!-- <el-form-item :label="t('selectCategory')" v-if="diyStore.editComponent.source == 'category'">
 						<div class="flex items-center w-full">
 							<div class="cursor-pointer ml-auto" @click="categoryShowDialogOpen">
 								<span class="text-[var(--el-color-primary)]">{{ diyStore.editComponent.goods_category_name }}</span>
@@ -56,95 +49,52 @@
 							<span class="ml-[15px]">{{ diyStore.editComponent.num }}</span>
 						</div>
 					</el-form-item> -->
-          <el-form-item
-            :label="t('customGoods')"
-            v-if="diyStore.editComponent.source == 'custom'"
-          >
-            <el-button
-              type="primary"
-              @click="
-                goodsSelectPopupRef.show(diyStore.editComponent.goods_ids)
-              "
-              >{{ t('goodsSelectPopupSelectGoodsButton') }}</el-button
-            >
-            <div
-              class="inline-block ml-[10px] text-[14px]"
-              v-show="diyStore.editComponent.goods_ids.length"
-            >
-              <span>{{ t('goodsSelectPopupSelect') }}</span>
-              <span class="text-primary mx-[2px]">{{
-                diyStore.editComponent.goods_ids.length
-              }}</span>
-              <span>{{ t('goodsSelectPopupPiece') }}</span>
-            </div>
-            <goods-select-popup
-              ref="goodsSelectPopupRef"
-              :min="1"
-              @select="goodsSelect"
-            />
-          </el-form-item>
-        </el-form>
-      </div>
-    </div>
+					<el-form-item :label="t('customGoods')" v-if="diyStore.editComponent.source == 'custom'">
+						<el-button type="primary" @click="goodsSelectPopupRef.show(diyStore.editComponent.goods_ids)">{{ t('goodsSelectPopupSelectGoodsButton') }}</el-button>
+						<div class="inline-block ml-[10px] text-[14px]" v-show="diyStore.editComponent.goods_ids.length">
+						<span>{{ t('goodsSelectPopupSelect') }}</span>
+						<span class="text-primary mx-[2px]">{{ diyStore.editComponent.goods_ids.length }}</span>
+						<span>{{ t('goodsSelectPopupPiece') }}</span>
+						</div>
+						<goods-select-popup ref="goodsSelectPopupRef" :min="1" @select="goodsSelect"/>
+					</el-form-item>
+				</el-form>
+
+			</div>
+		</div>
 
-    <!-- 样式 -->
-    <div class="style-wrap" v-if="diyStore.editTab == 'style'">
-      <div class="edit-attr-item-wrap">
-        <h3 class="mb-[10px]">{{ t('goodsStyle') }}</h3>
-        <el-form label-width="80px" class="px-[10px]">
-          <el-form-item :label="t('goodsNameColor')">
-            <el-color-picker
-              v-model="diyStore.editComponent.goodsNameStyle.color"
-              show-alpha
-              :predefine="diyStore.predefineColors"
-            />
-            <div class="mr-[20px]"></div>
-            <el-radio-group
-              v-model="diyStore.editComponent.goodsNameStyle.fontWeight"
-            >
-              <el-radio :label="'normal'">{{ t('fontWeightNormal') }}</el-radio>
-              <el-radio :label="'bold'">{{ t('fontWeightBold') }}</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item :label="t('goodsNumColor')">
-            <el-color-picker
-              v-model="diyStore.editComponent.saleStyle.color"
-              show-alpha
-              :predefine="diyStore.predefineColors"
-            />
-          </el-form-item>
-          <el-form-item :label="t('goodsPriceColor')">
-            <el-color-picker
-              v-model="diyStore.editComponent.priceStyle.mainColor"
-              show-alpha
-              :predefine="diyStore.predefineColors"
-            />
-          </el-form-item>
-          <el-form-item :label="t('topRounded')">
-            <el-slider
-              v-model="diyStore.editComponent.topElementRounded"
-              show-input
-              size="small"
-              class="ml-[10px] diy-nav-slider"
-              :max="50"
-            />
-          </el-form-item>
-          <el-form-item :label="t('bottomRounded')">
-            <el-slider
-              v-model="diyStore.editComponent.bottomElementRounded"
-              show-input
-              size="small"
-              class="ml-[10px] diy-nav-slider"
-              :max="50"
-            />
-          </el-form-item>
-        </el-form>
-      </div>
+		<!-- 样式 -->
+		<div class="style-wrap" v-if="diyStore.editTab == 'style'">
+			<div class="edit-attr-item-wrap">
+				<h3 class="mb-[10px]">{{ t('goodsStyle') }}</h3>
+				<el-form label-width="80px" class="px-[10px]">
+					<el-form-item :label="t('goodsNameColor')">
+						<el-color-picker v-model="diyStore.editComponent.goodsNameStyle.color" show-alpha :predefine="diyStore.predefineColors" />
+						<div class="mr-[20px]"></div>
+						<el-radio-group v-model="diyStore.editComponent.goodsNameStyle.fontWeight">
+							<el-radio :label="'normal'">{{ t('fontWeightNormal') }}</el-radio>
+							<el-radio :label="'bold'">{{ t('fontWeightBold') }}</el-radio>
+						</el-radio-group>
+					</el-form-item>
+					<el-form-item :label="t('goodsNumColor')">
+						<el-color-picker v-model="diyStore.editComponent.saleStyle.color" show-alpha :predefine="diyStore.predefineColors" />
+					</el-form-item>
+					<el-form-item :label="t('goodsPriceColor')">
+						<el-color-picker v-model="diyStore.editComponent.priceStyle.mainColor" show-alpha :predefine="diyStore.predefineColors" />
+					</el-form-item>
+					<el-form-item :label="t('topRounded')">
+						<el-slider v-model="diyStore.editComponent.topElementRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+					</el-form-item>
+					<el-form-item :label="t('bottomRounded')">
+						<el-slider v-model="diyStore.editComponent.bottomElementRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+					</el-form-item>
+				</el-form>
+			</div>
 
-      <!-- 组件样式 -->
-      <slot name="style"></slot>
-    </div>
-  </div>
+			<!-- 组件样式 -->
+			<slot name="style"></slot>
+		</div>
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -154,33 +104,34 @@ import useDiyStore from '@/stores/modules/diy'
 import { ref, reactive, onMounted } from 'vue'
 import goodsSelectPopup from '@/addon/shop/views/marketing/exchange/components/goods-select-popup.vue'
 
-const diyStore: any = useDiyStore()
+const diyStore:any = useDiyStore()
 diyStore.editComponent.ignore = [] // 忽略公共属性
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
-  const res = { code: true, message: '' }
+    const res = { code: true, message: '' }
 
-  if (diyStore.value[index].source == 'category') {
-    if (diyStore.value[index].goods_category == '') {
-      res.code = false
-      res.message = t('goodsCategoryPlaceholder')
-    }
-  } else if (diyStore.value[index].source == 'custom') {
-    if (diyStore.value[index].goods_ids.length == 0) {
-      res.code = false
-      res.message = t('goodsPlaceholder')
+    if(diyStore.value[index].source == 'category'){
+        if(diyStore.value[index].goods_category == ''){
+            res.code = false
+            res.message = t('goodsCategoryPlaceholder')
+        }
+    }else if(diyStore.value[index].source == 'custom'){
+        if(diyStore.value[index].goods_ids.length == 0){
+            res.code = false
+            res.message = t('goodsPlaceholder')
+        }
     }
-  }
 
-  return res
+    return res
 }
 
 const goodsSelectPopupRef = ref()
-const goodsSelect = (val: any) => {
-  diyStore.editComponent.goods_ids = val.map((el: any) => el.id)
+const goodsSelect = (val:any)=>{
+	diyStore.editComponent.goods_ids = val.map((el:any)=>el.id)
 }
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/addon/shop/views/diy/components/edit-shop-exchange-info.vue b/admin/src/addon/shop/views/diy/components/edit-shop-exchange-info.vue
index 2c787575..17757aa7 100644
--- a/admin/src/addon/shop/views/diy/components/edit-shop-exchange-info.vue
+++ b/admin/src/addon/shop/views/diy/components/edit-shop-exchange-info.vue
@@ -1,37 +1,38 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('memberStyle') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('bgUrl')">
-          <upload-image v-model="diyStore.editComponent.bgUrl" :limit="1" />
-        </el-form-item>
-      </el-form>
-    </div>
-  </div>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('memberStyle') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('bgUrl')">
+					<upload-image v-model="diyStore.editComponent.bgUrl" :limit="1"/>
+				</el-form-item>
+			</el-form>
+		</div>
+	</div>
 
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+	</div>
 </template>
 
 <script lang="ts" setup>
 import { t } from '@/lang'
 import useDiyStore from '@/stores/modules/diy'
 
-const diyStore: any = useDiyStore()
-diyStore.editComponent.ignore = ['componentBgColor', 'componentBgUrl'] // 忽略公共属性
+const diyStore:any = useDiyStore()
+diyStore.editComponent.ignore = ['componentBgColor','componentBgUrl'] // 忽略公共属性
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
-  const res = { code: true, message: '' }
-  return res
+    const res = { code: true, message: '' }
+    return res
 }
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/addon/shop/views/diy/components/edit-shop-goods-ranking.vue b/admin/src/addon/shop/views/diy/components/edit-shop-goods-ranking.vue
index 9e37f58b..9bb60ec0 100644
--- a/admin/src/addon/shop/views/diy/components/edit-shop-goods-ranking.vue
+++ b/admin/src/addon/shop/views/diy/components/edit-shop-goods-ranking.vue
@@ -1,150 +1,83 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('activeCubeBlockContent') }}</h3>
-      <el-form label-width="85px" class="px-[10px]">
-        <div ref="blockBoxRef">
-          <div
-            v-for="(item, index) in diyStore.editComponent.list"
-            :key="item.id"
-            class="item-wrap p-[10px] pb-0 relative border border-dashed border-gray-300 mb-[16px]"
-          >
-            <el-form-item :label="t('bgImage')">
-              <upload-image v-model="item.bgUrl" :limit="1" />
-            </el-form-item>
-
-            <el-form-item :label="t('listFrameColor')">
-              <el-color-picker
-                v-model="item.listFrame.startColor"
-                show-alpha
-                :predefine="diyStore.predefineColors"
-              />
-              <icon
-                name="iconfont iconmap-connect"
-                size="20px"
-                class="block !text-gray-400 mx-[5px]"
-              />
-              <el-color-picker
-                v-model="item.listFrame.endColor"
-                show-alpha
-                :predefine="diyStore.predefineColors"
-              />
-            </el-form-item>
-
-            <el-form-item :label="t('rankingTitleIcon')">
-              <upload-image v-model="item.imgUrl" :limit="1" />
-            </el-form-item>
-
-            <el-form-item :label="t('rankName')">
-              <el-input
-                v-model="item.text"
-                clearable
-                :placeholder="t('rankNamePlaceholder')"
-                maxlength="8"
-                show-word-limit
-              />
-            </el-form-item>
-            <el-form-item :label="t('rankTextColor')">
-              <el-color-picker
-                v-model="item.textColor"
-                show-alpha
-                :predefine="diyStore.predefineColors"
-              />
-            </el-form-item>
-
-            <el-form-item :label="t('rankingSubTitle')">
-              <el-input
-                v-model.trim="item.subTitle.text"
-                :placeholder="t('activeCubeSubTitlePlaceholder')"
-                clearable
-                maxlength="6"
-                show-word-limit
-              />
-            </el-form-item>
-
-            <el-form-item :label="t('rankingSubTitleTextColor')">
-              <el-color-picker
-                v-model="item.subTitle.textColor"
-                show-alpha
-                :predefine="diyStore.predefineColors"
-              />
-            </el-form-item>
-
-            <el-form-item :label="t('rankingSubTitleLink')">
-              <diy-link v-model="item.subTitle.link" />
-            </el-form-item>
-
-            <el-form-item :label="t('rankSelectPopupSelectRankButton')">
-              <el-radio-group
-                v-model="item.source"
-                :title="t('rankSelectPopupSelectRankButton')"
-              >
-                <el-radio label="default">{{ t('defaultSources') }}</el-radio>
-                <el-radio label="custom">{{
-                  t('manualSelectionSources')
-                }}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-            <el-form-item
-              :label="t('customGoods')"
-              v-if="item.source == 'custom'"
-            >
-              <rank-select-popup
-                ref="goodsSelectPopupRef"
-                v-model="diyStore.editComponent.list[index].rankIds"
-                :max="1"
-              />
-            </el-form-item>
-            <div
-              class="del absolute cursor-pointer z-[2] top-[-8px] right-[-8px]"
-              v-show="diyStore.editComponent.list.length > 1"
-              @click="diyStore.editComponent.list.splice(index, 1)"
-            >
-              <icon name="element CircleCloseFilled" color="#bbb" size="20px" />
-            </div>
-          </div>
+    <!-- 内容 -->
+    <div class="content-wrap" v-show="diyStore.editTab == 'content'">
+        <div class="edit-attr-item-wrap">
+            <h3 class="mb-[10px]">{{ t('activeCubeBlockContent') }}</h3>
+            <el-form label-width="85px" class="px-[10px]">
+
+                <div ref="blockBoxRef">
+                    <div v-for="(item,index) in diyStore.editComponent.list" :key="item.id" class="item-wrap p-[10px] pb-0 relative border border-dashed border-gray-300 mb-[16px]">
+                        <el-form-item :label="t('bgImage')">
+                            <upload-image v-model="item.bgUrl" :limit="1" />
+                        </el-form-item>
+
+                        <el-form-item :label="t('listFrameColor')">
+                            <el-color-picker v-model="item.listFrame.startColor" show-alpha :predefine="diyStore.predefineColors" />
+                            <icon name="iconfont iconmap-connect" size="20px" class="block !text-gray-400 mx-[5px]" />
+                            <el-color-picker v-model="item.listFrame.endColor" show-alpha :predefine="diyStore.predefineColors" />
+                        </el-form-item>
+
+                        <el-form-item :label="t('rankingTitleIcon')">
+                            <upload-image v-model="item.imgUrl" :limit="1" />
+                        </el-form-item>
+
+                        <el-form-item :label="t('rankName')">
+                            <el-input v-model="item.text" clearable :placeholder="t('rankNamePlaceholder')" maxlength="8" show-word-limit />
+                        </el-form-item>
+                        <el-form-item :label="t('rankTextColor')">
+                            <el-color-picker v-model="item.textColor" show-alpha :predefine="diyStore.predefineColors" />
+                        </el-form-item>
+
+                        <el-form-item :label="t('rankingSubTitle')">
+                            <el-input v-model.trim="item.subTitle.text" :placeholder="t('activeCubeSubTitlePlaceholder')" clearable maxlength="6" show-word-limit />
+                        </el-form-item>
+
+                        <el-form-item :label="t('rankingSubTitleTextColor')">
+                            <el-color-picker v-model="item.subTitle.textColor" show-alpha :predefine="diyStore.predefineColors" />
+                        </el-form-item>
+
+                        <el-form-item :label="t('rankingSubTitleLink')">
+                            <diy-link v-model="item.subTitle.link" />
+                        </el-form-item>
+
+                        <el-form-item :label="t('rankSelectPopupSelectRankButton')">
+                            <el-radio-group v-model="item.source" :title="t('rankSelectPopupSelectRankButton')">
+                                <el-radio label="default">{{ t('defaultSources') }}</el-radio>
+                                <el-radio label="custom">{{ t('manualSelectionSources') }}</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                        <el-form-item :label="t('customGoods')" v-if="item.source == 'custom'">
+                            <rank-select-popup ref="goodsSelectPopupRef" v-model="diyStore.editComponent.list[index].rankIds" :max="1" />
+                        </el-form-item>
+                        <div class="del absolute cursor-pointer z-[2] top-[-8px] right-[-8px]" v-show="diyStore.editComponent.list.length > 1" @click="diyStore.editComponent.list.splice(index,1)">
+                            <icon name="element CircleCloseFilled" color="#bbb" size="20px" />
+                        </div>
+                    </div>
+                </div>
+
+                <el-button v-show="diyStore.editComponent.list.length < 10" class="w-full" @click="addItem">{{ t('activeCubeAddItem') }}</el-button>
+
+            </el-form>
         </div>
-
-        <el-button
-          v-show="diyStore.editComponent.list.length < 10"
-          class="w-full"
-          @click="addItem"
-          >{{ t('activeCubeAddItem') }}</el-button
-        >
-      </el-form>
-    </div>
-  </div>
-
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('rankingStyle') }}</h3>
-      <el-form label-width="90px" class="px-[10px]">
-        <el-form-item :label="t('topRounded')">
-          <el-slider
-            v-model="diyStore.editComponent.topElementRounded"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-            :max="50"
-          />
-        </el-form-item>
-        <el-form-item :label="t('bottomRounded')">
-          <el-slider
-            v-model="diyStore.editComponent.bottomElementRounded"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-            :max="50"
-          />
-        </el-form-item>
-      </el-form>
     </div>
 
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
+    <!-- 样式 -->
+    <div class="style-wrap" v-show="diyStore.editTab == 'style'">
+        <div class="edit-attr-item-wrap">
+            <h3 class="mb-[10px]">{{ t('rankingStyle') }}</h3>
+            <el-form label-width="90px" class="px-[10px]">
+                <el-form-item :label="t('topRounded')">
+                    <el-slider v-model="diyStore.editComponent.topElementRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+                </el-form-item>
+                <el-form-item :label="t('bottomRounded')">
+                    <el-slider v-model="diyStore.editComponent.bottomElementRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+                </el-form-item>
+            </el-form>
+        </div>
+
+        <!-- 组件样式 -->
+        <slot name="style"></slot>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -154,44 +87,44 @@ import useDiyStore from '@/stores/modules/diy'
 import { ref, reactive } from 'vue'
 import rankSelectPopup from '@/addon/shop/views/marketing/goods_rank/components/rank-select-popup.vue'
 
-const diyStore: any = useDiyStore()
+const diyStore:any = useDiyStore()
 diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
-  const res = { code: true, message: '' }
-  diyStore.value[index].list.forEach((item: any) => {
-    if (item.source == 'custom') {
-      if (item.rankIds.length == 0) {
-        res.code = false
-        res.message = t('请选择榜单')
-      }
-    }
-  })
-  return res
+    const res = { code: true, message: '' }
+        diyStore.value[index].list.forEach((item: any) => {
+           if (item.source == 'custom') {
+                if (item.rankIds.length == 0) {
+                    res.code = false
+                    res.message = t('请选择榜单')
+                }
+            }
+        });
+    return res
 }
 
 const addItem = () => {
-  diyStore.editComponent.list.push({
-    id: diyStore.generateRandom(),
-    bgUrl: '',
-    text: '榜单名称',
-    textColor: '#FFFFFF',
-    imgUrl: '',
-    subTitle: {
-      text: '查看更多',
-      textColor: '#FFFFFF',
-      link: {
-        name: '',
-      },
-    },
-    listFrame: {
-      startColor: '#FEA715',
-      endColor: '#FE1E00',
-    },
-    source: 'default',
-    rankIds: [],
-  })
+    diyStore.editComponent.list.push({
+        id: diyStore.generateRandom(),
+        bgUrl: '',
+        text: '榜单名称',
+        textColor: "#FFFFFF",
+        imgUrl: "",
+        subTitle: {
+            text: '查看更多',
+            textColor: '#FFFFFF',
+            link: {
+                name: ''
+            }
+        },
+        listFrame: {
+            startColor: '#FEA715',
+            endColor: '#FE1E00',
+        },
+        source: 'default',
+        rankIds: []
+    })
 }
 
 defineExpose({})
diff --git a/admin/src/addon/shop/views/diy/components/edit-shop-goods-recommend.vue b/admin/src/addon/shop/views/diy/components/edit-shop-goods-recommend.vue
index d8025a11..e51c4fe5 100644
--- a/admin/src/addon/shop/views/diy/components/edit-shop-goods-recommend.vue
+++ b/admin/src/addon/shop/views/diy/components/edit-shop-goods-recommend.vue
@@ -1,281 +1,185 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('selectSource') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('goodsSelectPopupSelectGoodsButton')">
-          <el-radio-group
-            v-model="diyStore.editComponent.source"
-            :title="t('goodsSelectPopupSelectGoodsButton')"
-          >
-            <el-radio label="all">{{ t('defaultGoodsSelect') }}</el-radio>
-            <el-radio label="custom">{{
-              t('manualSelectionSources')
-            }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item
-          :label="t('customGoods')"
-          v-if="diyStore.editComponent.source == 'custom'"
-        >
-          <goods-select-popup
-            ref="goodsSelectPopupRef"
-            v-model="diyStore.editComponent.goods_ids"
-            :min="diyStore.editComponent.list.length"
-            :max="diyStore.editComponent.list.length"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t("selectSource") }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('goodsSelectPopupSelectGoodsButton')">
+					<el-radio-group v-model="diyStore.editComponent.source" :title="t('goodsSelectPopupSelectGoodsButton')">
+						<el-radio label="all">{{ t('defaultGoodsSelect') }}</el-radio>
+						<el-radio label="custom">{{ t('manualSelectionSources') }}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+				<el-form-item :label="t('customGoods')" v-if="diyStore.editComponent.source == 'custom'">
+					<goods-select-popup ref="goodsSelectPopupRef" v-model="diyStore.editComponent.goods_ids" :min="diyStore.editComponent.list.length" :max="diyStore.editComponent.list.length" />
+				</el-form-item>
+			</el-form>
+		</div>
 
-    <div class="edit-attr-item-wrap">
-      <el-form label-width="120px" class="px-[10px]">
-        <h3 class="mb-[10px]">{{ t('activeCubeBlockContent') }}</h3>
-        <p class="text-sm text-gray-400 mb-[10px]">
-          {{ t('dragMouseAdjustOrder') }}
-        </p>
-        <div ref="blockBoxRef">
-          <div
-            v-for="(item, index) in diyStore.editComponent.list"
-            :key="item.id"
-            class="item-wrap p-[10px] pb-0 relative border border-dashed border-gray-300 mb-[16px]"
-          >
-            <el-form-item :label="t('activeCubeTitle')">
-              <el-input
-                v-model.trim="item.title.text"
-                :placeholder="t('activeCubeTitlePlaceholder')"
-                clearable
-                maxlength="4"
-                show-word-limit
-              />
-            </el-form-item>
-            <el-form-item :label="t('shopGoodsRecommendComponentTag')">
-              <el-input
-                v-model.trim="item.moreTitle.text"
-                :placeholder="t('shopGoodsRecommendComponentTagPlaceholder')"
-                clearable
-                maxlength="2"
-                show-word-limit
-              />
-            </el-form-item>
-            <el-form-item :label="t('activeCubeButton')">
-              <el-input
-                v-model.trim="item.button.text"
-                :placeholder="t('activeCubeButtonPlaceholder')"
-                clearable
-                maxlength="2"
-                show-word-limit
-              />
-            </el-form-item>
-            <el-form-item :label="t('activeCubeSubTitleTextColor')">
-              <el-color-picker
-                v-model="item.title.textColor"
-                show-alpha
-                :predefine="diyStore.predefineColors"
-              />
-            </el-form-item>
-            <el-form-item :label="t('shopGoodsRecommendComponentTagcolor')">
-              <el-color-picker
-                v-model="item.moreTitle.startColor"
-                show-alpha
-                :predefine="diyStore.predefineColors"
-              />
-              <icon
-                name="iconfont iconmap-connect"
-                size="20px"
-                class="block !text-gray-400 mx-[5px]"
-              />
-              <el-color-picker
-                v-model="item.moreTitle.endColor"
-                show-alpha
-                :predefine="diyStore.predefineColors"
-              />
-            </el-form-item>
-            <el-form-item :label="t('activeCubeButtonColor')">
-              <el-color-picker
-                v-model="item.button.color"
-                show-alpha
-                :predefine="diyStore.predefineColors"
-              />
-            </el-form-item>
-            <el-form-item :label="t('activeListFrameColor')">
-              <el-color-picker
-                v-model="item.listFrame.startColor"
-                show-alpha
-                :predefine="diyStore.predefineColors"
-              />
-              <icon
-                name="iconfont iconmap-connect"
-                size="20px"
-                class="block !text-gray-400 mx-[5px]"
-              />
-              <el-color-picker
-                v-model="item.listFrame.endColor"
-                show-alpha
-                :predefine="diyStore.predefineColors"
-              />
-            </el-form-item>
-            <div
-              class="del absolute cursor-pointer z-[2] top-[-8px] right-[-8px]"
-              v-show="diyStore.editComponent.list.length > 1"
-              @click="deleteTempFn(index)"
-            >
-              <icon name="element CircleCloseFilled" color="#bbb" size="20px" />
-            </div>
-          </div>
-        </div>
-        <el-button
-          v-show="diyStore.editComponent.list.length < 10"
-          class="w-full"
-          @click="addItem"
-          >{{ t('activeCubeAddItem') }}</el-button
-        >
-      </el-form>
-    </div>
-  </div>
+		<div class="edit-attr-item-wrap">
+			<el-form label-width="120px" class="px-[10px]">
+				<h3 class="mb-[10px]">{{ t('activeCubeBlockContent') }}</h3>
+				<p class="text-sm text-gray-400 mb-[10px]">{{ t('dragMouseAdjustOrder') }}</p>
+				<div ref="blockBoxRef">
+					<div v-for="(item,index) in diyStore.editComponent.list" :key="item.id" class="item-wrap p-[10px] pb-0 relative border border-dashed border-gray-300 mb-[16px]">
+						<el-form-item :label="t('activeCubeTitle')">
+							<el-input v-model.trim="item.title.text" :placeholder="t('activeCubeTitlePlaceholder')" clearable maxlength="4" show-word-limit/>
+						</el-form-item>
+						<el-form-item :label="t('shopGoodsRecommendComponentTag')">
+							<el-input v-model.trim="item.moreTitle.text" :placeholder="t('shopGoodsRecommendComponentTagPlaceholder')" clearable maxlength="2" show-word-limit/>
+						</el-form-item>
+						<el-form-item :label="t('activeCubeButton')">
+							<el-input v-model.trim="item.button.text" :placeholder="t('activeCubeButtonPlaceholder')" clearable maxlength="2" show-word-limit/>
+						</el-form-item>
+						<el-form-item :label="t('activeCubeSubTitleTextColor')">
+                            <el-color-picker v-model="item.title.textColor" show-alpha :predefine="diyStore.predefineColors" />
+                        </el-form-item>
+						<el-form-item :label="t('shopGoodsRecommendComponentTagcolor')">
+							<el-color-picker v-model="item.moreTitle.startColor" show-alpha :predefine="diyStore.predefineColors" />
+							<icon name="iconfont iconmap-connect" size="20px" class="block !text-gray-400 mx-[5px]"/>
+							<el-color-picker v-model="item.moreTitle.endColor" show-alpha :predefine="diyStore.predefineColors"/>
+						</el-form-item>
+						<el-form-item :label="t('activeCubeButtonColor')">
+							<el-color-picker v-model="item.button.color" show-alpha :predefine="diyStore.predefineColors" />
+						</el-form-item>
+						<el-form-item :label="t('activeListFrameColor')">
+							<el-color-picker v-model="item.listFrame.startColor" show-alpha :predefine="diyStore.predefineColors" />
+							<icon name="iconfont iconmap-connect" size="20px" class="block !text-gray-400 mx-[5px]"/>
+							<el-color-picker v-model="item.listFrame.endColor" show-alpha :predefine="diyStore.predefineColors"/>
+						</el-form-item>
+						<div class="del absolute cursor-pointer z-[2] top-[-8px] right-[-8px]" v-show="diyStore.editComponent.list.length > 1" @click="deleteTempFn(index)">
+							<icon name="element CircleCloseFilled" color="#bbb" size="20px"/>
+						</div>
+					</div>
+				</div>
+				<el-button v-show="diyStore.editComponent.list.length < 10" class="w-full" @click="addItem">{{ t('activeCubeAddItem') }}</el-button>
+			</el-form>
+		</div>
+	</div>
 
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('goodsStyle') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('goodsPriceColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.priceStyle.mainColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-        <el-form-item :label="t('topRounded')">
-          <el-slider
-            v-model="diyStore.editComponent.topElementRounded"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-            :max="50"
-          />
-        </el-form-item>
-        <el-form-item :label="t('bottomRounded')">
-          <el-slider
-            v-model="diyStore.editComponent.bottomElementRounded"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-            :max="50"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('goodsStyle') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+			<el-form-item :label="t('goodsPriceColor')">
+					<el-color-picker v-model="diyStore.editComponent.priceStyle.mainColor" show-alpha :predefine="diyStore.predefineColors" />
+				</el-form-item>
+				<el-form-item :label="t('topRounded')">
+					<el-slider v-model="diyStore.editComponent.topElementRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+				</el-form-item>
+				<el-form-item :label="t('bottomRounded')">
+					<el-slider v-model="diyStore.editComponent.bottomElementRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+				</el-form-item>
+			</el-form>
+		</div>
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+	</div>
 </template>
 
 <script lang="ts" setup>
 import { t } from '@/lang'
 import { img } from '@/utils/common'
 import useDiyStore from '@/stores/modules/diy'
-import { ref, reactive, onMounted, nextTick } from 'vue'
+import { ref, reactive, onMounted,nextTick } from 'vue'
 import goodsSelectPopup from '@/addon/shop/views/goods/components/goods-select-popup.vue'
 import Sortable from 'sortablejs'
 import { range } from 'lodash-es'
 
-const diyStore: any = useDiyStore()
+const diyStore:any = useDiyStore()
 diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
-  const res = { code: true, message: '' }
-  diyStore.value[index].list.forEach((item: any) => {
-    if (!item.title.text) {
-      res.code = false
-      res.message = t('activeCubeTitlePlaceholder')
-      return res
-    }
-    if (!item.moreTitle.text) {
-      res.code = false
-      res.message = t('shopGoodsRecommendComponentTagPlaceholder')
-      return res
-    }
-    if (!item.button.text) {
-      res.code = false
-      res.message = t('activeCubeButtonPlaceholder')
-      return res
-    }
-  })
+    const res = { code: true, message: '' }
+    diyStore.value[index].list.forEach((item: any) => {
+		if (!item.title.text) {
+            res.code = false
+            res.message = t('activeCubeTitlePlaceholder')
+            return res
+        }
+		if (!item.moreTitle.text) {
+            res.code = false
+            res.message = t('shopGoodsRecommendComponentTagPlaceholder')
+            return res
+        }
+		if (!item.button.text) {
+            res.code = false
+            res.message = t('activeCubeButtonPlaceholder')
+            return res
+        }
+    })
 
-  if (
-    diyStore.value[index].source == 'custom' &&
-    diyStore.value[index].goods_ids.length < diyStore.value[index].list.length
-  ) {
-    res.code = false
-    res.message = t('goodsPlaceholder')
+    if (diyStore.value[index].source == 'custom' && diyStore.value[index].goods_ids.length < diyStore.value[index].list.length) {
+        res.code = false
+        res.message = t('goodsPlaceholder')
+        return res
+    }
     return res
-  }
-  return res
 }
 
 diyStore.editComponent.list.forEach((item: any) => {
-  if (!item.id) item.id = diyStore.generateRandom()
+    if (!item.id) item.id = diyStore.generateRandom()
 })
 
 const blockBoxRef = ref()
 
 onMounted(() => {
-  nextTick(() => {
-    const sortable = Sortable.create(blockBoxRef.value, {
-      group: 'item-wrap',
-      animation: 200,
-      onEnd: (event) => {
-        const temp = diyStore.editComponent.list[event.oldIndex!]
-        diyStore.editComponent.list.splice(event.oldIndex!, 1)
-        diyStore.editComponent.list.splice(event.newIndex!, 0, temp)
-        sortable.sort(
-          range(diyStore.editComponent.list.length).map((value) => {
-            return value.toString()
-          })
-        )
-      },
-    })
+    nextTick(() => {
+        const sortable = Sortable.create(blockBoxRef.value, {
+            group: 'item-wrap',
+            animation: 200,
+            onEnd: event => {
+                const temp = diyStore.editComponent.list[event.oldIndex!]
+                diyStore.editComponent.list.splice(event.oldIndex!, 1)
+                diyStore.editComponent.list.splice(event.newIndex!, 0, temp)
+                sortable.sort(
+                    range(diyStore.editComponent.list.length).map(value => {
+                        return value.toString()
+                    })
+                )
+            }
+        })
 
-    let listNum = diyStore.editComponent.list.length
-    let goodsIdNum = diyStore.editComponent.goods_ids.length
-    diyStore.editComponent.goods_ids.splice(listNum, goodsIdNum)
-  })
+        let listNum = diyStore.editComponent.list.length;
+        let goodsIdNum = diyStore.editComponent.goods_ids.length;
+        diyStore.editComponent.goods_ids.splice(listNum, goodsIdNum);
+    })
 })
 
 const addItem = () => {
-  diyStore.editComponent.list.push({
-    id: diyStore.generateRandom(),
-    title: {
-      text: '标题',
-      textColor: '#303133',
-    },
-    moreTitle: {
-      text: '精选',
-      startColor: '#FF7234',
-      endColor: '#FF213F',
-    },
-    listFrame: {
-      startColor: '#FFE5E5',
-      endColor: '#FFF5F0',
-    },
-    button: {
-      text: '首单',
-      textColor: '#FFFFFF',
-      color: '#FF1128',
-    },
-    goodsId: [],
-  })
+	diyStore.editComponent.list.push({
+		id: diyStore.generateRandom(),
+		title: {
+			text: '标题',
+			textColor: '#303133'
+		},
+		moreTitle: {
+			text: '精选',
+			startColor: '#FF7234',
+			endColor: '#FF213F'
+		},
+		listFrame: {
+			startColor: '#FFE5E5',
+			endColor: '#FFF5F0'
+		},
+		button : {
+			text: "首单",
+			textColor: "#FFFFFF",
+			color: "#FF1128",
+        },
+		goodsId: [],
+	})
 }
 
-const deleteTempFn = (index) => {
-  diyStore.editComponent.list.splice(index, 1)
-  diyStore.editComponent.goods_ids.splice(index, 1)
+const deleteTempFn = (index) =>{
+    diyStore.editComponent.list.splice(index,1);
+    diyStore.editComponent.goods_ids.splice(index,1);
 }
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/addon/shop/views/diy/components/edit-shop-member-info.vue b/admin/src/addon/shop/views/diy/components/edit-shop-member-info.vue
index f7e24614..10a65585 100644
--- a/admin/src/addon/shop/views/diy/components/edit-shop-member-info.vue
+++ b/admin/src/addon/shop/views/diy/components/edit-shop-member-info.vue
@@ -1,41 +1,41 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('memberStyle') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('bgUrl')">
-          <upload-image v-model="diyStore.editComponent.bgUrl" :limit="1" />
-        </el-form-item>
-      </el-form>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('shopMemberInfoComponentAccount')">
-          <el-switch v-model="diyStore.editComponent.isShowAccount" />
-        </el-form-item>
-      </el-form>
-    </div>
-  </div>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('memberStyle') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('bgUrl')">
+					<upload-image v-model="diyStore.editComponent.bgUrl" :limit="1"/>
+				</el-form-item>
+			</el-form>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('shopMemberInfoComponentAccount')">
+					<el-switch v-model="diyStore.editComponent.isShowAccount" />
+				</el-form-item>
+			</el-form>
+		</div>
+	</div>
 
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('memberStyle') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('textColor')">
-          <el-color-picker v-model="diyStore.editComponent.textColor" />
-        </el-form-item>
-      </el-form>
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('memberStyle') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('textColor')">
+					<el-color-picker v-model="diyStore.editComponent.textColor"/>
+				</el-form-item>
+			</el-form>
+			
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('shopMemberInfoComponentUidTextColor')">
+					<el-color-picker v-model="diyStore.editComponent.uidTextColor"/>
+				</el-form-item>
+			</el-form>
+		</div>
 
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('shopMemberInfoComponentUidTextColor')">
-          <el-color-picker v-model="diyStore.editComponent.uidTextColor" />
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -46,6 +46,7 @@ const diyStore = useDiyStore()
 diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/addon/shop/views/diy/components/edit-shop-newcomer.vue b/admin/src/addon/shop/views/diy/components/edit-shop-newcomer.vue
index 7b5260f1..5feb6593 100644
--- a/admin/src/addon/shop/views/diy/components/edit-shop-newcomer.vue
+++ b/admin/src/addon/shop/views/diy/components/edit-shop-newcomer.vue
@@ -1,232 +1,116 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('styleRecommend') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('selectStyle')" class="flex">
-          <span
-            class="text-primary flex-1 cursor-pointer"
-            @click="showTitleStyle"
-            >{{ diyStore.editComponent.style.title }}</span
-          >
-          <el-icon>
-            <ArrowRight />
-          </el-icon>
-        </el-form-item>
-      </el-form>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
+        <div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('styleRecommend') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('selectStyle')" class="flex">
+					<span class="text-primary flex-1 cursor-pointer" @click="showTitleStyle">{{ diyStore.editComponent.style.title }}</span>
+					<el-icon>
+						<ArrowRight />
+					</el-icon>
+				</el-form-item>
+			</el-form>
 
-      <el-dialog
-        v-model="showTitleDialog"
-        :title="t('selectStyle')"
-        width="460px"
-      >
-        <div class="flex flex-wrap">
-          <template v-for="(item, index) in styleList" :key="index">
-            <div
-              :class="{ 'border-primary': selectStyle.value == item.value }"
-              @click="changeTitleStyle(item)"
-              class="flex items-center justify-center overflow-hidden w-[200px] h-[100px] mr-[12px] mb-[12px] cursor-pointer border bg-[#eee]"
-            >
-              <img :src="img(item.url)" />
-            </div>
-          </template>
-        </div>
-        <template #footer>
-          <span class="dialog-footer">
-            <el-button @click="showTitleDialog = false">{{
-              t('cancel')
-            }}</el-button>
-            <el-button type="primary" @click="confirmTitleStyle">{{
-              t('confirm')
-            }}</el-button>
-          </span>
-        </template>
-      </el-dialog>
-    </div>
+			<el-dialog v-model="showTitleDialog" :title="t('selectStyle')" width="460px">
+				<div class="flex flex-wrap">
+					<template v-for="(item,index) in styleList" :key="index">
+						<div :class="{ 'border-primary': selectStyle.value == item.value }" @click="changeTitleStyle(item)" class="flex items-center justify-center overflow-hidden w-[200px] h-[100px] mr-[12px] mb-[12px] cursor-pointer border bg-[#eee]">
+							<img :src="img(item.url)" />
+						</div>
+					</template>
+				</div>
+				<template #footer>
+					<span class="dialog-footer">
+						<el-button @click="showTitleDialog = false">{{ t('cancel') }}</el-button>
+						<el-button type="primary" @click="confirmTitleStyle">{{ t('confirm') }}</el-button>
+					</span>
+				</template>
 
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('titleContent') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('image')">
-          <upload-image v-model="diyStore.editComponent.textImg" :limit="1" />
-        </el-form-item>
-        <el-form-item
-          :label="t('subTitle')"
-          v-show="
-            diyStore.editComponent &&
-            diyStore.editComponent.style &&
-            diyStore.editComponent.style.value == 'style-3'
-          "
-        >
-          <el-input
-            v-model.trim="diyStore.editComponent.subTitle.text"
-            :placeholder="t('subTitlePlaceholder')"
-            clearable
-            maxlength="8"
-            show-word-limit
-          />
-        </el-form-item>
-        <el-form-item
-          :label="t('link')"
-          v-show="
-            diyStore.editComponent &&
-            diyStore.editComponent.style &&
-            diyStore.editComponent.style.value == 'style-3'
-          "
-        >
-          <diy-link v-model="diyStore.editComponent.subTitle.link" />
-        </el-form-item>
-      </el-form>
-    </div>
+			</el-dialog>
+		</div>
 
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('selectSource') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('goodsSelectPopupSelectGoodsButton')">
-          <el-radio-group
-            v-model="diyStore.editComponent.source"
-            :title="t('goodsSelectPopupSelectGoodsButton')"
-          >
-            <el-radio label="all">{{ t('goodsSelectPopupAllGoods') }}</el-radio>
-            <el-radio label="custom">{{
-              t('manualSelectionSources')
-            }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item
-          :label="t('goodsNum')"
-          v-if="
-            diyStore.editComponent.source == 'all' ||
-            diyStore.editComponent.source == 'category'
-          "
-        >
-          <el-slider
-            class="goods-list-slider"
-            show-input
-            v-model="diyStore.editComponent.num"
-            :min="1"
-            max="20"
-            size="small"
-          />
-        </el-form-item>
-        <el-form-item
-          :label="t('customGoods')"
-          v-if="diyStore.editComponent.source == 'custom'"
-        >
-          <newcomer-goods-select-popup
-            ref="goodsSelectPopupRef"
-            v-model="diyStore.editComponent.goods_ids"
-            :min="1"
-            :max="99"
-            mode="sku"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-  </div>
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('titleContent') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+                <el-form-item :label="t('image')">
+                    <upload-image v-model="diyStore.editComponent.textImg" :limit="1"/>
+                </el-form-item>
+                <el-form-item :label="t('subTitle')" v-show="diyStore.editComponent && diyStore.editComponent.style && diyStore.editComponent.style.value == 'style-3'">
+                    <el-input v-model.trim="diyStore.editComponent.subTitle.text" :placeholder="t('subTitlePlaceholder')" clearable maxlength="8" show-word-limit />
+                </el-form-item>
+                <el-form-item :label="t('link')" v-show="diyStore.editComponent && diyStore.editComponent.style && diyStore.editComponent.style.value == 'style-3'">
+                    <diy-link v-model="diyStore.editComponent.subTitle.link"/>
+                </el-form-item>
+			</el-form>
+		</div>
 
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('goodsStyle') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('topRounded')">
-          <el-slider
-            v-model="diyStore.editComponent.topElementRounded"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-            :max="50"
-          />
-        </el-form-item>
-        <el-form-item :label="t('bottomRounded')">
-          <el-slider
-            v-model="diyStore.editComponent.bottomElementRounded"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-            :max="50"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-    <div
-      class="edit-attr-item-wrap"
-      v-if="
-        diyStore.editComponent &&
-        diyStore.editComponent.style &&
-        diyStore.editComponent.style.value == 'style-3'
-      "
-    >
-      <h3 class="mb-[10px]">{{ t('subTitleStyle') }}</h3>
-      <el-form label-width="90px" class="px-[10px]">
-        <el-form-item :label="t('textColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.subTitle.textColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-        <el-form-item :label="t('subTextBgColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.subTitle.startColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-          <icon
-            name="iconfont iconmap-connect"
-            size="20px"
-            class="block !text-gray-400 mx-[5px]"
-          />
-          <el-color-picker
-            v-model="diyStore.editComponent.subTitle.endColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('countDownStyle') }}</h3>
-      <el-form label-width="90px" class="px-[10px]">
-        <el-form-item :label="t('newcomerNumberColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.countDown.numberColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-        <el-form-item :label="t('newcomerNumberBg')">
-          <el-color-picker
-            v-model="diyStore.editComponent.countDown.numberBg.startColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-          <icon
-            name="iconfont iconmap-connect"
-            size="20px"
-            class="block !text-gray-400 mx-[5px]"
-          />
-          <el-color-picker
-            v-model="diyStore.editComponent.countDown.numberBg.endColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-        <el-form-item :label="t('newcomerOtherColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.countDown.otherColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t("selectSource") }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('goodsSelectPopupSelectGoodsButton')">
+					<el-radio-group v-model="diyStore.editComponent.source" :title="t('goodsSelectPopupSelectGoodsButton')">
+						<el-radio label="all">{{ t('goodsSelectPopupAllGoods') }}</el-radio>
+						<el-radio label="custom">{{ t('manualSelectionSources') }}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+				<el-form-item :label="t('goodsNum')" v-if="diyStore.editComponent.source == 'all' || diyStore.editComponent.source == 'category'">
+					<el-slider class="goods-list-slider" show-input v-model="diyStore.editComponent.num" :min="1" max="20" size="small" />
+				</el-form-item>
+				<el-form-item :label="t('customGoods')" v-if="diyStore.editComponent.source == 'custom'">
+					<newcomer-goods-select-popup ref="goodsSelectPopupRef" v-model="diyStore.editComponent.goods_ids" :min="1" :max="99" mode="sku" />
+				</el-form-item>
+			</el-form>
 
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
+		</div>
+	</div>
+
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+        <div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('goodsStyle') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('topRounded')">
+					<el-slider v-model="diyStore.editComponent.topElementRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+				</el-form-item>
+				<el-form-item :label="t('bottomRounded')">
+					<el-slider v-model="diyStore.editComponent.bottomElementRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+				</el-form-item>
+			</el-form>
+		</div>
+		<div class="edit-attr-item-wrap"  v-if="diyStore.editComponent && diyStore.editComponent.style && diyStore.editComponent.style.value == 'style-3'">
+			<h3 class="mb-[10px]">{{ t('subTitleStyle') }}</h3>
+			<el-form label-width="90px" class="px-[10px]">
+					<el-form-item :label="t('textColor')">
+						<el-color-picker v-model="diyStore.editComponent.subTitle.textColor" show-alpha :predefine="diyStore.predefineColors"/>
+					</el-form-item>
+				<el-form-item :label="t('subTextBgColor')">
+					<el-color-picker v-model="diyStore.editComponent.subTitle.startColor" show-alpha :predefine="diyStore.predefineColors"/>
+					<icon name="iconfont iconmap-connect" size="20px" class="block !text-gray-400 mx-[5px]"/>
+					<el-color-picker v-model="diyStore.editComponent.subTitle.endColor" show-alpha :predefine="diyStore.predefineColors"/>
+				</el-form-item>
+			</el-form>
+		</div>
+        <div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('countDownStyle') }}</h3>
+			<el-form label-width="90px" class="px-[10px]">
+                <el-form-item :label="t('newcomerNumberColor')">
+                    <el-color-picker v-model="diyStore.editComponent.countDown.numberColor" show-alpha :predefine="diyStore.predefineColors"/>
+                </el-form-item>
+				<el-form-item :label="t('newcomerNumberBg')">
+					<el-color-picker v-model="diyStore.editComponent.countDown.numberBg.startColor" show-alpha :predefine="diyStore.predefineColors"/>
+					<icon name="iconfont iconmap-connect" size="20px" class="block !text-gray-400 mx-[5px]"/>
+					<el-color-picker v-model="diyStore.editComponent.countDown.numberBg.endColor" show-alpha :predefine="diyStore.predefineColors"/>
+				</el-form-item>
+                <el-form-item :label="t('newcomerOtherColor')">
+                    <el-color-picker v-model="diyStore.editComponent.countDown.otherColor" show-alpha :predefine="diyStore.predefineColors"/>
+                </el-form-item>
+			</el-form>
+		</div>
+
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -236,183 +120,174 @@ import useDiyStore from '@/stores/modules/diy'
 import { ref, reactive } from 'vue'
 import newcomerGoodsSelectPopup from '@/addon/shop/views/goods/components/newcomer-goods-select-popup.vue'
 
-const diyStore: any = useDiyStore()
+const diyStore:any = useDiyStore()
 diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
-  const res = { code: true, message: '' }
+    const res = { code: true, message: '' }
 
-  if (diyStore.value[index].source == 'custom') {
-    if (diyStore.value[index].goods_ids.length == 0) {
-      res.code = false
-      res.message = t('goodsPlaceholder')
+    if(diyStore.value[index].source == 'custom'){
+        if(diyStore.value[index].goods_ids.length == 0){
+            res.code = false
+            res.message = t('goodsPlaceholder')
+        }
     }
-  }
 
-  return res
+    return res
 }
 
 // 标题风格样式
 const showTitleDialog = ref(false)
 
 const showTitleStyle = () => {
-  selectStyle.title = diyStore.editComponent.style.title
-  selectStyle.value = diyStore.editComponent.style.value
-  showTitleDialog.value = true
+	selectStyle.title = diyStore.editComponent.style.title;
+	selectStyle.value = diyStore.editComponent.style.value;
+    showTitleDialog.value = true
 }
 
-const changeTitleStyle = (item: any) => {
-  selectStyle.title = item.title
-  selectStyle.value = item.value
+const changeTitleStyle = (item:any) => {
+    selectStyle.title = item.title;
+    selectStyle.value = item.value;
 }
 
 const confirmTitleStyle = () => {
-  diyStore.editComponent.style.title = selectStyle.title
-  diyStore.editComponent.style.value = selectStyle.value
-  initStyle(diyStore.editComponent.style.value)
-  showTitleDialog.value = false
+    diyStore.editComponent.style.title = selectStyle.title;
+    diyStore.editComponent.style.value = selectStyle.value;
+    initStyle(diyStore.editComponent.style.value);
+    showTitleDialog.value = false
 }
 
 const styleList = reactive([
-  {
-    url: 'addon/shop/diy/newcomer/style_01.png',
-    title: '风格1',
-    value: 'style-1',
-  },
-  {
-    url: 'addon/shop/diy/newcomer/style_02.png',
-    title: '风格2',
-    value: 'style-2',
-  },
-  {
-    url: 'addon/shop/diy/newcomer/style_03.png',
-    title: '风格3',
-    value: 'style-3',
-  },
-  {
-    url: 'addon/shop/diy/newcomer/style_04.png',
-    title: '风格4',
-    value: 'style-4',
-  },
+	{
+        url : 'addon/shop/diy/newcomer/style_01.png',
+        title:'风格1',
+	    value:'style-1'
+	},{
+        url : 'addon/shop/diy/newcomer/style_02.png',
+        title:'风格2',
+	    value:'style-2'
+	},{
+        url : 'addon/shop/diy/newcomer/style_03.png',
+        title:'风格3',
+	    value:'style-3'
+	},{
+        url : 'addon/shop/diy/newcomer/style_04.png',
+        title:'风格4',
+	    value:'style-4'
+	}
 ])
 
 const initStyle = (style: any) => {
-  if (style == 'style-1') {
-    diyStore.editComponent.textImg =
-      'addon/shop/diy/newcomer/style_title_01.png'
-    diyStore.editComponent.countDown.numberColor = 'rgba(255, 0, 0, 1)'
-    diyStore.editComponent.countDown.numberBg.startColor =
-      'rgba(255, 255, 255, 1)'
-    diyStore.editComponent.countDown.numberBg.endColor = ''
-    diyStore.editComponent.countDown.otherColor = 'rgba(255, 255, 255, 1)'
-    diyStore.editComponent.textColor = '#303133'
-    diyStore.editComponent.pageStartBgColor = ''
-    diyStore.editComponent.pageEndBgColor = ''
-    diyStore.editComponent.pageGradientAngle = 'to bottom'
-    diyStore.editComponent.componentStartBgColor = '#ff6D1A'
-    diyStore.editComponent.componentEndBgColor = 'rgba(255, 70, 56, 1)'
-    diyStore.editComponent.componentGradientAngle = 'to right'
-    diyStore.editComponent.bottomRounded = 12
-    diyStore.editComponent.topRounded = 12
-    diyStore.editComponent.elementBgColor = ''
-    diyStore.editComponent.bottomElementRounded = 10
-    diyStore.editComponent.topElementRounded = 10
-    diyStore.editComponent.margin.top = 10
-    diyStore.editComponent.margin.bottom = 0
-    diyStore.editComponent.margin.both = 10
-  } else if (style == 'style-2') {
-    diyStore.editComponent.textImg =
-      'addon/shop/diy/newcomer/style_title_02.png'
-    diyStore.editComponent.countDown.numberColor = 'rgba(255, 255, 255, 1)'
-    diyStore.editComponent.countDown.numberBg.startColor =
-      'rgba(255, 44, 54, 1)'
-    diyStore.editComponent.countDown.numberBg.endColor = ''
-    diyStore.editComponent.countDown.otherColor = 'rgba(102, 102, 102, 1)'
-    diyStore.editComponent.textColor = '#303133'
-    diyStore.editComponent.pageStartBgColor = ''
-    diyStore.editComponent.pageEndBgColor = ''
-    diyStore.editComponent.pageGradientAngle = 'to bottom'
-    diyStore.editComponent.componentStartBgColor = 'rgba(255, 255, 255, 1)'
-    diyStore.editComponent.componentEndBgColor = ''
-    diyStore.editComponent.componentGradientAngle = 'to bottom'
-    diyStore.editComponent.bottomRounded = 12
-    diyStore.editComponent.topRounded = 12
-    diyStore.editComponent.elementBgColor = ''
-    diyStore.editComponent.bottomElementRounded = 5
-    diyStore.editComponent.topElementRounded = 5
-    diyStore.editComponent.margin.top = 10
-    diyStore.editComponent.margin.bottom = 0
-    diyStore.editComponent.margin.both = 10
-  } else if (style == 'style-3') {
-    diyStore.editComponent.textImg =
-      'addon/shop/diy/newcomer/style_title_03.png'
-    diyStore.editComponent.subTitle.text = '查看更多'
-    diyStore.editComponent.subTitle.textColor = 'rgba(239, 0, 12, 1)'
-    diyStore.editComponent.subTitle.startColor = 'rgba(255, 248, 217, 1)'
-    diyStore.editComponent.subTitle.endColor = 'rgba(255, 254, 251, 1)'
-    diyStore.editComponent.subTitle.link.name = ''
-    diyStore.editComponent.countDown.numberColor = 'rgba(239, 0, 12, 1)'
-    diyStore.editComponent.countDown.numberBg.startColor =
-      'rgba(255, 248, 217, 1)'
-    diyStore.editComponent.countDown.numberBg.endColor =
-      'rgba(255, 253, 246, 1)'
-    diyStore.editComponent.countDown.otherColor = 'rgba(255, 253, 246, 1)'
-    diyStore.editComponent.textColor = '#303133'
-    diyStore.editComponent.pageStartBgColor = ''
-    diyStore.editComponent.pageEndBgColor = ''
-    diyStore.editComponent.pageGradientAngle = 'to bottom'
-    diyStore.editComponent.componentStartBgColor = 'rgba(255, 12, 16, 1)'
-    diyStore.editComponent.componentEndBgColor = 'rgba(255, 101, 18, 1)'
-    diyStore.editComponent.componentGradientAngle = 'to right'
-    diyStore.editComponent.bottomRounded = 12
-    diyStore.editComponent.topRounded = 12
-    diyStore.editComponent.elementBgColor = ''
-    diyStore.editComponent.bottomElementRounded = 0
-    diyStore.editComponent.topElementRounded = 0
-    diyStore.editComponent.margin.top = 10
-    diyStore.editComponent.margin.bottom = 0
-    diyStore.editComponent.margin.both = 10
-  } else if (style == 'style-4') {
-    diyStore.editComponent.textImg =
-      'addon/shop/diy/newcomer/style_title_02.png'
-    diyStore.editComponent.countDown.numberColor = 'rgba(255, 255, 255, 1)'
-    diyStore.editComponent.countDown.numberBg.startColor = ''
-    diyStore.editComponent.countDown.numberBg.endColor = ''
-    diyStore.editComponent.countDown.otherColor = 'rgba(255, 253, 253, 1)'
-    diyStore.editComponent.textColor = '#303133'
-    diyStore.editComponent.pageStartBgColor = ''
-    diyStore.editComponent.pageEndBgColor = ''
-    diyStore.editComponent.pageGradientAngle = 'to bottom'
-    diyStore.editComponent.componentStartBgColor = 'rgba(255, 255, 255, 1)'
-    diyStore.editComponent.componentEndBgColor = 'rgba(255, 255, 255, 1)'
-    diyStore.editComponent.componentGradientAngle = 'to bottom'
-    diyStore.editComponent.bottomRounded = 12
-    diyStore.editComponent.topRounded = 12
-    diyStore.editComponent.elementBgColor = ''
-    diyStore.editComponent.bottomElementRounded = 10
-    diyStore.editComponent.topElementRounded = 10
-    diyStore.editComponent.margin.top = 10
-    diyStore.editComponent.margin.bottom = 0
-    diyStore.editComponent.margin.both = 10
-  }
+	if (style == 'style-1') {
+		diyStore.editComponent.textImg = "addon/shop/diy/newcomer/style_title_01.png";
+		diyStore.editComponent.countDown.numberColor = "rgba(255, 0, 0, 1)";
+		diyStore.editComponent.countDown.numberBg.startColor = "rgba(255, 255, 255, 1)";
+		diyStore.editComponent.countDown.numberBg.endColor = "";
+		diyStore.editComponent.countDown.otherColor = "rgba(255, 255, 255, 1)";
+		diyStore.editComponent.textColor = "#303133";
+		diyStore.editComponent.pageStartBgColor = "";
+		diyStore.editComponent.pageEndBgColor = "";
+		diyStore.editComponent.pageGradientAngle = "to bottom";
+		diyStore.editComponent.componentStartBgColor = "#ff6D1A";
+		diyStore.editComponent.componentEndBgColor = "rgba(255, 70, 56, 1)";
+		diyStore.editComponent.componentGradientAngle = "to right";
+		diyStore.editComponent.bottomRounded = 12;
+		diyStore.editComponent.topRounded = 12;
+		diyStore.editComponent.elementBgColor = "";
+		diyStore.editComponent.bottomElementRounded = 10;
+		diyStore.editComponent.topElementRounded = 10;
+		diyStore.editComponent.margin.top = 10;
+		diyStore.editComponent.margin.bottom = 0;
+		diyStore.editComponent.margin.both = 10;
+	} else if (style == 'style-2') {
+		diyStore.editComponent.textImg = "addon/shop/diy/newcomer/style_title_02.png";
+		diyStore.editComponent.countDown.numberColor = "rgba(255, 255, 255, 1)";
+		diyStore.editComponent.countDown.numberBg.startColor = "rgba(255, 44, 54, 1)";
+		diyStore.editComponent.countDown.numberBg.endColor = "";
+		diyStore.editComponent.countDown.otherColor = "rgba(102, 102, 102, 1)";
+		diyStore.editComponent.textColor = "#303133";
+		diyStore.editComponent.pageStartBgColor = "";
+		diyStore.editComponent.pageEndBgColor = "";
+		diyStore.editComponent.pageGradientAngle = "to bottom";
+		diyStore.editComponent.componentStartBgColor = "rgba(255, 255, 255, 1)";
+		diyStore.editComponent.componentEndBgColor = "";
+		diyStore.editComponent.componentGradientAngle = "to bottom";
+		diyStore.editComponent.bottomRounded = 12;
+		diyStore.editComponent.topRounded = 12;
+		diyStore.editComponent.elementBgColor = "";
+		diyStore.editComponent.bottomElementRounded = 5;
+		diyStore.editComponent.topElementRounded = 5;
+		diyStore.editComponent.margin.top = 10;
+		diyStore.editComponent.margin.bottom = 0;
+		diyStore.editComponent.margin.both = 10;
+	} else if (style == 'style-3') {
+		diyStore.editComponent.textImg = "addon/shop/diy/newcomer/style_title_03.png";
+		diyStore.editComponent.subTitle.text = "查看更多";
+		diyStore.editComponent.subTitle.textColor = "rgba(239, 0, 12, 1)";
+		diyStore.editComponent.subTitle.startColor = "rgba(255, 248, 217, 1)";
+		diyStore.editComponent.subTitle.endColor = "rgba(255, 254, 251, 1)";
+		diyStore.editComponent.subTitle.link.name = "";
+		diyStore.editComponent.countDown.numberColor = "rgba(239, 0, 12, 1)";
+		diyStore.editComponent.countDown.numberBg.startColor = "rgba(255, 248, 217, 1)";
+		diyStore.editComponent.countDown.numberBg.endColor = "rgba(255, 253, 246, 1)";
+		diyStore.editComponent.countDown.otherColor = "rgba(255, 253, 246, 1)";
+		diyStore.editComponent.textColor = "#303133";
+		diyStore.editComponent.pageStartBgColor = "";
+		diyStore.editComponent.pageEndBgColor = "";
+		diyStore.editComponent.pageGradientAngle = "to bottom";
+		diyStore.editComponent.componentStartBgColor = "rgba(255, 12, 16, 1)";
+		diyStore.editComponent.componentEndBgColor = "rgba(255, 101, 18, 1)";
+		diyStore.editComponent.componentGradientAngle = "to right";
+		diyStore.editComponent.bottomRounded = 12;
+		diyStore.editComponent.topRounded = 12;
+		diyStore.editComponent.elementBgColor = "";
+		diyStore.editComponent.bottomElementRounded = 0;
+		diyStore.editComponent.topElementRounded = 0;
+		diyStore.editComponent.margin.top = 10;
+		diyStore.editComponent.margin.bottom = 0;
+		diyStore.editComponent.margin.both = 10;
+	} else if (style == 'style-4') {
+		diyStore.editComponent.textImg = "addon/shop/diy/newcomer/style_title_02.png";
+		diyStore.editComponent.countDown.numberColor = "rgba(255, 255, 255, 1)";
+		diyStore.editComponent.countDown.numberBg.startColor = "";
+		diyStore.editComponent.countDown.numberBg.endColor = "";
+		diyStore.editComponent.countDown.otherColor = "rgba(255, 253, 253, 1)";
+		diyStore.editComponent.textColor = "#303133";
+		diyStore.editComponent.pageStartBgColor = "";
+		diyStore.editComponent.pageEndBgColor = "";
+		diyStore.editComponent.pageGradientAngle = "to bottom";
+		diyStore.editComponent.componentStartBgColor = "rgba(255, 255, 255, 1)";
+		diyStore.editComponent.componentEndBgColor = "rgba(255, 255, 255, 1)";
+		diyStore.editComponent.componentGradientAngle = "to bottom";
+		diyStore.editComponent.bottomRounded = 12;
+		diyStore.editComponent.topRounded = 12;
+		diyStore.editComponent.elementBgColor = "";
+		diyStore.editComponent.bottomElementRounded = 10;
+		diyStore.editComponent.topElementRounded = 10;
+		diyStore.editComponent.margin.top = 10;
+		diyStore.editComponent.margin.bottom = 0;
+		diyStore.editComponent.margin.both = 10;
+	}
+
 }
 
 const selectStyle = reactive({
-  title: diyStore.editComponent.style.title,
-  value: diyStore.editComponent.style.value,
+    title: diyStore.editComponent.style.title,
+    value: diyStore.editComponent.style.value
 })
 
-initStyle(diyStore.editComponent.style.value)
+initStyle(diyStore.editComponent.style.value);
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
 <style lang="scss">
-.goods-list-slider {
-  .el-slider__input {
-    width: 100px;
-  }
-}
+	.goods-list-slider {
+		.el-slider__input {
+			width: 100px;
+		}
+	}
 </style>
diff --git a/admin/src/addon/shop/views/diy/components/edit-shop-order-info.vue b/admin/src/addon/shop/views/diy/components/edit-shop-order-info.vue
index e3555b38..187f9edf 100644
--- a/admin/src/addon/shop/views/diy/components/edit-shop-order-info.vue
+++ b/admin/src/addon/shop/views/diy/components/edit-shop-order-info.vue
@@ -1,104 +1,78 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('titleContent') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('title')">
-          <el-input
-            v-model.trim="diyStore.editComponent.text"
-            :placeholder="t('titlePlaceholder')"
-            clearable
-            maxlength="6"
-            show-word-limit
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('subTitle') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('more')">
-          <el-input
-            v-model.trim="diyStore.editComponent.more.text"
-            :placeholder="t('morePlaceholder')"
-            clearable
-            maxlength="8"
-            show-word-limit
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-  </div>
-
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('titleStyle') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('textFontSize')">
-          <el-slider
-            v-model="diyStore.editComponent.fontSize"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-            :min="12"
-            :max="30"
-          />
-        </el-form-item>
-        <el-form-item :label="t('textFontWeight')">
-          <el-radio-group v-model="diyStore.editComponent.fontWeight">
-            <el-radio :label="'normal'">{{ t('fontWeightNormal') }}</el-radio>
-            <el-radio :label="'bold'">{{ t('fontWeightBold') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item :label="t('textColor')">
-          <el-color-picker v-model="diyStore.editComponent.textColor" />
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('subTitleStyle') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('textColor')">
-          <el-color-picker v-model="diyStore.editComponent.more.color" />
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('textSet') }}</h3>
-      <el-form label-width="90px" class="px-[10px]">
-        <el-form-item :label="t('textFontSize')">
-          <el-slider
-            v-model="diyStore.editComponent.item.fontSize"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-            :min="12"
-            :max="16"
-          />
-        </el-form-item>
-        <el-form-item :label="t('textFontWeight')">
-          <el-radio-group v-model="diyStore.editComponent.item.fontWeight">
-            <el-radio :label="'normal'">{{ t('fontWeightNormal') }}</el-radio>
-            <el-radio :label="'bold'">{{ t('fontWeightBold') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item :label="t('textColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.item.color"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('titleContent') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('title')">
+					<el-input v-model.trim="diyStore.editComponent.text" :placeholder="t('titlePlaceholder')" clearable maxlength="6" show-word-limit />
+				</el-form-item>
+			</el-form>
+		</div>
+
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('subTitle') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('more')">
+					<el-input v-model.trim="diyStore.editComponent.more.text" :placeholder="t('morePlaceholder')" clearable maxlength="8" show-word-limit />
+				</el-form-item>
+			</el-form>
+		</div>
+
+	</div>
+
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('titleStyle') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('textFontSize')">
+					<el-slider v-model="diyStore.editComponent.fontSize" show-input size="small" class="ml-[10px] diy-nav-slider" :min="12" :max="30" />
+				</el-form-item>
+				<el-form-item :label="t('textFontWeight')">
+					<el-radio-group v-model="diyStore.editComponent.fontWeight">
+						<el-radio :label="'normal'">{{ t('fontWeightNormal') }}</el-radio>
+						<el-radio :label="'bold'">{{ t('fontWeightBold') }}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+				<el-form-item :label="t('textColor')">
+					<el-color-picker v-model="diyStore.editComponent.textColor" />
+				</el-form-item>
+			</el-form>
+		</div>
+
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('subTitleStyle') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('textColor')">
+					<el-color-picker v-model="diyStore.editComponent.more.color" />
+				</el-form-item>
+			</el-form>
+		</div>
+
+        <div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('textSet') }}</h3>
+			<el-form label-width="90px" class="px-[10px]">
+				<el-form-item :label="t('textFontSize')">
+					<el-slider v-model="diyStore.editComponent.item.fontSize" show-input size="small" class="ml-[10px] diy-nav-slider" :min="12" :max="16"/>
+				</el-form-item>
+				<el-form-item :label="t('textFontWeight')">
+					<el-radio-group v-model="diyStore.editComponent.item.fontWeight">
+						<el-radio :label="'normal'">{{t('fontWeightNormal')}}</el-radio>
+						<el-radio :label="'bold'">{{t('fontWeightBold')}}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+				<el-form-item :label="t('textColor')">
+					<el-color-picker v-model="diyStore.editComponent.item.color" show-alpha :predefine="diyStore.predefineColors"/>
+				</el-form-item>
+
+			</el-form>
+		</div>
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -112,29 +86,30 @@ diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
 const showDialog = ref(false)
 
 const showStyle = () => {
-  showDialog.value = true
+    showDialog.value = true
 }
 
 const selectStyle = ref(diyStore.editComponent.style)
 
 const changeStyle = () => {
-  switch (selectStyle.value) {
-    case 'style-1':
-      diyStore.editComponent.subTitle.control = false
-      diyStore.editComponent.more.control = false
-      diyStore.editComponent.styleName = '风格1'
-      break
-    case 'style-2':
-      diyStore.editComponent.subTitle.control = true
-      diyStore.editComponent.more.control = true
-      diyStore.editComponent.styleName = '风格2'
-      break
-  }
-  diyStore.editComponent.style = selectStyle.value
-  showDialog.value = false
+    switch (selectStyle.value) {
+        case 'style-1':
+            diyStore.editComponent.subTitle.control = false
+            diyStore.editComponent.more.control = false
+            diyStore.editComponent.styleName = '风格1'
+            break
+        case 'style-2':
+            diyStore.editComponent.subTitle.control = true
+            diyStore.editComponent.more.control = true
+            diyStore.editComponent.styleName = '风格2'
+            break
+    }
+    diyStore.editComponent.style = selectStyle.value
+    showDialog.value = false
 }
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/addon/shop/views/diy/components/edit-shop-search.vue b/admin/src/addon/shop/views/diy/components/edit-shop-search.vue
index 805f9e50..cd175271 100644
--- a/admin/src/addon/shop/views/diy/components/edit-shop-search.vue
+++ b/admin/src/addon/shop/views/diy/components/edit-shop-search.vue
@@ -1,27 +1,24 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('goodsSearchSet') }}</h3>
-      <el-form label-width="100px" class="px-[10px]">
-        <el-form-item :label="t('goodsSearchText')">
-          <el-input
-            v-model.trim="diyStore.editComponent.text"
-            :placeholder="t('goodsSearchTextPlaceholder')"
-            clearable
-            maxlength="20"
-            show-word-limit
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-  </div>
-
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
+
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('goodsSearchSet') }}</h3>
+			<el-form label-width="100px" class="px-[10px]">
+				<el-form-item :label="t('goodsSearchText')">
+					<el-input v-model.trim="diyStore.editComponent.text" :placeholder="t('goodsSearchTextPlaceholder')" clearable maxlength="20" show-word-limit />
+				</el-form-item>
+			</el-form>
+		</div>
+
+	</div>
+
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+	</div>
+
 </template>
 
 <script lang="ts" setup>
diff --git a/admin/src/addon/shop/views/diy/components/edit-single-recommend.vue b/admin/src/addon/shop/views/diy/components/edit-single-recommend.vue
index d670603d..69f2cae3 100644
--- a/admin/src/addon/shop/views/diy/components/edit-single-recommend.vue
+++ b/admin/src/addon/shop/views/diy/components/edit-single-recommend.vue
@@ -1,313 +1,188 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('titleContent') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('selectStyle')" class="flex">
-          <span
-            class="text-primary flex-1 cursor-pointer"
-            @click="showTitleStyle"
-            >{{ diyStore.editComponent.titleStyle.title }}</span
-          >
-          <el-icon>
-            <ArrowRight />
-          </el-icon>
-        </el-form-item>
-        <el-form-item :label="t('image')">
-          <upload-image v-model="diyStore.editComponent.textImg" :limit="1" />
-        </el-form-item>
-        <el-form-item :label="t('link')">
-          <diy-link v-model="diyStore.editComponent.textLink" />
-        </el-form-item>
-        <el-form-item :label="t('subTitle')">
-          <el-input
-            v-model.trim="diyStore.editComponent.subTitle.text"
-            :placeholder="t('subTitlePlaceholder')"
-            clearable
-            maxlength="8"
-            show-word-limit
-          />
-        </el-form-item>
-        <el-form-item :label="t('link')">
-          <diy-link v-model="diyStore.editComponent.subTitle.link" />
-        </el-form-item>
-      </el-form>
-
-      <el-dialog
-        v-model="showTitleDialog"
-        :title="t('selectStyle')"
-        width="460px"
-      >
-        <div class="flex flex-wrap">
-          <template v-for="(item, index) in titleStyleList" :key="index">
-            <div
-              :class="{
-                'border-primary': selectTitleStyle.value == item.value,
-              }"
-              @click="changeTitleStyle(item)"
-              class="flex items-center justify-center overflow-hidden w-[200px] h-[100px] mr-[12px] mb-[12px] cursor-pointer border bg-[#eee]"
-            >
-              <img :src="img(item.url)" />
-            </div>
-          </template>
-        </div>
-
-        <template #footer>
-          <span class="dialog-footer">
-            <el-button @click="showTitleDialog = false">{{
-              t('cancel')
-            }}</el-button>
-            <el-button type="primary" @click="confirmTitleStyle">{{
-              t('confirm')
-            }}</el-button>
-          </span>
-        </template>
-      </el-dialog>
-    </div>
-
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('selectSource') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('goodsSelectPopupSelectGoodsButton')">
-          <el-radio-group
-            v-model="diyStore.editComponent.source"
-            :title="t('goodsSelectPopupSelectGoodsButton')"
-          >
-            <el-radio label="all">{{ t('defaultGoodsSelect') }}</el-radio>
-            <el-radio label="custom">{{
-              t('manualSelectionSources')
-            }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item
-          :label="t('customGoods')"
-          v-if="diyStore.editComponent.source == 'custom'"
-        >
-          <goods-select-popup
-            ref="goodsSelectPopupRef"
-            v-model="diyStore.editComponent.goods_ids"
-            :min="1"
-            :max="1"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('imageSet') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <div ref="imageBoxRef">
-          <div
-            v-for="(item, index) in diyStore.editComponent.list"
-            :key="item.id"
-            class="item-wrap p-[10px] pb-0 relative border border-dashed border-gray-300 mb-[16px]"
-          >
-            <el-form-item :label="t('image')">
-              <upload-image v-model="item.imageUrl" :limit="1" />
-            </el-form-item>
-
-            <div
-              class="del absolute cursor-pointer z-[2] top-[-8px] right-[-8px]"
-              v-show="diyStore.editComponent.list.length > 1"
-              @click="diyStore.editComponent.list.splice(index, 1)"
-            >
-              <icon name="element CircleCloseFilled" color="#bbb" size="20px" />
-            </div>
-
-            <el-form-item :label="t('link')">
-              <diy-link v-model="item.link" />
-            </el-form-item>
-          </div>
-        </div>
-
-        <el-button
-          v-show="diyStore.editComponent.list.length < 10"
-          class="w-full"
-          @click="addImageAd"
-          >{{ t('addImageAd') }}</el-button
-        >
-      </el-form>
-    </div>
-
-    <el-dialog
-      v-model="categoryShowDialog"
-      :title="t('goodsCategoryTitle')"
-      width="750px"
-      :close-on-press-escape="false"
-      :destroy-on-close="true"
-      :close-on-click-modal="false"
-    >
-      <el-table
-        :data="categoryTable.data"
-        ref="categoryTableRef"
-        size="large"
-        v-loading="categoryTable.loading"
-        height="450px"
-        @selection-change="handleSelectionChange"
-        row-key="category_id"
-        :expand-row-keys="expand_category_ids"
-        :tree-props="{ hasChildren: 'hasChildren', children: 'child_list' }"
-      >
-        <template #empty>
-          <span>{{ !categoryTable.loading ? t('emptyData') : '' }}</span>
-        </template>
-        <el-table-column type="selection" width="55" />
-        <el-table-column :label="t('categoryName')" min-width="120">
-          <template #default="{ row }">
-            <span class="order-2">{{ row.category_name }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column :label="t('categoryImage')" width="170" align="left">
-          <template #default="{ row }">
-            <div class="h-[30px]">
-              <el-image
-                class="w-[30px] h-[30px]"
-                :src="img(row.image)"
-                fit="contain"
-              >
-                <template #error>
-                  <div class="image-slot">
-                    <img
-                      class="w-[30px] h-[30px]"
-                      src="@/addon/shop/assets/category_default.png"
-                    />
-                  </div>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('titleContent') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('selectStyle')" class="flex">
+					<span class="text-primary flex-1 cursor-pointer" @click="showTitleStyle">{{ diyStore.editComponent.titleStyle.title }}</span>
+					<el-icon>
+						<ArrowRight />
+					</el-icon>
+				</el-form-item>
+                <el-form-item :label="t('image')">
+                    <upload-image v-model="diyStore.editComponent.textImg" :limit="1"/>
+                </el-form-item>
+                <el-form-item :label="t('link')">
+                    <diy-link v-model="diyStore.editComponent.textLink"/>
+                </el-form-item>
+                <el-form-item :label="t('subTitle')">
+                    <el-input v-model.trim="diyStore.editComponent.subTitle.text" :placeholder="t('subTitlePlaceholder')" clearable maxlength="8" show-word-limit />
+                </el-form-item>
+                <el-form-item :label="t('link')">
+                    <diy-link v-model="diyStore.editComponent.subTitle.link"/>
+                </el-form-item>
+			</el-form>
+
+			<el-dialog v-model="showTitleDialog" :title="t('selectStyle')" width="460px">
+
+				<div class="flex flex-wrap">
+					<template v-for="(item,index) in titleStyleList" :key="index">
+						<div :class="{ 'border-primary': selectTitleStyle.value == item.value }" @click="changeTitleStyle(item)" class="flex items-center justify-center overflow-hidden w-[200px] h-[100px] mr-[12px] mb-[12px] cursor-pointer border bg-[#eee]">
+							<img :src="img(item.url)" />
+						</div>
+					</template>
+				</div>
+
+				<template #footer>
+					<span class="dialog-footer">
+						<el-button @click="showTitleDialog = false">{{ t('cancel') }}</el-button>
+						<el-button type="primary" @click="confirmTitleStyle">{{ t('confirm') }}</el-button>
+					</span>
+				</template>
+
+			</el-dialog>
+		</div>
+
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t("selectSource") }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('goodsSelectPopupSelectGoodsButton')">
+					<el-radio-group v-model="diyStore.editComponent.source" :title="t('goodsSelectPopupSelectGoodsButton')">
+						<el-radio label="all">{{ t('defaultGoodsSelect') }}</el-radio>
+						<el-radio label="custom">{{ t('manualSelectionSources') }}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+				<el-form-item :label="t('customGoods')" v-if="diyStore.editComponent.source == 'custom'">
+					<goods-select-popup ref="goodsSelectPopupRef" v-model="diyStore.editComponent.goods_ids" :min="1" :max="1" />
+				</el-form-item>
+			</el-form>
+		</div>
+
+        <div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('imageSet') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+
+				<div ref="imageBoxRef">
+					<div v-for="(item,index) in diyStore.editComponent.list" :key="item.id" class="item-wrap p-[10px] pb-0 relative border border-dashed border-gray-300 mb-[16px]">
+						<el-form-item :label="t('image')">
+							<upload-image v-model="item.imageUrl" :limit="1" />
+						</el-form-item>
+
+						<div class="del absolute cursor-pointer z-[2] top-[-8px] right-[-8px]" v-show="diyStore.editComponent.list.length > 1" @click="diyStore.editComponent.list.splice(index,1)">
+							<icon name="element CircleCloseFilled" color="#bbb" size="20px"/>
+						</div>
+
+						<el-form-item :label="t('link')">
+							<diy-link v-model="item.link"/>
+						</el-form-item>
+					</div>
+				</div>
+
+				<el-button v-show="diyStore.editComponent.list.length < 10" class="w-full" @click="addImageAd">{{ t('addImageAd') }}</el-button>
+
+			</el-form>
+		</div>
+
+        <el-dialog v-model="categoryShowDialog" :title="t('goodsCategoryTitle')" width="750px" :close-on-press-escape="false" :destroy-on-close="true" :close-on-click-modal="false">
+            <el-table :data="categoryTable.data" ref="categoryTableRef" size="large" v-loading="categoryTable.loading"
+                height="450px" @selection-change="handleSelectionChange" row-key="category_id"
+                :expand-row-keys="expand_category_ids"
+                :tree-props="{ hasChildren: 'hasChildren', children: 'child_list' }">
+                <template #empty>
+                    <span>{{ !categoryTable.loading ? t('emptyData') : '' }}</span>
                 </template>
-              </el-image>
+                <el-table-column type="selection" width="55" />
+                <el-table-column :label="t('categoryName')" min-width="120">
+                    <template #default="{ row }">
+                        <span class="order-2">{{ row.category_name }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column :label="t('categoryImage')" width="170" align="left">
+                    <template #default="{ row }">
+                        <div class="h-[30px]">
+                            <el-image class="w-[30px] h-[30px] " :src="img(row.image)" fit="contain">
+                                <template #error>
+                                    <div class="image-slot">
+                                        <img class="w-[30px] h-[30px]" src="@/addon/shop/assets/category_default.png" />
+                                    </div>
+                                </template>
+                            </el-image>
+                        </div>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <div class="flex items-center justify-end mt-[15px]">
+                <el-button type="primary" @click="saveCategoryId">{{ t('confirm') }}</el-button>
+                <el-button @click="categoryShowDialog = false">{{ t('cancel') }}</el-button>
             </div>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="flex items-center justify-end mt-[15px]">
-        <el-button type="primary" @click="saveCategoryId">{{
-          t('confirm')
-        }}</el-button>
-        <el-button @click="categoryShowDialog = false">{{
-          t('cancel')
-        }}</el-button>
-      </div>
-    </el-dialog>
-  </div>
-
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('titleStyle') }}</h3>
-      <el-form label-width="90px" class="px-[10px]">
-        <el-form-item :label="t('textColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.subTitle.textColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('carouselStyle') }}</h3>
-      <el-form label-width="90px" class="px-[10px]">
-        <el-form-item :label="t('topRounded')">
-          <el-slider
-            v-model="diyStore.editComponent.topCarouselRounded"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-            :max="50"
-          />
-        </el-form-item>
-        <el-form-item :label="t('bottomRounded')">
-          <el-slider
-            v-model="diyStore.editComponent.bottomCarouselRounded"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-            :max="50"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('recommendIndicatorStyle') }}</h3>
-      <el-form label-width="90px" class="px-[10px]">
-        <el-form-item :label="t('recommendIndicatorColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.indicatorColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-        <el-form-item :label="t('recommendIndicatorActiveColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.indicatorActiveColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('goodsStyle') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('goodsBgColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.elementBgColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-        <el-form-item :label="t('goodsNameColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.goodsNameStyle.color"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-          <div class="mr-[20px]"></div>
-          <el-radio-group
-            v-model="diyStore.editComponent.goodsNameStyle.fontWeight"
-          >
-            <el-radio :label="'normal'">{{ t('fontWeightNormal') }}</el-radio>
-            <el-radio :label="'bold'">{{ t('fontWeightBold') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item :label="t('goodsPriceColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.priceStyle.mainColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-        <el-form-item :label="t('goodsBtnColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.saleStyle.color"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-        <el-form-item :label="t('topRounded')">
-          <el-slider
-            v-model="diyStore.editComponent.topElementRounded"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-            :max="50"
-          />
-        </el-form-item>
-        <el-form-item :label="t('bottomRounded')">
-          <el-slider
-            v-model="diyStore.editComponent.bottomElementRounded"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-            :max="50"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
+        </el-dialog>
+	</div>
+
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+        <div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('titleStyle') }}</h3>
+			<el-form label-width="90px" class="px-[10px]">
+				<el-form-item :label="t('textColor')">
+					<el-color-picker v-model="diyStore.editComponent.subTitle.textColor" show-alpha :predefine="diyStore.predefineColors"/>
+				</el-form-item>
+			</el-form>
+		</div>
+        <div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('carouselStyle') }}</h3>
+			<el-form label-width="90px" class="px-[10px]">
+                <el-form-item :label="t('topRounded')">
+					<el-slider v-model="diyStore.editComponent.topCarouselRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+				</el-form-item>
+				<el-form-item :label="t('bottomRounded')">
+					<el-slider v-model="diyStore.editComponent.bottomCarouselRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+				</el-form-item>
+			</el-form>
+		</div>
+        <div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('recommendIndicatorStyle') }}</h3>
+			<el-form label-width="90px" class="px-[10px]">
+                <el-form-item :label="t('recommendIndicatorColor')">
+					<el-color-picker v-model="diyStore.editComponent.indicatorColor" show-alpha :predefine="diyStore.predefineColors" />
+				</el-form-item>
+				<el-form-item :label="t('recommendIndicatorActiveColor')">
+					<el-color-picker v-model="diyStore.editComponent.indicatorActiveColor" show-alpha :predefine="diyStore.predefineColors" />
+				</el-form-item>
+			</el-form>
+		</div>
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('goodsStyle') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('goodsBgColor')">
+					<el-color-picker v-model="diyStore.editComponent.elementBgColor" show-alpha :predefine="diyStore.predefineColors" />
+				</el-form-item>
+				<el-form-item :label="t('goodsNameColor')">
+					<el-color-picker v-model="diyStore.editComponent.goodsNameStyle.color" show-alpha :predefine="diyStore.predefineColors" />
+					<div class="mr-[20px]"></div>
+					<el-radio-group v-model="diyStore.editComponent.goodsNameStyle.fontWeight">
+						<el-radio :label="'normal'">{{ t('fontWeightNormal') }}</el-radio>
+						<el-radio :label="'bold'">{{ t('fontWeightBold') }}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+				<el-form-item :label="t('goodsPriceColor')">
+					<el-color-picker v-model="diyStore.editComponent.priceStyle.mainColor" show-alpha :predefine="diyStore.predefineColors" />
+				</el-form-item>
+				<el-form-item :label="t('goodsBtnColor')">
+					<el-color-picker v-model="diyStore.editComponent.saleStyle.color" show-alpha :predefine="diyStore.predefineColors" />
+				</el-form-item>
+				<el-form-item :label="t('topRounded')">
+					<el-slider v-model="diyStore.editComponent.topElementRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+				</el-form-item>
+				<el-form-item :label="t('bottomRounded')">
+					<el-slider v-model="diyStore.editComponent.bottomElementRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+				</el-form-item>
+			</el-form>
+		</div>
+
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -315,85 +190,85 @@ import { getCategoryTree } from '@/addon/shop/api/goods'
 import { t } from '@/lang'
 import { img } from '@/utils/common'
 import useDiyStore from '@/stores/modules/diy'
-import { ref, reactive, onMounted, nextTick } from 'vue'
+import { ref, reactive, onMounted,nextTick } from 'vue'
 import { ElTable } from 'element-plus'
 import goodsSelectPopup from '@/addon/shop/views/goods/components/goods-select-popup.vue'
 
-const diyStore: any = useDiyStore()
+const diyStore:any = useDiyStore()
 diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
 
 const selectTitleStyle = reactive({
-  title: diyStore.editComponent.titleStyle.title,
-  value: diyStore.editComponent.titleStyle.value,
+    title: diyStore.editComponent.titleStyle.title,
+    value: diyStore.editComponent.titleStyle.value
 })
 
 // 标题风格样式
 const showTitleDialog = ref(false)
 
 const showTitleStyle = () => {
-  selectTitleStyle.title = diyStore.editComponent.titleStyle.title
-  selectTitleStyle.value = diyStore.editComponent.titleStyle.value
-  showTitleDialog.value = true
+	selectTitleStyle.title = diyStore.editComponent.titleStyle.title;
+	selectTitleStyle.value = diyStore.editComponent.titleStyle.value;
+    showTitleDialog.value = true
 }
 
-const changeTitleStyle = (item: any) => {
-  selectTitleStyle.title = item.title
-  selectTitleStyle.value = item.value
+const changeTitleStyle = (item:any) => {
+    selectTitleStyle.title = item.title;
+    selectTitleStyle.value = item.value;
 }
 
 const confirmTitleStyle = () => {
-  diyStore.editComponent.titleStyle.title = selectTitleStyle.title
-  diyStore.editComponent.titleStyle.value = selectTitleStyle.value
-  showTitleDialog.value = false
+    diyStore.editComponent.titleStyle.title = selectTitleStyle.title;
+    diyStore.editComponent.titleStyle.value = selectTitleStyle.value;
+    showTitleDialog.value = false
 }
 
 const titleStyleList = reactive([
-  {
-    url: 'addon/shop/diy/single_recommend/title_style_01.png',
-    title: '风格1',
-    value: 'style-1',
-  },
+	{
+        url : 'addon/shop/diy/single_recommend/title_style_01.png',
+        title:'风格1',
+	    value:'style-1'
+	}
 ])
 
 const addImageAd = () => {
-  diyStore.editComponent.list.push({
-    id: diyStore.generateRandom(),
-    imageUrl: '',
-    imgWidth: 0,
-    imgHeight: 0,
-    link: { name: '' },
-  })
+    diyStore.editComponent.list.push({
+        id: diyStore.generateRandom(),
+        imageUrl: '',
+        imgWidth: 0,
+        imgHeight: 0,
+        link: { name: '' }
+    })
 }
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
-  const res = { code: true, message: '' }
-  if (diyStore.value[index].source == 'custom') {
-    if (diyStore.value[index].goods_ids.length == 0) {
-      res.code = false
-      res.message = t('goodsPlaceholder')
+    const res = { code: true, message: '' }
+    if(diyStore.value[index].source == 'custom'){
+        if(diyStore.value[index].goods_ids.length == 0){
+            res.code = false
+            res.message = t('goodsPlaceholder')
+        }
     }
-  }
 
-  diyStore.value[index].list.forEach((item, index) => {
-    if (item.imageUrl === '') {
-      res.code = false
-      res.message = t('imageUrlTip')
-      return res
-    }
-  })
+    diyStore.value[index].list.forEach((item,index) => {
+        if (item.imageUrl === '') {
+            res.code = false
+            res.message = t('imageUrlTip')
+            return res
+        }
+    });
 
-  return res
+    return res
 }
 
 const categoryShowDialog = ref(false)
 
 const categoryTable = reactive({
-  loading: true,
-  data: [],
+    loading: true,
+    data: [],
 })
 onMounted(() => {
-  loadCategoryList()
+    loadCategoryList()
 })
 
 const categoryTableRef = ref<InstanceType<typeof ElTable>>()
@@ -402,56 +277,54 @@ const categoryTableRef = ref<InstanceType<typeof ElTable>>()
  */
 let currCategoryData: any = null
 const loadCategoryList = () => {
-  categoryTable.loading = true
+    categoryTable.loading = true
 
-  getCategoryTree()
-    .then((res) => {
-      categoryTable.loading = false
-      categoryTable.data = res.data
-    })
-    .catch(() => {
-      categoryTable.loading = false
+    getCategoryTree().then(res => {
+        categoryTable.loading = false
+        categoryTable.data = res.data
+    }).catch(() => {
+        categoryTable.loading = false
     })
 }
 
 // 选择商品分类
 const handleSelectionChange = (val: string | any[]) => {
-  let data = ''
-  if (val) data = val[val.length - 1]
-  if (val.length > 1) categoryTableRef.value!.clearSelection()
-  if (data) categoryTableRef.value!.toggleRowSelection(data, true)
-  currCategoryData = data
+    let data = ''
+    if (val) data = val[val.length - 1]
+    if (val.length > 1) categoryTableRef.value!.clearSelection()
+    if (data) categoryTableRef.value!.toggleRowSelection(data, true)
+    currCategoryData = data
 }
 
 const saveCategoryId = () => {
-  diyStore.editComponent.goods_category = currCategoryData.category_id
-  diyStore.editComponent.goods_category_name = currCategoryData.category_name
-  categoryShowDialog.value = false
+    diyStore.editComponent.goods_category = currCategoryData.category_id
+    diyStore.editComponent.goods_category_name = currCategoryData.category_name;
+    categoryShowDialog.value = false
 }
 
 const categoryShowDialogOpen = () => {
-  categoryShowDialog.value = true
-  nextTick(() => {
-    setRowSelection()
-  })
+    categoryShowDialog.value = true
+	nextTick(()=>{
+		setRowSelection()
+	})
 }
 
 //分类数据选中回填,设置展开行
 const expand_category_ids = ref<Array<any>>([])
-const setRowSelection = () => {
-  expand_category_ids.value = []
-  categoryTable.data.forEach((el: any) => {
-    if (diyStore.editComponent.goods_category == el.category_id) {
-      categoryTableRef.value!.toggleRowSelection(el, true)
-    } else if (el.child_list && el.child_list.length) {
-      el.child_list.forEach((v: any) => {
-        if (diyStore.editComponent.goods_category == v.category_id) {
-          expand_category_ids.value.push(el.category_id.toString())
-          categoryTableRef.value!.toggleRowSelection(v, true)
-        }
-      })
-    }
-  })
+const setRowSelection = ()=>{
+	expand_category_ids.value = []
+	categoryTable.data.forEach((el:any)=>{
+		if(diyStore.editComponent.goods_category == el.category_id){
+			categoryTableRef.value!.toggleRowSelection(el, true)
+		}else if(el.child_list&&el.child_list.length){
+			el.child_list.forEach((v:any)=>{
+				if(diyStore.editComponent.goods_category == v.category_id){
+					expand_category_ids.value.push(el.category_id.toString())
+					categoryTableRef.value!.toggleRowSelection(v, true)
+				}
+			})
+		}
+	})
 }
 
 defineExpose({})
diff --git a/admin/src/addon/shop/views/goods/attr.vue b/admin/src/addon/shop/views/goods/attr.vue
index f5b1e471..fb4a8cc7 100644
--- a/admin/src/addon/shop/views/goods/attr.vue
+++ b/admin/src/addon/shop/views/goods/attr.vue
@@ -1,189 +1,104 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-lg">{{ pageName }}</span>
-        <el-button type="primary" @click="addEvent">
-          {{ t('addShopGoodsAttr') }}
-        </el-button>
-      </div>
-
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="goodsAttrTable.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('attrName')" prop="attr_name">
-            <el-input
-              v-model.trim="goodsAttrTable.searchParam.attr_name"
-              :placeholder="t('attrNamePlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="loadShopGoodsAttrList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
-
-      <div class="mt-[10px]">
-        <el-table
-          :data="goodsAttrTable.data"
-          size="large"
-          v-loading="goodsAttrTable.loading"
-          @sort-change="sortChange"
-        >
-          <template #empty>
-            <span>{{ !goodsAttrTable.loading ? t('emptyData') : '' }}</span>
-          </template>
-
-          <el-table-column
-            prop="attr_name"
-            :label="t('attrName')"
-            min-width="320"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="sort"
-            :label="t('sort')"
-            min-width="120"
-            sortable="custom"
-          >
-            <template #default="{ row }">
-              <el-input
-                v-model.trim="row.sort"
-                class="!w-[100px]"
-                maxlength="8"
-                @blur="sortInputListener(row.sort, row)"
-              />
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            :label="t('operation')"
-            fixed="right"
-            align="right"
-            min-width="120"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="manageEvent(row)">{{
-                t('manage')
-              }}</el-button>
-              <el-button type="primary" link @click="editEvent(row)">{{
-                t('edit')
-              }}</el-button>
-              <el-button
-                type="primary"
-                link
-                @click="deleteEvent(row.attr_id)"
-                >{{ t('delete') }}</el-button
-              >
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+
+            <div class="flex justify-between items-center">
+                <span class="text-lg">{{pageName}}</span>
+                <el-button type="primary" @click="addEvent">
+                    {{ t('addShopGoodsAttr') }}
+                </el-button>
+            </div>
+
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="goodsAttrTable.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('attrName')" prop="attr_name">
+                        <el-input v-model.trim="goodsAttrTable.searchParam.attr_name" :placeholder="t('attrNamePlaceholder')" />
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="loadShopGoodsAttrList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+
+            <div class="mt-[10px]">
+                <el-table :data="goodsAttrTable.data" size="large" v-loading="goodsAttrTable.loading" @sort-change="sortChange">
+                    <template #empty>
+                        <span>{{ !goodsAttrTable.loading ? t('emptyData') : '' }}</span>
+                    </template>
+
+                    <el-table-column prop="attr_name" :label="t('attrName')" min-width="320" :show-overflow-tooltip="true"/>
+
+                    <el-table-column prop="sort" :label="t('sort')" min-width="120" sortable="custom">
+                        <template #default="{ row }">
+                            <el-input v-model.trim="row.sort" class="!w-[100px]" maxlength="8" @blur="sortInputListener(row.sort, row)" />
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column :label="t('operation')" fixed="right" align="right" min-width="120">
+                       <template #default="{ row }">
+                           <el-button type="primary" link @click="manageEvent(row)">{{ t('manage') }}</el-button>
+                           <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+                           <el-button type="primary" link @click="deleteEvent(row.attr_id)">{{ t('delete') }}</el-button>
+                       </template>
+                    </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="goodsAttrTable.page" v-model:page-size="goodsAttrTable.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="goodsAttrTable.total"
+                        @size-change="loadShopGoodsAttrList()" @current-change="loadShopGoodsAttrList" />
+                </div>
+            </div>
+
+        </el-card>
+
+        <el-dialog v-model="showDialog" :title="titleDialog" width="500px" :destroy-on-close="true">
+            <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('attrName')" prop="attr_name">
+                    <el-input v-model.trim="formData.attr_name" clearable :placeholder="t('attrNamePlaceholder')" class="input-width"  maxlength="20" />
+                </el-form-item>
+
+                <el-form-item :label="t('sort')" >
+                    <el-input v-model.trim="formData.sort"  maxlength="8" show-word-limit clearable :placeholder="t('sortPlaceholder')" class="input-width" @keyup="filterNumber($event)"/>
+                </el-form-item>
+
+            </el-form>
+
+            <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+            </span>
             </template>
-          </el-table-column>
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="goodsAttrTable.page"
-            v-model:page-size="goodsAttrTable.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="goodsAttrTable.total"
-            @size-change="loadShopGoodsAttrList()"
-            @current-change="loadShopGoodsAttrList"
-          />
-        </div>
-      </div>
-    </el-card>
-
-    <el-dialog
-      v-model="showDialog"
-      :title="titleDialog"
-      width="500px"
-      :destroy-on-close="true"
-    >
-      <el-form
-        :model="formData"
-        label-width="120px"
-        ref="formRef"
-        :rules="formRules"
-        class="page-form"
-        v-loading="loading"
-      >
-        <el-form-item :label="t('attrName')" prop="attr_name">
-          <el-input
-            v-model.trim="formData.attr_name"
-            clearable
-            :placeholder="t('attrNamePlaceholder')"
-            class="input-width"
-            maxlength="20"
-          />
-        </el-form-item>
-
-        <el-form-item :label="t('sort')">
-          <el-input
-            v-model.trim="formData.sort"
-            maxlength="8"
-            show-word-limit
-            clearable
-            :placeholder="t('sortPlaceholder')"
-            class="input-width"
-            @keyup="filterNumber($event)"
-          />
-        </el-form-item>
-      </el-form>
-
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-          <el-button
-            type="primary"
-            :loading="loading"
-            @click="confirm(formRef)"
-            >{{ t('confirm') }}</el-button
-          >
-        </span>
-      </template>
-    </el-dialog>
-  </div>
+        </el-dialog>
+
+    </div>
 </template>
 
 <script lang="ts" setup>
-import { reactive, ref, computed } from 'vue'
+import { reactive, ref,computed } from 'vue'
 import { t } from '@/lang'
-import { ElMessage, ElMessageBox, FormInstance } from 'element-plus'
+import { ElMessage,ElMessageBox,FormInstance } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
-import { debounce, filterNumber } from '@/utils/common'
-import {
-  getAttrPageList,
-  addAttr,
-  deleteAttr,
-  modifyAttrSort,
-  editAttr,
-} from '@/addon/shop/api/goods'
+import { debounce,filterNumber } from '@/utils/common'
+import { getAttrPageList, addAttr, deleteAttr,modifyAttrSort,editAttr} from '@/addon/shop/api/goods'
 
 const route = useRoute()
 const router = useRouter()
-const pageName = route.meta.title
+const pageName = route.meta.title;
 
 const goodsAttrTable = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    attr_name: '',
-    order: '',
-    sort: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        attr_name: '',
+        order: '',
+        sort: ''
+    }
 })
 
 const searchFormRef = ref<FormInstance>()
@@ -193,56 +108,54 @@ const loading = ref(false)
 const titleDialog = ref('')
 
 const formData = reactive({
-  attr_id: 0,
-  attr_name: '',
-  sort: 0,
+    attr_id: 0,
+    attr_name: '',
+    sort: 0
 })
 
 const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    attr_name: [
-      { required: true, message: t('attrNamePlaceholder'), trigger: 'blur' },
-    ],
-  }
+    return {
+        attr_name: [
+            { required: true, message: t('attrNamePlaceholder'), trigger: 'blur' }
+        ]
+    }
 })
 
 // 监听排序
 const sortChange = (event: any) => {
-  let sort = ''
-  if (event.order == 'ascending') {
-    sort = 'asc'
-  } else if (event.order == 'descending') {
-    sort = 'desc'
-  }
-  if (sort) {
-    goodsAttrTable.searchParam.order = event.prop
-    goodsAttrTable.searchParam.sort = sort
-  }
-  loadShopGoodsAttrList()
+    let sort = ''
+    if (event.order == 'ascending') {
+        sort = 'asc'
+    } else if (event.order == 'descending') {
+        sort = 'desc'
+    }
+    if (sort) {
+        goodsAttrTable.searchParam.order = event.prop
+        goodsAttrTable.searchParam.sort = sort
+    }
+    loadShopGoodsAttrList()
 }
 
 /**
  * 获取商品参数列表
  */
 const loadShopGoodsAttrList = (page: number = 1) => {
-  goodsAttrTable.loading = true
-  goodsAttrTable.page = page
-
-  getAttrPageList({
-    page: goodsAttrTable.page,
-    limit: goodsAttrTable.limit,
-    ...goodsAttrTable.searchParam,
-  })
-    .then((res) => {
-      goodsAttrTable.loading = false
-      goodsAttrTable.data = res.data.data
-      goodsAttrTable.total = res.data.total
-    })
-    .catch(() => {
-      goodsAttrTable.loading = false
+    goodsAttrTable.loading = true
+    goodsAttrTable.page = page
+
+    getAttrPageList({
+        page: goodsAttrTable.page,
+        limit: goodsAttrTable.limit,
+         ...goodsAttrTable.searchParam
+    }).then(res => {
+        goodsAttrTable.loading = false
+        goodsAttrTable.data = res.data.data
+        goodsAttrTable.total = res.data.total
+    }).catch(() => {
+        goodsAttrTable.loading = false
     })
 }
 
@@ -252,20 +165,20 @@ loadShopGoodsAttrList()
  * 添加商品参数
  */
 const addEvent = () => {
-  formData.attr_id = 0
-  formData.attr_name = ''
-  formData.sort = 0
-  titleDialog.value = t('addShopGoodsAttr')
-  showDialog.value = true
+    formData.attr_id = 0;
+    formData.attr_name = '';
+    formData.sort = 0;
+    titleDialog.value = t('addShopGoodsAttr');
+    showDialog.value = true
 }
 
 // 编辑商品参数
-const editEvent = (data: any) => {
-  formData.attr_id = data.attr_id
-  formData.attr_name = data.attr_name
-  formData.sort = data.sort
-  titleDialog.value = t('updateShopGoodsAttr')
-  showDialog.value = true
+const editEvent = (data:any)=>{
+    formData.attr_id = data.attr_id;
+    formData.attr_name = data.attr_name;
+    formData.sort = data.sort;
+    titleDialog.value = t('updateShopGoodsAttr');
+    showDialog.value = true
 }
 
 /**
@@ -273,23 +186,21 @@ const editEvent = (data: any) => {
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  const save = formData.attr_id ? editAttr : addAttr
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      save(formData)
-        .then((res) => {
-          loading.value = false
-          showDialog.value = false
-          loadShopGoodsAttrList()
-        })
-        .catch((err) => {
-          loading.value = false
-        })
-    }
-  })
+    if (loading.value || !formEl) return
+    const save = formData.attr_id ? editAttr : addAttr
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+            save(formData).then(res => {
+                loading.value = false
+                showDialog.value = false
+                loadShopGoodsAttrList()
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
 }
 
 /**
@@ -297,49 +208,52 @@ const confirm = async (formEl: FormInstance | undefined) => {
  * @param data
  */
 const manageEvent = (data: any) => {
-  router.push('/shop/goods/attr_edit?attr_id=' + data.attr_id)
+    router.push('/shop/goods/attr_edit?attr_id=' + data.attr_id)
 }
 
 /**
  * 删除商品参数
  */
 const deleteEvent = (id: number) => {
-  ElMessageBox.confirm(t('goodsAttrDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    deleteAttr(id)
-      .then(() => {
-        loadShopGoodsAttrList()
-      })
-      .catch(() => {})
-  })
+    ElMessageBox.confirm(t('goodsAttrDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning',
+        }
+    ).then(() => {
+        deleteAttr(id).then(() => {
+            loadShopGoodsAttrList()
+        }).catch(() => {
+        })
+    })
 }
 
 // 修改排序号
 const sortInputListener = debounce((sort, row) => {
-  if (isNaN(sort) || !/^\d{0,8}$/.test(sort)) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('sortTips')}`,
+    if (isNaN(sort) || !/^\d{0,8}$/.test(sort)) {
+        ElMessage({
+            type: 'warning',
+            message: `${ t('sortTips') }`
+        })
+        return
+    }
+    if (sort > 99999999) {
+        row.sort = 99999999
+    }
+    modifyAttrSort({
+        attr_id: row.attr_id,
+        sort
+    }).then((res) => {
     })
-    return
-  }
-  if (sort > 99999999) {
-    row.sort = 99999999
-  }
-  modifyAttrSort({
-    attr_id: row.attr_id,
-    sort,
-  }).then((res) => {})
 })
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadShopGoodsAttrList()
+    if (!formEl) return
+    formEl.resetFields()
+    loadShopGoodsAttrList()
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
diff --git a/admin/src/addon/shop/views/goods/attr_edit.vue b/admin/src/addon/shop/views/goods/attr_edit.vue
index 48b09b34..7e4989c4 100644
--- a/admin/src/addon/shop/views/goods/attr_edit.vue
+++ b/admin/src/addon/shop/views/goods/attr_edit.vue
@@ -1,363 +1,202 @@
 <template>
-  <div class="main-container">
-    <el-card class="card !border-none mb-[15px]" shadow="never">
-      <el-page-header
-        :content="pageName"
-        :icon="ArrowLeft"
-        @back="router.push(`/shop/goods/attr`)"
-      />
-    </el-card>
-
-    <el-card class="box-card !border-none" shadow="never">
-      <!-- 商品参数基础信息 -->
-      <el-row
-        :gutter="20"
-        class="text-[14px]"
-        v-if="Object.keys(attrInfo).length"
-      >
-        <el-col :span="8">
-          <label>{{ t('attrName') }}：</label>
-          <span class="ml-[10px]">{{ attrInfo.attr_name }}</span>
-        </el-col>
-        <el-col :span="6">
-          <label>{{ t('sort') }}：</label>
-          <span class="ml-[10px]">{{ attrInfo.sort }}</span>
-        </el-col>
-        <el-col :span="6">
-          <el-button type="primary" link @click="editEvent">{{
-            t('edit')
-          }}</el-button>
-        </el-col>
-      </el-row>
-
-      <el-button type="primary" @click="openAttrValueEvent" class="my-[15px]">{{
-        t('addShopGoodsAttr')
-      }}</el-button>
-
-      <el-table
-        :data="goodsAttrTable.data"
-        size="large"
-        v-loading="goodsAttrTable.loading"
-      >
-        <template #empty>
-          <span>{{ !goodsAttrTable.loading ? t('emptyData') : '' }}</span>
-        </template>
-
-        <el-table-column
-          prop="attr_value_name"
-          :label="t('attrValueName')"
-          min-width="200"
-          :show-overflow-tooltip="true"
-        />
-
-        <el-table-column
-          prop="type"
-          :label="t('attrValueType')"
-          min-width="100"
-          :show-overflow-tooltip="true"
-        >
-          <template #default="{ row }">
-            <template v-if="row.type == 'radio'">
-              <span>{{ t('attrValueTypeRadio') }}</span>
+    <div class="main-container">
+        <el-card class="card !border-none mb-[15px]" shadow="never">
+            <el-page-header :content="pageName" :icon="ArrowLeft" @back="router.push(`/shop/goods/attr`)" />
+        </el-card>
+        
+        <el-card class="box-card !border-none" shadow="never">
+
+            <!-- 商品参数基础信息 -->
+            <el-row :gutter="20" class="text-[14px]" v-if="Object.keys(attrInfo).length">
+                <el-col :span="8">
+                    <label>{{ t('attrName') }}：</label>
+                    <span class="ml-[10px]">{{ attrInfo.attr_name }}</span>
+                </el-col>
+                <el-col :span="6">
+                    <label>{{ t('sort') }}：</label>
+                    <span class="ml-[10px]">{{ attrInfo.sort }}</span>
+                </el-col>
+                <el-col :span="6">
+                    <el-button type="primary" link @click="editEvent">{{ t('edit') }}</el-button>
+                </el-col>
+            </el-row>
+
+            <el-button type="primary" @click="openAttrValueEvent" class="my-[15px]">{{ t('addShopGoodsAttr') }}</el-button>
+
+            <el-table :data="goodsAttrTable.data" size="large" v-loading="goodsAttrTable.loading">
+                <template #empty>
+                    <span>{{ !goodsAttrTable.loading ? t('emptyData') : '' }}</span>
+                </template>
+
+                <el-table-column prop="attr_value_name" :label="t('attrValueName')" min-width="200" :show-overflow-tooltip="true"/>
+
+                <el-table-column prop="type" :label="t('attrValueType')" min-width="100" :show-overflow-tooltip="true">
+                    <template #default="{ row }">
+                        <template v-if="row.type == 'radio'">
+                            <span>{{ t('attrValueTypeRadio') }}</span>
+                        </template>
+                        <template v-else-if="row.type == 'checkbox'">
+                            <span>{{ t('attrValueTypeCheckbox') }}</span>
+                        </template>
+                        <template v-if="row.type == 'text'">
+                            <span>{{ t('attrValueTypeText') }}</span>
+                        </template>
+                    </template>
+                </el-table-column>
+
+                <el-table-column prop="child" :label="t('attrValueChild')" min-width="320" :show-overflow-tooltip="true">
+                    <template #default="{ row }">
+                        <template v-if="row.type != 'text'">
+                            <template v-for="(item,index) in row.child">
+                                <span :class="{ 'mr-[5px]' : (index+1) != row.child.length }">{{ item.name }}</span>
+                            </template>
+                        </template>
+                        <template v-else>
+                            <span>-</span>
+                        </template>
+                    </template>
+                </el-table-column>
+
+                <el-table-column prop="sort" :label="t('sort')" min-width="120" sortable="custom">
+                    <template #default="{ row,$index }">
+                        <el-input v-model.trim="row.sort" class="w-[70px]" maxlength="8" @input="sortInputListener($event, row)" />
+                    </template>
+                </el-table-column>
+
+                <el-table-column :label="t('operation')" fixed="right" align="right" min-width="120">
+                   <template #default="{ row,$index }">
+                       <el-button type="primary" link @click="editAttrValueEvent(row,$index)">{{ t('edit') }}</el-button>
+                       <el-button type="primary" link @click="deleteEvent($index)">{{ t('delete') }}</el-button>
+                   </template>
+                </el-table-column>
+
+            </el-table>
+
+        </el-card>
+
+        <!-- 编辑商品参数信息 -->
+        <el-dialog v-model="showDialogByAttr" :title="t('updateAttr')" width="500px" :destroy-on-close="true">
+            <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRulesByAttr" class="page-form" v-loading="loadingByAttr">
+                <el-form-item :label="t('attrName')" prop="attr_name">
+                    <el-input v-model.trim="formData.attr_name" clearable :placeholder="t('attrNamePlaceholder')" class="input-width"  maxlength="20" />
+                </el-form-item>
+
+                <el-form-item :label="t('sort')" >
+                    <el-input v-model.trim="formData.sort"  maxlength="8" show-word-limit clearable :placeholder="t('sortPlaceholder')" class="input-width" @keyup="filterNumber($event)"/>
+                </el-form-item>
+
+            </el-form>
+
+            <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialogByAttr = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loadingByAttr" @click="confirmAttr(formRef)">{{ t('confirm') }}</el-button>
+            </span>
             </template>
-            <template v-else-if="row.type == 'checkbox'">
-              <span>{{ t('attrValueTypeCheckbox') }}</span>
-            </template>
-            <template v-if="row.type == 'text'">
-              <span>{{ t('attrValueTypeText') }}</span>
-            </template>
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          prop="child"
-          :label="t('attrValueChild')"
-          min-width="320"
-          :show-overflow-tooltip="true"
-        >
-          <template #default="{ row }">
-            <template v-if="row.type != 'text'">
-              <template v-for="(item, index) in row.child">
-                <span :class="{ 'mr-[5px]': index + 1 != row.child.length }">{{
-                  item.name
-                }}</span>
-              </template>
-            </template>
-            <template v-else>
-              <span>-</span>
-            </template>
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          prop="sort"
-          :label="t('sort')"
-          min-width="120"
-          sortable="custom"
-        >
-          <template #default="{ row, $index }">
-            <el-input
-              v-model.trim="row.sort"
-              class="w-[70px]"
-              maxlength="8"
-              @input="sortInputListener($event, row)"
-            />
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          :label="t('operation')"
-          fixed="right"
-          align="right"
-          min-width="120"
-        >
-          <template #default="{ row, $index }">
-            <el-button
-              type="primary"
-              link
-              @click="editAttrValueEvent(row, $index)"
-              >{{ t('edit') }}</el-button
-            >
-            <el-button type="primary" link @click="deleteEvent($index)">{{
-              t('delete')
-            }}</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
-
-    <!-- 编辑商品参数信息 -->
-    <el-dialog
-      v-model="showDialogByAttr"
-      :title="t('updateAttr')"
-      width="500px"
-      :destroy-on-close="true"
-    >
-      <el-form
-        :model="formData"
-        label-width="120px"
-        ref="formRef"
-        :rules="formRulesByAttr"
-        class="page-form"
-        v-loading="loadingByAttr"
-      >
-        <el-form-item :label="t('attrName')" prop="attr_name">
-          <el-input
-            v-model.trim="formData.attr_name"
-            clearable
-            :placeholder="t('attrNamePlaceholder')"
-            class="input-width"
-            maxlength="20"
-          />
-        </el-form-item>
-
-        <el-form-item :label="t('sort')">
-          <el-input
-            v-model.trim="formData.sort"
-            maxlength="8"
-            show-word-limit
-            clearable
-            :placeholder="t('sortPlaceholder')"
-            class="input-width"
-            @keyup="filterNumber($event)"
-          />
-        </el-form-item>
-      </el-form>
-
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="showDialogByAttr = false">{{
-            t('cancel')
-          }}</el-button>
-          <el-button
-            type="primary"
-            :loading="loadingByAttr"
-            @click="confirmAttr(formRef)"
-            >{{ t('confirm') }}</el-button
-          >
-        </span>
-      </template>
-    </el-dialog>
-
-    <!-- 编辑商品参数值信息 -->
-    <el-dialog
-      v-model="showDialogByAttrValue"
-      :title="attrValueTitleDialog"
-      width="700px"
-      :destroy-on-close="true"
-    >
-      <el-form
-        :model="formAttrValueData"
-        label-width="120px"
-        ref="formAttrValueRef"
-        :rules="formRulesByAttrValue"
-        class="page-form"
-        v-loading="loadingByAttrValue"
-      >
-        <el-form-item :label="t('attrValueName')" prop="attr_value_name">
-          <el-input
-            v-model.trim="formAttrValueData.attr_value_name"
-            clearable
-            :placeholder="t('attrValueNamePlaceholder')"
-            class="input-width"
-            maxlength="20"
-            show-word-limit
-          />
-        </el-form-item>
-
-        <el-form-item :label="t('attrValueType')">
-          <el-select
-            v-model="formAttrValueData.type"
-            class="!w-[150px]"
-            :disabled="actionAttrValueIndex > -1"
-          >
-            <el-option
-              v-for="item in attrValueTypeOptions"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-form-item>
-
-        <el-form-item :label="t('sort')">
-          <el-input
-            v-model.trim="formAttrValueData.sort"
-            maxlength="8"
-            show-word-limit
-            clearable
-            :placeholder="t('sortPlaceholder')"
-            class="!w-[150px]"
-            @keyup="filterNumber($event)"
-          />
-        </el-form-item>
-
-        <template v-if="formAttrValueData.type != 'text'">
-          <el-table :data="formAttrValueData.child" size="large">
-            <template #empty>
-              <span>{{
-                formAttrValueData.child.length == 0 ? t('emptyData') : ''
-              }}</span>
+        </el-dialog>
+
+        <!-- 编辑商品参数值信息 -->
+        <el-dialog v-model="showDialogByAttrValue" :title="attrValueTitleDialog" width="700px" :destroy-on-close="true">
+            <el-form :model="formAttrValueData" label-width="120px" ref="formAttrValueRef" :rules="formRulesByAttrValue" class="page-form" v-loading="loadingByAttrValue">
+                <el-form-item :label="t('attrValueName')" prop="attr_value_name">
+                    <el-input v-model.trim="formAttrValueData.attr_value_name" clearable :placeholder="t('attrValueNamePlaceholder')" class="input-width" maxlength="20" show-word-limit />
+                </el-form-item>
+
+                <el-form-item :label="t('attrValueType')">
+                    <el-select v-model="formAttrValueData.type" class="!w-[150px]" :disabled="actionAttrValueIndex > -1">
+                        <el-option v-for="item in attrValueTypeOptions" :label="item.label" :value="item.value" />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('sort')" >
+                    <el-input v-model.trim="formAttrValueData.sort" maxlength="8" show-word-limit clearable :placeholder="t('sortPlaceholder')" class="!w-[150px]" @keyup="filterNumber($event)"/>
+                </el-form-item>
+
+                <template v-if="formAttrValueData.type != 'text'">
+                    <el-table :data="formAttrValueData.child" size="large">
+                        <template #empty>
+                            <span>{{ formAttrValueData.child.length == 0 ? t('emptyData') : '' }}</span>
+                        </template>
+
+                        <el-table-column prop="name" :label="t('attrValueName')" min-width="200">
+                            <template #default="{ row }">
+                                <el-input v-model.trim="row.name" class="input-width" maxlength="20" :placeholder="t('attrValueNamePlaceholder')" clearable show-word-limit />
+                            </template>
+                        </el-table-column>
+
+                        <el-table-column prop="name" :label="t('sort')" min-width="120">
+                            <template #default="{ row }">
+                                <el-input v-model.trim="row.sort" class="!w-[150px]" maxlength="8" :placeholder="t('sortPlaceholder')" clearable show-word-limit @keyup="filterNumber($event)" />
+                            </template>
+                        </el-table-column>
+
+                        <el-table-column :label="t('operation')" fixed="right" align="right" min-width="60">
+                            <template #default="{ row,$index }">
+                                <el-button type="primary" link @click="deleteAttrValueEvent(row,$index)">{{ t('delete') }}</el-button>
+                            </template>
+                        </el-table-column>
+
+                    </el-table>
+
+                    <el-button type="primary" plain @click="addAttrValueEvent" class="my-[10px]" v-show="formAttrValueData.child.length < maxLength">{{ t('addAttrValue') }}</el-button>
+                </template>
+
+            </el-form>
+
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="showDialogByAttrValue = false">{{ t('cancel') }}</el-button>
+                    <el-button type="primary" :loading="loadingByAttrValue" @click="confirmAttrValue(formAttrValueRef)">{{ t('confirm') }}</el-button>
+                </span>
             </template>
+        </el-dialog>
 
-            <el-table-column
-              prop="name"
-              :label="t('attrValueName')"
-              min-width="200"
-            >
-              <template #default="{ row }">
-                <el-input
-                  v-model.trim="row.name"
-                  class="input-width"
-                  maxlength="20"
-                  :placeholder="t('attrValueNamePlaceholder')"
-                  clearable
-                  show-word-limit
-                />
-              </template>
-            </el-table-column>
-
-            <el-table-column prop="name" :label="t('sort')" min-width="120">
-              <template #default="{ row }">
-                <el-input
-                  v-model.trim="row.sort"
-                  class="!w-[150px]"
-                  maxlength="8"
-                  :placeholder="t('sortPlaceholder')"
-                  clearable
-                  show-word-limit
-                  @keyup="filterNumber($event)"
-                />
-              </template>
-            </el-table-column>
-
-            <el-table-column
-              :label="t('operation')"
-              fixed="right"
-              align="right"
-              min-width="60"
-            >
-              <template #default="{ row, $index }">
-                <el-button
-                  type="primary"
-                  link
-                  @click="deleteAttrValueEvent(row, $index)"
-                  >{{ t('delete') }}</el-button
-                >
-              </template>
-            </el-table-column>
-          </el-table>
-
-          <el-button
-            type="primary"
-            plain
-            @click="addAttrValueEvent"
-            class="my-[10px]"
-            v-show="formAttrValueData.child.length < maxLength"
-            >{{ t('addAttrValue') }}</el-button
-          >
-        </template>
-      </el-form>
-
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="showDialogByAttrValue = false">{{
-            t('cancel')
-          }}</el-button>
-          <el-button
-            type="primary"
-            :loading="loadingByAttrValue"
-            @click="confirmAttrValue(formAttrValueRef)"
-            >{{ t('confirm') }}</el-button
-          >
-        </span>
-      </template>
-    </el-dialog>
-  </div>
+    </div>
 </template>
 
 <script lang="ts" setup>
-import { reactive, ref, computed } from 'vue'
+import { reactive, ref,computed } from 'vue'
 import { t } from '@/lang'
-import { ElMessage, ElMessageBox, FormInstance } from 'element-plus'
+import { ElMessage,ElMessageBox,FormInstance } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
-import { debounce, filterNumber } from '@/utils/common'
-import { getAttrInfo, editAttr, modifyAttrValue } from '@/addon/shop/api/goods'
+import { debounce,filterNumber } from '@/utils/common'
+import { getAttrInfo,editAttr, modifyAttrValue } from '@/addon/shop/api/goods'
 import { cloneDeep } from 'lodash-es'
 
 const route = useRoute()
 const router = useRouter()
 
-const pageName = route.meta.title
+const pageName = route.meta.title;
 
 route.query.attr_id = route.query.attr_id || 0
 
-const attrId: any = ref(route.query.attr_id)
-const attrInfo: any = reactive({})
+const attrId:any = ref(route.query.attr_id)
+const attrInfo:any = reactive({})
 
 const maxLength = ref(30) // 参数值最大数量控制
 
 const goodsAttrTable = reactive({
-  loading: true,
-  data: [],
+    loading: true,
+    data: []
 })
 
-const loadAttrInfo = () => {
-  // 查询商品参数信息
-  getAttrInfo(attrId.value).then((res: any) => {
-    Object.assign(attrInfo, res.data)
-    if (attrInfo.attr_value_format) {
-      attrInfo.attr_value_format = JSON.parse(attrInfo.attr_value_format)
-    } else {
-      attrInfo.attr_value_format = []
-    }
+const loadAttrInfo = ()=> {
+    // 查询商品参数信息
+    getAttrInfo(attrId.value).then((res: any) => {
+        Object.assign(attrInfo, res.data)
+        if (attrInfo.attr_value_format) {
+            attrInfo.attr_value_format = JSON.parse(attrInfo.attr_value_format);
+        } else {
+            attrInfo.attr_value_format = []
+        }
 
-    goodsAttrTable.data = cloneDeep(attrInfo.attr_value_format)
-    goodsAttrTable.data.sort((a: any, b: any) => {
-      return b.sort - a.sort
-    })
+        goodsAttrTable.data = cloneDeep(attrInfo.attr_value_format)
+        goodsAttrTable.data.sort((a: any, b: any) => {
+            return b.sort - a.sort
+        });
 
-    goodsAttrTable.loading = false
-  })
+        goodsAttrTable.loading = false
+    })
 }
 
 loadAttrInfo()
@@ -366,26 +205,26 @@ const showDialogByAttr = ref(false)
 const loadingByAttr = ref(false)
 const formRef = ref<FormInstance>()
 const formData = reactive({
-  attr_id: 0,
-  attr_name: '',
-  sort: 0,
+    attr_id: 0,
+    attr_name: '',
+    sort: 0
 })
 
 // 表单验证规则
 const formRulesByAttr = computed(() => {
-  return {
-    attr_name: [
-      { required: true, message: t('attrNamePlaceholder'), trigger: 'blur' },
-    ],
-  }
+    return {
+        attr_name: [
+            { required: true, message: t('attrNamePlaceholder'), trigger: 'blur' }
+        ]
+    }
 })
 
 // 编辑商品参数
-const editEvent = (data: any) => {
-  formData.attr_id = attrInfo.attr_id
-  formData.attr_name = attrInfo.attr_name
-  formData.sort = attrInfo.sort
-  showDialogByAttr.value = true
+const editEvent = (data:any)=>{
+    formData.attr_id = attrInfo.attr_id;
+    formData.attr_name = attrInfo.attr_name;
+    formData.sort = attrInfo.sort;
+    showDialogByAttr.value = true
 }
 
 /**
@@ -393,228 +232,205 @@ const editEvent = (data: any) => {
  * @param formEl
  */
 const confirmAttr = async (formEl: FormInstance | undefined) => {
-  if (loadingByAttr.value || !formEl) return
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loadingByAttr.value = true
-      editAttr(formData)
-        .then((res) => {
-          loadingByAttr.value = false
-          showDialogByAttr.value = false
-          loadAttrInfo()
-        })
-        .catch((err) => {
-          loadingByAttr.value = false
-        })
-    }
-  })
+    if (loadingByAttr.value || !formEl) return
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loadingByAttr.value = true
+            editAttr(formData).then(res => {
+                loadingByAttr.value = false
+                showDialogByAttr.value = false
+                loadAttrInfo()
+            }).catch(err => {
+                loadingByAttr.value = false
+            })
+        }
+    })
 }
 
 // 删除商品参数
 const deleteEvent = (index: any) => {
-  ElMessageBox.confirm(t('goodsAttrDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    if (repeatAttrValue.value) return
-    repeatAttrValue.value = true
-
-    attrInfo.attr_value_format.splice(index, 1)
-    let data = {
-      attr_id: attrId.value,
-      attr_value_format: JSON.stringify(attrInfo.attr_value_format),
-    }
-    modifyAttrValue(data)
-      .then((res) => {
-        repeatAttrValue.value = false
-        loadAttrInfo()
-      })
-      .catch((err) => {
-        repeatAttrValue.value = false
-      })
-  })
+    ElMessageBox.confirm(t('goodsAttrDeleteTips'), t('warning'), {
+        confirmButtonText: t('confirm'),
+        cancelButtonText: t('cancel'),
+        type: 'warning',
+    }).then(() => {
+        if (repeatAttrValue.value) return
+        repeatAttrValue.value = true
+
+        attrInfo.attr_value_format.splice(index, 1);
+        let data = {
+            attr_id: attrId.value,
+            attr_value_format: JSON.stringify(attrInfo.attr_value_format)
+        };
+        modifyAttrValue(data).then(res => {
+            repeatAttrValue.value = false
+            loadAttrInfo()
+        }).catch(err => {
+            repeatAttrValue.value = false
+        })
+    })
 }
 
 const showDialogByAttrValue = ref(false)
 const loadingByAttrValue = ref(false)
 const formAttrValueRef = ref<FormInstance>()
 const attrValueTitleDialog = ref('')
-const formAttrValueData: any = reactive({
-  attr_value_id: 0,
-  attr_value_name: '',
-  type: 'radio',
-  sort: 0,
-  child: <any>[],
+const formAttrValueData:any = reactive({
+    attr_value_id: 0,
+    attr_value_name: '',
+    type: 'radio',
+    sort: 0,
+    child: <any>[]
 })
 
 // 参数类型下拉框
 const attrValueTypeOptions = reactive([
-  {
-    label: '单选',
-    value: 'radio',
-  },
-  {
-    label: '多选',
-    value: 'checkbox',
-  },
-  {
-    label: '输入',
-    value: 'text',
-  },
+    {
+        label:'单选',
+        value:'radio'
+    },
+    {
+        label:'多选',
+        value:'checkbox'
+    },
+    {
+        label:'输入',
+        value:'text'
+    }
 ])
 
 // 生成随机数，商品参数中添加的为正数，商品中为负数，方便区分
 const generateRandom = () => {
-  return (
-    Math.floor(new Date().getSeconds()) +
-    Math.floor(new Date().getMilliseconds())
-  )
+    return (Math.floor(new Date().getSeconds()) + Math.floor(new Date().getMilliseconds()));
 }
 
 // 打开商品参数弹出框
-const openAttrValueEvent = () => {
-  formAttrValueData.attr_value_id =
-    attrInfo.attr_value_format.length + generateRandom()
-  formAttrValueData.attr_value_name = ''
-  formAttrValueData.type = 'radio'
-  formAttrValueData.sort = 0
-  formAttrValueData.child = []
-
-  showDialogByAttrValue.value = true
-  attrValueTitleDialog.value = t('addShopGoodsAttr')
-  actionAttrValueId.value = -1
+const openAttrValueEvent = ()=> {
+    formAttrValueData.attr_value_id = attrInfo.attr_value_format.length + generateRandom();
+    formAttrValueData.attr_value_name = '';
+    formAttrValueData.type = 'radio';
+    formAttrValueData.sort = 0;
+    formAttrValueData.child = [];
+
+    showDialogByAttrValue.value = true;
+    attrValueTitleDialog.value = t('addShopGoodsAttr');
+    actionAttrValueId.value = -1
 }
 
 // 修改参数的排序号
-const sortInputListener = debounce((sort: any, row: any) => {
-  if (isNaN(sort) || !/^\d{0,10}$/.test(sort)) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('sortTips')}`,
-    })
-    return
-  }
+const sortInputListener = debounce((sort:any, row:any) => {
+    if (isNaN(sort) || !/^\d{0,10}$/.test(sort)) {
+        ElMessage({
+            type: 'warning',
+            message: `${t('sortTips')}`
+        })
+        return
+    }
 
-  for (let i = 0; i < attrInfo.attr_value_format.length; i++) {
-    if (attrInfo.attr_value_format[i].attr_value_id == row.attr_value_id) {
-      attrInfo.attr_value_format[i].sort = sort
-      break
+    for (let i = 0; i < attrInfo.attr_value_format.length; i++) {
+        if (attrInfo.attr_value_format[i].attr_value_id == row.attr_value_id) {
+            attrInfo.attr_value_format[i].sort = sort;
+            break;
+        }
     }
-  }
-
-  let data = {
-    attr_id: attrId.value,
-    attr_value_format: JSON.stringify(attrInfo.attr_value_format),
-  }
-  modifyAttrValue(data)
-    .then((res) => {
-      loadAttrInfo()
+
+    let data = {
+        attr_id: attrId.value,
+        attr_value_format: JSON.stringify(attrInfo.attr_value_format)
+    };
+    modifyAttrValue(data).then(res => {
+        loadAttrInfo()
+    }).catch(err => {
     })
-    .catch((err) => {})
 })
 
 // 添加参数值
-const addAttrValueEvent = () => {
-  formAttrValueData.child.push({
-    id: formAttrValueData.child.length + generateRandom(),
-    name: '',
-    sort: 0,
-  })
+const addAttrValueEvent = ()=>{
+    formAttrValueData.child.push({
+        id: formAttrValueData.child.length + generateRandom(),
+        name: '',
+        sort: 0
+    });
 }
 
 // 编辑商品参数值
-const editAttrValueEvent = (data: any, index: any) => {
-  attrValueTitleDialog.value = t('updateShopGoodsAttr')
-  actionAttrValueId.value = data.attr_value_id
-  Object.assign(formAttrValueData, cloneDeep(data))
-  showDialogByAttrValue.value = true
+const editAttrValueEvent = (data:any,index:any)=> {
+    attrValueTitleDialog.value = t('updateShopGoodsAttr');
+    actionAttrValueId.value = data.attr_value_id
+    Object.assign(formAttrValueData,cloneDeep(data))
+    showDialogByAttrValue.value = true;
 }
 
 // 表单验证规则
 const formRulesByAttrValue = computed(() => {
-  return {
-    attr_value_name: [
-      {
-        required: true,
-        message: t('attrValueNamePlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-  }
+    return {
+        attr_value_name: [
+            { required: true, message: t('attrValueNamePlaceholder'), trigger: 'blur' }
+        ]
+    }
 })
 
 const actionAttrValueId = ref(-1)
 const repeatAttrValue = ref(false)
 const confirmAttrValue = async (formEl: FormInstance | undefined) => {
-  if (loadingByAttrValue.value || !formEl) return
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      if (formAttrValueData.type != 'text') {
-        if (formAttrValueData.child.length == 0) {
-          ElMessage({
-            type: 'warning',
-            message: `${t('attrValueNamePlaceholder')}`,
-          })
-          return
-        }
-        for (let i = 0; i < formAttrValueData.child.length; i++) {
-          if (formAttrValueData.child[i].name == '') {
-            ElMessage({
-              type: 'warning',
-              message: `${t('attrValueNamePlaceholder')}`,
+    if (loadingByAttrValue.value || !formEl) return
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            if(formAttrValueData.type != 'text'){
+                if(formAttrValueData.child.length == 0){
+                    ElMessage({type: 'warning', message: `${t('attrValueNamePlaceholder')}`})
+                    return;
+                }
+                for(let i=0;i<formAttrValueData.child.length;i++){
+                    if(formAttrValueData.child[i].name == ''){
+                        ElMessage({type: 'warning', message: `${t('attrValueNamePlaceholder')}`})
+                        break;
+                    }
+                }
+            }
+
+            if (repeatAttrValue.value) return
+            repeatAttrValue.value = true
+
+            formAttrValueData.child.sort((a: any, b: any) => {
+                return b.sort - a.sort
+            });
+
+            loadingByAttrValue.value = true
+            if(actionAttrValueId.value == -1) {
+                attrInfo.attr_value_format.push(formAttrValueData)
+            }else{
+                for (let i = 0; i < attrInfo.attr_value_format.length; i++) {
+                    if (attrInfo.attr_value_format[i].attr_value_id == actionAttrValueId.value) {
+                        attrInfo.attr_value_format[i] = cloneDeep(formAttrValueData)
+                        break;
+                    }
+                }
+            }
+            let data = {
+                attr_id : attrId.value,
+                attr_value_format : JSON.stringify(attrInfo.attr_value_format)
+            };
+            modifyAttrValue(data).then(res => {
+                loadingByAttrValue.value = false
+                showDialogByAttrValue.value = false
+                repeatAttrValue.value = false
+                loadAttrInfo()
+            }).catch(err => {
+                loadingByAttrValue.value = false
+                repeatAttrValue.value = false
             })
-            break
-          }
-        }
-      }
-
-      if (repeatAttrValue.value) return
-      repeatAttrValue.value = true
-
-      formAttrValueData.child.sort((a: any, b: any) => {
-        return b.sort - a.sort
-      })
-
-      loadingByAttrValue.value = true
-      if (actionAttrValueId.value == -1) {
-        attrInfo.attr_value_format.push(formAttrValueData)
-      } else {
-        for (let i = 0; i < attrInfo.attr_value_format.length; i++) {
-          if (
-            attrInfo.attr_value_format[i].attr_value_id ==
-            actionAttrValueId.value
-          ) {
-            attrInfo.attr_value_format[i] = cloneDeep(formAttrValueData)
-            break
-          }
         }
-      }
-      let data = {
-        attr_id: attrId.value,
-        attr_value_format: JSON.stringify(attrInfo.attr_value_format),
-      }
-      modifyAttrValue(data)
-        .then((res) => {
-          loadingByAttrValue.value = false
-          showDialogByAttrValue.value = false
-          repeatAttrValue.value = false
-          loadAttrInfo()
-        })
-        .catch((err) => {
-          loadingByAttrValue.value = false
-          repeatAttrValue.value = false
-        })
-    }
-  })
+    })
 }
 
 // 删除参数值
-const deleteAttrValueEvent = (item: any, index: any) => {
-  formAttrValueData.child.splice(index, 1)
+const deleteAttrValueEvent = (item:any,index:any)=> {
+    formAttrValueData.child.splice(index,1);
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
diff --git a/admin/src/addon/shop/views/goods/brand_list.vue b/admin/src/addon/shop/views/goods/brand_list.vue
index adf9dc6d..77e48435 100644
--- a/admin/src/addon/shop/views/goods/brand_list.vue
+++ b/admin/src/addon/shop/views/goods/brand_list.vue
@@ -1,132 +1,77 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-        <el-button type="primary" @click="addEvent">
-          {{ t('addBrand') }}
-        </el-button>
-      </div>
-
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="brandTable.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('brandName')" prop="brand_name">
-            <el-input
-              v-model.trim="brandTable.searchParam.brand_name"
-              :placeholder="t('brandNamePlaceholder')"
-            />
-          </el-form-item>
-
-          <el-form-item>
-            <el-button type="primary" @click="loadBrandList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
-
-      <div class="mt-[10px]">
-        <el-table
-          :data="brandTable.data"
-          size="large"
-          v-loading="brandTable.loading"
-          @sort-change="sortChange"
-        >
-          <template #empty>
-            <span>{{ !brandTable.loading ? t('emptyData') : '' }}</span>
-          </template>
-          <el-table-column
-            prop="brand_name"
-            :label="t('brandName')"
-            min-width="120"
-          />
-          <el-table-column :label="t('logo')" min-width="120">
-            <template #default="{ row }">
-              <div class="h-[30px]">
-                <el-image
-                  class="w-[30px] h-[30px]"
-                  :src="img(row.logo)"
-                  fit="contain"
-                >
-                  <template #error>
-                    <div class="image-slot">
-                      <img
-                        class="w-[30px] h-[30px]"
-                        src="@/addon/shop/assets/brand_default.png"
-                      />
-                    </div>
-                  </template>
-                </el-image>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="sort"
-            :label="t('sort')"
-            min-width="120"
-            sortable="custom"
-          >
-            <template #default="{ row }">
-              <el-input
-                v-model.trim="row.sort"
-                class="!w-[100px]"
-                maxlength="8"
-                @blur="sortInputListener(row.sort, row)"
-              />
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            :label="t('operation')"
-            fixed="right"
-            align="right"
-            min-width="120"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="editEvent(row)">{{
-                t('edit')
-              }}</el-button>
-              <el-button type="primary" link @click="deleteEvent(row.brand_id)"
-                >{{ t('delete') }}
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="brandTable.page"
-            v-model:page-size="brandTable.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="brandTable.total"
-            @size-change="loadBrandList()"
-            @current-change="loadBrandList"
-          />
-        </div>
-      </div>
-
-      <brand-edit ref="editBrandDialog" @complete="loadBrandList" />
-    </el-card>
-  </div>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+                <el-button type="primary" @click="addEvent">
+                    {{ t('addBrand') }}
+                </el-button>
+            </div>
+
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="brandTable.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('brandName')" prop="brand_name">
+                        <el-input v-model.trim="brandTable.searchParam.brand_name" :placeholder="t('brandNamePlaceholder')" />
+                    </el-form-item>
+
+                    <el-form-item>
+                        <el-button type="primary" @click="loadBrandList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+
+            <div class="mt-[10px]">
+                <el-table :data="brandTable.data" size="large" v-loading="brandTable.loading" @sort-change="sortChange">
+                    <template #empty>
+                        <span>{{ !brandTable.loading ? t('emptyData') : '' }}</span>
+                    </template>
+                    <el-table-column prop="brand_name" :label="t('brandName')" min-width="120" />
+                    <el-table-column :label="t('logo')" min-width="120">
+                        <template #default="{ row }">
+                            <div class="h-[30px]">
+                                <el-image class="w-[30px] h-[30px] " :src="img(row.logo)" fit="contain">
+                                    <template #error>
+                                        <div class="image-slot">
+                                            <img class="w-[30px] h-[30px]" src="@/addon/shop/assets/brand_default.png" />
+                                        </div>
+                                    </template>
+                                </el-image>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="sort" :label="t('sort')" min-width="120" sortable="custom">
+                        <template #default="{ row }">
+                            <el-input v-model.trim="row.sort" class="!w-[100px]" maxlength="8" @blur="sortInputListener(row.sort, row)" />
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column :label="t('operation')" fixed="right" align="right" min-width="120">
+                        <template #default="{ row }">
+                            <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+                            <el-button type="primary" link @click="deleteEvent(row.brand_id)">{{ t('delete') }}
+                            </el-button>
+                        </template>
+                    </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="brandTable.page" v-model:page-size="brandTable.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="brandTable.total"
+                        @size-change="loadBrandList()" @current-change="loadBrandList" />
+                </div>
+            </div>
+
+            <brand-edit ref="editBrandDialog" @complete="loadBrandList" />
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
 import { t } from '@/lang'
-import {
-  getBrandPageList,
-  deleteBrand,
-  modifyBrandSort,
-} from '@/addon/shop/api/goods'
+import { getBrandPageList, deleteBrand, modifyBrandSort } from '@/addon/shop/api/goods'
 import { img, debounce } from '@/utils/common'
 import { ElMessageBox, FormInstance, ElMessage } from 'element-plus'
 import BrandEdit from '@/addon/shop/views/goods/components/brand-edit.vue'
@@ -136,54 +81,52 @@ const route = useRoute()
 const pageName = route.meta.title
 
 const brandTable = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    brand_name: '',
-    order: '',
-    sort: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        brand_name: '',
+        order: '',
+        sort: ''
+    }
 })
 
 const searchFormRef = ref<FormInstance>()
 
 // 监听排序
 const sortChange = (event: any) => {
-  let sort = ''
-  if (event.order == 'ascending') {
-    sort = 'asc'
-  } else if (event.order == 'descending') {
-    sort = 'desc'
-  }
-  if (sort) {
-    brandTable.searchParam.order = event.prop
-    brandTable.searchParam.sort = sort
-  }
-  loadBrandList()
+    let sort = ''
+    if (event.order == 'ascending') {
+        sort = 'asc'
+    } else if (event.order == 'descending') {
+        sort = 'desc'
+    }
+    if (sort) {
+        brandTable.searchParam.order = event.prop
+        brandTable.searchParam.sort = sort
+    }
+    loadBrandList()
 }
 
 /**
  * 获取商品品牌列表
  */
 const loadBrandList = (page: number = 1) => {
-  brandTable.loading = true
-  brandTable.page = page
-
-  getBrandPageList({
-    page: brandTable.page,
-    limit: brandTable.limit,
-    ...brandTable.searchParam,
-  })
-    .then((res) => {
-      brandTable.loading = false
-      brandTable.data = res.data.data
-      brandTable.total = res.data.total
-    })
-    .catch(() => {
-      brandTable.loading = false
+    brandTable.loading = true
+    brandTable.page = page
+
+    getBrandPageList({
+        page: brandTable.page,
+        limit: brandTable.limit,
+        ...brandTable.searchParam
+    }).then(res => {
+        brandTable.loading = false
+        brandTable.data = res.data.data
+        brandTable.total = res.data.total
+    }).catch(() => {
+        brandTable.loading = false
     })
 }
 loadBrandList()
@@ -194,8 +137,8 @@ const editBrandDialog: Record<string, any> | null = ref(null)
  * 添加商品品牌
  */
 const addEvent = () => {
-  editBrandDialog.value.setFormData()
-  editBrandDialog.value.showDialog = true
+    editBrandDialog.value.setFormData()
+    editBrandDialog.value.showDialog = true
 }
 
 /**
@@ -203,49 +146,52 @@ const addEvent = () => {
  * @param data
  */
 const editEvent = (data: any) => {
-  editBrandDialog.value.setFormData(data)
-  editBrandDialog.value.showDialog = true
+    editBrandDialog.value.setFormData(data)
+    editBrandDialog.value.showDialog = true
 }
 
 /**
  * 删除商品品牌
  */
 const deleteEvent = (id: number) => {
-  ElMessageBox.confirm(t('brandDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    deleteBrand(id)
-      .then(() => {
-        loadBrandList()
-      })
-      .catch(() => {})
-  })
+    ElMessageBox.confirm(t('brandDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        deleteBrand(id).then(() => {
+            loadBrandList()
+        }).catch(() => {
+        })
+    })
 }
 // 修改排序号
 const sortInputListener = debounce((sort, row) => {
-  if (isNaN(sort) || !/^\d{0,8}$/.test(sort)) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('sortTips')}`,
+    if (isNaN(sort) || !/^\d{0,8}$/.test(sort)) {
+        ElMessage({
+            type: 'warning',
+            message: `${ t('sortTips') }`
+        })
+        return
+    }
+    if (sort > 99999999) {
+        row.sort = 99999999
+    }
+    modifyBrandSort({
+        brand_id: row.brand_id,
+        sort
+    }).then((res) => {
     })
-    return
-  }
-  if (sort > 99999999) {
-    row.sort = 99999999
-  }
-  modifyBrandSort({
-    brand_id: row.brand_id,
-    sort,
-  }).then((res) => {})
 })
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadBrandList()
+    if (!formEl) return
+    formEl.resetFields()
+    loadBrandList()
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
diff --git a/admin/src/addon/shop/views/goods/category.vue b/admin/src/addon/shop/views/goods/category.vue
index f081c65e..25a865d7 100644
--- a/admin/src/addon/shop/views/goods/category.vue
+++ b/admin/src/addon/shop/views/goods/category.vue
@@ -1,118 +1,75 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center mb-[5px]">
-        <span class="text-page-title">{{ pageName }}</span>
-        <el-button type="primary" @click="addEvent">
-          {{ t('addCategory') }}
-        </el-button>
-      </div>
-      <el-tabs
-        class="demo-tabs"
-        model-value="/shop/goods/category"
-        @tab-change="handleClick"
-      >
-        <el-tab-pane
-          :label="t('tabGoodsCategory')"
-          name="/shop/goods/category"
-        />
-        <el-tab-pane
-          :label="t('tabGoodsCategoryConfig')"
-          name="/shop/goods/category/config"
-        />
-      </el-tabs>
-      <div class="mt-[10px]">
-        <el-table
-          :data="categoryTable.data"
-          ref="tableRef"
-          size="large"
-          v-loading="categoryTable.loading"
-          row-key="category_id"
-          :tree-props="{ hasChildren: 'hasChildren', children: 'child_list' }"
-        >
-          <template #empty>
-            <span>{{ !categoryTable.loading ? t('emptyData') : '' }}</span>
-          </template>
-          <el-table-column :label="t('categoryName')" min-width="120">
-            <template #default="{ row }">
-              <i class="order-0 iconfont icontuodong vues-rank mr-[8px]"></i>
-              <span class="order-2">{{ row.category_name }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('image')" width="170" align="left">
-            <template #default="{ row }">
-              <div class="h-[30px]">
-                <el-image
-                  class="w-[30px] h-[30px]"
-                  :src="img(row.image)"
-                  fit="contain"
-                >
-                  <template #error>
-                    <div class="image-slot">
-                      <img
-                        class="w-[30px] h-[30px]"
-                        src="@/addon/shop/assets/category_default.png"
-                      />
-                    </div>
-                  </template>
-                </el-image>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="is_show" :label="t('isShow')" width="400">
-            <template #default="{ row }">
-              <el-tag
-                class="cursor-pointer"
-                :type="row.is_show != 2 ? 'success' : 'danger'"
-                @click="showClick(row)"
-                >{{ row.is_show != 2 ? '是' : '否' }}</el-tag
-              >
-            </template>
-          </el-table-column>
-          <el-table-column prop="sort" :label="t('sort')" width="120" />
-          <el-table-column
-            :label="t('operation')"
-            fixed="right"
-            align="right"
-            width="200"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="spreadEvent(row)">{{
-                t('spreadGoodsCategory')
-              }}</el-button>
-              <el-button type="primary" link @click="editEvent(row)">{{
-                t('edit')
-              }}</el-button>
-              <el-button type="primary" link @click="deleteEvent(row)">{{
-                t('delete')
-              }}</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+            <div class="flex justify-between items-center mb-[5px]">
+                <span class="text-page-title">{{ pageName }}</span>
+                <el-button type="primary" @click="addEvent">
+                    {{ t('addCategory') }}
+                </el-button>
+            </div>
+            <el-tabs class="demo-tabs" model-value="/shop/goods/category" @tab-change="handleClick">
+                <el-tab-pane :label="t('tabGoodsCategory')" name="/shop/goods/category" />
+                <el-tab-pane :label="t('tabGoodsCategoryConfig')" name="/shop/goods/category/config" />
+            </el-tabs>
+            <div class="mt-[10px]">
+                <el-table :data="categoryTable.data" ref="tableRef" size="large" v-loading="categoryTable.loading" row-key="category_id" :tree-props="{ hasChildren: 'hasChildren', children: 'child_list' }">
+                    <template #empty>
+                        <span>{{ !categoryTable.loading ? t('emptyData') : '' }}</span>
+                    </template>
+                    <el-table-column :label="t('categoryName')" min-width="120">
+                        <template #default="{ row }">
+                            <i class="order-0 iconfont icontuodong vues-rank mr-[8px]"></i>
+                            <span class="order-2">{{ row.category_name }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('image')" width="170" align="left">
+                        <template #default="{ row }">
+                            <div class="h-[30px]">
+                                <el-image class="w-[30px] h-[30px] " :src="img(row.image)" fit="contain">
+                                    <template #error>
+                                        <div class="image-slot">
+                                            <img class="w-[30px] h-[30px]" src="@/addon/shop/assets/category_default.png" />
+                                        </div>
+                                    </template>
+                                </el-image>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="is_show" :label="t('isShow')" width="400">
+                        <template #default="{ row }">
+                            <el-tag class="cursor-pointer" :type="row.is_show != 2 ? 'success' : 'danger'" @click="showClick(row)">{{ row.is_show != 2 ? '是' : '否' }}</el-tag>
+                        </template>
+                    </el-table-column>
+                     <el-table-column prop="sort" :label="t('sort')" width="120" />
+                    <el-table-column :label="t('operation')" fixed="right" align="right" width="200">
+                        <template #default="{ row }">
+                            <el-button type="primary" link @click="spreadEvent(row)">{{ t('spreadGoodsCategory') }}</el-button>
+                            <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+                            <el-button type="primary" link @click="deleteEvent(row)">{{ t('delete') }}</el-button>
+                        </template>
+                    </el-table-column>
 
-      <category-edit ref="editCategoryDialog" @complete="loadCategoryList" />
-    </el-card>
+                </el-table>
+            </div>
 
-    <!-- 商品分类推广弹出框 -->
-    <goods-category-spread-popup ref="goodsCategorySpreadPopupRef" />
-  </div>
+            <category-edit ref="editCategoryDialog" @complete="loadCategoryList" />
+        </el-card>
+
+        <!-- 商品分类推广弹出框 -->
+        <goods-category-spread-popup ref="goodsCategorySpreadPopupRef" />
+
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref, onMounted, nextTick } from 'vue'
 import { t } from '@/lang'
-import {
-  getCategoryTree,
-  deleteCategory,
-  updateCategory,
-  editCategory,
-} from '@/addon/shop/api/goods'
+import { getCategoryTree, deleteCategory, updateCategory, editCategory } from '@/addon/shop/api/goods'
 import { img } from '@/utils/common'
 import { ElMessageBox } from 'element-plus'
 import categoryEdit from '@/addon/shop/views/goods/components/category-edit.vue'
 import goodsCategorySpreadPopup from '@/addon/shop/views/goods/components/goods-category-spread-popup.vue'
-import { useRoute, useRouter } from 'vue-router'
+import { useRoute,useRouter } from 'vue-router'
 import Sortable from 'sortablejs'
 import { useTemplateRefsList } from '@vueuse/core'
 import { cloneDeep } from 'lodash-es'
@@ -121,132 +78,114 @@ const route = useRoute()
 const pageName = route.meta.title
 const tableRef = useTemplateRefsList<HTMLElement>()
 const categoryTable = reactive({
-  loading: true,
-  data: [],
+    loading: true,
+    data: []
 })
 
 onMounted(() => {
-  nextTick(() => {
-    rowDrop()
-  })
-  loadCategoryList()
+    nextTick(() => {
+        rowDrop()
+    })
+    loadCategoryList()
 })
 
 // 拖拽
 const activeRows = ref<any[]>([])
 // 拖拽排序
 const rowDrop = () => {
-  const tbody = tableRef.value.$el.querySelector(
-    '.el-table__body-wrapper tbody'
-  )
-  Sortable.create(tbody, {
-    handle: '.vues-rank',
-    animation: 300,
-    onMove: ({ dragged, related }) => {
-      const oldRow = activeRows.value[dragged.rowIndex] // 移动的那个元素
-      const newRow = activeRows.value[related.rowIndex] // 新的元素
-      if (oldRow.pid !== newRow.pid) {
-        // 移动的元素与新元素父级id不相同
-        return false // 不允许跨级拖动
-      }
-    },
-    onStart: () => {
-      // 开始拖拽前把树形结构数据扁平化
-      activeRows.value = treeToTile(cloneDeep(categoryTable.data)) // 把树形的结构转为列表再进行拖拽
-    },
-    onEnd: (e) => {
-      const oldRow = activeRows.value[e.oldIndex] // 移动的那个元素
-      const newRow = activeRows.value[e.newIndex] // 新的元素
+    const tbody = tableRef.value.$el.querySelector('.el-table__body-wrapper tbody')
+    Sortable.create(tbody, {
+        handle: '.vues-rank',
+        animation: 300,
+        onMove: ({ dragged, related }) => {
+            const oldRow = activeRows.value[dragged.rowIndex] // 移动的那个元素
+            const newRow = activeRows.value[related.rowIndex] // 新的元素
+            if (oldRow.pid !== newRow.pid) { // 移动的元素与新元素父级id不相同
+                return false // 不允许跨级拖动
+            }
+        },
+        onStart: () => { // 开始拖拽前把树形结构数据扁平化
+            activeRows.value = treeToTile(cloneDeep(categoryTable.data)) // 把树形的结构转为列表再进行拖拽
+        },
+        onEnd: e => {
+            const oldRow = activeRows.value[e.oldIndex] // 移动的那个元素
+            const newRow = activeRows.value[e.newIndex] // 新的元素
 
-      if (e.oldIndex === e.newIndex || oldRow.pid !== newRow.pid) return false
+            if (e.oldIndex === e.newIndex || oldRow.pid !== newRow.pid) return false
 
-      const index = activeRows.value.indexOf(oldRow)
+            const index = activeRows.value.indexOf(oldRow)
 
-      if (index < 0) return false
+            if (index < 0) return false
 
-      const currRow = activeRows.value.splice(e.oldIndex, 1)[0]
-      activeRows.value.splice(e.newIndex, 0, currRow)
-      const pid = newRow.pid
-      const currentRows = activeRows.value
-        .filter((c) => c.pid === pid)
-        ?.map((item, index) => {
-          if (item.level === 1 && item.category_id === currRow.category_id) {
-            categoryTable.data = categoryTable.data.filter(
-              (c) => c.category_id !== currRow.category_id
-            )
-            categoryTable.data.splice(index, 0, currRow)
-          }
-          if (item.level === 2 && item.category_id === currRow.category_id) {
-            const treeIndex = categoryTable.data.findIndex(
-              (el) => el.category_id === item.pid
-            )
-            const obj = cloneDeep(
-              categoryTable.data[treeIndex].child_list.filter(
-                (c) => c.category_id !== currRow.category_id
-              )
-            )
-            categoryTable.data[treeIndex].child_list = []
-            categoryTable.data[treeIndex].child_list.push(...obj)
-            categoryTable.data[treeIndex].child_list.splice(index, 0, currRow)
-          }
-          return {
-            category_id: item.category_id, // 当前行的唯一标识
-            sort: 9999 - index,
-          }
-        })
-      updateCategoryFn({ category_sort_array: currentRows })
-    },
-  })
+            const currRow = activeRows.value.splice(e.oldIndex, 1)[0]
+            activeRows.value.splice(e.newIndex, 0, currRow)
+            const pid = newRow.pid
+            const currentRows = activeRows.value.filter(c => c.pid === pid)?.map((item, index) => {
+                if (item.level === 1 && item.category_id === currRow.category_id) {
+                    categoryTable.data = categoryTable.data.filter(c => c.category_id !== currRow.category_id)
+                    categoryTable.data.splice(index, 0, currRow)
+                }
+                if (item.level === 2 && item.category_id === currRow.category_id) {
+                    const treeIndex = categoryTable.data.findIndex(el => el.category_id === item.pid)
+                    const obj = cloneDeep(categoryTable.data[treeIndex].child_list.filter(c => c.category_id !== currRow.category_id))
+                    categoryTable.data[treeIndex].child_list = []
+                    categoryTable.data[treeIndex].child_list.push(...obj)
+                    categoryTable.data[treeIndex].child_list.splice(index, 0, currRow)
+                }
+                return {
+                    category_id: item.category_id, // 当前行的唯一标识
+                    sort: 9999 - index
+                }
+            })
+            updateCategoryFn({ category_sort_array: currentRows })
+        }
+    })
 }
 
 /**
- * 将树数据转化为平铺数据
- * @param <Array> treeData当前要转的id
- * @param <String> childKey 子级字段
- * @return <Array> 返回数据
- */
-const treeToTile = (treeData: any, childKey = 'child_list') => {
-  const arr: Array<any> = []
-  const expanded = (data: any) => {
-    if (data && data.length > 0) {
-      data
-        .filter((d: any) => d)
-        .forEach((e: any) => {
-          arr.push(e)
-          expanded(e[childKey] || [])
-        })
+  * 将树数据转化为平铺数据
+  * @param <Array> treeData当前要转的id
+  * @param <String> childKey 子级字段
+  * @return <Array> 返回数据
+  */
+const treeToTile = (treeData:any, childKey = 'child_list') => {
+    const arr:Array<any> = []
+    const expanded = (data:any) => {
+        if (data && data.length > 0) {
+            data.filter((d:any) => d).forEach((e:any) => {
+                arr.push(e)
+                expanded(e[childKey] || [])
+            })
+        }
     }
-  }
-  expanded(treeData)
-  return arr
+    expanded(treeData)
+    return arr
 }
 
 /**
  * 获取商品分类列表
  */
 const loadCategoryList = () => {
-  categoryTable.loading = true
+    categoryTable.loading = true
 
-  getCategoryTree()
-    .then((res) => {
-      categoryTable.loading = false
-      categoryTable.data = res.data
-    })
-    .catch(() => {
-      categoryTable.loading = false
+    getCategoryTree().then(res => {
+        categoryTable.loading = false
+        categoryTable.data = res.data
+    }).catch(() => {
+        categoryTable.loading = false
     })
 }
 const updateCategoryFn = (params: any) => {
-  updateCategory(params).then((res) => {
-    loadCategoryList()
-  })
+    updateCategory(params).then(res => {
+        loadCategoryList()
+    })
 }
 
 const showClick = (row: any) => {
-  row.is_show = row.is_show === 1 ? 2 : 1
-  const obj = cloneDeep(row)
-  delete obj.child_list
-  editCategory(obj)
+    row.is_show = row.is_show === 1 ? 2 : 1
+    const obj = cloneDeep(row)
+    delete obj.child_list
+    editCategory(obj)
 }
 const editCategoryDialog: Record<string, any> | null = ref(null)
 
@@ -254,8 +193,8 @@ const editCategoryDialog: Record<string, any> | null = ref(null)
  * 添加商品分类
  */
 const addEvent = () => {
-  editCategoryDialog.value.setFormData()
-  editCategoryDialog.value.showDialog = true
+    editCategoryDialog.value.setFormData()
+    editCategoryDialog.value.showDialog = true
 }
 
 /**
@@ -263,59 +202,57 @@ const addEvent = () => {
  * @param data
  */
 const editEvent = (data: any) => {
-  editCategoryDialog.value.setFormData(data)
-  editCategoryDialog.value.showDialog = true
+    editCategoryDialog.value.setFormData(data)
+    editCategoryDialog.value.showDialog = true
 }
 
 /**
  * 删除商品分类
  */
 const deleteEvent = (row: any) => {
-  ElMessageBox.confirm(
-    !row.child_list || !row.child_list.length
-      ? t('categoryDeleteTips')
-      : t('categoryDeleteTips1'),
-    t('warning'),
-    {
-      confirmButtonText: t('confirm'),
-      cancelButtonText: t('cancel'),
-      type: 'warning',
-    }
-  ).then(() => {
-    deleteCategory(row.category_id)
-      .then(() => {
-        loadCategoryList()
-      })
-      .catch(() => {})
-  })
+    ElMessageBox.confirm(!row.child_list || !row.child_list.length ? t('categoryDeleteTips') : t('categoryDeleteTips1'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        deleteCategory(row.category_id).then(() => {
+            loadCategoryList()
+        }).catch(() => {
+        })
+    })
 }
 
 // 商品分类推广
 const goodsCategorySpreadPopupRef: any = ref(null)
 
 const spreadEvent = (data: any) => {
-  goodsCategorySpreadPopupRef.value.show(data)
+    goodsCategorySpreadPopupRef.value.show(data)
 }
 
 const router = useRouter()
 
 const handleClick = (path: string) => {
-  router.push({ path })
+    router.push({ path })
 }
+
 </script>
 
 <style lang="scss" scoped>
 :deep(.el-table__row) {
-  > .el-table__cell:nth-child(1) {
-    .cell {
-      display: flex;
-      align-items: center;
+    > .el-table__cell:nth-child(1) {
+        .cell {
+            display: flex;
+            align-items: center;
+
+            .el-table__expand-icon,
+            .el-table__placeholder {
+                order: 1;
+            }
+
+        }
 
-      .el-table__expand-icon,
-      .el-table__placeholder {
-        order: 1;
-      }
     }
-  }
 }
 </style>
diff --git a/admin/src/addon/shop/views/goods/category_config.vue b/admin/src/addon/shop/views/goods/category_config.vue
index c3a56a43..eca21729 100644
--- a/admin/src/addon/shop/views/goods/category_config.vue
+++ b/admin/src/addon/shop/views/goods/category_config.vue
@@ -1,109 +1,46 @@
 <template>
-  <div class="main-container pt-[20px] bg-[#fff]">
-    <div class="flex ml-[18px] justify-between items-center mb-[5px]">
-      <span class="text-page-title">{{ pageName }}</span>
-    </div>
-    <el-tabs
-      class="demo-tabs mx-[18px]"
-      model-value="/shop/goods/category/config"
-      @tab-change="handleClick"
-    >
-      <el-tab-pane :label="t('tabGoodsCategory')" name="/shop/goods/category" />
-      <el-tab-pane
-        :label="t('tabGoodsCategoryConfig')"
-        name="/shop/goods/category/config"
-      />
-    </el-tabs>
-    <el-form
-      v-if="Object.keys(formData).length"
-      :model="formData"
-      label-width="170"
-      ref="formRef"
-      :rules="rules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-card class="box-card !border-none" shadow="never">
-        <h3 class="panel-title !text-[16px] pl-[15px]">
-          {{ t('categoryTemplate') }}
-        </h3>
-        <el-form-item :label="t('categoryType')">
-          <el-radio-group
-            class="mx-[10px]"
-            v-model="formData.level"
-            @change="formData.template = 'style-1'"
-          >
-            <el-radio :label="1">{{ t('categorystyleOne') }}</el-radio>
-            <el-radio :label="2">{{ t('categorystyleTwo') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item :label="t('categoryTemplate')">
-          <template
-            v-for="(item, index) in config['level_' + formData.level]"
-            :key="index"
-          >
-            <div
-              :class="[
-                'w-[150px] border-[1px] border-[#ededed] border-solid overflow-hidden text-[#ededed] rounded-[4px] mr-[20px] relative',
-                formData.template === item.template
-                  ? 'border-color text-color'
-                  : '',
-              ]"
-              @click="levelChange(item.template)"
-            >
-              <img
-                class="w-[100%]"
-                :src="img(item.preview)"
-                fit-object="contain"
-              />
-              <span
-                class="iconfont iconicon-selected absolute right-0 bottom-[-8px]"
-              ></span>
-            </div>
-          </template>
-        </el-form-item>
-      </el-card>
-      <el-card class="box-card !border-none" shadow="never">
-        <h3 class="panel-title !text-[16px] pl-[15px]">
-          {{ t('pageSettings') }}
-        </h3>
-        <el-form-item :label="t('pageTitle')" prop="page_title">
-          <el-input
-            v-model.trim="formData.page_title"
-            clearable
-            :placeholder="t('pageTitlePlaceholder')"
-            class="input-width"
-            maxlength="10"
-            show-word-limit
-          />
-        </el-form-item>
-        <el-form-item :label="t('searchControl')">
-          <el-radio-group class="mx-[10px]" v-model="formData.search.control">
-            <el-radio :label="1">{{ t('open') }}</el-radio>
-            <el-radio :label="0">{{ t('close') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item
-          v-if="formData.search.control"
-          :label="t('searchTitle')"
-          prop="search.title"
-        >
-          <el-input
-            v-model.trim="formData.search.title"
-            clearable
-            :placeholder="t('searchTitlePlaceholder')"
-            class="input-width"
-            maxlength="12"
-            show-word-limit
-          />
-        </el-form-item>
-        <template
-          v-if="
-            formData.level != 2 ||
-            (formData.level === 2 && formData.template != 'style-1')
-          "
-        >
-          <!-- <el-form-item :label="t('sort')" prop="sort">
+    <div class="main-container pt-[20px] bg-[#fff]" >
+        <div class="flex ml-[18px] justify-between items-center mb-[5px]">
+            <span class="text-page-title">{{ pageName }}</span>
+        </div>
+        <el-tabs class="demo-tabs mx-[18px]" model-value="/shop/goods/category/config" @tab-change="handleClick">
+            <el-tab-pane :label="t('tabGoodsCategory')" name="/shop/goods/category" />
+            <el-tab-pane :label="t('tabGoodsCategoryConfig')" name="/shop/goods/category/config" />
+        </el-tabs>
+        <el-form v-if="Object.keys(formData).length" :model="formData" label-width="170" ref="formRef" :rules="rules" class="page-form" v-loading="loading">
+            <el-card class="box-card !border-none" shadow="never">
+                <h3 class="panel-title !text-[16px] pl-[15px]">{{ t('categoryTemplate') }}</h3>
+                <el-form-item :label="t('categoryType')">
+                    <el-radio-group class="mx-[10px]" v-model="formData.level" @change="formData.template='style-1'">
+                        <el-radio :label="1">{{ t('categorystyleOne') }}</el-radio>
+                        <el-radio :label="2">{{ t('categorystyleTwo') }}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item :label="t('categoryTemplate')">
+                    <template v-for="(item,index) in config['level_'+formData.level]" :key="index">
+                        <div :class="['w-[150px] border-[1px] border-[#ededed] border-solid overflow-hidden text-[#ededed] rounded-[4px] mr-[20px] relative', formData.template ===item.template ? 'border-color text-color' : '']" @click="levelChange(item.template)">
+                            <img class="w-[100%]" :src="img(item.preview)" fit-object="contain" />
+                            <span class="iconfont iconicon-selected absolute right-0 bottom-[-8px]"></span>
+                        </div>
+                    </template>
+                </el-form-item>
+            </el-card>
+            <el-card class="box-card !border-none" shadow="never">
+                <h3 class="panel-title !text-[16px] pl-[15px]">{{ t('pageSettings') }}</h3>
+                <el-form-item :label="t('pageTitle')" prop="page_title">
+                    <el-input v-model.trim="formData.page_title" clearable :placeholder="t('pageTitlePlaceholder')" class="input-width" maxlength="10" show-word-limit />
+                </el-form-item>
+                <el-form-item :label="t('searchControl')">
+                    <el-radio-group class="mx-[10px]" v-model="formData.search.control">
+                        <el-radio :label="1">{{ t('open') }}</el-radio>
+                        <el-radio :label="0">{{ t('close') }}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item v-if="formData.search.control" :label="t('searchTitle')" prop="search.title">
+                    <el-input v-model.trim="formData.search.title" clearable :placeholder="t('searchTitlePlaceholder')" class="input-width" maxlength="12" show-word-limit />
+                </el-form-item>
+                <template v-if="formData.level!=2||(formData.level===2&&formData.template != 'style-1')">
+                    <!-- <el-form-item :label="t('sort')" prop="sort">
                         <el-select v-model="formData.sort" clearable :placeholder="t('sortPlaceholder')"
                             class="input-width">
                             <el-option label="综合" value="default" />
@@ -111,99 +48,61 @@
                             <el-option label="价格" value="price" />
                         </el-select>
                     </el-form-item> -->
-          <!-- <el-form-item :label="t('goodsStyle')">
+                    <!-- <el-form-item :label="t('goodsStyle')">
                         <el-radio-group class="mx-[10px]" v-model="formData.goods.style">
                             <el-radio label="single-cols">{{ t('singleCols') }}</el-radio>
                             <el-radio label="double-cols">{{ t('doubleCols') }}</el-radio>
                         </el-radio-group>
                     </el-form-item> -->
-          <el-form-item :label="t('cartControl')">
-            <el-radio-group class="mx-[10px]" v-model="formData.cart.control">
-              <el-radio :label="1">{{ t('show') }}</el-radio>
-              <el-radio :label="0">{{ t('hidden') }}</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <template v-if="formData.cart.control">
-            <el-form-item :label="t('cartStyle')" class="carStyle">
-              <div class="flex items-center">
-                <div
-                  :class="[
-                    'flex items-center justify-center w-[65px] h-[65px] border-0 border-color rounded-[4px] border-solid box-border cursor-pointer mr-[15px]',
-                    formData.cart.style === 'style-1' ? '!border-[1px]' : '',
-                  ]"
-                  @click="carStyleClick(1)"
-                >
-                  <div
-                    class="text-[#fff] bg-color h-[20px] text-[12px] px-[10px] leading-[20px] rounded-[10px]"
-                  >
-                    {{ formData.cart.text }}
-                  </div>
-                </div>
-                <!-- <div :class="['flex items-center justify-center w-[50px] h-[50px] border-0 border-color rounded-[4px] border-solid box-border cursor-pointer mr-[15px]', formData.cart.style === 'style-2' ? '!border-[1px]' : '']"
+                    <el-form-item :label="t('cartControl')">
+                        <el-radio-group class="mx-[10px]" v-model="formData.cart.control">
+                            <el-radio :label="1">{{ t('show') }}</el-radio>
+                            <el-radio :label="0">{{ t('hidden') }}</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+                    <template v-if="formData.cart.control">
+                        <el-form-item :label="t('cartStyle')" class="carStyle">
+                            <div class="flex items-center">
+                                <div :class="['flex items-center justify-center w-[65px] h-[65px] border-0 border-color rounded-[4px] border-solid box-border cursor-pointer mr-[15px]', formData.cart.style === 'style-1' ? '!border-[1px]' : '']" @click="carStyleClick(1)">
+                                    <div class="text-[#fff] bg-color h-[20px] text-[12px] px-[10px] leading-[20px] rounded-[10px]">
+                                        {{ formData.cart.text }}
+                                    </div>
+                                </div>
+                                <!-- <div :class="['flex items-center justify-center w-[50px] h-[50px] border-0 border-color rounded-[4px] border-solid box-border cursor-pointer mr-[15px]', formData.cart.style === 'style-2' ? '!border-[1px]' : '']"
                                     @click="carStyleClick(2)">
                                     <el-icon size="30px" class="text-color">
                                         <CirclePlusFilled />
                                     </el-icon>
                                 </div> -->
-                <div
-                  :class="[
-                    'flex items-center justify-center w-[65px] h-[65px] border-0 border-color rounded-[4px] border-solid box-border cursor-pointer mr-[15px]',
-                    formData.cart.style === 'style-3' ? '!border-[1px]' : '',
-                  ]"
-                  @click="carStyleClick(3)"
-                >
-                  <span
-                    class="text-color nc-iconfont nc-icon-gouwucheV6xx6 !text-[24px]"
-                  ></span>
-                </div>
-                <div
-                  :class="[
-                    'flex items-center justify-center w-[65px] h-[65px] border-0 border-color rounded-[4px] border-solid box-border cursor-pointer mr-[15px]',
-                    formData.cart.style === 'style-4' ? '!border-[1px]' : '',
-                  ]"
-                  @click="carStyleClick(4)"
-                >
-                  <div
-                    class="text-[#fff] bg-color h-[30px] w-[30px] leading-[30px] rounded-[30px] text-center"
-                  >
-                    <span
-                      class="nc-iconfont nc-icon-gouwucheV6xx6 !text-[20px]"
-                    ></span>
-                  </div>
-                </div>
-              </div>
-            </el-form-item>
-            <el-form-item
-              v-if="formData.cart.style === 'style-1'"
-              prop="cart.text"
-            >
-              <el-input
-                v-model.trim="formData.cart.text"
-                clearable
-                :placeholder="t('cartTextPlaceholder')"
-                class="input-width"
-                maxlength="3"
-                show-word-limit
-              />
-            </el-form-item>
-            <el-form-item :label="t('cartEvent')">
-              <el-radio-group class="mx-[10px]" v-model="formData.cart.event">
-                <el-radio label="detail">{{ t('detail') }}</el-radio>
-                <el-radio label="cart">{{ t('cart') }}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </template>
-        </template>
-      </el-card>
-    </el-form>
-    <div class="fixed-footer-wrap">
-      <div class="fixed-footer">
-        <el-button type="primary" @click="onSave(formRef)">{{
-          t('save')
-        }}</el-button>
-      </div>
+                                <div :class="['flex items-center justify-center w-[65px] h-[65px] border-0 border-color rounded-[4px] border-solid box-border cursor-pointer mr-[15px]', formData.cart.style === 'style-3' ? '!border-[1px]' : '']" @click="carStyleClick(3)">
+                                    <span class="text-color nc-iconfont nc-icon-gouwucheV6xx6 !text-[24px]"></span>
+                                </div>
+                                <div :class="['flex items-center justify-center w-[65px] h-[65px] border-0 border-color rounded-[4px] border-solid box-border cursor-pointer mr-[15px]', formData.cart.style === 'style-4' ? '!border-[1px]' : '']" @click="carStyleClick(4)">
+                                    <div class="text-[#fff] bg-color h-[30px] w-[30px] leading-[30px] rounded-[30px] text-center">
+                                        <span class="nc-iconfont nc-icon-gouwucheV6xx6 !text-[20px]"></span>
+                                    </div>
+                                </div>
+                            </div>
+                        </el-form-item>
+                        <el-form-item v-if="formData.cart.style === 'style-1'" prop="cart.text">
+                            <el-input v-model.trim="formData.cart.text" clearable :placeholder="t('cartTextPlaceholder')" class="input-width" maxlength="3" show-word-limit />
+                        </el-form-item>
+                        <el-form-item :label="t('cartEvent')">
+                            <el-radio-group class="mx-[10px]" v-model="formData.cart.event">
+                                <el-radio label="detail">{{ t('detail') }}</el-radio>
+                                <el-radio label="cart">{{ t('cart') }}</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                    </template>
+                </template>
+            </el-card>
+        </el-form>
+        <div class="fixed-footer-wrap">
+            <div class="fixed-footer">
+                <el-button type="primary" @click="onSave(formRef)">{{ t('save') }}</el-button>
+            </div>
+        </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
@@ -211,131 +110,127 @@ import { reactive, ref, computed } from 'vue'
 import { t } from '@/lang'
 import { getCategoryConfig, setCategoryConfig } from '@/addon/shop/api/goods'
 import { img } from '@/utils/common'
-import { useRoute, useRouter } from 'vue-router'
+import { useRoute,useRouter } from 'vue-router'
 
 const route = useRoute()
 const pageName = route.meta.title
 interface formDataType {
-  level: string | number
-  template: string
-  page_title: string
-  search: {
-    title: string
-    control: number | string
-  }
-  sort: string
-  cart: {
-    control: number
-    style: string
-    text: string
-    event: string
-  }
+    level: string|number
+    template: string
+    page_title: string
+    search: {
+        title: string
+        control: number|string
+    }
+    sort: string
+    cart: {
+        control: number
+        style: string
+        text: string
+        event: string
+    }
 }
-const formData = ref<formDataType | any>({})
+const formData = ref<formDataType|any>({})
 const loading = ref(false)
 const rules = computed(() => {
-  return {
-    page_title: [
-      { required: true, message: t('pageTitlePlaceholder'), trigger: 'blur' },
-    ],
-    'search.title': [
-      { required: true, message: t('searchTitlePlaceholder'), trigger: 'blur' },
-    ],
-    sort: [
-      { required: true, message: t('sortPlaceholder'), trigger: 'change' },
-    ],
-    'cart.text': [
-      { required: true, message: t('cartTextPlaceholder'), trigger: 'blur' },
-    ],
-  }
+    return {
+        page_title: [
+            { required: true, message: t('pageTitlePlaceholder'), trigger: 'blur' }
+        ],
+        'search.title': [
+            { required: true, message: t('searchTitlePlaceholder'), trigger: 'blur' }
+        ],
+        sort: [
+            { required: true, message: t('sortPlaceholder'), trigger: 'change' }
+        ],
+        'cart.text': [
+            { required: true, message: t('cartTextPlaceholder'), trigger: 'blur' }
+        ]
+    }
 })
 
 interface configType {
-  level_1: {
-    template: string
-    preview: string
-  }[]
-  level_2: {
-    template: string
-    preview: string
-  }[]
+    level_1: {
+        template: string
+        preview: string
+    }[]
+    level_2: {
+        template: string
+        preview: string
+    }[]
 }
-const config = reactive<configType | any>({
-  level_1: [
-    {
-      template: 'style-1',
-      preview: 'addon/shop/category_style1_1.png',
-    },
-  ],
-  level_2: [
-    {
-      template: 'style-1',
-      preview: 'addon/shop/category_style2_1.png',
-    },
-    {
-      template: 'style-2',
-      preview: 'addon/shop/category_style2_2.png',
-    },
-  ],
+const config = reactive<configType|any>({
+    level_1: [
+        {
+            template: 'style-1',
+            preview: 'addon/shop/category_style1_1.png'
+        }
+    ],
+    level_2: [
+        {
+            template: 'style-1',
+            preview: 'addon/shop/category_style2_1.png'
+        },
+        {
+            template: 'style-2',
+            preview: 'addon/shop/category_style2_2.png'
+        }
+    ]
 })
 const getCategoryConfigFn = () => {
-  loading.value = true
-  getCategoryConfig()
-    .then((res) => {
-      formData.value = res.data
-      loading.value = false
-    })
-    .catch(() => {
-      loading.value = false
+    loading.value = true
+    getCategoryConfig().then(res => {
+        formData.value = res.data
+        loading.value = false
+    }).catch(() => {
+        loading.value = false
     })
 }
 getCategoryConfigFn()
 const levelChange = (value: any) => {
-  formData.value.template = value
+    formData.value.template = value
 }
 const carStyleClick = (value: any) => {
-  formData.value.cart.style = 'style-' + value
+    formData.value.cart.style = 'style-' + value
 }
 const formRef = ref()
 const onSave = async (formEl: any) => {
-  await formEl.validate(async (valid: any) => {
-    if (valid) {
-      loading.value = true
-      setCategoryConfig(formData.value)
-        .then((res) => {
-          getCategoryConfigFn()
-        })
-        .catch(() => {
-          loading.value = false
-        })
-    }
-  })
+    await formEl.validate(async (valid:any) => {
+        if (valid) {
+            loading.value = true
+            setCategoryConfig(formData.value).then(res => {
+                getCategoryConfigFn()
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
 }
 
 const router = useRouter()
 
 const handleClick = (path: string) => {
-  router.push({ path })
+    router.push({ path })
 }
 </script>
 
 <style lang="scss" scoped>
 .border-color {
-  border-color: var(--el-color-primary);
+    border-color: var(--el-color-primary);
 }
 
 .text-color {
-  color: var(--el-color-primary);
+    color: var(--el-color-primary);
 }
 
 .bg-color {
-  background-color: var(--el-color-primary);
+    background-color: var(--el-color-primary);
 }
 
 .carStyle {
-  :deep(.el-form-item__label) {
-    height: 50px;
-    line-height: 50px;
-  }
+    :deep(.el-form-item__label) {
+        height: 50px;
+        line-height: 50px;
+    }
 }
 </style>
diff --git a/admin/src/addon/shop/views/goods/components/brand-edit.vue b/admin/src/addon/shop/views/goods/components/brand-edit.vue
index f6e51388..600c3175 100644
--- a/admin/src/addon/shop/views/goods/components/brand-edit.vue
+++ b/admin/src/addon/shop/views/goods/components/brand-edit.vue
@@ -1,71 +1,30 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="title"
-    width="500px"
-    class="diy-dialog-wrap"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="120px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('brandName')" prop="brand_name">
-        <el-input
-          v-model.trim="formData.brand_name"
-          clearable
-          :placeholder="t('brandNamePlaceholder')"
-          class="input-width"
-          maxlength="10"
-          @blur="formData.brand_name = $event.target.value"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('logo')">
-        <upload-image v-model="formData.logo" />
-      </el-form-item>
-
-      <el-form-item :label="t('desc')">
-        <el-input
-          v-model.trim="formData.desc"
-          type="textarea"
-          clearable
-          :placeholder="t('descPlaceholder')"
-          class="input-width"
-          maxlength="200"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('sort')">
-        <el-input
-          v-model.trim="formData.sort"
-          maxlength="8"
-          show-word-limit
-          clearable
-          :placeholder="t('sortPlaceholder')"
-          class="input-width"
-          @keyup="filterNumber($event)"
-          @blur="formData.sort = $event.target.value"
-        />
-      </el-form-item>
-    </el-form>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+    <el-dialog v-model="showDialog" :title="title" width="500px" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+            <el-form-item :label="t('brandName')" prop="brand_name">
+                <el-input v-model.trim="formData.brand_name" clearable :placeholder="t('brandNamePlaceholder')" class="input-width" maxlength="10" @blur="formData.brand_name = $event.target.value"/>
+            </el-form-item>
+
+            <el-form-item :label="t('logo')">
+                <upload-image v-model="formData.logo" />
+            </el-form-item>
+
+            <el-form-item :label="t('desc')" >
+                <el-input v-model.trim="formData.desc" type="textarea" clearable :placeholder="t('descPlaceholder')" class="input-width" maxlength="200"/>
+            </el-form-item>
+
+            <el-form-item :label="t('sort')" >
+                <el-input v-model.trim="formData.sort" maxlength="8" show-word-limit clearable :placeholder="t('sortPlaceholder')" class="input-width" @keyup="filterNumber($event)" @blur="formData.sort = $event.target.value"/>
+            </el-form-item>
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -84,11 +43,11 @@ const title = ref('')
  * 表单数据
  */
 const initialFormData = {
-  brand_id: '',
-  brand_name: '',
-  logo: '',
-  desc: '',
-  sort: '',
+    brand_id: '',
+    brand_name: '',
+    logo: '',
+    desc: '',
+    sort: ''
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -96,11 +55,11 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    brand_name: [
-      { required: true, message: t('brandNamePlaceholder'), trigger: 'blur' },
-    ],
-  }
+    return {
+        brand_name: [
+            { required: true, message: t('brandNamePlaceholder'), trigger: 'blur' }
+        ]
+    }
 })
 
 const emit = defineEmits(['complete'])
@@ -110,67 +69,59 @@ const emit = defineEmits(['complete'])
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  const save = formData.brand_id ? editBrand : addBrand
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-
-      const data = formData
-
-      save(data)
-        .then((res) => {
-          loading.value = false
-          showDialog.value = false
-          emit('complete')
-        })
-        .catch((err) => {
-          loading.value = false
-        })
-    }
-  })
+    if (loading.value || !formEl) return
+    const save = formData.brand_id ? editBrand : addBrand
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            const data = formData
+
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
 }
 
 // 获取字典数据
 
 const setFormData = async (row: any = null) => {
-  Object.assign(formData, initialFormData)
-  loading.value = true
-  if (row) {
-    const data = await (await getBrandInfo(row.brand_id)).data
-    title.value = t('updateBrand')
-    if (data) {
-      Object.keys(formData).forEach((key: string) => {
-        if (data[key] != undefined) formData[key] = data[key]
-      })
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if (row) {
+        const data = await (await getBrandInfo(row.brand_id)).data
+        title.value = t('updateBrand')
+        if (data) {
+            Object.keys(formData).forEach((key: string) => {
+                if (data[key] != undefined) formData[key] = data[key]
+            })
+        }
+    } else {
+        title.value = t('addBrand')
     }
-  } else {
-    title.value = t('addBrand')
-  }
-  loading.value = false
+    loading.value = false
 }
 
-const filterSpecial = (event: any) => {
-  event.target.value = event.target.value.replace(
-    /[^\u4e00-\u9fa5a-zA-Z0-9]/g,
-    ''
-  )
-  event.target.value = event.target.value.replace(
-    /[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]/g,
-    ''
-  )
+const filterSpecial = (event:any) => {
+    event.target.value = event.target.value.replace(/[^\u4e00-\u9fa5a-zA-Z0-9]/g, '')
+    event.target.value = event.target.value.replace(/[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]/g, '')
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
 <style lang="scss" scoped></style>
 <style lang="scss">
-.diy-dialog-wrap .el-form-item__label {
-  height: auto !important;
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
 }
 </style>
diff --git a/admin/src/addon/shop/views/goods/components/category-edit.vue b/admin/src/addon/shop/views/goods/components/category-edit.vue
index 0ba64043..2fd0f87c 100644
--- a/admin/src/addon/shop/views/goods/components/category-edit.vue
+++ b/admin/src/addon/shop/views/goods/components/category-edit.vue
@@ -1,84 +1,38 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="title"
-    width="480"
-    class="diy-dialog-wrap"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="120px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('categoryName')" prop="category_name">
-        <el-input
-          v-model.trim="formData.category_name"
-          clearable
-          :placeholder="t('categoryNamePlaceholder')"
-          class="input-width"
-          maxlength="10"
-          show-word-limit
-        />
-      </el-form-item>
-      <el-form-item :label="t('pid')" prop="pid">
-        <el-select
-          v-model="formData.pid"
-          clearable
-          :disabled="formData.child_count"
-          :placeholder="t('pidPlaceholder')"
-          class="input-width"
-        >
-          <el-option label="顶级分类" :value="0" />
-          <el-option
-            v-for="item in optionList"
-            :key="item.category_id"
-            :label="item.category_name"
-            :value="item.category_id"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="t('image')">
-        <upload-image v-model="formData.image" />
-      </el-form-item>
-
-      <el-form-item :label="t('isShow')" prop="is_show">
-        <el-switch
-          v-model="formData.is_show"
-          class="input-width"
-          :active-value="1"
-          :inactive-value="2"
-        />
-      </el-form-item>
-    </el-form>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+    <el-dialog v-model="showDialog" :title="title" width="480" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+            <el-form-item :label="t('categoryName')" prop="category_name">
+                <el-input v-model.trim="formData.category_name" clearable :placeholder="t('categoryNamePlaceholder')" class="input-width" maxlength="10" show-word-limit />
+            </el-form-item>
+            <el-form-item :label="t('pid')" prop="pid">
+                <el-select v-model="formData.pid" clearable :disabled="formData.child_count" :placeholder="t('pidPlaceholder')" class="input-width">
+                    <el-option label="顶级分类" :value="0" />
+                    <el-option v-for="(item) in optionList" :key="item.category_id" :label="item.category_name" :value="item.category_id" />
+                </el-select>
+            </el-form-item>
+            <el-form-item :label="t('image')">
+                <upload-image v-model="formData.image" />
+            </el-form-item>
+
+            <el-form-item :label="t('isShow')" prop="is_show">
+                <el-switch v-model="formData.is_show" class="input-width" :active-value="1" :inactive-value="2" />
+            </el-form-item>
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
 import { ref, reactive, computed } from 'vue'
 import { t } from '@/lang'
 import type { FormInstance } from 'element-plus'
-import {
-  addCategory,
-  editCategory,
-  getCategoryInfo,
-  getCategoryList,
-} from '@/addon/shop/api/goods'
+import { addCategory, editCategory, getCategoryInfo, getCategoryList } from '@/addon/shop/api/goods'
 
 const showDialog = ref(false)
 const loading = ref(false)
@@ -88,14 +42,14 @@ const title = ref('')
  * 表单数据
  */
 const initialFormData = {
-  category_id: '',
-  category_name: '',
-  image: '',
-  pid: 0,
-  is_show: 1,
-  child_count: 0,
-  // sort: 9999,
-  level: 1,
+    category_id: '',
+    category_name: '',
+    image: '',
+    pid: 0,
+    is_show: 1,
+    child_count: 0,
+    // sort: 9999,
+    level: 1
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -103,24 +57,22 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    category_id: [
-      { required: true, message: t('categoryIdPlaceholder'), trigger: 'blur' },
-    ],
-    category_name: [
-      {
-        required: true,
-        message: t('categoryNamePlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    pid: [{ required: true, message: t('pidPlaceholder'), trigger: 'change' }],
-  }
+    return {
+        category_id: [
+            { required: true, message: t('categoryIdPlaceholder'), trigger: 'blur' }
+        ],
+        category_name: [
+            { required: true, message: t('categoryNamePlaceholder'), trigger: 'blur' }
+        ],
+        pid: [
+            { required: true, message: t('pidPlaceholder'), trigger: 'change' }
+        ]
+    }
 })
 
 interface optionListType {
-  category_id: number
-  category_name: string
+    category_id: number
+    category_name: string
 }
 const optionList = ref<optionListType[]>([])
 const emit = defineEmits(['complete'])
@@ -130,67 +82,63 @@ const emit = defineEmits(['complete'])
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  const save = formData.category_id ? editCategory : addCategory
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-
-      const data = formData
-
-      save(data)
-        .then((res) => {
-          loading.value = false
-          showDialog.value = false
-          emit('complete')
-        })
-        .catch((err) => {
-          loading.value = false
-        })
-    }
-  })
+    if (loading.value || !formEl) return
+    const save = formData.category_id ? editCategory : addCategory
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            const data = formData
+
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
 }
 
 // 获取全部分类
 const getCategoryAllFn = () => {
-  getCategoryList({
-    level: 1,
-  }).then((res) => {
-    optionList.value = res.data.filter(
-      (el: any) => el.category_id != formData.category_id
-    )
-  })
+    getCategoryList({
+        level: 1
+    }).then(res => {
+        optionList.value = res.data.filter((el: any) => el.category_id != formData.category_id)
+    })
 }
 
 const setFormData = async (row: any = null) => {
-  Object.assign(formData, initialFormData)
-  loading.value = true
-
-  if (row) {
-    title.value = t('updateCategory')
-    const data = await (await getCategoryInfo(row.category_id)).data
-    if (data) {
-      Object.keys(formData).forEach((key: string) => {
-        if (data[key] != undefined) formData[key] = data[key]
-      })
+    Object.assign(formData, initialFormData)
+    loading.value = true
+
+    if (row) {
+        title.value = t('updateCategory')
+        const data = await (await getCategoryInfo(row.category_id)).data
+        if (data) {
+            Object.keys(formData).forEach((key: string) => {
+                if (data[key] != undefined) formData[key] = data[key]
+            })
+        }
+    } else {
+        title.value = t('addCategory')
     }
-  } else {
-    title.value = t('addCategory')
-  }
-  getCategoryAllFn()
-  loading.value = false
+    getCategoryAllFn()
+    loading.value = false
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
 <style lang="scss" scoped></style>
 <style lang="scss">
 .diy-dialog-wrap .el-form-item__label {
-  height: auto !important;
+    height: auto !important;
 }
 </style>
diff --git a/admin/src/addon/shop/views/goods/components/coupon-select-popup.vue b/admin/src/addon/shop/views/goods/components/coupon-select-popup.vue
index 54091d8f..68d53da9 100644
--- a/admin/src/addon/shop/views/goods/components/coupon-select-popup.vue
+++ b/admin/src/addon/shop/views/goods/components/coupon-select-popup.vue
@@ -1,124 +1,76 @@
 <template>
-  <div>
-    <div @click="show">
-      <slot>
-        <el-button>{{ t('选择优惠券') }}</el-button>
-        <div
-          class="inline-block ml-[10px] text-[14px]"
-          v-show="couponIds.length"
-        >
-          <span>{{ t('已选') }}</span>
-          <span class="text-primary mx-[2px]">{{ couponIds.length }}</span>
-          <span>{{ t('张') }}</span>
+    <div>
+        <div @click="show">
+            <slot>
+                <el-button>{{ t('选择优惠券') }}</el-button>
+                <div class="inline-block ml-[10px] text-[14px]" v-show="couponIds.length">
+                    <span>{{ t('已选') }}</span>
+                    <span class="text-primary mx-[2px]">{{ couponIds.length }}</span>
+                    <span>{{ t('张') }}</span>
+                </div>
+            </slot>
         </div>
-      </slot>
+        <el-dialog v-model="showDialog" :title="t('优惠券选择')" width="1000px" :close-on-press-escape="false" :destroy-on-close="true" :close-on-click-modal="false">
+
+            <el-form :inline="true" :model="couponTable.searchParam" ref="searchFormRef">
+                <el-form-item :label="t('优惠券名称')" prop="keyword" class="form-item-wrap">
+                    <el-input v-model.trim="couponTable.searchParam.title" :placeholder="t('请输入优惠券名称')" maxlength="60" />
+                </el-form-item>
+                <el-form-item class="form-item-wrap">
+                    <el-button type="primary" @click="loadCouponList()">{{ t('search') }}</el-button>
+                    <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                </el-form-item>
+            </el-form>
+
+            <el-table :data="couponTable.data" size="large" v-loading="couponTable.loading" ref="couponListTableRef" max-height="400" @select="handleSelectChange" @select-all="handleSelectAllChange">
+                <template #empty>
+                    <span>{{ !couponTable.loading ? t('emptyData') : '' }}</span>
+                </template>
+                <el-table-column type="selection" width="55" />
+
+                <el-table-column prop="title" :label="t('名称')" min-width="130" />
+                <el-table-column prop="type_name" :label="t('类型')" min-width="130" />
+                <el-table-column prop="price" :label="t('面值')" min-width="130" >
+                    <template #default="{ row }">
+                        <span >¥{{row.price}}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column  :label="t('使用门槛')" min-width="130" >
+                    <template #default="{ row }">
+                        <span v-if="row.min_condition_money == '0.00'">无门槛</span>
+                        <span v-else >满{{ row.min_condition_money }}元可用</span>
+                    </template>
+                </el-table-column>
+                <el-table-column  :label="t('有效期')" min-width="210">
+                    <template #default="{ row }">
+                        <span v-if="row.valid_type == 1">  领取之日起{{ row.length || '' }} 天内有效</span>
+                        <span v-else> 使用截止时间至{{ row.valid_end_time || ''}} </span>
+                    </template>
+                </el-table-column>
+
+            </el-table>
+            <div class="mt-[16px] flex">
+                <div class="flex items-center flex-1">
+                    <div class="layui-table-bottom-left-container mr-[10px]" v-show="selectCouponNum">
+                        <span>{{ t('已选择') }}</span>
+                        <span class="text-primary mx-[2px]">{{ selectCouponNum }}</span>
+                        <span>{{ t('张优惠券') }}</span>
+                    </div>
+                    <el-button type="primary" link @click="clear" v-show="selectCouponNum">{{ t('取消选择') }}</el-button>
+                </div>
+                <el-pagination v-model:current-page="couponTable.page" v-model:page-size="couponTable.limit"
+                    layout="total, sizes, prev, pager, next, jumper" :total="couponTable.total"
+                    @size-change="loadCouponList()" @current-change="loadCouponList" />
+            </div>
+
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                    <el-button type="primary" @click="save">{{ t('confirm') }}</el-button>
+                </span>
+            </template>
+        </el-dialog>
     </div>
-    <el-dialog
-      v-model="showDialog"
-      :title="t('优惠券选择')"
-      width="1000px"
-      :close-on-press-escape="false"
-      :destroy-on-close="true"
-      :close-on-click-modal="false"
-    >
-      <el-form
-        :inline="true"
-        :model="couponTable.searchParam"
-        ref="searchFormRef"
-      >
-        <el-form-item
-          :label="t('优惠券名称')"
-          prop="keyword"
-          class="form-item-wrap"
-        >
-          <el-input
-            v-model.trim="couponTable.searchParam.title"
-            :placeholder="t('请输入优惠券名称')"
-            maxlength="60"
-          />
-        </el-form-item>
-        <el-form-item class="form-item-wrap">
-          <el-button type="primary" @click="loadCouponList()">{{
-            t('search')
-          }}</el-button>
-          <el-button @click="resetForm(searchFormRef)">{{
-            t('reset')
-          }}</el-button>
-        </el-form-item>
-      </el-form>
-
-      <el-table
-        :data="couponTable.data"
-        size="large"
-        v-loading="couponTable.loading"
-        ref="couponListTableRef"
-        max-height="400"
-        @select="handleSelectChange"
-        @select-all="handleSelectAllChange"
-      >
-        <template #empty>
-          <span>{{ !couponTable.loading ? t('emptyData') : '' }}</span>
-        </template>
-        <el-table-column type="selection" width="55" />
-
-        <el-table-column prop="title" :label="t('名称')" min-width="130" />
-        <el-table-column prop="type_name" :label="t('类型')" min-width="130" />
-        <el-table-column prop="price" :label="t('面值')" min-width="130">
-          <template #default="{ row }">
-            <span>¥{{ row.price }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column :label="t('使用门槛')" min-width="130">
-          <template #default="{ row }">
-            <span v-if="row.min_condition_money == '0.00'">无门槛</span>
-            <span v-else>满{{ row.min_condition_money }}元可用</span>
-          </template>
-        </el-table-column>
-        <el-table-column :label="t('有效期')" min-width="210">
-          <template #default="{ row }">
-            <span v-if="row.valid_type == 1">
-              领取之日起{{ row.length || '' }} 天内有效</span
-            >
-            <span v-else> 使用截止时间至{{ row.valid_end_time || '' }} </span>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="mt-[16px] flex">
-        <div class="flex items-center flex-1">
-          <div
-            class="layui-table-bottom-left-container mr-[10px]"
-            v-show="selectCouponNum"
-          >
-            <span>{{ t('已选择') }}</span>
-            <span class="text-primary mx-[2px]">{{ selectCouponNum }}</span>
-            <span>{{ t('张优惠券') }}</span>
-          </div>
-          <el-button
-            type="primary"
-            link
-            @click="clear"
-            v-show="selectCouponNum"
-            >{{ t('取消选择') }}</el-button
-          >
-        </div>
-        <el-pagination
-          v-model:current-page="couponTable.page"
-          v-model:page-size="couponTable.limit"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="couponTable.total"
-          @size-change="loadCouponList()"
-          @current-change="loadCouponList"
-        />
-      </div>
-
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-          <el-button type="primary" @click="save">{{ t('confirm') }}</el-button>
-        </span>
-      </template>
-    </el-dialog>
-  </div>
 </template>
 
 <script lang="ts" setup>
@@ -129,29 +81,29 @@ import { ElMessage } from 'element-plus'
 import { getCouponSelectList } from '@/addon/shop/api/marketing'
 
 const prop = defineProps({
-  modelValue: {
-    type: String,
-    default: '',
-  },
-  max: {
-    type: Number,
-    default: 0,
-  },
-  min: {
-    type: Number,
-    default: 0,
-  },
+    modelValue: {
+        type: String,
+        default: ''
+    },
+    max: {
+        type: Number,
+        default: 0
+    },
+    min: {
+        type: Number,
+        default: 0
+    }
 })
 
-const emit = defineEmits(['update:modelValue', 'couponSelect'])
+const emit = defineEmits(['update:modelValue','couponSelect'])
 
 const couponIds: any = computed({
-  get() {
-    return prop.modelValue
-  },
-  set(value) {
-    emit('update:modelValue', value)
-  },
+    get () {
+        return prop.modelValue
+    },
+    set (value) {
+        emit('update:modelValue', value)
+    }
 })
 
 const showDialog = ref(false)
@@ -161,26 +113,27 @@ const selectCoupon: any = reactive({})
 
 // 已选优惠券数量
 const selectCouponNum: any = computed(() => {
-  return Object.keys(selectCoupon).length
+    return Object.keys(selectCoupon).length
 })
 
 const couponTable = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    title: '',
-    status: 1,
-    verify_coupon_ids: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        title: '',
+        status: 1,
+        verify_coupon_ids:'',
+    }
 })
 
 const searchFormRef = ref()
 
 // 初始化数据
-const initData = () => {}
+const initData = () => {
+}
 
 initData()
 
@@ -191,168 +144,162 @@ const multipleSelection: any = ref([])
 
 // 监听表格复选框
 const handleSelectChange = (selection: any, row: any) => {
-  // 是否选中
-  let isSelected = false
-  for (let i = 0; i < selection.length; i++) {
-    if (selection[i].id == row.id) {
-      isSelected = true
-      break
+    // 是否选中
+    let isSelected = false
+    for (let i = 0; i < selection.length; i++) {
+        if (selection[i].id == row.id) {
+            isSelected = true
+            break
+        }
+    }
+    if (isSelected) {
+        selectCoupon['coupon_' + row.id] = row
+    } else {
+        // 未选中，删除当前优惠券
+        delete selectCoupon['coupon_' + row.id]
     }
-  }
-  if (isSelected) {
-    selectCoupon['coupon_' + row.id] = row
-  } else {
-    // 未选中，删除当前优惠券
-    delete selectCoupon['coupon_' + row.id]
-  }
 }
 
 // 监听表格全选
 const handleSelectAllChange = (selection: any) => {
-  if (selection.length) {
-    selection.forEach((item: any) => {
-      selectCoupon['coupon_' + item.id] = item
-    })
-  } else {
-    // 未选中，删除当前页面的数据
-    couponTable.data.forEach((item: any) => {
-      delete selectCoupon['coupon_' + item.id]
-    })
-  }
+    if (selection.length) {
+        selection.forEach((item: any) => {
+            selectCoupon['coupon_' + item.id] = item
+        })
+    } else {
+        // 未选中，删除当前页面的数据
+        couponTable.data.forEach((item: any) => {
+            delete selectCoupon['coupon_' + item.id]
+        })
+    }
 }
 
 /**
  * 获取优惠券列表
  */
 const loadCouponList = (page: number = 1, callback: any = null) => {
-  couponTable.loading = true
-  couponTable.page = page
-
-  const searchData: any = cloneDeep(couponTable.searchParam)
-  getCouponSelectList({
-    page: couponTable.page,
-    limit: couponTable.limit,
-    ...searchData,
-  })
-    .then((res) => {
-      couponTable.loading = false
-      couponTable.data = res.data.data
-      couponTable.total = res.data.total
-
-      if (callback) callback(res.data.verify_coupon_ids)
-
-      setCouponSelected()
-    })
-    .catch(() => {
-      couponTable.loading = false
+    couponTable.loading = true
+    couponTable.page = page
+
+    const searchData: any = cloneDeep(couponTable.searchParam);
+    getCouponSelectList({
+        page: couponTable.page,
+        limit: couponTable.limit,
+        ...searchData
+    }).then(res => {
+        couponTable.loading = false
+        couponTable.data = res.data.data
+        couponTable.total = res.data.total
+
+        if (callback) callback(res.data.verify_coupon_ids)
+
+        setCouponSelected();
+    }).catch(() => {
+        couponTable.loading = false
     })
+
 }
 
 // 表格设置选中状态
 const setCouponSelected = () => {
-  nextTick(() => {
-    if (!couponListTableRef.value) return
-    for (let i = 0; i < couponTable.data.length; i++) {
-      couponListTableRef.value.toggleRowSelection(couponTable.data[i], false)
-      if (selectCoupon['coupon_' + couponTable.data[i].id]) {
-        couponListTableRef.value.toggleRowSelection(couponTable.data[i], true)
-      }
-    }
-  })
+    nextTick(() => {
+        if (!couponListTableRef.value) return;
+        for (let i = 0; i < couponTable.data.length; i++) {
+            couponListTableRef.value.toggleRowSelection(couponTable.data[i], false);
+            if (selectCoupon['coupon_' + couponTable.data[i].id]) {
+                couponListTableRef.value.toggleRowSelection(couponTable.data[i], true);
+            }
+        }
+    });
 }
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
+    if (!formEl) return
+    formEl.resetFields()
 
-  loadCouponList()
+    loadCouponList()
 }
 
 const show = () => {
-  // 检测商品id集合是否存在，移除不存在的商品id，纠正数据准确性
-  couponTable.searchParam.verify_coupon_ids = couponIds.value
-  loadCouponList(1, (verify_coupon_ids: any) => {
-    // 第一次打开弹出框时，纠正数据，并且赋值已选优惠券
-    if (couponIds.value) {
-      couponIds.value.splice(0, couponIds.value.length, ...verify_coupon_ids)
-      // 先删除 selectCoupon 中已经不再存在于 couponIds 中的优惠券
-      for (let key in selectCoupon) {
-        const couponId = key.replace('coupon_', '')
-        if (!couponIds.value.includes(Number(couponId))) {
-          delete selectCoupon[key] // 删除不存在的优惠券
+    // 检测商品id集合是否存在，移除不存在的商品id，纠正数据准确性
+    couponTable.searchParam.verify_coupon_ids = couponIds.value;
+    loadCouponList(1, (verify_coupon_ids:any) => {
+        // 第一次打开弹出框时，纠正数据，并且赋值已选优惠券
+        if (couponIds.value) {
+            couponIds.value.splice(0, couponIds.value.length, ...verify_coupon_ids)
+            // 先删除 selectCoupon 中已经不再存在于 couponIds 中的优惠券
+            for (let key in selectCoupon) {
+                const couponId = key.replace('coupon_', '');
+                if (!couponIds.value.includes(Number(couponId))) {
+                    delete selectCoupon[key]; // 删除不存在的优惠券
+                }
+            }
+            couponIds.value.forEach((item: any) => {
+                if (!selectCoupon['coupon_' + item]) {
+                    selectCoupon['coupon_' + item] = {};
+                }
+            })
+
+            // 赋值已选择的优惠券
+            for (let i = 0; i < couponTable.data.length; i++) {
+                if (couponIds.value.indexOf(couponTable.data[i].id) != -1) {
+                    selectCoupon['coupon_' + couponTable.data[i].id] = couponTable.data[i];
+                }
+            }
         }
-      }
-      couponIds.value.forEach((item: any) => {
-        if (!selectCoupon['coupon_' + item]) {
-          selectCoupon['coupon_' + item] = {}
-        }
-      })
-
-      // 赋值已选择的优惠券
-      for (let i = 0; i < couponTable.data.length; i++) {
-        if (couponIds.value.indexOf(couponTable.data[i].id) != -1) {
-          selectCoupon['coupon_' + couponTable.data[i].id] = couponTable.data[i]
-        }
-      }
-    }
-  })
-  showDialog.value = true
+    })
+    showDialog.value = true
 }
 
 // 清空已选优惠券
 const clear = () => {
-  for (let k in selectCoupon) {
-    delete selectCoupon[k]
-  }
-  setCouponSelected()
+    for (let k in selectCoupon) {
+        delete selectCoupon[k];
+    }
+    setCouponSelected();
 }
 
 const save = () => {
-  if (prop.min && selectCouponNum.value < prop.min) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('所选优惠券数量不能少于')}${prop.min}${t('张')}`,
-    })
-    return
-  }
-
-  if (
-    prop.max &&
-    prop.max > 0 &&
-    selectCouponNum.value &&
-    selectCouponNum.value > prop.max
-  ) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('所选优惠券数量不能超过')}${prop.max}${t('张')}`,
-    })
-    return
-  }
+    if (prop.min && selectCouponNum.value < prop.min) {
+        ElMessage({
+            type: 'warning',
+            message: `${t('所选优惠券数量不能少于')}${prop.min}${t('张')}`,
+        });
+        return;
+    }
+
+    if (prop.max && prop.max > 0 && selectCouponNum.value && selectCouponNum.value > prop.max) {
+        ElMessage({
+            type: 'warning',
+            message: `${t('所选优惠券数量不能超过')}${prop.max}${t('张')}`,
+        });
+        return;
+    }
 
-  let ids: any = []
-  for (let k in selectCoupon) {
-    ids.push(parseInt(k.replace('coupon_', '')))
-  }
+    let ids: any = [];
+    for (let k in selectCoupon) {
+        ids.push(parseInt(k.replace('coupon_', '')));
+    }
 
-  couponIds.value.splice(0, couponIds.value.length, ...ids)
-  emit('couponSelect', selectCoupon)
-  showDialog.value = false
+    couponIds.value.splice(0, couponIds.value.length, ...ids)
+    emit('couponSelect',selectCoupon)
+    showDialog.value = false
 }
 
 defineExpose({
-  showDialog,
-  selectCoupon,
-  selectCouponNum,
+    showDialog,
+    selectCoupon,
+    selectCouponNum
 })
 </script>
 
 <style lang="scss" scoped>
 .form-item-wrap {
-  margin-right: 10px !important;
-  margin-bottom: 10px !important;
+    margin-right: 10px !important;
+    margin-bottom: 10px !important;
 
-  &.last-child {
-    margin-right: 0 !important;
-  }
+    &.last-child {
+        margin-right: 0 !important;
+    }
 }
 </style>
diff --git a/admin/src/addon/shop/views/goods/components/evaluate-add.vue b/admin/src/addon/shop/views/goods/components/evaluate-add.vue
index 58813751..61052688 100644
--- a/admin/src/addon/shop/views/goods/components/evaluate-add.vue
+++ b/admin/src/addon/shop/views/goods/components/evaluate-add.vue
@@ -1,95 +1,47 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="formData.evaluate_id ? t('updateEvaluate') : t('addEvaluate')"
-    width="700px"
-    class="diy-dialog-wrap"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="120px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('goodsInfo')" prop="goods_id">
-        <goods-select-popup
-          ref="goodsSelectPopupRef"
-          v-model="formData.goods_id"
-          :min="1"
-          :max="1"
-        />
-      </el-form-item>
-      <el-form-item :label="t('memberHead')" prop="member_head">
-        <upload-image v-model="formData.member_head" />
-      </el-form-item>
-      <el-form-item :label="t('memberName')" prop="member_name">
-        <el-input
-          v-model.trim="formData.member_name"
-          clearable
-          maxlength="20"
-          show-word-limit
-          :placeholder="t('memberNamePlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-      <el-form-item :label="t('createTime')" prop="create_time">
-        <div class="input-width">
-          <el-date-picker
-            clearable
-            :disabled-date="disabledDateFn"
-            v-model="formData.create_time"
-            type="datetime"
-            :placeholder="t('createTimePlaceholder')"
-            value-format="YYYY-MM-DD HH:mm:ss"
-          />
-        </div>
-      </el-form-item>
-
-      <el-form-item :label="t('isAnonymous')" clearable prop="is_anonymous">
-        <el-radio-group
-          v-model="formData.is_anonymous"
-          :placeholder="t('isAnonymousPlaceholder')"
-          clearable
-        >
-          <el-radio :label="1">{{ t('anonymous') }}</el-radio>
-          <el-radio :label="2">{{ t('notAnonymous') }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item :label="t('scores')" prop="scores">
-        <el-rate v-model="formData.scores" />
-      </el-form-item>
-      <el-form-item :label="t('content')" prop="content">
-        <el-input
-          v-model.trim="formData.content"
-          maxlength="200"
-          show-word-limit
-          type="textarea"
-          rows="4"
-          clearable
-          :placeholder="t('contentPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('images')">
-        <upload-image v-model="formData.image_arr" :limit="9" />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+    <el-dialog v-model="showDialog" :title="formData.evaluate_id ? t('updateEvaluate') : t('addEvaluate')" width="700px" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+            <el-form-item :label="t('goodsInfo')" prop="goods_id">
+                <goods-select-popup ref="goodsSelectPopupRef" v-model="formData.goods_id" :min="1" :max="1" />
+            </el-form-item>
+            <el-form-item :label="t('memberHead')" prop="member_head">
+                <upload-image v-model="formData.member_head" />
+            </el-form-item>
+            <el-form-item :label="t('memberName')" prop="member_name">
+                <el-input v-model.trim="formData.member_name" clearable maxlength="20" show-word-limit :placeholder="t('memberNamePlaceholder')" class="input-width" />
+            </el-form-item>
+            <el-form-item :label="t('createTime')" prop="create_time">
+                <div class="input-width">
+                    <el-date-picker clearable :disabled-date="disabledDateFn" v-model="formData.create_time" type="datetime" :placeholder="t('createTimePlaceholder')" value-format="YYYY-MM-DD HH:mm:ss" />
+                </div>
+            </el-form-item>
+
+            <el-form-item :label="t('isAnonymous')" clearable prop="is_anonymous">
+                <el-radio-group v-model="formData.is_anonymous" :placeholder="t('isAnonymousPlaceholder')" clearable>
+                    <el-radio :label="1">{{ t('anonymous') }}</el-radio>
+                    <el-radio :label="2">{{ t('notAnonymous') }}</el-radio>
+                </el-radio-group>
+            </el-form-item>
+            <el-form-item :label="t('scores')" prop="scores">
+                <el-rate  v-model="formData.scores" />
+            </el-form-item>
+            <el-form-item :label="t('content')" prop="content">
+                <el-input v-model.trim="formData.content"  maxlength="200" show-word-limit type="textarea" rows="4" clearable :placeholder="t('contentPlaceholder')" class="input-width" />
+            </el-form-item>
+
+            <el-form-item :label="t('images')">
+                <upload-image v-model="formData.image_arr" :limit="9" />
+            </el-form-item>
+
+        </el-form>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+            </span>
+        </template>
+
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -102,23 +54,23 @@ import { addEvaluate } from '@/addon/shop/api/goods'
 const showDialog = ref(false)
 const loading = ref(false)
 
-const disabledDateFn = (date) => {
-  return date.getTime() > Date.now()
+const disabledDateFn = (date)=>{
+    return date.getTime() > Date.now()
 }
 
 /**
  * 表单数据
  */
 const initialFormData = {
-  goods_id: [],
-  member_head: '',
-  member_name: '',
-  content: '',
-  images: [],
-  image_arr: '',
-  is_anonymous: 1,
-  scores: 5,
-  create_time: '',
+    goods_id: [],
+    member_head: '',
+    member_name: '',
+    content: '',
+    images: [],
+    image_arr: '',
+    is_anonymous: 1,
+    scores: 5,
+    create_time: ''
 }
 
 const formData: Record<string, any> = reactive({ ...initialFormData })
@@ -127,26 +79,26 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    goods_id: [
-      { required: true, message: t('goodsIdPlaceholder'), trigger: 'blur' },
-    ],
-    member_head: [
-      { required: true, message: t('memberHeadPlaceholder'), trigger: 'blur' },
-    ],
-    member_name: [
-      { required: true, message: t('memberNamePlaceholder'), trigger: 'blur' },
-    ],
-    content: [
-      { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
-    ],
-    images: [
-      { required: true, message: t('imagesPlaceholder'), trigger: 'blur' },
-    ],
-    create_time: [
-      { required: true, message: t('createTimePlaceholder'), trigger: 'blur' },
-    ],
-  }
+    return {
+        goods_id: [
+            { required: true, message: t('goodsIdPlaceholder'), trigger: 'blur' }
+        ],
+        member_head: [
+            { required: true, message: t('memberHeadPlaceholder'), trigger: 'blur' }
+        ],
+        member_name: [
+            { required: true, message: t('memberNamePlaceholder'), trigger: 'blur' }
+        ],
+        content: [
+            { required: true, message: t('contentPlaceholder'), trigger: 'blur' }
+        ],
+        images: [
+            { required: true, message: t('imagesPlaceholder'), trigger: 'blur' }
+        ],
+        create_time: [
+            { required: true, message: t('createTimePlaceholder'), trigger: 'blur' }
+        ]
+    }
 })
 
 const emit = defineEmits(['complete'])
@@ -157,49 +109,47 @@ const goodsSelectPopupRef: any = ref(null)
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      if (formData.image_arr) formData.images = formData.image_arr.split(',')
-      const data = formData
-      if (data.goods_id.length > 0) data.goods_id = data.goods_id[0]
-
-      addEvaluate(data)
-        .then((res) => {
-          loading.value = false
-          showDialog.value = false
-          emit('complete')
-        })
-        .catch((err) => {
-          loading.value = false
-        })
-    }
-  })
+    if (loading.value || !formEl) return
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+            if (formData.image_arr) formData.images = formData.image_arr.split(',')
+            const data = formData
+            if (data.goods_id.length > 0) data.goods_id = data.goods_id[0]
+
+            addEvaluate(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
 }
 
 // 获取字典数据
 
 const setFormData = async (row: any = null) => {
-  Object.keys(formData).forEach((key: string) => {
-    formData[key] = ''
-  })
-  formData.is_anonymous = 1
-  formData.goods_id = []
-  formData.scores = 5
-  loading.value = false
+    Object.keys(formData).forEach((key: string) => {
+        formData[key] = ''
+    })
+    formData.is_anonymous = 1
+    formData.goods_id = []
+    formData.scores = 5
+    loading.value = false
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
 <style lang="scss" scoped></style>
 <style lang="scss">
 .diy-dialog-wrap .el-form-item__label {
-  height: auto !important;
+    height: auto !important;
 }
 </style>
diff --git a/admin/src/addon/shop/views/goods/components/goods-batch-settings-popup.vue b/admin/src/addon/shop/views/goods/components/goods-batch-settings-popup.vue
index 0259fd3d..1a248a9b 100644
--- a/admin/src/addon/shop/views/goods/components/goods-batch-settings-popup.vue
+++ b/admin/src/addon/shop/views/goods/components/goods-batch-settings-popup.vue
@@ -1,379 +1,155 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="t('batchSetting')"
-    width="700px"
-    class="diy-dialog-wrap"
-    :destroy-on-close="true"
-  >
-    <el-alert :title="t('batchSettingTip')" type="info" :closable="false" />
-    <el-form
-      :model="formData"
-      label-width="120px"
-      ref="formRef"
-      :rules="formRules"
-      class="mt-[10px] page-form"
-      v-loading="loading"
-    >
-      <el-row>
-        <!-- 左侧菜单栏 -->
-        <el-col :span="4" class="menu-column">
-          <el-menu :default-active="activeMenu" @select="handleMenuSelect">
-            <el-menu-item
-              v-for="[key, value] in Object.entries(setTypeList)"
-              :key="key"
-              :index="key"
-              >{{ value }}</el-menu-item
-            >
-          </el-menu>
-        </el-col>
-
-        <!-- 右侧内容展示 -->
-        <el-col :span="20" class="content-column p-[5px]">
-          <!-- 商品标签 -->
-          <el-form-item v-if="activeMenu === 'label'" :label="t('label')">
-            <el-checkbox-group v-model="formData.label_ids">
-              <el-checkbox
-                :label="item.label_id"
-                v-for="(item, index) in labelOptions"
-                :key="index"
-                >{{ item.label_name }}</el-checkbox
-              >
-            </el-checkbox-group>
-            <div class="ml-[10px]">
-              <span
-                class="cursor-pointer text-primary mr-[10px]"
-                @click="refreshGoodsLabel"
-                >{{ t('refresh') }}</span
-              >
-              <span
-                class="cursor-pointer text-primary"
-                @click="toGoodsLabelEvent"
-                >{{ t('addGoodsLabel') }}</span
-              >
-            </div>
-          </el-form-item>
-          <!-- 商品服务 -->
-          <el-form-item v-if="activeMenu === 'service'" :label="t('label')">
-            <el-checkbox-group v-model="formData.service_ids">
-              <el-checkbox
-                :label="item.service_id"
-                v-for="(item, index) in serviceOptions"
-                :key="index"
-                >{{ item.service_name }}</el-checkbox
-              >
-            </el-checkbox-group>
-            <div class="ml-[10px]">
-              <span
-                class="cursor-pointer text-primary mr-[10px]"
-                @click="refreshGoodsService"
-                >{{ t('refresh') }}</span
-              >
-              <span
-                class="cursor-pointer text-primary"
-                @click="toGoodsServiceEvent"
-                >{{ t('addGoodsService') }}</span
-              >
-            </div>
-          </el-form-item>
-          <!-- 虚拟销量 -->
-          <el-form-item
-            v-if="activeMenu === 'virtual_sale_num'"
-            :label="t('virtualSaleNum')"
-            prop="virtual_sale_num"
-          >
-            <div>
-              <el-input
-                v-model.trim="formData.virtual_sale_num"
-                :placeholder="t('virtualSaleNumPlaceholder')"
-                class="input-width"
-                show-word-limit
-                maxlength="8"
-                clearable
-                @keyup="filterNumber($event)"
-                @blur="formData.virtual_sale_num = $event.target.value"
-              >
-                <template #append>{{
-                  formData.unit ? formData.unit : '件'
-                }}</template>
-              </el-input>
-              <div class="mt-[10px] text-[12px] text-[#999] leading-[20px]">
-                {{ t('virtualSaleNumDesc') }}
-              </div>
-            </div>
-          </el-form-item>
-          <!-- 商品分类 -->
-          <el-form-item
-            v-if="activeMenu === 'category'"
-            prop="goods_category"
-            :label="t('goodsCategory')"
-          >
-            <el-cascader
-              v-model="formData.goods_category"
-              :options="goodsCategoryOptions"
-              :props="goodsCategoryProps"
-              clearable
-              filterable
-              @change="categoryHandleChange"
-            />
-            <div class="ml-[10px]">
-              <span
-                class="cursor-pointer text-primary mr-[10px]"
-                @click="refreshGoodsCategory(true)"
-                >{{ t('refresh') }}</span
-              >
-              <span
-                class="cursor-pointer text-primary"
-                @click="toGoodsCategoryEvent"
-                >{{ t('addGoodsCategory') }}</span
-              >
-            </div>
-          </el-form-item>
-          <!-- 商品品牌 -->
-          <el-form-item v-if="activeMenu === 'brand'" :label="t('goodsBrand')">
-            <el-select
-              v-model="formData.brand_id"
-              :placeholder="t('brandPlaceholder')"
-              clearable
-            >
-              <el-option
-                v-for="item in brandOptions"
-                :key="item.brand_id"
-                :label="item.brand_name"
-                :value="item.brand_id"
-              />
-            </el-select>
-            <div class="ml-[10px]">
-              <span
-                class="cursor-pointer text-primary mr-[10px]"
-                @click="refreshGoodsBrand(true)"
-                >{{ t('refresh') }}</span
-              >
-              <span
-                class="cursor-pointer text-primary"
-                @click="toGoodsBrandEvent"
-                >{{ t('addGoodsBrand') }}</span
-              >
-            </div>
-          </el-form-item>
-          <!-- 商品海报 -->
-          <el-form-item
-            v-if="activeMenu === 'poster'"
-            :label="t('goodsPoster')"
-          >
-            <el-select
-              v-model="formData.poster_id"
-              :placeholder="t('posterPlaceholder')"
-              clearable
-            >
-              <el-option
-                v-for="item in posterOptions"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              />
-            </el-select>
-            <div class="ml-[10px]">
-              <span
-                class="cursor-pointer text-primary mr-[10px]"
-                @click="refreshGoodsPoster(true)"
-                >{{ t('refresh') }}</span
-              >
-              <span
-                class="cursor-pointer text-primary"
-                @click="toPosterEvent"
-                >{{ t('addGoodsPoster') }}</span
-              >
-            </div>
-          </el-form-item>
-          <!-- 是否赠品 -->
-          <el-form-item v-if="activeMenu === 'gift'" :label="t('isGift')">
-            <div>
-              <el-radio-group v-model="formData.is_gift">
-                <el-radio :label="1">{{ t('yes') }}</el-radio>
-                <el-radio :label="0">{{ t('no') }}</el-radio>
-              </el-radio-group>
-              <div class="mt-[10px] text-[12px] text-[#999] leading-[20px]">
-                {{ t('giftTips') }}
-              </div>
-            </div>
-          </el-form-item>
-          <!-- 配送设置 -->
-          <div v-if="activeMenu === 'delivery'">
-            <el-form-item :label="t('deliveryType')" prop="delivery_type">
-              <div>
-                <el-checkbox-group v-model="formData.delivery_type">
-                  <el-checkbox
-                    v-for="(item, index) in deliveryTypeCheckBox"
-                    :key="index"
-                    :label="item.key"
-                    >{{ item.name }}</el-checkbox
-                  >
-                </el-checkbox-group>
-                <div
-                  v-if="deliveryTypeCheckBox && deliveryTypeCheckBox.length"
-                  class="text-[12px] text-[#999] leading-[20px]"
-                >
-                  只针对实物商品有效
-                </div>
-                <div
-                  v-if="deliveryTypeFlag"
-                  class="text-[12px] text-[#999] leading-[20px]"
-                >
-                  请先在配置设置中设置配送方式
-                </div>
-              </div>
-            </el-form-item>
-
-            <el-form-item
-              :label="t('isFreeShipping')"
-              v-show="formData.delivery_type.indexOf('express') != -1"
-            >
-              <el-switch
-                v-model="formData.is_free_shipping"
-                :active-value="1"
-                :inactive-value="0"
-              />
-            </el-form-item>
-
-            <el-form-item
-              :label="t('feeType')"
-              prop="fee_type"
-              v-show="
-                formData.delivery_type.indexOf('express') != -1 &&
-                formData.is_free_shipping == 0
-              "
-            >
-              <el-radio-group v-model="formData.fee_type">
-                <el-radio label="template">{{ t('selectTemplate') }}</el-radio>
-                <el-radio label="fixed">{{ t('fixedShipping') }}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-            <el-form-item
-              :label="t('deliveryMoney')"
-              prop="delivery_money"
-              v-show="
-                formData.delivery_type.indexOf('express') != -1 &&
-                formData.is_free_shipping == 0 &&
-                formData.fee_type == 'fixed'
-              "
-            >
-              <el-input
-                v-model.trim="formData.delivery_money"
-                clearable
-                placeholder="0.00"
-                class="input-width-short"
-                maxlength="8"
-              >
-                <template #append>{{ t('yuan') }}</template>
-              </el-input>
-            </el-form-item>
-            <el-form-item
-              :label="t('deliveryTemplateId')"
-              prop="delivery_template_id"
-              v-show="
-                formData.delivery_type.indexOf('express') != -1 &&
-                formData.is_free_shipping == 0 &&
-                formData.fee_type == 'template'
-              "
-            >
-              <el-select
-                v-model="formData.delivery_template_id"
-                :placeholder="t('deliveryTemplateIdPlaceholder')"
-                filterable
-                autocomplete="off"
-                clearable
-              >
-                <el-option
-                  v-for="item in deliveryTemplateOptions"
-                  :key="item.template_id"
-                  :label="item.template_name"
-                  :value="item.template_id"
-                />
-              </el-select>
-              <div class="ml-[10px]">
-                <span
-                  class="cursor-pointer text-primary mr-[10px]"
-                  @click="refreshDeliveryTemplate"
-                  >{{ t('refresh') }}</span
-                >
-                <span
-                  class="cursor-pointer text-primary"
-                  @click="toDeliveryTemplateEvent"
-                  >{{ t('addDeliveryTemplateId') }}</span
-                >
-              </div>
-            </el-form-item>
-          </div>
-          <!-- 库存设置 -->
-          <div v-if="activeMenu === 'stock'">
-            <el-form-item :label="t('setStock')" prop="stock_type">
-              <el-radio-group v-model="formData.stock_type">
-                <el-radio label="inc">{{ t('addStock') }}</el-radio>
-                <el-radio label="dec">{{ t('reduceStock') }}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-            <el-form-item :label="t('stockNum')" prop="">
-              <el-input
-                v-model.trim="formData.stock"
-                clearable
-                placeholder="0"
-                class="input-width-short"
-                show-word-limit
-                maxlength="8"
-                @keyup="filterNumber($event)"
-                @blur="formData.stock = $event.target.value"
-              />
-            </el-form-item>
-            <div
-              class="mt-[10px] ml-[120px] text-[12px] text-[#999] leading-[20px]"
-            >
-              {{ t('stockNumTips') }}
-            </div>
-          </div>
-          <!-- 万能表单 -->
-          <el-form-item v-if="activeMenu === 'diy_form'" :label="t('diyForm')">
-            <el-select
-              v-model="formData.form_id"
-              :placeholder="t('diyFormPlaceholder')"
-              clearable
-            >
-              <el-option
-                v-for="item in diyFormOptions"
-                :key="item.form_id"
-                :label="item.page_title"
-                :value="item.form_id"
-              />
-            </el-select>
-            <div class="ml-[10px]">
-              <span
-                class="cursor-pointer text-primary mr-[10px]"
-                @click="refreshDiyForm(true)"
-                >{{ t('refresh') }}</span
-              >
-              <span
-                class="cursor-pointer text-primary"
-                @click="toDiyFormEvent"
-                >{{ t('addDiyForm') }}</span
-              >
-            </div>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+    <el-dialog v-model="showDialog" :title="t('batchSetting')" width="700px" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-alert :title="t('batchSettingTip')" type="info" :closable="false" />
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="mt-[10px] page-form" v-loading="loading">
+            <el-row>
+                <!-- 左侧菜单栏 -->
+                <el-col :span="4" class="menu-column">
+                    <el-menu :default-active="activeMenu"  @select="handleMenuSelect">
+                        <el-menu-item v-for="([key, value]) in Object.entries(setTypeList)" :key="key" :index="key">{{ value }}</el-menu-item>
+                    </el-menu>
+                </el-col>
+
+                <!-- 右侧内容展示 -->
+                <el-col :span="20" class="content-column p-[5px]">
+                    <!-- 商品标签 -->
+                    <el-form-item v-if="activeMenu === 'label'" :label="t('label')">
+                        <el-checkbox-group v-model="formData.label_ids">
+                            <el-checkbox :label="item.label_id" v-for="(item, index) in labelOptions" :key="index" >{{ item.label_name }}</el-checkbox>
+                        </el-checkbox-group>
+                        <div class="ml-[10px]">
+                            <span class="cursor-pointer text-primary mr-[10px]" @click="refreshGoodsLabel">{{ t('refresh') }}</span>
+                            <span class="cursor-pointer text-primary" @click="toGoodsLabelEvent">{{ t('addGoodsLabel') }}</span>
+                        </div>
+                    </el-form-item>
+                    <!-- 商品服务 -->
+                    <el-form-item v-if="activeMenu === 'service'" :label="t('label')">
+                        <el-checkbox-group v-model="formData.service_ids">
+                            <el-checkbox :label="item.service_id" v-for="(item, index) in serviceOptions" :key="index" >{{ item.service_name }}</el-checkbox>
+                        </el-checkbox-group>
+                        <div class="ml-[10px]">
+                            <span class="cursor-pointer text-primary mr-[10px]" @click="refreshGoodsService">{{ t('refresh') }}</span>
+                            <span class="cursor-pointer text-primary" @click="toGoodsServiceEvent">{{ t('addGoodsService') }}</span>
+                        </div>
+                    </el-form-item>
+                    <!-- 虚拟销量 -->
+                    <el-form-item v-if="activeMenu === 'virtual_sale_num'" :label="t('virtualSaleNum')" prop="virtual_sale_num">
+                        <div>
+                            <el-input v-model.trim="formData.virtual_sale_num"  :placeholder="t('virtualSaleNumPlaceholder')" class="input-width" show-word-limit maxlength="8" clearable @keyup="filterNumber($event)" @blur="formData.virtual_sale_num = $event.target.value">
+                                <template #append>{{ formData.unit ? formData.unit : '件' }}</template>
+                            </el-input>
+                            <div class="mt-[10px] text-[12px] text-[#999] leading-[20px]">{{ t('virtualSaleNumDesc') }}</div>
+                        </div>
+                    </el-form-item>
+                    <!-- 商品分类 -->
+                    <el-form-item v-if="activeMenu === 'category'" prop="goods_category" :label="t('goodsCategory')">
+                        <el-cascader v-model="formData.goods_category" :options="goodsCategoryOptions" :props="goodsCategoryProps" clearable filterable @change="categoryHandleChange" />
+                            <div class="ml-[10px]">
+                                <span class="cursor-pointer text-primary mr-[10px]" @click="refreshGoodsCategory(true)">{{ t('refresh') }}</span>
+                                <span class="cursor-pointer text-primary" @click="toGoodsCategoryEvent">{{ t('addGoodsCategory') }}</span>
+                            </div>
+                    </el-form-item>
+                    <!-- 商品品牌 -->
+                    <el-form-item v-if="activeMenu === 'brand'" :label="t('goodsBrand')">
+                        <el-select v-model="formData.brand_id" :placeholder="t('brandPlaceholder')" clearable>
+                            <el-option v-for="item in brandOptions" :key="item.brand_id" :label="item.brand_name" :value="item.brand_id" />
+                        </el-select>
+                        <div class="ml-[10px]">
+                            <span class="cursor-pointer text-primary mr-[10px]" @click="refreshGoodsBrand(true)">{{ t('refresh') }}</span>
+                            <span class="cursor-pointer text-primary" @click="toGoodsBrandEvent">{{ t('addGoodsBrand') }}</span>
+                        </div>
+                    </el-form-item>
+                    <!-- 商品海报 -->
+                    <el-form-item v-if="activeMenu === 'poster'" :label="t('goodsPoster')">
+                        <el-select v-model="formData.poster_id" :placeholder="t('posterPlaceholder')" clearable>
+                            <el-option v-for="item in posterOptions" :key="item.id" :label="item.name" :value="item.id" />
+                        </el-select>
+                        <div class="ml-[10px]">
+                            <span class="cursor-pointer text-primary mr-[10px]" @click="refreshGoodsPoster(true)">{{ t('refresh') }}</span>
+                            <span class="cursor-pointer text-primary" @click="toPosterEvent">{{ t('addGoodsPoster') }}</span>
+                        </div>
+                    </el-form-item>
+                    <!-- 是否赠品 -->
+                    <el-form-item v-if="activeMenu === 'gift'" :label="t('isGift')">
+                        <div>
+                            <el-radio-group v-model="formData.is_gift">
+                                <el-radio :label= "1">{{ t('yes') }}</el-radio>
+                                <el-radio :label= "0">{{ t('no') }}</el-radio>
+                            </el-radio-group>
+                            <div class="mt-[10px] text-[12px] text-[#999] leading-[20px]">{{ t('giftTips') }}</div>
+                        </div>
+                    </el-form-item>
+                    <!-- 配送设置 -->
+                    <div v-if="activeMenu === 'delivery'">
+                        <el-form-item :label="t('deliveryType')" prop="delivery_type">
+                            <div>
+                                <el-checkbox-group v-model="formData.delivery_type">
+                                    <el-checkbox v-for="(item, index) in deliveryTypeCheckBox" :key="index" :label="item.key">{{ item.name }}</el-checkbox>
+                                </el-checkbox-group>
+                                <div v-if="deliveryTypeCheckBox && deliveryTypeCheckBox.length" class="text-[12px] text-[#999] leading-[20px]">只针对实物商品有效</div>
+                                <div v-if="deliveryTypeFlag" class="text-[12px] text-[#999] leading-[20px]">请先在配置设置中设置配送方式</div>
+                            </div>
+                        </el-form-item>
+
+                        <el-form-item :label="t('isFreeShipping')" v-show="formData.delivery_type.indexOf('express') != -1">
+                            <el-switch v-model="formData.is_free_shipping" :active-value="1" :inactive-value="0" />
+                        </el-form-item>
+
+                        <el-form-item :label="t('feeType')" prop="fee_type" v-show="formData.delivery_type.indexOf('express') != -1 && formData.is_free_shipping == 0">
+                            <el-radio-group v-model="formData.fee_type">
+                                <el-radio label="template">{{ t('selectTemplate') }}</el-radio>
+                                <el-radio label="fixed">{{ t('fixedShipping') }}</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                        <el-form-item :label="t('deliveryMoney')" prop="delivery_money" v-show="formData.delivery_type.indexOf('express') != -1 && formData.is_free_shipping == 0 && formData.fee_type == 'fixed'">
+                            <el-input v-model.trim="formData.delivery_money" clearable placeholder="0.00" class="input-width-short" maxlength="8">
+                                <template #append>{{ t('yuan') }}</template>
+                            </el-input>
+                        </el-form-item>
+                        <el-form-item :label="t('deliveryTemplateId')" prop="delivery_template_id" v-show="formData.delivery_type.indexOf('express') != -1 && formData.is_free_shipping == 0 && formData.fee_type == 'template'">
+                            <el-select v-model="formData.delivery_template_id" :placeholder="t('deliveryTemplateIdPlaceholder')" filterable autocomplete="off" clearable>
+                                <el-option v-for="item in deliveryTemplateOptions" :key="item.template_id" :label="item.template_name" :value="item.template_id" />
+                            </el-select>
+                            <div class="ml-[10px]">
+                                <span class="cursor-pointer text-primary mr-[10px]" @click="refreshDeliveryTemplate">{{ t('refresh') }}</span>
+                                <span class="cursor-pointer text-primary" @click="toDeliveryTemplateEvent">{{ t('addDeliveryTemplateId') }}</span>
+                            </div>
+                        </el-form-item>
+                    </div>
+                    <!-- 库存设置 -->
+                    <div v-if="activeMenu === 'stock'">
+                        <el-form-item :label="t('setStock')" prop="stock_type">
+                            <el-radio-group v-model="formData.stock_type">
+                                <el-radio label="inc">{{ t('addStock') }}</el-radio>
+                                <el-radio label="dec">{{ t('reduceStock') }}</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                        <el-form-item :label="t('stockNum')" prop="">
+                            <el-input v-model.trim="formData.stock" clearable placeholder="0" class="input-width-short" show-word-limit maxlength="8" @keyup="filterNumber($event)" @blur="formData.stock = $event.target.value" />
+                        </el-form-item>
+                        <div class="mt-[10px] ml-[120px] text-[12px] text-[#999] leading-[20px]">{{ t('stockNumTips') }}</div>
+                    </div>
+                    <!-- 万能表单 -->
+                    <el-form-item v-if="activeMenu === 'diy_form'" :label="t('diyForm')">
+                        <el-select v-model="formData.form_id" :placeholder="t('diyFormPlaceholder')" clearable>
+                            <el-option v-for="item in diyFormOptions" :key="item.form_id" :label="item.page_title" :value="item.form_id" />
+                        </el-select>
+                        <div class="ml-[10px]">
+                            <span class="cursor-pointer text-primary mr-[10px]" @click="refreshDiyForm(true)">{{ t('refresh') }}</span>
+                            <span class="cursor-pointer text-primary" @click="toDiyFormEvent">{{ t('addDiyForm') }}</span>
+                        </div>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -383,19 +159,16 @@ import { ElMessage, FormInstance } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 import { filterNumber } from '@/utils/common'
 import {
-  getBrandList,
-  getLabelList,
-  getServeList,
-  getCategoryTree,
-  getGoodsBatchSetDict,
-  goodsBatchSet,
+    getBrandList,
+    getLabelList,
+    getServeList,
+    getCategoryTree,
+    getGoodsBatchSetDict,
+    goodsBatchSet
 } from '@/addon/shop/api/goods'
 import { getPosterList } from '@/app/api/poster'
 import { getDiyFormList } from '@/app/api/diy_form'
-import {
-  getShopDeliveryList,
-  getShippingTemplateList,
-} from '@/addon/shop/api/delivery'
+import {getShopDeliveryList,getShippingTemplateList} from '@/addon/shop/api/delivery'
 
 const emit = defineEmits(['load'])
 const showDialog = ref(false)
@@ -408,179 +181,165 @@ const router = useRouter()
  * 表单数据
  */
 const initialFormData = {
-  label_ids: [],
-  service_ids: [],
-  poster_id: '',
-  form_id: '',
-  brand_id: '',
-  goods_category: [],
-  virtual_sale_num: 0,
-  delivery_template_id: '',
-  delivery_money: 0,
-  fee_type: 'template',
-  delivery_type: [],
-  stock_type: 'inc',
-  is_free_shipping: 1,
-  is_gift: 0,
-  stock: '',
+    label_ids: [],
+    service_ids: [],
+    poster_id: '',
+    form_id: '',
+    brand_id: '',
+    goods_category: [],
+    virtual_sale_num: 0,
+    delivery_template_id: '',
+    delivery_money: 0,
+    fee_type: 'template',
+    delivery_type: [],
+    stock_type: 'inc',
+    is_free_shipping: 1,
+    is_gift: 0,
+    stock: ''
 }
 
 const formData: Record<string, any> = reactive({ ...initialFormData })
 // 正则表达式
 const regExp: any = {
-  required: /[\S]+/,
-  number: /^\d{0,10}$/,
-  digit: /^\d{0,10}(.?\d{0,2})$/,
-  special: /^\d{0,10}(.?\d{0,3})$/,
+    required: /[\S]+/,
+    number: /^\d{0,10}$/,
+    digit: /^\d{0,10}(.?\d{0,2})$/,
+    special: /^\d{0,10}(.?\d{0,3})$/
 }
 const formRef = ref<FormInstance>()
 const formRules = reactive({
-  virtual_sale_num: [
-    {
-      trigger: 'blur',
-      validator: (rule: any, value: any, callback: any) => {
-        if (activeMenu.value == 'virtual_sale_num') {
-          if (isNaN(value) || !regExp.number.test(value)) {
-            callback(new Error(t('virtualSaleNumTips')))
-          } else if (value < 0) {
-            callback(new Error(t('virtualSaleNumNotZeroTips')))
-          } else {
-            callback()
-          }
-        } else {
-          callback()
+    virtual_sale_num: [
+        {
+            trigger: 'blur',
+            validator: (rule: any, value: any, callback: any) => {
+                if (activeMenu.value == 'virtual_sale_num') {
+                    if (isNaN(value) || !regExp.number.test(value)) {
+                        callback(new Error(t('virtualSaleNumTips')))
+                    } else if (value < 0) {
+                        callback(new Error(t('virtualSaleNumNotZeroTips')))
+                    } else {
+                        callback()
+                    }
+                } else {
+                    callback()
+                }
+            }
         }
-      },
-    },
-  ],
-  delivery_type: [
-    { required: true, message: t('deliveryTypePlaceholder'), trigger: 'blur' },
-  ],
-  goods_category: [
-    {
-      required: true,
-      message: t('goodsCategoryPlaceholderTwo'),
-      trigger: 'blur',
-    },
-  ],
-  delivery_money: [
-    {
-      trigger: 'blur',
-      validator: (rule: any, value: any, callback: any) => {
-        if (activeMenu.value == 'delivery') {
-          if (
-            formData.delivery_type.indexOf('express') != -1 &&
-            formData.is_free_shipping == 0 &&
-            formData.fee_type == 'fixed'
-          ) {
-            if (formData.delivery_template_id.length == 0 && value === '') {
-              callback(new Error(t('deliveryMoneyPlaceholder')))
-            } else if (isNaN(value) || !regExp.digit.test(value)) {
-              callback(new Error(t('deliveryMoneyTips')))
-            } else if (value < 0) {
-              callback(new Error(t('deliveryMoneyNotZeroTips')))
-            } else {
-              callback()
+    ],
+    delivery_type: [
+        { required: true, message: t('deliveryTypePlaceholder'), trigger: 'blur' }
+    ],
+    goods_category: [
+        { required: true, message: t('goodsCategoryPlaceholderTwo'), trigger: 'blur' }
+    ],
+    delivery_money: [
+        {
+            trigger: 'blur',
+            validator: (rule: any, value: any, callback: any) => {
+                if (activeMenu.value == 'delivery') {
+                    if (formData.delivery_type.indexOf('express') != -1 && formData.is_free_shipping == 0 && formData.fee_type == 'fixed') {
+                        if (formData.delivery_template_id.length == 0 && value === '') {
+                            callback(new Error(t('deliveryMoneyPlaceholder')))
+                        } else if (isNaN(value) || !regExp.digit.test(value)) {
+                            callback(new Error(t('deliveryMoneyTips')))
+                        } else if (value < 0) {
+                            callback(new Error(t('deliveryMoneyNotZeroTips')))
+                        } else {
+                            callback()
+                        }
+                    } else {
+                        callback()
+                    }
+                } else {
+                    callback()
+                }
             }
-          } else {
-            callback()
-          }
-        } else {
-          callback()
         }
-      },
-    },
-  ],
-  delivery_template_id: [
-    {
-      trigger: 'blur',
-      validator: (rule: any, value: any, callback: any) => {
-        if (activeMenu.value == 'delivery') {
-          if (
-            formData.delivery_type.indexOf('express') != -1 &&
-            formData.is_free_shipping == 0 &&
-            formData.fee_type == 'template'
-          ) {
-            if (formData.delivery_money.length == 0 && value === '') {
-              callback(new Error(t('deliveryTemplateIdPlaceholder')))
-            } else {
-              callback()
+    ],
+    delivery_template_id: [
+        {
+            trigger: 'blur',
+            validator: (rule: any, value: any, callback: any) => {
+                if (activeMenu.value == 'delivery') {
+                    if (formData.delivery_type.indexOf('express') != -1 && formData.is_free_shipping == 0 && formData.fee_type == 'template') {
+                        if (formData.delivery_money.length == 0 && value === '') {
+                            callback(new Error(t('deliveryTemplateIdPlaceholder')))
+                        } else {
+                            callback()
+                        }
+                    } else {
+                        callback()
+                    }
+                } else {
+                    callback()
+                }
             }
-          } else {
-            callback()
-          }
-        } else {
-          callback()
         }
-      },
-    },
-  ],
+    ]
 })
 
-const goods_ids: any = []
+const goods_ids: any = [];
 const show = (multipleSelection: any) => {
-  multipleSelection.forEach((item: any) => {
-    goods_ids.push(item.goods_id)
-  })
-  showDialog.value = true
+    multipleSelection.forEach((item: any) => {
+        goods_ids.push(item.goods_id);
+    });
+    showDialog.value = true
 }
 
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      const goodsCategory: any = []
-      formData.goods_category.forEach((item: any) => {
-        if (typeof item == 'object') {
-          item.forEach((second: any) => {
-            if (goodsCategory.indexOf(second) == -1) {
-              goodsCategory.push(second)
+    if (loading.value || !formEl) return
+    await formEl.validate(async(valid) => {
+        if (valid) {
+            loading.value = true
+            const goodsCategory: any = []
+            formData.goods_category.forEach((item: any) => {
+                if (typeof item == 'object') {
+                    item.forEach((second: any) => {
+                        if (goodsCategory.indexOf(second) == -1) {
+                            goodsCategory.push(second)
+                        }
+                    })
+                } else {
+                    if (goodsCategory.indexOf(item) == -1) {
+                        goodsCategory.push(item)
+                    }
+                }
+            })
+
+            formData.goods_category = goodsCategory
+            let data = {
+                goods_ids: goods_ids,
+                set_type: activeMenu.value,
+                set_value: formData
             }
-          })
-        } else {
-          if (goodsCategory.indexOf(item) == -1) {
-            goodsCategory.push(item)
-          }
-        }
-      })
-
-      formData.goods_category = goodsCategory
-      let data = {
-        goods_ids: goods_ids,
-        set_type: activeMenu.value,
-        set_value: formData,
-      }
-      goodsBatchSet(data)
-        .then((res) => {
-          if (['stock'].indexOf(activeMenu.value) != -1) {
-            activeMenu.value = 'label'
-            showDialog.value = false
-            goods_ids.splice(0, goods_ids.length)
-            Object.assign(formData, {
-              label_ids: [],
-              service_ids: [],
-              poster_id: '',
-              form_id: '',
-              brand_id: '',
-              goods_category: [],
-              virtual_sale_num: '',
-              delivery_template_id: '',
-              delivery_money: '',
-              fee_type: 'template',
-              delivery_type: [],
-              is_free_shipping: 1,
-              is_gift: 0,
+            goodsBatchSet(data).then((res) => {
+                if (['stock'].indexOf(activeMenu.value) != -1) {
+                    activeMenu.value = 'label';
+                    showDialog.value = false
+                    goods_ids.splice(0, goods_ids.length);
+                    Object.assign(formData, {
+                        label_ids: [],
+                        service_ids: [],
+                        poster_id: '',
+                        form_id: '',
+                        brand_id: '',
+                        goods_category: [],
+                        virtual_sale_num: '',
+                        delivery_template_id: '',
+                        delivery_money: '',
+                        fee_type: 'template',
+                        delivery_type: [],
+                        is_free_shipping: 1,
+                        is_gift: 0,
+                    });
+                    emit('load')
+                }
+                loading.value = false
+            }).catch(err => {
+                loading.value = false
             })
-            emit('load')
-          }
-          loading.value = false
-        })
-        .catch((err) => {
-          loading.value = false
-        })
-    }
-  })
+        }
+    })
 }
 
 const handleMenuSelect = (index: string) => {
@@ -589,9 +348,9 @@ const handleMenuSelect = (index: string) => {
 
 const setTypeList = reactive([])
 const getGoodsTypeList = () => {
-  getGoodsBatchSetDict().then((res) => {
-    Object.assign(setTypeList, res.data)
-  })
+    getGoodsBatchSetDict().then((res) => {
+        Object.assign(setTypeList, res.data);
+    })
 }
 getGoodsTypeList()
 
@@ -600,26 +359,26 @@ getGoodsTypeList()
 const labelOptions = reactive([])
 // 跳转到商品标签，添加标签
 const toGoodsLabelEvent = () => {
-  const url = router.resolve({
-    path: '/shop/goods/label',
-  })
-  window.open(url.href)
+    const url = router.resolve({
+        path: '/shop/goods/label'
+    })
+    window.open(url.href)
 }
 
 // 商品标签
 const refreshGoodsLabel = (bool = false) => {
-  getLabelList({}).then((res) => {
-    const data = res.data
-    if (data) {
-      labelOptions.splice(0, labelOptions.length, ...data)
-      if (bool) {
-        ElMessage({
-          message: t('refreshSuccess'),
-          type: 'success',
-        })
-      }
-    }
-  })
+    getLabelList({}).then((res) => {
+        const data = res.data
+        if (data) {
+            labelOptions.splice(0, labelOptions.length, ...data)
+            if (bool) {
+                ElMessage({
+                    message: t('refreshSuccess'),
+                    type: 'success'
+                })
+            }
+        }
+    })
 }
 refreshGoodsLabel()
 /** *****************商品标签-end *************************/
@@ -629,26 +388,26 @@ refreshGoodsLabel()
 const serviceOptions = reactive([])
 // 跳转到商品服务，添加服务
 const toGoodsServiceEvent = () => {
-  const url = router.resolve({
-    path: '/shop/goods/service',
-  })
-  window.open(url.href)
+    const url = router.resolve({
+        path: '/shop/goods/service'
+    })
+    window.open(url.href)
 }
 
 // 商品服务
 const refreshGoodsService = (bool = false) => {
-  getServeList({}).then((res) => {
-    const data = res.data
-    if (data) {
-      serviceOptions.splice(0, serviceOptions.length, ...data)
-      if (bool) {
-        ElMessage({
-          message: t('refreshSuccess'),
-          type: 'success',
-        })
-      }
-    }
-  })
+    getServeList({}).then((res) => {
+        const data = res.data
+        if (data) {
+            serviceOptions.splice(0, serviceOptions.length, ...data)
+            if (bool) {
+                ElMessage({
+                    message: t('refreshSuccess'),
+                    type: 'success'
+                })
+            }
+        }
+    })
 }
 
 refreshGoodsService()
@@ -658,55 +417,51 @@ refreshGoodsService()
 // 商品分类
 const goodsCategoryOptions = reactive([])
 const goodsCategoryProps = {
-  multiple: true,
+    multiple: true
 }
 const categoryHandleChange = (value: any) => {
-  // console.log(value, goodsEdit.formData.goods_category, goodsEdit.formData.goods_category.toString())
+    // console.log(value, goodsEdit.formData.goods_category, goodsEdit.formData.goods_category.toString())
 }
 
 // 跳转到商品分类，添加分类
 const toGoodsCategoryEvent = () => {
-  const url = router.resolve({
-    path: '/shop/goods/category',
-  })
-  window.open(url.href)
+    const url = router.resolve({
+        path: '/shop/goods/category'
+    })
+    window.open(url.href)
 }
 
 // 刷新商品分类
 const refreshGoodsCategory = (bool = false) => {
-  getCategoryTree().then((res) => {
-    const data = res.data
-    if (data) {
-      const goodsCategoryTree: any = []
-      data.forEach((item: any) => {
-        const children: any = []
-        if (item.child_list) {
-          item.child_list.forEach((childItem: any) => {
-            children.push({
-              value: childItem.category_id,
-              label: childItem.category_name,
+    getCategoryTree().then((res) => {
+        const data = res.data
+        if (data) {
+            const goodsCategoryTree: any = []
+            data.forEach((item: any) => {
+                const children: any = []
+                if (item.child_list) {
+                    item.child_list.forEach((childItem: any) => {
+                        children.push({
+                            value: childItem.category_id,
+                            label: childItem.category_name
+                        })
+                    })
+                }
+                goodsCategoryTree.push({
+                    value: item.category_id,
+                    label: item.category_name,
+                    children
+                })
             })
-          })
+            goodsCategoryOptions.splice(0, goodsCategoryOptions.length, ...goodsCategoryTree)
+            if (bool) {
+                ElMessage({
+                    message: t('refreshSuccess'),
+                    type: 'success'
+                })
+            }
         }
-        goodsCategoryTree.push({
-          value: item.category_id,
-          label: item.category_name,
-          children,
-        })
-      })
-      goodsCategoryOptions.splice(
-        0,
-        goodsCategoryOptions.length,
-        ...goodsCategoryTree
-      )
-      if (bool) {
-        ElMessage({
-          message: t('refreshSuccess'),
-          type: 'success',
-        })
-      }
-    }
-  })
+    })
 }
 
 refreshGoodsCategory()
@@ -718,26 +473,26 @@ const brandOptions = reactive([])
 
 // 跳转到商品品牌，添加品牌
 const toGoodsBrandEvent = () => {
-  const url = router.resolve({
-    path: '/shop/goods/brand',
-  })
-  window.open(url.href)
+    const url = router.resolve({
+        path: '/shop/goods/brand'
+    })
+    window.open(url.href)
 }
 
 // 商品品牌
 const refreshGoodsBrand = (bool = false) => {
-  getBrandList({}).then((res) => {
-    const data = res.data
-    if (data) {
-      brandOptions.splice(0, brandOptions.length, ...data)
-      if (bool) {
-        ElMessage({
-          message: t('refreshSuccess'),
-          type: 'success',
-        })
-      }
-    }
-  })
+    getBrandList({}).then((res) => {
+        const data = res.data
+        if (data) {
+            brandOptions.splice(0, brandOptions.length, ...data)
+            if (bool) {
+                ElMessage({
+                    message: t('refreshSuccess'),
+                    type: 'success'
+                })
+            }
+        }
+    })
 }
 
 refreshGoodsBrand()
@@ -748,33 +503,34 @@ refreshGoodsBrand()
 const posterOptions = reactive([])
 // 跳转到海报列表，添加海报
 const toPosterEvent = () => {
-  const url = router.resolve({
-    path: '/poster/list',
-  })
-  window.open(url.href)
+    const url = router.resolve({
+        path: '/poster/list'
+    })
+    window.open(url.href)
 }
 
 // 商品海报
 const refreshGoodsPoster = (bool = false) => {
-  getPosterList({
-    type: 'shop_goods',
-  }).then((res) => {
-    const data = res.data
-    if (data) {
-      posterOptions.splice(0, posterOptions.length, ...data)
-      if (bool) {
-        ElMessage({
-          message: t('refreshSuccess'),
-          type: 'success',
-        })
-      }
-    }
-  })
+    getPosterList({
+        type: 'shop_goods'
+    }).then((res) => {
+        const data = res.data
+        if (data) {
+            posterOptions.splice(0, posterOptions.length, ...data)
+            if (bool) {
+                ElMessage({
+                    message: t('refreshSuccess'),
+                    type: 'success'
+                })
+            }
+        }
+    })
 }
 
 refreshGoodsPoster()
 /** *****************商品海报-end *************************/
 
+
 // 配送方式复选框
 const deliveryTypeCheckBox = reactive([])
 
@@ -784,37 +540,37 @@ const deliveryTemplateOptions = reactive([])
 // 配送方式
 const deliveryTypeFlag = ref(false)
 getShopDeliveryList().then((res) => {
-  const data = res.data
-  if (data) {
-    deliveryTypeCheckBox.splice(0, deliveryTypeCheckBox.length, ...data)
-    // deliveryTypeFlag.value = deliveryTypeCheckBox.every(el => {
-    // return el.status == '2'
-    // })
-  }
+    const data = res.data
+    if (data) {
+        deliveryTypeCheckBox.splice(0, deliveryTypeCheckBox.length, ...data)
+        // deliveryTypeFlag.value = deliveryTypeCheckBox.every(el => {
+        // return el.status == '2'
+        // })
+    }
 })
 
 // 跳转到运费模板
 const toDeliveryTemplateEvent = () => {
-  const url = router.resolve({
-    path: '/shop/order/shipping/template',
-  })
-  window.open(url.href)
+    const url = router.resolve({
+        path: '/shop/order/shipping/template'
+    })
+    window.open(url.href)
 }
 
 // 运费模板
 const refreshDeliveryTemplate = (bool = false) => {
-  getShippingTemplateList({}).then((res) => {
-    const data = res.data
-    if (data) {
-      deliveryTemplateOptions.splice(0, deliveryTemplateOptions.length, ...data)
-      if (bool) {
-        ElMessage({
-          message: t('refreshSuccess'),
-          type: 'success',
-        })
-      }
-    }
-  })
+    getShippingTemplateList({}).then((res) => {
+        const data = res.data
+        if (data) {
+            deliveryTemplateOptions.splice(0, deliveryTemplateOptions.length, ...data)
+            if (bool) {
+                ElMessage({
+                    message: t('refreshSuccess'),
+                    type: 'success'
+                })
+            }
+        }
+    })
 }
 
 refreshDeliveryTemplate()
@@ -824,45 +580,45 @@ refreshDeliveryTemplate()
 const diyFormOptions = reactive([])
 // 跳转到万能表单列表，添加表单
 const toDiyFormEvent = () => {
-  const url = router.resolve({
-    path: '/diy_form/list',
-  })
-  window.open(url.href)
+    const url = router.resolve({
+        path: '/diy_form/list'
+    })
+    window.open(url.href)
 }
 
 // 刷新万能表单
 const refreshDiyForm = (bool = false) => {
-  getDiyFormList({
-    type: 'DIY_FORM_GOODS_DETAIL',
-    status: 1,
-  }).then((res) => {
-    const data = res.data
-    if (data) {
-      diyFormOptions.splice(0, diyFormOptions.length, ...data)
-      if (bool) {
-        ElMessage({
-          message: t('refreshSuccess'),
-          type: 'success',
-        })
-      }
-    }
-  })
+    getDiyFormList({
+        type: 'DIY_FORM_GOODS_DETAIL',
+        status: 1
+    }).then((res) => {
+        const data = res.data
+        if (data) {
+            diyFormOptions.splice(0, diyFormOptions.length, ...data)
+            if (bool) {
+                ElMessage({
+                    message: t('refreshSuccess'),
+                    type: 'success'
+                })
+            }
+        }
+    })
 }
 
 refreshDiyForm()
 /** *****************万能表单-end *************************/
 
 defineExpose({
-  showDialog,
-  show,
+    showDialog,
+    show
 })
 </script>
 
 <style lang="scss" scoped>
 .el-menu-item {
-  height: 40px;
+    height:40px;
 }
-.input-width-short {
-  width: 200px;
+.input-width-short{
+    width: 200px;
 }
 </style>
diff --git a/admin/src/addon/shop/views/goods/components/goods-category-spread-popup.vue b/admin/src/addon/shop/views/goods/components/goods-category-spread-popup.vue
index 095bc32b..f41c0fb1 100644
--- a/admin/src/addon/shop/views/goods/components/goods-category-spread-popup.vue
+++ b/admin/src/addon/shop/views/goods/components/goods-category-spread-popup.vue
@@ -1,32 +1,24 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="t('goodsCategorySpreadTitle')"
-    width="500px"
-    :destroy-on-close="true"
-  >
-    <div class="promote-flex flex">
-      <div
-        class="promote-img flex justify-center items-center bg-[#f8f8f8] w-[150px] h-[150px]"
-      >
-        <el-image :src="wapImage" />
-      </div>
-
-      <div class="px-[20px] flex-1">
-        <div class="mb-[10px]">{{ t('spreadLink') }}</div>
-        <el-input class="mb-[10px]" readonly :value="wapPreview">
-          <template #append>
-            <el-button @click="copyEvent(wapPreview)">{{
-              t('copy')
-            }}</el-button>
-          </template>
-        </el-input>
-        <a class="text-primary" :href="wapImage" download>{{
-          t('downloadQrcode')
-        }}</a>
-      </div>
-    </div>
-  </el-dialog>
+    <el-dialog v-model="showDialog" :title="t('goodsCategorySpreadTitle')" width="500px" :destroy-on-close="true">
+
+        <div class="promote-flex flex">
+            <div class="promote-img flex justify-center items-center bg-[#f8f8f8] w-[150px] h-[150px]">
+                <el-image :src="wapImage" />
+            </div>
+
+            <div class="px-[20px] flex-1">
+                <div class="mb-[10px]">{{ t('spreadLink') }}</div>
+                <el-input class="mb-[10px]" readonly :value="wapPreview">
+                    <template #append>
+                        <el-button @click="copyEvent(wapPreview)">{{ t('copy') }}</el-button>
+                    </template>
+                </el-input>
+                <a class="text-primary" :href="wapImage" download>{{ t('downloadQrcode') }}</a>
+            </div>
+
+        </div>
+
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -47,67 +39,63 @@ const wapPreview = ref('')
 const page = ref('')
 
 getUrl().then((res: any) => {
-  wapUrl.value = res.data.wap_url
+    wapUrl.value = res.data.wap_url
 
-  // 生产模式禁止
-  if (import.meta.env.MODE == 'production') return
+    // 生产模式禁止
+    if (import.meta.env.MODE == 'production') return
 
-  wapDomain.value = res.data.wap_domain
+    wapDomain.value = res.data.wap_domain
 
-  // env文件配置过wap域名
-  if (wapDomain.value) {
-    wapUrl.value = wapDomain.value + '/wap'
-  }
+    // env文件配置过wap域名
+    if (wapDomain.value) {
+        wapUrl.value = wapDomain.value + '/wap'
+    }
 
-  const wapDomainStorage = storage.get('wap_domain')
-  if (wapDomainStorage) {
-    wapUrl.value = wapDomainStorage
-  }
+    const wapDomainStorage = storage.get('wap_domain')
+    if (wapDomainStorage) {
+        wapUrl.value = wapDomainStorage
+    }
 })
 
 const loadQrcode = () => {
-  wapPreview.value = `${wapUrl.value}${page.value}`
-  // errorCorrectionLevel：密度容错率L（低）H(高)
-  QRCode.toDataURL(wapPreview.value, {
-    errorCorrectionLevel: 'L',
-    margin: 0,
-    width: 120,
-  }).then((url) => {
-    wapImage.value = url
-  })
+    wapPreview.value = `${wapUrl.value}${page.value}`
+    // errorCorrectionLevel：密度容错率L（低）H(高)
+    QRCode.toDataURL(wapPreview.value, { errorCorrectionLevel: 'L', margin: 0, width: 120 }).then(url => {
+        wapImage.value = url
+    })
 }
 
 const show = (data: any) => {
-  Object.assign(goods, data)
-  page.value = `/addon/shop/pages/goods/list?curr_goods_category=${goods.category_id}`
-  loadQrcode()
-  showDialog.value = true
+    Object.assign(goods, data)
+    page.value = `/addon/shop/pages/goods/list?curr_goods_category=${goods.category_id}`
+    loadQrcode()
+    showDialog.value = true
 }
 
 // 复制
 const { copy, isSupported, copied } = useClipboard()
 const copyEvent = (text: string) => {
-  if (!isSupported.value) {
-    ElMessage({
-      message: t('notSupportCopy'),
-      type: 'warning',
-    })
-  }
-  copy(text)
+    if (!isSupported.value) {
+        ElMessage({
+            message: t('notSupportCopy'),
+            type: 'warning'
+        })
+    }
+    copy(text)
 }
 
 watch(copied, () => {
-  if (copied.value) {
-    ElMessage({
-      message: t('copySuccess'),
-      type: 'success',
-    })
-  }
+    if (copied.value) {
+        ElMessage({
+            message: t('copySuccess'),
+            type: 'success'
+        })
+    }
 })
 
 defineExpose({
-  showDialog,
-  show,
+    showDialog,
+    show
 })
 </script>
 
diff --git a/admin/src/addon/shop/views/goods/components/goods-member-price-popup.vue b/admin/src/addon/shop/views/goods/components/goods-member-price-popup.vue
index ce3ab67c..e9a17350 100644
--- a/admin/src/addon/shop/views/goods/components/goods-member-price-popup.vue
+++ b/admin/src/addon/shop/views/goods/components/goods-member-price-popup.vue
@@ -1,175 +1,84 @@
 <template>
-  <div>
-    <el-dialog
-      v-model="showDialog"
-      :title="t('editMemberPricePopupTitle')"
-      width="1100px"
-      :close-on-press-escape="false"
-      :destroy-on-close="true"
-      :close-on-click-modal="false"
-    >
-      <el-form :model="formData" label-width="120px" class="page-form">
-        <el-form-item :label="t('memberDiscount')">
-          <div>
-            <el-radio-group v-model="formData.member_discount">
-              <el-radio label="">{{ t('nonparticipation') }}</el-radio>
-              <el-radio label="discount">{{ t('discount') }}</el-radio>
-              <el-radio label="fixed_price">{{ t('fixedPrice') }}</el-radio>
-            </el-radio-group>
-            <div
-              class="text-[12px] text-[#999] leading-[20px]"
-              v-if="formData.member_discount == 'discount'"
-            >
-              {{ t('discountHint') }}
-            </div>
-            <div
-              class="text-[12px] text-[#999] leading-[20px]"
-              v-if="formData.member_discount == 'fixed_price'"
-            >
-              {{ t('fixedPriceHint') }}
-            </div>
-          </div>
-        </el-form-item>
-        <el-form-item
-          v-if="
-            formData.member_discount == 'discount' && memberDiscountLevel.length
-          "
-        >
-          <el-table
-            :data="[{}]"
-            size="large"
-            v-loading="tableData.loading"
-            max-height="450"
-            @selection-change="handleSelectionChange"
-          >
-            <template #empty>
-              <span>{{ !tableData.loading ? t('emptyData') : '' }}</span>
-            </template>
-            <el-table-column
-              fixed
-              prop="sku_name"
-              :label="t('memberLevel')"
-              width="150"
-            >
-              <template #default>
-                {{ t('memberEnjoyDiscount') }}
-              </template>
-            </el-table-column>
-            <el-table-column
-              v-for="(item, index) in memberDiscountLevel"
-              :key="index"
-              :label="item.level_name"
-            >
-              <template #default="{ row }">
-                {{ item.level_benefits.discount.discount }}
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-form-item>
-        <el-form-item v-if="formData.member_discount == 'fixed_price'">
-          <div class="mb-[10px] flex items-center">
-            <el-checkbox
-              v-model="toggleCheckbox"
-              @change="toggleChange"
-              size="large"
-              class="px-[14px]"
-              :indeterminate="isIndeterminate"
-            />
-            <el-button
-              v-for="(item, index) in tableData.member_level"
-              :key="index"
-              size="small"
-              @click="batchGoodsBtn(item.level_id)"
-            >
-              {{ item.level_name }}
-            </el-button>
-          </div>
-          <el-table
-            :data="tableData.data"
-            size="large"
-            v-loading="tableData.loading"
-            max-height="450"
-            @selection-change="handleSelectionChange"
-            ref="goodsListTableRef"
-          >
-            <template #empty>
-              <span>{{ !tableData.loading ? t('emptyData') : '' }}</span>
-            </template>
-            <el-table-column type="selection" width="55" />
-            <el-table-column
-              fixed
-              prop="sku_name"
-              :label="t('goodsSku')"
-              width="150"
-            />
-            <el-table-column
-              fixed
-              prop="price"
-              :label="t('skuPrice')"
-              width="120"
-            />
-            <el-table-column
-              v-for="(item, index) in tableData.member_level"
-              :key="index"
-              :label="item.level_name"
-              width="190"
-            >
-              <template #default="{ row }">
-                <el-input
-                  v-model.trim="row[`level_${item.level_id}`]"
-                  maxlength="8"
-                  clearable
-                  class="w-full"
-                  @keyup="filterDigit($event)"
-                >
-                  <template #append>{{ t('yuanUnit') }}</template>
-                </el-input>
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-form-item>
-      </el-form>
+    <div>
+        <el-dialog v-model="showDialog" :title="t('editMemberPricePopupTitle')" width="1100px" :close-on-press-escape="false" :destroy-on-close="true" :close-on-click-modal="false">
 
-      <el-dialog
-        v-model="memberPriceDialog"
-        :title="t('editMemberPrice')"
-        width="400px"
-        :close-on-press-escape="false"
-        :destroy-on-close="true"
-        :close-on-click-modal="false"
-      >
-        <el-form :model="formData" label-width="80px" class="page-form">
-          <el-form-item :label="t('memberPrice')" prop="member_price">
-            <el-input
-              v-model.trim="memberPrice"
-              :placeholder="t('memberPricePlaceholder')"
-              maxlength="8"
-              clearable
-              @keyup="filterDigit($event)"
-            />
-          </el-form-item>
-        </el-form>
+            <el-form :model="formData" label-width="120px" class="page-form">
+                <el-form-item :label="t('memberDiscount')">
+                    <div>
+                        <el-radio-group v-model="formData.member_discount">
+                            <el-radio label="">{{ t('nonparticipation') }}</el-radio>
+                            <el-radio label="discount">{{ t('discount') }}</el-radio>
+                            <el-radio label="fixed_price">{{ t('fixedPrice') }}</el-radio>
+                        </el-radio-group>
+                        <div class="text-[12px] text-[#999] leading-[20px]" v-if="formData.member_discount == 'discount'">{{t('discountHint')}}</div>
+                        <div class="text-[12px] text-[#999] leading-[20px]" v-if="formData.member_discount == 'fixed_price'">{{t('fixedPriceHint')}}</div>
+                    </div>
+                </el-form-item>
+                <el-form-item v-if="formData.member_discount == 'discount' && memberDiscountLevel.length">
+                    <el-table :data="[{}]" size="large" v-loading="tableData.loading" max-height="450" @selection-change="handleSelectionChange">
+                        <template #empty>
+                            <span>{{ !tableData.loading ? t('emptyData') : '' }}</span>
+                        </template>
+                        <el-table-column fixed prop="sku_name" :label="t('memberLevel')" width="150" >
+                            <template #default>
+                                {{t('memberEnjoyDiscount')}}
+                            </template>
+                        </el-table-column>
+                        <el-table-column v-for="(item,index) in memberDiscountLevel" :key="index" :label="item.level_name">
+                            <template #default="{ row }">
+                                {{item.level_benefits.discount.discount}}
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </el-form-item>
+                <el-form-item v-if="formData.member_discount == 'fixed_price'">
+                    <div class="mb-[10px] flex items-center">
+                        <el-checkbox v-model="toggleCheckbox"  @change="toggleChange" size="large" class="px-[14px]" :indeterminate="isIndeterminate" />
+                        <el-button v-for="(item,index) in tableData.member_level" :key="index" size="small" @click="batchGoodsBtn(item.level_id)">
+                            {{item.level_name}}
+                        </el-button>
+                    </div>
+                    <el-table :data="tableData.data" size="large" v-loading="tableData.loading" max-height="450" @selection-change="handleSelectionChange" ref="goodsListTableRef">
+                        <template #empty>
+                            <span>{{ !tableData.loading ? t('emptyData') : '' }}</span>
+                        </template>
+                        <el-table-column type="selection" width="55" />
+                        <el-table-column fixed prop="sku_name" :label="t('goodsSku')" width="150" />
+                        <el-table-column fixed prop="price" :label="t('skuPrice')" width="120" />
+                        <el-table-column v-for="(item,index) in tableData.member_level" :key="index" :label="item.level_name" width="190">
+                            <template #default="{ row }">
+                                <el-input v-model.trim="row[`level_${item.level_id}`]" maxlength="8" clearable class="w-full"  @keyup="filterDigit($event)">
+                                    <template #append>{{t('yuanUnit')}}</template>
+                                </el-input>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </el-form-item>
+            </el-form>
 
-        <template #footer>
-          <span class="dialog-footer">
-            <el-button @click="memberPriceDialog = false">{{
-              t('cancel')
-            }}</el-button>
-            <el-button type="primary" @click="memberPriceSave">{{
-              t('confirm')
-            }}</el-button>
-          </span>
-        </template>
-      </el-dialog>
+            <el-dialog v-model="memberPriceDialog" :title="t('editMemberPrice')" width="400px" :close-on-press-escape="false" :destroy-on-close="true" :close-on-click-modal="false">
+                <el-form :model="formData" label-width="80px" class="page-form">
+                    <el-form-item :label="t('memberPrice')"  prop="member_price">
+                        <el-input v-model.trim="memberPrice" :placeholder="t('memberPricePlaceholder')" maxlength="8" clearable  @keyup="filterDigit($event)" />
+                    </el-form-item>
+                </el-form>
 
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-          <el-button type="primary" @click="save">{{ t('confirm') }}</el-button>
-        </span>
-      </template>
-    </el-dialog>
-  </div>
+                <template #footer>
+                    <span class="dialog-footer">
+                        <el-button @click="memberPriceDialog = false">{{ t('cancel') }}</el-button>
+                        <el-button type="primary" @click="memberPriceSave">{{ t('confirm') }}</el-button>
+                    </span>
+                </template>
+            </el-dialog>
+
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                    <el-button type="primary" @click="save">{{ t('confirm') }}</el-button>
+                </span>
+            </template>
+        </el-dialog>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -179,13 +88,13 @@ import { img, deepClone, filterDigit } from '@/utils/common'
 import { ElMessage } from 'element-plus'
 
 import {
-  getGoodsSkuList,
-  editGoodsListMemberPrice,
+    getGoodsSkuList,
+    editGoodsListMemberPrice
 } from '@/addon/shop/api/goods'
 
 const goodsListTableRef = ref()
 const formData: any = reactive({
-  member_discount: '',
+    member_discount: ''
 })
 const goods: any = reactive({})
 const showDialog = ref(false)
@@ -194,90 +103,73 @@ const memberPrice = ref('') // 会员价
 const emit = defineEmits(['load'])
 
 const tableData = reactive({
-  loading: true,
-  data: [],
-  member_level: [],
+    loading: true,
+    data: [],
+    member_level: []
 })
 /**
  * 获取商品列表
  */
 const loadGoodsList = () => {
-  tableData.loading = true
+    tableData.loading = true
 
-  getGoodsSkuList({
-    goods_id: goods.goods_id,
-  })
-    .then((res) => {
-      tableData.loading = false
-      tableData.data = res.data
-      tableData.data.forEach((item: any, index, Array: any) => {
-        // 针对于单规格是，sku_name为空就展示商品名称
-        if (!item.sku_name) {
-          Array[index].sku_name = goods.goods_name
-        }
-        // 处理商品的会员价
-        tableData.member_level.forEach((levelItem: any, levelIndex) => {
-          if (!item.member_price) {
-            Array[index][`level_${levelItem.level_id}`] = parseFloat(
-              item.price
-            ).toFixed(2)
-          } else if (item.member_price) {
-            const memberPrice = JSON.parse(item.member_price)
-            if (memberPrice[`level_${levelItem.level_id}`]) {
-              Array[index][`level_${levelItem.level_id}`] = parseFloat(
-                memberPrice[`level_${levelItem.level_id}`]
-              ).toFixed(2)
-            } else {
-              Array[index][`level_${levelItem.level_id}`] = parseFloat(
-                item.price
-              ).toFixed(2)
+    getGoodsSkuList({
+        goods_id: goods.goods_id
+    }).then(res => {
+        tableData.loading = false
+        tableData.data = res.data
+        tableData.data.forEach((item: any, index, Array: any) => {
+            // 针对于单规格是，sku_name为空就展示商品名称
+            if (!item.sku_name) {
+                Array[index].sku_name = goods.goods_name
             }
-          }
+            // 处理商品的会员价
+            tableData.member_level.forEach((levelItem: any, levelIndex) => {
+                if (!item.member_price) {
+                    Array[index][`level_${levelItem.level_id}`] = parseFloat(item.price).toFixed(2)
+                } else if (item.member_price) {
+                    const memberPrice = JSON.parse(item.member_price)
+                    if (memberPrice[`level_${levelItem.level_id}`]) {
+                        Array[index][`level_${levelItem.level_id}`] = parseFloat(memberPrice[`level_${levelItem.level_id}`]).toFixed(2)
+                    } else {
+                        Array[index][`level_${levelItem.level_id}`] = parseFloat(item.price).toFixed(2)
+                    }
+                }
+            })
         })
-      })
-    })
-    .catch(() => {
-      tableData.loading = false
+    }).catch(() => {
+        tableData.loading = false
     })
 }
 
 // 用于会员折扣展示
-const memberDiscountLevel: any = ref([])
+const memberDiscountLevel:any = ref([])
 const show = (data: any, levelData: any) => {
-  Object.assign(goods, data)
-  tableData.member_level = []
-  Object.assign(tableData.member_level, levelData)
-  formData.member_discount = data.member_discount
+    Object.assign(goods, data)
+    tableData.member_level = []
+    Object.assign(tableData.member_level, levelData)
+    formData.member_discount = data.member_discount
 
-  memberDiscountLevel.value = deepClone(levelData)
-  memberDiscountLevel.value.forEach((item: any, index: any, Array: any) => {
-    if (!item.level_benefits || item.level_benefits == null) {
-      Array[index].level_benefits = {
-        discount: {
-          discount: '原价',
-        },
-      }
-    } else if (
-      item.level_benefits &&
-      item.level_benefits != null &&
-      !item.level_benefits.discount
-    ) {
-      Array[index].level_benefits.discount = {
-        discount: '原价',
-      }
-    } else if (
-      item.level_benefits &&
-      item.level_benefits != null &&
-      item.level_benefits.discount &&
-      !item.level_benefits.discount.discount
-    ) {
-      Array[index].level_benefits.discount.discount = '原价'
-    } else {
-      Array[index].level_benefits.discount.discount += '折'
-    }
-  })
-  loadGoodsList()
-  showDialog.value = true
+    memberDiscountLevel.value = deepClone(levelData)
+    memberDiscountLevel.value.forEach((item: any, index: any, Array: any) => {
+        if (!item.level_benefits || item.level_benefits == null) {
+            Array[index].level_benefits = {
+                discount: {
+                    discount: '原价'
+                }
+            }
+        } else if (item.level_benefits && item.level_benefits != null && !item.level_benefits.discount) {
+            Array[index].level_benefits.discount = {
+                discount: '原价'
+            }
+        } else if (item.level_benefits && item.level_benefits != null && item.level_benefits.discount && !item.level_benefits.discount.discount) {
+            Array[index].level_benefits.discount.discount = '原价'
+        } else {
+            Array[index].level_benefits.discount.discount += '折'
+        }
+    })
+    loadGoodsList()
+    showDialog.value = true
 }
 
 /** ******* 批量复选框-start *************/
@@ -286,8 +178,8 @@ const toggleCheckbox = ref()
 const isIndeterminate = ref(false)
 // 监听批量复选框事件
 const toggleChange = (value: any) => {
-  isIndeterminate.value = false
-  goodsListTableRef.value.toggleAllSelection()
+    isIndeterminate.value = false
+    goodsListTableRef.value.toggleAllSelection()
 }
 
 // 选中数据
@@ -295,120 +187,105 @@ const multipleSelection: any = ref([])
 
 // 监听表格单行选中
 const handleSelectionChange = (val: []) => {
-  multipleSelection.value = deepClone(val)
+    multipleSelection.value = deepClone(val)
 
-  toggleCheckbox.value = false
-  if (
-    multipleSelection.value.length > 0 &&
-    multipleSelection.value.length < tableData.data.length
-  ) {
-    isIndeterminate.value = true
-  } else {
-    isIndeterminate.value = false
-  }
+    toggleCheckbox.value = false
+    if (multipleSelection.value.length > 0 && multipleSelection.value.length < tableData.data.length) {
+        isIndeterminate.value = true
+    } else {
+        isIndeterminate.value = false
+    }
 
-  if (multipleSelection.value.length == tableData.data.length) {
-    toggleCheckbox.value = true
-  }
+    if (multipleSelection.value.length == tableData.data.length) {
+        toggleCheckbox.value = true
+    }
 }
 
 // 按钮
 const currLevelId = ref('')
-const batchGoodsBtn = (level_id: any) => {
-  if (!multipleSelection.value.length) {
-    ElMessage({
-      message: '请选择要操作的商品',
-      type: 'warning',
-    })
-    return false
-  }
-  currLevelId.value = level_id
-  memberPriceDialog.value = true
+const batchGoodsBtn = (level_id:any) => {
+    if (!multipleSelection.value.length) {
+        ElMessage({
+            message: '请选择要操作的商品',
+            type: 'warning'
+        })
+        return false
+    }
+    currLevelId.value = level_id
+    memberPriceDialog.value = true
 }
 
 /** ******* 批量复选框-end *************/
 const memberPriceDialog = ref(false)
 const memberPriceSave = () => {
-  if (!memberPrice.value) {
-    ElMessage.error('请输入会员价')
-    return false
-  }
-
-  const idArr = multipleSelection.value.map((obj: any) => obj.sku_id)
-  tableData.data.forEach((item: any, index, Array: any) => {
-    if (idArr.indexOf(item.sku_id) > -1) {
-      Array[index][`level_${currLevelId.value}`] = parseFloat(
-        memberPrice.value
-      ).toFixed(2)
+    if (!memberPrice.value) {
+        ElMessage.error('请输入会员价')
+        return false
     }
-  })
 
-  memberPrice.value = ''
-  memberPriceDialog.value = false
+    const idArr = multipleSelection.value.map((obj: any) => obj.sku_id)
+    tableData.data.forEach((item: any, index, Array: any) => {
+        if (idArr.indexOf(item.sku_id) > -1) { Array[index][`level_${currLevelId.value}`] = parseFloat(memberPrice.value).toFixed(2) }
+    })
+
+    memberPrice.value = ''
+    memberPriceDialog.value = false
 }
 
 let saveLoad = false
 const save = () => {
-  const sku_list: any = []
-  let verify = true // 用于校验价格是否小于等于零或大于商品原价
-  if (formData.member_discount == 'fixed_price') {
-    tableData.data.forEach((item: any, index, Array) => {
-      const obj: any = {}
-      obj.sku_id = item.sku_id
-      obj.member_price = {}
-      tableData.member_level.forEach((levelItem: any, levelIndex) => {
-        if (verify) {
-          obj.member_price[`level_${levelItem.level_id}`] =
-            item[`level_${levelItem.level_id}`]
-          if (parseFloat(item[`level_${levelItem.level_id}`]) <= 0) {
-            verify = false
-            ElMessage.error(
-              `[${item.sku_name}][${levelItem.level_name}]的指定价格不能小于等于零`
-            )
-          }
-          if (
-            parseFloat(item[`level_${levelItem.level_id}`]) >
-            parseFloat(item.price)
-          ) {
-            verify = false
-            ElMessage.error(
-              `[${item.sku_name}][${levelItem.level_name}]的指定价格不能大于商品原价`
-            )
-          }
-        }
-      })
-      sku_list.push(obj)
-    })
+    const sku_list: any = []
+    let verify = true // 用于校验价格是否小于等于零或大于商品原价
+    if (formData.member_discount == 'fixed_price') {
+        tableData.data.forEach((item: any, index, Array) => {
+            const obj: any = {}
+            obj.sku_id = item.sku_id
+            obj.member_price = {}
+            tableData.member_level.forEach((levelItem: any, levelIndex) => {
+                if (verify) {
+                    obj.member_price[`level_${levelItem.level_id}`] = item[`level_${levelItem.level_id}`]
+                    if (parseFloat(item[`level_${levelItem.level_id}`]) <= 0) {
+                        verify = false
+                        ElMessage.error(`[${item.sku_name}][${levelItem.level_name}]的指定价格不能小于等于零`)
+                    }
+                    if (parseFloat(item[`level_${levelItem.level_id}`]) > parseFloat(item.price)) {
+                        verify = false
+                        ElMessage.error(`[${item.sku_name}][${levelItem.level_name}]的指定价格不能大于商品原价`)
+                    }
+                }
+            })
+            sku_list.push(obj)
+        })
 
-    if (!verify) return false
-  }
+        if (!verify) return false
+    }
 
-  if (saveLoad) return false
-  saveLoad = true
+    if (saveLoad) return false
+    saveLoad = true
 
-  editGoodsListMemberPrice({
-    goods_id: goods.goods_id,
-    member_discount: formData.member_discount,
-    sku_list,
-  }).then((res) => {
-    saveLoad = false
-    emit('load')
-    showDialog.value = false
-  })
+    editGoodsListMemberPrice({
+        goods_id: goods.goods_id,
+        member_discount: formData.member_discount,
+        sku_list
+    }).then(res => {
+        saveLoad = false
+        emit('load')
+        showDialog.value = false
+    })
 }
 
 defineExpose({
-  showDialog,
-  show,
+    showDialog,
+    show
 })
 </script>
 
 <style lang="scss" scoped>
 .form-item-wrap {
-  margin-right: 10px !important;
+    margin-right: 10px !important;
 
-  &.last-child {
-    margin-right: 0 !important;
-  }
+    &.last-child {
+        margin-right: 0 !important;
+    }
 }
 </style>
diff --git a/admin/src/addon/shop/views/goods/components/goods-price-edit-popup.vue b/admin/src/addon/shop/views/goods/components/goods-price-edit-popup.vue
index 89c205bd..85382eb3 100644
--- a/admin/src/addon/shop/views/goods/components/goods-price-edit-popup.vue
+++ b/admin/src/addon/shop/views/goods/components/goods-price-edit-popup.vue
@@ -1,152 +1,74 @@
 <template>
-  <div>
-    <el-dialog
-      v-model="showDialog"
-      :title="t('editPricePopupTitle')"
-      width="800px"
-      :close-on-press-escape="false"
-      :destroy-on-close="true"
-      :close-on-click-modal="false"
-    >
-      <div class="flex items-center mb-[10px]">
-        <div class="min-w-[70px] h-[70px] flex items-center justify-center">
-          <el-image
-            v-if="goods.goods_cover_thumb_small"
-            class="w-[70px] h-[70px]"
-            :src="img(goods.goods_cover_thumb_small)"
-            fit="contain"
-          >
-            <template #error>
-              <div class="image-slot">
-                <img
-                  class="w-[70px] h-[70px]"
-                  src="@/addon/shop/assets/goods_default.png"
-                />
-              </div>
+    <div>
+        <el-dialog v-model="showDialog" :title="t('editPricePopupTitle')" width="800px" :close-on-press-escape="false" :destroy-on-close="true" :close-on-click-modal="false">
+
+            <div class="flex items-center mb-[10px]">
+                <div class="min-w-[70px] h-[70px] flex items-center justify-center">
+                    <el-image v-if="goods.goods_cover_thumb_small" class="w-[70px] h-[70px]" :src="img(goods.goods_cover_thumb_small)" fit="contain">
+                        <template #error>
+                            <div class="image-slot">
+                                <img class="w-[70px] h-[70px]" src="@/addon/shop/assets/goods_default.png" />
+                            </div>
+                        </template>
+                    </el-image>
+                    <img v-else class="w-[70px] h-[70px]" src="@/addon/shop/assets/goods_default.png" fit="contain" />
+                </div>
+                <div class="ml-2">
+                    <span :title="goods.goods_name" class="multi-hidden">{{ goods.goods_name }}</span>
+                    <span class="text-primary text-[12px]">{{ goods.goods_type_name }}</span>
+                </div>
+            </div>
+
+            <!-- 批量设置 -->
+            <div class="batch-operation-sku" v-if="goodsTable.data.length > 1">
+                <label>{{ t('batchOperationSku') }}</label>
+
+                <div v-if="batchOperation.field">
+                    <el-input v-model.trim="batchOperation.value" clearable :placeholder="t(batchOperation.field)" class="set-input" maxlength="8" :autofocus="true" />
+                    <el-button type="primary" @click="saveBatch">{{ t('confirm') }}</el-button>
+                    <el-button @click="clearBatch">{{ t('cancel') }}</el-button>
+                </div>
+                <div v-else>
+                    <el-button type="primary" link @click="setBatchField('price')" v-if="activeGoodsCount == 0">{{ t('price') }}</el-button>
+                    <el-button type="primary" link @click="setBatchField('market_price')">{{ t('marketPrice') }}</el-button>
+                    <el-button type="primary" link @click="setBatchField('cost_price')">{{ t('costPrice') }}</el-button>
+                </div>
+            </div>
+
+            <el-table :data="goodsTable.data" size="large" v-loading="goodsTable.loading" max-height="400">
+                <template #empty>
+                    <span>{{ !goodsTable.loading ? t('emptyData') : '' }}</span>
+                </template>
+
+                <el-table-column prop="sku_name" :label="t('skuName')" min-width="120" v-if="goodsTable.data.length > 1" />
+                <el-table-column prop="price" :label="t('price')" min-width="120">
+                    <template #default="{ row }">
+                        <el-input v-model.trim="row.price" clearable placeholder="0.00" maxlength="8" :disabled="activeGoodsCount > 0" />
+                    </template>
+                </el-table-column>
+
+                <el-table-column prop="market_price" :label="t('marketPrice')" min-width="120">
+                    <template #default="{ row }">
+                        <el-input v-model.trim="row.market_price" clearable placeholder="0.00" maxlength="8" />
+                    </template>
+                </el-table-column>
+
+                <el-table-column prop="cost_price" :label="t('costPrice')" min-width="120">
+                    <template #default="{ row }">
+                        <el-input v-model.trim="row.cost_price" clearable placeholder="0.00" maxlength="8" />
+                    </template>
+                </el-table-column>
+
+            </el-table>
+
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                    <el-button type="primary" @click="save">{{ t('confirm') }}</el-button>
+                </span>
             </template>
-          </el-image>
-          <img
-            v-else
-            class="w-[70px] h-[70px]"
-            src="@/addon/shop/assets/goods_default.png"
-            fit="contain"
-          />
-        </div>
-        <div class="ml-2">
-          <span :title="goods.goods_name" class="multi-hidden">{{
-            goods.goods_name
-          }}</span>
-          <span class="text-primary text-[12px]">{{
-            goods.goods_type_name
-          }}</span>
-        </div>
-      </div>
-
-      <!-- 批量设置 -->
-      <div class="batch-operation-sku" v-if="goodsTable.data.length > 1">
-        <label>{{ t('batchOperationSku') }}</label>
-
-        <div v-if="batchOperation.field">
-          <el-input
-            v-model.trim="batchOperation.value"
-            clearable
-            :placeholder="t(batchOperation.field)"
-            class="set-input"
-            maxlength="8"
-            :autofocus="true"
-          />
-          <el-button type="primary" @click="saveBatch">{{
-            t('confirm')
-          }}</el-button>
-          <el-button @click="clearBatch">{{ t('cancel') }}</el-button>
-        </div>
-        <div v-else>
-          <el-button
-            type="primary"
-            link
-            @click="setBatchField('price')"
-            v-if="activeGoodsCount == 0"
-            >{{ t('price') }}</el-button
-          >
-          <el-button
-            type="primary"
-            link
-            @click="setBatchField('market_price')"
-            >{{ t('marketPrice') }}</el-button
-          >
-          <el-button type="primary" link @click="setBatchField('cost_price')">{{
-            t('costPrice')
-          }}</el-button>
-        </div>
-      </div>
-
-      <el-table
-        :data="goodsTable.data"
-        size="large"
-        v-loading="goodsTable.loading"
-        max-height="400"
-      >
-        <template #empty>
-          <span>{{ !goodsTable.loading ? t('emptyData') : '' }}</span>
-        </template>
-
-        <el-table-column
-          prop="sku_name"
-          :label="t('skuName')"
-          min-width="120"
-          v-if="goodsTable.data.length > 1"
-        />
-        <el-table-column prop="price" :label="t('price')" min-width="120">
-          <template #default="{ row }">
-            <el-input
-              v-model.trim="row.price"
-              clearable
-              placeholder="0.00"
-              maxlength="8"
-              :disabled="activeGoodsCount > 0"
-            />
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          prop="market_price"
-          :label="t('marketPrice')"
-          min-width="120"
-        >
-          <template #default="{ row }">
-            <el-input
-              v-model.trim="row.market_price"
-              clearable
-              placeholder="0.00"
-              maxlength="8"
-            />
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          prop="cost_price"
-          :label="t('costPrice')"
-          min-width="120"
-        >
-          <template #default="{ row }">
-            <el-input
-              v-model.trim="row.cost_price"
-              clearable
-              placeholder="0.00"
-              maxlength="8"
-            />
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-          <el-button type="primary" @click="save">{{ t('confirm') }}</el-button>
-        </span>
-      </template>
-    </el-dialog>
-  </div>
+        </el-dialog>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -156,9 +78,9 @@ import { img } from '@/utils/common'
 import { ElMessage } from 'element-plus'
 
 import {
-  getActiveGoodsCount,
-  getGoodsSkuList,
-  editGoodsListPrice,
+    getActiveGoodsCount,
+    getGoodsSkuList,
+    editGoodsListPrice
 } from '@/addon/shop/api/goods'
 
 const goods: any = reactive({})
@@ -169,208 +91,206 @@ const showDialog = ref(false)
 const emit = defineEmits(['load'])
 
 const goodsTable = reactive({
-  loading: true,
-  data: [],
+    loading: true,
+    data: []
 })
 
 const batchOperation: any = reactive({
-  field: '', // 当前编辑的字段
-  value: '', // 输入值
+    field: '', // 当前编辑的字段
+    value: '' // 输入值
 })
 
 const setBatchField = (value: string, regexp: string) => {
-  batchOperation.field = value
-  batchOperation.value = ''
+    batchOperation.field = value
+    batchOperation.value = ''
 }
 
 const clearBatch = () => {
-  batchOperation.field = ''
-  batchOperation.value = ''
+    batchOperation.field = ''
+    batchOperation.value = ''
 }
 
 const saveBatch = () => {
-  if (batchOperation.value.length == 0) {
-    ElMessage({
-      type: 'warning',
-      message: `${t(batchOperation.field + 'Placeholder')}`,
-    })
-    return
-  }
+    if (batchOperation.value.length == 0) {
+        ElMessage({
+            type: 'warning',
+            message: `${t(batchOperation.field + 'Placeholder')}`
+        })
+        return
+    }
 
-  if (!regExp.digit.test(batchOperation.value)) {
-    ElMessage({
-      type: 'warning',
-      message: `${t(batchOperation.field + 'Tips')}`,
-    })
-    return
-  }
+    if (!regExp.digit.test(batchOperation.value)) {
+        ElMessage({
+            type: 'warning',
+            message: `${t(batchOperation.field + 'Tips')}`
+        })
+        return
+    }
 
-  if (batchOperation.value < 0) {
-    ElMessage({
-      type: 'warning',
-      message: `${t(batchOperation.field + 'NotZeroTips')}`,
-    })
-    return
-  }
+    if (batchOperation.value < 0) {
+        ElMessage({
+            type: 'warning',
+            message: `${t(batchOperation.field + 'NotZeroTips')}`
+        })
+        return
+    }
 
-  goodsTable.data.forEach((item: any) => {
-    item[batchOperation.field] = batchOperation.value
-  })
+    goodsTable.data.forEach((item: any) => {
+        item[batchOperation.field] = batchOperation.value
+    })
 
-  clearBatch()
+    clearBatch()
 }
 
 /**
  * 获取商品列表
  */
 const loadGoodsList = () => {
-  goodsTable.loading = true
-
-  getGoodsSkuList({
-    goods_id: goods.goods_id,
-  })
-    .then((res) => {
-      goodsTable.loading = false
-      goodsTable.data = res.data
-    })
-    .catch(() => {
-      goodsTable.loading = false
+    goodsTable.loading = true
+
+    getGoodsSkuList({
+        goods_id: goods.goods_id
+    }).then(res => {
+        goodsTable.loading = false
+        goodsTable.data = res.data
+    }).catch(() => {
+        goodsTable.loading = false
     })
 }
 
 const show = (data: any) => {
-  Object.assign(goods, data)
-  getActiveGoodsCountFn()
-  loadGoodsList()
-  showDialog.value = true
+    Object.assign(goods, data)
+    getActiveGoodsCountFn();
+    loadGoodsList()
+    showDialog.value = true
 }
 
-const getActiveGoodsCountFn = () => {
-  getActiveGoodsCount({
-    goods_id: goods.goods_id,
-  }).then((res) => {
-    activeGoodsCount.value = res.data
-  })
+const getActiveGoodsCountFn = ()=>{
+    getActiveGoodsCount({
+        goods_id: goods.goods_id
+    }).then((res)=>{
+        activeGoodsCount.value = res.data;
+    })
 }
 
 // 正则表达式
 const regExp: any = {
-  digit: /^\d{0,10}(.?\d{0,2})$/,
+    digit: /^\d{0,10}(.?\d{0,2})$/
 }
 
 const verify = () => {
-  let result = true
-  for (let i = 0; i < goodsTable.data.length; i++) {
-    const item: any = goodsTable.data[i]
-
-    if (isNaN(item.price) || !regExp.digit.test(item.price)) {
-      result = false
-      ElMessage({
-        type: 'warning',
-        message: `${t('priceTips')}`,
-      })
-      break
-    } else if (item.price < 0) {
-      result = false
-      ElMessage({
-        type: 'warning',
-        message: `${t('priceNotZeroTips')}`,
-      })
-      break
-    }
-
-    if (isNaN(item.market_price) || !regExp.digit.test(item.market_price)) {
-      result = false
-      ElMessage({
-        type: 'warning',
-        message: `${t('marketPriceTips')}`,
-      })
-      break
-    } else if (item.market_price < 0) {
-      result = false
-      ElMessage({
-        type: 'warning',
-        message: `${t('marketPriceNotZeroTips')}`,
-      })
-      break
-    }
-
-    if (isNaN(item.cost_price) || !regExp.digit.test(item.cost_price)) {
-      result = false
-      ElMessage({
-        type: 'warning',
-        message: `${t('costPriceTips')}`,
-      })
-      break
-    } else if (item.cost_price < 0) {
-      result = false
-      ElMessage({
-        type: 'warning',
-        message: `${t('costPriceNotZeroTips')}`,
-      })
-      break
+    let result = true
+    for (let i = 0; i < goodsTable.data.length; i++) {
+        const item:any = goodsTable.data[i]
+
+        if (isNaN(item.price) || !regExp.digit.test(item.price)) {
+            result = false
+            ElMessage({
+                type: 'warning',
+                message: `${t('priceTips')}`
+            })
+            break
+        } else if (item.price < 0) {
+            result = false
+            ElMessage({
+                type: 'warning',
+                message: `${t('priceNotZeroTips')}`
+            })
+            break
+        }
+
+        if (isNaN(item.market_price) || !regExp.digit.test(item.market_price)) {
+            result = false
+            ElMessage({
+                type: 'warning',
+                message: `${t('marketPriceTips')}`
+            })
+            break
+        } else if (item.market_price < 0) {
+            result = false
+            ElMessage({
+                type: 'warning',
+                message: `${t('marketPriceNotZeroTips')}`
+            })
+            break
+        }
+
+        if (isNaN(item.cost_price) || !regExp.digit.test(item.cost_price)) {
+            result = false
+            ElMessage({
+                type: 'warning',
+                message: `${t('costPriceTips')}`
+            })
+            break
+        } else if (item.cost_price < 0) {
+            result = false
+            ElMessage({
+                type: 'warning',
+                message: `${t('costPriceNotZeroTips')}`
+            })
+            break
+        }
     }
-  }
 
-  return result
+    return result
 }
 
 const save = () => {
-  if (verify()) {
-    let sku_list = <any>[]
-    goodsTable.data.forEach((item: any) => {
-      sku_list.push({
-        sku_id: item.sku_id,
-        price: item.price,
-        market_price: item.market_price,
-        cost_price: item.cost_price,
-      })
-    })
-    editGoodsListPrice({
-      goods_id: goods.goods_id,
-      sku_list,
-    }).then((res) => {
-      emit('load')
-      showDialog.value = false
-    })
-  }
+    if (verify()) {
+        let sku_list = <any>[]
+        goodsTable.data.forEach((item: any) => {
+            sku_list.push({
+                sku_id: item.sku_id,
+                price: item.price,
+                market_price: item.market_price,
+                cost_price: item.cost_price
+            })
+        })
+        editGoodsListPrice({
+            goods_id: goods.goods_id,
+            sku_list
+        }).then(res => {
+            emit('load');
+            showDialog.value = false
+        })
+    }
 }
 
 defineExpose({
-  showDialog,
-  show,
+    showDialog,
+    show
 })
 </script>
 
 <style lang="scss" scoped>
 .form-item-wrap {
-  margin-right: 10px !important;
+    margin-right: 10px !important;
 
-  &.last-child {
-    margin-right: 0 !important;
-  }
+    &.last-child {
+        margin-right: 0 !important;
+    }
 }
 
 .batch-operation-sku {
-  display: flex;
-  margin-bottom: 16px;
-  background-color: #ffffff;
-  -ms-flex-wrap: nowrap;
-  flex-wrap: nowrap;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-
-  label {
-    font-size: 14px;
-    margin-right: 10px;
-    height: 20px;
-  }
-
-  .set-input {
-    max-width: 150px;
-    min-width: 60px;
-    margin-right: 10px;
-  }
+    display: flex;
+    margin-bottom: 16px;
+    background-color: #ffffff;
+    -ms-flex-wrap: nowrap;
+    flex-wrap: nowrap;
+    -webkit-box-align: center;
+    -ms-flex-align: center;
+    align-items: center;
+
+    label {
+        font-size: 14px;
+        margin-right: 10px;
+        height: 20px;
+    }
+
+    .set-input {
+        max-width: 150px;
+        min-width: 60px;
+        margin-right: 10px;
+    }
 }
 </style>
diff --git a/admin/src/addon/shop/views/goods/components/goods-select-popup.vue b/admin/src/addon/shop/views/goods/components/goods-select-popup.vue
index e333830f..8e29ee7b 100644
--- a/admin/src/addon/shop/views/goods/components/goods-select-popup.vue
+++ b/admin/src/addon/shop/views/goods/components/goods-select-popup.vue
@@ -1,349 +1,193 @@
 <template>
-  <div>
-    <div @click="show">
-      <slot>
-        <el-button>{{ t('goodsSelectPopupSelectGoodsButton') }}</el-button>
-        <div
-          class="inline-block ml-[10px] text-[14px]"
-          v-show="goodsIds.length"
-        >
-          <span>{{ t('goodsSelectPopupSelect') }}</span>
-          <span class="text-primary mx-[2px]">{{ goodsIds.length }}</span>
-          <span>{{ t('goodsSelectPopupPiece') }}</span>
-        </div>
-      </slot>
-    </div>
-    <el-dialog
-      v-model="showDialog"
-      :title="t('goodsSelectPopupSelectGoodsDialog')"
-      width="1000px"
-      :close-on-press-escape="false"
-      :destroy-on-close="true"
-      :close-on-click-modal="false"
-    >
-      <el-form
-        :inline="true"
-        :model="goodsTable.searchParam"
-        ref="searchFormRef"
-      >
-        <el-form-item prop="select_type" class="form-item-wrap">
-          <el-select
-            v-model="goodsTable.searchParam.select_type"
-            @change="handleSelectTypeChange"
-          >
-            <el-option :label="t('goodsSelectPopupAllGoods')" value="all" />
-            <el-option
-              :label="t('goodsSelectPopupSelectedGoods')"
-              value="selected"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item
-          :label="t('goodsSelectPopupGoodsName')"
-          prop="keyword"
-          class="form-item-wrap"
-        >
-          <el-input
-            v-model.trim="goodsTable.searchParam.keyword"
-            :placeholder="t('goodsSelectPopupGoodsNamePlaceholder')"
-            maxlength="60"
-          />
-        </el-form-item>
-        <el-form-item
-          :label="t('goodsSelectPopupGoodsCategory')"
-          prop="goods_category"
-          class="form-item-wrap"
-        >
-          <el-cascader
-            v-model="goodsTable.searchParam.goods_category"
-            :options="goodsCategoryOptions"
-            :placeholder="t('goodsSelectPopupGoodsCategoryPlaceholder')"
-            clearable
-            :props="{ value: 'value', label: 'label', emitPath: false }"
-          />
-        </el-form-item>
-        <el-form-item
-          :label="t('goodsSelectPopupGoodsType')"
-          prop="goods_type"
-          class="form-item-wrap"
-        >
-          <el-select
-            v-model="goodsTable.searchParam.goods_type"
-            :placeholder="t('goodsSelectPopupGoodsTypePlaceholder')"
-            clearable
-          >
-            <el-option
-              v-for="item in goodsType"
-              :key="item.type"
-              :label="item.name"
-              :value="item.type"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item class="form-item-wrap">
-          <el-button type="primary" @click="loadGoodsList()">{{
-            t('search')
-          }}</el-button>
-          <el-button @click="resetForm(searchFormRef)">{{
-            t('reset')
-          }}</el-button>
-        </el-form-item>
-      </el-form>
-
-      <div class="table w-[100%]" v-loading="goodsTable.loading">
-        <div class="table-head flex items-center bg-[#f5f7f9] py-[8px]">
-          <div class="w-[3%]"></div>
-          <div class="w-[7%]">
-            <el-checkbox
-              v-model="staircheckAll"
-              :indeterminate="isStairIndeterminate"
-              @change="handleCheckAllChange"
-            />
-          </div>
-          <div class="w-[50%]">商品信息</div>
-          <div class="w-[20%]">商品价格</div>
-          <div class="w-[20%]">库存</div>
+    <div>
+        <div @click="show">
+            <slot>
+                <el-button>{{ t('goodsSelectPopupSelectGoodsButton') }}</el-button>
+                <div class="inline-block ml-[10px] text-[14px]" v-show="goodsIds.length">
+                    <span>{{ t('goodsSelectPopupSelect') }}</span>
+                    <span class="text-primary mx-[2px]">{{ goodsIds.length }}</span>
+                    <span>{{ t('goodsSelectPopupPiece') }}</span>
+                </div>
+            </slot>
         </div>
-        <div class="table-body h-[350px] overflow-y-auto">
-          <div
-            v-for="(row, rowIndex) in goodsTable.data"
-            :key="rowIndex"
-            class="flex flex-col"
-          >
-            <!-- 内容 -->
-            <div
-              class="flex items-center border-solid border-[#e5e7eb] py-[8px] border-b-[1px]"
-            >
-              <div v-if="prop.mode == 'spu'" class="w-[3%]"></div>
-              <div
-                v-if="prop.mode == 'sku' && row.skuList.length > 1"
-                class="w-[3%] cursor-pointer text-center !text-[10px]"
-                @click="secondLevelArrowChange(row)"
-                :class="{
-                  'iconfont iconxiangyoujiantou': row.skuList.length,
-                  'arrow-show': row.isShow,
-                }"
-              ></div>
-              <div
-                v-if="prop.mode == 'sku' && row.skuList.length <= 1"
-                class="w-[3%]"
-              ></div>
-              <div class="w-[7%]">
-                <el-checkbox
-                  v-model="row.secondLevelCheckAll"
-                  :indeterminate="row.isSecondLevelIndeterminate"
-                  @change="secondLevelHandleCheckAllChange($event, row)"
-                />
-              </div>
-              <div class="flex items-center cursor-pointer w-[50%]">
-                <div
-                  class="min-w-[60px] h-[60px] flex items-center justify-center"
-                >
-                  <el-image
-                    v-if="row.goods_cover_thumb_small"
-                    class="w-[60px] h-[60px]"
-                    :src="img(row.goods_cover_thumb_small)"
-                    fit="contain"
-                  >
-                    <template #error>
-                      <div class="image-slot">
-                        <img
-                          class="w-[60px] h-[60px]"
-                          src="@/addon/shop/assets/goods_default.png"
-                        />
-                      </div>
-                    </template>
-                  </el-image>
-                  <img
-                    v-else
-                    class="w-[60px] h-[60px]"
-                    src="@/addon/shop/assets/goods_default.png"
-                    fit="contain"
-                  />
+        <el-dialog v-model="showDialog" :title="t('goodsSelectPopupSelectGoodsDialog')" width="1000px" :close-on-press-escape="false" :destroy-on-close="true" :close-on-click-modal="false">
+
+            <el-form :inline="true" :model="goodsTable.searchParam" ref="searchFormRef">
+                <el-form-item prop="select_type" class="form-item-wrap">
+                    <el-select v-model="goodsTable.searchParam.select_type" @change="handleSelectTypeChange">
+                        <el-option :label="t('goodsSelectPopupAllGoods')" value="all" />
+                        <el-option :label="t('goodsSelectPopupSelectedGoods')" value="selected" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item :label="t('goodsSelectPopupGoodsName')" prop="keyword" class="form-item-wrap">
+                    <el-input v-model.trim="goodsTable.searchParam.keyword" :placeholder="t('goodsSelectPopupGoodsNamePlaceholder')" maxlength="60" />
+                </el-form-item>
+                <el-form-item :label="t('goodsSelectPopupGoodsCategory')" prop="goods_category" class="form-item-wrap">
+                    <el-cascader  v-model="goodsTable.searchParam.goods_category"
+                        :options="goodsCategoryOptions" :placeholder="t('goodsSelectPopupGoodsCategoryPlaceholder')"
+                        clearable :props="{ value: 'value', label: 'label', emitPath:false }" />
+                </el-form-item>
+                <el-form-item :label="t('goodsSelectPopupGoodsType')" prop="goods_type" class="form-item-wrap">
+                    <el-select v-model="goodsTable.searchParam.goods_type" :placeholder="t('goodsSelectPopupGoodsTypePlaceholder')" clearable>
+                        <el-option v-for="item in goodsType" :key="item.type" :label="item.name" :value="item.type" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item class="form-item-wrap">
+                    <el-button type="primary" @click="loadGoodsList()">{{ t('search') }}</el-button>
+                    <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                </el-form-item>
+            </el-form>
+
+            <div class="table w-[100%]" v-loading="goodsTable.loading">
+                <div class="table-head flex items-center bg-[#f5f7f9] py-[8px]">
+                    <div class="w-[3%]"></div>
+                    <div class="w-[7%]">
+                        <el-checkbox v-model="staircheckAll" :indeterminate="isStairIndeterminate" @change="handleCheckAllChange" />
+                    </div>
+                    <div class="w-[50%]">商品信息</div>
+                    <div class="w-[20%]">商品价格</div>
+                    <div class="w-[20%]">库存</div>
                 </div>
-                <div class="ml-2 flex flex-col items-start">
-                  <span
-                    :title="row.goods_name"
-                    class="multi-hidden leading-[1.4]"
-                    >{{ row.goods_name }}</span
-                  >
-                  <span class="text-primary text-[12px]">{{
-                    row.goods_type_name
-                  }}</span>
-                  <span
-                    class="px-[4px] text-[12px] text-[#fff] rounded-[4px] bg-primary leading-[18px]"
-                    v-if="row.is_gift == 1"
-                    >赠品</span
-                  >
+                <div class="table-body h-[350px] overflow-y-auto">
+                    <div v-for="(row,rowIndex) in goodsTable.data" :key="rowIndex" class="flex flex-col">
+                        <!-- 内容 -->
+                        <div class="flex items-center border-solid border-[#e5e7eb] py-[8px] border-b-[1px]">
+                            <div v-if="prop.mode == 'spu'" class="w-[3%]"></div>
+                            <div v-if="prop.mode == 'sku' && row.skuList.length > 1" class="w-[3%] cursor-pointer text-center !text-[10px]" @click="secondLevelArrowChange(row)" :class="{'iconfont iconxiangyoujiantou': row.skuList.length, 'arrow-show': row.isShow}"></div>
+                            <div v-if="prop.mode == 'sku' && row.skuList.length <= 1" class="w-[3%]"></div>
+                            <div class="w-[7%]">
+                                <el-checkbox v-model="row.secondLevelCheckAll" :indeterminate="row.isSecondLevelIndeterminate" @change="secondLevelHandleCheckAllChange($event,row)" />
+                            </div>
+                            <div class="flex items-center cursor-pointer w-[50%]">
+                                <div class="min-w-[60px] h-[60px] flex items-center justify-center">
+                                    <el-image v-if="row.goods_cover_thumb_small" class="w-[60px] h-[60px]" :src="img(row.goods_cover_thumb_small)" fit="contain">
+                                        <template #error>
+                                            <div class="image-slot">
+                                                <img class="w-[60px] h-[60px]" src="@/addon/shop/assets/goods_default.png" />
+                                            </div>
+                                        </template>
+                                    </el-image>
+                                    <img v-else class="w-[60px] h-[60px]" src="@/addon/shop/assets/goods_default.png" fit="contain" />
+                                </div>
+                                <div class="ml-2 flex flex-col items-start">
+                                    <span :title="row.goods_name" class="multi-hidden leading-[1.4]">{{ row.goods_name }}</span>
+                                    <span class="text-primary text-[12px]">{{ row.goods_type_name }}</span>
+                                    <span class="px-[4px]  text-[12px] text-[#fff] rounded-[4px] bg-primary leading-[18px]" v-if="row.is_gift == 1">赠品</span>
+                                </div>
+                            </div>
+                            <div class="w-[20%]">￥{{ row.goodsSku.price }}</div>
+                            <div class="w-[20%]">{{row.stock}}</div>
+                        </div>
+
+                        <div v-show="prop.mode == 'sku' && row.skuList.length > 1">
+                            <!-- 子级 -->
+                            <div v-for="(item,index) in row.skuList" :key="index" class="flex items-center py-[8px] border-solid border-transparent border-b-[1px]" :class="{'hidden': !row.isShow, 'border-[#e5e7eb]': index == (row.skuList.length-1)}">
+                                <div class="w-[6%]"></div>
+                                <div class="w-[4%]">
+                                    <el-checkbox v-model="item.threeLevelCheckAll"  @change="subChildHandleCheckAllChange($event,row,item)" />
+                                </div>
+                                <div class="flex items-center cursor-pointer w-[50%]">
+                                    <div class="min-w-[60px] h-[60px] flex items-center justify-center">
+                                        <el-image v-if="item.sku_image" class="w-[60px] h-[60px]" :src="img(item.sku_image)" fit="contain">
+                                            <template #error>
+                                                <div class="image-slot">
+                                                    <img class="w-[60px] h-[60px]" src="@/addon/shop/assets/goods_default.png" />
+                                                </div>
+                                            </template>
+                                        </el-image>
+                                        <img v-else class="w-[60px] h-[60px]" src="@/addon/shop/assets/goods_default.png" fit="contain" />
+                                    </div>
+                                    <div class="ml-2">
+                                        <span :title="item.sku_name || row.goods_name" class="multi-hidden leading-[1.4]">{{ item.sku_name || row.goods_name }}</span>
+                                        <span class="text-primary text-[12px]">{{ row.goods_type_name }}</span>
+                                    </div>
+                                </div>
+                                <div class="w-[20%] flex">￥{{ item.price }}</div>
+                                <div class="w-[20%] flex">{{ item.stock }}</div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div v-if="!goodsTable.data.length && !goodsTable.loading" class="h-[60px] flex items-center justify-center border-solid border-[#e5e7eb] py-[12px] border-b-[1px]">
+                        暂无数据
+                    </div>
                 </div>
-              </div>
-              <div class="w-[20%]">￥{{ row.goodsSku.price }}</div>
-              <div class="w-[20%]">{{ row.stock }}</div>
             </div>
 
-            <div v-show="prop.mode == 'sku' && row.skuList.length > 1">
-              <!-- 子级 -->
-              <div
-                v-for="(item, index) in row.skuList"
-                :key="index"
-                class="flex items-center py-[8px] border-solid border-transparent border-b-[1px]"
-                :class="{
-                  hidden: !row.isShow,
-                  'border-[#e5e7eb]': index == row.skuList.length - 1,
-                }"
-              >
-                <div class="w-[6%]"></div>
-                <div class="w-[4%]">
-                  <el-checkbox
-                    v-model="item.threeLevelCheckAll"
-                    @change="subChildHandleCheckAllChange($event, row, item)"
-                  />
-                </div>
-                <div class="flex items-center cursor-pointer w-[50%]">
-                  <div
-                    class="min-w-[60px] h-[60px] flex items-center justify-center"
-                  >
-                    <el-image
-                      v-if="item.sku_image"
-                      class="w-[60px] h-[60px]"
-                      :src="img(item.sku_image)"
-                      fit="contain"
-                    >
-                      <template #error>
-                        <div class="image-slot">
-                          <img
-                            class="w-[60px] h-[60px]"
-                            src="@/addon/shop/assets/goods_default.png"
-                          />
-                        </div>
-                      </template>
-                    </el-image>
-                    <img
-                      v-else
-                      class="w-[60px] h-[60px]"
-                      src="@/addon/shop/assets/goods_default.png"
-                      fit="contain"
-                    />
-                  </div>
-                  <div class="ml-2">
-                    <span
-                      :title="item.sku_name || row.goods_name"
-                      class="multi-hidden leading-[1.4]"
-                      >{{ item.sku_name || row.goods_name }}</span
-                    >
-                    <span class="text-primary text-[12px]">{{
-                      row.goods_type_name
-                    }}</span>
-                  </div>
+            <div class="mt-[16px] flex">
+                <div class="flex items-center flex-1">
+                    <div class="layui-table-bottom-left-container mr-[10px]" v-show="selectGoodsNum">
+                        <span>{{ t('goodsSelectPopupBeforeTip') }}</span>
+                        <span class="text-primary mx-[2px]">{{ selectGoodsNum }}</span>
+                        <span>{{ t('goodsSelectPopupAfterTip') }}</span>
+                    </div>
+                    <el-button type="primary" link @click="clear" v-show="selectGoodsNum">{{ t('goodsSelectPopupClearGoods') }}</el-button>
                 </div>
-                <div class="w-[20%] flex">￥{{ item.price }}</div>
-                <div class="w-[20%] flex">{{ item.stock }}</div>
-              </div>
+                <el-pagination v-model:current-page="goodsTable.page" v-model:page-size="goodsTable.limit"
+                    layout="total, sizes, prev, pager, next, jumper" :total="goodsTable.total"
+                    @size-change="loadGoodsList()" @current-change="loadGoodsList" />
             </div>
-          </div>
-
-          <div
-            v-if="!goodsTable.data.length && !goodsTable.loading"
-            class="h-[60px] flex items-center justify-center border-solid border-[#e5e7eb] py-[12px] border-b-[1px]"
-          >
-            暂无数据
-          </div>
-        </div>
-      </div>
-
-      <div class="mt-[16px] flex">
-        <div class="flex items-center flex-1">
-          <div
-            class="layui-table-bottom-left-container mr-[10px]"
-            v-show="selectGoodsNum"
-          >
-            <span>{{ t('goodsSelectPopupBeforeTip') }}</span>
-            <span class="text-primary mx-[2px]">{{ selectGoodsNum }}</span>
-            <span>{{ t('goodsSelectPopupAfterTip') }}</span>
-          </div>
-          <el-button
-            type="primary"
-            link
-            @click="clear"
-            v-show="selectGoodsNum"
-            >{{ t('goodsSelectPopupClearGoods') }}</el-button
-          >
-        </div>
-        <el-pagination
-          v-model:current-page="goodsTable.page"
-          v-model:page-size="goodsTable.limit"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="goodsTable.total"
-          @size-change="loadGoodsList()"
-          @current-change="loadGoodsList"
-        />
-      </div>
-
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-          <el-button type="primary" @click="save">{{ t('confirm') }}</el-button>
-        </span>
-      </template>
-    </el-dialog>
-  </div>
+
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                    <el-button type="primary" @click="save">{{ t('confirm') }}</el-button>
+                </span>
+            </template>
+        </el-dialog>
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { t } from '@/lang'
 import { ref, reactive, computed, nextTick } from 'vue'
 import { cloneDeep } from 'lodash-es'
-import { img, deepClone } from '@/utils/common'
+import { img,deepClone } from '@/utils/common'
 import { ElMessage } from 'element-plus'
-import {
-  getGoodsSelectPageList,
-  getGoodsSkuNoPageList,
-  getCategoryTree,
-  getGoodsType,
-} from '@/addon/shop/api/goods'
+import { getGoodsSelectPageList,getGoodsSkuNoPageList, getCategoryTree, getGoodsType } from '@/addon/shop/api/goods'
 
 const prop = defineProps({
-  modelValue: {
-    type: String,
-    default: '',
-  },
-  max: {
-    type: Number,
-    default: 0,
-  },
-  min: {
-    type: Number,
-    default: 0,
-  },
-  mode: {
-    type: String,
-    default: 'spu', // spu：按商品，sku：按多规格
-  },
-  way: {
-    type: String,
-    default: '', // 选择方式，空：代表全部， single：单一
-  },
-  isGift: {
-    type: [String, Number],
-    default: 0, // 查询是否赠品，0：不查赠品，1：查询赠品
-  },
+    modelValue: {
+        type: String,
+        default: ''
+    },
+    max: {
+        type: Number,
+        default: 0
+    },
+    min: {
+        type: Number,
+        default: 0
+    },
+    mode: {
+        type: String,
+        default: 'spu' // spu：按商品，sku：按多规格
+    },
+    way: {
+        type: String,
+        default: '' // 选择方式，空：代表全部， single：单一
+    },
+    isGift: {
+        type: [String,Number],
+        default: 0 // 查询是否赠品，0：不查赠品，1：查询赠品
+    },
 })
 
-const emit = defineEmits(['update:modelValue', 'goodsSelect'])
+const emit = defineEmits(['update:modelValue','goodsSelect'])
 
 // 通过prop.mode来决定 数据前缀是sku_还是goods_
-let replacePrefix = prop.mode == 'sku' ? 'sku_' : 'goods_'
+let replacePrefix = prop.mode == "sku" ? 'sku_' : 'goods_';
 
-const isStairIndeterminate = ref(false)
-const staircheckAll = ref(false)
+const isStairIndeterminate = ref(false);
+const staircheckAll = ref(false);
 
 const goodsIds: any = computed({
-  get() {
-    return prop.modelValue
-  },
-  set(value) {
-    emit('update:modelValue', value)
-  },
+    get () {
+        return prop.modelValue
+    },
+    set (value) {
+        emit('update:modelValue', value)
+    }
 })
 
 const showDialog = ref(false)
@@ -356,34 +200,34 @@ const selectGoodsId: any = reactive([])
 
 // 已选商品数量
 const selectGoodsNum: any = computed(() => {
-  return Object.keys(selectGoods).length
+    return Object.keys(selectGoods).length
 })
 
 const goodsTable = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    keyword: '',
-    goods_category: [],
-    select_type: 'all',
-    goods_ids: '',
-    verify_goods_ids: '',
-    verify_sku_ids: '',
-    goods_type: '',
-    is_gift: 0,
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        keyword: '',
+        goods_category: [],
+        select_type: 'all',
+        goods_ids: '',
+        verify_goods_ids: '',
+        verify_sku_ids: '',
+        goods_type: '',
+        is_gift: 0
+    }
 })
 
-goodsTable.searchParam.is_gift = prop.isGift ? prop.isGift : 0
+goodsTable.searchParam.is_gift = prop.isGift ? prop.isGift : 0;
 
 const searchFormRef = ref()
 
 // 查询全部/已选商品
 const handleSelectTypeChange = (value: any) => {
-  loadGoodsList()
+    loadGoodsList()
 }
 
 // 商品分类
@@ -394,44 +238,40 @@ const goodsType: any = reactive([])
 
 // 初始化数据
 const initData = () => {
-  // 查询商品分类树结构
-  getCategoryTree().then((res) => {
-    const data = res.data
-    if (data) {
-      const goodsCategoryTree: any = []
-      data.forEach((item: any) => {
-        const children: any = []
-        if (item.child_list) {
-          item.child_list.forEach((childItem: any) => {
-            children.push({
-              value: childItem.category_id,
-              label: childItem.category_name,
+// 查询商品分类树结构
+    getCategoryTree().then((res) => {
+        const data = res.data
+        if (data) {
+            const goodsCategoryTree: any = []
+            data.forEach((item: any) => {
+                const children: any = []
+                if (item.child_list) {
+                    item.child_list.forEach((childItem: any) => {
+                        children.push({
+                            value: childItem.category_id,
+                            label: childItem.category_name
+                        })
+                    })
+                }
+                goodsCategoryTree.push({
+                    value: item.category_id,
+                    label: item.category_name,
+                    children
+                })
             })
-          })
+            goodsCategoryOptions.splice(0, goodsCategoryOptions.length, ...goodsCategoryTree)
         }
-        goodsCategoryTree.push({
-          value: item.category_id,
-          label: item.category_name,
-          children,
-        })
-      })
-      goodsCategoryOptions.splice(
-        0,
-        goodsCategoryOptions.length,
-        ...goodsCategoryTree
-      )
-    }
-  })
-
-  // 商品类型
-  getGoodsType().then((res) => {
-    const data = res.data
-    if (data) {
-      for (const k in data) {
-        goodsType.push(data[k])
-      }
-    }
-  })
+    })
+
+    // 商品类型
+    getGoodsType().then((res) => {
+        const data = res.data
+        if (data) {
+            for (const k in data) {
+                goodsType.push(data[k])
+            }
+        }
+    })
 }
 
 initData()
@@ -442,447 +282,423 @@ const goodsListTableRef = ref()
 const multipleSelection: any = ref([])
 
 // 箭头选择事件
-const secondLevelArrowChange = (data) => {
-  data.isShow = !data.isShow
+const secondLevelArrowChange = (data)=>{
+    data.isShow = !data.isShow;
 }
 
 // 一级复选框
-const handleCheckAllChange = (isSelect) => {
-  isStairIndeterminate.value = false
-  goodsTable.data.forEach((item, index) => {
-    item.secondLevelCheckAll = isSelect
-    item.skuList.forEach((subItem, subIndex) => {
-      subItem.threeLevelCheckAll = isSelect
-    })
-  })
-  if (isSelect) {
-    goodsTable.data.forEach((item: any) => {
-      if (prop.mode == 'spu') {
-        selectGoods[replacePrefix + item.goods_id] = item
-        selectGoodsId.push(item.goods_id)
-      } else {
-        item.skuList.forEach((skuItem: any) => {
-          selectGoodsId.push(skuItem.sku_id)
-          selectGoods[replacePrefix + skuItem.sku_id] = deepClone(skuItem)
-          selectGoods[replacePrefix + skuItem.sku_id].goods_name =
-            item.goods_name // 多规格模式，要增加商品名称、商品类型，后续还会增加，满足不同业务场景
-          selectGoods[replacePrefix + skuItem.sku_id].goods_type_name =
-            item.goods_type_name
-          selectGoods[replacePrefix + skuItem.sku_id].goods_type =
-            item.goods_type
+const handleCheckAllChange = (isSelect) =>{
+    isStairIndeterminate.value = false;
+    goodsTable.data.forEach((item,index) => {
+        item.secondLevelCheckAll = isSelect;
+        item.skuList.forEach((subItem, subIndex) => {
+            subItem.threeLevelCheckAll = isSelect;
+        });
+    });
+    if (isSelect) {
+        goodsTable.data.forEach((item: any) => {
+            if(prop.mode == 'spu') {
+                selectGoods[replacePrefix + item.goods_id] = item
+                selectGoodsId.push(item.goods_id)
+            }else{
+                item.skuList.forEach((skuItem:any)=>{
+                    selectGoodsId.push(skuItem.sku_id);
+                    selectGoods[replacePrefix + skuItem.sku_id] = deepClone(skuItem);
+                    selectGoods[replacePrefix + skuItem.sku_id].goods_name = item.goods_name; // 多规格模式，要增加商品名称、商品类型，后续还会增加，满足不同业务场景
+                    selectGoods[replacePrefix + skuItem.sku_id].goods_type_name = item.goods_type_name;
+                    selectGoods[replacePrefix + skuItem.sku_id].goods_type = item.goods_type;
+                })
+
+            }
         })
-      }
-    })
-  } else {
-    // 未选中，删除当前页面的数据
-    goodsTable.data.forEach((item: any) => {
-      if (prop.mode == 'spu') {
-        selectGoodsId.splice(selectGoodsId.indexOf(item.goods_id), 1)
-        delete selectGoods[replacePrefix + item.goods_id]
-      } else {
-        item.skuList.forEach((skuItem: any) => {
-          selectGoodsId.splice(selectGoodsId.indexOf(skuItem.sku_id), 1)
-          delete selectGoods[replacePrefix + skuItem.sku_id]
+    } else {
+        // 未选中，删除当前页面的数据
+        goodsTable.data.forEach((item: any) => {
+            if(prop.mode == 'spu') {
+                selectGoodsId.splice(selectGoodsId.indexOf(item.goods_id), 1)
+                delete selectGoods[replacePrefix + item.goods_id]
+            }else{
+                item.skuList.forEach((skuItem:any)=>{
+                    selectGoodsId.splice(selectGoodsId.indexOf(skuItem.sku_id), 1)
+                    delete selectGoods[replacePrefix + skuItem.sku_id]
+                })
+            }
         })
-      }
-    })
-  }
+    }
 }
 
 // 二级复选框
-const secondLevelHandleCheckAllChange = (isSelect, row) => {
-  row.skuList.forEach((item, index) => {
-    item.threeLevelCheckAll = isSelect
-  })
-  detectionAllSelect()
-  if (prop.mode == 'spu') {
-    if (isSelect) {
-      selectGoodsId.push(row.goods_id)
-      selectGoods[replacePrefix + row.goods_id] = deepClone(row)
-    } else {
-      selectGoodsId.splice(selectGoodsId.indexOf(row.goods_id), 1)
-      // 未选中，删除当前商品
-      delete selectGoods[replacePrefix + row.goods_id]
+const secondLevelHandleCheckAllChange = (isSelect,row)=>{
+
+    row.skuList.forEach((item,index) => {
+        item.threeLevelCheckAll = isSelect;
+    });
+    detectionAllSelect();
+    if(prop.mode == 'spu'){
+        if (isSelect) {
+            selectGoodsId.push(row.goods_id)
+            selectGoods[replacePrefix + row.goods_id] = deepClone(row)
+        } else {
+            selectGoodsId.splice(selectGoodsId.indexOf(row.goods_id),1)
+            // 未选中，删除当前商品
+            delete selectGoods[replacePrefix + row.goods_id]
+        }
+    }else{
+        if (isSelect) {
+            row.skuList.forEach((item,index) => {
+                selectGoodsId.push(item.sku_id);
+                selectGoods[replacePrefix + item.sku_id] = deepClone(item);
+                selectGoods[replacePrefix + item.sku_id].goods_name = row.goods_name; // 多规格模式，要增加商品名称、商品类型，后续还会增加，满足不同业务场景
+                selectGoods[replacePrefix + item.sku_id].goods_type_name = row.goods_type_name;
+                selectGoods[replacePrefix + item.sku_id].goods_type = row.goods_type;
+            });
+        } else {
+            row.skuList.forEach((item,index) => {
+                selectGoodsId.splice(selectGoodsId.indexOf(item.sku_id),1)
+                // 未选中，删除当前商品
+                delete selectGoods[replacePrefix + item.sku_id]
+            });
+        }
     }
-  } else {
-    if (isSelect) {
-      row.skuList.forEach((item, index) => {
-        selectGoodsId.push(item.sku_id)
-        selectGoods[replacePrefix + item.sku_id] = deepClone(item)
-        selectGoods[replacePrefix + item.sku_id].goods_name = row.goods_name // 多规格模式，要增加商品名称、商品类型，后续还会增加，满足不同业务场景
-        selectGoods[replacePrefix + item.sku_id].goods_type_name =
-          row.goods_type_name
-        selectGoods[replacePrefix + item.sku_id].goods_type = row.goods_type
-      })
-    } else {
-      row.skuList.forEach((item, index) => {
-        selectGoodsId.splice(selectGoodsId.indexOf(item.sku_id), 1)
-        // 未选中，删除当前商品
-        delete selectGoods[replacePrefix + item.sku_id]
-      })
+
+    // 用于可扩展的表格或树表格，如果某行被扩展，则切换。 使用第二个参数，您可以直接设置该行应该被扩展或折叠。
+    // setTimeout(() => {
+    //     goodsListTableRef.value.toggleRowExpansion(...Object.values(spreadTableData),true)
+    // }, 0);
+    // 当所选数量超出限制数量【prop.max】时，添加一个就会删除开头的第一个或多个，最终保证所选的数量小于等于prop.max
+    if(prop.max && prop.max > 0 && Object.keys(selectGoods).length > 0 && Object.keys(selectGoods).length > prop.max){
+        let len = Object.keys(selectGoods).length;
+        len = len - prop.max;
+
+        let goodsIdCopy = cloneDeep(selectGoodsId);
+        goodsIdCopy.forEach((item,index,arr) => {
+            if(index < len){
+                let indent = selectGoodsId.indexOf(item)
+                delete selectGoods[replacePrefix+selectGoodsId[indent]]
+                selectGoodsId.splice(indent,1)
+            }
+        });
+        setGoodsSelected();
     }
-  }
-
-  // 用于可扩展的表格或树表格，如果某行被扩展，则切换。 使用第二个参数，您可以直接设置该行应该被扩展或折叠。
-  // setTimeout(() => {
-  //     goodsListTableRef.value.toggleRowExpansion(...Object.values(spreadTableData),true)
-  // }, 0);
-  // 当所选数量超出限制数量【prop.max】时，添加一个就会删除开头的第一个或多个，最终保证所选的数量小于等于prop.max
-  if (
-    prop.max &&
-    prop.max > 0 &&
-    Object.keys(selectGoods).length > 0 &&
-    Object.keys(selectGoods).length > prop.max
-  ) {
-    let len = Object.keys(selectGoods).length
-    len = len - prop.max
-
-    let goodsIdCopy = cloneDeep(selectGoodsId)
-    goodsIdCopy.forEach((item, index, arr) => {
-      if (index < len) {
-        let indent = selectGoodsId.indexOf(item)
-        delete selectGoods[replacePrefix + selectGoodsId[indent]]
-        selectGoodsId.splice(indent, 1)
-      }
-    })
-    setGoodsSelected()
-  }
 }
 
 // 三级复选框
-const subChildHandleCheckAllChange = (
-  selected: any,
-  parentData: any,
-  data: any
-) => {
-  let selectNum = 0
-  parentData.skuList.forEach((item, index) => {
-    if (item.threeLevelCheckAll) {
-      selectNum++
+const subChildHandleCheckAllChange  = (selected: any,parentData: any,data: any)=>{
+    let selectNum = 0;
+    parentData.skuList.forEach((item,index) => {
+        if(item.threeLevelCheckAll){
+            selectNum++;
+        }
+    });
+    if(selectNum > 0 && selectNum != parentData.skuList.length){
+        parentData.secondLevelCheckAll = false;
+        parentData.isSecondLevelIndeterminate = true;
+    }else if(selectNum == parentData.skuList.length){
+        parentData.isSecondLevelIndeterminate = false;
+        parentData.secondLevelCheckAll = true
+    }else{
+        parentData.isSecondLevelIndeterminate = false;
+        parentData.secondLevelCheckAll = false;
+    }
+
+    detectionAllSelect();
+
+    let currSku = deepClone(data)
+
+    if(selected){
+        selectGoodsId.push(currSku.sku_id);
+
+        currSku.goods_name = parentData.goods_name; // 多规格模式，要增加商品名称、商品类型，后续还会增加，满足不同业务场景
+        currSku.goods_type_name = parentData.goods_type_name;
+        currSku.goods_type = parentData.goods_type;
+        selectGoods[replacePrefix + currSku.sku_id] = currSku;
+    }else{
+        selectGoodsId.splice(selectGoodsId.indexOf(currSku.sku_id),1)
+        // 未选中，删除当前商品
+        delete selectGoods[replacePrefix + currSku.sku_id]
     }
-  })
-  if (selectNum > 0 && selectNum != parentData.skuList.length) {
-    parentData.secondLevelCheckAll = false
-    parentData.isSecondLevelIndeterminate = true
-  } else if (selectNum == parentData.skuList.length) {
-    parentData.isSecondLevelIndeterminate = false
-    parentData.secondLevelCheckAll = true
-  } else {
-    parentData.isSecondLevelIndeterminate = false
-    parentData.secondLevelCheckAll = false
-  }
-
-  detectionAllSelect()
-
-  let currSku = deepClone(data)
-
-  if (selected) {
-    selectGoodsId.push(currSku.sku_id)
-
-    currSku.goods_name = parentData.goods_name // 多规格模式，要增加商品名称、商品类型，后续还会增加，满足不同业务场景
-    currSku.goods_type_name = parentData.goods_type_name
-    currSku.goods_type = parentData.goods_type
-    selectGoods[replacePrefix + currSku.sku_id] = currSku
-  } else {
-    selectGoodsId.splice(selectGoodsId.indexOf(currSku.sku_id), 1)
-    // 未选中，删除当前商品
-    delete selectGoods[replacePrefix + currSku.sku_id]
-  }
 }
 
 // 检测是否选中
-const detectionAllSelect = () => {
-  let selectNum = 0
-  goodsTable.data.forEach((item, index) => {
-    if (item.secondLevelCheckAll) {
-      selectNum++
+const detectionAllSelect = ()=> {
+    let selectNum = 0;
+    goodsTable.data.forEach((item,index) => {
+        if(item.secondLevelCheckAll){
+            selectNum++;
+        }
+    });
+
+    if(selectNum > 0 && selectNum != goodsTable.data.length){
+        staircheckAll.value = false;
+        isStairIndeterminate.value = true;
+    }else if(selectNum > 0 && selectNum == goodsTable.data.length){
+        isStairIndeterminate.value = false;
+        staircheckAll.value = true
+    }else{
+        isStairIndeterminate.value = false;
+        staircheckAll.value = false;
     }
-  })
-
-  if (selectNum > 0 && selectNum != goodsTable.data.length) {
-    staircheckAll.value = false
-    isStairIndeterminate.value = true
-  } else if (selectNum > 0 && selectNum == goodsTable.data.length) {
-    isStairIndeterminate.value = false
-    staircheckAll.value = true
-  } else {
-    isStairIndeterminate.value = false
-    staircheckAll.value = false
-  }
 }
 
 /**
  * 获取商品列表
  */
 const loadGoodsList = (page: number = 1, callback: any = null) => {
-  isStairIndeterminate.value = false
-  staircheckAll.value = false
-  goodsTable.loading = true
-  goodsTable.data = []
-  goodsTable.page = page
-
-  const searchData = cloneDeep(goodsTable.searchParam)
-
-  if (searchData.select_type == 'selected') {
-    const goods_ids = <any>[]
-    for (let k in selectGoods) {
-      goods_ids.push(parseInt(k.replace(replacePrefix, '')))
+    isStairIndeterminate.value = false;
+    staircheckAll.value = false;
+    goodsTable.loading = true;
+    goodsTable.data = [];
+    goodsTable.page = page
+
+    const searchData = cloneDeep(goodsTable.searchParam);
+
+    if (searchData.select_type == 'selected') {
+        const goods_ids = <any>[]
+        for (let k in selectGoods) {
+            goods_ids.push(parseInt(k.replace(replacePrefix, '')))
+        }
+        searchData[replacePrefix+'ids'] = goods_ids
+    } else {
+        searchData[replacePrefix+'ids'] = '';
     }
-    searchData[replacePrefix + 'ids'] = goods_ids
-  } else {
-    searchData[replacePrefix + 'ids'] = ''
-  }
-
-  getGoodsSelectPageList({
-    page: goodsTable.page,
-    limit: goodsTable.limit,
-    ...searchData,
-  })
-    .then((res) => {
-      let goodsTableData = cloneDeep(res.data.data)
-      goodsTableData.forEach((item: any) => {
-        item.isShow = false
-        item.isSecondLevelIndeterminate = false
-        item.secondLevelCheckAll = false
-      })
-
-      if (prop.mode == 'sku') {
+
+    getGoodsSelectPageList({
+        page: goodsTable.page,
+        limit: goodsTable.limit,
+        ...searchData
+    }).then(res => {
+        let goodsTableData = cloneDeep(res.data.data);
         goodsTableData.forEach((item: any) => {
-          if (item.skuList.length) {
-            item.skuList.forEach((skuItem: any) => {
-              skuItem.threeLevelCheckAll = false
-              skuItem.goods_type = item.goods_type
-            })
-          }
+            item.isShow = false;
+            item.isSecondLevelIndeterminate = false;
+            item.secondLevelCheckAll = false;
         })
-      }
-      if (callback)
-        callback(
-          prop.mode == 'spu'
-            ? res.data.verify_goods_ids
-            : res.data.verify_sku_ids,
-          res.data.select_goods_list
-        )
-      setGoodsSelected()
-
-      goodsTable.data = goodsTableData
-      goodsTable.total = res.data.total
-      goodsTable.loading = false
-    })
-    .catch(() => {
-      goodsTable.loading = false
+
+        if(prop.mode == "sku") {
+            goodsTableData.forEach((item: any) => {
+                if (item.skuList.length) {
+                    item.skuList.forEach((skuItem: any) => {
+                        skuItem.threeLevelCheckAll = false;
+                        skuItem.goods_type = item.goods_type;
+                    })
+                }
+            })
+        }
+        if (callback) callback(prop.mode == "spu" ? res.data.verify_goods_ids : res.data.verify_sku_ids, res.data.select_goods_list)
+        setGoodsSelected();
+
+        goodsTable.data = goodsTableData
+        goodsTable.total = res.data.total
+        goodsTable.loading = false
+
+    }).catch(() => {
+        goodsTable.loading = false
     })
+
 }
 
 // 表格设置选中状态 spu
 const setGoodsSelected = () => {
-  nextTick(() => {
-    if (prop.mode == 'spu') {
-      for (let i = 0; i < goodsTable.data.length; i++) {
-        goodsTable.data[i].secondLevelCheckAll = false
-        if (selectGoods[replacePrefix + goodsTable.data[i].goods_id]) {
-          goodsTable.data[i].secondLevelCheckAll = true
-        }
-      }
-    } else {
-      let isAllSelectSku = true
-      for (let i = 0; i < goodsTable.data.length; i++) {
-        goodsTable.data[i].secondLevelCheckAll = false
-
-        isAllSelectSku = true
-
-        goodsTable.data[i].isSecondLevelIndeterminate = false
-        goodsTable.data[i].skuList.forEach((item, index) => {
-          item.threeLevelCheckAll = false
-          if (selectGoods[replacePrefix + item.sku_id]) {
-            goodsTable.data[i].isSecondLevelIndeterminate = true
-            item.threeLevelCheckAll = true
-          } else {
-            isAllSelectSku = false
-          }
-        })
-        if (isAllSelectSku) {
-          goodsTable.data[i].isSecondLevelIndeterminate = false
-          goodsTable.data[i].secondLevelCheckAll = true
+    nextTick(() => {
+        if(prop.mode == "spu"){
+            for (let i = 0; i < goodsTable.data.length; i++) {
+                goodsTable.data[i].secondLevelCheckAll = false;
+                if (selectGoods[replacePrefix + goodsTable.data[i].goods_id]) {
+                    goodsTable.data[i].secondLevelCheckAll = true;
+                }
+            }
+        }else{
+            let isAllSelectSku = true;
+            for (let i = 0; i < goodsTable.data.length; i++) {
+                goodsTable.data[i].secondLevelCheckAll = false;
+
+                isAllSelectSku = true;
+
+                goodsTable.data[i].isSecondLevelIndeterminate = false;
+                goodsTable.data[i].skuList.forEach((item,index) => {
+                    item.threeLevelCheckAll = false;
+                    if (selectGoods[replacePrefix + item.sku_id]) {
+                        goodsTable.data[i].isSecondLevelIndeterminate = true;
+                        item.threeLevelCheckAll = true;
+                    }else{
+                        isAllSelectSku = false;
+                    }
+                });
+                if(isAllSelectSku){
+                    goodsTable.data[i].isSecondLevelIndeterminate = false;
+                    goodsTable.data[i].secondLevelCheckAll = true;
+                }
+            }
         }
-      }
-    }
-    detectionAllSelect()
-  })
+        detectionAllSelect();
+    });
 }
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
+    if (!formEl) return
+    formEl.resetFields()
 
-  loadGoodsList()
+    loadGoodsList()
 }
 
 const show = () => {
-  for (let k in selectGoods) {
-    delete selectGoods[k]
-  }
-
-  replacePrefix = prop.mode == 'sku' ? 'sku_' : 'goods_'
-
-  // 检测商品id集合是否存在，移除不存在的商品id，纠正数据准确性
-  if (prop.mode == 'sku') {
-    goodsTable.searchParam.verify_sku_ids = goodsIds.value
-  } else {
-    goodsTable.searchParam.verify_goods_ids = goodsIds.value
-  }
-
-  getGoodsSkuNoPageListFn()
-
-  loadGoodsList(1, (verify_ids: any) => {
-    // 第一次打开弹出框时，纠正数据，并且赋值已选商品
-    if (goodsIds.value && goodsIds.value.length) {
-      goodsIds.value.splice(0, goodsIds.value.length, ...verify_ids)
-      selectGoodsId.splice(0, selectGoodsId.length, ...verify_ids)
-      if (Object.keys(selectGoods).length) {
-        for (let key in selectGoods) {
-          let num = Number(key.split(replacePrefix)[1])
-          if (goodsIds.value.indexOf(num) == -1) {
-            delete selectGoods[key]
-          }
-        }
-      }
+    for (let k in selectGoods) {
+        delete selectGoods[k];
     }
-  })
 
-  showDialog.value = true
-}
+    replacePrefix = prop.mode == "sku" ? 'sku_' : 'goods_';
 
-const getGoodsSkuNoPageListFn = () => {
-  const searchData = cloneDeep(goodsTable.searchParam)
-  getGoodsSkuNoPageList({ ...searchData }).then((res: any) => {
-    const selectGoodsData = res.data
-    // 赋值已选择的商品
+    // 检测商品id集合是否存在，移除不存在的商品id，纠正数据准确性
     if (prop.mode == 'sku') {
-      for (let i = 0; i < selectGoodsData.length; i++) {
-        selectGoodsData[i].skuList.forEach((item: any) => {
-          if (goodsIds.value.indexOf(item.sku_id) != -1) {
-            item.goods_name = selectGoodsData[i].goods_name // 多规格模式，要增加商品名称、商品类型，后续还会增加，满足不同业务场景
-            item.goods_type_name = selectGoodsData[i].goods_type_name
-            item.goods_type = selectGoodsData[i].goods_type
-            selectGoods[replacePrefix + item.sku_id] = item
-          }
-        })
-      }
+        goodsTable.searchParam.verify_sku_ids = goodsIds.value;
     } else {
-      for (let i = 0; i < selectGoodsData.length; i++) {
-        if (goodsIds.value.indexOf(selectGoodsData[i].goods_id) != -1) {
-          selectGoods[replacePrefix + selectGoodsData[i].goods_id] =
-            selectGoodsData[i]
-        }
-      }
+        goodsTable.searchParam.verify_goods_ids = goodsIds.value;
     }
 
-    if (Object.keys(selectGoods).length && goodsIds.value.length) {
-      for (let key in selectGoods) {
-        let num = Number(key.split(replacePrefix)[1])
-        if (goodsIds.value.indexOf(num) == -1) {
-          delete selectGoods[key]
+    getGoodsSkuNoPageListFn();
+
+    loadGoodsList(1, (verify_ids: any) => {
+
+        // 第一次打开弹出框时，纠正数据，并且赋值已选商品
+        if (goodsIds.value && goodsIds.value.length) {
+            goodsIds.value.splice(0, goodsIds.value.length, ...verify_ids)
+            selectGoodsId.splice(0, selectGoodsId.length, ...verify_ids)
+            if(Object.keys(selectGoods).length){
+                for(let key in selectGoods){
+                    let num = Number(key.split(replacePrefix)[1]);
+                    if(goodsIds.value.indexOf(num) == -1){
+                        delete selectGoods[key];
+                    }
+                }
+            }
         }
-      }
-    }
+    })
 
-    setGoodsSelected()
-  })
+    showDialog.value = true
+}
+
+const getGoodsSkuNoPageListFn = () =>{
+    const searchData = cloneDeep(goodsTable.searchParam);
+    getGoodsSkuNoPageList({...searchData}).then((res:any)=>{
+        const selectGoodsData = res.data;
+        // 赋值已选择的商品
+        if (prop.mode == 'sku') {
+            for (let i = 0; i < selectGoodsData.length; i++) {
+                selectGoodsData[i].skuList.forEach((item: any) => {
+                    if (goodsIds.value.indexOf(item.sku_id) != -1) {
+                        item.goods_name = selectGoodsData[i].goods_name; // 多规格模式，要增加商品名称、商品类型，后续还会增加，满足不同业务场景
+                        item.goods_type_name = selectGoodsData[i].goods_type_name;
+                        item.goods_type = selectGoodsData[i].goods_type;
+                        selectGoods[replacePrefix + item.sku_id] = item;
+                    }
+                });
+            }
+        } else {
+            for (let i = 0; i < selectGoodsData.length; i++) {
+                if (goodsIds.value.indexOf(selectGoodsData[i].goods_id) != -1) {
+                    selectGoods[replacePrefix + selectGoodsData[i].goods_id] = selectGoodsData[i];
+                }
+            }
+        }
+
+        if(Object.keys(selectGoods).length && goodsIds.value.length){
+            for(let key in selectGoods){
+                let num = Number(key.split(replacePrefix)[1]);
+                if(goodsIds.value.indexOf(num) == -1){
+                    delete selectGoods[key];
+                }
+            }
+        }
+
+
+        setGoodsSelected();
+    })
 }
 
 // 清空已选商品
 const clear = () => {
-  for (let k in selectGoods) {
-    delete selectGoods[k]
-  }
-  setGoodsSelected()
+    for (let k in selectGoods) {
+        delete selectGoods[k];
+    }
+    setGoodsSelected();
 }
 
 const save = () => {
-  if (prop.min && selectGoodsNum.value < prop.min) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('goodsSelectPopupGoodsMinTip')}${prop.min}${t('goodsSelectPopupPiece')}`,
-    })
-    return
-  }
-
-  if (
-    prop.max &&
-    prop.max > 0 &&
-    selectGoodsNum.value &&
-    selectGoodsNum.value > prop.max
-  ) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('goodsSelectPopupGoodsMaxTip')}${prop.max}${t('goodsSelectPopupPiece')}`,
-    })
-    return
-  }
+    if (prop.min && selectGoodsNum.value < prop.min) {
+        ElMessage({
+            type: 'warning',
+            message: `${t('goodsSelectPopupGoodsMinTip')}${prop.min}${t('goodsSelectPopupPiece')}`,
+        });
+        return;
+    }
 
-  if (prop.way == 'single') {
-    let realTypeNum = 0
-    let virtualTypeNum = 0
-    for (let k in selectGoods) {
-      if (selectGoods[k].goods_type == 'virtual') {
-        virtualTypeNum++
-      } else if (selectGoods[k].goods_type == 'real') {
-        realTypeNum++
-      }
+    if (prop.max && prop.max > 0 && selectGoodsNum.value && selectGoodsNum.value > prop.max) {
+        ElMessage({
+            type: 'warning',
+            message: `${t('goodsSelectPopupGoodsMaxTip')}${prop.max}${t('goodsSelectPopupPiece')}`,
+        });
+        return;
     }
 
-    if (
-      realTypeNum != Object.keys(selectGoods).length &&
-      virtualTypeNum != Object.keys(selectGoods).length
-    ) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('wayPlaceholder')}`,
-      })
-      return
+    if(prop.way == 'single'){
+        let realTypeNum = 0;
+        let virtualTypeNum = 0;
+        for (let k in selectGoods) {
+            if(selectGoods[k].goods_type == "virtual"){
+                virtualTypeNum++;
+            }else if(selectGoods[k].goods_type == "real"){
+                realTypeNum++;
+            }
+        }
+
+        if (realTypeNum != Object.keys(selectGoods).length && virtualTypeNum != Object.keys(selectGoods).length) {
+            ElMessage({
+                type: 'warning',
+                message: `${t('wayPlaceholder')}`,
+            });
+            return;
+        }
     }
-  }
 
-  let ids: any = []
-  for (let k in selectGoods) {
-    ids.push(parseInt(k.replace(replacePrefix, '')))
-  }
+    let ids: any = [];
+    for (let k in selectGoods) {
+        ids.push(parseInt(k.replace(replacePrefix, '')));
+    }
 
-  goodsIds.value.splice(0, goodsIds.value.length, ...ids)
-  emit('goodsSelect', selectGoods)
-  initSearchParam()
-  showDialog.value = false
+    goodsIds.value.splice(0, goodsIds.value.length, ...ids)
+    emit('goodsSelect',selectGoods)
+    initSearchParam();
+    showDialog.value = false
 }
 
 // 重置表单搜索
-const initSearchParam = () => {
-  goodsTable.searchParam.keyword = ''
-  goodsTable.searchParam.goods_category = []
-  goodsTable.searchParam.select_type = 'all'
-  goodsTable.searchParam.goods_ids = ''
-  goodsTable.searchParam.verify_goods_ids = ''
-  goodsTable.searchParam.verify_sku_ids = ''
-  goodsTable.searchParam.goods_type = ''
+const initSearchParam = ()=>{
+    goodsTable.searchParam.keyword = '';
+    goodsTable.searchParam.goods_category = [];
+    goodsTable.searchParam.select_type = 'all';
+    goodsTable.searchParam.goods_ids = '';
+    goodsTable.searchParam.verify_goods_ids = '';
+    goodsTable.searchParam.verify_sku_ids = '';
+    goodsTable.searchParam.goods_type = '';
 }
 
 defineExpose({
-  showDialog,
-  selectGoods,
-  selectGoodsNum,
+    showDialog,
+    selectGoods,
+    selectGoodsNum
 })
 </script>
 
 <style lang="scss" scoped>
 .form-item-wrap {
-  margin-right: 10px !important;
-  margin-bottom: 10px !important;
+    margin-right: 10px !important;
+    margin-bottom: 10px !important;
 
-  &.last-child {
-    margin-right: 0 !important;
-  }
+    &.last-child {
+        margin-right: 0 !important;
+    }
 }
-.arrow-show {
-  transform: rotate(90deg);
+.arrow-show{
+    transform: rotate(90deg);
 }
 </style>
diff --git a/admin/src/addon/shop/views/goods/components/goods-spread-popup.vue b/admin/src/addon/shop/views/goods/components/goods-spread-popup.vue
index 6326fe5e..70aebafe 100644
--- a/admin/src/addon/shop/views/goods/components/goods-spread-popup.vue
+++ b/admin/src/addon/shop/views/goods/components/goods-spread-popup.vue
@@ -1,34 +1,26 @@
 <template>
-  <div>
-    <el-dialog
-      v-model="showDialog"
-      :title="t('goodsSpreadTitle')"
-      width="500px"
-      :destroy-on-close="true"
-    >
-      <div class="promote-flex flex">
-        <div
-          class="promote-img flex justify-center items-center bg-[#f8f8f8] w-[150px] h-[150px]"
-        >
-          <el-image :src="wapImage" />
-        </div>
-
-        <div class="px-[20px] flex-1">
-          <div class="mb-[10px]">{{ t('spreadLink') }}</div>
-          <el-input class="mb-[10px]" readonly :value="wapPreview">
-            <template #append>
-              <el-button @click="copyEvent(wapPreview)">{{
-                t('copy')
-              }}</el-button>
-            </template>
-          </el-input>
-          <a class="text-primary" :href="wapImage" download>{{
-            t('downloadQrcode')
-          }}</a>
-        </div>
-      </div>
-    </el-dialog>
-  </div>
+    <div>
+        <el-dialog v-model="showDialog" :title="t('goodsSpreadTitle')" width="500px" :destroy-on-close="true">
+
+            <div class="promote-flex flex">
+                <div class="promote-img flex justify-center items-center bg-[#f8f8f8] w-[150px] h-[150px]">
+                    <el-image :src="wapImage" />
+                </div>
+
+                <div class="px-[20px] flex-1">
+                    <div class="mb-[10px]">{{ t('spreadLink') }}</div>
+                    <el-input class="mb-[10px]" readonly :value="wapPreview">
+                        <template #append>
+                            <el-button @click="copyEvent(wapPreview)">{{ t('copy') }}</el-button>
+                        </template>
+                    </el-input>
+                    <a class="text-primary" :href="wapImage" download>{{ t('downloadQrcode') }}</a>
+                </div>
+
+            </div>
+
+        </el-dialog>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -52,72 +44,68 @@ const wapPreview = ref('')
 const page = ref('')
 
 getUrl().then((res: any) => {
-  wapUrl.value = res.data.wap_url
+    wapUrl.value = res.data.wap_url
 
-  // 生产模式禁止
-  if (import.meta.env.MODE == 'production') return
+    // 生产模式禁止
+    if (import.meta.env.MODE == 'production') return
 
-  wapDomain.value = res.data.wap_domain
+    wapDomain.value = res.data.wap_domain
 
-  // env文件配置过wap域名
-  if (wapDomain.value) {
-    wapUrl.value = wapDomain.value + '/wap'
-  }
+    // env文件配置过wap域名
+    if (wapDomain.value) {
+        wapUrl.value = wapDomain.value + '/wap'
+    }
 
-  const wapDomainStorage = storage.get('wap_domain')
-  if (wapDomainStorage) {
-    wapUrl.value = wapDomainStorage
-  }
+    const wapDomainStorage = storage.get('wap_domain')
+    if (wapDomainStorage) {
+        wapUrl.value = wapDomainStorage
+    }
 })
 
 const loadQrcode = () => {
-  wapPreview.value = `${wapUrl.value}${page.value}`
-  // errorCorrectionLevel：密度容错率L（低）H(高)
-  QRCode.toDataURL(wapPreview.value, {
-    errorCorrectionLevel: 'L',
-    margin: 0,
-    width: 120,
-  }).then((url) => {
-    wapImage.value = url
-  })
+    wapPreview.value = `${wapUrl.value}${page.value}`
+    // errorCorrectionLevel：密度容错率L（低）H(高)
+    QRCode.toDataURL(wapPreview.value, { errorCorrectionLevel: 'L', margin: 0, width: 120 }).then(url => {
+        wapImage.value = url
+    })
 }
 
-const show = (data: any, type = 'goods') => {
-  Object.assign(goods, data)
-  if (type == 'goods') {
-    page.value = `/addon/shop/pages/goods/detail?goods_id=${goods.goods_id}`
-  } else {
-    page.value = `/addon/shop/pages/point/detail?id=${goods.id}`
-  }
-
-  loadQrcode()
-  showDialog.value = true
+const show = (data: any,type='goods') => {
+    Object.assign(goods, data)
+    if(type=='goods'){
+        page.value = `/addon/shop/pages/goods/detail?goods_id=${goods.goods_id}`
+    }else{
+        page.value = `/addon/shop/pages/point/detail?id=${goods.id}`
+    }
+    
+    loadQrcode()
+    showDialog.value = true
 }
 
 // 复制
 const { copy, isSupported, copied } = useClipboard()
 const copyEvent = (text: string) => {
-  if (!isSupported.value) {
-    ElMessage({
-      message: t('notSupportCopy'),
-      type: 'warning',
-    })
-  }
-  copy(text)
+    if (!isSupported.value) {
+        ElMessage({
+            message: t('notSupportCopy'),
+            type: 'warning'
+        })
+    }
+    copy(text)
 }
 
 watch(copied, () => {
-  if (copied.value) {
-    ElMessage({
-      message: t('copySuccess'),
-      type: 'success',
-    })
-  }
+    if (copied.value) {
+        ElMessage({
+            message: t('copySuccess'),
+            type: 'success'
+        })
+    }
 })
 
 defineExpose({
-  showDialog,
-  show,
+    showDialog,
+    show
 })
 </script>
 
diff --git a/admin/src/addon/shop/views/goods/components/goods-stock-edit-popup.vue b/admin/src/addon/shop/views/goods/components/goods-stock-edit-popup.vue
index 6ce8e1b1..9154466e 100644
--- a/admin/src/addon/shop/views/goods/components/goods-stock-edit-popup.vue
+++ b/admin/src/addon/shop/views/goods/components/goods-stock-edit-popup.vue
@@ -1,104 +1,54 @@
 <template>
-  <div>
-    <el-dialog
-      v-model="showDialog"
-      :title="t('editStockPopupTitle')"
-      width="600px"
-      :close-on-press-escape="false"
-      :destroy-on-close="true"
-      :close-on-click-modal="false"
-    >
-      <div class="flex items-center mb-[10px]">
-        <div class="min-w-[70px] h-[70px] flex items-center justify-center">
-          <el-image
-            v-if="goods.goods_cover_thumb_small"
-            class="w-[70px] h-[70px]"
-            :src="img(goods.goods_cover_thumb_small)"
-            fit="contain"
-          >
-            <template #error>
-              <div class="image-slot">
-                <img
-                  class="w-[70px] h-[70px]"
-                  src="@/addon/shop/assets/goods_default.png"
-                />
-              </div>
+    <div>
+        <el-dialog v-model="showDialog" :title="t('editStockPopupTitle')" width="600px" :close-on-press-escape="false" :destroy-on-close="true" :close-on-click-modal="false">
+
+            <div class="flex items-center mb-[10px]">
+                <div class="min-w-[70px] h-[70px] flex items-center justify-center">
+                    <el-image v-if="goods.goods_cover_thumb_small" class="w-[70px] h-[70px]" :src="img(goods.goods_cover_thumb_small)" fit="contain">
+                        <template #error>
+                            <div class="image-slot">
+                                <img class="w-[70px] h-[70px]" src="@/addon/shop/assets/goods_default.png" />
+                            </div>
+                        </template>
+                    </el-image>
+                    <img v-else class="w-[70px] h-[70px]" src="@/addon/shop/assets/goods_default.png" fit="contain" />
+                </div>
+                <div class="ml-2">
+                    <span :title="goods.goods_name" class="multi-hidden">{{ goods.goods_name }}</span>
+                    <span class="text-primary text-[12px]">{{ goods.goods_type_name }}</span>
+                </div>
+            </div>
+
+            <!-- 批量设置 -->
+            <div class="batch-operation-sku" v-if="activeGoodsCount == 0 && goodsTable.data.length > 1">
+                <label>{{ t('batchOperationSku') }}</label>
+                <el-input v-model.trim="batchOperation.value" clearable :placeholder="t('stock')" class="set-input" maxlength="8" :autofocus="true" />
+                <el-button type="primary" @click="saveBatch">{{ t('confirm') }}</el-button>
+            </div>
+
+            <el-table :data="goodsTable.data" size="large" v-loading="goodsTable.loading" max-height="400">
+                <template #empty>
+                    <span>{{ !goodsTable.loading ? t('emptyData') : '' }}</span>
+                </template>
+
+                <el-table-column prop="sku_name" :label="t('skuName')" min-width="120" v-if="goodsTable.data.length > 1" />
+                <el-table-column prop="price" :label="t('price')" min-width="120" />
+                <el-table-column prop="stock" :label="t('stock')" min-width="120">
+                    <template #default="{ row }">
+                        <el-input v-model.trim="row.stock" clearable placeholder="0" maxlength="8" :disabled="activeGoodsCount > 0" />
+                    </template>
+                </el-table-column>
+
+            </el-table>
+
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                    <el-button type="primary" @click="save">{{ t('confirm') }}</el-button>
+                </span>
             </template>
-          </el-image>
-          <img
-            v-else
-            class="w-[70px] h-[70px]"
-            src="@/addon/shop/assets/goods_default.png"
-            fit="contain"
-          />
-        </div>
-        <div class="ml-2">
-          <span :title="goods.goods_name" class="multi-hidden">{{
-            goods.goods_name
-          }}</span>
-          <span class="text-primary text-[12px]">{{
-            goods.goods_type_name
-          }}</span>
-        </div>
-      </div>
-
-      <!-- 批量设置 -->
-      <div
-        class="batch-operation-sku"
-        v-if="activeGoodsCount == 0 && goodsTable.data.length > 1"
-      >
-        <label>{{ t('batchOperationSku') }}</label>
-        <el-input
-          v-model.trim="batchOperation.value"
-          clearable
-          :placeholder="t('stock')"
-          class="set-input"
-          maxlength="8"
-          :autofocus="true"
-        />
-        <el-button type="primary" @click="saveBatch">{{
-          t('confirm')
-        }}</el-button>
-      </div>
-
-      <el-table
-        :data="goodsTable.data"
-        size="large"
-        v-loading="goodsTable.loading"
-        max-height="400"
-      >
-        <template #empty>
-          <span>{{ !goodsTable.loading ? t('emptyData') : '' }}</span>
-        </template>
-
-        <el-table-column
-          prop="sku_name"
-          :label="t('skuName')"
-          min-width="120"
-          v-if="goodsTable.data.length > 1"
-        />
-        <el-table-column prop="price" :label="t('price')" min-width="120" />
-        <el-table-column prop="stock" :label="t('stock')" min-width="120">
-          <template #default="{ row }">
-            <el-input
-              v-model.trim="row.stock"
-              clearable
-              placeholder="0"
-              maxlength="8"
-              :disabled="activeGoodsCount > 0"
-            />
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-          <el-button type="primary" @click="save">{{ t('confirm') }}</el-button>
-        </span>
-      </template>
-    </el-dialog>
-  </div>
+        </el-dialog>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -107,9 +57,9 @@ import { ref, reactive } from 'vue'
 import { img } from '@/utils/common'
 import { ElMessage } from 'element-plus'
 import {
-  getActiveGoodsCount,
-  getGoodsSkuList,
-  editGoodsListStock,
+    getActiveGoodsCount,
+    getGoodsSkuList,
+    editGoodsListStock
 } from '@/addon/shop/api/goods'
 
 const goods: any = reactive({})
@@ -120,171 +70,169 @@ const showDialog = ref(false)
 const emit = defineEmits(['load'])
 
 interface goodsTableType {
-  loading: boolean
-  data: any[]
+    loading: boolean
+    data: any[]
 }
 const goodsTable = reactive<goodsTableType>({
-  loading: true,
-  data: [],
+    loading: true,
+    data: []
 })
 
 const batchOperation: any = reactive({
-  value: '', // 输入值
+    value: '' // 输入值
 })
 
 const saveBatch = () => {
-  if (batchOperation.value.length == 0) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('stockPlaceholder')}`,
-    })
-    return
-  }
+    if (batchOperation.value.length == 0) {
+        ElMessage({
+            type: 'warning',
+            message: `${t('stockPlaceholder')}`
+        })
+        return
+    }
 
-  if (!regExp.number.test(batchOperation.value)) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('stockTips')}`,
-    })
-    return
-  }
+    if (!regExp.number.test(batchOperation.value)) {
+        ElMessage({
+            type: 'warning',
+            message: `${t('stockTips')}`
+        })
+        return
+    }
 
-  if (batchOperation.value < 0) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('stockNotZeroTips')}`,
-    })
-    return
-  }
+    if (batchOperation.value < 0) {
+        ElMessage({
+            type: 'warning',
+            message: `${t('stockNotZeroTips')}`
+        })
+        return
+    }
 
-  goodsTable.data.forEach((item: any) => {
-    item.stock = batchOperation.value
-  })
+    goodsTable.data.forEach((item: any) => {
+        item.stock = batchOperation.value
+    })
 }
 
 /**
  * 获取商品列表
  */
 const loadGoodsList = () => {
-  goodsTable.loading = true
-
-  getGoodsSkuList({
-    goods_id: goods.goods_id,
-  })
-    .then((res) => {
-      goodsTable.loading = false
-      goodsTable.data = res.data
-    })
-    .catch(() => {
-      goodsTable.loading = false
+    goodsTable.loading = true
+
+    getGoodsSkuList({
+        goods_id: goods.goods_id
+    }).then(res => {
+        goodsTable.loading = false
+        goodsTable.data = res.data
+    }).catch(() => {
+        goodsTable.loading = false
     })
 }
 
 const show = (data: any) => {
-  Object.assign(goods, data)
-  // getActiveGoodsCountFn(); // 暂时不控制
-  loadGoodsList()
-  showDialog.value = true
+    Object.assign(goods, data)
+    // getActiveGoodsCountFn(); // 暂时不控制
+    loadGoodsList()
+    showDialog.value = true
 }
 
-const getActiveGoodsCountFn = () => {
-  getActiveGoodsCount({
-    goods_id: goods.goods_id,
-  }).then((res) => {
-    activeGoodsCount.value = res.data
-  })
+const getActiveGoodsCountFn = ()=>{
+    getActiveGoodsCount({
+        goods_id: goods.goods_id
+    }).then((res)=>{
+        activeGoodsCount.value = res.data;
+    })
 }
 
 // 正则表达式
 const regExp: any = {
-  number: /^\d{0,10}$/,
+    number: /^\d{0,10}$/
 }
 
 const verify = () => {
-  let result = true
-  for (let i = 0; i < goodsTable.data.length; i++) {
-    let item = goodsTable.data[i]
-
-    if (item.stock.length == 0) {
-      result = false
-      ElMessage({
-        type: 'warning',
-        message: `${t('stockPlaceholder')}`,
-      })
-      break
-    } else if (isNaN(item.stock) || !regExp.number.test(item.stock)) {
-      result = false
-      ElMessage({
-        type: 'warning',
-        message: `${t('stockTips')}`,
-      })
-      break
-    } else if (item.stock < 0) {
-      result = false
-      ElMessage({
-        type: 'warning',
-        message: `${t('stockNotZeroTips')}`,
-      })
-      break
+    let result = true
+    for (let i = 0; i < goodsTable.data.length; i++) {
+        let item = goodsTable.data[i]
+
+        if (item.stock.length == 0) {
+            result = false
+            ElMessage({
+                type: 'warning',
+                message: `${t('stockPlaceholder')}`
+            })
+            break
+        } else if (isNaN(item.stock) || !regExp.number.test(item.stock)) {
+            result = false
+            ElMessage({
+                type: 'warning',
+                message: `${t('stockTips')}`
+            })
+            break
+        } else if (item.stock < 0) {
+            result = false
+            ElMessage({
+                type: 'warning',
+                message: `${t('stockNotZeroTips')}`,
+            })
+            break
+        }
     }
-  }
 
-  return result
+    return result
 }
 
 const save = () => {
-  if (verify()) {
-    const sku_list = <any>[]
-    goodsTable.data.forEach((item: any) => {
-      sku_list.push({
-        sku_id: item.sku_id,
-        stock: item.stock,
-      })
-    })
-    editGoodsListStock({
-      goods_id: goods.goods_id,
-      sku_list,
-    }).then((res) => {
-      emit('load')
-      showDialog.value = false
-    })
-  }
+    if (verify()) {
+        const sku_list = <any>[]
+        goodsTable.data.forEach((item: any) => {
+            sku_list.push({
+                sku_id: item.sku_id,
+                stock: item.stock
+            })
+        })
+        editGoodsListStock({
+            goods_id: goods.goods_id,
+            sku_list
+        }).then(res => {
+            emit('load')
+            showDialog.value = false
+        })
+    }
 }
 
 defineExpose({
-  showDialog,
-  show,
+    showDialog,
+    show
 })
 </script>
 
 <style lang="scss" scoped>
 .form-item-wrap {
-  margin-right: 10px !important;
+    margin-right: 10px !important;
 
-  &.last-child {
-    margin-right: 0 !important;
-  }
+    &.last-child {
+        margin-right: 0 !important;
+    }
 }
 
 .batch-operation-sku {
-  display: flex;
-  margin-bottom: 16px;
-  background-color: #ffffff;
-  -ms-flex-wrap: nowrap;
-  flex-wrap: nowrap;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-
-  label {
-    font-size: 14px;
-    margin-right: 10px;
-  }
+    display: flex;
+    margin-bottom: 16px;
+    background-color: #ffffff;
+    -ms-flex-wrap: nowrap;
+    flex-wrap: nowrap;
+    -webkit-box-align: center;
+    -ms-flex-align: center;
+    align-items: center;
+
+    label {
+        font-size: 14px;
+        margin-right: 10px;
+    }
 
-  .set-input {
-    max-width: 150px;
-    min-width: 60px;
-    margin-right: 10px;
-  }
+    .set-input {
+        max-width: 150px;
+        min-width: 60px;
+        margin-right: 10px;
+    }
 }
 </style>
diff --git a/admin/src/addon/shop/views/goods/components/label-edit.vue b/admin/src/addon/shop/views/goods/components/label-edit.vue
index 6ae7ffaa..6b62708a 100644
--- a/admin/src/addon/shop/views/goods/components/label-edit.vue
+++ b/admin/src/addon/shop/views/goods/components/label-edit.vue
@@ -1,129 +1,57 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="title"
-    width="500px"
-    class="diy-dialog-wrap"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="120px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('labelName')" prop="label_name">
-        <el-input
-          v-model.trim="formData.label_name"
-          clearable
-          :placeholder="t('labelNamePlaceholder')"
-          class="input-width"
-          maxlength="10"
-        />
-      </el-form-item>
-      <el-form-item :label="t('groupName')" prop="group_id">
-        <el-select
-          v-model="formData.group_id"
-          :placeholder="t('groupNamePlaceholder')"
-          clearable
-          class="input-width"
-        >
-          <el-option
-            v-for="item in prop.groupList"
-            :key="item.group_id"
-            :label="item.group_name"
-            :value="item.group_id"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="t('styleType')">
-        <el-radio-group v-model="formData.style_type">
-          <el-radio label="diy">{{ t('styleByDiy') }}</el-radio>
-          <el-radio label="icon">{{ t('styleByIcon') }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item
-        :label="t('textColor')"
-        v-show="formData.style_type == 'diy'"
-      >
-        <el-color-picker
-          v-model="formData.color_json.text_color"
-          show-alpha
-          :predefine="predefineColors"
-        />
-        <div class="form-tip">{{ t('colorTips') }}</div>
-      </el-form-item>
-      <el-form-item :label="t('bgColor')" v-show="formData.style_type == 'diy'">
-        <el-color-picker
-          v-model="formData.color_json.bg_color"
-          show-alpha
-          :predefine="predefineColors"
-        />
-        <div class="form-tip">{{ t('colorTips') }}</div>
-      </el-form-item>
-      <el-form-item
-        :label="t('borderColor')"
-        v-show="formData.style_type == 'diy'"
-      >
-        <el-color-picker
-          v-model="formData.color_json.border_color"
-          show-alpha
-          :predefine="predefineColors"
-        />
-        <div class="form-tip">{{ t('colorTips') }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('icon')" v-show="formData.style_type == 'icon'">
-        <upload-image v-model="formData.icon" />
-        <div class="form-tip">{{ t('iconTips') }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('status')">
-        <el-switch
-          v-model="formData.status"
-          :active-value="1"
-          :inactive-value="0"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('memo')">
-        <el-input
-          v-model.trim="formData.memo"
-          type="textarea"
-          clearable
-          :placeholder="t('memoPlaceholder')"
-          class="input-width"
-          maxlength="50"
-        />
-      </el-form-item>
-      <el-form-item :label="t('sort')">
-        <el-input
-          v-model.trim="formData.sort"
-          clearable
-          :placeholder="t('sortPlaceholder')"
-          class="input-width"
-          @keyup="filterNumber($event)"
-          maxlength="8"
-          show-word-limit
-          @blur="formData.sort = $event.target.value"
-        />
-      </el-form-item>
-    </el-form>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+    <el-dialog v-model="showDialog" :title="title" width="500px" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+            <el-form-item :label="t('labelName')" prop="label_name">
+                <el-input v-model.trim="formData.label_name" clearable :placeholder="t('labelNamePlaceholder')" class="input-width" maxlength="10" />
+            </el-form-item>
+            <el-form-item :label="t('groupName')" prop="group_id">
+                <el-select v-model="formData.group_id" :placeholder="t('groupNamePlaceholder')" clearable class="input-width">
+                    <el-option v-for="item in prop.groupList" :key="item.group_id" :label="item.group_name" :value="item.group_id" />
+                </el-select>
+            </el-form-item>
+            <el-form-item :label="t('styleType')">
+                <el-radio-group v-model="formData.style_type">
+                    <el-radio label="diy">{{ t('styleByDiy') }}</el-radio>
+                    <el-radio label="icon">{{ t('styleByIcon') }}</el-radio>
+                </el-radio-group>
+            </el-form-item>
+            <el-form-item :label="t('textColor')" v-show="formData.style_type == 'diy'">
+                <el-color-picker v-model="formData.color_json.text_color" show-alpha :predefine="predefineColors" />
+                <div class="form-tip">{{ t('colorTips') }}</div>
+            </el-form-item>
+            <el-form-item :label="t('bgColor')" v-show="formData.style_type == 'diy'">
+                <el-color-picker v-model="formData.color_json.bg_color" show-alpha :predefine="predefineColors" />
+                <div class="form-tip">{{ t('colorTips') }}</div>
+            </el-form-item>
+            <el-form-item :label="t('borderColor')" v-show="formData.style_type == 'diy'">
+                <el-color-picker v-model="formData.color_json.border_color" show-alpha :predefine="predefineColors" />
+                <div class="form-tip">{{ t('colorTips') }}</div>
+            </el-form-item>
+
+            <el-form-item :label="t('icon')" v-show="formData.style_type == 'icon'">
+                <upload-image v-model="formData.icon" />
+                <div class="form-tip">{{ t('iconTips') }}</div>
+            </el-form-item>
+
+            <el-form-item :label="t('status')">
+                <el-switch v-model="formData.status" :active-value="1" :inactive-value="0" />
+            </el-form-item>
+
+            <el-form-item :label="t('memo')" >
+                <el-input v-model.trim="formData.memo" type="textarea" clearable :placeholder="t('memoPlaceholder')" class="input-width" maxlength="50"/>
+            </el-form-item>
+            <el-form-item :label="t('sort')" >
+                <el-input v-model.trim="formData.sort" clearable :placeholder="t('sortPlaceholder')" class="input-width" @keyup="filterNumber($event)" maxlength="8" show-word-limit @blur="formData.sort = $event.target.value"/>
+            </el-form-item>
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -134,10 +62,10 @@ import { filterNumber } from '@/utils/common'
 import { addLabel, editLabel, getLabelInfo } from '@/addon/shop/api/goods'
 
 const prop = defineProps({
-  groupList: {
-    type: Object,
-    default: [],
-  },
+    groupList: {
+        type: Object,
+        default: []
+    },
 })
 
 const showDialog = ref(false)
@@ -148,40 +76,40 @@ const title = ref('')
  * 表单数据
  */
 const initialFormData = {
-  label_id: '',
-  label_name: '',
-  group_id: '',
-  style_type: 'diy',
-  color_json: {
-    text_color: 'rgba(255, 255, 255, 1)',
-    bg_color: 'rgba(255, 65, 66, 1)',
-    border_color: '',
-  },
-  icon: '',
-  memo: '',
-  sort: '',
-  status: 1,
+    label_id: '',
+    label_name: '',
+    group_id:'',
+    style_type: 'diy',
+    color_json: {
+        text_color: 'rgba(255, 255, 255, 1)',
+        bg_color: 'rgba(255, 65, 66, 1)',
+        border_color: '',
+    },
+    icon: '',
+    memo: '',
+    sort: '',
+    status: 1
 }
 
 const predefineColors = ref([
-  '#F4391c',
-  '#ff4500',
-  '#ff8c00',
-  '#FFD009',
-  '#ffd700',
-  '#19C650',
-  '#90ee90',
-  '#00ced1',
-  '#1e90ff',
-  '#c71585',
-  '#FF407E',
-  '#CFAF70',
-  '#A253FF',
-  'rgba(255, 69, 0, 0.68)',
-  'rgb(255, 120, 0)',
-  'hsl(181, 100%, 37%)',
-  'hsla(209, 100%, 56%, 0.73)',
-  '#c7158577',
+    '#F4391c',
+    '#ff4500',
+    '#ff8c00',
+    '#FFD009',
+    '#ffd700',
+    '#19C650',
+    '#90ee90',
+    '#00ced1',
+    '#1e90ff',
+    '#c71585',
+    '#FF407E',
+    '#CFAF70',
+    '#A253FF',
+    'rgba(255, 69, 0, 0.68)',
+    'rgb(255, 120, 0)',
+    'hsl(181, 100%, 37%)',
+    'hsla(209, 100%, 56%, 0.73)',
+    '#c7158577'
 ])
 
 const formData: Record<string, any> = reactive({ ...initialFormData })
@@ -190,14 +118,14 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    label_name: [
-      { required: true, message: t('labelNamePlaceholder'), trigger: 'blur' },
-    ],
-    group_id: [
-      { required: true, message: t('groupNamePlaceholder'), trigger: 'blur' },
-    ],
-  }
+    return {
+        label_name: [
+            { required: true, message: t('labelNamePlaceholder'), trigger: 'blur' }
+        ],
+        group_id: [
+            { required: true, message: t('groupNamePlaceholder'), trigger: 'blur' }
+        ]
+    }
 })
 
 const emit = defineEmits(['complete'])
@@ -207,55 +135,53 @@ const emit = defineEmits(['complete'])
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  const save = formData.label_id ? editLabel : addLabel
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-
-      const data = formData
-
-      save(data)
-        .then((res) => {
-          loading.value = false
-          showDialog.value = false
-          emit('complete')
-        })
-        .catch((err) => {
-          loading.value = false
-        })
-    }
-  })
+    if (loading.value || !formEl) return
+    const save = formData.label_id ? editLabel : addLabel
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            const data = formData
+
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
 }
 
 // 获取字典数据
 const setFormData = async (row: any = null) => {
-  Object.assign(formData, initialFormData)
-  loading.value = true
-  if (row) {
-    const data = await (await getLabelInfo(row.label_id)).data
-    title.value = t('updateLabel')
-    if (data) {
-      Object.keys(formData).forEach((key: string) => {
-        if (data[key] != undefined) formData[key] = data[key]
-      })
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if (row) {
+        const data = await (await getLabelInfo(row.label_id)).data
+        title.value = t('updateLabel')
+        if (data) {
+            Object.keys(formData).forEach((key: string) => {
+                if (data[key] != undefined) formData[key] = data[key]
+            })
+        }
+    } else {
+        title.value = t('addLabel')
     }
-  } else {
-    title.value = t('addLabel')
-  }
-  loading.value = false
+    loading.value = false
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
 <style lang="scss" scoped></style>
 <style lang="scss">
-.diy-dialog-wrap .el-form-item__label {
-  height: auto !important;
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
 }
 </style>
diff --git a/admin/src/addon/shop/views/goods/components/label-group-edit.vue b/admin/src/addon/shop/views/goods/components/label-group-edit.vue
index ef031a07..a7dfc8c8 100644
--- a/admin/src/addon/shop/views/goods/components/label-group-edit.vue
+++ b/admin/src/addon/shop/views/goods/components/label-group-edit.vue
@@ -1,54 +1,21 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="title"
-    width="500px"
-    class="diy-dialog-wrap"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="120px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('groupName')" prop="group_name">
-        <el-input
-          v-model.trim="formData.group_name"
-          clearable
-          :placeholder="t('groupNamePlaceholder')"
-          class="input-width"
-          maxlength="10"
-        />
-      </el-form-item>
-      <el-form-item :label="t('sort')">
-        <el-input
-          v-model.trim="formData.sort"
-          clearable
-          :placeholder="t('sortPlaceholder')"
-          class="input-width"
-          @keyup="filterNumber($event)"
-          maxlength="8"
-          show-word-limit
-          @blur="formData.sort = $event.target.value"
-        />
-      </el-form-item>
-    </el-form>
+    <el-dialog v-model="showDialog" :title="title" width="500px" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+            <el-form-item :label="t('groupName')" prop="group_name">
+                <el-input v-model.trim="formData.group_name" clearable :placeholder="t('groupNamePlaceholder')" class="input-width" maxlength="10" />
+            </el-form-item>
+            <el-form-item :label="t('sort')" >
+                <el-input v-model.trim="formData.sort" clearable :placeholder="t('sortPlaceholder')" class="input-width" @keyup="filterNumber($event)" maxlength="8" show-word-limit @blur="formData.sort = $event.target.value"/>
+            </el-form-item>
+        </el-form>
 
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -56,11 +23,7 @@ import { ref, reactive, computed } from 'vue'
 import { t } from '@/lang'
 import type { FormInstance } from 'element-plus'
 import { filterNumber } from '@/utils/common'
-import {
-  addLabelGroup,
-  editLabelGroup,
-  getLabelGroupInfo,
-} from '@/addon/shop/api/goods'
+import { addLabelGroup, editLabelGroup, getLabelGroupInfo } from '@/addon/shop/api/goods'
 
 const showDialog = ref(false)
 const loading = ref(false)
@@ -70,9 +33,9 @@ const title = ref('')
  * 表单数据
  */
 const initialFormData = {
-  group_id: '',
-  group_name: '',
-  sort: '',
+    group_id: '',
+    group_name: '',
+    sort: ''
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -80,11 +43,11 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    group_name: [
-      { required: true, message: t('groupNamePlaceholder'), trigger: 'blur' },
-    ],
-  }
+    return {
+        group_name: [
+            { required: true, message: t('groupNamePlaceholder'), trigger: 'blur' }
+        ]
+    }
 })
 
 const emit = defineEmits(['complete'])
@@ -94,55 +57,53 @@ const emit = defineEmits(['complete'])
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  const save = formData.group_id ? editLabelGroup : addLabelGroup
+    if (loading.value || !formEl) return
+    const save = formData.group_id ? editLabelGroup : addLabelGroup
 
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
 
-      const data = formData
+            const data = formData
 
-      save(data)
-        .then((res) => {
-          loading.value = false
-          showDialog.value = false
-          emit('complete')
-        })
-        .catch((err) => {
-          loading.value = false
-        })
-    }
-  })
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
 }
 
 // 获取字典数据
 const setFormData = async (row: any = null) => {
-  Object.assign(formData, initialFormData)
-  loading.value = true
-  if (row) {
-    const data = await (await getLabelGroupInfo(row.group_id)).data
-    title.value = t('updateLabelGroup')
-    if (data) {
-      Object.keys(formData).forEach((key: string) => {
-        if (data[key] != undefined) formData[key] = data[key]
-      })
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if (row) {
+        const data = await (await getLabelGroupInfo(row.group_id)).data
+        title.value = t('updateLabelGroup')
+        if (data) {
+            Object.keys(formData).forEach((key: string) => {
+                if (data[key] != undefined) formData[key] = data[key]
+            })
+        }
+    } else {
+        title.value = t('addLabelGroup')
     }
-  } else {
-    title.value = t('addLabelGroup')
-  }
-  loading.value = false
+    loading.value = false
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
 <style lang="scss" scoped></style>
 <style lang="scss">
-.diy-dialog-wrap .el-form-item__label {
-  height: auto !important;
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
 }
 </style>
diff --git a/admin/src/addon/shop/views/goods/components/newcomer-goods-select-popup.vue b/admin/src/addon/shop/views/goods/components/newcomer-goods-select-popup.vue
index fca3ef49..ab839da6 100644
--- a/admin/src/addon/shop/views/goods/components/newcomer-goods-select-popup.vue
+++ b/admin/src/addon/shop/views/goods/components/newcomer-goods-select-popup.vue
@@ -1,345 +1,191 @@
 <template>
-  <div>
-    <div @click="show">
-      <slot>
-        <el-button>{{ t('goodsSelectPopupSelectGoodsButton') }}</el-button>
-        <div
-          class="inline-block ml-[10px] text-[14px]"
-          v-show="goodsIds.length"
-        >
-          <span>{{ t('goodsSelectPopupSelect') }}</span>
-          <span class="text-primary mx-[2px]">{{ goodsIds.length }}</span>
-          <span>{{ t('goodsSelectPopupPiece') }}</span>
-        </div>
-      </slot>
-    </div>
-    <el-dialog
-      v-model="showDialog"
-      :title="t('goodsSelectPopupSelectGoodsDialog')"
-      width="1000px"
-      :close-on-press-escape="false"
-      :destroy-on-close="true"
-      :close-on-click-modal="false"
-    >
-      <el-form
-        :inline="true"
-        :model="goodsTable.searchParam"
-        ref="searchFormRef"
-      >
-        <el-form-item prop="select_type" class="form-item-wrap">
-          <el-select
-            v-model="goodsTable.searchParam.select_type"
-            @change="handleSelectTypeChange"
-          >
-            <el-option :label="t('goodsSelectPopupAllGoods')" value="all" />
-            <el-option
-              :label="t('goodsSelectPopupSelectedGoods')"
-              value="selected"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item
-          :label="t('goodsSelectPopupGoodsName')"
-          prop="keyword"
-          class="form-item-wrap"
-        >
-          <el-input
-            v-model.trim="goodsTable.searchParam.keyword"
-            :placeholder="t('goodsSelectPopupGoodsNamePlaceholder')"
-            maxlength="60"
-          />
-        </el-form-item>
-        <el-form-item
-          :label="t('goodsSelectPopupGoodsCategory')"
-          prop="goods_category"
-          class="form-item-wrap"
-        >
-          <el-cascader
-            v-model="goodsTable.searchParam.goods_category"
-            :options="goodsCategoryOptions"
-            :placeholder="t('goodsSelectPopupGoodsCategoryPlaceholder')"
-            clearable
-            :props="{ value: 'value', label: 'label', emitPath: false }"
-          />
-        </el-form-item>
-        <el-form-item
-          :label="t('goodsSelectPopupGoodsType')"
-          prop="goods_type"
-          class="form-item-wrap"
-        >
-          <el-select
-            v-model="goodsTable.searchParam.goods_type"
-            :placeholder="t('goodsSelectPopupGoodsTypePlaceholder')"
-            clearable
-          >
-            <el-option
-              v-for="item in goodsType"
-              :key="item.type"
-              :label="item.name"
-              :value="item.type"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item class="form-item-wrap">
-          <el-button type="primary" @click="loadGoodsList()">{{
-            t('search')
-          }}</el-button>
-          <el-button @click="resetForm(searchFormRef)">{{
-            t('reset')
-          }}</el-button>
-        </el-form-item>
-      </el-form>
-
-      <div class="table w-[100%]" v-loading="goodsTable.loading">
-        <div class="table-head flex items-center bg-[#f5f7f9] py-[8px]">
-          <div class="w-[3%]"></div>
-          <div class="w-[7%]">
-            <el-checkbox
-              v-model="staircheckAll"
-              :indeterminate="isStairIndeterminate"
-              @change="handleCheckAllChange"
-            />
-          </div>
-          <div class="w-[50%]">商品信息</div>
-          <div class="w-[20%]">商品价格</div>
-          <div class="w-[20%]">库存</div>
+    <div>
+        <div @click="show">
+            <slot>
+                <el-button>{{ t('goodsSelectPopupSelectGoodsButton') }}</el-button>
+                <div class="inline-block ml-[10px] text-[14px]" v-show="goodsIds.length">
+                    <span>{{ t('goodsSelectPopupSelect') }}</span>
+                    <span class="text-primary mx-[2px]">{{ goodsIds.length }}</span>
+                    <span>{{ t('goodsSelectPopupPiece') }}</span>
+                </div>
+            </slot>
         </div>
-        <div class="table-body h-[350px] overflow-y-auto">
-          <div
-            v-for="(row, rowIndex) in goodsTable.data"
-            :key="rowIndex"
-            class="flex flex-col"
-          >
-            <!-- 内容 -->
-            <div
-              class="flex items-center border-solid border-[#e5e7eb] py-[8px] border-b-[1px]"
-            >
-              <div v-if="prop.mode == 'spu'" class="w-[3%]"></div>
-              <div
-                v-if="prop.mode == 'sku' && row.skuList.length > 1"
-                class="w-[3%] cursor-pointer text-center !text-[10px]"
-                @click="secondLevelArrowChange(row)"
-                :class="{
-                  'iconfont iconxiangyoujiantou': row.skuList.length,
-                  'arrow-show': row.isShow,
-                }"
-              ></div>
-              <div
-                v-if="prop.mode == 'sku' && row.skuList.length <= 1"
-                class="w-[3%]"
-              ></div>
-              <div class="w-[7%]">
-                <el-checkbox
-                  v-model="row.secondLevelCheckAll"
-                  :indeterminate="row.isSecondLevelIndeterminate"
-                  @change="secondLevelHandleCheckAllChange($event, row)"
-                />
-              </div>
-              <div class="flex items-center cursor-pointer w-[50%]">
-                <div
-                  class="min-w-[60px] h-[60px] flex items-center justify-center"
-                >
-                  <el-image
-                    v-if="row.goods_cover_thumb_small"
-                    class="w-[60px] h-[60px]"
-                    :src="img(row.goods_cover_thumb_small)"
-                    fit="contain"
-                  >
-                    <template #error>
-                      <div class="image-slot">
-                        <img
-                          class="w-[60px] h-[60px]"
-                          src="@/addon/shop/assets/goods_default.png"
-                        />
-                      </div>
-                    </template>
-                  </el-image>
-                  <img
-                    v-else
-                    class="w-[60px] h-[60px]"
-                    src="@/addon/shop/assets/goods_default.png"
-                    fit="contain"
-                  />
+        <el-dialog v-model="showDialog" :title="t('goodsSelectPopupSelectGoodsDialog')" width="1000px" :close-on-press-escape="false" :destroy-on-close="true" :close-on-click-modal="false">
+
+            <el-form :inline="true" :model="goodsTable.searchParam" ref="searchFormRef">
+                <el-form-item prop="select_type" class="form-item-wrap">
+                    <el-select v-model="goodsTable.searchParam.select_type" @change="handleSelectTypeChange">
+                        <el-option :label="t('goodsSelectPopupAllGoods')" value="all" />
+                        <el-option :label="t('goodsSelectPopupSelectedGoods')" value="selected" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item :label="t('goodsSelectPopupGoodsName')" prop="keyword" class="form-item-wrap">
+                    <el-input v-model.trim="goodsTable.searchParam.keyword" :placeholder="t('goodsSelectPopupGoodsNamePlaceholder')" maxlength="60" />
+                </el-form-item>
+                <el-form-item :label="t('goodsSelectPopupGoodsCategory')" prop="goods_category" class="form-item-wrap">
+                    <el-cascader  v-model="goodsTable.searchParam.goods_category"
+                        :options="goodsCategoryOptions" :placeholder="t('goodsSelectPopupGoodsCategoryPlaceholder')"
+                        clearable :props="{ value: 'value', label: 'label', emitPath:false }" />
+                </el-form-item>
+                <el-form-item :label="t('goodsSelectPopupGoodsType')" prop="goods_type" class="form-item-wrap">
+                    <el-select v-model="goodsTable.searchParam.goods_type" :placeholder="t('goodsSelectPopupGoodsTypePlaceholder')" clearable>
+                        <el-option v-for="item in goodsType" :key="item.type" :label="item.name" :value="item.type" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item class="form-item-wrap">
+                    <el-button type="primary" @click="loadGoodsList()">{{ t('search') }}</el-button>
+                    <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                </el-form-item>
+            </el-form>
+
+            <div class="table w-[100%]" v-loading="goodsTable.loading">
+                <div class="table-head flex items-center bg-[#f5f7f9] py-[8px]">
+                    <div class="w-[3%]"></div>
+                    <div class="w-[7%]">
+                        <el-checkbox v-model="staircheckAll" :indeterminate="isStairIndeterminate" @change="handleCheckAllChange" />
+                    </div>
+                    <div class="w-[50%]">商品信息</div>
+                    <div class="w-[20%]">商品价格</div>
+                    <div class="w-[20%]">库存</div>
                 </div>
-                <div class="ml-2">
-                  <span
-                    :title="row.goods_name"
-                    class="multi-hidden leading-[1.4]"
-                    >{{ row.goods_name }}</span
-                  >
-                  <span class="text-primary text-[12px]">{{
-                    row.goods_type_name
-                  }}</span>
+                <div class="table-body h-[350px] overflow-y-auto">
+                    <div v-for="(row,rowIndex) in goodsTable.data" :key="rowIndex" class="flex flex-col">
+                        <!-- 内容 -->
+                        <div class="flex items-center border-solid border-[#e5e7eb] py-[8px] border-b-[1px]">
+                            <div v-if="prop.mode == 'spu'" class="w-[3%]"></div>
+                            <div v-if="prop.mode == 'sku' && row.skuList.length > 1" class="w-[3%] cursor-pointer text-center !text-[10px]" @click="secondLevelArrowChange(row)" :class="{'iconfont iconxiangyoujiantou': row.skuList.length, 'arrow-show': row.isShow}"></div>
+                            <div v-if="prop.mode == 'sku' && row.skuList.length <= 1" class="w-[3%]"></div>
+                            <div class="w-[7%]">
+                                <el-checkbox v-model="row.secondLevelCheckAll" :indeterminate="row.isSecondLevelIndeterminate" @change="secondLevelHandleCheckAllChange($event,row)" />
+                            </div>
+                            <div class="flex items-center cursor-pointer w-[50%]">
+                                <div class="min-w-[60px] h-[60px] flex items-center justify-center">
+                                    <el-image v-if="row.goods_cover_thumb_small" class="w-[60px] h-[60px]" :src="img(row.goods_cover_thumb_small)" fit="contain">
+                                        <template #error>
+                                            <div class="image-slot">
+                                                <img class="w-[60px] h-[60px]" src="@/addon/shop/assets/goods_default.png" />
+                                            </div>
+                                        </template>
+                                    </el-image>
+                                    <img v-else class="w-[60px] h-[60px]" src="@/addon/shop/assets/goods_default.png" fit="contain" />
+                                </div>
+                                <div class="ml-2">
+                                    <span :title="row.goods_name" class="multi-hidden leading-[1.4]">{{ row.goods_name }}</span>
+                                    <span class="text-primary text-[12px]">{{ row.goods_type_name }}</span>
+                                </div>
+                            </div>
+                            <div class="w-[20%]">￥{{ row.skuList.length > 1 ? row.goodsSku.price : row.goodsSku.newcomer_price }}</div>
+                            <div class="w-[20%]">{{row.stock}}</div>
+                        </div>
+
+                        <div v-show="prop.mode == 'sku' && row.skuList.length > 1">
+                            <!-- 子级 -->
+                            <div v-for="(item,index) in row.skuList" :key="index" class="flex items-center py-[8px] border-solid border-transparent border-b-[1px]" :class="{'hidden': !row.isShow, 'border-[#e5e7eb]': index == (row.skuList.length-1)}">
+                                <div class="w-[6%]"></div>
+                                <div class="w-[4%]">
+                                    <el-checkbox v-model="item.threeLevelCheckAll"  @change="subChildHandleCheckAllChange($event,row,item)" />
+                                </div>
+                                <div class="flex items-center cursor-pointer w-[50%]">
+                                    <div class="min-w-[60px] h-[60px] flex items-center justify-center">
+                                        <el-image v-if="item.sku_image" class="w-[60px] h-[60px]" :src="img(item.sku_image)" fit="contain">
+                                            <template #error>
+                                                <div class="image-slot">
+                                                    <img class="w-[60px] h-[60px]" src="@/addon/shop/assets/goods_default.png" />
+                                                </div>
+                                            </template>
+                                        </el-image>
+                                        <img v-else class="w-[60px] h-[60px]" src="@/addon/shop/assets/goods_default.png" fit="contain" />
+                                    </div>
+                                    <div class="ml-2">
+                                        <span :title="item.sku_name || row.goods_name" class="multi-hidden leading-[1.4]">{{ item.sku_name || row.goods_name }}</span>
+                                        <span class="text-primary text-[12px]">{{ row.goods_type_name }}</span>
+                                    </div>
+                                </div>
+                                <div class="w-[20%] flex">￥{{ item.newcomer_price }}</div>
+                                <div class="w-[20%] flex">{{ item.stock }}</div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div v-if="!goodsTable.data.length && !goodsTable.loading" class="h-[60px] flex items-center justify-center border-solid border-[#e5e7eb] py-[12px] border-b-[1px]">
+                        暂无数据
+                    </div>
                 </div>
-              </div>
-              <div class="w-[20%]">
-                ￥{{
-                  row.skuList.length > 1
-                    ? row.goodsSku.price
-                    : row.goodsSku.newcomer_price
-                }}
-              </div>
-              <div class="w-[20%]">{{ row.stock }}</div>
             </div>
 
-            <div v-show="prop.mode == 'sku' && row.skuList.length > 1">
-              <!-- 子级 -->
-              <div
-                v-for="(item, index) in row.skuList"
-                :key="index"
-                class="flex items-center py-[8px] border-solid border-transparent border-b-[1px]"
-                :class="{
-                  hidden: !row.isShow,
-                  'border-[#e5e7eb]': index == row.skuList.length - 1,
-                }"
-              >
-                <div class="w-[6%]"></div>
-                <div class="w-[4%]">
-                  <el-checkbox
-                    v-model="item.threeLevelCheckAll"
-                    @change="subChildHandleCheckAllChange($event, row, item)"
-                  />
-                </div>
-                <div class="flex items-center cursor-pointer w-[50%]">
-                  <div
-                    class="min-w-[60px] h-[60px] flex items-center justify-center"
-                  >
-                    <el-image
-                      v-if="item.sku_image"
-                      class="w-[60px] h-[60px]"
-                      :src="img(item.sku_image)"
-                      fit="contain"
-                    >
-                      <template #error>
-                        <div class="image-slot">
-                          <img
-                            class="w-[60px] h-[60px]"
-                            src="@/addon/shop/assets/goods_default.png"
-                          />
-                        </div>
-                      </template>
-                    </el-image>
-                    <img
-                      v-else
-                      class="w-[60px] h-[60px]"
-                      src="@/addon/shop/assets/goods_default.png"
-                      fit="contain"
-                    />
-                  </div>
-                  <div class="ml-2">
-                    <span
-                      :title="item.sku_name || row.goods_name"
-                      class="multi-hidden leading-[1.4]"
-                      >{{ item.sku_name || row.goods_name }}</span
-                    >
-                    <span class="text-primary text-[12px]">{{
-                      row.goods_type_name
-                    }}</span>
-                  </div>
+
+            <div class="mt-[16px] flex">
+                <div class="flex items-center flex-1">
+                    <div class="layui-table-bottom-left-container mr-[10px]" v-show="selectGoodsNum">
+                        <span>{{ t('goodsSelectPopupBeforeTip') }}</span>
+                        <span class="text-primary mx-[2px]">{{ selectGoodsNum }}</span>
+                        <span>{{ t('goodsSelectPopupAfterTip') }}</span>
+                    </div>
+                    <el-button type="primary" link @click="clear" v-show="selectGoodsNum">{{ t('goodsSelectPopupClearGoods') }}</el-button>
                 </div>
-                <div class="w-[20%] flex">￥{{ item.newcomer_price }}</div>
-                <div class="w-[20%] flex">{{ item.stock }}</div>
-              </div>
+                <el-pagination v-model:current-page="goodsTable.page" v-model:page-size="goodsTable.limit"
+                    layout="total, sizes, prev, pager, next, jumper" :total="goodsTable.total"
+                    @size-change="loadGoodsList()" @current-change="loadGoodsList" />
             </div>
-          </div>
-
-          <div
-            v-if="!goodsTable.data.length && !goodsTable.loading"
-            class="h-[60px] flex items-center justify-center border-solid border-[#e5e7eb] py-[12px] border-b-[1px]"
-          >
-            暂无数据
-          </div>
-        </div>
-      </div>
-
-      <div class="mt-[16px] flex">
-        <div class="flex items-center flex-1">
-          <div
-            class="layui-table-bottom-left-container mr-[10px]"
-            v-show="selectGoodsNum"
-          >
-            <span>{{ t('goodsSelectPopupBeforeTip') }}</span>
-            <span class="text-primary mx-[2px]">{{ selectGoodsNum }}</span>
-            <span>{{ t('goodsSelectPopupAfterTip') }}</span>
-          </div>
-          <el-button
-            type="primary"
-            link
-            @click="clear"
-            v-show="selectGoodsNum"
-            >{{ t('goodsSelectPopupClearGoods') }}</el-button
-          >
-        </div>
-        <el-pagination
-          v-model:current-page="goodsTable.page"
-          v-model:page-size="goodsTable.limit"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="goodsTable.total"
-          @size-change="loadGoodsList()"
-          @current-change="loadGoodsList"
-        />
-      </div>
-
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-          <el-button type="primary" @click="save">{{ t('confirm') }}</el-button>
-        </span>
-      </template>
-    </el-dialog>
-  </div>
+
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                    <el-button type="primary" @click="save">{{ t('confirm') }}</el-button>
+                </span>
+            </template>
+        </el-dialog>
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { t } from '@/lang'
 import { ref, reactive, computed, nextTick } from 'vue'
 import { cloneDeep } from 'lodash-es'
-import { img, deepClone } from '@/utils/common'
+import { img,deepClone } from '@/utils/common'
 import { ElMessage } from 'element-plus'
 import { getCategoryTree, getGoodsType } from '@/addon/shop/api/goods'
-import {
-  getNewcomerSelectGoodsList,
-  getNewcomerGoodsList,
-} from '@/addon/shop/api/marketing'
+import { getNewcomerSelectGoodsList, getNewcomerGoodsList } from '@/addon/shop/api/marketing'
 
 const prop = defineProps({
-  modelValue: {
-    type: String,
-    default: '',
-  },
-  max: {
-    type: Number,
-    default: 0,
-  },
-  min: {
-    type: Number,
-    default: 0,
-  },
-  mode: {
-    type: String,
-    default: 'spu', // spu：按商品，sku：按多规格
-  },
-  way: {
-    type: String,
-    default: '', // 选择方式，空：代表全部， single：单一
-  },
+    modelValue: {
+        type: String,
+        default: ''
+    },
+    max: {
+        type: Number,
+        default: 0
+    },
+    min: {
+        type: Number,
+        default: 0
+    },
+    mode: {
+        type: String,
+        default: 'spu' // spu：按商品，sku：按多规格
+    },
+    way: {
+        type: String,
+        default: '' // 选择方式，空：代表全部， single：单一
+    },
 })
 
-const emit = defineEmits(['update:modelValue', 'goodsSelect'])
+const emit = defineEmits(['update:modelValue','goodsSelect'])
 
 // 通过prop.mode来决定 数据前缀是sku_还是goods_
-let replacePrefix = prop.mode == 'sku' ? 'sku_' : 'goods_'
+let replacePrefix = prop.mode == "sku" ? 'sku_' : 'goods_';
+
 
-const isStairIndeterminate = ref(false)
-const staircheckAll = ref(false)
+const isStairIndeterminate = ref(false);
+const staircheckAll = ref(false);
 
 const goodsIds: any = computed({
-  get() {
-    return prop.modelValue
-  },
-  set(value) {
-    emit('update:modelValue', value)
-  },
+    get () {
+        return prop.modelValue
+    },
+    set (value) {
+        emit('update:modelValue', value)
+    }
 })
 
 const showDialog = ref(false)
@@ -352,31 +198,31 @@ const selectGoodsId: any = reactive([])
 
 // 已选商品数量
 const selectGoodsNum: any = computed(() => {
-  return Object.keys(selectGoods).length
+    return Object.keys(selectGoods).length
 })
 
 const goodsTable = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    keyword: '',
-    goods_category: [],
-    select_type: 'all',
-    goods_ids: '',
-    verify_goods_ids: '',
-    verify_sku_ids: '',
-    goods_type: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        keyword: '',
+        goods_category: [],
+        select_type: 'all',
+        goods_ids: '',
+        verify_goods_ids: '',
+        verify_sku_ids: '',
+        goods_type: ''
+    }
 })
 
 const searchFormRef = ref()
 
 // 查询全部/已选商品
 const handleSelectTypeChange = (value: any) => {
-  loadGoodsList()
+    loadGoodsList()
 }
 
 // 商品分类
@@ -387,44 +233,40 @@ const goodsType: any = reactive([])
 
 // 初始化数据
 const initData = () => {
-  // 查询商品分类树结构
-  getCategoryTree().then((res) => {
-    const data = res.data
-    if (data) {
-      const goodsCategoryTree: any = []
-      data.forEach((item: any) => {
-        const children: any = []
-        if (item.child_list) {
-          item.child_list.forEach((childItem: any) => {
-            children.push({
-              value: childItem.category_id,
-              label: childItem.category_name,
+// 查询商品分类树结构
+    getCategoryTree().then((res) => {
+        const data = res.data
+        if (data) {
+            const goodsCategoryTree: any = []
+            data.forEach((item: any) => {
+                const children: any = []
+                if (item.child_list) {
+                    item.child_list.forEach((childItem: any) => {
+                        children.push({
+                            value: childItem.category_id,
+                            label: childItem.category_name
+                        })
+                    })
+                }
+                goodsCategoryTree.push({
+                    value: item.category_id,
+                    label: item.category_name,
+                    children
+                })
             })
-          })
+            goodsCategoryOptions.splice(0, goodsCategoryOptions.length, ...goodsCategoryTree)
         }
-        goodsCategoryTree.push({
-          value: item.category_id,
-          label: item.category_name,
-          children,
-        })
-      })
-      goodsCategoryOptions.splice(
-        0,
-        goodsCategoryOptions.length,
-        ...goodsCategoryTree
-      )
-    }
-  })
-
-  // 商品类型
-  getGoodsType().then((res) => {
-    const data = res.data
-    if (data) {
-      for (const k in data) {
-        goodsType.push(data[k])
-      }
-    }
-  })
+    })
+
+    // 商品类型
+    getGoodsType().then((res) => {
+        const data = res.data
+        if (data) {
+            for (const k in data) {
+                goodsType.push(data[k])
+            }
+        }
+    })
 }
 
 initData()
@@ -434,450 +276,428 @@ const goodsListTableRef = ref()
 // 选中数据
 const multipleSelection: any = ref([])
 
+
 // 箭头选择事件
-const secondLevelArrowChange = (data) => {
-  data.isShow = !data.isShow
+const secondLevelArrowChange = (data)=>{
+    data.isShow = !data.isShow;
 }
 
 // 一级复选框
-const handleCheckAllChange = (isSelect) => {
-  isStairIndeterminate.value = false
-  goodsTable.data.forEach((item, index) => {
-    item.secondLevelCheckAll = isSelect
-    item.skuList.forEach((subItem, subIndex) => {
-      subItem.threeLevelCheckAll = isSelect
-    })
-  })
-  if (isSelect) {
-    goodsTable.data.forEach((item: any) => {
-      if (prop.mode == 'spu') {
-        selectGoods[replacePrefix + item.goods_id] = item
-        selectGoodsId.push(item.goods_id)
-      } else {
-        item.skuList.forEach((skuItem: any) => {
-          selectGoodsId.push(skuItem.sku_id)
-          selectGoods[replacePrefix + skuItem.sku_id] = deepClone(skuItem)
-          selectGoods[replacePrefix + skuItem.sku_id].goods_name =
-            item.goods_name // 多规格模式，要增加商品名称、商品类型，后续还会增加，满足不同业务场景
-          selectGoods[replacePrefix + skuItem.sku_id].goods_type_name =
-            item.goods_type_name
-          selectGoods[replacePrefix + skuItem.sku_id].goods_type =
-            item.goods_type
+const handleCheckAllChange = (isSelect) =>{
+    isStairIndeterminate.value = false;
+    goodsTable.data.forEach((item,index) => {
+        item.secondLevelCheckAll = isSelect;
+        item.skuList.forEach((subItem, subIndex) => {
+            subItem.threeLevelCheckAll = isSelect;
+        });
+    });
+    if (isSelect) {
+        goodsTable.data.forEach((item: any) => {
+            if(prop.mode == 'spu') {
+                selectGoods[replacePrefix + item.goods_id] = item
+                selectGoodsId.push(item.goods_id)
+            }else{
+                item.skuList.forEach((skuItem:any)=>{
+                    selectGoodsId.push(skuItem.sku_id);
+                    selectGoods[replacePrefix + skuItem.sku_id] = deepClone(skuItem);
+                    selectGoods[replacePrefix + skuItem.sku_id].goods_name = item.goods_name; // 多规格模式，要增加商品名称、商品类型，后续还会增加，满足不同业务场景
+                    selectGoods[replacePrefix + skuItem.sku_id].goods_type_name = item.goods_type_name;
+                    selectGoods[replacePrefix + skuItem.sku_id].goods_type = item.goods_type;
+                })
+
+            }
         })
-      }
-    })
-  } else {
-    // 未选中，删除当前页面的数据
-    goodsTable.data.forEach((item: any) => {
-      if (prop.mode == 'spu') {
-        selectGoodsId.splice(selectGoodsId.indexOf(item.goods_id), 1)
-        delete selectGoods[replacePrefix + item.goods_id]
-      } else {
-        item.skuList.forEach((skuItem: any) => {
-          selectGoodsId.splice(selectGoodsId.indexOf(skuItem.sku_id), 1)
-          delete selectGoods[replacePrefix + skuItem.sku_id]
+    } else {
+        // 未选中，删除当前页面的数据
+        goodsTable.data.forEach((item: any) => {
+            if(prop.mode == 'spu') {
+                selectGoodsId.splice(selectGoodsId.indexOf(item.goods_id), 1)
+                delete selectGoods[replacePrefix + item.goods_id]
+            }else{
+                item.skuList.forEach((skuItem:any)=>{
+                    selectGoodsId.splice(selectGoodsId.indexOf(skuItem.sku_id), 1)
+                    delete selectGoods[replacePrefix + skuItem.sku_id]
+                })
+            }
         })
-      }
-    })
-  }
+    }
 }
 
 // 二级复选框
-const secondLevelHandleCheckAllChange = (isSelect, row) => {
-  row.skuList.forEach((item, index) => {
-    item.threeLevelCheckAll = isSelect
-  })
-  detectionAllSelect()
-
-  if (prop.mode == 'spu') {
-    if (isSelect) {
-      selectGoodsId.push(row.goods_id)
-      selectGoods[replacePrefix + row.goods_id] = deepClone(row)
-    } else {
-      selectGoodsId.splice(selectGoodsId.indexOf(row.goods_id), 1)
-      // 未选中，删除当前商品
-      delete selectGoods[replacePrefix + row.goods_id]
+const secondLevelHandleCheckAllChange = (isSelect,row)=>{
+
+    row.skuList.forEach((item,index) => {
+        item.threeLevelCheckAll = isSelect;
+    });
+    detectionAllSelect();
+    
+    if(prop.mode == 'spu'){
+        if (isSelect) {
+            selectGoodsId.push(row.goods_id)
+            selectGoods[replacePrefix + row.goods_id] = deepClone(row)
+        } else {
+            selectGoodsId.splice(selectGoodsId.indexOf(row.goods_id),1)
+            // 未选中，删除当前商品
+            delete selectGoods[replacePrefix + row.goods_id]
+        }
+    }else{
+        if (isSelect) {
+            row.skuList.forEach((item,index) => {
+                selectGoodsId.push(item.sku_id);
+                selectGoods[replacePrefix + item.sku_id] = deepClone(item);
+                selectGoods[replacePrefix + item.sku_id].goods_name = row.goods_name; // 多规格模式，要增加商品名称、商品类型，后续还会增加，满足不同业务场景
+                selectGoods[replacePrefix + item.sku_id].goods_type_name = row.goods_type_name;
+                selectGoods[replacePrefix + item.sku_id].goods_type = row.goods_type;
+            });
+        } else {
+            row.skuList.forEach((item,index) => {
+                selectGoodsId.splice(selectGoodsId.indexOf(item.sku_id),1)
+                // 未选中，删除当前商品
+                delete selectGoods[replacePrefix + item.sku_id]
+            });
+        }
     }
-  } else {
-    if (isSelect) {
-      row.skuList.forEach((item, index) => {
-        selectGoodsId.push(item.sku_id)
-        selectGoods[replacePrefix + item.sku_id] = deepClone(item)
-        selectGoods[replacePrefix + item.sku_id].goods_name = row.goods_name // 多规格模式，要增加商品名称、商品类型，后续还会增加，满足不同业务场景
-        selectGoods[replacePrefix + item.sku_id].goods_type_name =
-          row.goods_type_name
-        selectGoods[replacePrefix + item.sku_id].goods_type = row.goods_type
-      })
-    } else {
-      row.skuList.forEach((item, index) => {
-        selectGoodsId.splice(selectGoodsId.indexOf(item.sku_id), 1)
-        // 未选中，删除当前商品
-        delete selectGoods[replacePrefix + item.sku_id]
-      })
+
+    // 用于可扩展的表格或树表格，如果某行被扩展，则切换。 使用第二个参数，您可以直接设置该行应该被扩展或折叠。
+    // setTimeout(() => {
+    //     goodsListTableRef.value.toggleRowExpansion(...Object.values(spreadTableData),true)
+    // }, 0);
+
+    // 当所选数量超出限制数量【prop.max】时，添加一个就会删除开头的第一个或多个，最终保证所选的数量小于等于prop.max
+    if(prop.max && prop.max > 0 && Object.keys(selectGoods).length > 0 && Object.keys(selectGoods).length > prop.max){
+        let len = Object.keys(selectGoods).length;
+        len = len - prop.max;
+
+        let goodsIdCopy = cloneDeep(selectGoodsId);
+        goodsIdCopy.forEach((item,index,arr) => {
+            if(index < len){
+                let indent = selectGoodsId.indexOf(item)
+                delete selectGoods[replacePrefix+selectGoodsId[indent]]
+                selectGoodsId.splice(indent,1) 
+            }
+        });
+        setGoodsSelected();
     }
-  }
-
-  // 用于可扩展的表格或树表格，如果某行被扩展，则切换。 使用第二个参数，您可以直接设置该行应该被扩展或折叠。
-  // setTimeout(() => {
-  //     goodsListTableRef.value.toggleRowExpansion(...Object.values(spreadTableData),true)
-  // }, 0);
-
-  // 当所选数量超出限制数量【prop.max】时，添加一个就会删除开头的第一个或多个，最终保证所选的数量小于等于prop.max
-  if (
-    prop.max &&
-    prop.max > 0 &&
-    Object.keys(selectGoods).length > 0 &&
-    Object.keys(selectGoods).length > prop.max
-  ) {
-    let len = Object.keys(selectGoods).length
-    len = len - prop.max
-
-    let goodsIdCopy = cloneDeep(selectGoodsId)
-    goodsIdCopy.forEach((item, index, arr) => {
-      if (index < len) {
-        let indent = selectGoodsId.indexOf(item)
-        delete selectGoods[replacePrefix + selectGoodsId[indent]]
-        selectGoodsId.splice(indent, 1)
-      }
-    })
-    setGoodsSelected()
-  }
 }
 
+
 // 三级复选框
-const subChildHandleCheckAllChange = (
-  selected: any,
-  parentData: any,
-  data: any
-) => {
-  let selectNum = 0
-  parentData.skuList.forEach((item, index) => {
-    if (item.threeLevelCheckAll) {
-      selectNum++
+const subChildHandleCheckAllChange  = (selected: any,parentData: any,data: any)=>{
+    let selectNum = 0;
+    parentData.skuList.forEach((item,index) => {
+        if(item.threeLevelCheckAll){
+            selectNum++;
+        }
+    });
+    if(selectNum > 0 && selectNum != parentData.skuList.length){
+        parentData.secondLevelCheckAll = false;
+        parentData.isSecondLevelIndeterminate = true;
+    }else if(selectNum == parentData.skuList.length){
+        parentData.isSecondLevelIndeterminate = false;
+        parentData.secondLevelCheckAll = true
+    }else{
+        parentData.isSecondLevelIndeterminate = false;
+        parentData.secondLevelCheckAll = false;
+    }
+    
+    detectionAllSelect();
+
+    let currSku = deepClone(data)
+    
+    if(selected){
+        selectGoodsId.push(currSku.sku_id);
+
+        currSku.goods_name = parentData.goods_name; // 多规格模式，要增加商品名称、商品类型，后续还会增加，满足不同业务场景
+        currSku.goods_type_name = parentData.goods_type_name;
+        currSku.goods_type = parentData.goods_type;
+        selectGoods[replacePrefix + currSku.sku_id] = currSku;
+    }else{
+        selectGoodsId.splice(selectGoodsId.indexOf(currSku.sku_id),1)
+        // 未选中，删除当前商品
+        delete selectGoods[replacePrefix + currSku.sku_id]
     }
-  })
-  if (selectNum > 0 && selectNum != parentData.skuList.length) {
-    parentData.secondLevelCheckAll = false
-    parentData.isSecondLevelIndeterminate = true
-  } else if (selectNum == parentData.skuList.length) {
-    parentData.isSecondLevelIndeterminate = false
-    parentData.secondLevelCheckAll = true
-  } else {
-    parentData.isSecondLevelIndeterminate = false
-    parentData.secondLevelCheckAll = false
-  }
-
-  detectionAllSelect()
-
-  let currSku = deepClone(data)
-
-  if (selected) {
-    selectGoodsId.push(currSku.sku_id)
-
-    currSku.goods_name = parentData.goods_name // 多规格模式，要增加商品名称、商品类型，后续还会增加，满足不同业务场景
-    currSku.goods_type_name = parentData.goods_type_name
-    currSku.goods_type = parentData.goods_type
-    selectGoods[replacePrefix + currSku.sku_id] = currSku
-  } else {
-    selectGoodsId.splice(selectGoodsId.indexOf(currSku.sku_id), 1)
-    // 未选中，删除当前商品
-    delete selectGoods[replacePrefix + currSku.sku_id]
-  }
 }
 
+
 // 检测是否选中
-const detectionAllSelect = () => {
-  let selectNum = 0
-  goodsTable.data.forEach((item, index) => {
-    if (item.secondLevelCheckAll) {
-      selectNum++
+const detectionAllSelect = ()=> {
+    let selectNum = 0;
+    goodsTable.data.forEach((item,index) => {
+        if(item.secondLevelCheckAll){
+            selectNum++;
+        }
+    });
+
+    if(selectNum > 0 && selectNum != goodsTable.data.length){
+        staircheckAll.value = false;
+        isStairIndeterminate.value = true;
+    }else if(selectNum > 0 && selectNum == goodsTable.data.length){
+        isStairIndeterminate.value = false;
+        staircheckAll.value = true
+    }else{
+        isStairIndeterminate.value = false;
+        staircheckAll.value = false;
     }
-  })
-
-  if (selectNum > 0 && selectNum != goodsTable.data.length) {
-    staircheckAll.value = false
-    isStairIndeterminate.value = true
-  } else if (selectNum > 0 && selectNum == goodsTable.data.length) {
-    isStairIndeterminate.value = false
-    staircheckAll.value = true
-  } else {
-    isStairIndeterminate.value = false
-    staircheckAll.value = false
-  }
 }
 
 /**
  * 获取商品列表
  */
 const loadGoodsList = (page: number = 1, callback: any = null) => {
-  isStairIndeterminate.value = false
-  staircheckAll.value = false
-  goodsTable.loading = true
-  goodsTable.data = []
-  goodsTable.page = page
-
-  const searchData = cloneDeep(goodsTable.searchParam)
-
-  if (searchData.select_type == 'selected') {
-    const goods_ids = <any>[]
-    for (let k in selectGoods) {
-      goods_ids.push(parseInt(k.replace(replacePrefix, '')))
-    }
-    searchData[replacePrefix + 'ids'] = goods_ids
-  } else {
-    searchData[replacePrefix + 'ids'] = ''
-  }
-
-  getNewcomerGoodsList({
-    page: goodsTable.page,
-    limit: goodsTable.limit,
-    ...searchData,
-  })
-    .then((res) => {
-      let goodsTableData = cloneDeep(res.data.data)
-      goodsTableData.forEach((item: any) => {
-        item.isShow = false
-        item.isSecondLevelIndeterminate = false
-        item.secondLevelCheckAll = false
-      })
-
-      if (prop.mode == 'sku') {
+    isStairIndeterminate.value = false;
+    staircheckAll.value = false;
+    goodsTable.loading = true;
+    goodsTable.data = [];
+    goodsTable.page = page
+
+    const searchData = cloneDeep(goodsTable.searchParam);
+
+    if (searchData.select_type == 'selected') {
+        const goods_ids = <any>[]
+        for (let k in selectGoods) {
+            goods_ids.push(parseInt(k.replace(replacePrefix, '')))
+        }
+        searchData[replacePrefix+'ids'] = goods_ids
+    } else {
+        searchData[replacePrefix+'ids'] = '';
+    } 
+
+    getNewcomerGoodsList({
+        page: goodsTable.page,
+        limit: goodsTable.limit,
+        ...searchData
+    }).then(res => {
+        let goodsTableData = cloneDeep(res.data.data);
         goodsTableData.forEach((item: any) => {
-          if (item.skuList.length) {
-            item.skuList.forEach((skuItem: any) => {
-              skuItem.threeLevelCheckAll = false
-              skuItem.goods_type = item.goods_type
-            })
-          }
+            item.isShow = false;
+            item.isSecondLevelIndeterminate = false;
+            item.secondLevelCheckAll = false;
         })
-      }
-      if (callback)
-        callback(
-          prop.mode == 'spu'
-            ? res.data.verify_goods_ids
-            : res.data.verify_sku_ids,
-          res.data.select_goods_list
-        )
-      setGoodsSelected()
-
-      goodsTable.data = goodsTableData
-      goodsTable.total = res.data.total
-      goodsTable.loading = false
-    })
-    .catch(() => {
-      goodsTable.loading = false
+
+        if(prop.mode == "sku") {
+            goodsTableData.forEach((item: any) => {
+                if (item.skuList.length) {
+                    item.skuList.forEach((skuItem: any) => {
+                        skuItem.threeLevelCheckAll = false;
+                        skuItem.goods_type = item.goods_type;
+                    })
+                }
+            })
+        }
+        if (callback) callback(prop.mode == "spu" ? res.data.verify_goods_ids : res.data.verify_sku_ids, res.data.select_goods_list)
+        setGoodsSelected();
+        
+        goodsTable.data = goodsTableData
+        goodsTable.total = res.data.total
+        goodsTable.loading = false
+
+    }).catch(() => {
+        goodsTable.loading = false
     })
+
 }
 
 // 表格设置选中状态 spu
 const setGoodsSelected = () => {
-  nextTick(() => {
-    if (prop.mode == 'spu') {
-      for (let i = 0; i < goodsTable.data.length; i++) {
-        goodsTable.data[i].secondLevelCheckAll = false
-        if (selectGoods[replacePrefix + goodsTable.data[i].goods_id]) {
-          goodsTable.data[i].secondLevelCheckAll = true
-        }
-      }
-    } else {
-      let isAllSelectSku = true
-      for (let i = 0; i < goodsTable.data.length; i++) {
-        goodsTable.data[i].secondLevelCheckAll = false
-
-        isAllSelectSku = true
-
-        goodsTable.data[i].isSecondLevelIndeterminate = false
-        goodsTable.data[i].skuList.forEach((item, index) => {
-          item.threeLevelCheckAll = false
-          if (selectGoods[replacePrefix + item.sku_id]) {
-            goodsTable.data[i].isSecondLevelIndeterminate = true
-            item.threeLevelCheckAll = true
-          } else {
-            isAllSelectSku = false
-          }
-        })
-        if (isAllSelectSku) {
-          goodsTable.data[i].isSecondLevelIndeterminate = false
-          goodsTable.data[i].secondLevelCheckAll = true
+    nextTick(() => {
+        if(prop.mode == "spu"){
+            for (let i = 0; i < goodsTable.data.length; i++) {
+                goodsTable.data[i].secondLevelCheckAll = false;
+                if (selectGoods[replacePrefix + goodsTable.data[i].goods_id]) {
+                    goodsTable.data[i].secondLevelCheckAll = true;
+                }
+            }
+        }else{
+            let isAllSelectSku = true;
+            for (let i = 0; i < goodsTable.data.length; i++) {
+                goodsTable.data[i].secondLevelCheckAll = false;
+                
+                isAllSelectSku = true;
+                
+                goodsTable.data[i].isSecondLevelIndeterminate = false;
+                goodsTable.data[i].skuList.forEach((item,index) => {
+                    item.threeLevelCheckAll = false;
+                    if (selectGoods[replacePrefix + item.sku_id]) {
+                        goodsTable.data[i].isSecondLevelIndeterminate = true;
+                        item.threeLevelCheckAll = true;
+                    }else{
+                        isAllSelectSku = false;
+                    }
+                });
+                if(isAllSelectSku){
+                    goodsTable.data[i].isSecondLevelIndeterminate = false;
+                    goodsTable.data[i].secondLevelCheckAll = true;
+                }
+            }
         }
-      }
-    }
-    detectionAllSelect()
-  })
+        detectionAllSelect();
+    });
 }
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
+    if (!formEl) return
+    formEl.resetFields()
 
-  loadGoodsList()
+    loadGoodsList()
 }
 
 const show = () => {
-  for (let k in selectGoods) {
-    delete selectGoods[k]
-  }
-
-  replacePrefix = prop.mode == 'sku' ? 'sku_' : 'goods_'
-
-  // 检测商品id集合是否存在，移除不存在的商品id，纠正数据准确性
-  if (prop.mode == 'sku') {
-    goodsTable.searchParam.verify_sku_ids = goodsIds.value
-  } else {
-    goodsTable.searchParam.verify_goods_ids = goodsIds.value
-  }
-
-  getGoodsSkuNoPageListFn()
-
-  loadGoodsList(1, (verify_ids: any) => {
-    // 第一次打开弹出框时，纠正数据，并且赋值已选商品
-    if (goodsIds.value && goodsIds.value.length) {
-      goodsIds.value.splice(0, goodsIds.value.length, ...verify_ids)
-      selectGoodsId.splice(0, selectGoodsId.length, ...verify_ids)
-      if (Object.keys(selectGoods).length) {
-        for (let key in selectGoods) {
-          let num = Number(key.split(replacePrefix)[1])
-          if (goodsIds.value.indexOf(num) == -1) {
-            delete selectGoods[key]
-          }
-        }
-      }
+    for (let k in selectGoods) {
+        delete selectGoods[k];
     }
-  })
+    
+    replacePrefix = prop.mode == "sku" ? 'sku_' : 'goods_';
 
-  showDialog.value = true
-}
-
-const getGoodsSkuNoPageListFn = () => {
-  const searchData = cloneDeep(goodsTable.searchParam)
-  getNewcomerSelectGoodsList({ ...searchData }).then((res: any) => {
-    const selectGoodsData = res.data
-    // 赋值已选择的商品
+    // 检测商品id集合是否存在，移除不存在的商品id，纠正数据准确性
     if (prop.mode == 'sku') {
-      for (let i = 0; i < selectGoodsData.length; i++) {
-        selectGoodsData[i].skuList.forEach((item: any) => {
-          if (goodsIds.value.indexOf(item.sku_id) != -1) {
-            item.goods_name = selectGoodsData[i].goods_name // 多规格模式，要增加商品名称、商品类型，后续还会增加，满足不同业务场景
-            item.goods_type_name = selectGoodsData[i].goods_type_name
-            item.goods_type = selectGoodsData[i].goods_type
-            selectGoods[replacePrefix + item.sku_id] = item
-          }
-        })
-      }
+        goodsTable.searchParam.verify_sku_ids = goodsIds.value;
     } else {
-      for (let i = 0; i < selectGoodsData.length; i++) {
-        if (goodsIds.value.indexOf(selectGoodsData[i].goods_id) != -1) {
-          selectGoods[replacePrefix + selectGoodsData[i].goods_id] =
-            selectGoodsData[i]
-        }
-      }
+        goodsTable.searchParam.verify_goods_ids = goodsIds.value;
     }
 
-    if (Object.keys(selectGoods).length && goodsIds.value.length) {
-      for (let key in selectGoods) {
-        let num = Number(key.split(replacePrefix)[1])
-        if (goodsIds.value.indexOf(num) == -1) {
-          delete selectGoods[key]
+    getGoodsSkuNoPageListFn();
+    
+    loadGoodsList(1, (verify_ids: any) => {
+        // 第一次打开弹出框时，纠正数据，并且赋值已选商品
+        if (goodsIds.value && goodsIds.value.length) {
+            goodsIds.value.splice(0, goodsIds.value.length, ...verify_ids)
+            selectGoodsId.splice(0, selectGoodsId.length, ...verify_ids)
+            if(Object.keys(selectGoods).length){
+                for(let key in selectGoods){
+                    let num = Number(key.split(replacePrefix)[1]);
+                    if(goodsIds.value.indexOf(num) == -1){
+                        delete selectGoods[key];
+                    }
+                }
+            }
         }
-      }
-    }
+    })
 
-    setGoodsSelected()
-  })
+    showDialog.value = true
+}
+
+const getGoodsSkuNoPageListFn = () =>{
+    const searchData = cloneDeep(goodsTable.searchParam);
+    getNewcomerSelectGoodsList({...searchData}).then((res:any)=>{
+        const selectGoodsData = res.data;
+        // 赋值已选择的商品
+        if (prop.mode == 'sku') {
+            for (let i = 0; i < selectGoodsData.length; i++) {
+                selectGoodsData[i].skuList.forEach((item: any) => {
+                    if (goodsIds.value.indexOf(item.sku_id) != -1) {
+                        item.goods_name = selectGoodsData[i].goods_name; // 多规格模式，要增加商品名称、商品类型，后续还会增加，满足不同业务场景
+                        item.goods_type_name = selectGoodsData[i].goods_type_name;
+                        item.goods_type = selectGoodsData[i].goods_type;
+                        selectGoods[replacePrefix + item.sku_id] = item;
+                    }
+                });
+            }
+        } else {
+            for (let i = 0; i < selectGoodsData.length; i++) {
+                if (goodsIds.value.indexOf(selectGoodsData[i].goods_id) != -1) {
+                    selectGoods[replacePrefix + selectGoodsData[i].goods_id] = selectGoodsData[i];
+                }
+            }
+        }
+
+        if(Object.keys(selectGoods).length && goodsIds.value.length){
+            for(let key in selectGoods){
+                let num = Number(key.split(replacePrefix)[1]);
+                if(goodsIds.value.indexOf(num) == -1){
+                    delete selectGoods[key];
+                }
+            }
+        }
+
+        
+        setGoodsSelected();
+    })
 }
 
 // 清空已选商品
 const clear = () => {
-  for (let k in selectGoods) {
-    delete selectGoods[k]
-  }
-  setGoodsSelected()
+    for (let k in selectGoods) {
+        delete selectGoods[k];
+    }
+    setGoodsSelected();
 }
 
 const save = () => {
-  if (prop.min && selectGoodsNum.value < prop.min) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('goodsSelectPopupGoodsMinTip')}${prop.min}${t('goodsSelectPopupPiece')}`,
-    })
-    return
-  }
-
-  if (
-    prop.max &&
-    prop.max > 0 &&
-    selectGoodsNum.value &&
-    selectGoodsNum.value > prop.max
-  ) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('goodsSelectPopupGoodsMaxTip')}${prop.max}${t('goodsSelectPopupPiece')}`,
-    })
-    return
-  }
-
-  if (prop.way == 'single') {
-    let realTypeNum = 0
-    let virtualTypeNum = 0
-    for (let k in selectGoods) {
-      if (selectGoods[k].goods_type == 'virtual') {
-        virtualTypeNum++
-      } else if (selectGoods[k].goods_type == 'real') {
-        realTypeNum++
-      }
+    if (prop.min && selectGoodsNum.value < prop.min) {
+        ElMessage({
+            type: 'warning',
+            message: `${t('goodsSelectPopupGoodsMinTip')}${prop.min}${t('goodsSelectPopupPiece')}`,
+        });
+        return;
     }
 
-    if (
-      realTypeNum != Object.keys(selectGoods).length &&
-      virtualTypeNum != Object.keys(selectGoods).length
-    ) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('wayPlaceholder')}`,
-      })
-      return
+    if (prop.max && prop.max > 0 && selectGoodsNum.value && selectGoodsNum.value > prop.max) {
+        ElMessage({
+            type: 'warning',
+            message: `${t('goodsSelectPopupGoodsMaxTip')}${prop.max}${t('goodsSelectPopupPiece')}`,
+        });
+        return;
+    }
+    
+    if(prop.way == 'single'){
+        let realTypeNum = 0;
+        let virtualTypeNum = 0;
+        for (let k in selectGoods) {
+            if(selectGoods[k].goods_type == "virtual"){
+                virtualTypeNum++;
+            }else if(selectGoods[k].goods_type == "real"){
+                realTypeNum++;
+            }
+        }
+        
+        if (realTypeNum != Object.keys(selectGoods).length && virtualTypeNum != Object.keys(selectGoods).length) {
+            ElMessage({
+                type: 'warning',
+                message: `${t('wayPlaceholder')}`,
+            });
+            return;
+        }
     }
-  }
 
-  let ids: any = []
-  for (let k in selectGoods) {
-    ids.push(parseInt(k.replace(replacePrefix, '')))
-  }
+    let ids: any = [];
+    for (let k in selectGoods) {
+        ids.push(parseInt(k.replace(replacePrefix, '')));
+    }
 
-  goodsIds.value.splice(0, goodsIds.value.length, ...ids)
-  emit('goodsSelect', selectGoods)
-  initSearchParam()
-  showDialog.value = false
+    goodsIds.value.splice(0, goodsIds.value.length, ...ids)
+    emit('goodsSelect',selectGoods)
+    initSearchParam();
+    showDialog.value = false
 }
 
 // 重置表单搜索
-const initSearchParam = () => {
-  goodsTable.searchParam.keyword = ''
-  goodsTable.searchParam.goods_category = []
-  goodsTable.searchParam.select_type = 'all'
-  goodsTable.searchParam.goods_ids = ''
-  goodsTable.searchParam.verify_goods_ids = ''
-  goodsTable.searchParam.verify_sku_ids = ''
-  goodsTable.searchParam.goods_type = ''
+const initSearchParam = ()=>{
+    goodsTable.searchParam.keyword = '';
+    goodsTable.searchParam.goods_category = [];
+    goodsTable.searchParam.select_type = 'all';
+    goodsTable.searchParam.goods_ids = '';
+    goodsTable.searchParam.verify_goods_ids = '';
+    goodsTable.searchParam.verify_sku_ids = '';
+    goodsTable.searchParam.goods_type = '';
 }
 
 defineExpose({
-  showDialog,
-  selectGoods,
-  selectGoodsNum,
+    showDialog,
+    selectGoods,
+    selectGoodsNum
 })
 </script>
 
 <style lang="scss" scoped>
 .form-item-wrap {
-  margin-right: 10px !important;
-  margin-bottom: 10px !important;
+    margin-right: 10px !important;
+    margin-bottom: 10px !important;
 
-  &.last-child {
-    margin-right: 0 !important;
-  }
+    &.last-child {
+        margin-right: 0 !important;
+    }
 }
-.arrow-show {
-  transform: rotate(90deg);
+.arrow-show{
+    transform: rotate(90deg);
 }
 </style>
diff --git a/admin/src/addon/shop/views/goods/components/service-edit.vue b/admin/src/addon/shop/views/goods/components/service-edit.vue
index 599b15de..d4ba688c 100644
--- a/admin/src/addon/shop/views/goods/components/service-edit.vue
+++ b/admin/src/addon/shop/views/goods/components/service-edit.vue
@@ -1,58 +1,24 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="title"
-    width="500px"
-    class="diy-dialog-wrap"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="120px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('serviceName')" prop="service_name">
-        <el-input
-          v-model.trim="formData.service_name"
-          show-word-limit
-          clearable
-          :placeholder="t('serviceNamePlaceholder')"
-          :maxlength="20"
-          class="input-width"
-        />
-      </el-form-item>
-      <el-form-item :label="t('image')">
-        <upload-image v-model="formData.image" />
-      </el-form-item>
-      <el-form-item :label="t('desc')">
-        <el-input
-          v-model.trim="formData.desc"
-          type="textarea"
-          rows="5"
-          show-word-limit
-          clearable
-          :placeholder="t('descPlaceholder')"
-          :maxlength="200"
-          class="input-width"
-        />
-      </el-form-item>
-    </el-form>
+    <el-dialog v-model="showDialog" :title="title" width="500px" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+            <el-form-item :label="t('serviceName')" prop="service_name">
+                <el-input v-model.trim="formData.service_name" show-word-limit clearable :placeholder="t('serviceNamePlaceholder')" :maxlength="20" class="input-width" />
+            </el-form-item>
+            <el-form-item :label="t('image')">
+                <upload-image v-model="formData.image" />
+            </el-form-item>
+            <el-form-item :label="t('desc')" >
+                <el-input v-model.trim="formData.desc" type="textarea" rows="5" show-word-limit clearable :placeholder="t('descPlaceholder')" :maxlength="200" class="input-width"/>
+            </el-form-item>
+        </el-form>
 
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -69,10 +35,10 @@ const title = ref('')
  * 表单数据
  */
 const initialFormData = {
-  service_id: '',
-  service_name: '',
-  image: '',
-  desc: '',
+    service_id: '',
+    service_name: '',
+    image: '',
+    desc: ''
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -80,11 +46,11 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    service_name: [
-      { required: true, message: t('serviceNamePlaceholder'), trigger: 'blur' },
-    ],
-  }
+    return {
+        service_name: [
+            { required: true, message: t('serviceNamePlaceholder'), trigger: 'blur' }
+        ]
+    }
 })
 
 const emit = defineEmits(['complete'])
@@ -94,55 +60,53 @@ const emit = defineEmits(['complete'])
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  const save = formData.service_id ? editServe : addServe
+    if (loading.value || !formEl) return
+    const save = formData.service_id ? editServe : addServe
 
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
 
-      const data = formData
+            const data = formData
 
-      save(data)
-        .then((res) => {
-          loading.value = false
-          showDialog.value = false
-          emit('complete')
-        })
-        .catch(() => {
-          loading.value = false
-        })
-    }
-  })
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
 }
 
 // 获取字典数据
 const setFormData = async (row: any = null) => {
-  Object.assign(formData, initialFormData)
-  loading.value = true
-  if (row) {
-    title.value = t('updateServe')
-    const data = await (await getServeInfo(row.service_id)).data
-    if (data) {
-      Object.keys(formData).forEach((key: string) => {
-        if (data[key] != undefined) formData[key] = data[key]
-      })
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if (row) {
+        title.value = t('updateServe')
+        const data = await (await getServeInfo(row.service_id)).data
+        if (data) {
+            Object.keys(formData).forEach((key: string) => {
+                if (data[key] != undefined) formData[key] = data[key]
+            })
+        }
+    } else {
+        title.value = t('addServe')
     }
-  } else {
-    title.value = t('addServe')
-  }
-  loading.value = false
+    loading.value = false
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
 <style lang="scss" scoped></style>
 <style lang="scss">
-.diy-dialog-wrap .el-form-item__label {
-  height: auto !important;
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
 }
 </style>
diff --git a/admin/src/addon/shop/views/goods/evaluate.vue b/admin/src/addon/shop/views/goods/evaluate.vue
index 507f262f..ca166607 100644
--- a/admin/src/addon/shop/views/goods/evaluate.vue
+++ b/admin/src/addon/shop/views/goods/evaluate.vue
@@ -1,265 +1,123 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-        <el-button type="primary" @click="addEvent">
-          {{ t('addEvaluate') }}
-        </el-button>
-      </div>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
 
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="evaluateTable.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('goodsName')" prop="goods_name">
-            <el-input
-              v-model.trim="evaluateTable.searchParam.goods_name"
-              :placeholder="t('goodsNamePlaceholder')"
-              class="input-width"
-              maxlength="60"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="loadEvaluateList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+                <el-button type="primary" @click="addEvent">
+                    {{ t('addEvaluate') }}
+                </el-button>
+            </div>
 
-      <div class="mt-[10px]">
-        <el-table
-          :data="evaluateTable.data"
-          size="large"
-          v-loading="evaluateTable.loading"
-        >
-          <template #empty>
-            <span>{{ !evaluateTable.loading ? t('emptyData') : '' }}</span>
-          </template>
-          <el-table-column :label="t('goodsInfo')" min-width="120" align="left">
-            <template #default="{ row }">
-              <div class="flex cursor-pointer">
-                <div class="flex items-center min-w-[50px] mr-[10px]">
-                  <el-image
-                    v-if="row.goods.goods_cover_thumb_small"
-                    class="w-[50px] h-[50px]"
-                    :src="img(row.goods.goods_cover_thumb_small)"
-                    fit="contain"
-                  >
-                    <template #error>
-                      <div class="image-slot">
-                        <img
-                          class="w-[50px] h-[50px]"
-                          src="@/addon/shop/assets/goods_default.png"
-                        />
-                      </div>
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="evaluateTable.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('goodsName')" prop="goods_name">
+                        <el-input v-model.trim="evaluateTable.searchParam.goods_name" :placeholder="t('goodsNamePlaceholder')" class="input-width" maxlength="60" />
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="loadEvaluateList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+
+            <div class="mt-[10px]">
+                <el-table :data="evaluateTable.data" size="large" v-loading="evaluateTable.loading">
+                    <template #empty>
+                        <span>{{ !evaluateTable.loading ? t('emptyData') : '' }}</span>
                     </template>
-                  </el-image>
+                    <el-table-column :label="t('goodsInfo')" min-width="120" align="left">
+                        <template #default="{ row }">
+                            <div class="flex cursor-pointer">
+                                <div class="flex items-center min-w-[50px] mr-[10px]">
+                                    <el-image v-if="row.goods.goods_cover_thumb_small" class="w-[50px] h-[50px]" :src="img(row.goods.goods_cover_thumb_small)" fit="contain">
+                                        <template #error>
+                                            <div class="image-slot">
+                                                <img class="w-[50px] h-[50px]" src="@/addon/shop/assets/goods_default.png" />
+                                            </div>
+                                        </template>
+                                    </el-image>
 
-                  <img
-                    v-else
-                    class="w-[50px] h-[50px]"
-                    src="@/addon/shop/assets/goods_default.png"
-                    fit="contain"
-                  />
-                </div>
-                <div class="flex">
-                  <p class="multi-hidden">{{ row.goods.goods_name }}</p>
-                </div>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('content')" min-width="240" align="left">
-            <template #default="{ row }">
-              <div>
-                <p class="text-[14px]">{{ row.content }}</p>
-                <div
-                  class="flex flex-wrap mt-[10px]"
-                  v-if="row.images?.length > 0"
-                >
-                  <div
-                    v-for="(imageItem, imageIndex) in row.images"
-                    :key="imageIndex"
-                    class="mr-4"
-                  >
-                    <el-image
-                      v-if="imageItem"
-                      class="w-[40px] h-[40px]"
-                      :src="img(imageItem)"
-                      fit="contain"
-                      :preview-src-list="[img(imageItem)]"
-                      :zoom-rate="1.2"
-                      :max-scale="7"
-                      :min-scale="0.2"
-                    >
-                      <template #error>
-                        <div class="image-slot">
-                          <img
-                            class="w-[40px] h-[40px]"
-                            src="@/addon/shop/assets/goods_default.png"
-                          />
-                        </div>
-                      </template>
-                    </el-image>
-                    <img
-                      v-else
-                      class="w-[40px] h-[40px]"
-                      src="@/addon/shop/assets/goods_default.png"
-                    />
-                  </div>
+                                    <img v-else class="w-[50px] h-[50px]" src="@/addon/shop/assets/goods_default.png" fit="contain" />
+                                </div>
+                                <div class="flex">
+                                    <p class="multi-hidden">{{ row.goods.goods_name }}</p>
+                                </div>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('content')" min-width="240" align="left">
+                        <template #default="{ row }">
+                            <div>
+                                <p class="text-[14px]">{{ row.content }}</p>
+                                <div class="flex flex-wrap mt-[10px]" v-if="row.images?.length > 0">
+                                    <div v-for="(imageItem, imageIndex) in row.images" :key="imageIndex" class="mr-4">
+                                        <el-image v-if="imageItem" class="w-[40px] h-[40px]" :src="img(imageItem)" fit="contain" :preview-src-list="[img(imageItem)]" :zoom-rate="1.2" :max-scale="7" :min-scale="0.2">
+                                            <template #error>
+                                                <div class="image-slot">
+                                                    <img class="w-[40px] h-[40px]" src="@/addon/shop/assets/goods_default.png" />
+                                                </div>
+                                            </template>
+                                        </el-image>
+                                        <img v-else class="w-[40px] h-[40px]" src="@/addon/shop/assets/goods_default.png" />
+                                    </div>
+                                </div>
+                                <p class="mt-[15px] text-[14px]" v-if="row.explain_first"><span class="text-[#ff7f5b]">{{ t('explainFirst') }}：</span>{{ row.explain_first }}</p>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('scores')" min-width="110" align="left">
+                        <template #default="{ row }">
+                            <el-rate v-model="row.scores" disabled />
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="audit_name" :label="t('auditName')" min-width="80" />
+                    <el-table-column prop="create_time" :label="t('createTime')" min-width="120" />
+                    <el-table-column :label="t('operation')" fixed="right" min-width="100" align="right">
+                        <template #default="{ row }">
+                            <div>
+                                <el-button type="primary" link @click="adoptEvent(row.evaluate_id)" v-if="row.is_audit == 1">{{ t('adopt') }}</el-button>
+                                <el-button type="primary" link @click="refuseEvent(row.evaluate_id)" v-if="row.is_audit == 1">{{ t('refuse') }}</el-button>
+                                <el-button type="primary" link @click="replyEvent(row.evaluate_id)" v-if="row.explain_first == ''">{{ t('reply') }}</el-button>
+                                <el-button type="primary" link @click="deleteEvent(row.evaluate_id)">{{ t('delete') }}</el-button>
+                                <el-button type="primary" link @click="toppingEvent(row.evaluate_id, 'topping')" v-if="row.is_audit == 2 && row.topping == 0">{{ t('topping') }}</el-button>
+                                <el-button type="primary" link @click="toppingEvent(row.evaluate_id, 'cancel_topping')" v-if="row.topping == 1">{{ t('cancelTopping') }}</el-button>
+                            </div>
+                        </template>
+                    </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="evaluateTable.page" v-model:page-size="evaluateTable.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="evaluateTable.total"
+                        @size-change="loadEvaluateList()" @current-change="loadEvaluateList" />
                 </div>
-                <p class="mt-[15px] text-[14px]" v-if="row.explain_first">
-                  <span class="text-[#ff7f5b]">{{ t('explainFirst') }}：</span
-                  >{{ row.explain_first }}
-                </p>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('scores')" min-width="110" align="left">
-            <template #default="{ row }">
-              <el-rate v-model="row.scores" disabled />
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="audit_name"
-            :label="t('auditName')"
-            min-width="80"
-          />
-          <el-table-column
-            prop="create_time"
-            :label="t('createTime')"
-            min-width="120"
-          />
-          <el-table-column
-            :label="t('operation')"
-            fixed="right"
-            min-width="100"
-            align="right"
-          >
-            <template #default="{ row }">
-              <div>
-                <el-button
-                  type="primary"
-                  link
-                  @click="adoptEvent(row.evaluate_id)"
-                  v-if="row.is_audit == 1"
-                  >{{ t('adopt') }}</el-button
-                >
-                <el-button
-                  type="primary"
-                  link
-                  @click="refuseEvent(row.evaluate_id)"
-                  v-if="row.is_audit == 1"
-                  >{{ t('refuse') }}</el-button
-                >
-                <el-button
-                  type="primary"
-                  link
-                  @click="replyEvent(row.evaluate_id)"
-                  v-if="row.explain_first == ''"
-                  >{{ t('reply') }}</el-button
-                >
-                <el-button
-                  type="primary"
-                  link
-                  @click="deleteEvent(row.evaluate_id)"
-                  >{{ t('delete') }}</el-button
-                >
-                <el-button
-                  type="primary"
-                  link
-                  @click="toppingEvent(row.evaluate_id, 'topping')"
-                  v-if="row.is_audit == 2 && row.topping == 0"
-                  >{{ t('topping') }}</el-button
-                >
-                <el-button
-                  type="primary"
-                  link
-                  @click="toppingEvent(row.evaluate_id, 'cancel_topping')"
-                  v-if="row.topping == 1"
-                  >{{ t('cancelTopping') }}</el-button
-                >
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="evaluateTable.page"
-            v-model:page-size="evaluateTable.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="evaluateTable.total"
-            @size-change="loadEvaluateList()"
-            @current-change="loadEvaluateList"
-          />
-        </div>
-      </div>
-    </el-card>
+            </div>
+        </el-card>
 
-    <evaluate-add ref="editEvaluateDialog" @complete="loadEvaluateList" />
+        <evaluate-add ref="editEvaluateDialog" @complete="loadEvaluateList" />
 
-    <el-dialog
-      v-model="replyShowDialog"
-      :title="t('explainFirst')"
-      width="460px"
-      class="diy-dialog-wrap"
-      :destroy-on-close="true"
-    >
-      <el-form
-        :model="formData"
-        label-width="90px"
-        ref="formRef"
-        :rules="formRules"
-        class="page-form"
-      >
-        <el-form-item :label="t('explainFirst')" prop="explain_first">
-          <el-input
-            v-model.trim="formData.explain_first"
-            type="textarea"
-            rows="4"
-            clearable
-            :placeholder="t('explainFirstPlaceholder')"
-            class="input-width"
-            maxlength="200"
-            show-word-limit
-          />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="replyShowDialog = false">{{
-            t('cancel')
-          }}</el-button>
-          <el-button type="primary" @click="confirm(formRef)">{{
-            t('confirm')
-          }}</el-button>
-        </span>
-      </template>
-    </el-dialog>
-  </div>
+        <el-dialog v-model="replyShowDialog" :title="t('explainFirst')" width="460px" class="diy-dialog-wrap" :destroy-on-close="true">
+            <el-form :model="formData" label-width="90px" ref="formRef" :rules="formRules" class="page-form">
+                <el-form-item :label="t('explainFirst')" prop="explain_first">
+                    <el-input v-model.trim="formData.explain_first" type="textarea" rows="4" clearable
+                        :placeholder="t('explainFirstPlaceholder')" class="input-width" maxlength="200" show-word-limit />
+                </el-form-item>
+            </el-form>
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="replyShowDialog = false">{{ t('cancel') }}</el-button>
+                    <el-button type="primary" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+                </span>
+            </template>
+        </el-dialog>
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref, computed } from 'vue'
 import { t } from '@/lang'
-import {
-  getEvaluateList,
-  deleteEvaluate,
-  adoptEvaluate,
-  refuseEvaluate,
-  replyEvaluate,
-  toppingEvaluate,
-  cancelToppingEvaluate,
-} from '@/addon/shop/api/goods'
+import { getEvaluateList, deleteEvaluate, adoptEvaluate, refuseEvaluate, replyEvaluate, toppingEvaluate, cancelToppingEvaluate } from '@/addon/shop/api/goods'
 import EvaluateAdd from '@/addon/shop/views/goods/components/evaluate-add.vue'
 import { img } from '@/utils/common'
 import { ElMessageBox, FormInstance } from 'element-plus'
@@ -269,14 +127,14 @@ const route = useRoute()
 const pageName = route.meta.title
 
 const evaluateTable = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    goods_name: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        goods_name: ''
+    }
 })
 
 const searchFormRef = ref<FormInstance>()
@@ -285,27 +143,25 @@ const searchFormRef = ref<FormInstance>()
  * 获取商品评价列表
  */
 const loadEvaluateList = (page: number = 1) => {
-  evaluateTable.loading = true
-  evaluateTable.page = page
+    evaluateTable.loading = true
+    evaluateTable.page = page
 
-  getEvaluateList({
-    page: evaluateTable.page,
-    limit: evaluateTable.limit,
-    ...evaluateTable.searchParam,
-  })
-    .then((res) => {
-      evaluateTable.loading = false
-      evaluateTable.data = res.data.data
-      evaluateTable.total = res.data.total
-      evaluateTable.data.map((item: any) => {
-        item.previewList = item.images.map((el: any) => {
-          return img(el)
+    getEvaluateList({
+        page: evaluateTable.page,
+        limit: evaluateTable.limit,
+        ...evaluateTable.searchParam
+    }).then(res => {
+        evaluateTable.loading = false
+        evaluateTable.data = res.data.data
+        evaluateTable.total = res.data.total
+        evaluateTable.data.map((item: any)=> {
+            item.previewList = item.images.map((el:any)=> {
+                return img(el)
+            })
+            return item
         })
-        return item
-      })
-    })
-    .catch(() => {
-      evaluateTable.loading = false
+    }).catch(() => {
+        evaluateTable.loading = false
     })
 }
 loadEvaluateList()
@@ -315,118 +171,113 @@ const editEvaluateDialog: Record<string, any> | null = ref(null)
  * 添加商品评价
  */
 const addEvent = () => {
-  editEvaluateDialog.value.setFormData()
-  editEvaluateDialog.value.showDialog = true
+    editEvaluateDialog.value.setFormData()
+    editEvaluateDialog.value.showDialog = true
 }
 
 /**
  * 删除商品评价
  */
 const deleteEvent = (id: number) => {
-  ElMessageBox.confirm(t('evaluateDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    deleteEvaluate(id)
-      .then(() => {
-        loadEvaluateList()
-      })
-      .catch(() => {})
-  })
+    ElMessageBox.confirm(t('evaluateDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        deleteEvaluate(id).then(() => {
+            loadEvaluateList()
+        }).catch(() => {
+        })
+    })
 }
 
 // 审核通过
 const adoptEvent = (id: number) => {
-  ElMessageBox.confirm(t('auditAdoptTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    adoptEvaluate(id)
-      .then(() => {
-        loadEvaluateList()
-      })
-      .catch(() => {})
-  })
+    ElMessageBox.confirm(t('auditAdoptTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        adoptEvaluate(id).then(() => {
+            loadEvaluateList()
+        }).catch(() => {
+        })
+    })
 }
 
 // 审核拒绝
 const refuseEvent = (id: number) => {
-  refuseEvaluate(id).then(() => {
-    loadEvaluateList()
-  })
+    refuseEvaluate(id).then(() => {
+        loadEvaluateList()
+    })
 }
 
 // 置顶、取消置顶
-const toppingEvent = (id: number, event: string) => {
-  if (event == 'topping') {
-    toppingEvaluate(id).then(() => {
-      loadEvaluateList()
-    })
-  } else {
-    cancelToppingEvaluate(id).then(() => {
-      loadEvaluateList()
-    })
-  }
+const toppingEvent = (id: number, event:string) => {
+    if (event == 'topping') {
+        toppingEvaluate(id).then(() => {
+            loadEvaluateList()
+        })
+    } else {
+        cancelToppingEvaluate(id).then(() => {
+            loadEvaluateList()
+        })
+    }
 }
 
 // 评价回复
 const replyShowDialog = ref(false)
 const initialFormData = {
-  evaluate_id: 0,
-  explain_first: '',
+    evaluate_id: 0,
+    explain_first: ''
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 const formRef = ref<FormInstance>()
 const replyEvent = (id: number) => {
-  formData.evaluate_id = id
-  formData.explain_first = ''
-  replyShowDialog.value = true
+    formData.evaluate_id = id
+    formData.explain_first = ''
+    replyShowDialog.value = true
 }
 const formRules = computed(() => {
-  return {
-    explain_first: [
-      {
-        required: true,
-        message: t('explainFirstPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-  }
+    return {
+        explain_first: [
+            { required: true, message: t('explainFirstPlaceholder'), trigger: 'blur' }
+        ]
+    }
 })
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      const data = formData
-      replyEvaluate(data)
-        .then((res) => {
-          loadEvaluateList()
-          replyShowDialog.value = false
-        })
-        .catch((err) => {
-          replyShowDialog.value = false
-        })
-    }
-  })
+    if (!formEl) return
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            const data = formData
+            replyEvaluate(data).then(res => {
+                loadEvaluateList()
+                replyShowDialog.value = false
+            }).catch(err => {
+                replyShowDialog.value = false
+            })
+        }
+    })
 }
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadEvaluateList()
+    if (!formEl) return
+    formEl.resetFields()
+    loadEvaluateList()
 }
 </script>
 
 <style lang="scss" scoped>
 /* 多行超出隐藏 */
 .multi-hidden {
-  word-break: break-all;
-  text-overflow: ellipsis;
-  overflow: hidden;
-  display: -webkit-box;
-  -webkit-line-clamp: 2;
-  -webkit-box-orient: vertical;
-}
-</style>
+    word-break: break-all;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+}</style>
diff --git a/admin/src/addon/shop/views/goods/label_group_list.vue b/admin/src/addon/shop/views/goods/label_group_list.vue
index ef349a01..59659b76 100644
--- a/admin/src/addon/shop/views/goods/label_group_list.vue
+++ b/admin/src/addon/shop/views/goods/label_group_list.vue
@@ -1,129 +1,71 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-        <el-button type="primary" @click="addEvent">
-          {{ t('addLabelGroup') }}
-        </el-button>
-      </div>
-
-      <el-tabs model-value="/shop/goods/label/group" @tab-change="handleClick">
-        <el-tab-pane :label="t('tabGoodsLabel')" name="/shop/goods/label" />
-        <el-tab-pane
-          :label="t('tabGoodsLabelGroup')"
-          name="/shop/goods/label/group"
-        />
-      </el-tabs>
-
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="labelTable.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('groupName')" prop="group_name">
-            <el-input
-              v-model.trim="labelTable.searchParam.group_name"
-              :placeholder="t('groupNamePlaceholder')"
-            />
-          </el-form-item>
-
-          <el-form-item>
-            <el-button type="primary" @click="loadLabelGroupList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
-
-      <div class="mt-[10px]">
-        <el-table
-          :data="labelTable.data"
-          size="large"
-          v-loading="labelTable.loading"
-          @sort-change="sortChange"
-        >
-          <template #empty>
-            <span>{{ !labelTable.loading ? t('emptyData') : '' }}</span>
-          </template>
-          <el-table-column
-            prop="group_name"
-            :label="t('groupName')"
-            min-width="120"
-          />
-          <el-table-column
-            prop="sort"
-            :label="t('sort')"
-            min-width="120"
-            sortable="custom"
-          >
-            <template #default="{ row }">
-              <el-input
-                v-model.trim="row.sort"
-                class="!w-[100px]"
-                maxlength="8"
-                @blur="sortInputListener(row.sort, row)"
-              />
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            :label="t('operation')"
-            fixed="right"
-            align="right"
-            min-width="120"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="editEvent(row)">{{
-                t('edit')
-              }}</el-button>
-              <el-button
-                type="primary"
-                link
-                @click="deleteEvent(row.group_id)"
-                >{{ t('delete') }}</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="labelTable.page"
-            v-model:page-size="labelTable.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="labelTable.total"
-            @size-change="loadLabelGroupList()"
-            @current-change="loadLabelGroupList"
-          />
-        </div>
-      </div>
-
-      <label-group-edit
-        ref="editLabelGroupDialog"
-        @complete="loadLabelGroupList"
-      />
-    </el-card>
-  </div>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{pageName}}</span>
+                <el-button type="primary" @click="addEvent">
+                    {{ t('addLabelGroup') }}
+                </el-button>
+            </div>
+
+            <el-tabs model-value="/shop/goods/label/group" @tab-change="handleClick">
+                <el-tab-pane :label="t('tabGoodsLabel')" name="/shop/goods/label" />
+                <el-tab-pane :label="t('tabGoodsLabelGroup')" name="/shop/goods/label/group" />
+            </el-tabs>
+
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="labelTable.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('groupName')" prop="group_name">
+                        <el-input v-model.trim="labelTable.searchParam.group_name" :placeholder="t('groupNamePlaceholder')"  />
+                    </el-form-item>
+
+                    <el-form-item>
+                        <el-button type="primary" @click="loadLabelGroupList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+
+            <div class="mt-[10px]">
+                <el-table :data="labelTable.data" size="large" v-loading="labelTable.loading" @sort-change="sortChange">
+                    <template #empty>
+                        <span>{{ !labelTable.loading ? t('emptyData') : '' }}</span>
+                    </template>
+                    <el-table-column prop="group_name" :label="t('groupName')" min-width="120" />
+                    <el-table-column prop="sort" :label="t('sort')" min-width="120" sortable="custom">
+                        <template #default="{ row }">
+                            <el-input v-model.trim="row.sort" class="!w-[100px]" maxlength="8" @blur="sortInputListener(row.sort, row)" />
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column :label="t('operation')" fixed="right" align="right" min-width="120">
+                       <template #default="{ row }">
+                           <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+                           <el-button type="primary" link @click="deleteEvent(row.group_id)">{{ t('delete') }}</el-button>
+                       </template>
+                    </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="labelTable.page" v-model:page-size="labelTable.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="labelTable.total"
+                        @size-change="loadLabelGroupList()" @current-change="loadLabelGroupList" />
+                </div>
+            </div>
+
+            <label-group-edit ref="editLabelGroupDialog" @complete="loadLabelGroupList" />
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
 import { t } from '@/lang'
-import {
-  getLabelGroupPageList,
-  deleteLabelGroup,
-  modifyLabelGroupSort,
-} from '@/addon/shop/api/goods'
+import { getLabelGroupPageList, deleteLabelGroup, modifyLabelGroupSort } from '@/addon/shop/api/goods'
 import { ElMessageBox, FormInstance, ElMessage } from 'element-plus'
 import LabelGroupEdit from '@/addon/shop/views/goods/components/label-group-edit.vue'
-import { useRoute, useRouter } from 'vue-router'
+import { useRoute,useRouter } from 'vue-router'
 import { debounce } from '@/utils/common'
 
 const route = useRoute()
@@ -131,58 +73,56 @@ const router = useRouter()
 const pageName = route.meta.title
 
 const handleClick = (path: string) => {
-  router.push({ path })
+    router.push({ path })
 }
 
 const labelTable = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    group_name: '',
-    order: '',
-    sort: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        group_name: '',
+        order: '',
+        sort: ''
+    }
 })
 
 const searchFormRef = ref<FormInstance>()
 
 // 监听排序
 const sortChange = (event: any) => {
-  let sort = ''
-  if (event.order == 'ascending') {
-    sort = 'asc'
-  } else if (event.order == 'descending') {
-    sort = 'desc'
-  }
-  if (sort) {
-    labelTable.searchParam.order = event.prop
-    labelTable.searchParam.sort = sort
-  }
-  loadLabelGroupList()
+    let sort = ''
+    if (event.order == 'ascending') {
+        sort = 'asc'
+    } else if (event.order == 'descending') {
+        sort = 'desc'
+    }
+    if (sort) {
+        labelTable.searchParam.order = event.prop
+        labelTable.searchParam.sort = sort
+    }
+    loadLabelGroupList()
 }
 
 /**
  * 获取商品标签列表
  */
 const loadLabelGroupList = (page: number = 1) => {
-  labelTable.loading = true
-  labelTable.page = page
-
-  getLabelGroupPageList({
-    page: labelTable.page,
-    limit: labelTable.limit,
-    ...labelTable.searchParam,
-  })
-    .then((res) => {
-      labelTable.loading = false
-      labelTable.data = res.data.data
-      labelTable.total = res.data.total
-    })
-    .catch(() => {
-      labelTable.loading = false
+    labelTable.loading = true
+    labelTable.page = page
+
+    getLabelGroupPageList({
+        page: labelTable.page,
+        limit: labelTable.limit,
+        ...labelTable.searchParam
+    }).then(res => {
+        labelTable.loading = false
+        labelTable.data = res.data.data
+        labelTable.total = res.data.total
+    }).catch(() => {
+        labelTable.loading = false
     })
 }
 loadLabelGroupList()
@@ -193,8 +133,8 @@ const editLabelGroupDialog: Record<string, any> | null = ref(null)
  * 添加商品标签
  */
 const addEvent = () => {
-  editLabelGroupDialog.value.setFormData()
-  editLabelGroupDialog.value.showDialog = true
+    editLabelGroupDialog.value.setFormData()
+    editLabelGroupDialog.value.showDialog = true
 }
 
 /**
@@ -202,50 +142,53 @@ const addEvent = () => {
  * @param data
  */
 const editEvent = (data: any) => {
-  editLabelGroupDialog.value.setFormData(data)
-  editLabelGroupDialog.value.showDialog = true
+    editLabelGroupDialog.value.setFormData(data)
+    editLabelGroupDialog.value.showDialog = true
 }
 
 /**
  * 删除商品标签
  */
 const deleteEvent = (id: number) => {
-  ElMessageBox.confirm(t('labelGroupDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    deleteLabelGroup(id)
-      .then(() => {
-        loadLabelGroupList()
-      })
-      .catch(() => {})
-  })
+    ElMessageBox.confirm(t('labelGroupDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        deleteLabelGroup(id).then(() => {
+            loadLabelGroupList()
+        }).catch(() => {
+        })
+    })
 }
 
 // 修改排序号
 const sortInputListener = debounce((sort, row) => {
-  if (isNaN(sort) || !/^\d{0,8}$/.test(sort)) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('sortTips')}`,
+    if (isNaN(sort) || !/^\d{0,8}$/.test(sort)) {
+        ElMessage({
+            type: 'warning',
+            message: `${ t('sortTips') }`
+        })
+        return
+    }
+    if (sort > 99999999) {
+        row.sort = 99999999
+    }
+    modifyLabelGroupSort({
+        group_id: row.group_id,
+        sort
+    }).then((res) => {
     })
-    return
-  }
-  if (sort > 99999999) {
-    row.sort = 99999999
-  }
-  modifyLabelGroupSort({
-    group_id: row.group_id,
-    sort,
-  }).then((res) => {})
 })
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadLabelGroupList()
+    if (!formEl) return
+    formEl.resetFields()
+    loadLabelGroupList()
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
diff --git a/admin/src/addon/shop/views/goods/label_list.vue b/admin/src/addon/shop/views/goods/label_list.vue
index 9ea904fb..ca118f59 100644
--- a/admin/src/addon/shop/views/goods/label_list.vue
+++ b/admin/src/addon/shop/views/goods/label_list.vue
@@ -1,288 +1,177 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-        <el-button type="primary" @click="addEvent">
-          {{ t('addLabel') }}
-        </el-button>
-      </div>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
 
-      <el-tabs model-value="/shop/goods/label" @tab-change="handleClick">
-        <el-tab-pane :label="t('tabGoodsLabel')" name="/shop/goods/label" />
-        <el-tab-pane
-          :label="t('tabGoodsLabelGroup')"
-          name="/shop/goods/label/group"
-        />
-      </el-tabs>
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{pageName}}</span>
+                <el-button type="primary" @click="addEvent">
+                    {{ t('addLabel') }}
+                </el-button>
+            </div>
 
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="labelTable.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('labelName')" prop="label_name">
-            <el-input
-              v-model.trim="labelTable.searchParam.label_name"
-              :placeholder="t('labelNamePlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('groupName')" prop="group_id">
-            <el-select
-              v-model="labelTable.searchParam.group_id"
-              :placeholder="t('groupNamePlaceholder')"
-              clearable
-            >
-              <el-option
-                v-for="item in groupList"
-                :key="item.group_id"
-                :label="item.group_name"
-                :value="item.group_id"
-              />
-            </el-select>
-          </el-form-item>
+            <el-tabs model-value="/shop/goods/label" @tab-change="handleClick">
+                <el-tab-pane :label="t('tabGoodsLabel')" name="/shop/goods/label" />
+                <el-tab-pane :label="t('tabGoodsLabelGroup')" name="/shop/goods/label/group" />
+            </el-tabs>
 
-          <el-form-item>
-            <el-button type="primary" @click="loadLabelList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="labelTable.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('labelName')" prop="label_name">
+                        <el-input v-model.trim="labelTable.searchParam.label_name" :placeholder="t('labelNamePlaceholder')"  />
+                    </el-form-item>
+                    <el-form-item :label="t('groupName')" prop="group_id">
+                        <el-select v-model="labelTable.searchParam.group_id" :placeholder="t('groupNamePlaceholder')" clearable>
+                            <el-option v-for="item in groupList" :key="item.group_id" :label="item.group_name" :value="item.group_id" />
+                        </el-select>
+                    </el-form-item>
 
-      <div class="mt-[10px]">
-        <el-table
-          :data="labelTable.data"
-          size="large"
-          v-loading="labelTable.loading"
-          @sort-change="sortChange"
-        >
-          <template #empty>
-            <span>{{ !labelTable.loading ? t('emptyData') : '' }}</span>
-          </template>
-          <el-table-column
-            prop="label_name"
-            :label="t('label')"
-            min-width="120"
-          >
-            <template #default="{ row }">
-              <div
-                v-if="row.style_type == 'diy'"
-                class="inline-block px-[10px] text-[12px] rounded-[4px] box-border whitespace-nowrap h-[28px] leading-[28px]"
-                :style="{
-                  color: row.color_json.text_color,
-                  backgroundColor: row.color_json.bg_color,
-                  border: row.color_json.border_color
-                    ? '1px solid ' + row.color_json.border_color
-                    : 'none',
-                }"
-              >
-                <span>{{ row.label_name }}</span>
-              </div>
-              <img
-                v-else-if="row.style_type == 'icon'"
-                class="block h-[28px] rounded-[4px] object-cover"
-                :src="img(row.icon)"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="group_name"
-            :label="t('groupName')"
-            min-width="120"
-          >
-            <template #default="{ row }">
-              <span v-if="row.group">{{ row.group.group_name }}</span>
-              <span v-else>--</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="status"
-            :label="t('status')"
-            min-width="80"
-            :show-overflow-tooltip="true"
-          >
-            <template #default="{ row }">
-              <el-tag
-                type="success"
-                v-if="row.status == 1"
-                @click="modifyLabelStatusEvent(row.label_id, 0)"
-                class="cursor-pointer"
-                >{{ t('statusOn') }}</el-tag
-              >
-              <el-tag
-                type="info"
-                v-else
-                @click="modifyLabelStatusEvent(row.label_id, 1)"
-                class="cursor-pointer"
-                >{{ t('statusOff') }}</el-tag
-              >
-            </template>
-          </el-table-column>
-          <el-table-column prop="memo" :label="t('memo')" min-width="200" />
-          <el-table-column
-            prop="sort"
-            :label="t('sort')"
-            min-width="120"
-            sortable="custom"
-          >
-            <template #default="{ row }">
-              <el-input
-                v-model.trim="row.sort"
-                class="!w-[100px]"
-                maxlength="8"
-                @blur="sortInputListener(row.sort, row)"
-              />
-            </template>
-          </el-table-column>
+                    <el-form-item>
+                        <el-button type="primary" @click="loadLabelList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
 
-          <el-table-column
-            prop="create_time"
-            :label="t('createTime')"
-            min-width="100"
-            sortable="custom"
-          >
-            <template #default="{ row }">
-              <div>{{ row.create_time }}</div>
-            </template>
-          </el-table-column>
+            <div class="mt-[10px]">
+                <el-table :data="labelTable.data" size="large" v-loading="labelTable.loading" @sort-change="sortChange">
+                    <template #empty>
+                        <span>{{ !labelTable.loading ? t('emptyData') : '' }}</span>
+                    </template>
+                    <el-table-column prop="label_name" :label="t('label')" min-width="120">
+                        <template #default="{ row }">
+                            <div v-if="row.style_type == 'diy'" class="inline-block px-[10px] text-[12px] rounded-[4px] box-border whitespace-nowrap h-[28px] leading-[28px]"
+                                 :style="{ color : row.color_json.text_color, backgroundColor : row.color_json.bg_color, border : row.color_json.border_color ? '1px solid ' + row.color_json.border_color : 'none' }">
+                                <span>{{ row.label_name }}</span>
+                            </div>
+                            <img v-else-if="row.style_type == 'icon'" class="block h-[28px] rounded-[4px] object-cover" :src="img(row.icon)" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="group_name" :label="t('groupName')" min-width="120">
+                        <template #default="{ row }">
+                            <span v-if="row.group">{{ row.group.group_name }}</span>
+                            <span v-else>--</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="status" :label="t('status')" min-width="80" :show-overflow-tooltip="true" >
+                        <template #default="{ row }">
+                            <el-tag type="success" v-if="row.status == 1" @click="modifyLabelStatusEvent(row.label_id, 0)" class="cursor-pointer">{{ t('statusOn') }}</el-tag>
+                            <el-tag type="info" v-else @click="modifyLabelStatusEvent(row.label_id, 1)" class="cursor-pointer">{{ t('statusOff') }}</el-tag>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="memo" :label="t('memo')" min-width="200" />
+                    <el-table-column prop="sort" :label="t('sort')" min-width="120" sortable="custom">
+                        <template #default="{ row }">
+                            <el-input v-model.trim="row.sort" class="!w-[100px]" maxlength="8" @blur="sortInputListener(row.sort, row)" />
+                        </template>
+                    </el-table-column>
 
-          <el-table-column
-            :label="t('operation')"
-            fixed="right"
-            align="right"
-            min-width="120"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="editEvent(row)">{{
-                t('edit')
-              }}</el-button>
-              <el-button
-                type="primary"
-                link
-                @click="deleteEvent(row.label_id)"
-                >{{ t('delete') }}</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="labelTable.page"
-            v-model:page-size="labelTable.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="labelTable.total"
-            @size-change="loadLabelList()"
-            @current-change="loadLabelList"
-          />
-        </div>
-      </div>
+                    <el-table-column prop="create_time" :label="t('createTime')" min-width="100" sortable="custom">
+                        <template #default="{ row }">
+                            <div>{{ row.create_time }}</div>
+                        </template>
+                    </el-table-column>
 
-      <label-edit
-        ref="editLabelDialog"
-        @complete="loadLabelList"
-        :groupList="groupList"
-      />
-    </el-card>
-  </div>
+                    <el-table-column :label="t('operation')" fixed="right" align="right" min-width="120">
+                       <template #default="{ row }">
+                           <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+                           <el-button type="primary" link @click="deleteEvent(row.label_id)">{{ t('delete') }}</el-button>
+                       </template>
+                    </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="labelTable.page" v-model:page-size="labelTable.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="labelTable.total"
+                        @size-change="loadLabelList()" @current-change="loadLabelList" />
+                </div>
+            </div>
+
+            <label-edit ref="editLabelDialog" @complete="loadLabelList" :groupList="groupList" />
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
 import { t } from '@/lang'
-import {
-  getLabelPageList,
-  deleteLabel,
-  modifyLabelSort,
-  getLabelGroupList,
-  modifyLabelStatus,
-} from '@/addon/shop/api/goods'
+import { getLabelPageList, deleteLabel, modifyLabelSort,getLabelGroupList,modifyLabelStatus } from '@/addon/shop/api/goods'
 import { ElMessageBox, FormInstance, ElMessage } from 'element-plus'
 import LabelEdit from '@/addon/shop/views/goods/components/label-edit.vue'
-import { useRoute, useRouter } from 'vue-router'
-import { debounce, img } from '@/utils/common'
+import { useRoute,useRouter } from 'vue-router'
+import { debounce,img } from '@/utils/common'
 
 const route = useRoute()
 const router = useRouter()
 const pageName = route.meta.title
 
 const handleClick = (path: string) => {
-  router.push({ path })
+    router.push({ path })
 }
 
 const labelTable = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    label_name: '',
-    group_id: '',
-    order: '',
-    sort: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        label_name: '',
+        group_id: '',
+        order: '',
+        sort: ''
+    }
 })
 
-const groupList: any = reactive([])
+const groupList: any = reactive([]);
 
 const searchFormRef = ref<FormInstance>()
 
 // 监听排序
 const sortChange = (event: any) => {
-  let sort = ''
-  if (event.order == 'ascending') {
-    sort = 'asc'
-  } else if (event.order == 'descending') {
-    sort = 'desc'
-  }
-  if (sort) {
-    labelTable.searchParam.order = event.prop
-    labelTable.searchParam.sort = sort
-  }
-  loadLabelList()
+    let sort = ''
+    if (event.order == 'ascending') {
+        sort = 'asc'
+    } else if (event.order == 'descending') {
+        sort = 'desc'
+    }
+    if (sort) {
+        labelTable.searchParam.order = event.prop
+        labelTable.searchParam.sort = sort
+    }
+    loadLabelList()
 }
 
 /**
  * 获取商品标签列表
  */
 const loadLabelList = (page: number = 1) => {
-  labelTable.loading = true
-  labelTable.page = page
+    labelTable.loading = true
+    labelTable.page = page
 
-  getLabelPageList({
-    page: labelTable.page,
-    limit: labelTable.limit,
-    ...labelTable.searchParam,
-  })
-    .then((res) => {
-      labelTable.loading = false
-      labelTable.data = res.data.data
-      labelTable.total = res.data.total
-    })
-    .catch(() => {
-      labelTable.loading = false
+    getLabelPageList({
+        page: labelTable.page,
+        limit: labelTable.limit,
+        ...labelTable.searchParam
+    }).then(res => {
+        labelTable.loading = false
+        labelTable.data = res.data.data
+        labelTable.total = res.data.total
+    }).catch(() => {
+        labelTable.loading = false
     })
 }
 
-const initData = () => {
-  getLabelGroupList({}).then((res: any) => {
-    const data = res.data
-    if (data) {
-      groupList.push(...data)
-    }
-  })
-  loadLabelList()
+const initData = ()=>{
+    getLabelGroupList({}).then((res:any)=>{
+        const data = res.data
+        if (data) {
+            groupList.push(...data)
+        }
+    })
+    loadLabelList()
 }
 
-initData()
+initData();
 
 const editLabelDialog: Record<string, any> | null = ref(null)
 
@@ -290,8 +179,8 @@ const editLabelDialog: Record<string, any> | null = ref(null)
  * 添加商品标签
  */
 const addEvent = () => {
-  editLabelDialog.value.setFormData()
-  editLabelDialog.value.showDialog = true
+    editLabelDialog.value.setFormData()
+    editLabelDialog.value.showDialog = true
 }
 
 /**
@@ -299,66 +188,70 @@ const addEvent = () => {
  * @param data
  */
 const editEvent = (data: any) => {
-  editLabelDialog.value.setFormData(data)
-  editLabelDialog.value.showDialog = true
+    editLabelDialog.value.setFormData(data)
+    editLabelDialog.value.showDialog = true
 }
 
 /**
  * 删除商品标签
  */
 const deleteEvent = (id: number) => {
-  ElMessageBox.confirm(t('labelDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    deleteLabel(id)
-      .then(() => {
-        loadLabelList()
-      })
-      .catch(() => {})
-  })
+    ElMessageBox.confirm(t('labelDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        deleteLabel(id).then(() => {
+            loadLabelList()
+        }).catch(() => {
+        })
+    })
 }
 
 // 修改排序号
 const sortInputListener = debounce((sort, row) => {
-  if (isNaN(sort) || !/^\d{0,8}$/.test(sort)) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('sortTips')}`,
+    if (isNaN(sort) || !/^\d{0,8}$/.test(sort)) {
+        ElMessage({
+            type: 'warning',
+            message: `${ t('sortTips') }`
+        })
+        return
+    }
+    if (sort > 99999999) {
+        row.sort = 99999999
+    }
+    modifyLabelSort({
+        label_id: row.label_id,
+        sort
+    }).then((res) => {
     })
-    return
-  }
-  if (sort > 99999999) {
-    row.sort = 99999999
-  }
-  modifyLabelSort({
-    label_id: row.label_id,
-    sort,
-  }).then((res) => {})
 })
 
+
 const isRepeat = ref(false)
 
 // 修改状态
 const modifyLabelStatusEvent = (label_id: any, status: any) => {
-  if (isRepeat.value) return
-  isRepeat.value = true
+    if (isRepeat.value) return
+    isRepeat.value = true
 
-  modifyLabelStatus({
-    label_id,
-    status,
-  }).then((res) => {
-    loadLabelList()
-    isRepeat.value = false
-  })
+    modifyLabelStatus({
+        label_id,
+        status
+    }).then((res) => {
+        loadLabelList()
+        isRepeat.value = false
+    })
 }
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadLabelList()
+    if (!formEl) return
+    formEl.resetFields()
+    loadLabelList()
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
diff --git a/admin/src/addon/shop/views/goods/list.vue b/admin/src/addon/shop/views/goods/list.vue
index 76750ee1..697332e7 100644
--- a/admin/src/addon/shop/views/goods/list.vue
+++ b/admin/src/addon/shop/views/goods/list.vue
@@ -1,421 +1,194 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-        <el-button type="primary" @click="addEvent">{{
-          t('addGoods')
-        }}</el-button>
-      </div>
-
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="goodsTable.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('goodsName')" prop="goods_name">
-            <el-input
-              v-model.trim="goodsTable.searchParam.goods_name"
-              :placeholder="t('goodsNamePlaceholder')"
-              maxlength="60"
-            />
-          </el-form-item>
-          <el-form-item :label="t('goodsCategory')" prop="goods_category">
-            <!-- <el-cascader v-model="goodsTable.searchParam.goods_category" :options="goodsCategoryOptions" :placeholder="t('goodsCategoryPlaceholder')" clearable :props="{ value: 'value', label: 'label', emitPath:false }"/> -->
-            <el-cascader
-              v-model="goodsTable.searchParam.goods_category"
-              ref="cascader"
-              :options="goodsCategoryOptions"
-              @change="handleCascaderChange"
-              :placeholder="t('goodsCategoryPlaceholder')"
-              clearable
-              :props="{
-                value: 'value',
-                label: 'label',
-                emitPath: false,
-                multiple: false,
-                checkStrictly: true,
-                expandTrigger: 'hover',
-              }"
-            />
-          </el-form-item>
-          <el-form-item :label="t('goodsType')" prop="goods_type">
-            <el-select
-              v-model="goodsTable.searchParam.goods_type"
-              :placeholder="t('goodsTypePlaceholder')"
-              clearable
-            >
-              <el-option
-                v-for="item in goodsType"
-                :key="item.type"
-                :label="item.name"
-                :value="item.type"
-              />
-            </el-select>
-          </el-form-item>
-
-          <el-form-item :label="t('brand')" prop="brand_id">
-            <el-select
-              v-model="goodsTable.searchParam.brand_id"
-              :placeholder="t('brandPlaceholder')"
-              clearable
-            >
-              <el-option
-                v-for="item in brandOptions"
-                :key="item.brand_id"
-                :label="item.brand_name"
-                :value="item.brand_id"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="t('labelIds')" prop="label_ids">
-            <el-select
-              v-model="goodsTable.searchParam.label_ids"
-              :placeholder="t('labelIdsPlaceholder')"
-              clearable
-            >
-              <el-option
-                v-for="item in labelOptions"
-                :key="item.label_id"
-                :label="item.label_name"
-                :value="item.label_id"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="t('saleNum')" prop="sale_num">
-            <div class="region-input">
-              <input
-                type="text"
-                :placeholder="t('startSaleNumPlaceholder')"
-                maxlength="10"
-                v-model.trim="goodsTable.searchParam.start_sale_num"
-                @keyup="filterDigit($event)"
-              />
-              <span class="separator">-</span>
-              <input
-                type="text"
-                :placeholder="t('endSaleNumPlaceholder')"
-                maxlength="10"
-                v-model.trim="goodsTable.searchParam.end_sale_num"
-                @keyup="filterDigit($event)"
-              />
-            </div>
-          </el-form-item>
-          <el-form-item :label="t('skuPrice')" prop="sku_price">
-            <div class="region-input">
-              <input
-                type="text"
-                :placeholder="t('startPricePlaceholder')"
-                maxlength="10"
-                v-model.trim="goodsTable.searchParam.start_price"
-                @keyup="filterDigit($event)"
-              />
-              <span class="separator">-</span>
-              <input
-                type="text"
-                :placeholder="t('endPricePlaceholder')"
-                maxlength="10"
-                v-model.trim="goodsTable.searchParam.end_price"
-                @keyup="filterDigit($event)"
-              />
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+                <el-button type="primary" @click="addEvent">{{ t('addGoods') }}</el-button>
             </div>
-          </el-form-item>
-
-          <el-form-item>
-            <el-button type="primary" @click="loadGoodsList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
-
-      <div class="mt-[10px]">
-        <el-tabs
-          v-model="goodsTable.searchParam.status"
-          class="goods-tabs"
-          @tab-click="tabHandleClick"
-        >
-          <el-tab-pane :label="t('statusOn')" name="1"></el-tab-pane>
-          <el-tab-pane :label="t('statusOff')" name="0"></el-tab-pane>
-          <el-tab-pane :label="t('statusAll')" name=""></el-tab-pane>
-        </el-tabs>
-
-        <div class="mb-[10px] flex items-center">
-          <el-checkbox
-            v-model="toggleCheckbox"
-            size="large"
-            class="px-[14px]"
-            @change="toggleChange"
-            :indeterminate="isIndeterminate"
-          />
-          <el-button
-            @click="batchGoodsStatus(1)"
-            size="small"
-            v-if="goodsTable.searchParam.status != '1'"
-            >{{ t('batchOnGoods') }}</el-button
-          >
-          <el-button
-            @click="batchGoodsStatus(0)"
-            size="small"
-            v-if="goodsTable.searchParam.status != '0'"
-            >{{ t('batchOffGoods') }}</el-button
-          >
-          <el-button @click="batchDeleteGoods" size="small">{{
-            t('batchDeleteGoods')
-          }}</el-button>
-          <el-button @click="batchSetGoods" size="small">{{
-            t('batchSetting')
-          }}</el-button>
-        </div>
-
-        <el-table
-          :data="goodsTable.data"
-          size="large"
-          v-loading="goodsTable.loading"
-          ref="goodsListTableRef"
-          @sort-change="sortChange"
-          @selection-change="handleSelectionChange"
-        >
-          <template #empty>
-            <span>{{ !goodsTable.loading ? t('emptyData') : '' }}</span>
-          </template>
-          <el-table-column type="selection" width="55" />
-
-          <el-table-column
-            prop="goods_id"
-            :label="t('goodsInfo')"
-            min-width="300"
-          >
-            <template #default="{ row }">
-              <div
-                class="flex items-center cursor-pointer"
-                @click="previewEvent(row)"
-              >
-                <div
-                  class="min-w-[70px] h-[70px] flex items-center justify-center"
-                >
-                  <el-image
-                    v-if="row.goods_cover_thumb_small"
-                    class="w-[70px] h-[70px]"
-                    :src="img(row.goods_cover_thumb_small)"
-                    fit="contain"
-                  >
-                    <template #error>
-                      <div class="image-slot">
-                        <img
-                          class="w-[70px] h-[70px]"
-                          src="@/addon/shop/assets/goods_default.png"
-                        />
-                      </div>
-                    </template>
-                  </el-image>
-                  <img
-                    v-else
-                    class="w-[70px] h-[70px]"
-                    src="@/addon/shop/assets/goods_default.png"
-                    fit="contain"
-                  />
-                </div>
-                <div class="ml-2 flex flex-col items-start">
-                  <span :title="row.goods_name" class="multi-hidden">{{
-                    row.goods_name
-                  }}</span>
-                  <span class="text-primary text-[12px]">{{
-                    row.goods_type_name
-                  }}</span>
-                  <span
-                    class="px-[4px] text-[12px] text-[#fff] rounded-[4px] bg-primary leading-[18px]"
-                    v-if="row.is_gift == 1"
-                    >赠品</span
-                  >
+
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="goodsTable.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('goodsName')" prop="goods_name">
+                        <el-input v-model.trim="goodsTable.searchParam.goods_name" :placeholder="t('goodsNamePlaceholder')" maxlength="60" />
+                    </el-form-item>
+                    <el-form-item :label="t('goodsCategory')" prop="goods_category">
+                        <!-- <el-cascader v-model="goodsTable.searchParam.goods_category" :options="goodsCategoryOptions" :placeholder="t('goodsCategoryPlaceholder')" clearable :props="{ value: 'value', label: 'label', emitPath:false }"/> -->
+                        <el-cascader v-model="goodsTable.searchParam.goods_category" ref="cascader" :options="goodsCategoryOptions" @change="handleCascaderChange" :placeholder="t('goodsCategoryPlaceholder')" clearable :props="{ value: 'value', label: 'label', emitPath:false, multiple: false,checkStrictly: true,expandTrigger: 'hover'}"/>
+                    </el-form-item>
+                    <el-form-item :label="t('goodsType')" prop="goods_type">
+                        <el-select v-model="goodsTable.searchParam.goods_type" :placeholder="t('goodsTypePlaceholder')" clearable>
+                            <el-option v-for="item in goodsType" :key="item.type" :label="item.name" :value="item.type" />
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item :label="t('brand')" prop="brand_id">
+                        <el-select v-model="goodsTable.searchParam.brand_id" :placeholder="t('brandPlaceholder')" clearable>
+                            <el-option v-for="item in brandOptions" :key="item.brand_id" :label="item.brand_name" :value="item.brand_id" />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item :label="t('labelIds')" prop="label_ids">
+                        <el-select v-model="goodsTable.searchParam.label_ids" :placeholder="t('labelIdsPlaceholder')" clearable>
+                            <el-option v-for="item in labelOptions" :key="item.label_id" :label="item.label_name" :value="item.label_id" />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item :label="t('saleNum')" prop="sale_num">
+                        <div class="region-input">
+                            <input type="text" :placeholder="t('startSaleNumPlaceholder')" maxlength="10" v-model.trim="goodsTable.searchParam.start_sale_num" @keyup="filterDigit($event)">
+                            <span class="separator">-</span>
+                            <input type="text" :placeholder="t('endSaleNumPlaceholder')" maxlength="10" v-model.trim="goodsTable.searchParam.end_sale_num" @keyup="filterDigit($event)">
+                        </div>
+                    </el-form-item>
+                    <el-form-item :label="t('skuPrice')" prop="sku_price">
+                        <div class="region-input">
+                            <input type="text" :placeholder="t('startPricePlaceholder')" maxlength="10" v-model.trim="goodsTable.searchParam.start_price" @keyup="filterDigit($event)">
+                            <span class="separator">-</span>
+                            <input type="text" :placeholder="t('endPricePlaceholder')" maxlength="10" v-model.trim="goodsTable.searchParam.end_price" @keyup="filterDigit($event)">
+                        </div>
+                    </el-form-item>
+
+                    <el-form-item>
+                        <el-button type="primary" @click="loadGoodsList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+
+            <div class="mt-[10px]">
+
+                <el-tabs v-model="goodsTable.searchParam.status" class="goods-tabs" @tab-click="tabHandleClick">
+                    <el-tab-pane :label="t('statusOn')" name="1"></el-tab-pane>
+                    <el-tab-pane :label="t('statusOff')" name="0"></el-tab-pane>
+                    <el-tab-pane :label="t('statusAll')" name=""></el-tab-pane>
+                </el-tabs>
+
+                <div class="mb-[10px] flex items-center">
+                    <el-checkbox v-model="toggleCheckbox" size="large" class="px-[14px]" @change="toggleChange" :indeterminate="isIndeterminate" />
+                    <el-button @click="batchGoodsStatus(1)" size="small" v-if="goodsTable.searchParam.status != '1'">{{ t('batchOnGoods') }}</el-button>
+                    <el-button @click="batchGoodsStatus(0)" size="small" v-if="goodsTable.searchParam.status != '0'">{{ t('batchOffGoods') }}</el-button>
+                    <el-button @click="batchDeleteGoods" size="small">{{ t('batchDeleteGoods') }}</el-button>
+                    <el-button @click="batchSetGoods" size="small">{{ t('batchSetting') }}</el-button>
                 </div>
-              </div>
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            prop="price"
-            :label="t('skuPrice')"
-            min-width="120"
-            align="right"
-            sortable="custom"
-          >
-            <template #default="{ row }">
-              <div
-                class="cursor-pointer price-wrap"
-                @click="editPriceEvent(row)"
-              >
-                <span>￥{{ row.goodsSku.price }}</span>
-                <el-icon class="icon-wrap ml-[5px] invisible">
-                  <EditPen />
-                </el-icon>
-              </div>
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            prop="stock"
-            :label="t('stock')"
-            min-width="120"
-            sortable="custom"
-          >
-            <template #default="{ row }">
-              <div
-                class="cursor-pointer stock-wrap"
-                @click="editStockEvent(row)"
-              >
-                <span>{{ row.stock }}</span>
-                <el-icon class="icon-wrap ml-[5px] invisible">
-                  <EditPen />
-                </el-icon>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="sale_num"
-            :label="t('saleNum')"
-            min-width="100"
-            sortable="custom"
-          />
-          <el-table-column prop="status" :label="t('status')" min-width="100">
-            <template #default="{ row }">
-              <div v-if="row.status == 1">{{ t('statusOn') }}</div>
-              <div v-if="row.status == 0">{{ t('statusOff') }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="sort"
-            :label="t('sort')"
-            min-width="120"
-            sortable="custom"
-          >
-            <template #default="{ row }">
-              <el-input
-                v-model.trim="row.sort"
-                class="w-[70px]"
-                maxlength="8"
-                @blur="sortInputListener(row.sort, row)"
-              />
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            prop="create_time"
-            :label="t('createTime')"
-            min-width="150"
-            sortable="custom"
-          >
-            <template #default="{ row }">
-              <div>{{ row.create_time }}</div>
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            :label="t('operation')"
-            fixed="right"
-            align="right"
-            min-width="120"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="editEvent(row)">{{
-                t('edit')
-              }}</el-button>
-              <el-button type="primary" link @click="spreadEvent(row)">{{
-                t('spreadGoods')
-              }}</el-button>
-              <el-button type="primary" link @click="memberPriceEvent(row)">{{
-                t('memberPrice')
-              }}</el-button>
-              <el-button
-                type="primary"
-                v-if="row.status == 1"
-                link
-                @click="statusChange(row, 0)"
-                >{{ t('statusActionOff') }}</el-button
-              >
-              <el-button
-                type="primary"
-                v-else
-                link
-                @click="statusChange(row, 1)"
-                >{{ t('statusActionOn') }}</el-button
-              >
-              <el-button type="primary" link @click="copyEvent(row)">{{
-                t('copyGoods')
-              }}</el-button>
-              <el-button
-                type="primary"
-                v-if="row.status != 1"
-                link
-                @click="deleteEvent(row.goods_id)"
-                >{{ t('delete') }}</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <!-- <div class="flex items-center flex-1">
+
+                <el-table :data="goodsTable.data" size="large" v-loading="goodsTable.loading" ref="goodsListTableRef" @sort-change="sortChange" @selection-change="handleSelectionChange">
+                    <template #empty>
+                        <span>{{ !goodsTable.loading ? t('emptyData') : '' }}</span>
+                    </template>
+                    <el-table-column type="selection" width="55" />
+
+                    <el-table-column prop="goods_id" :label="t('goodsInfo')" min-width="300">
+                        <template #default="{ row }">
+                            <div class="flex items-center cursor-pointer" @click="previewEvent(row)">
+                                <div class="min-w-[70px] h-[70px] flex items-center justify-center">
+                                    <el-image v-if="row.goods_cover_thumb_small" class="w-[70px] h-[70px]" :src="img(row.goods_cover_thumb_small)" fit="contain">
+                                        <template #error>
+                                            <div class="image-slot">
+                                                <img class="w-[70px] h-[70px]" src="@/addon/shop/assets/goods_default.png" />
+                                            </div>
+                                        </template>
+                                    </el-image>
+                                    <img v-else class="w-[70px] h-[70px]" src="@/addon/shop/assets/goods_default.png" fit="contain" />
+                                </div>
+                                <div class="ml-2  flex flex-col items-start">
+                                    <span :title="row.goods_name" class="multi-hidden">{{ row.goods_name }}</span>
+                                    <span class="text-primary text-[12px]">{{ row.goods_type_name }}</span>
+                                    <span class="px-[4px]  text-[12px] text-[#fff] rounded-[4px] bg-primary leading-[18px]" v-if="row.is_gift == 1">赠品</span>
+                                </div>
+                            </div>
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column prop="price" :label="t('skuPrice')" min-width="120" align="right" sortable="custom">
+                        <template #default="{ row }">
+                            <div class="cursor-pointer price-wrap" @click="editPriceEvent(row)">
+                                <span>￥{{ row.goodsSku.price }}</span>
+                                <el-icon class="icon-wrap ml-[5px] invisible">
+                                    <EditPen />
+                                </el-icon>
+                            </div>
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column prop="stock" :label="t('stock')" min-width="120" sortable="custom">
+                        <template #default="{ row }">
+                            <div class="cursor-pointer stock-wrap" @click="editStockEvent(row)">
+                                <span>{{ row.stock }}</span>
+                                <el-icon class="icon-wrap ml-[5px] invisible">
+                                    <EditPen />
+                                </el-icon>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="sale_num" :label="t('saleNum')" min-width="100" sortable="custom" />
+                    <el-table-column prop="status" :label="t('status')" min-width="100">
+                        <template #default="{ row }">
+                            <div v-if="row.status == 1">{{ t('statusOn') }}</div>
+                            <div v-if="row.status == 0">{{ t('statusOff') }}</div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="sort" :label="t('sort')" min-width="120" sortable="custom">
+                        <template #default="{ row }">
+                            <el-input v-model.trim="row.sort" class="w-[70px]" maxlength="8" @blur="sortInputListener(row.sort, row)" />
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column prop="create_time" :label="t('createTime')" min-width="150" sortable="custom">
+                        <template #default="{ row }">
+                            <div>{{ row.create_time }}</div>
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column :label="t('operation')" fixed="right" align="right" min-width="120">
+                        <template #default="{ row }">
+                            <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+                            <el-button type="primary" link @click="spreadEvent(row)">{{ t('spreadGoods') }}</el-button>
+                            <el-button type="primary" link @click="memberPriceEvent(row)">{{ t('memberPrice') }}</el-button>
+                            <el-button type="primary" v-if="row.status == 1" link @click="statusChange(row, 0)">{{ t('statusActionOff') }}</el-button>
+                            <el-button type="primary" v-else link @click="statusChange(row, 1)">{{ t('statusActionOn') }}</el-button>
+                            <el-button type="primary" link @click="copyEvent(row)">{{ t('copyGoods') }}</el-button>
+                            <el-button type="primary" v-if="row.status != 1" link @click="deleteEvent(row.goods_id)">{{ t('delete') }}</el-button>
+                        </template>
+                    </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <!-- <div class="flex items-center flex-1">
                         <el-checkbox v-model="toggleCheckbox" size="large" class="px-[14px]" @change="toggleChange" :indeterminate="isIndeterminate" />
                         <el-button @click="batchGoodsStatus(1)" size="small">{{ t('batchOnGoods') }}</el-button>
                         <el-button @click="batchGoodsStatus(0)" size="small">{{ t('batchOffGoods') }}</el-button>
                         <el-button @click="batchDeleteGoods" size="small">{{ t('batchDeleteGoods') }}</el-button>
                     </div> -->
 
-          <el-pagination
-            v-model:current-page="goodsTable.page"
-            v-model:page-size="goodsTable.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="goodsTable.total"
-            @size-change="loadGoodsList()"
-            @current-change="loadGoodsList"
-          />
-        </div>
-      </div>
-    </el-card>
-
-    <!-- 商品库存编辑弹出框 -->
-    <goods-stock-edit-popup
-      ref="goodsStockEditPopupRef"
-      @load="loadGoodsList"
-    />
-
-    <!-- 商品价格编辑弹出框 -->
-    <goods-price-edit-popup
-      ref="goodsPriceEditPopupRef"
-      @load="loadGoodsList"
-    />
-
-    <!-- 商品推广弹出框 -->
-    <goods-spread-popup ref="goodsSpreadPopupRef" />
-
-    <!-- 会员价弹出框 -->
-    <goods-member-price-popup ref="memberPricePopupRef" @load="loadGoodsList" />
-
-    <!-- 批量设置弹出框 -->
-    <goods-batch-settings-popup
-      ref="goodsBatchSettingPopupRef"
-      @load="loadGoodsList"
-    />
-  </div>
+                    <el-pagination v-model:current-page="goodsTable.page" v-model:page-size="goodsTable.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="goodsTable.total"
+                        @size-change="loadGoodsList()" @current-change="loadGoodsList" />
+                </div>
+
+            </div>
+
+        </el-card>
+
+        <!-- 商品库存编辑弹出框 -->
+        <goods-stock-edit-popup ref="goodsStockEditPopupRef" @load="loadGoodsList" />
+
+        <!-- 商品价格编辑弹出框 -->
+        <goods-price-edit-popup ref="goodsPriceEditPopupRef" @load="loadGoodsList" />
+
+        <!-- 商品推广弹出框 -->
+        <goods-spread-popup ref="goodsSpreadPopupRef" />
+
+        <!-- 会员价弹出框 -->
+        <goods-member-price-popup ref="memberPricePopupRef" @load="loadGoodsList" />
+
+        <!-- 批量设置弹出框 -->
+        <goods-batch-settings-popup ref="goodsBatchSettingPopupRef" @load="loadGoodsList" />
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
 import { t } from '@/lang'
-import {
-  debounce,
-  img,
-  filterDigit,
-  setTablePageStorage,
-  getTablePageStorage,
-} from '@/utils/common'
+import { debounce, img, filterDigit, setTablePageStorage, getTablePageStorage } from '@/utils/common'
 import { ElMessage, ElMessageBox, FormInstance } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 import { cloneDeep, multiply } from 'lodash-es'
@@ -424,17 +197,7 @@ import goodsStockEditPopup from '@/addon/shop/views/goods/components/goods-stock
 import goodsPriceEditPopup from '@/addon/shop/views/goods/components/goods-price-edit-popup.vue'
 import goodsSpreadPopup from '@/addon/shop/views/goods/components/goods-spread-popup.vue'
 import goodsBatchSettingsPopup from '@/addon/shop/views/goods/components/goods-batch-settings-popup.vue'
-import {
-  getGoodsPageList,
-  getCategoryTree,
-  getGoodsType,
-  getBrandList,
-  getLabelList,
-  editGoodsSort,
-  editGoodsStatus,
-  copyGoods,
-  deleteGoods,
-} from '@/addon/shop/api/goods'
+import { getGoodsPageList, getCategoryTree, getGoodsType, getBrandList, getLabelList, editGoodsSort, editGoodsStatus, copyGoods, deleteGoods } from '@/addon/shop/api/goods'
 import { getMemberLevelAll } from '@/app/api/member'
 
 const router = useRouter()
@@ -443,33 +206,33 @@ const pageName = route.meta.title
 const repeat = ref(false)
 
 const goodsTable = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    goods_name: '',
-    goods_category: [],
-    goods_type: '',
-    brand_id: '',
-    label_ids: '',
-    start_sale_num: '',
-    end_sale_num: '',
-    start_price: '',
-    end_price: '',
-    status: route.query.status || '1',
-    order: '',
-    sort: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        goods_name: '',
+        goods_category: [],
+        goods_type: '',
+        brand_id: '',
+        label_ids: '',
+        start_sale_num: '',
+        end_sale_num: '',
+        start_price: '',
+        end_price: '',
+        status: route.query.status || '1',
+        order: '',
+        sort: ''
+    }
 })
 
 const searchFormRef = ref<FormInstance>()
 
 // 正则表达式
 const regExp = {
-  number: /^\d{0,10}$/,
-  digit: /^\d{0,10}(.?\d{0,2})$/,
+    number: /^\d{0,10}$/,
+    digit: /^\d{0,10}(.?\d{0,2})$/
 }
 
 // 商品分类
@@ -484,89 +247,85 @@ const brandOptions: any = reactive([])
 // 标签组列表下拉框
 const labelOptions: any = reactive([])
 
-const cascader = ref(null)
+const cascader = ref(null);
 // 级联选择器的 change 事件处理
-const handleCascaderChange = (value: any) => {
-  const cascaderInstance = cascader.value
-  if (cascaderInstance?.togglePopperVisible) {
-    cascaderInstance.togglePopperVisible(false) // 关闭下拉框
-  }
-}
+const handleCascaderChange = (value:any) => {
+    const cascaderInstance = cascader.value;
+        if (cascaderInstance?.togglePopperVisible) {
+            cascaderInstance.togglePopperVisible(false); // 关闭下拉框
+        }
+};
 
 // 初始化数据
 const initData = () => {
-  // 查询商品分类树结构
-  getCategoryTree().then((res) => {
-    const data = res.data
-    if (data) {
-      const goodsCategoryTree: any = []
-      // 增加全部筛选选择
-      goodsCategoryTree.push({
-        value: '',
-        label: '全部',
-        children: [],
-      })
-      data.forEach((item: any) => {
-        const children: any = []
-        if (item.child_list) {
-          children.push({
-            value: item.category_id,
-            label: '全部',
-          })
-          item.child_list.forEach((childItem: any) => {
-            children.push({
-              value: childItem.category_id,
-              label: childItem.category_name,
+    // 查询商品分类树结构
+    getCategoryTree().then((res) => {
+        const data = res.data
+        if (data) {
+            const goodsCategoryTree: any = []
+            // 增加全部筛选选择
+            goodsCategoryTree.push({
+                value: '',
+                label: '全部',
+                children: []
             })
-          })
+            data.forEach((item: any) => {
+                const children: any = []
+                if (item.child_list) {
+                    children.push({
+                        value: item.category_id,
+                        label: '全部'
+                    })
+                    item.child_list.forEach((childItem: any) => {
+                        children.push({
+                            value: childItem.category_id,
+                            label: childItem.category_name
+                        })
+                    })
+                }
+                goodsCategoryTree.push({
+                    value: item.category_id,
+                    label: item.category_name,
+                    children
+                })
+            })
+            goodsCategoryOptions.splice(0, goodsCategoryOptions.length, ...goodsCategoryTree)
         }
-        goodsCategoryTree.push({
-          value: item.category_id,
-          label: item.category_name,
-          children,
-        })
-      })
-      goodsCategoryOptions.splice(
-        0,
-        goodsCategoryOptions.length,
-        ...goodsCategoryTree
-      )
-    }
-  })
-
-  // 商品类型
-  getGoodsType().then((res) => {
-    const data = res.data
-    if (data) {
-      for (const k in data) {
-        goodsType.push(data[k])
-      }
-    }
-  })
+    })
 
-  // 商品品牌
-  getBrandList({}).then((res) => {
-    const data = res.data
-    if (data) {
-      brandOptions.push(...data)
-    }
-  })
+    // 商品类型
+    getGoodsType().then((res) => {
+        const data = res.data
+        if (data) {
+            for (const k in data) {
+                goodsType.push(data[k])
+            }
+        }
+    })
 
-  // 商品标签
-  getLabelList({}).then((res) => {
-    const data = res.data
-    if (data) {
-      labelOptions.push(...data)
-    }
-  })
+    // 商品品牌
+    getBrandList({}).then((res) => {
+        const data = res.data
+        if (data) {
+            brandOptions.push(...data)
+        }
+    })
+
+    // 商品标签
+    getLabelList({}).then((res) => {
+        const data = res.data
+        if (data) {
+            labelOptions.push(...data)
+        }
+    })
 }
 
 initData()
 
 // 当前选中tab页面
 const tabHandleClick = (tab: any, event: Event) => {
-  goodsTable.searchParam.status = tab.props.name
-  loadGoodsList()
+    goodsTable.searchParam.status = tab.props.name
+    loadGoodsList()
 }
 
 // 批量复选框
@@ -577,8 +336,8 @@ const isIndeterminate = ref(false)
 
 // 监听批量复选框事件
 const toggleChange = (value: any) => {
-  isIndeterminate.value = false
-  goodsListTableRef.value.toggleAllSelection()
+    isIndeterminate.value = false
+    goodsListTableRef.value.toggleAllSelection()
 }
 
 const goodsListTableRef = ref()
@@ -588,252 +347,228 @@ const multipleSelection: any = ref([])
 
 // 监听表格单行选中
 const handleSelectionChange = (val: []) => {
-  multipleSelection.value = val
-
-  toggleCheckbox.value = false
-  if (
-    multipleSelection.value.length > 0 &&
-    multipleSelection.value.length < goodsTable.data.length
-  ) {
-    isIndeterminate.value = true
-  } else {
-    isIndeterminate.value = false
-  }
-
-  if (
-    multipleSelection.value.length == goodsTable.data.length &&
-    goodsTable.data.length &&
-    multipleSelection.value.length
-  ) {
-    toggleCheckbox.value = true
-  }
+    multipleSelection.value = val
+
+    toggleCheckbox.value = false
+    if (multipleSelection.value.length > 0 && multipleSelection.value.length < goodsTable.data.length) {
+        isIndeterminate.value = true
+    } else {
+        isIndeterminate.value = false
+    }
+
+    if (multipleSelection.value.length == goodsTable.data.length && goodsTable.data.length && multipleSelection.value.length) {
+        toggleCheckbox.value = true
+    }
 }
 
 // 商品预览
 const previewEvent = (data: any) => {
-  const url = router.resolve({
-    path: '/preview/wap',
-    query: {
-      page: `/addon/shop/pages/goods/detail?goods_id=${data.goods_id}`,
-    },
-  })
-  window.open(url.href)
+    const url = router.resolve({
+        path: '/preview/wap',
+        query: {
+            page: `/addon/shop/pages/goods/detail?goods_id=${data.goods_id}`
+        }
+    })
+    window.open(url.href)
 }
 
 // 监听排序
 const sortChange = (event: any) => {
-  let sort = ''
-  if (event.order == 'ascending') {
-    sort = 'asc'
-  } else if (event.order == 'descending') {
-    sort = 'desc'
-  }
-  if (sort) {
-    goodsTable.searchParam.order = event.prop
-    goodsTable.searchParam.sort = sort
-  }
-  loadGoodsList()
+    let sort = ''
+    if (event.order == 'ascending') {
+        sort = 'asc'
+    } else if (event.order == 'descending') {
+        sort = 'desc'
+    }
+    if (sort) {
+        goodsTable.searchParam.order = event.prop
+        goodsTable.searchParam.sort = sort
+    }
+    loadGoodsList()
 }
 
 // 修改商品上下架状态
 const statusChange = (row: any, value: any) => {
-  if (value) {
-    editGoodsStatus({
-      goods_ids: row.goods_id,
-      status: value,
-    }).then((res) => {
-      loadGoodsList()
-    })
-  } else {
-    ElMessageBox.confirm(t('statusChangeTips'), t('warning'), {
-      confirmButtonText: t('confirm'),
-      cancelButtonText: t('cancel'),
-      type: 'warning',
-    }).then(() => {
-      editGoodsStatus({
-        goods_ids: row.goods_id,
-        status: value,
-      }).then((res) => {
-        loadGoodsList()
-      })
-    })
-  }
+    if (value) {
+        editGoodsStatus({
+            goods_ids: row.goods_id,
+            status: value
+        }).then((res) => {
+            loadGoodsList()
+        })
+    } else {
+        ElMessageBox.confirm(t('statusChangeTips'), t('warning'),
+            {
+                confirmButtonText: t('confirm'),
+                cancelButtonText: t('cancel'),
+                type: 'warning'
+            }
+        ).then(() => {
+            editGoodsStatus({
+                goods_ids: row.goods_id,
+                status: value
+            }).then((res) => {
+                loadGoodsList()
+            })
+        })
+    }
 }
 
 // 批量设置上下架
 const batchGoodsStatus = (status: any) => {
-  if (multipleSelection.value.length == 0) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('batchEmptySelectedGoodsTips')}`,
+    if (multipleSelection.value.length == 0) {
+        ElMessage({
+            type: 'warning',
+            message: `${t('batchEmptySelectedGoodsTips')}`
+        })
+        return
+    }
+
+    const goodsIds: any = []
+    multipleSelection.value.forEach((item: any) => {
+        goodsIds.push(item.goods_id)
+    })
+
+    editGoodsStatus({
+        goods_ids: goodsIds,
+        status
+    }).then((res) => {
+        loadGoodsList()
     })
-    return
-  }
-
-  const goodsIds: any = []
-  multipleSelection.value.forEach((item: any) => {
-    goodsIds.push(item.goods_id)
-  })
-
-  editGoodsStatus({
-    goods_ids: goodsIds,
-    status,
-  }).then((res) => {
-    loadGoodsList()
-  })
 }
 /** ***************** 批量设置-start *************************/
 const goodsBatchSettingPopupRef = ref()
 const batchSetGoods = () => {
-  if (multipleSelection.value.length == 0) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('batchEmptySelectedGoodsTips')}`,
-    })
-    return
-  }
-  goodsBatchSettingPopupRef.value.show(multipleSelection.value)
+    if (multipleSelection.value.length == 0) {
+        ElMessage({
+            type: 'warning',
+            message: `${t('batchEmptySelectedGoodsTips')}`
+        })
+        return
+    }
+    goodsBatchSettingPopupRef.value.show(multipleSelection.value)
 }
 /** ***************** 批量设置-end *************************/
 
+
 const batchDeleteGoods = () => {
-  if (multipleSelection.value.length == 0) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('batchEmptySelectedGoodsTips')}`,
-    })
-    return
-  }
+    if (multipleSelection.value.length == 0) {
+        ElMessage({
+            type: 'warning',
+            message: `${t('batchEmptySelectedGoodsTips')}`
+        })
+        return
+    }
 
-  ElMessageBox.confirm(t('batchGoodsDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    if (repeat.value) return
-    repeat.value = true
+    ElMessageBox.confirm(t('batchGoodsDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        if (repeat.value) return
+        repeat.value = true
 
-    const goodsIds: any = []
-    multipleSelection.value.forEach((item: any) => {
-      goodsIds.push(item.goods_id)
-    })
+        const goodsIds: any = []
+        multipleSelection.value.forEach((item: any) => {
+            goodsIds.push(item.goods_id)
+        })
 
-    deleteGoods({
-      goods_ids: goodsIds,
+        deleteGoods({
+            goods_ids: goodsIds
+        }).then(() => {
+            loadGoodsList()
+            repeat.value = false
+        }).catch(() => {
+            repeat.value = false
+        })
     })
-      .then(() => {
-        loadGoodsList()
-        repeat.value = false
-      })
-      .catch(() => {
-        repeat.value = false
-      })
-  })
 }
 
 // 修改排序号
 const sortInputListener = debounce((sort, row) => {
-  if (isNaN(sort) || !regExp.number.test(sort)) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('sortTips')}`,
+    if (isNaN(sort) || !regExp.number.test(sort)) {
+        ElMessage({
+            type: 'warning',
+            message: `${t('sortTips')}`
+        })
+        return
+    }
+    if(sort>99999999){
+        row.sort = 99999999
+    }
+    editGoodsSort({
+        goods_id: row.goods_id,
+        sort
+    }).then((res) => {
+        // loadGoodsList();
     })
-    return
-  }
-  if (sort > 99999999) {
-    row.sort = 99999999
-  }
-  editGoodsSort({
-    goods_id: row.goods_id,
-    sort,
-  }).then((res) => {
-    // loadGoodsList();
-  })
 })
 
 /**
  * 获取商品列表
  */
 const loadGoodsList = (page: number = 1) => {
-  if (
-    goodsTable.searchParam.start_sale_num &&
-    !regExp.digit.test(goodsTable.searchParam.start_sale_num)
-  ) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('startSaleNumTips')}`,
-    })
-    return
-  }
-  if (
-    goodsTable.searchParam.end_sale_num &&
-    !regExp.digit.test(goodsTable.searchParam.end_sale_num)
-  ) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('endSaleNumTips')}`,
-    })
-    return
-  }
-  if (
-    Number(goodsTable.searchParam.start_sale_num) >
-    Number(goodsTable.searchParam.end_sale_num)
-  ) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('shopSaleNumTips')}`,
-    })
-    return
-  }
-  if (
-    goodsTable.searchParam.start_price &&
-    !regExp.digit.test(goodsTable.searchParam.start_price)
-  ) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('startPriceTips')}`,
-    })
-    return
-  }
-  if (
-    goodsTable.searchParam.end_price &&
-    !regExp.digit.test(goodsTable.searchParam.end_price)
-  ) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('endPriceTips')}`,
-    })
-    return
-  }
-  if (
-    Number(goodsTable.searchParam.start_price) >
-    Number(goodsTable.searchParam.end_price)
-  ) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('shopPriceTips')}`,
-    })
-    return
-  }
-  goodsTable.loading = true
-  goodsTable.page = page
-
-  const searchData = cloneDeep(goodsTable.searchParam)
-
-  getGoodsPageList({
-    page: goodsTable.page,
-    limit: goodsTable.limit,
-    ...searchData,
-  })
-    .then((res) => {
-      goodsTable.loading = false
-      goodsTable.data = res.data.data
-      goodsTable.total = res.data.total
-      multipleSelection.value = []
-      setTablePageStorage(goodsTable.page, goodsTable.limit, searchData)
-    })
-    .catch(() => {
-      goodsTable.loading = false
+    if (goodsTable.searchParam.start_sale_num && !regExp.digit.test(goodsTable.searchParam.start_sale_num)) {
+        ElMessage({
+            type: 'warning',
+            message: `${t('startSaleNumTips')}`
+        })
+        return
+    }
+    if (goodsTable.searchParam.end_sale_num && !regExp.digit.test(goodsTable.searchParam.end_sale_num)) {
+        ElMessage({
+            type: 'warning',
+            message: `${t('endSaleNumTips')}`
+        })
+        return
+    }
+    if (Number(goodsTable.searchParam.start_sale_num) > Number(goodsTable.searchParam.end_sale_num)) {
+        ElMessage({
+            type: 'warning',
+            message: `${t('shopSaleNumTips')}`
+        })
+        return
+    }
+    if (goodsTable.searchParam.start_price && !regExp.digit.test(goodsTable.searchParam.start_price)) {
+        ElMessage({
+            type: 'warning',
+            message: `${t('startPriceTips')}`
+        })
+        return
+    }
+    if (goodsTable.searchParam.end_price && !regExp.digit.test(goodsTable.searchParam.end_price)) {
+        ElMessage({
+            type: 'warning',
+            message: `${t('endPriceTips')}`
+        })
+        return
+    }
+    if (Number(goodsTable.searchParam.start_price) > Number(goodsTable.searchParam.end_price)) {
+        ElMessage({
+            type: 'warning',
+            message: `${t('shopPriceTips')}`
+        })
+        return
+    }
+    goodsTable.loading = true
+    goodsTable.page = page
+
+    const searchData = cloneDeep(goodsTable.searchParam)
+
+    getGoodsPageList({
+        page: goodsTable.page,
+        limit: goodsTable.limit,
+        ...searchData
+    }).then(res => {
+        goodsTable.loading = false
+        goodsTable.data = res.data.data
+        goodsTable.total = res.data.total
+        multipleSelection.value = []
+        setTablePageStorage(goodsTable.page, goodsTable.limit, searchData)
+    }).catch(() => {
+        goodsTable.loading = false
     })
 }
 
@@ -843,11 +578,11 @@ loadGoodsList(getTablePageStorage(goodsTable.searchParam).page)
  * 添加商品
  */
 const addEvent = () => {
-  router.push('/shop/goods/real_edit')
-  // let url = router.resolve({
-  //     path: '/shop/goods/real_edit',
-  // });
-  // window.open(url.href);
+    router.push('/shop/goods/real_edit')
+    // let url = router.resolve({
+    //     path: '/shop/goods/real_edit',
+    // });
+    // window.open(url.href);
 }
 
 /**
@@ -855,133 +590,132 @@ const addEvent = () => {
  * @param data
  */
 const editEvent = (data: any) => {
-  router.push(data.goods_edit_path + '?goods_id=' + data.goods_id)
-  // let url = router.resolve({
-  //     path: data.goods_edit_path,
-  //     query: {goods_id: data.goods_id}
-  // });
-  // window.open(url.href);
+    router.push(data.goods_edit_path + '?goods_id=' + data.goods_id)
+    // let url = router.resolve({
+    //     path: data.goods_edit_path,
+    //     query: {goods_id: data.goods_id}
+    // });
+    // window.open(url.href);
 }
 
 const goodsPriceEditPopupRef: any = ref(null)
 
 // 编辑商品价格
 const editPriceEvent = (data: any) => {
-  goodsPriceEditPopupRef.value.show(data)
+    goodsPriceEditPopupRef.value.show(data)
 }
 
 const goodsStockEditPopupRef: any = ref(null)
 
 // 编辑商品库存
 const editStockEvent = (data: any) => {
-  goodsStockEditPopupRef.value.show(data)
+    goodsStockEditPopupRef.value.show(data)
 }
 
 // 商品推广
 const goodsSpreadPopupRef: any = ref(null)
 
 const spreadEvent = (data: any) => {
-  goodsSpreadPopupRef.value.show(data)
+    goodsSpreadPopupRef.value.show(data)
 }
 
 /** ***************** 会员价-start *************************/
 // 会员等级
 const memberLevel = ref([])
 const getMemberLevelAllFn = () => {
-  getMemberLevelAll().then((res) => {
-    memberLevel.value = res.data ? res.data : []
-  })
+    getMemberLevelAll().then(res => {
+        memberLevel.value = res.data ? res.data : []
+    })
 }
 getMemberLevelAllFn()
 
 const memberPricePopupRef: any = ref(null)
 const memberPriceEvent = (data: any) => {
-  memberPricePopupRef.value.show(data, memberLevel.value)
+    memberPricePopupRef.value.show(data, memberLevel.value)
 }
 /** ***************** 会员价-end *************************/
 
 // 复制商品
 const copyEvent = (data: any) => {
-  ElMessageBox.confirm(t('goodsCopyTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    if (repeat.value) return
-    repeat.value = true
-
-    copyGoods({
-      goods_id: data.goods_id,
-    })
-      .then((res: any) => {
-        if (res.code == 1) {
-          loadGoodsList()
+    ElMessageBox.confirm(t('goodsCopyTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
         }
-        repeat.value = false
-      })
-      .catch((err) => {
-        repeat.value = false
-      })
-  })
+    ).then(() => {
+        if (repeat.value) return
+        repeat.value = true
+
+        copyGoods({
+            goods_id: data.goods_id
+        }).then((res: any) => {
+            if (res.code == 1) {
+                loadGoodsList()
+            }
+            repeat.value = false
+        }).catch(err => {
+            repeat.value = false
+        })
+    })
 }
 
 // 删除商品
 const deleteEvent = (id: number) => {
-  ElMessageBox.confirm(t('goodsDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    if (repeat.value) return
-    repeat.value = true
-    deleteGoods({
-      goods_ids: id,
+    ElMessageBox.confirm(t('goodsDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        if (repeat.value) return
+        repeat.value = true
+        deleteGoods({
+            goods_ids: id
+        }).then(() => {
+            loadGoodsList()
+            repeat.value = false
+        }).catch(() => {
+            repeat.value = false
+        })
     })
-      .then(() => {
-        loadGoodsList()
-        repeat.value = false
-      })
-      .catch(() => {
-        repeat.value = false
-      })
-  })
 }
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  goodsTable.searchParam.start_price = ''
-  goodsTable.searchParam.end_price = ''
-  goodsTable.searchParam.start_sale_num = ''
-  goodsTable.searchParam.end_sale_num = ''
-
-  loadGoodsList()
+    if (!formEl) return
+    formEl.resetFields()
+    goodsTable.searchParam.start_price = ''
+    goodsTable.searchParam.end_price = ''
+    goodsTable.searchParam.start_sale_num = ''
+    goodsTable.searchParam.end_sale_num = ''
+
+    loadGoodsList()
 }
 </script>
 <style lang="scss">
-.el-cascader-panel .el-radio {
-  position: absolute;
-  z-index: 10;
-  padding: 0 10px;
-  width: 132px;
-  height: 34px;
-  line-height: 34px;
-}
-.el-cascader-panel .el-radio__input {
-  visibility: hidden;
-}
-.el-cascader-panel .el-input-node__postfix {
-  top: 10px;
-}
+    .el-cascader-panel .el-radio{
+        position:absolute;
+        z-index:10;
+        padding:0 10px;
+        width:132px;
+        height:34px;
+        line-height:34px;
+    }
+    .el-cascader-panel .el-radio__input{
+        visibility:hidden;
+    }
+    .el-cascader-panel .el-input-node__postfix{
+        top:10px;
+    }
 </style>
 <style lang="scss" scoped>
-.price-wrap,
-.stock-wrap {
-  &:hover {
-    .icon-wrap {
-      visibility: visible;
-      color: var(--el-color-primary);
+    .price-wrap, .stock-wrap {
+        &:hover {
+            .icon-wrap {
+                visibility: visible;
+                color: var(--el-color-primary);
+            }
+        }
     }
-  }
-}
 </style>
diff --git a/admin/src/addon/shop/views/goods/public/js/useGoodsEdit.ts b/admin/src/addon/shop/views/goods/public/js/useGoodsEdit.ts
index db8c0eeb..82b8e2a9 100644
--- a/admin/src/addon/shop/views/goods/public/js/useGoodsEdit.ts
+++ b/admin/src/addon/shop/views/goods/public/js/useGoodsEdit.ts
@@ -7,1682 +7,1591 @@ import { debounce, deepClone } from '@/utils/common'
 import { useRoute, useRouter } from 'vue-router'
 import Test from '@/utils/test'
 import {
-  getGoodsType,
-  getBrandList,
-  getLabelList,
-  getServeList,
-  getSupplierList,
-  getCategoryTree,
-  getAttrList,
-  getAttrInfo,
+    getGoodsType,
+    getBrandList,
+    getLabelList,
+    getServeList,
+    getSupplierList,
+    getCategoryTree,
+    getAttrList,
+    getAttrInfo
 } from '@/addon/shop/api/goods'
 import { getPosterList } from '@/app/api/poster'
 import { getDiyFormList } from '@/app/api/diy_form'
 
 // 商品添加/编辑
 export function useGoodsEdit(params: any = {}) {
-  const route = useRoute()
-  const router = useRouter()
-
-  const repeat = ref(false)
-
-  // 表单数据
-  const formData: any = reactive({
-    goods_id: '',
-    goods_type: 'real',
-
-    // 基础信息
-    goods_name: '',
-    sub_title: '',
-    goods_image: '',
-    goods_video: '',
-    goods_category: '',
-    brand_id: '',
-    poster_id: '',
-    form_id: '',
-    label_ids: [],
-    service_ids: [],
-    supplier_id: '',
-    status: '1',
-    is_gift: 0,
-    sort: '',
-
-    addon_shop_supplier: [],
-
-    // 价格库存
-    spec_type: 'single',
-    price: '',
-    market_price: '',
-    cost_price: '',
-    stock: '',
-    sku_no: '',
-    unit: '',
-    virtual_sale_num: '',
-    member_discount: '',
-    is_limit: 0,
-    limit_type: 1,
-    max_buy: '',
-    min_buy: '',
-
-    // 商品参数
-    attr_format: [],
-    attr_id: '',
-
-    // 商品详情
-    goods_desc: '',
-    skuCheckAll: false, // 是否全选
-    skuIsIndeterminate: false, // 是否部分选中
-    skuCheckedCities: [], // 选中的规格
-  })
-
-  Object.assign(formData, params.formData)
-
-  formData.goods_id = ref(route.query.goods_id)
-
-  // 追加表单数据
-  const appendFormData = params.appendFormData
-  Object.assign(formData, appendFormData)
-
-  // 追加刷新商品sku数据
-  const appendRefreshGoodsSkuData = params.appendRefreshGoodsSkuData || {}
-
-  // 追加单规格数据
-  const appendSingleGoodsData = params.appendSingleGoodsData
-
-  const getFormRules = params.getFormRules
-
-  const formRefArr: any = reactive({})
-
-  const getFormRef = params.getFormRef
-
-  const verifyArr: any = reactive([])
-
-  nextTick(() => {
-    let formRef = getFormRef()
-    for (let key in formRef) {
-      formRefArr[key] = formRef[key]
-    }
 
-    if (params.getVerify) {
-      verifyArr.splice(0, verifyArr.length, ...params.getVerify())
-    }
-  })
-
-  const editApi = params.editApi
-  const addApi = params.addApi
-
-  const activeName: any = ref('basic')
-  const tabHandleClick = (tab: TabsPaneContext, event: Event) => {
-    // console.log(tab, event)
-  }
-
-  // 商品类型
-  const goodsType = reactive([])
-
-  // 切换商品类型
-  const changeGoodsType = (data: any) => {
-    router.push(data.path)
-  }
-
-  // 商品类型
-  getGoodsType().then((res) => {
-    const data = res.data
-    if (data) {
-      for (const k in data) {
-        goodsType.push(data[k])
-      }
-    }
-  })
-
-  // 商品分类
-  const goodsCategoryOptions = reactive([])
-  const goodsCategoryProps = {
-    multiple: true,
-  }
-
-  const categoryHandleChange = (value: any) => {
-    // console.log(value, goodsEdit.formData.goods_category, goodsEdit.formData.goods_category.toString())
-  }
-
-  // 跳转到商品分类，添加分类
-  const toGoodsCategoryEvent = () => {
-    const url = router.resolve({
-      path: '/shop/goods/category',
+    const route = useRoute()
+    const router = useRouter()
+
+    const repeat = ref(false)
+
+    // 表单数据
+    const formData: any = reactive({
+        goods_id: '',
+        goods_type: 'real',
+
+        // 基础信息
+        goods_name: '',
+        sub_title: '',
+        goods_image: '',
+        goods_video:'',
+        goods_category: '',
+        brand_id: '',
+        poster_id: '',
+        form_id: '',
+        label_ids: [],
+        service_ids: [],
+        supplier_id: '',
+        status: '1',
+        is_gift: 0,
+        sort: '',
+
+        addon_shop_supplier: [],
+
+        // 价格库存
+        spec_type: 'single',
+        price: '',
+        market_price: '',
+        cost_price: '',
+        stock: '',
+        sku_no: '',
+        unit: '',
+        virtual_sale_num: '',
+        member_discount: '',
+        is_limit: 0,
+        limit_type: 1,
+        max_buy: '',
+        min_buy: '',
+
+        // 商品参数
+        attr_format: [],
+        attr_id: '',
+
+        // 商品详情
+        goods_desc: '',
+        skuCheckAll :false,// 是否全选
+        skuIsIndeterminate : false,// 是否部分选中
+        skuCheckedCities: [],// 选中的规格
     })
-    window.open(url.href)
-  }
-
-  // 刷新商品分类
-  const refreshGoodsCategory = (bool = false) => {
-    getCategoryTree().then((res) => {
-      const data = res.data
-      if (data) {
-        const goodsCategoryTree: any = []
-        data.forEach((item: any) => {
-          const children: any = []
-          if (item.child_list) {
-            item.child_list.forEach((childItem: any) => {
-              children.push({
-                value: childItem.category_id,
-                label: childItem.category_name,
-              })
-            })
-          }
-          goodsCategoryTree.push({
-            value: item.category_id,
-            label: item.category_name,
-            children,
-          })
-        })
-        goodsCategoryOptions.splice(
-          0,
-          goodsCategoryOptions.length,
-          ...goodsCategoryTree
-        )
-        if (bool) {
-          ElMessage({
-            message: t('refreshSuccess'),
-            type: 'success',
-          })
-        }
-      }
-    })
-  }
 
-  refreshGoodsCategory()
+    Object.assign(formData, params.formData);
 
-  // 品牌列表下拉框
-  const brandOptions = reactive([])
+    formData.goods_id = ref(route.query.goods_id)
 
-  // 跳转到商品品牌，添加品牌
-  const toGoodsBrandEvent = () => {
-    const url = router.resolve({
-      path: '/shop/goods/brand',
-    })
-    window.open(url.href)
-  }
-
-  // 商品品牌
-  const refreshGoodsBrand = (bool = false) => {
-    getBrandList({}).then((res) => {
-      const data = res.data
-      if (data) {
-        brandOptions.splice(0, brandOptions.length, ...data)
-        if (bool) {
-          ElMessage({
-            message: t('refreshSuccess'),
-            type: 'success',
-          })
-        }
-      }
-    })
-  }
-
-  refreshGoodsBrand()
+    // 追加表单数据
+    const appendFormData = params.appendFormData;
+    Object.assign(formData, appendFormData);
 
-  // 海报列表下拉框
-  const posterOptions = reactive([])
+    // 追加刷新商品sku数据
+    const appendRefreshGoodsSkuData = params.appendRefreshGoodsSkuData || {};
 
-  // 跳转到海报列表，添加海报
-  const toPosterEvent = () => {
-    const url = router.resolve({
-      path: '/poster/list',
-    })
-    window.open(url.href)
-  }
-
-  // 商品海报
-  const refreshGoodsPoster = (bool = false) => {
-    getPosterList({
-      type: 'shop_goods',
-    }).then((res) => {
-      const data = res.data
-      if (data) {
-        posterOptions.splice(0, posterOptions.length, ...data)
-        if (bool) {
-          ElMessage({
-            message: t('refreshSuccess'),
-            type: 'success',
-          })
-        }
-      }
-    })
-  }
+    // 追加单规格数据
+    const appendSingleGoodsData = params.appendSingleGoodsData;
 
-  refreshGoodsPoster()
+    const getFormRules = params.getFormRules;
 
-  // 万能表单列表下拉框
-  const diyFormOptions = reactive([])
+    const formRefArr: any = reactive({});
 
-  // 跳转到万能表单列表，添加表单
-  const toDiyFormEvent = () => {
-    const url = router.resolve({
-      path: '/diy_form/list',
-    })
-    window.open(url.href)
-  }
-
-  // 刷新万能表单
-  const refreshDiyForm = (bool = false) => {
-    getDiyFormList({
-      type: 'DIY_FORM_GOODS_DETAIL',
-      status: 1,
-    }).then((res) => {
-      const data = res.data
-      if (data) {
-        diyFormOptions.splice(0, diyFormOptions.length, ...data)
-        if (bool) {
-          ElMessage({
-            message: t('refreshSuccess'),
-            type: 'success',
-          })
-        }
-      }
-    })
-  }
+    const getFormRef = params.getFormRef;
 
-  refreshDiyForm()
+    const verifyArr: any = reactive([])
 
-  // 标签组列表复选框
-  const labelOptions = reactive([])
+    nextTick(() => {
+        let formRef = getFormRef();
+        for (let key in formRef) {
+            formRefArr[key] = formRef[key];
+        }
 
-  // 跳转到商品标签，添加标签
-  const toGoodsLabelEvent = () => {
-    const url = router.resolve({
-      path: '/shop/goods/label',
-    })
-    window.open(url.href)
-  }
-
-  // 商品标签
-  const refreshGoodsLabel = () => {
-    getLabelList({}).then((res) => {
-      const data = res.data
-      if (data) {
-        labelOptions.splice(0, labelOptions.length, ...data)
-      }
-    })
-  }
+        if (params.getVerify) {
+            verifyArr.splice(0, verifyArr.length, ...params.getVerify())
+        }
 
-  refreshGoodsLabel()
+    });
 
-  // 商品服务列表复选框
-  const serviceOptions = reactive([])
+    const editApi = params.editApi;
+    const addApi = params.addApi;
 
-  // 跳转到商品服务，添加服务
-  const toGoodsServiceEvent = () => {
-    const url = router.resolve({
-      path: '/shop/goods/service',
-    })
-    window.open(url.href)
-  }
-
-  // 商品服务
-  const refreshGoodsService = () => {
-    getServeList({}).then((res) => {
-      const data = res.data
-      if (data) {
-        serviceOptions.splice(0, serviceOptions.length, ...data)
-      }
-    })
-  }
+    const activeName: any = ref('basic')
+    const tabHandleClick = (tab: TabsPaneContext, event: Event) => {
+        // console.log(tab, event)
+    }
 
-  refreshGoodsService()
+    // 商品类型
+    const goodsType = reactive([])
 
-  // 供应商列表下拉框
-  const supplierOptions = reactive([])
+    // 切换商品类型
+    const changeGoodsType = (data: any) => {
+        router.push(data.path)
+    }
 
-  // 跳转到供应商
-  const toSupplierEvent = () => {
-    const url = router.resolve({
-      path: '/shop_supplier/supplier',
-    })
-    window.open(url.href)
-  }
-
-  // 供应商
-  const refreshSupplier = () => {
-    getSupplierList({}).then((res) => {
-      const data = res.data
-      if (data) {
-        supplierOptions.splice(0, supplierOptions.length, ...data)
-      }
+    // 商品类型
+    getGoodsType().then((res) => {
+        const data = res.data
+        if (data) {
+            for (const k in data) {
+                goodsType.push(data[k])
+            }
+        }
     })
-  }
 
-  const goodsSpecFormat: any = reactive([]) // 规格项/规格值
-  const goodsSkuData: any = reactive({}) // 商品SKU规格数据
-  const specData: any = reactive([]) // 商品规格值
-
-  const activeGoodsCount: any = ref(0)
+    // 商品分类
+    const goodsCategoryOptions = reactive([])
+    const goodsCategoryProps = {
+        multiple: true
+    }
 
-  const isDisabledPrice = () => {
-    if (activeGoodsCount.value > 0) {
-      return true
+    const categoryHandleChange = (value: any) => {
+        // console.log(value, goodsEdit.formData.goods_category, goodsEdit.formData.goods_category.toString())
     }
-    return false
-  }
-
-  const handleGoodsInit = (data: any) => {
-    formData.addon_shop_supplier = data.addon_shop_supplier
-    if (
-      formData.addon_shop_supplier &&
-      formData.addon_shop_supplier.status == 1
-    ) {
-      refreshSupplier()
+
+    // 跳转到商品分类，添加分类
+    const toGoodsCategoryEvent = () => {
+        const url = router.resolve({
+            path: '/shop/goods/category'
+        })
+        window.open(url.href)
     }
 
-    if (formData.goods_id && data.goods_info) {
-      // 商品参与营销活动的数量
-      activeGoodsCount.value = data.goods_info.active_goods_count
-
-      // 基础信息
-      formData.goods_name = data.goods_info.goods_name
-      formData.sub_title = data.goods_info.sub_title
-      formData.goods_type = data.goods_info.goods_type
-      formData.goods_image = data.goods_info.goods_image
-      formData.goods_video = data.goods_info.goods_video
-      formData.goods_category = data.goods_info.goods_category
-      formData.brand_id = data.goods_info.brand_id
-      formData.poster_id = data.goods_info.poster_id
-      formData.form_id = data.goods_info.form_id
-      formData.label_ids = data.goods_info.label_ids
-      formData.service_ids = data.goods_info.service_ids
-      formData.supplier_id = data.goods_info.supplier_id
-      formData.status = data.goods_info.status
-      formData.sort = data.goods_info.sort
-      formData.is_gift = data.goods_info.is_gift
-
-      /*************** 商品参数-start ****************/
-      formData.attr_format = data.goods_info.attr_format
-        ? JSON.parse(data.goods_info.attr_format)
-        : []
-      formData.attr_id = data.goods_info.attr_id
-
-      editCallFn.value = true
-      attrChange(formData.attr_id || -1) //formData.attr_id为空，需要传入-1，便于attrChange方法调用
-      /*************** 商品参数-end ****************/
-
-      // 价格库存
-      formData.spec_type = data.goods_info.spec_type
-      formData.stock = data.goods_info.stock
-
-      if (formData.spec_type == 'single') {
-        // 单规格
-        const skuInfo = data.goods_info.sku_list[0]
-        formData.price = skuInfo.price
-        formData.market_price = skuInfo.market_price
-        formData.cost_price = skuInfo.cost_price
-        formData.sku_no = skuInfo.sku_no
-
-        if (appendSingleGoodsData)
-          Object.assign(formData, appendSingleGoodsData(skuInfo))
-      } else if (formData.spec_type == 'multi') {
-        // 多规格
-        const specList = data.goods_info.spec_list
-        specList.forEach((item: any) => {
-          const values: any = []
-          item.spec_values = item.spec_values.split(',')
-          item.spec_values.forEach((v: any) => {
-            values.push({
-              id: generateRandom(),
-              spec_value_name: v,
-            })
-          })
-          goodsSpecFormat.push({
-            id: generateRandom(),
-            spec_id: item.spec_id,
-            goods_id: item.goods_id,
-            spec_name: item.spec_name,
-            values,
-          })
+    // 刷新商品分类
+    const refreshGoodsCategory = (bool = false) => {
+        getCategoryTree().then((res) => {
+            const data = res.data
+            if (data) {
+                const goodsCategoryTree: any = []
+                data.forEach((item: any) => {
+                    const children: any = []
+                    if (item.child_list) {
+                        item.child_list.forEach((childItem: any) => {
+                            children.push({
+                                value: childItem.category_id,
+                                label: childItem.category_name
+                            })
+                        })
+                    }
+                    goodsCategoryTree.push({
+                        value: item.category_id,
+                        label: item.category_name,
+                        children
+                    })
+                })
+                goodsCategoryOptions.splice(0, goodsCategoryOptions.length, ...goodsCategoryTree)
+                if (bool) {
+                    ElMessage({
+                        message: t('refreshSuccess'),
+                        type: 'success'
+                    })
+                }
+            }
         })
+    }
 
-        refreshGoodsSkuData()
+    refreshGoodsCategory()
 
-        const skuList = data.goods_info.sku_list
-
-        for (let key in goodsSkuData) {
-          for (let i = 0; i < skuList.length; i++) {
-            let item = skuList[i]
-            if (
-              goodsSkuData[key].spec_name ==
-              item.sku_spec_format.replace(/,/g, ' ')
-            ) {
-              goodsSkuData[key].sku_id = item.sku_id
-              goodsSkuData[key].sku_image = item.sku_image
-              goodsSkuData[key].price = item.price
-              goodsSkuData[key].market_price = item.market_price
-              goodsSkuData[key].cost_price = item.cost_price
-
-              for (let field in appendRefreshGoodsSkuData) {
-                goodsSkuData[key][field] = item[field]
-              }
-
-              goodsSkuData[key].stock = item.stock
-              goodsSkuData[key].sku_id = item.sku_id
-              goodsSkuData[key].sku_no = item.sku_no
-              goodsSkuData[key].is_default = item.is_default
-              break
-            }
-          }
-        }
+    // 品牌列表下拉框
+    const brandOptions = reactive([])
 
-        nextTick(() => {
-          refreshSkuTable()
-          bindSpecValue()
+    // 跳转到商品品牌，添加品牌
+    const toGoodsBrandEvent = () => {
+        const url = router.resolve({
+            path: '/shop/goods/brand'
         })
-      }
+        window.open(url.href)
+    }
 
-      formData.member_discount = data.goods_info.member_discount
+    // 商品品牌
+    const refreshGoodsBrand = (bool = false) => {
+        getBrandList({}).then((res) => {
+            const data = res.data
+            if (data) {
+                brandOptions.splice(0, brandOptions.length, ...data)
+                if (bool) {
+                    ElMessage({
+                        message: t('refreshSuccess'),
+                        type: 'success'
+                    })
+                }
+            }
+        })
+    }
 
-      formData.unit = data.goods_info.unit
-      formData.virtual_sale_num = data.goods_info.virtual_sale_num
-      formData.is_limit = data.goods_info.is_limit
-      formData.limit_type = data.goods_info.limit_type
-      formData.max_buy = data.goods_info.max_buy
-      formData.min_buy = data.goods_info.min_buy
+    refreshGoodsBrand()
 
-      // 商品详情
-      formData.goods_desc = data.goods_info.goods_desc
-    }
-  }
+    // 海报列表下拉框
+    const posterOptions = reactive([])
 
-  // 绑定拖拽规格值事件
-  const bindSpecValue = () => {
-    // 商品正在参与营销活动，禁止操作
-    if (isDisabledPrice()) {
-      return
+    // 跳转到海报列表，添加海报
+    const toPosterEvent = () => {
+        const url = router.resolve({
+            path: '/poster/list'
+        })
+        window.open(url.href)
     }
-    if (!getFormRef().specValueRef) return
-
-    for (let i = 0; i < getFormRef().specValueRef.length; i++) {
-      const item = getFormRef().specValueRef[i]
-      const sortable = Sortable.create(item, {
-        group: 'draggable-element-' + i,
-        animation: 200,
-        // 结束拖拽
-        onEnd: (event) => {
-          const temp = goodsSpecFormat[i].values[event.oldIndex!]
-          goodsSpecFormat[i].values.splice(event.oldIndex!, 1)
-          goodsSpecFormat[i].values.splice(event.newIndex!, 0, temp)
-
-          nextTick(() => {
-            sortable.sort(
-              range(goodsSpecFormat[i].values.length).map((value) => {
-                return value.toString()
-              })
-            )
-
-            // 渲染商品规格数据、表格
-            refreshGoodsSkuData()
-            refreshSkuTable()
-          })
-        },
-      })
+
+    // 商品海报
+    const refreshGoodsPoster = (bool = false) => {
+        getPosterList({
+            type: 'shop_goods'
+        }).then((res) => {
+            const data = res.data
+            if (data) {
+                posterOptions.splice(0, posterOptions.length, ...data)
+                if (bool) {
+                    ElMessage({
+                        message: t('refreshSuccess'),
+                        type: 'success'
+                    })
+                }
+            }
+        })
     }
-  }
-
-  // 生成随机数
-  const generateRandom = (len: number = 5) => {
-    return Number(
-      Math.random().toString().substr(3, len) + Date.now()
-    ).toString(36)
-  }
-
-  // 添加规格项
-  const addSpec = () => {
-    // 商品正在参与营销活动，禁止操作
-    if (isDisabledPrice()) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('participateInActiveDisableTips')}`,
-      })
-      return
+
+    refreshGoodsPoster()
+
+    // 万能表单列表下拉框
+    const diyFormOptions = reactive([])
+
+    // 跳转到万能表单列表，添加表单
+    const toDiyFormEvent = () => {
+        const url = router.resolve({
+            path: '/diy_form/list'
+        })
+        window.open(url.href)
     }
-    if (goodsSpecFormat.length > 4) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('maxAddSpecTips')}`,
-      })
-      return
+
+    // 刷新万能表单
+    const refreshDiyForm = (bool = false) => {
+        getDiyFormList({
+            type: 'DIY_FORM_GOODS_DETAIL',
+            status: 1
+        }).then((res) => {
+            const data = res.data
+            if (data) {
+                diyFormOptions.splice(0, diyFormOptions.length, ...data)
+                if (bool) {
+                    ElMessage({
+                        message: t('refreshSuccess'),
+                        type: 'success'
+                    })
+                }
+            }
+        })
     }
-    goodsSpecFormat.push({
-      id: generateRandom(),
-      spec_name: '',
-      values: [
-        {
-          id: generateRandom(),
-          spec_value_name: '',
-        },
-      ],
-    })
-  }
-
-  // 删除规格项
-  const deleteSpec = (index: number) => {
-    // 商品正在参与营销活动，禁止操作
-    if (isDisabledPrice()) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('participateInActiveDisableTips')}`,
-      })
-      return
+
+    refreshDiyForm()
+
+    // 标签组列表复选框
+    const labelOptions = reactive([])
+
+    // 跳转到商品标签，添加标签
+    const toGoodsLabelEvent = () => {
+        const url = router.resolve({
+            path: '/shop/goods/label'
+        })
+        window.open(url.href)
     }
-    goodsSpecFormat.splice(index, 1)
-    // 渲染商品规格数据、表格、统计库存变化
-    refreshGoodsSkuData()
-    refreshSkuTable()
-    specStockSum()
-  }
-
-  // 添加规格值
-  const addSpecValue = (index: number) => {
-    // 商品正在参与营销活动，禁止操作
-    if (isDisabledPrice()) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('participateInActiveDisableTips')}`,
-      })
-      return
+
+    // 商品标签
+    const refreshGoodsLabel = () => {
+        getLabelList({}).then((res) => {
+            const data = res.data
+            if (data) {
+                labelOptions.splice(0, labelOptions.length, ...data)
+            }
+        })
     }
-    goodsSpecFormat[index].values.push({
-      id: generateRandom(),
-      spec_value_name: '',
-    })
-    bindSpecValue()
-  }
-
-  // 监听规格值变化
-  const specValueNameInputListener = debounce((value) => {
-    // 渲染商品规格数据、表格
-    refreshGoodsSkuData()
-    refreshSkuTable()
-  })
-
-  // 删除规格值
-  const deleteSpecValue = (index: number, specIndex: number) => {
-    // 商品正在参与营销活动，禁止操作
-    if (isDisabledPrice()) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('participateInActiveDisableTips')}`,
-      })
-      return
+
+    refreshGoodsLabel()
+
+    // 商品服务列表复选框
+    const serviceOptions = reactive([])
+
+    // 跳转到商品服务，添加服务
+    const toGoodsServiceEvent = () => {
+        const url = router.resolve({
+            path: '/shop/goods/service'
+        })
+        window.open(url.href)
     }
-    goodsSpecFormat[index].values.splice(specIndex, 1)
-    // 渲染商品规格数据、表格、统计库存变化
-    refreshGoodsSkuData()
-    refreshSkuTable()
-    specStockSum()
-  }
-
-  // 设置默认规格
-  const specValueIsDefaultChangeListener = (value: any, key: any) => {
-    for (const k in goodsSkuData) {
-      if (k == key) {
-        goodsSkuData[k].is_default = value
-      } else {
-        goodsSkuData[k].is_default = 0
-      }
+
+    // 商品服务
+    const refreshGoodsService = () => {
+        getServeList({}).then((res) => {
+            const data = res.data
+            if (data) {
+                serviceOptions.splice(0, serviceOptions.length, ...data)
+            }
+        })
     }
-  }
 
-  // 监听规格库存变化，统计总库存
-  const specStockSum = debounce(() => {
-    let stock = 0
-    for (const k in goodsSkuData) {
-      if (goodsSkuData[k].stock) stock += parseInt(goodsSkuData[k].stock)
+    refreshGoodsService()
+
+    // 供应商列表下拉框
+    const supplierOptions = reactive([])
+
+    // 跳转到供应商
+    const toSupplierEvent = () => {
+        const url = router.resolve({
+            path: '/shop_supplier/supplier'
+        })
+        window.open(url.href)
     }
-    formData.stock = stock
-  })
-
-  // 刷新商品规格数据
-  const refreshGoodsSkuData = () => {
-    const arr = goodsSpecFormat
-    const tempGoodsSkuData = cloneDeep(goodsSkuData) // 记录原始数据，后续用作对比
-    let skuData: any = {}
-    let tempIndex = 0
-    for (const spec of arr) {
-      let item_prop_arr: any = {}
-      if (Object.keys(skuData).length > 0) {
-        for (const ele_2 in skuData) {
-          for (let ele_3 of spec.values) {
-            let sku_spec = cloneDeep(skuData[ele_2].sku_spec) // 防止对象引用
-            sku_spec.push(ele_3)
-            item_prop_arr['sku_' + tempIndex] = {
-              spec_name: `${skuData[ele_2].spec_name} ${ele_3.spec_value_name}`,
-              sku_spec,
-              sku_image: '',
-              price: '',
-              market_price: '',
-              cost_price: '',
-              stock: '',
-              sku_no: '',
-              is_default: 0,
-            }
 
-            for (let key in appendRefreshGoodsSkuData) {
-              item_prop_arr['sku_' + tempIndex][key] =
-                appendRefreshGoodsSkuData[key].value
+    // 供应商
+    const refreshSupplier = () => {
+        getSupplierList({}).then((res) => {
+            const data = res.data
+            if (data) {
+                supplierOptions.splice(0, supplierOptions.length, ...data)
             }
-            tempIndex++
-          }
-        }
-      } else {
-        for (let ele_1 of spec.values) {
-          let spec_name = ele_1.spec_value_name
-          item_prop_arr['sku_' + tempIndex] = {
-            spec_name: spec_name,
-            sku_spec: [ele_1],
-            sku_image: '',
-            price: '',
-            market_price: '',
-            cost_price: '',
-            stock: '',
-            sku_no: '',
-            is_default: 0,
-          }
-          for (let key in appendRefreshGoodsSkuData) {
-            item_prop_arr['sku_' + tempIndex][key] =
-              appendRefreshGoodsSkuData[key].value
-          }
-          tempIndex++
-        }
-      }
-
-      skuData = Object.keys(item_prop_arr).length > 0 ? item_prop_arr : skuData
+        })
     }
 
-    // 比对已存在的规格项/值，并且赋值
-    for (const tempKey in tempGoodsSkuData) {
-      for (const key in skuData) {
-        const count = matchSkuSpecCount(
-          tempGoodsSkuData[tempKey].sku_spec,
-          skuData[key].sku_spec
-        )
-        if (count === skuData[key].sku_spec.length) {
-          // 匹配成功后，要同步最新的规格项名称、规格值集合
-          const specName = skuData[key].spec_name
-          const skuSpec = skuData[key].sku_spec
-          Object.assign(skuData[key], tempGoodsSkuData[tempKey])
-          skuData[key].spec_name = specName
-          skuData[key].sku_spec = skuSpec
-          break
+    const goodsSpecFormat: any = reactive([]) // 规格项/规格值
+    const goodsSkuData: any = reactive({}) // 商品SKU规格数据
+    const specData: any = reactive([]) // 商品规格值
+
+    const activeGoodsCount: any = ref(0)
+
+    const isDisabledPrice = () => {
+        if (activeGoodsCount.value > 0) {
+            return true;
         }
-      }
+        return false;
     }
 
-    for (const item in goodsSkuData) {
-      delete goodsSkuData[item]
-    }
+    const handleGoodsInit = (data: any) => {
+        formData.addon_shop_supplier = data.addon_shop_supplier
+        if (formData.addon_shop_supplier && formData.addon_shop_supplier.status == 1) {
+            refreshSupplier()
+        }
 
-    let firstSpec = ''
+        if (formData.goods_id && data.goods_info) {
+
+            // 商品参与营销活动的数量
+            activeGoodsCount.value = data.goods_info.active_goods_count;
+
+            // 基础信息
+            formData.goods_name = data.goods_info.goods_name
+            formData.sub_title = data.goods_info.sub_title
+            formData.goods_type = data.goods_info.goods_type
+            formData.goods_image = data.goods_info.goods_image
+            formData.goods_video = data.goods_info.goods_video
+            formData.goods_category = data.goods_info.goods_category
+            formData.brand_id = data.goods_info.brand_id
+            formData.poster_id = data.goods_info.poster_id
+            formData.form_id = data.goods_info.form_id
+            formData.label_ids = data.goods_info.label_ids
+            formData.service_ids = data.goods_info.service_ids
+            formData.supplier_id = data.goods_info.supplier_id
+            formData.status = data.goods_info.status
+            formData.sort = data.goods_info.sort
+            formData.is_gift = data.goods_info.is_gift
+
+            /*************** 商品参数-start ****************/
+            formData.attr_format = data.goods_info.attr_format ? JSON.parse(data.goods_info.attr_format) : []
+            formData.attr_id = data.goods_info.attr_id
+
+            editCallFn.value = true;
+            attrChange(formData.attr_id || -1) //formData.attr_id为空，需要传入-1，便于attrChange方法调用
+            /*************** 商品参数-end ****************/
+
+            // 价格库存
+            formData.spec_type = data.goods_info.spec_type
+            formData.stock = data.goods_info.stock
 
-    for (const key in skuData) {
-      if (firstSpec == '') {
-        firstSpec = key
-        skuData[key].is_default = 1
-      } else {
-        skuData[key].is_default = 0
-      }
-      goodsSkuData[key] = skuData[key]
-    }
-    formData.skuCheckAll = false // 是否全选
-    ;(formData.skuIsIndeterminate = false), // 是否部分选中
-      (formData.skuCheckedCities = []) // 选中的规格
-  }
-
-  // 匹配规格值
-  const matchSkuSpecCount = (oVal: any, nVal: any) => {
-    let count = 0 // 匹配次数，与规格值相等时为匹配成功
-    for (let i = 0; i < oVal.length; i++) {
-      for (let j = 0; j < nVal.length; j++) {
-        if (oVal[i].id === nVal[j].id) {
-          count++
-          break
+            if (formData.spec_type == 'single') {
+                // 单规格
+                const skuInfo = data.goods_info.sku_list[0]
+                formData.price = skuInfo.price
+                formData.market_price = skuInfo.market_price
+                formData.cost_price = skuInfo.cost_price
+                formData.sku_no = skuInfo.sku_no
+
+                if (appendSingleGoodsData) Object.assign(formData, appendSingleGoodsData(skuInfo));
+            } else if (formData.spec_type == 'multi') {
+                // 多规格
+                const specList = data.goods_info.spec_list
+                specList.forEach((item: any) => {
+                    const values: any = []
+                    item.spec_values = item.spec_values.split(',')
+                    item.spec_values.forEach((v: any) => {
+                        values.push({
+                            id: generateRandom(),
+                            spec_value_name: v
+                        })
+                    })
+                    goodsSpecFormat.push({
+                        id: generateRandom(),
+                        spec_id: item.spec_id,
+                        goods_id: item.goods_id,
+                        spec_name: item.spec_name,
+                        values
+                    })
+                })
+
+                refreshGoodsSkuData();
+
+                const skuList = data.goods_info.sku_list
+
+                for (let key in goodsSkuData) {
+                    for (let i = 0; i < skuList.length; i++) {
+                        let item = skuList[i];
+                        if (goodsSkuData[key].spec_name == item.sku_spec_format.replace(/,/g, ' ')) {
+                            goodsSkuData[key].sku_id = item.sku_id;
+                            goodsSkuData[key].sku_image = item.sku_image;
+                            goodsSkuData[key].price = item.price;
+                            goodsSkuData[key].market_price = item.market_price;
+                            goodsSkuData[key].cost_price = item.cost_price;
+
+                            for (let field in appendRefreshGoodsSkuData) {
+                                goodsSkuData[key][field] = item[field];
+                            }
+
+                            goodsSkuData[key].stock = item.stock;
+                            goodsSkuData[key].sku_id = item.sku_id;
+                            goodsSkuData[key].sku_no = item.sku_no;
+                            goodsSkuData[key].is_default = item.is_default;
+                            break;
+                        }
+                    }
+                }
+
+                nextTick(() => {
+                    refreshSkuTable()
+                    bindSpecValue()
+                })
+            }
+
+            formData.member_discount = data.goods_info.member_discount
+
+            formData.unit = data.goods_info.unit
+            formData.virtual_sale_num = data.goods_info.virtual_sale_num
+            formData.is_limit = data.goods_info.is_limit
+            formData.limit_type = data.goods_info.limit_type
+            formData.max_buy = data.goods_info.max_buy
+            formData.min_buy = data.goods_info.min_buy
+
+            // 商品详情
+            formData.goods_desc = data.goods_info.goods_desc
         }
-      }
-    }
-    return count
-  }
-
-  // 刷新商品规格表格
-  const refreshSkuTable = () => {
-    let length = 0
-    // 统计有效规格数量
-    for (let i = 0; i < goodsSpecFormat.length; i++) {
-      if (
-        goodsSpecFormat[i].spec_name != '' &&
-        goodsSpecFormat[i].values.length > 0
-      ) {
-        length++
-      }
     }
 
-    let row = 1 // 跨行
-    const tempSpecData = []
-
-    // 规格值单元格合并
-    for (let i = length - 1; i >= 0; i--) {
-      for (let k = 0; k < Object.keys(goodsSkuData).length; ) {
-        if (goodsSpecFormat[i].values.length > 0) {
-          for (let ele of goodsSpecFormat[i].values) {
-            tempSpecData.push({
-              index: k,
-              colSpan: i,
-              rowSpan: row,
-              spec_value_name: ele.spec_value_name,
+    // 绑定拖拽规格值事件
+    const bindSpecValue = () => {
+        // 商品正在参与营销活动，禁止操作
+        if (isDisabledPrice()) {
+            return
+        }
+        if (!getFormRef().specValueRef) return
+
+        for (let i = 0; i < getFormRef().specValueRef.length; i++) {
+            const item = getFormRef().specValueRef[i]
+            const sortable = Sortable.create(item, {
+                group: 'draggable-element-' + i,
+                animation: 200,
+                // 结束拖拽
+                onEnd: event => {
+                    const temp = goodsSpecFormat[i].values[event.oldIndex!]
+                    goodsSpecFormat[i].values.splice(event.oldIndex!, 1)
+                    goodsSpecFormat[i].values.splice(event.newIndex!, 0, temp)
+
+                    nextTick(() => {
+                        sortable.sort(
+                            range(goodsSpecFormat[i].values.length).map(value => {
+                                return value.toString()
+                            })
+                        )
+
+                        // 渲染商品规格数据、表格
+                        refreshGoodsSkuData()
+                        refreshSkuTable()
+                    })
+                }
             })
-            k = k + row
-          }
-        } else {
-          k++
         }
-      }
-      row = row * goodsSpecFormat[i].values.length
     }
 
-    tempSpecData.reverse()
-    specData.splice(0, specData.length, ...tempSpecData)
-  }
-
-  const batchOperation: any = reactive({
-    spec: '', // 所选规格id，空为全部
-    price: '', // 销售价
-    market_price: '', // 划线价
-    cost_price: '', // 成本价
-    stock: '', // 库存
-    sku_no: '', // 商品编码
-  })
-
-  var appendBatchOperation: any = {}
-  for (let key in appendRefreshGoodsSkuData) {
-    appendBatchOperation[key] = appendRefreshGoodsSkuData[key].value
-  }
-
-  Object.assign(batchOperation, appendBatchOperation)
-
-  const skuHandleCheckAllChange = (value: any) => {
-    formData.skuIsIndeterminate = false
-    if (value) {
-      formData.skuCheckedCities = Object.keys(goodsSkuData)
-    } else {
-      formData.skuCheckedCities = []
-    }
-  }
-  const handleCheckedCitiesChange = (value: any) => {
-    const checkedCount = value.length
-    formData.skuCheckAll = checkedCount === Object.keys(goodsSkuData).length
-    formData.skuIsIndeterminate =
-      checkedCount > 0 && checkedCount < Object.keys(goodsSkuData).length
-  }
-  // 批量设置确认
-  const saveBatch = () => {
-    if (formData.skuCheckedCities.length == 0) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('pleaseSelectSku')}`,
-      })
-      return
-    }
-    // 验证输入内容
-    if (
-      batchOperation.price &&
-      (isNaN(batchOperation.price) || !regExp.digit.test(batchOperation.price))
-    ) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('priceTips')}`,
-      })
-      return
+    // 生成随机数
+    const generateRandom = (len: number = 5) => {
+        return Number(Math.random().toString().substr(3, len) + Date.now()).toString(36)
     }
-    if (
-      batchOperation.market_price &&
-      (isNaN(batchOperation.market_price) ||
-        !regExp.digit.test(batchOperation.market_price))
-    ) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('marketPriceTips')}`,
-      })
-      return
-    }
-    if (
-      batchOperation.cost_price &&
-      (isNaN(batchOperation.cost_price) ||
-        !regExp.digit.test(batchOperation.cost_price))
-    ) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('costPriceTips')}`,
-      })
-      return
+
+    // 添加规格项
+    const addSpec = () => {
+        // 商品正在参与营销活动，禁止操作
+        if (isDisabledPrice()) {
+            ElMessage({
+                type: 'warning',
+                message: `${ t('participateInActiveDisableTips') }`
+            })
+            return
+        }
+        if (goodsSpecFormat.length > 4) {
+            ElMessage({
+                type: 'warning',
+                message: `${ t('maxAddSpecTips') }`
+            })
+            return
+        }
+        goodsSpecFormat.push({
+            id: generateRandom(),
+            spec_name: '',
+            values: [
+                {
+                    id: generateRandom(),
+                    spec_value_name: ''
+                }
+            ]
+        })
     }
-    if (
-      batchOperation.stock &&
-      (isNaN(batchOperation.stock) || !regExp.number.test(batchOperation.stock))
-    ) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('stockTips')}`,
-      })
-      return
+
+    // 删除规格项
+    const deleteSpec = (index: number) => {
+        // 商品正在参与营销活动，禁止操作
+        if (isDisabledPrice()) {
+            ElMessage({
+                type: 'warning',
+                message: `${ t('participateInActiveDisableTips') }`
+            })
+            return
+        }
+        goodsSpecFormat.splice(index, 1)
+        // 渲染商品规格数据、表格、统计库存变化
+        refreshGoodsSkuData()
+        refreshSkuTable()
+        specStockSum()
     }
 
-    for (let field in appendRefreshGoodsSkuData) {
-      let reg = regExp[appendRefreshGoodsSkuData[field].regExp]
-      let message = appendRefreshGoodsSkuData[field].message
-
-      if (
-        batchOperation[field] &&
-        (isNaN(batchOperation[field]) || !reg.test(batchOperation[field]))
-      ) {
-        ElMessage({
-          type: 'warning',
-          message: message,
+    // 添加规格值
+    const addSpecValue = (index: number) => {
+        // 商品正在参与营销活动，禁止操作
+        if (isDisabledPrice()) {
+            ElMessage({
+                type: 'warning',
+                message: `${ t('participateInActiveDisableTips') }`
+            })
+            return
+        }
+        goodsSpecFormat[index].values.push({
+            id: generateRandom(),
+            spec_value_name: ''
         })
-        return
-      }
+        bindSpecValue()
     }
 
-    // 设置全部规格
-    formData.skuCheckedCities.forEach((key: any) => {
-      if (batchOperation.price) goodsSkuData[key].price = batchOperation.price
-      if (batchOperation.market_price)
-        goodsSkuData[key].market_price = batchOperation.market_price
-      if (batchOperation.cost_price)
-        goodsSkuData[key].cost_price = batchOperation.cost_price
-      if (batchOperation.stock) goodsSkuData[key].stock = batchOperation.stock
-
-      for (let field in appendRefreshGoodsSkuData) {
-        if (batchOperation[field])
-          goodsSkuData[key][field] = batchOperation[field]
-      }
-
-      if (batchOperation.sku_no)
-        goodsSkuData[key].sku_no = batchOperation.sku_no
-    })
+    // 监听规格值变化
+    const specValueNameInputListener = debounce((value) => {
+        // 渲染商品规格数据、表格
+        refreshGoodsSkuData()
+        refreshSkuTable()
 
-    // 保存完清空
-    batchOperation.price = ''
-    batchOperation.market_price = ''
-    batchOperation.cost_price = ''
-    batchOperation.stock = ''
-    batchOperation.sku_no = ''
+    })
 
-    for (let field in appendRefreshGoodsSkuData) {
-      batchOperation[field] = ''
+    // 删除规格值
+    const deleteSpecValue = (index: number, specIndex: number) => {
+        // 商品正在参与营销活动，禁止操作
+        if (isDisabledPrice()) {
+            ElMessage({
+                type: 'warning',
+                message: `${ t('participateInActiveDisableTips') }`
+            })
+            return
+        }
+        goodsSpecFormat[index].values.splice(specIndex, 1)
+        // 渲染商品规格数据、表格、统计库存变化
+        refreshGoodsSkuData()
+        refreshSkuTable()
+        specStockSum()
     }
-  }
-
-  // 正则表达式
-  const regExp: any = {
-    required: /[\S]+/,
-    number: /^\d{0,10}$/,
-    digit: /^\d{0,10}(.?\d{0,2})$/,
-    special: /^\d{0,10}(.?\d{0,3})$/,
-  }
-
-  // 表单验证规则
-  const formRules = computed(() => {
-    let rules = {
-      goods_name: [
-        {
-          required: true,
-          trigger: 'blur',
-          validator: (rule: any, value: any, callback: any) => {
-            if (value === '') {
-              callback(new Error(t('goodsNamePlaceholder')))
-            }
-            if (value.length > 60) {
-              callback(new Error(t('goodsNameMaxLengthTips')))
+
+    // 设置默认规格
+    const specValueIsDefaultChangeListener = (value: any, key: any) => {
+        for (const k in goodsSkuData) {
+            if (k == key) {
+                goodsSkuData[k].is_default = value
             } else {
-              callback()
+                goodsSkuData[k].is_default = 0
             }
-          },
-        },
-      ],
-      sub_title: [
-        {
-          trigger: 'blur',
-          validator: (rule: any, value: any, callback: any) => {
-            if (value.length > 80) {
-              callback(new Error(t('subTitleMaxLengthTips')))
+        }
+    }
+
+    // 监听规格库存变化，统计总库存
+    const specStockSum = debounce(() => {
+        let stock = 0
+        for (const k in goodsSkuData) {
+            if (goodsSkuData[k].stock) stock += parseInt(goodsSkuData[k].stock)
+        }
+        formData.stock = stock
+    })
+
+    // 刷新商品规格数据
+    const refreshGoodsSkuData = () => {
+        const arr = goodsSpecFormat
+        const tempGoodsSkuData = cloneDeep(goodsSkuData)// 记录原始数据，后续用作对比
+        let skuData: any = {}
+        let tempIndex = 0;
+        for (const spec of arr) {
+            let item_prop_arr: any = {}
+            if (Object.keys(skuData).length > 0) {
+                for (const ele_2 in skuData) {
+                    for (let ele_3 of spec.values) {
+                        let sku_spec = cloneDeep(skuData[ele_2].sku_spec)// 防止对象引用
+                        sku_spec.push(ele_3)
+                        item_prop_arr['sku_' + tempIndex] = {
+                            spec_name: `${ skuData[ele_2].spec_name } ${ ele_3.spec_value_name }`,
+                            sku_spec,
+                            sku_image: '',
+                            price: '',
+                            market_price: '',
+                            cost_price: '',
+                            stock: '',
+                            sku_no: '',
+                            is_default: 0
+                        }
+
+                        for (let key in appendRefreshGoodsSkuData) {
+                            item_prop_arr['sku_' + tempIndex][key] = appendRefreshGoodsSkuData[key].value;
+                        }
+                        tempIndex++;
+                    }
+                }
             } else {
-              callback()
+                for (let ele_1 of spec.values) {
+                    let spec_name = ele_1.spec_value_name
+                    item_prop_arr['sku_' + tempIndex] = {
+                        spec_name: spec_name,
+                        sku_spec: [ele_1],
+                        sku_image: '',
+                        price: '',
+                        market_price: '',
+                        cost_price: '',
+                        stock: '',
+                        sku_no: '',
+                        is_default: 0
+                    }
+                    for (let key in appendRefreshGoodsSkuData) {
+                        item_prop_arr['sku_' + tempIndex][key] = appendRefreshGoodsSkuData[key].value;
+                    }
+                    tempIndex++;
+                }
             }
-          },
-        },
-      ],
-      goods_image: [
-        {
-          required: true,
-          message: t('goodsImagePlaceholder'),
-          trigger: 'blur',
-        },
-      ],
-      goods_category: [
-        {
-          required: true,
-          message: t('goodsCategoryPlaceholder'),
-          trigger: 'blur',
-        },
-      ],
-      sort: [
-        {
-          trigger: 'blur',
-          validator: (rule: any, value: any, callback: any) => {
-            if (isNaN(value) || !regExp.number.test(value)) {
-              callback(new Error(t('sortTips')))
-            } else {
-              callback()
+
+            skuData = Object.keys(item_prop_arr).length > 0 ? item_prop_arr : skuData
+        }
+
+        // 比对已存在的规格项/值，并且赋值
+        for (const tempKey in tempGoodsSkuData) {
+            for (const key in skuData) {
+                const count = matchSkuSpecCount(tempGoodsSkuData[tempKey].sku_spec, skuData[key].sku_spec)
+                if (count === skuData[key].sku_spec.length) {
+                    // 匹配成功后，要同步最新的规格项名称、规格值集合
+                    const specName = skuData[key].spec_name
+                    const skuSpec = skuData[key].sku_spec
+                    Object.assign(skuData[key], tempGoodsSkuData[tempKey])
+                    skuData[key].spec_name = specName
+                    skuData[key].sku_spec = skuSpec
+                    break
+                }
             }
-          },
-        },
-      ],
-      // unit: [
-      //     {required: true, message: t('unitPlaceholder'), trigger: 'blur'}
-      // ],
-      // 单规格
-      price: [
-        {
-          trigger: 'blur',
-          validator: (rule: any, value: any, callback: any) => {
-            if (formData.spec_type == 'single') {
-              if (value === '') {
-                callback(new Error(t('pricePlaceholder')))
-              } else if (isNaN(value) || !regExp.digit.test(value)) {
-                callback(new Error(t('priceTips')))
-              } else if (value < 0) {
-                callback(new Error(t('priceNotZeroTips')))
-              } else {
-                callback()
-              }
+        }
+
+        for (const item in goodsSkuData) {
+            delete goodsSkuData[item]
+        }
+
+        let firstSpec = ''
+
+        for (const key in skuData) {
+            if (firstSpec == '') {
+                firstSpec = key
+                skuData[key].is_default = 1
             } else {
-              callback()
+                skuData[key].is_default = 0
             }
-          },
-        },
-      ],
-      market_price: [
-        {
-          trigger: 'blur',
-          validator: (rule: any, value: any, callback: any) => {
-            if (formData.spec_type == 'single') {
-              if (isNaN(value) || !regExp.digit.test(value)) {
-                callback(new Error(t('marketPriceTips')))
-              } else if (value < 0) {
-                callback(new Error(t('marketPriceNotZeroTips')))
-              } else {
-                callback()
-              }
-            } else {
-              callback()
+            goodsSkuData[key] = skuData[key]
+        }
+        formData.skuCheckAll = false;// 是否全选
+        formData.skuIsIndeterminate = false,// 是否部分选中
+        formData.skuCheckedCities = []// 选中的规格
+    }
+
+    // 匹配规格值
+    const matchSkuSpecCount = (oVal: any, nVal: any) => {
+        let count = 0// 匹配次数，与规格值相等时为匹配成功
+        for (let i = 0; i < oVal.length; i++) {
+            for (let j = 0; j < nVal.length; j++) {
+                if (oVal[i].id === nVal[j].id) {
+                    count++
+                    break
+                }
             }
-          },
-        },
-      ],
-      cost_price: [
-        {
-          trigger: 'blur',
-          validator: (rule: any, value: any, callback: any) => {
-            if (formData.spec_type == 'single') {
-              if (isNaN(value) || !regExp.digit.test(value)) {
-                callback(new Error(t('costPriceTips')))
-              } else if (value < 0) {
-                callback(new Error(t('costPriceNotZeroTips')))
-              } else {
-                callback()
-              }
-            } else {
-              callback()
+        }
+        return count
+    }
+
+    // 刷新商品规格表格
+    const refreshSkuTable = () => {
+        let length = 0
+        // 统计有效规格数量
+        for (let i = 0; i < goodsSpecFormat.length; i++) {
+            if (goodsSpecFormat[i].spec_name != '' && goodsSpecFormat[i].values.length > 0) {
+                length++
             }
-          },
-        },
-      ],
-      stock: [
-        {
-          trigger: 'blur',
-          validator: (rule: any, value: any, callback: any) => {
-            if (formData.spec_type == 'single') {
-              if (value === '') {
-                callback(new Error(t('stockPlaceholder')))
-              } else if (isNaN(value) || !regExp.number.test(value)) {
-                callback(new Error(t('stockTips')))
-              } else if (value < 0) {
-                callback(new Error(t('stockNotZeroTips')))
-              } else {
-                callback()
-              }
-            } else {
-              callback()
+        }
+
+        let row = 1 // 跨行
+        const tempSpecData = []
+
+        // 规格值单元格合并
+        for (let i = length - 1; i >= 0; i--) {
+            for (let k = 0; k < Object.keys(goodsSkuData).length;) {
+                if (goodsSpecFormat[i].values.length > 0) {
+                    for (let ele of goodsSpecFormat[i].values) {
+                        tempSpecData.push({
+                            index: k,
+                            colSpan: i,
+                            rowSpan: row,
+                            spec_value_name: ele.spec_value_name
+                        })
+                        k = k + row
+                    }
+                } else {
+                    k++
+                }
             }
-          },
-        },
-      ],
-      virtual_sale_num: [
-        {
-          trigger: 'blur',
-          validator: (rule: any, value: any, callback: any) => {
-            if (formData.spec_type == 'single') {
-              if (isNaN(value) || !regExp.number.test(value)) {
-                callback(new Error(t('virtualSaleNumTips')))
-              } else if (value < 0) {
-                callback(new Error(t('virtualSaleNumNotZeroTips')))
-              } else {
-                callback()
-              }
-            } else {
-              callback()
+            row = row * goodsSpecFormat[i].values.length
+        }
+
+        tempSpecData.reverse()
+        specData.splice(0, specData.length, ...tempSpecData)
+    }
+
+    const batchOperation: any = reactive({
+        spec: '', // 所选规格id，空为全部
+        price: '', // 销售价
+        market_price: '', // 划线价
+        cost_price: '', // 成本价
+        stock: '', // 库存
+        sku_no: '' // 商品编码
+    })
+
+    var appendBatchOperation: any = {}
+    for (let key in appendRefreshGoodsSkuData) {
+        appendBatchOperation[key] = appendRefreshGoodsSkuData[key].value;
+    }
+
+    Object.assign(batchOperation, appendBatchOperation);
+
+    const skuHandleCheckAllChange = (value: any) => {
+        formData.skuIsIndeterminate = false
+        if( value ) {
+            formData.skuCheckedCities = Object.keys(goodsSkuData)
+        } else {
+            formData.skuCheckedCities = []
+        }
+    }
+    const handleCheckedCitiesChange = (value: any) => {
+        const checkedCount = value.length
+        formData.skuCheckAll = checkedCount === Object.keys(goodsSkuData).length
+        formData.skuIsIndeterminate = checkedCount > 0 && checkedCount < Object.keys(goodsSkuData).length
+    }
+    // 批量设置确认
+    const saveBatch = () => {
+        if( formData.skuCheckedCities.length == 0 ) {
+            ElMessage({
+                type: 'warning',
+                message: `${ t('pleaseSelectSku') }`
+            })
+            return
+        }
+        // 验证输入内容
+        if (batchOperation.price && (isNaN(batchOperation.price) || !regExp.digit.test(batchOperation.price))) {
+            ElMessage({
+                type: 'warning',
+                message: `${ t('priceTips') }`
+            })
+            return
+        }
+        if (batchOperation.market_price && (isNaN(batchOperation.market_price) || !regExp.digit.test(batchOperation.market_price))) {
+            ElMessage({
+                type: 'warning',
+                message: `${ t('marketPriceTips') }`
+            })
+            return
+        }
+        if (batchOperation.cost_price && (isNaN(batchOperation.cost_price) || !regExp.digit.test(batchOperation.cost_price))) {
+            ElMessage({
+                type: 'warning',
+                message: `${ t('costPriceTips') }`
+            })
+            return
+        }
+        if (batchOperation.stock && (isNaN(batchOperation.stock) || !regExp.number.test(batchOperation.stock))) {
+            ElMessage({
+                type: 'warning',
+                message: `${ t('stockTips') }`
+            })
+            return
+        }
+
+        for (let field in appendRefreshGoodsSkuData) {
+            let reg = regExp[appendRefreshGoodsSkuData[field].regExp]
+            let message = appendRefreshGoodsSkuData[field].message
+
+            if (batchOperation[field] && (isNaN(batchOperation[field]) || !reg.test(batchOperation[field]))) {
+                ElMessage({
+                    type: 'warning',
+                    message: message
+                })
+                return
             }
-          },
-        },
-      ],
-      // 多规格
-      spec_type: [
-        {
-          trigger: 'blur',
-          validator: (rule: any, value: any, callback: any) => {
-            if (formData.spec_type == 'multi') {
-              if (Object.keys(goodsSkuData).length == 0) {
-                callback(new Error(t('pleaseEditSpecPlaceholder')))
-              }
+
+        }
+
+        // 设置全部规格
+        formData.skuCheckedCities.forEach((key: any) => {
+            if (batchOperation.price) goodsSkuData[key].price = batchOperation.price
+            if (batchOperation.market_price) goodsSkuData[key].market_price = batchOperation.market_price
+            if (batchOperation.cost_price) goodsSkuData[key].cost_price = batchOperation.cost_price
+            if (batchOperation.stock) goodsSkuData[key].stock = batchOperation.stock
+
+            for (let field in appendRefreshGoodsSkuData) {
+                if (batchOperation[field]) goodsSkuData[key][field] = batchOperation[field]
             }
-            callback()
-          },
-        },
-      ],
-      max_buy: [
-        {
-          trigger: 'blur',
-          validator: (rule: any, value: any, callback: any) => {
-            if (value === '') {
-              callback(new Error(t('maxBuyPlaceholder')))
-            } else if (isNaN(value) || !regExp.number.test(value)) {
-              callback(new Error(t('maxBuyTips')))
-            } else if (value < 1) {
-              callback(new Error(t('maxBuyNotZeroTips')))
-            } else {
-              callback()
+
+            if (batchOperation.sku_no) goodsSkuData[key].sku_no = batchOperation.sku_no
+        })
+
+        // 保存完清空
+        batchOperation.price = ''
+        batchOperation.market_price = ''
+        batchOperation.cost_price = ''
+        batchOperation.stock = ''
+        batchOperation.sku_no = ''
+
+        for (let field in appendRefreshGoodsSkuData) {
+            batchOperation[field] = '';
+        }
+    }
+
+    // 正则表达式
+    const regExp: any = {
+        required: /[\S]+/,
+        number: /^\d{0,10}$/,
+        digit: /^\d{0,10}(.?\d{0,2})$/,
+        special: /^\d{0,10}(.?\d{0,3})$/
+    }
+
+    // 表单验证规则
+    const formRules = computed(() => {
+        let rules = {
+            goods_name: [
+                {
+                    required: true,
+                    trigger: 'blur',
+                    validator: (rule: any, value: any, callback: any) => {
+                        if (value === '') {
+                            callback(new Error(t('goodsNamePlaceholder')))
+                        }
+                        if (value.length > 60) {
+                            callback(new Error(t('goodsNameMaxLengthTips')))
+                        } else {
+                            callback()
+                        }
+                    }
+                }
+            ],
+            sub_title: [
+                {
+                    trigger: 'blur',
+                    validator: (rule: any, value: any, callback: any) => {
+                        if (value.length > 80) {
+                            callback(new Error(t('subTitleMaxLengthTips')))
+                        } else {
+                            callback()
+                        }
+                    }
+                }
+            ],
+            goods_image: [
+                { required: true, message: t('goodsImagePlaceholder'), trigger: 'blur' }
+            ],
+            goods_category: [
+                { required: true, message: t('goodsCategoryPlaceholder'), trigger: 'blur' }
+            ],
+            sort: [
+                {
+                    trigger: 'blur',
+                    validator: (rule: any, value: any, callback: any) => {
+                        if (isNaN(value) || !regExp.number.test(value)) {
+                            callback(new Error(t('sortTips')))
+                        } else {
+                            callback()
+                        }
+                    }
+                }
+            ],
+            // unit: [
+            //     {required: true, message: t('unitPlaceholder'), trigger: 'blur'}
+            // ],
+            // 单规格
+            price: [
+                {
+                    trigger: 'blur',
+                    validator: (rule: any, value: any, callback: any) => {
+                        if (formData.spec_type == 'single') {
+                            if (value === '') {
+                                callback(new Error(t('pricePlaceholder')))
+                            } else if (isNaN(value) || !regExp.digit.test(value)) {
+                                callback(new Error(t('priceTips')))
+                            } else if (value < 0) {
+                                callback(new Error(t('priceNotZeroTips')))
+                            } else {
+                                callback()
+                            }
+                        } else {
+                            callback()
+                        }
+                    }
+                }
+            ],
+            market_price: [
+                {
+                    trigger: 'blur',
+                    validator: (rule: any, value: any, callback: any) => {
+                        if (formData.spec_type == 'single') {
+                            if (isNaN(value) || !regExp.digit.test(value)) {
+                                callback(new Error(t('marketPriceTips')))
+                            } else if (value < 0) {
+                                callback(new Error(t('marketPriceNotZeroTips')))
+                            } else {
+                                callback()
+                            }
+                        } else {
+                            callback()
+                        }
+                    }
+                }
+            ],
+            cost_price: [
+                {
+                    trigger: 'blur',
+                    validator: (rule: any, value: any, callback: any) => {
+                        if (formData.spec_type == 'single') {
+                            if (isNaN(value) || !regExp.digit.test(value)) {
+                                callback(new Error(t('costPriceTips')))
+                            } else if (value < 0) {
+                                callback(new Error(t('costPriceNotZeroTips')))
+                            } else {
+                                callback()
+                            }
+                        } else {
+                            callback()
+                        }
+                    }
+                }
+            ],
+            stock: [
+                {
+                    trigger: 'blur',
+                    validator: (rule: any, value: any, callback: any) => {
+                        if (formData.spec_type == 'single') {
+                            if (value === '') {
+                                callback(new Error(t('stockPlaceholder')))
+                            } else if (isNaN(value) || !regExp.number.test(value)) {
+                                callback(new Error(t('stockTips')))
+                            } else if (value < 0) {
+                                callback(new Error(t('stockNotZeroTips')))
+                            } else {
+                                callback()
+                            }
+                        } else {
+                            callback()
+                        }
+                    }
+                }
+            ],
+            virtual_sale_num: [
+                {
+                    trigger: 'blur',
+                    validator: (rule: any, value: any, callback: any) => {
+                        if (formData.spec_type == 'single') {
+                            if (isNaN(value) || !regExp.number.test(value)) {
+                                callback(new Error(t('virtualSaleNumTips')))
+                            } else if (value < 0) {
+                                callback(new Error(t('virtualSaleNumNotZeroTips')))
+                            } else {
+                                callback()
+                            }
+                        } else {
+                            callback()
+                        }
+                    }
+                }
+            ],
+            // 多规格
+            spec_type: [
+                {
+                    trigger: 'blur',
+                    validator: (rule: any, value: any, callback: any) => {
+                        if (formData.spec_type == 'multi') {
+                            if (Object.keys(goodsSkuData).length == 0) {
+                                callback(new Error(t('pleaseEditSpecPlaceholder')))
+                            }
+                        }
+                        callback()
+                    }
+                }
+            ],
+            max_buy: [
+                {
+                    trigger: 'blur',
+                    validator: (rule: any, value: any, callback: any) => {
+                        if (value === '') {
+                            callback(new Error(t('maxBuyPlaceholder')))
+                        } else if (isNaN(value) || !regExp.number.test(value)) {
+                            callback(new Error(t('maxBuyTips')))
+                        } else if (value < 1) {
+                            callback(new Error(t('maxBuyNotZeroTips')))
+                        } else {
+                            callback()
+                        }
+                    }
+                }
+            ],
+            min_buy: [
+                {
+                    trigger: 'blur',
+                    validator: (rule: any, value: any, callback: any) => {
+                        if (isNaN(value) || !regExp.number.test(value)) {
+                            callback(new Error(t('minBuyFormatErrorTips')))
+                        } else if (value < 0) {
+                            callback(new Error(t('minBuyNotZeroTips')))
+                        } else if (formData.is_limit == 1 && value > Number(formData.max_buy)) {
+                            callback(new Error(t('minBuyGreaterThanMaxBuyTips')))
+                        } else {
+                            callback()
+                        }
+                    }
+                }
+            ],
+            goods_desc: [
+                {
+                    required: true,
+                    trigger: ['blur', 'change'],
+                    validator: (rule: any, value: any, callback: any) => {
+                        if (value === '') {
+                            callback(new Error(t('goodsDescPlaceholder')))
+                        } else if (value.length < 5 || value.length > 50000) {
+                            callback(new Error(t('goodsDescMaxTips')))
+                            return false
+                        } else {
+                            callback()
+                        }
+                    }
+                }
+            ]
+        };
+
+        if (getFormRules) {
+            Object.assign(rules, getFormRules(formData, regExp));
+        }
+
+        return rules;
+    })
+
+    // 多规格，销售价 验证规则
+    const skuPriceRules = () => {
+        return [{
+            trigger: 'blur',
+            validator: (rule: any, value: any, callback: any) => {
+                if (formData.spec_type == 'multi') {
+                    if (value.length == 0) {
+                        callback(t('pricePlaceholder'))
+                    } else if (isNaN(value) || !regExp.digit.test(value)) {
+                        callback(t('priceTips'))
+                    } else if (value < 0) {
+                        callback(t('priceNotZeroTips'))
+                    } else {
+                        callback();
+                    }
+                } else {
+                    callback();
+                }
+
             }
-          },
-        },
-      ],
-      min_buy: [
-        {
-          trigger: 'blur',
-          validator: (rule: any, value: any, callback: any) => {
-            if (isNaN(value) || !regExp.number.test(value)) {
-              callback(new Error(t('minBuyFormatErrorTips')))
-            } else if (value < 0) {
-              callback(new Error(t('minBuyNotZeroTips')))
-            } else if (
-              formData.is_limit == 1 &&
-              value > Number(formData.max_buy)
-            ) {
-              callback(new Error(t('minBuyGreaterThanMaxBuyTips')))
-            } else {
-              callback()
+        }]
+    };
+
+    // 多规格，划线价 验证规则
+    const skuMarketPriceRules = () => {
+        return [{
+            trigger: 'blur',
+            validator: (rule: any, value: any, callback: any) => {
+                if (formData.spec_type == 'multi') {
+                    if (isNaN(value) || !regExp.digit.test(value)) {
+                        callback(t('marketPriceTips'))
+                    } else if (value < 0) {
+                        callback(t('marketPriceNotZeroTips'))
+                    } else {
+                        callback();
+                    }
+                } else {
+                    callback();
+                }
             }
-          },
-        },
-      ],
-      goods_desc: [
-        {
-          required: true,
-          trigger: ['blur', 'change'],
-          validator: (rule: any, value: any, callback: any) => {
-            if (value === '') {
-              callback(new Error(t('goodsDescPlaceholder')))
-            } else if (value.length < 5 || value.length > 50000) {
-              callback(new Error(t('goodsDescMaxTips')))
-              return false
-            } else {
-              callback()
+        }]
+    }
+
+    // 多规格，成本价 验证规则
+    const skuCostPriceRules = () => {
+        return [{
+            trigger: 'blur',
+            validator: (rule: any, value: any, callback: any) => {
+                if (formData.spec_type == 'multi') {
+                    if (isNaN(value) || !regExp.digit.test(value)) {
+                        callback(t('costPriceTips'))
+                    } else if (value < 0) {
+                        callback(t('costPriceNotZeroTips'))
+                    } else {
+                        callback();
+                    }
+                } else {
+                    callback();
+                }
             }
-          },
-        },
-      ],
+        }]
     }
 
-    if (getFormRules) {
-      Object.assign(rules, getFormRules(formData, regExp))
+    // 多规格，库存 验证规则
+    const skuStockRules = () => {
+        return [{
+            trigger: 'blur',
+            validator: (rule: any, value: any, callback: any) => {
+                if (formData.spec_type == 'multi') {
+                    if (value.length == 0) {
+                        callback(t('stockPlaceholder'))
+                    } else if (isNaN(value) || !regExp.number.test(value)) {
+                        callback(t('stockTips'))
+                    } else if (value < 0) {
+                        callback(t('stockNotZeroTips'))
+                    } else {
+                        callback();
+                    }
+
+                } else {
+                    callback();
+                }
+
+            }
+        }]
     }
 
-    return rules
-  })
-
-  // 多规格，销售价 验证规则
-  const skuPriceRules = () => {
-    return [
-      {
-        trigger: 'blur',
-        validator: (rule: any, value: any, callback: any) => {
-          if (formData.spec_type == 'multi') {
-            if (value.length == 0) {
-              callback(t('pricePlaceholder'))
-            } else if (isNaN(value) || !regExp.digit.test(value)) {
-              callback(t('priceTips'))
-            } else if (value < 0) {
-              callback(t('priceNotZeroTips'))
-            } else {
-              callback()
+    const verify = (callback: any) => {
+        let formRef = [
+            {
+                key: 'basic',
+                verify: false,
+                ref: formRefArr.basicFormRef
+            },
+            {
+                key: 'price_stock',
+                verify: false,
+                ref: formRefArr.priceStockFormRef
+            },
+            {
+                key: 'price_stock',
+                verify: false,
+                ref: formRefArr.skuFormRef
+            },
+            {
+                key: 'price_stock',
+                verify: false,
+                ref: formRefArr.priceStockCommonFormRef
             }
-          } else {
-            callback()
-          }
-        },
-      },
-    ]
-  }
-
-  // 多规格，划线价 验证规则
-  const skuMarketPriceRules = () => {
-    return [
-      {
-        trigger: 'blur',
-        validator: (rule: any, value: any, callback: any) => {
-          if (formData.spec_type == 'multi') {
-            if (isNaN(value) || !regExp.digit.test(value)) {
-              callback(t('marketPriceTips'))
-            } else if (value < 0) {
-              callback(t('marketPriceNotZeroTips'))
-            } else {
-              callback()
+        ];
+        formRef = formRef.concat(verifyArr);
+
+        // 调整验证顺序 -- 详情验证
+        let obj = {
+            key: 'detail',
+            verify: false,
+            ref: formRefArr.detailFormRef
+        };
+        formRef.push(obj)
+
+        formRef.forEach((el: any, index) => {
+            el.ref.validate((valid: any) => {
+                el.verify = valid
+            })
+        })
+
+        if (formData.spec_type == 'multi') {
+            let specVerify = true
+            let repeatSpecNameArr: any = [];
+            let repeatSpecValueNameArr: any = [];
+            for (let i = 0; i < goodsSpecFormat.length; i++) {
+                const spec = goodsSpecFormat[i]
+                if (Test.require(spec.spec_name)) {
+                    specVerify = false
+                    ElMessage({ type: 'warning', message: `${ t('specNameRequire') }` })
+                    break
+                }
+                if (repeatSpecNameArr.indexOf(spec.spec_name) > -1) {
+                    specVerify = false
+                    ElMessage({ type: 'warning', message: `${ t('specNameRepeat') }` })
+                    break
+                } else {
+                    repeatSpecNameArr.push(spec.spec_name);
+                }
+
+                if (spec.values.length) {
+                    for (let v = 0; v < spec.values.length; v++) {
+                        const value = spec.values[v]
+                        if (Test.require(value.spec_value_name)) {
+                            specVerify = false
+                            ElMessage({ type: 'warning', message: `${ t('specValueRequire') }` })
+                            break
+                        }
+
+                        if (repeatSpecValueNameArr.indexOf(value.spec_value_name) > -1) {
+                            specVerify = false
+                            ElMessage({ type: 'warning', message: `${ t('specValueNameRepeat') }` })
+                            break
+                        } else {
+                            repeatSpecValueNameArr.push(value.spec_value_name);
+                        }
+                    }
+                } else {
+                    specVerify = false
+                    ElMessage({ type: 'warning', message: `${ t('specValueRequire') }` })
+                }
+
+                if (!specVerify) break
             }
-          } else {
-            callback()
-          }
-        },
-      },
-    ]
-  }
-
-  // 多规格，成本价 验证规则
-  const skuCostPriceRules = () => {
-    return [
-      {
-        trigger: 'blur',
-        validator: (rule: any, value: any, callback: any) => {
-          if (formData.spec_type == 'multi') {
-            if (isNaN(value) || !regExp.digit.test(value)) {
-              callback(t('costPriceTips'))
-            } else if (value < 0) {
-              callback(t('costPriceNotZeroTips'))
-            } else {
-              callback()
+
+            if (!specVerify) {
+                activeName.value = 'price_stock'
+                return
             }
-          } else {
-            callback()
-          }
-        },
-      },
-    ]
-  }
-
-  // 多规格，库存 验证规则
-  const skuStockRules = () => {
-    return [
-      {
-        trigger: 'blur',
-        validator: (rule: any, value: any, callback: any) => {
-          if (formData.spec_type == 'multi') {
-            if (value.length == 0) {
-              callback(t('stockPlaceholder'))
-            } else if (isNaN(value) || !regExp.number.test(value)) {
-              callback(t('stockTips'))
-            } else if (value < 0) {
-              callback(t('stockNotZeroTips'))
-            } else {
-              callback()
+
+            let isHasDefaultSpec = false; // 是否存在默认规格
+            for (const k in goodsSkuData) {
+                if (goodsSkuData[k].is_default) {
+                    isHasDefaultSpec = true;
+                }
             }
-          } else {
-            callback()
-          }
-        },
-      },
-    ]
-  }
-
-  const verify = (callback: any) => {
-    let formRef = [
-      {
-        key: 'basic',
-        verify: false,
-        ref: formRefArr.basicFormRef,
-      },
-      {
-        key: 'price_stock',
-        verify: false,
-        ref: formRefArr.priceStockFormRef,
-      },
-      {
-        key: 'price_stock',
-        verify: false,
-        ref: formRefArr.skuFormRef,
-      },
-      {
-        key: 'price_stock',
-        verify: false,
-        ref: formRefArr.priceStockCommonFormRef,
-      },
-    ]
-    formRef = formRef.concat(verifyArr)
-
-    // 调整验证顺序 -- 详情验证
-    let obj = {
-      key: 'detail',
-      verify: false,
-      ref: formRefArr.detailFormRef,
+
+            if (!isHasDefaultSpec) {
+                activeName.value = 'price_stock'
+                ElMessage({ type: 'warning', message: `${ t('lackDefaultSpec') }` })
+                return
+            }
+        }
+
+        setTimeout(() => {
+            let verify = true
+            // 检测验证，并且定位tab页面
+            for (let i = 0; i < formRef.length; i++) {
+                if (formRef[i].verify == false) {
+                    activeName.value = formRef[i].key
+                    verify = false
+                    break
+                }
+            }
+            if (verify && callback) callback()
+        }, 10)
     }
-    formRef.push(obj)
 
-    formRef.forEach((el: any, index) => {
-      el.ref.validate((valid: any) => {
-        el.verify = valid
-      })
-    })
+    // 保存数据
+    const save = (callback: any = null) => {
+        verify(() => {
 
-    if (formData.spec_type == 'multi') {
-      let specVerify = true
-      let repeatSpecNameArr: any = []
-      let repeatSpecValueNameArr: any = []
-      for (let i = 0; i < goodsSpecFormat.length; i++) {
-        const spec = goodsSpecFormat[i]
-        if (Test.require(spec.spec_name)) {
-          specVerify = false
-          ElMessage({ type: 'warning', message: `${t('specNameRequire')}` })
-          break
-        }
-        if (repeatSpecNameArr.indexOf(spec.spec_name) > -1) {
-          specVerify = false
-          ElMessage({ type: 'warning', message: `${t('specNameRepeat')}` })
-          break
-        } else {
-          repeatSpecNameArr.push(spec.spec_name)
-        }
+            if (repeat.value) return
+            repeat.value = true
 
-        if (spec.values.length) {
-          for (let v = 0; v < spec.values.length; v++) {
-            const value = spec.values[v]
-            if (Test.require(value.spec_value_name)) {
-              specVerify = false
-              ElMessage({
-                type: 'warning',
-                message: `${t('specValueRequire')}`,
-              })
-              break
+            const api = formData.goods_id ? editApi : addApi
+            const data = cloneDeep(formData)
+
+            if (data.spec_type == 'multi') {
+                data.stock = 0
+                for (const k in goodsSkuData) {
+                    if (goodsSkuData[k].stock) data.stock += parseInt(goodsSkuData[k].stock)
+                }
             }
 
-            if (repeatSpecValueNameArr.indexOf(value.spec_value_name) > -1) {
-              specVerify = false
-              ElMessage({
-                type: 'warning',
-                message: `${t('specValueNameRepeat')}`,
-              })
-              break
-            } else {
-              repeatSpecValueNameArr.push(value.spec_value_name)
+            const goodsCategory: any = []
+            data.goods_category.forEach((item: any) => {
+                if (typeof item == 'object') {
+                    item.forEach((second: any) => {
+                        if (goodsCategory.indexOf(second) == -1) {
+                            goodsCategory.push(second)
+                        }
+                    })
+                } else {
+                    if (goodsCategory.indexOf(item) == -1) {
+                        goodsCategory.push(item)
+                    }
+                }
+            })
+
+            data.goods_category = goodsCategory
+            data.goods_sku_data = goodsSkuData
+            data.goods_spec_format = goodsSpecFormat
+
+            /***** 商品参数-start ****/
+            data.attr_format = [];
+            let attrFormat: any = deepClone(attrTableData);
+            attrFormat.forEach((item: any, index: any) => {
+                if (item.attr_value_name && item.select_child_val || item.attr_value_id > 0) {
+                    let obj: any = {};
+                    obj.attr_value_id = item.attr_value_id
+                    obj.attr_value_name = item.attr_value_name
+                    obj.type = item.type
+                    obj.sort = item.sort
+                    obj.attr_child_value_id = item.select_child_name
+                    obj.attr_child_value_name = item.select_child_val
+                    data.attr_format.push(obj);
+                }
+            });
+            data.attr_format.sort((a: any, b: any) => {
+                return b.sort - a.sort
+            });
+            data.attr_format = JSON.stringify(data.attr_format)
+            /***** 商品参数-end ****/
+
+            if (callback) {
+                Object.assign(data, callback(data));
             }
-          }
-        } else {
-          specVerify = false
-          ElMessage({ type: 'warning', message: `${t('specValueRequire')}` })
-        }
 
-        if (!specVerify) break
-      }
+            api(data).then((res: any) => {
+                repeat.value = false
+                router.push('/shop/goods/list')
+            }).catch(() => {
+                repeat.value = false
+            })
+        })
+    }
 
-      if (!specVerify) {
-        activeName.value = 'price_stock'
-        return
-      }
+    const back = () => {
+        router.push('/shop/goods/list')
+    }
 
-      let isHasDefaultSpec = false // 是否存在默认规格
-      for (const k in goodsSkuData) {
-        if (goodsSkuData[k].is_default) {
-          isHasDefaultSpec = true
-        }
-      }
+    const filterSpecial = (event: any) => {
+        event.target.value = event.target.value.replace(/[^\u4e00-\u9fa5a-zA-Z0-9\s]/g, '')
+        event.target.value = event.target.value.replace(/[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]/g, '')
+    }
 
-      if (!isHasDefaultSpec) {
-        activeName.value = 'price_stock'
-        ElMessage({ type: 'warning', message: `${t('lackDefaultSpec')}` })
-        return
-      }
+    const handleBlur = (e: any) => {
+        formRefArr.detailFormRef.value?.validateField('goods_desc')
     }
 
-    setTimeout(() => {
-      let verify = true
-      // 检测验证，并且定位tab页面
-      for (let i = 0; i < formRef.length; i++) {
-        if (formRef[i].verify == false) {
-          activeName.value = formRef[i].key
-          verify = false
-          break
-        }
-      }
-      if (verify && callback) callback()
-    }, 10)
-  }
-
-  // 保存数据
-  const save = (callback: any = null) => {
-    verify(() => {
-      if (repeat.value) return
-      repeat.value = true
-
-      const api = formData.goods_id ? editApi : addApi
-      const data = cloneDeep(formData)
-
-      if (data.spec_type == 'multi') {
-        data.stock = 0
-        for (const k in goodsSkuData) {
-          if (goodsSkuData[k].stock)
-            data.stock += parseInt(goodsSkuData[k].stock)
-        }
-      }
-
-      const goodsCategory: any = []
-      data.goods_category.forEach((item: any) => {
-        if (typeof item == 'object') {
-          item.forEach((second: any) => {
-            if (goodsCategory.indexOf(second) == -1) {
-              goodsCategory.push(second)
-            }
-          })
-        } else {
-          if (goodsCategory.indexOf(item) == -1) {
-            goodsCategory.push(item)
-          }
-        }
-      })
-
-      data.goods_category = goodsCategory
-      data.goods_sku_data = goodsSkuData
-      data.goods_spec_format = goodsSpecFormat
-
-      /***** 商品参数-start ****/
-      data.attr_format = []
-      let attrFormat: any = deepClone(attrTableData)
-      attrFormat.forEach((item: any, index: any) => {
-        if (
-          (item.attr_value_name && item.select_child_val) ||
-          item.attr_value_id > 0
-        ) {
-          let obj: any = {}
-          obj.attr_value_id = item.attr_value_id
-          obj.attr_value_name = item.attr_value_name
-          obj.type = item.type
-          obj.sort = item.sort
-          obj.attr_child_value_id = item.select_child_name
-          obj.attr_child_value_name = item.select_child_val
-          data.attr_format.push(obj)
-        }
-      })
-      data.attr_format.sort((a: any, b: any) => {
-        return b.sort - a.sort
-      })
-      data.attr_format = JSON.stringify(data.attr_format)
-      /***** 商品参数-end ****/
-
-      if (callback) {
-        Object.assign(data, callback(data))
-      }
-
-      api(data)
-        .then((res: any) => {
-          repeat.value = false
-          router.push('/shop/goods/list')
+    /******************** 商品参数-start ***************************/
+    const attrOptions = reactive([])
+    const getAttrListFn = () => {
+        getAttrList({}).then((res) => {
+            attrOptions.splice(0, attrOptions.length, ...res.data)
         })
-        .catch(() => {
-          repeat.value = false
-        })
-    })
-  }
-
-  const back = () => {
-    router.push('/shop/goods/list')
-  }
-
-  const filterSpecial = (event: any) => {
-    event.target.value = event.target.value.replace(
-      /[^\u4e00-\u9fa5a-zA-Z0-9\s]/g,
-      ''
-    )
-    event.target.value = event.target.value.replace(
-      /[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]/g,
-      ''
-    )
-  }
-
-  const handleBlur = (e: any) => {
-    formRefArr.detailFormRef.value?.validateField('goods_desc')
-  }
-
-  /******************** 商品参数-start ***************************/
-  const attrOptions = reactive([])
-  const getAttrListFn = () => {
-    getAttrList({}).then((res) => {
-      attrOptions.splice(0, attrOptions.length, ...res.data)
-    })
-  }
-
-  getAttrListFn()
-
-  let attrLoad = false
-  const attrTableData: any = reactive([])
-  const editCallFn = ref(false) //用于编辑时，只调用一次的变量标识
-
-  const attrChange = (attr_id: any = 0) => {
-    if (attrLoad || !attr_id) return false // !attr_id 防止多次进入
-    attrLoad = true
-
-    let id = attr_id == -1 ? 0 : attr_id // attr_id = -1 表示清空商品参数模版
-    getAttrInfo(id).then((res) => {
-      let data =
-        Object.keys(res.data).length && res.data.attr_value_format
-          ? JSON.parse(res.data.attr_value_format)
-          : []
-      let temporaryData: any = deepClone(attrTableData)
-      // 切换商品参数模版把之前的模版清除
-      temporaryData = temporaryData.filter(
-        (item: any) => item.attr_value_id <= 0
-      )
-
-      // 添加
-      data.filter((item: any) => {
-        item.select_child_name = item.type == 'checkbox' ? [] : ''
-        item.select_child_val = item.type == 'checkbox' ? [] : ''
-      })
-
-      temporaryData = temporaryData.concat(data)
-      attrTableData.splice(0, attrTableData.length, ...temporaryData)
-      attrLoad = false
-
-      if (editCallFn.value) {
-        let formAttrIdArray = formData.attr_format.map(
-          (obj: any) => obj.attr_value_id
-        )
-        let temporaryAttrData: any = deepClone(attrTableData)
-
-        temporaryAttrData = temporaryAttrData.filter(
-          (item: any) => formAttrIdArray.indexOf(item.attr_value_id) > -1
-        )
-
-        formData.attr_format.forEach((item: any, index: any) => {
-          temporaryAttrData.forEach(
-            (attrItem: any, attrIndex: any, attrArray: any) => {
-              if (attrItem.attr_value_id == item.attr_value_id) {
-                attrArray[attrIndex].select_child_name =
-                  item.attr_child_value_id
-                attrArray[attrIndex].select_child_val =
-                  item.attr_child_value_name
-                attrArray[attrIndex].sort = item.sort
-              }
+    }
+
+    getAttrListFn();
+
+    let attrLoad = false;
+    const attrTableData: any = reactive([])
+    const editCallFn = ref(false) //用于编辑时，只调用一次的变量标识
+
+    const attrChange = (attr_id: any = 0) => {
+        if (attrLoad || !attr_id) return false; // !attr_id 防止多次进入
+        attrLoad = true;
+
+        let id = attr_id == -1 ? 0 : attr_id; // attr_id = -1 表示清空商品参数模版
+        getAttrInfo(id).then((res) => {
+            let data = Object.keys(res.data).length && res.data.attr_value_format ? JSON.parse(res.data.attr_value_format) : []
+            let temporaryData: any = deepClone(attrTableData);
+            // 切换商品参数模版把之前的模版清除
+            temporaryData = temporaryData.filter((item: any) => item.attr_value_id <= 0);
+
+            // 添加
+            data.filter((item: any) => {
+                item.select_child_name = item.type == "checkbox" ? [] : '';
+                item.select_child_val = item.type == "checkbox" ? [] : '';
+            });
+
+            temporaryData = temporaryData.concat(data)
+            attrTableData.splice(0, attrTableData.length, ...temporaryData);
+            attrLoad = false;
+
+            if (editCallFn.value) {
+                let formAttrIdArray = formData.attr_format.map((obj: any) => obj.attr_value_id);
+                let temporaryAttrData: any = deepClone(attrTableData);
+
+                temporaryAttrData = temporaryAttrData.filter((item: any) => formAttrIdArray.indexOf(item.attr_value_id) > -1);
+
+                formData.attr_format.forEach((item: any, index: any) => {
+                    temporaryAttrData.forEach((attrItem: any, attrIndex: any, attrArray: any) => {
+                        if (attrItem.attr_value_id == item.attr_value_id) {
+                            attrArray[attrIndex].select_child_name = item.attr_child_value_id;
+                            attrArray[attrIndex].select_child_val = item.attr_child_value_name;
+                            attrArray[attrIndex].sort = item.sort;
+                        }
+                    });
+                });
+                let attrIdArray = temporaryAttrData.map((obj: any) => obj.attr_value_id);
+                formData.attr_format.forEach((item: any, index: any) => {
+                    if (attrIdArray.indexOf(item.attr_value_id) == -1 && item.type == 'text') {
+                        let obj: any = {};
+                        obj.attr_value_id = item.attr_value_id;
+                        obj.attr_value_name = item.attr_value_name;
+                        obj.sort = item.sort;
+                        obj.type = "text";
+                        obj.select_child_name = item.attr_child_value_id;
+                        obj.select_child_val = item.attr_child_value_name;
+                        temporaryAttrData.push(obj);
+                    }
+                });
+
+                temporaryAttrData.sort((a: any, b: any) => {
+                    return b.sort - a.sort
+                });
+
+                attrTableData.splice(0, attrTableData.length, ...temporaryAttrData);
+
+                editCallFn.value = false
             }
-          )
-        })
-        let attrIdArray = temporaryAttrData.map((obj: any) => obj.attr_value_id)
-        formData.attr_format.forEach((item: any, index: any) => {
-          if (
-            attrIdArray.indexOf(item.attr_value_id) == -1 &&
-            item.type == 'text'
-          ) {
-            let obj: any = {}
-            obj.attr_value_id = item.attr_value_id
-            obj.attr_value_name = item.attr_value_name
-            obj.sort = item.sort
-            obj.type = 'text'
-            obj.select_child_name = item.attr_child_value_id
-            obj.select_child_val = item.attr_child_value_name
-            temporaryAttrData.push(obj)
-          }
         })
+    }
 
-        temporaryAttrData.sort((a: any, b: any) => {
-          return b.sort - a.sort
-        })
+    // 添加商品参数
+    const addAttr = () => {
+        let obj: any = {
+            attr_value_id: "",
+            attr_value_name: "",
+            child: {
+                id: 1,
+                name: ''
+            },
+            sort: '',
+            type: "text",
+            select_child_name: '',
+            select_child_val: ''
+        };
+        obj.attr_value_id = -Math.floor((new Date().getSeconds()) + Math.floor(new Date().getMilliseconds()));
+        obj.sort = attrTableData.length + 1;
+        attrTableData.push(obj);
+    }
 
-        attrTableData.splice(0, attrTableData.length, ...temporaryAttrData)
+    // 删除商品参数
+    const delAttr = (index: any) => {
+        attrTableData.splice(index, 1);
+    }
 
-        editCallFn.value = false
-      }
-    })
-  }
-
-  // 添加商品参数
-  const addAttr = () => {
-    let obj: any = {
-      attr_value_id: '',
-      attr_value_name: '',
-      child: {
-        id: 1,
-        name: '',
-      },
-      sort: '',
-      type: 'text',
-      select_child_name: '',
-      select_child_val: '',
+    // 商品参数单选监听
+    const attrRadioChange = (index: any, data: any) => {
+        attrTableData.forEach((item: any, index: any, array: any) => {
+            if (item.type == 'radio') {
+                item.child.forEach((childItem: any, childIndex: any) => {
+                    if (childItem.id == data) {
+                        array[index].select_child_name = childItem.id;
+                        array[index].select_child_val = childItem.name;
+                    }
+                });
+            }
+            return item;
+        });
+    }
+
+    // 商品参数多选监听
+    const attrCheckboxChange = (index: any, data: any) => {
+        attrTableData[index].select_child_val = []
+        attrTableData[index].child.forEach((childItem: any, childIndex: any) => {
+            if (data.indexOf(childItem.id) > -1) {
+                attrTableData[index].select_child_val.push(childItem.name);
+            }
+        });
+    }
+
+    return {
+        formData,
+
+        activeName,
+        tabHandleClick,
+
+        goodsType,
+        changeGoodsType,
+
+        goodsCategoryOptions,
+        goodsCategoryProps,
+        categoryHandleChange,
+        toGoodsCategoryEvent,
+        refreshGoodsCategory,
+
+        brandOptions,
+        toGoodsBrandEvent,
+        refreshGoodsBrand,
+
+        posterOptions,
+        toPosterEvent,
+        refreshGoodsPoster,
+
+        diyFormOptions,
+        toDiyFormEvent,
+        refreshDiyForm,
+
+        labelOptions,
+        toGoodsLabelEvent,
+        refreshGoodsLabel,
+
+        serviceOptions,
+        toGoodsServiceEvent,
+        refreshGoodsService,
+
+        supplierOptions,
+        toSupplierEvent,
+        refreshSupplier,
+
+        goodsSpecFormat,
+        goodsSkuData,
+        specData,
+
+        generateRandom,
+
+        isDisabledPrice,
+        addSpec,
+        deleteSpec,
+        addSpecValue,
+        specValueNameInputListener,
+        deleteSpecValue,
+        specValueIsDefaultChangeListener,
+        specStockSum,
+
+        batchOperation,
+        skuHandleCheckAllChange,
+        handleCheckedCitiesChange,
+        saveBatch,
+
+        regExp,
+
+        formRules,
+        skuPriceRules,
+        skuMarketPriceRules,
+        skuCostPriceRules,
+        skuStockRules,
+
+        handleGoodsInit,
+        save,
+        back,
+        filterSpecial,
+        handleBlur,
+
+        attrOptions,
+        attrChange,
+        getAttrListFn,
+        attrTableData,
+        addAttr,
+        delAttr,
+        attrRadioChange,
+        attrCheckboxChange
     }
-    obj.attr_value_id = -Math.floor(
-      new Date().getSeconds() + Math.floor(new Date().getMilliseconds())
-    )
-    obj.sort = attrTableData.length + 1
-    attrTableData.push(obj)
-  }
-
-  // 删除商品参数
-  const delAttr = (index: any) => {
-    attrTableData.splice(index, 1)
-  }
-
-  // 商品参数单选监听
-  const attrRadioChange = (index: any, data: any) => {
-    attrTableData.forEach((item: any, index: any, array: any) => {
-      if (item.type == 'radio') {
-        item.child.forEach((childItem: any, childIndex: any) => {
-          if (childItem.id == data) {
-            array[index].select_child_name = childItem.id
-            array[index].select_child_val = childItem.name
-          }
-        })
-      }
-      return item
-    })
-  }
-
-  // 商品参数多选监听
-  const attrCheckboxChange = (index: any, data: any) => {
-    attrTableData[index].select_child_val = []
-    attrTableData[index].child.forEach((childItem: any, childIndex: any) => {
-      if (data.indexOf(childItem.id) > -1) {
-        attrTableData[index].select_child_val.push(childItem.name)
-      }
-    })
-  }
-
-  return {
-    formData,
-
-    activeName,
-    tabHandleClick,
-
-    goodsType,
-    changeGoodsType,
-
-    goodsCategoryOptions,
-    goodsCategoryProps,
-    categoryHandleChange,
-    toGoodsCategoryEvent,
-    refreshGoodsCategory,
-
-    brandOptions,
-    toGoodsBrandEvent,
-    refreshGoodsBrand,
-
-    posterOptions,
-    toPosterEvent,
-    refreshGoodsPoster,
-
-    diyFormOptions,
-    toDiyFormEvent,
-    refreshDiyForm,
-
-    labelOptions,
-    toGoodsLabelEvent,
-    refreshGoodsLabel,
-
-    serviceOptions,
-    toGoodsServiceEvent,
-    refreshGoodsService,
-
-    supplierOptions,
-    toSupplierEvent,
-    refreshSupplier,
-
-    goodsSpecFormat,
-    goodsSkuData,
-    specData,
-
-    generateRandom,
-
-    isDisabledPrice,
-    addSpec,
-    deleteSpec,
-    addSpecValue,
-    specValueNameInputListener,
-    deleteSpecValue,
-    specValueIsDefaultChangeListener,
-    specStockSum,
-
-    batchOperation,
-    skuHandleCheckAllChange,
-    handleCheckedCitiesChange,
-    saveBatch,
-
-    regExp,
-
-    formRules,
-    skuPriceRules,
-    skuMarketPriceRules,
-    skuCostPriceRules,
-    skuStockRules,
-
-    handleGoodsInit,
-    save,
-    back,
-    filterSpecial,
-    handleBlur,
-
-    attrOptions,
-    attrChange,
-    getAttrListFn,
-    attrTableData,
-    addAttr,
-    delAttr,
-    attrRadioChange,
-    attrCheckboxChange,
-  }
 }
diff --git a/admin/src/addon/shop/views/goods/real_edit.vue b/admin/src/addon/shop/views/goods/real_edit.vue
index c4b19bf1..dfa5633d 100644
--- a/admin/src/addon/shop/views/goods/real_edit.vue
+++ b/admin/src/addon/shop/views/goods/real_edit.vue
@@ -1,1290 +1,592 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <el-page-header
-        :content="
-          goodsEdit.formData.goods_id ? t('updateGoods') : t('addGoods')
-        "
-        :icon="ArrowLeft"
-        @back="goodsEdit.back()"
-      />
-    </el-card>
-
-    <el-card class="box-card mt-[15px] !border-none" shadow="never">
-      <el-tabs
-        v-model="goodsEdit.activeName"
-        @tab-click="goodsEdit.tabHandleClick"
-      >
-        <el-tab-pane :label="t('basicInfoTab')" name="basic">
-          <el-form
-            :model="goodsEdit.formData"
-            label-width="120px"
-            ref="basicFormRef"
-            :rules="goodsEdit.formRules"
-            class="page-form"
-          >
-            <el-form-item
-              :label="t('goodsType')"
-              v-if="goodsEdit.formData.goods_id"
-            >
-              <template v-for="item in goodsEdit.goodsType" :key="item.type">
-                <div
-                  class="goods-type-wrap"
-                  :class="[
-                    goodsEdit.formData.goods_type == item.type
-                      ? 'selected'
-                      : 'disabled',
-                  ]"
-                >
-                  <div class="goods-type-name">{{ item.name }}</div>
-                  <div class="goods-type-desc">({{ item.desc }})</div>
-                  <template v-if="goodsEdit.formData.goods_type == item.type">
-                    <div class="triangle"></div>
-                    <div class="selected">✓</div>
-                  </template>
-                </div>
-              </template>
-            </el-form-item>
-            <el-form-item :label="t('goodsType')" v-else>
-              <div
-                class="goods-type-wrap"
-                :class="{
-                  selected: goodsEdit.formData.goods_type == item.type,
-                }"
-                v-for="item in goodsEdit.goodsType"
-                :key="item.type"
-                @click="goodsEdit.changeGoodsType(item)"
-              >
-                <div class="goods-type-name">{{ item.name }}</div>
-                <div class="goods-type-desc">({{ item.desc }})</div>
-                <template v-if="goodsEdit.formData.goods_type == item.type">
-                  <div class="triangle"></div>
-                  <div class="selected">✓</div>
-                </template>
-              </div>
-            </el-form-item>
-            <el-form-item :label="t('goodsName')" prop="goods_name">
-              <el-input
-                v-model.trim="goodsEdit.formData.goods_name"
-                clearable
-                :placeholder="t('goodsNamePlaceholder')"
-                class="input-width"
-                maxlength="60"
-                show-word-limit
-              />
-            </el-form-item>
-            <el-form-item :label="t('subTitle')" prop="sub_title">
-              <el-input
-                v-model.trim="goodsEdit.formData.sub_title"
-                clearable
-                :placeholder="t('subTitlePlaceholder')"
-                class="input-width"
-                maxlength="80"
-                show-word-limit
-              />
-            </el-form-item>
-            <el-form-item :label="t('goodsImage')" prop="goods_image">
-              <upload-image
-                v-model="goodsEdit.formData.goods_image"
-                :limit="10"
-              />
-            </el-form-item>
-            <!--                        <el-form-item :label="t('goodsVideo')">-->
-            <!--                            <upload-video v-model="goodsEdit.formData.goods_video" :limit="1" />-->
-            <!--                        </el-form-item>-->
-            <el-form-item :label="t('goodsCategory')" prop="goods_category">
-              <el-cascader
-                v-model="goodsEdit.formData.goods_category"
-                :options="goodsEdit.goodsCategoryOptions"
-                :props="goodsEdit.goodsCategoryProps"
-                clearable
-                filterable
-                @change="goodsEdit.categoryHandleChange"
-                popper-class="choice"
-              />
-              <div class="ml-[10px]">
-                <span
-                  class="cursor-pointer text-primary mr-[10px]"
-                  @click="goodsEdit.refreshGoodsCategory(true)"
-                  >{{ t('refresh') }}</span
-                >
-                <span
-                  class="cursor-pointer text-primary"
-                  @click="goodsEdit.toGoodsCategoryEvent"
-                  >{{ t('addGoodsCategory') }}</span
-                >
-              </div>
-            </el-form-item>
-
-            <el-form-item :label="t('brand')">
-              <el-select
-                v-model="goodsEdit.formData.brand_id"
-                :placeholder="t('brandPlaceholder')"
-                clearable
-              >
-                <el-option
-                  v-for="item in goodsEdit.brandOptions"
-                  :key="item.brand_id"
-                  :label="item.brand_name"
-                  :value="item.brand_id"
-                />
-              </el-select>
-              <div class="ml-[10px]">
-                <span
-                  class="cursor-pointer text-primary mr-[10px]"
-                  @click="goodsEdit.refreshGoodsBrand(true)"
-                  >{{ t('refresh') }}</span
-                >
-                <span
-                  class="cursor-pointer text-primary"
-                  @click="goodsEdit.toGoodsBrandEvent"
-                  >{{ t('addGoodsBrand') }}</span
-                >
-              </div>
-            </el-form-item>
-
-            <el-form-item :label="t('poster')">
-              <el-select
-                v-model="goodsEdit.formData.poster_id"
-                :placeholder="t('posterPlaceholder')"
-                clearable
-              >
-                <el-option
-                  v-for="item in goodsEdit.posterOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-              <div class="ml-[10px]">
-                <span
-                  class="cursor-pointer text-primary mr-[10px]"
-                  @click="goodsEdit.refreshGoodsPoster(true)"
-                  >{{ t('refresh') }}</span
-                >
-                <span
-                  class="cursor-pointer text-primary"
-                  @click="goodsEdit.toPosterEvent"
-                  >{{ t('addGoodsPoster') }}</span
-                >
-              </div>
-            </el-form-item>
-
-            <div
-              class="ml-[120px] mb-[10px] text-[12px] text-[#999] leading-[20px]"
-            >
-              {{ t('posterTips') }}
-            </div>
-
-            <el-form-item :label="t('diyForm')">
-              <el-select
-                v-model="goodsEdit.formData.form_id"
-                :placeholder="t('diyFormPlaceholder')"
-                clearable
-              >
-                <el-option
-                  v-for="item in goodsEdit.diyFormOptions"
-                  :key="item.form_id"
-                  :label="item.page_title"
-                  :value="item.form_id"
-                />
-              </el-select>
-              <div class="ml-[10px]">
-                <span
-                  class="cursor-pointer text-primary mr-[10px]"
-                  @click="goodsEdit.refreshDiyForm(true)"
-                  >{{ t('refresh') }}</span
-                >
-                <span
-                  class="cursor-pointer text-primary"
-                  @click="goodsEdit.toDiyFormEvent"
-                  >{{ t('addDiyForm') }}</span
-                >
-              </div>
-            </el-form-item>
-
-            <el-form-item :label="t('label')">
-              <el-checkbox-group v-model="goodsEdit.formData.label_ids">
-                <el-checkbox
-                  :label="item.label_id"
-                  v-for="(item, index) in goodsEdit.labelOptions"
-                  :key="index"
-                  >{{ item.label_name }}</el-checkbox
-                >
-              </el-checkbox-group>
-              <div class="ml-[10px]">
-                <span
-                  class="cursor-pointer text-primary mr-[10px]"
-                  @click="goodsEdit.refreshGoodsLabel"
-                  >{{ t('refresh') }}</span
-                >
-                <span
-                  class="cursor-pointer text-primary"
-                  @click="goodsEdit.toGoodsLabelEvent"
-                  >{{ t('addGoodsLabel') }}</span
-                >
-              </div>
-            </el-form-item>
-            <el-form-item :label="t('goodsService')">
-              <el-checkbox-group v-model="goodsEdit.formData.service_ids">
-                <el-checkbox
-                  :label="item.service_id"
-                  v-for="(item, index) in goodsEdit.serviceOptions"
-                  :key="index"
-                  >{{ item.service_name }}</el-checkbox
-                >
-              </el-checkbox-group>
-              <div class="ml-[10px]">
-                <span
-                  class="cursor-pointer text-primary mr-[10px]"
-                  @click="goodsEdit.refreshGoodsService"
-                  >{{ t('refresh') }}</span
-                >
-                <span
-                  class="cursor-pointer text-primary"
-                  @click="goodsEdit.toGoodsServiceEvent"
-                  >{{ t('addGoodsService') }}</span
-                >
-              </div>
-            </el-form-item>
-
-            <el-form-item
-              :label="t('supplier')"
-              v-if="
-                goodsEdit.formData.addon_shop_supplier &&
-                goodsEdit.formData.addon_shop_supplier.status == 1
-              "
-            >
-              <el-select
-                v-model="goodsEdit.formData.supplier_id"
-                :placeholder="t('supplierPlaceholder')"
-                clearable
-              >
-                <el-option
-                  v-for="item in goodsEdit.supplierOptions"
-                  :key="item.supplier_id"
-                  :label="item.supplier_name"
-                  :value="item.supplier_id"
-                />
-              </el-select>
-              <div class="ml-[10px]">
-                <span
-                  class="cursor-pointer text-primary mr-[10px]"
-                  @click="goodsEdit.refreshSupplier"
-                  >{{ t('refresh') }}</span
-                >
-                <span
-                  class="cursor-pointer text-primary"
-                  @click="goodsEdit.toSupplierEvent"
-                  >{{ t('addSupplier') }}</span
-                >
-              </div>
-            </el-form-item>
-            <el-form-item :label="t('status')">
-              <el-radio-group v-model="goodsEdit.formData.status">
-                <el-radio label="1">{{ t('statusOn') }}</el-radio>
-                <el-radio label="0">{{ t('statusOff') }}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-            <el-form-item :label="t('isGive')">
-              <div>
-                <el-radio-group v-model="goodsEdit.formData.is_gift">
-                  <el-radio :label="1">{{ t('yes') }}</el-radio>
-                  <el-radio :label="0">{{ t('no') }}</el-radio>
-                </el-radio-group>
-                <div class="mt-[10px] text-[12px] text-[#999] leading-[20px]">
-                  {{ t('giftTips') }}
-                </div>
-              </div>
-            </el-form-item>
-            <el-form-item :label="t('unit')" prop="unit">
-              <el-input
-                v-model.trim="goodsEdit.formData.unit"
-                clearable
-                :placeholder="t('unitPlaceholder')"
-                class="input-width"
-                show-word-limit
-                maxlength="6"
-              />
-            </el-form-item>
-            <el-form-item :label="t('virtualSaleNum')" prop="virtual_sale_num">
-              <div>
-                <el-input
-                  v-model.trim="goodsEdit.formData.virtual_sale_num"
-                  clearable
-                  :placeholder="t('virtualSaleNumPlaceholder')"
-                  class="input-width"
-                  show-word-limit
-                  maxlength="8"
-                  @keyup="filterNumber($event)"
-                  @blur="
-                    goodsEdit.formData.virtual_sale_num = $event.target.value
-                  "
-                >
-                  <template #append>{{
-                    goodsEdit.formData.unit ? goodsEdit.formData.unit : '件'
-                  }}</template>
-                </el-input>
-                <div class="mt-[10px] text-[12px] text-[#999] leading-[20px]">
-                  {{ t('virtualSaleNumDesc') }}
-                </div>
-              </div>
-            </el-form-item>
-            <el-form-item :label="t('sort')" prop="sort">
-              <el-input
-                v-model.trim="goodsEdit.formData.sort"
-                clearable
-                :placeholder="t('sortPlaceholder')"
-                class="input-width"
-                show-word-limit
-                maxlength="8"
-                @keyup="filterNumber($event)"
-                @blur="goodsEdit.formData.sort = $event.target.value"
-              />
-            </el-form-item>
-          </el-form>
-        </el-tab-pane>
-        <el-tab-pane :label="t('priceStockTab')" name="price_stock">
-          <el-form
-            :model="goodsEdit.formData"
-            label-width="120px"
-            ref="priceStockFormRef"
-            :rules="goodsEdit.formRules"
-            class="page-form"
-          >
-            <el-form-item :label="t('specType')" prop="spec_type">
-              <div>
-                <el-radio-group v-model="goodsEdit.formData.spec_type">
-                  <el-radio
-                    label="single"
-                    :disabled="goodsEdit.isDisabledPrice()"
-                    >{{ t('singleSpec') }}</el-radio
-                  >
-                  <el-radio
-                    label="multi"
-                    :disabled="goodsEdit.isDisabledPrice()"
-                    >{{ t('multiSpec') }}</el-radio
-                  >
-                </el-radio-group>
-                <div
-                  class="mt-[10px] text-[12px] text-[#999] leading-[20px]"
-                  v-if="goodsEdit.isDisabledPrice()"
-                >
-                  {{ t('participateInActiveDisableTips') }}
-                </div>
-              </div>
-            </el-form-item>
-
-            <template v-if="goodsEdit.formData.spec_type == 'single'">
-              <el-form-item :label="t('price')" prop="price">
-                <el-input
-                  v-model.trim="goodsEdit.formData.price"
-                  clearable
-                  placeholder="0.00"
-                  class="input-width"
-                  maxlength="8"
-                  :disabled="goodsEdit.isDisabledPrice()"
-                >
-                  <template #append>{{ t('yuan') }}</template>
-                </el-input>
-              </el-form-item>
-
-              <el-form-item :label="t('marketPrice')" prop="market_price">
-                <el-input
-                  v-model.trim="goodsEdit.formData.market_price"
-                  clearable
-                  placeholder="0.00"
-                  class="input-width"
-                  maxlength="8"
-                >
-                  <template #append>{{ t('yuan') }}</template>
-                </el-input>
-              </el-form-item>
-
-              <el-form-item :label="t('costPrice')" prop="cost_price">
-                <el-input
-                  v-model.trim="goodsEdit.formData.cost_price"
-                  clearable
-                  placeholder="0.00"
-                  class="input-width"
-                  maxlength="8"
-                >
-                  <template #append>{{ t('yuan') }}</template>
-                </el-input>
-              </el-form-item>
-              <el-form-item :label="t('weight')" prop="weight">
-                <el-input
-                  v-model.trim="goodsEdit.formData.weight"
-                  clearable
-                  placeholder="0.00"
-                  class="input-width"
-                  maxlength="6"
-                >
-                  <template #append>kg</template>
-                </el-input>
-              </el-form-item>
-              <el-form-item :label="t('volume')" prop="volume">
-                <el-input
-                  v-model.trim="goodsEdit.formData.volume"
-                  clearable
-                  placeholder="0.00"
-                  class="input-width"
-                  maxlength="6"
-                >
-                  <template #append>m³</template>
-                </el-input>
-              </el-form-item>
-              <el-form-item :label="t('goodsStock')" prop="stock">
-                <!--                                :disabled="goodsEdit.isDisabledPrice()"-->
-                <el-input
-                  v-model.trim="goodsEdit.formData.stock"
-                  clearable
-                  :placeholder="t('goodsStockPlaceholder')"
-                  class="input-width"
-                  maxlength="8"
-                  @keyup="filterNumber($event)"
-                >
-                  <template #append>{{
-                    goodsEdit.formData.unit
-                      ? goodsEdit.formData.unit
-                      : t('defaultUnit')
-                  }}</template>
-                </el-input>
-              </el-form-item>
-              <el-form-item :label="t('skuNo')">
-                <el-input
-                  v-model.trim="goodsEdit.formData.sku_no"
-                  clearable
-                  :placeholder="t('skuNoPlaceholder')"
-                  class="input-width"
-                  maxlength="50"
-                  @keyup="goodsEdit.filterSpecial($event)"
-                />
-              </el-form-item>
-            </template>
-          </el-form>
-
-          <!-- 多规格 -->
-          <el-form
-            :model="goodsEdit.goodsSkuData"
-            label-width="120px"
-            ref="skuFormRef"
-            class="page-form"
-          >
-            <div
-              class="el-form-item asterisk-left"
-              v-show="goodsEdit.formData.spec_type == 'multi'"
-            >
-              <div class="el-form-item__label w-[120px]">
-                {{ t('goodsSku') }}
-              </div>
-              <div class="spec-wrap">
-                <!--规格项/规格值-->
-                <div class="spec-edit-list">
-                  <div
-                    class="spec-item"
-                    v-for="(item, index) in goodsEdit.goodsSpecFormat"
-                    :key="item.id"
-                  >
-                    <div class="spec-name-wrap">
-                      <el-input
-                        v-model.trim="item.spec_name"
-                        clearable
-                        :placeholder="t('specNamePlaceholder')"
-                        class="input-width"
-                        maxlength="20"
-                      />
-                    </div>
-                    <div class="spec-value-wrap">
-                      <ul ref="specValueRef">
-                        <li
-                          :class="'draggable-element' + index"
-                          v-for="(specValue, specIndex) in item.values"
-                          :key="specValue.id"
-                        >
-                          <el-input
-                            v-model.trim="specValue.spec_value_name"
-                            clearable
-                            :placeholder="t('specValueNamePlaceholder')"
-                            class="input-width"
-                            :suffix-icon="Rank"
-                            maxlength="20"
-                            @input="goodsEdit.specValueNameInputListener"
-                          >
-                          </el-input>
-                          <el-icon
-                            class="icon"
-                            :size="20"
-                            color="#7b7b7b"
-                            @click="goodsEdit.deleteSpecValue(index, specIndex)"
-                          >
-                            <CircleCloseFilled />
-                          </el-icon>
-                        </li>
-                      </ul>
-                      <span
-                        class="text-primary text-[14px] add-spec-value"
-                        @click="goodsEdit.addSpecValue(index)"
-                        >{{ t('addSpecValue') }}</span
-                      >
-                      <div class="box"></div>
-                    </div>
-
-                    <el-icon
-                      class="del-spec"
-                      :size="20"
-                      color="#7b7b7b"
-                      @click="goodsEdit.deleteSpec(index)"
-                    >
-                      <CircleCloseFilled />
-                    </el-icon>
-                  </div>
-                </div>
+    <div class="main-container">
+
+        <el-card class="box-card !border-none" shadow="never">
+            <el-page-header :content="goodsEdit.formData.goods_id ? t('updateGoods') : t('addGoods')" :icon="ArrowLeft" @back="goodsEdit.back()" />
+        </el-card>
+
+        <el-card class="box-card mt-[15px] !border-none" shadow="never">
+
+            <el-tabs v-model="goodsEdit.activeName" @tab-click="goodsEdit.tabHandleClick">
+                <el-tab-pane :label="t('basicInfoTab')" name="basic">
+
+                    <el-form :model="goodsEdit.formData" label-width="120px" ref="basicFormRef" :rules="goodsEdit.formRules" class="page-form">
+                        <el-form-item :label="t('goodsType')" v-if="goodsEdit.formData.goods_id">
+                            <template v-for="(item) in goodsEdit.goodsType" :key="item.type">
+                                <div class="goods-type-wrap" :class="[goodsEdit.formData.goods_type == item.type ? 'selected' : 'disabled']">
+                                    <div class="goods-type-name">{{ item.name }}</div>
+                                    <div class="goods-type-desc">({{ item.desc }})</div>
+                                    <template v-if="goodsEdit.formData.goods_type == item.type">
+                                        <div class="triangle"></div>
+                                        <div class="selected">✓</div>
+                                    </template>
+                                </div>
+                            </template>
+                        </el-form-item>
+                        <el-form-item :label="t('goodsType')" v-else>
+                            <div class="goods-type-wrap" :class="{ 'selected': goodsEdit.formData.goods_type == item.type }" v-for="(item) in goodsEdit.goodsType" :key="item.type" @click="goodsEdit.changeGoodsType(item)">
+                                <div class="goods-type-name">{{ item.name }}</div>
+                                <div class="goods-type-desc">({{ item.desc }})</div>
+                                <template v-if="goodsEdit.formData.goods_type == item.type">
+                                    <div class="triangle"></div>
+                                    <div class="selected">✓</div>
+                                </template>
+                            </div>
+                        </el-form-item>
+                        <el-form-item :label="t('goodsName')" prop="goods_name">
+                            <el-input v-model.trim="goodsEdit.formData.goods_name" clearable :placeholder="t('goodsNamePlaceholder')" class="input-width" maxlength="60" show-word-limit />
+                        </el-form-item>
+                        <el-form-item :label="t('subTitle')" prop="sub_title">
+                            <el-input v-model.trim="goodsEdit.formData.sub_title" clearable :placeholder="t('subTitlePlaceholder')" class="input-width" maxlength="80" show-word-limit />
+                        </el-form-item>
+                        <el-form-item :label="t('goodsImage')" prop="goods_image">
+                            <upload-image v-model="goodsEdit.formData.goods_image" :limit="10" />
+                        </el-form-item>
+<!--                        <el-form-item :label="t('goodsVideo')">-->
+<!--                            <upload-video v-model="goodsEdit.formData.goods_video" :limit="1" />-->
+<!--                        </el-form-item>-->
+                        <el-form-item :label="t('goodsCategory')" prop="goods_category">
+                            <el-cascader v-model="goodsEdit.formData.goods_category" :options="goodsEdit.goodsCategoryOptions" :props="goodsEdit.goodsCategoryProps" clearable filterable @change="goodsEdit.categoryHandleChange" popper-class="choice" />
+                            <div class="ml-[10px]">
+                                <span class="cursor-pointer text-primary mr-[10px]" @click="goodsEdit.refreshGoodsCategory(true)">{{ t('refresh') }}</span>
+                                <span class="cursor-pointer text-primary" @click="goodsEdit.toGoodsCategoryEvent">{{ t('addGoodsCategory') }}</span>
+                            </div>
+                        </el-form-item>
+
+                        <el-form-item :label="t('brand')">
+                            <el-select v-model="goodsEdit.formData.brand_id" :placeholder="t('brandPlaceholder')" clearable>
+                                <el-option v-for="item in goodsEdit.brandOptions" :key="item.brand_id" :label="item.brand_name" :value="item.brand_id" />
+                            </el-select>
+                            <div class="ml-[10px]">
+                                <span class="cursor-pointer text-primary mr-[10px]" @click="goodsEdit.refreshGoodsBrand(true)">{{ t('refresh') }}</span>
+                                <span class="cursor-pointer text-primary" @click="goodsEdit.toGoodsBrandEvent">{{ t('addGoodsBrand') }}</span>
+                            </div>
+                        </el-form-item>
+
+                        <el-form-item :label="t('poster')">
+                            <el-select v-model="goodsEdit.formData.poster_id" :placeholder="t('posterPlaceholder')" clearable>
+                                <el-option v-for="item in goodsEdit.posterOptions" :key="item.id" :label="item.name" :value="item.id" />
+                            </el-select>
+                            <div class="ml-[10px]">
+                                <span class="cursor-pointer text-primary mr-[10px]" @click="goodsEdit.refreshGoodsPoster(true)">{{ t('refresh') }}</span>
+                                <span class="cursor-pointer text-primary" @click="goodsEdit.toPosterEvent">{{ t('addGoodsPoster') }}</span>
+                            </div>
+                        </el-form-item>
 
-                <div class="add-spec">
-                  <el-button type="primary" @click="goodsEdit.addSpec">{{
-                    t('addSpec')
-                  }}</el-button>
-                </div>
+                        <div class="ml-[120px] mb-[10px] text-[12px] text-[#999] leading-[20px]">{{ t('posterTips') }}</div>
 
-                <!-- 批量设置 -->
-                <div
-                  class="batch-operation-sku"
-                  v-show="Object.keys(goodsEdit.goodsSkuData).length"
-                >
-                  <label>{{ t('batchOperationSku') }}</label>
+                        <el-form-item :label="t('diyForm')">
+                            <el-select v-model="goodsEdit.formData.form_id" :placeholder="t('diyFormPlaceholder')" clearable>
+                                <el-option v-for="item in goodsEdit.diyFormOptions" :key="item.form_id" :label="item.page_title" :value="item.form_id" />
+                            </el-select>
+                            <div class="ml-[10px]">
+                                <span class="cursor-pointer text-primary mr-[10px]" @click="goodsEdit.refreshDiyForm(true)">{{ t('refresh') }}</span>
+                                <span class="cursor-pointer text-primary" @click="goodsEdit.toDiyFormEvent">{{ t('addDiyForm') }}</span>
+                            </div>
+                        </el-form-item>
 
-                  <!--                                    <el-select v-model="goodsEdit.batchOperation.spec" class="set-spec-select" :placeholder="t('all')">-->
-                  <!--                                        <el-option :label="t('all')" value="" />-->
-                  <!--                                        <template v-for="(item, key) in goodsEdit.goodsSkuData" :key="key">-->
-                  <!--                                            <el-option v-if="item.spec_name" :label="item.spec_name" :value="key" />-->
-                  <!--                                        </template>-->
-                  <!--                                    </el-select>-->
+                        <el-form-item :label="t('label')">
+                            <el-checkbox-group v-model="goodsEdit.formData.label_ids">
+                                <el-checkbox :label="item.label_id" v-for="(item, index) in goodsEdit.labelOptions" :key="index">{{ item.label_name }}</el-checkbox>
+                            </el-checkbox-group>
+                            <div class="ml-[10px]">
+                                <span class="cursor-pointer text-primary mr-[10px]" @click="goodsEdit.refreshGoodsLabel">{{ t('refresh') }}</span>
+                                <span class="cursor-pointer text-primary" @click="goodsEdit.toGoodsLabelEvent">{{ t('addGoodsLabel') }}</span>
+                            </div>
+                        </el-form-item>
+                        <el-form-item :label="t('goodsService')">
+                            <el-checkbox-group v-model="goodsEdit.formData.service_ids">
+                                <el-checkbox :label="item.service_id" v-for="(item, index) in goodsEdit.serviceOptions" :key="index">{{ item.service_name }}</el-checkbox>
+                            </el-checkbox-group>
+                            <div class="ml-[10px]">
+                                <span class="cursor-pointer text-primary mr-[10px]" @click="goodsEdit.refreshGoodsService">{{ t('refresh') }}</span>
+                                <span class="cursor-pointer text-primary" @click="goodsEdit.toGoodsServiceEvent">{{ t('addGoodsService') }}</span>
+                            </div>
+                        </el-form-item>
+
+                        <el-form-item :label="t('supplier')" v-if="goodsEdit.formData.addon_shop_supplier && goodsEdit.formData.addon_shop_supplier.status == 1">
+                            <el-select v-model="goodsEdit.formData.supplier_id" :placeholder="t('supplierPlaceholder')" clearable>
+                                <el-option v-for="item in goodsEdit.supplierOptions" :key="item.supplier_id" :label="item.supplier_name" :value="item.supplier_id" />
+                            </el-select>
+                            <div class="ml-[10px]">
+                                <span class="cursor-pointer text-primary mr-[10px]" @click="goodsEdit.refreshSupplier">{{ t('refresh') }}</span>
+                                <span class="cursor-pointer text-primary" @click="goodsEdit.toSupplierEvent">{{ t('addSupplier') }}</span>
+                            </div>
+                        </el-form-item>
+                        <el-form-item :label="t('status')">
+                            <el-radio-group v-model="goodsEdit.formData.status">
+                                <el-radio label="1">{{ t('statusOn') }}</el-radio>
+                                <el-radio label="0">{{ t('statusOff') }}</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                        <el-form-item :label="t('isGive')">
+                            <div>
+                                <el-radio-group v-model="goodsEdit.formData.is_gift">
+                                    <el-radio :label= "1">{{ t('yes') }}</el-radio>
+                                    <el-radio :label= "0">{{ t('no') }}</el-radio>
+                                </el-radio-group>
+                                <div class="mt-[10px] text-[12px] text-[#999] leading-[20px]">{{ t('giftTips') }}</div>
+                            </div>
+                        </el-form-item>
+                        <el-form-item :label="t('unit')" prop="unit">
+                            <el-input v-model.trim="goodsEdit.formData.unit" clearable :placeholder="t('unitPlaceholder')" class="input-width" show-word-limit maxlength="6" />
+                        </el-form-item>
+                        <el-form-item :label="t('virtualSaleNum')" prop="virtual_sale_num">
+                            <div>
+                                <el-input v-model.trim="goodsEdit.formData.virtual_sale_num" clearable :placeholder="t('virtualSaleNumPlaceholder')" class="input-width" show-word-limit maxlength="8" @keyup="filterNumber($event)" @blur="goodsEdit.formData.virtual_sale_num = $event.target.value">
+                                    <template #append>{{ goodsEdit.formData.unit ? goodsEdit.formData.unit : '件' }}</template>
+                                </el-input>
+                                <div class="mt-[10px] text-[12px] text-[#999] leading-[20px]">{{ t('virtualSaleNumDesc') }}</div>
+                            </div>
+                        </el-form-item>
+                        <el-form-item :label="t('sort')" prop="sort">
+                            <el-input v-model.trim="goodsEdit.formData.sort" clearable :placeholder="t('sortPlaceholder')"
+                                class="input-width" show-word-limit maxlength="8" @keyup="filterNumber($event)"
+                                @blur="goodsEdit.formData.sort = $event.target.value" />
+                        </el-form-item>
+
+                    </el-form>
+
+                </el-tab-pane>
+                <el-tab-pane :label="t('priceStockTab')" name="price_stock">
+                    <el-form :model="goodsEdit.formData" label-width="120px" ref="priceStockFormRef" :rules="goodsEdit.formRules" class="page-form">
+                        <el-form-item :label="t('specType')" prop="spec_type">
+                            <div>
+                                <el-radio-group v-model="goodsEdit.formData.spec_type">
+                                    <el-radio label="single" :disabled="goodsEdit.isDisabledPrice()">{{ t('singleSpec') }}</el-radio>
+                                    <el-radio label="multi" :disabled="goodsEdit.isDisabledPrice()">{{ t('multiSpec') }}</el-radio>
+                                </el-radio-group>
+                                <div class="mt-[10px] text-[12px] text-[#999] leading-[20px]" v-if="goodsEdit.isDisabledPrice()">{{ t('participateInActiveDisableTips') }}</div>
+                            </div>
+                        </el-form-item>
+
+                        <template v-if="goodsEdit.formData.spec_type == 'single'">
+                            <el-form-item :label="t('price')" prop="price">
+                                <el-input v-model.trim="goodsEdit.formData.price" clearable placeholder="0.00" class="input-width" maxlength="8" :disabled="goodsEdit.isDisabledPrice()">
+                                    <template #append>{{ t('yuan') }}</template>
+                                </el-input>
+                            </el-form-item>
+
+                            <el-form-item :label="t('marketPrice')" prop="market_price">
+                                <el-input v-model.trim="goodsEdit.formData.market_price" clearable placeholder="0.00" class="input-width" maxlength="8">
+                                    <template #append>{{ t('yuan') }}</template>
+                                </el-input>
+                            </el-form-item>
+
+                            <el-form-item :label="t('costPrice')" prop="cost_price">
+                                <el-input v-model.trim="goodsEdit.formData.cost_price" clearable placeholder="0.00" class="input-width" maxlength="8">
+                                    <template #append>{{ t('yuan') }}</template>
+                                </el-input>
+                            </el-form-item>
+                            <el-form-item :label="t('weight')" prop="weight">
+                                <el-input v-model.trim="goodsEdit.formData.weight" clearable placeholder="0.00" class="input-width" maxlength="6">
+                                    <template #append>kg</template>
+                                </el-input>
+                            </el-form-item>
+                            <el-form-item :label="t('volume')" prop="volume">
+                                <el-input v-model.trim="goodsEdit.formData.volume" clearable placeholder="0.00" class="input-width" maxlength="6">
+                                    <template #append>m³</template>
+                                </el-input>
+                            </el-form-item>
+                            <el-form-item :label="t('goodsStock')" prop="stock">
+<!--                                :disabled="goodsEdit.isDisabledPrice()"-->
+                                <el-input v-model.trim="goodsEdit.formData.stock" clearable :placeholder="t('goodsStockPlaceholder')" class="input-width" maxlength="8" @keyup="filterNumber($event)">
+                                    <template #append>{{ goodsEdit.formData.unit ? goodsEdit.formData.unit : t('defaultUnit') }}</template>
+                                </el-input>
+                            </el-form-item>
+                            <el-form-item :label="t('skuNo')">
+                                <el-input v-model.trim="goodsEdit.formData.sku_no" clearable :placeholder="t('skuNoPlaceholder')" class="input-width" maxlength="50" @keyup="goodsEdit.filterSpecial($event)"  />
+                            </el-form-item>
+                        </template>
+                    </el-form>
+
+                    <!-- 多规格 -->
+                    <el-form :model="goodsEdit.goodsSkuData" label-width="120px" ref="skuFormRef" class="page-form">
+                        <div class="el-form-item asterisk-left" v-show="goodsEdit.formData.spec_type == 'multi'">
+                            <div class="el-form-item__label w-[120px]">{{ t('goodsSku') }}</div>
+                            <div class="spec-wrap">
+                                <!--规格项/规格值-->
+                                <div class="spec-edit-list">
+                                    <div class="spec-item" v-for="(item, index) in goodsEdit.goodsSpecFormat" :key="item.id">
+                                        <div class="spec-name-wrap">
+                                            <el-input v-model.trim="item.spec_name" clearable :placeholder="t('specNamePlaceholder')" class="input-width" maxlength="20" />
+                                        </div>
+                                        <div class="spec-value-wrap">
+                                            <ul ref="specValueRef">
+                                                <li :class="'draggable-element' + index" v-for="(specValue, specIndex) in item.values" :key="specValue.id">
+
+                                                    <el-input v-model.trim="specValue.spec_value_name" clearable
+                                                        :placeholder="t('specValueNamePlaceholder')" class="input-width"
+                                                        :suffix-icon="Rank" maxlength="20"
+                                                        @input="goodsEdit.specValueNameInputListener">
+                                                    </el-input>
+                                                    <el-icon class="icon" :size="20" color="#7b7b7b" @click="goodsEdit.deleteSpecValue(index, specIndex)">
+                                                        <CircleCloseFilled />
+                                                    </el-icon>
+                                                </li>
+                                            </ul>
+                                            <span class="text-primary text-[14px] add-spec-value" @click="goodsEdit.addSpecValue(index)">{{ t('addSpecValue') }}</span>
+                                            <div class="box"></div>
+                                        </div>
 
-                  <el-input
-                    v-if="!goodsEdit.isDisabledPrice()"
-                    v-model.trim="goodsEdit.batchOperation.price"
-                    clearable
-                    :placeholder="t('price')"
-                    class="set-input"
-                    maxlength="8"
-                  />
-                  <el-input
-                    v-model.trim="goodsEdit.batchOperation.market_price"
-                    clearable
-                    :placeholder="t('marketPrice')"
-                    class="set-input"
-                    maxlength="8"
-                  />
-                  <el-input
-                    v-model.trim="goodsEdit.batchOperation.cost_price"
-                    clearable
-                    :placeholder="t('costPrice')"
-                    class="set-input"
-                    maxlength="8"
-                  />
-                  <!--                                    v-if="!goodsEdit.isDisabledPrice()"-->
-                  <el-input
-                    v-model.trim="goodsEdit.batchOperation.stock"
-                    clearable
-                    :placeholder="t('stock')"
-                    class="set-input"
-                    maxlength="8"
-                  />
-                  <el-input
-                    v-model.trim="goodsEdit.batchOperation.weight"
-                    clearable
-                    :placeholder="t('skuWeight')"
-                    class="set-input"
-                    maxlength="6"
-                  />
-                  <el-input
-                    v-model.trim="goodsEdit.batchOperation.volume"
-                    clearable
-                    :placeholder="t('skuVolume')"
-                    class="set-input"
-                    maxlength="6"
-                  />
-                  <el-input
-                    v-model.trim="goodsEdit.batchOperation.sku_no"
-                    clearable
-                    maxlength="50"
-                    :placeholder="t('skuNo')"
-                    class="set-input"
-                  />
-                  <el-button type="primary" @click="goodsEdit.saveBatch">{{
-                    t('confirm')
-                  }}</el-button>
-                </div>
+                                        <el-icon class="del-spec" :size="20" color="#7b7b7b" @click="goodsEdit.deleteSpec(index)">
+                                            <CircleCloseFilled />
+                                        </el-icon>
+                                    </div>
 
-                <!--sku列表-->
-                <div
-                  class="sku-table"
-                  v-show="Object.keys(goodsEdit.goodsSkuData).length"
-                >
-                  <div
-                    class="el-table--fit el-table--default el-table"
-                    style="width: 100%"
-                  >
-                    <div class="el-table__inner-wrapper">
-                      <div class="el-table__header-wrapper">
-                        <table
-                          class="el-table__header"
-                          border="0"
-                          cellpadding="0"
-                          cellspacing="0"
-                          style="width: 100%"
-                        >
-                          <thead>
-                            <tr>
-                              <th class="el-table__cell w-[50px]">
-                                <div class="cell">
-                                  <el-checkbox
-                                    v-model="goodsEdit.formData.skuCheckAll"
-                                    :indeterminate="
-                                      goodsEdit.formData.skuIsIndeterminate
-                                    "
-                                    @change="goodsEdit.skuHandleCheckAllChange"
-                                  ></el-checkbox>
                                 </div>
-                              </th>
-                              <template
-                                v-for="(
-                                  item, index
-                                ) in goodsEdit.goodsSpecFormat"
-                                :key="index"
-                              >
-                                <th
-                                  class="el-table__cell"
-                                  v-if="item.spec_name"
-                                >
-                                  <div class="cell">{{ item.spec_name }}</div>
-                                </th>
-                              </template>
 
-                              <th class="el-table__cell">
-                                <div class="cell">{{ t('image') }}</div>
-                              </th>
-                              <th class="el-table__cell">
-                                <div class="cell">{{ t('price') }}</div>
-                              </th>
-                              <th class="el-table__cell">
-                                <div class="cell">{{ t('marketPrice') }}</div>
-                              </th>
-                              <th class="el-table__cell">
-                                <div class="cell">{{ t('costPrice') }}</div>
-                              </th>
-                              <th class="el-table__cell">
-                                <div class="cell">{{ t('stock') }}</div>
-                              </th>
-                              <th class="el-table__cell">
-                                <div class="cell">{{ t('skuWeight') }}</div>
-                              </th>
-                              <th class="el-table__cell">
-                                <div class="cell">{{ t('skuVolume') }}</div>
-                              </th>
-                              <th class="el-table__cell">
-                                <div class="cell">{{ t('skuNo') }}</div>
-                              </th>
-                              <th class="el-table__cell">
-                                <div class="cell">{{ t('defaultSku') }}</div>
-                              </th>
-                            </tr>
-                          </thead>
-                        </table>
-                      </div>
-                      <el-checkbox-group
-                        v-model="goodsEdit.formData.skuCheckedCities"
-                        @change="goodsEdit.handleCheckedCitiesChange"
-                      >
-                        <div class="el-table__body-wrapper text-[14px]">
-                          <div class="el-scrollbar">
-                            <div
-                              class="el-scrollbar__wrap el-scrollbar__wrap--hidden-default"
-                            >
-                              <div
-                                class="el-scrollbar__view"
-                                style="
-                                  display: inline-block;
-                                  vertical-align: middle;
-                                "
-                              >
-                                <table
-                                  class="el-table__body"
-                                  cellspacing="0"
-                                  cellpadding="0"
-                                  border="0"
-                                  style="table-layout: fixed; width: 100%"
-                                >
-                                  <tbody tabindex="-1">
-                                    <tr
-                                      class="el-table__row"
-                                      v-for="(
-                                        item, key, index
-                                      ) in goodsEdit.goodsSkuData"
-                                      :key="key"
-                                    >
-                                      <td class="el-table__cell w-[50px]">
-                                        <div class="cell">
-                                          <el-checkbox
-                                            :label="key"
-                                            :key="key"
-                                            >{{ '' }}</el-checkbox
-                                          >
-                                        </div>
-                                      </td>
-                                      <template
-                                        v-for="(
-                                          c, cIndex
-                                        ) in goodsEdit.specData"
-                                        :key="cIndex"
-                                      >
-                                        <td
-                                          class="el-table__cell"
-                                          :rowspan="c.rowSpan"
-                                          v-if="c.index == index"
-                                        >
-                                          <div class="cell">
-                                            {{ c.spec_value_name }}
-                                          </div>
-                                        </td>
-                                      </template>
+                                <div class="add-spec">
+                                    <el-button type="primary" @click="goodsEdit.addSpec">{{ t('addSpec') }}</el-button>
+                                </div>
 
-                                      <td class="el-table__cell">
-                                        <div class="cell">
-                                          <upload-image
-                                            v-model="item.sku_image"
-                                            :limit="1"
-                                            width="50px"
-                                            height="50px"
-                                          />
-                                        </div>
-                                      </td>
+                                <!-- 批量设置 -->
+                                <div class="batch-operation-sku" v-show="Object.keys(goodsEdit.goodsSkuData).length">
+                                    <label>{{ t('batchOperationSku') }}</label>
+
+<!--                                    <el-select v-model="goodsEdit.batchOperation.spec" class="set-spec-select" :placeholder="t('all')">-->
+<!--                                        <el-option :label="t('all')" value="" />-->
+<!--                                        <template v-for="(item, key) in goodsEdit.goodsSkuData" :key="key">-->
+<!--                                            <el-option v-if="item.spec_name" :label="item.spec_name" :value="key" />-->
+<!--                                        </template>-->
+<!--                                    </el-select>-->
+
+                                    <el-input v-if="!goodsEdit.isDisabledPrice()" v-model.trim="goodsEdit.batchOperation.price" clearable :placeholder="t('price')" class="set-input" maxlength="8" />
+                                    <el-input v-model.trim="goodsEdit.batchOperation.market_price" clearable :placeholder="t('marketPrice')" class="set-input" maxlength="8" />
+                                    <el-input v-model.trim="goodsEdit.batchOperation.cost_price" clearable :placeholder="t('costPrice')" class="set-input" maxlength="8" />
+<!--                                    v-if="!goodsEdit.isDisabledPrice()"-->
+                                    <el-input v-model.trim="goodsEdit.batchOperation.stock" clearable :placeholder="t('stock')" class="set-input" maxlength="8"/>
+                                    <el-input v-model.trim="goodsEdit.batchOperation.weight" clearable :placeholder="t('skuWeight')" class="set-input" maxlength="6" />
+                                    <el-input v-model.trim="goodsEdit.batchOperation.volume" clearable :placeholder="t('skuVolume')" class="set-input" maxlength="6" />
+                                    <el-input v-model.trim="goodsEdit.batchOperation.sku_no" clearable maxlength="50" :placeholder="t('skuNo')" class="set-input" />
+                                    <el-button type="primary" @click="goodsEdit.saveBatch">{{ t('confirm') }}</el-button>
+                                </div>
 
-                                      <td class="el-table__cell">
-                                        <div class="cell">
-                                          <el-form-item
-                                            :prop="key + '.price'"
-                                            :rules="goodsEdit.skuPriceRules()"
-                                            class="sku-form-item-wrap"
-                                          >
-                                            <el-input
-                                              v-model.trim="item.price"
-                                              clearable
-                                              placeholder="0.00"
-                                              maxlength="8"
-                                              :disabled="
-                                                goodsEdit.isDisabledPrice()
-                                              "
-                                            />
-                                          </el-form-item>
-                                        </div>
-                                      </td>
-                                      <td class="el-table__cell">
-                                        <div class="cell">
-                                          <el-form-item
-                                            :prop="key + '.market_price'"
-                                            :rules="
-                                              goodsEdit.skuMarketPriceRules()
-                                            "
-                                            class="sku-form-item-wrap"
-                                          >
-                                            <el-input
-                                              v-model.trim="item.market_price"
-                                              clearable
-                                              placeholder="0.00"
-                                              maxlength="8"
-                                            />
-                                          </el-form-item>
-                                        </div>
-                                      </td>
-                                      <td class="el-table__cell">
-                                        <div class="cell">
-                                          <el-form-item
-                                            :prop="key + '.cost_price'"
-                                            :rules="
-                                              goodsEdit.skuCostPriceRules()
-                                            "
-                                            class="sku-form-item-wrap"
-                                          >
-                                            <el-input
-                                              v-model.trim="item.cost_price"
-                                              clearable
-                                              placeholder="0.00"
-                                              maxlength="8"
-                                            />
-                                          </el-form-item>
-                                        </div>
-                                      </td>
-                                      <td class="el-table__cell">
-                                        <div class="cell">
-                                          <el-form-item
-                                            :prop="key + '.stock'"
-                                            :rules="goodsEdit.skuStockRules()"
-                                            class="sku-form-item-wrap"
-                                          >
-                                            <!--                                                                                            :disabled="goodsEdit.isDisabledPrice()"-->
-                                            <el-input
-                                              v-model.trim="item.stock"
-                                              clearable
-                                              placeholder="0"
-                                              @input="goodsEdit.specStockSum"
-                                              maxlength="8"
-                                            />
-                                          </el-form-item>
-                                        </div>
-                                      </td>
-                                      <td class="el-table__cell">
-                                        <div class="cell">
-                                          <el-form-item
-                                            :prop="key + '.weight'"
-                                            :rules="skuWeightRules()"
-                                            class="sku-form-item-wrap"
-                                          >
-                                            <el-input
-                                              v-model.trim="item.weight"
-                                              clearable
-                                              placeholder="0.00"
-                                              maxlength="6"
-                                            />
-                                          </el-form-item>
-                                        </div>
-                                      </td>
-                                      <td class="el-table__cell">
-                                        <div class="cell">
-                                          <el-form-item
-                                            :prop="key + '.volume'"
-                                            :rules="skuVolumeRules()"
-                                            class="sku-form-item-wrap"
-                                          >
-                                            <el-input
-                                              v-model.trim="item.volume"
-                                              clearable
-                                              placeholder="0.00"
-                                              maxlength="6"
-                                            />
-                                          </el-form-item>
-                                        </div>
-                                      </td>
-                                      <td class="el-table__cell">
-                                        <div class="cell">
-                                          <el-input
-                                            v-model.trim="item.sku_no"
-                                            clearable
-                                            maxlength="50"
-                                          />
-                                        </div>
-                                      </td>
-                                      <td class="el-table__cell">
-                                        <div class="cell">
-                                          <el-switch
-                                            v-model="item.is_default"
-                                            :active-value="1"
-                                            :inactive-value="0"
-                                            @change="
-                                              goodsEdit.specValueIsDefaultChangeListener(
-                                                $event,
-                                                key
-                                              )
-                                            "
-                                          />
+                                <!--sku列表-->
+                                <div class="sku-table" v-show="Object.keys(goodsEdit.goodsSkuData).length">
+
+                                    <div class="el-table--fit el-table--default el-table" style="width: 100%;">
+
+                                        <div class="el-table__inner-wrapper">
+                                            <div class="el-table__header-wrapper">
+                                                <table class="el-table__header" border="0" cellpadding="0" cellspacing="0" style="width: 100%;">
+                                                    <thead>
+                                                        <tr>
+                                                            <th class="el-table__cell w-[50px]">
+                                                                <div class="cell">
+                                                                    <el-checkbox
+                                                                        v-model="goodsEdit.formData.skuCheckAll"
+                                                                        :indeterminate="goodsEdit.formData.skuIsIndeterminate"
+                                                                        @change="goodsEdit.skuHandleCheckAllChange"
+                                                                    ></el-checkbox>
+                                                                </div>
+                                                            </th>
+                                                            <template v-for="(item, index) in goodsEdit.goodsSpecFormat" :key="index">
+                                                                <th class="el-table__cell" v-if="item.spec_name">
+                                                                    <div class="cell">{{ item.spec_name }}</div>
+                                                                </th>
+                                                            </template>
+
+                                                            <th class="el-table__cell">
+                                                                <div class="cell">{{ t('image') }}</div>
+                                                            </th>
+                                                            <th class="el-table__cell">
+                                                                <div class="cell">{{ t('price') }}</div>
+                                                            </th>
+                                                            <th class="el-table__cell">
+                                                                <div class="cell">{{ t('marketPrice') }}</div>
+                                                            </th>
+                                                            <th class="el-table__cell">
+                                                                <div class="cell">{{ t('costPrice') }}</div>
+                                                            </th>
+                                                            <th class="el-table__cell">
+                                                                <div class="cell">{{ t('stock') }}</div>
+                                                            </th>
+                                                            <th class="el-table__cell">
+                                                                <div class="cell">{{ t('skuWeight') }}</div>
+                                                            </th>
+                                                            <th class="el-table__cell">
+                                                                <div class="cell">{{ t('skuVolume') }}</div>
+                                                            </th>
+                                                            <th class="el-table__cell">
+                                                                <div class="cell">{{ t('skuNo') }}</div>
+                                                            </th>
+                                                            <th class="el-table__cell">
+                                                                <div class="cell">{{ t('defaultSku') }}</div>
+                                                            </th>
+                                                        </tr>
+                                                    </thead>
+                                                </table>
+                                            </div>
+                                            <el-checkbox-group v-model="goodsEdit.formData.skuCheckedCities" @change="goodsEdit.handleCheckedCitiesChange">
+                                                <div class="el-table__body-wrapper text-[14px]">
+                                                    <div class="el-scrollbar">
+                                                        <div class="el-scrollbar__wrap el-scrollbar__wrap--hidden-default">
+                                                            <div class="el-scrollbar__view" style="display: inline-block; vertical-align: middle;">
+
+                                                                <table class="el-table__body" cellspacing="0" cellpadding="0" border="0" style="table-layout: fixed; width: 100%;">
+
+                                                                        <tbody tabindex="-1">
+                                                                            <tr class="el-table__row" v-for="(item, key, index) in goodsEdit.goodsSkuData" :key="key">
+                                                                                <td class="el-table__cell w-[50px]">
+                                                                                    <div class="cell">
+                                                                                        <el-checkbox :label="key" :key="key">{{ '' }}</el-checkbox>
+                                                                                    </div>
+                                                                                </td>
+                                                                                <template v-for="(c, cIndex) in goodsEdit.specData" :key="cIndex">
+                                                                                    <td class="el-table__cell" :rowspan="c.rowSpan" v-if="c.index == index">
+                                                                                        <div class="cell">{{ c.spec_value_name }}</div>
+                                                                                    </td>
+                                                                                </template>
+
+                                                                                <td class="el-table__cell">
+                                                                                    <div class="cell">
+                                                                                        <upload-image v-model="item.sku_image" :limit="1" width="50px" height="50px" />
+                                                                                    </div>
+                                                                                </td>
+
+                                                                                <td class="el-table__cell">
+                                                                                    <div class="cell">
+                                                                                        <el-form-item :prop="key + '.price'" :rules="goodsEdit.skuPriceRules()" class="sku-form-item-wrap">
+                                                                                            <el-input v-model.trim="item.price" clearable placeholder="0.00" maxlength="8" :disabled="goodsEdit.isDisabledPrice()" />
+                                                                                        </el-form-item>
+                                                                                    </div>
+                                                                                </td>
+                                                                                <td class="el-table__cell">
+                                                                                    <div class="cell">
+                                                                                        <el-form-item :prop="key + '.market_price'" :rules="goodsEdit.skuMarketPriceRules()" class="sku-form-item-wrap">
+                                                                                            <el-input v-model.trim="item.market_price" clearable placeholder="0.00" maxlength="8" />
+                                                                                        </el-form-item>
+                                                                                    </div>
+                                                                                </td>
+                                                                                <td class="el-table__cell">
+                                                                                    <div class="cell">
+                                                                                        <el-form-item :prop="key + '.cost_price'" :rules="goodsEdit.skuCostPriceRules()" class="sku-form-item-wrap">
+                                                                                            <el-input v-model.trim="item.cost_price" clearable placeholder="0.00" maxlength="8" />
+                                                                                        </el-form-item>
+                                                                                    </div>
+                                                                                </td>
+                                                                                <td class="el-table__cell">
+                                                                                    <div class="cell">
+                                                                                        <el-form-item :prop="key + '.stock'" :rules="goodsEdit.skuStockRules()" class="sku-form-item-wrap" >
+<!--                                                                                            :disabled="goodsEdit.isDisabledPrice()"-->
+                                                                                            <el-input v-model.trim="item.stock" clearable placeholder="0" @input="goodsEdit.specStockSum" maxlength="8"/>
+                                                                                        </el-form-item>
+                                                                                    </div>
+                                                                                </td>
+                                                                                <td class="el-table__cell">
+                                                                                    <div class="cell">
+                                                                                        <el-form-item :prop="key + '.weight'" :rules="skuWeightRules()" class="sku-form-item-wrap">
+                                                                                            <el-input v-model.trim="item.weight" clearable placeholder="0.00" maxlength="6" />
+                                                                                        </el-form-item>
+                                                                                    </div>
+                                                                                </td>
+                                                                                <td class="el-table__cell">
+                                                                                    <div class="cell">
+                                                                                        <el-form-item :prop="key + '.volume'" :rules="skuVolumeRules()" class="sku-form-item-wrap">
+                                                                                            <el-input v-model.trim="item.volume" clearable placeholder="0.00" maxlength="6" />
+                                                                                        </el-form-item>
+                                                                                    </div>
+                                                                                </td>
+                                                                                <td class="el-table__cell">
+                                                                                    <div class="cell">
+                                                                                        <el-input v-model.trim="item.sku_no" clearable maxlength="50" />
+                                                                                    </div>
+                                                                                </td>
+                                                                                <td class="el-table__cell">
+                                                                                    <div class="cell">
+                                                                                        <el-switch v-model="item.is_default" :active-value="1" :inactive-value="0" @change="goodsEdit.specValueIsDefaultChangeListener($event, key)" />
+                                                                                    </div>
+                                                                                </td>
+                                                                            </tr>
+                                                                        </tbody>
+
+                                                                </table>
+
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </el-checkbox-group>
                                         </div>
-                                      </td>
-                                    </tr>
-                                  </tbody>
-                                </table>
-                              </div>
+                                    </div>
+                                </div>
                             </div>
-                          </div>
                         </div>
-                      </el-checkbox-group>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-            <el-form-item :label="t('memberDiscount')">
-              <div>
-                <el-radio-group v-model="goodsEdit.formData.member_discount">
-                  <el-radio label="">{{ t('nonparticipation') }}</el-radio>
-                  <el-radio label="discount">{{ t('discount') }}</el-radio>
-                  <el-radio label="fixed_price">{{ t('fixedPrice') }}</el-radio>
-                </el-radio-group>
-                <div
-                  class="text-[12px] text-[#999] leading-[20px]"
-                  v-if="goodsEdit.formData.member_discount == 'discount'"
-                >
-                  {{ t('discountHint') }}
-                </div>
-                <div
-                  class="text-[12px] text-[#999] leading-[20px]"
-                  v-if="goodsEdit.formData.member_discount == 'fixed_price'"
-                >
-                  {{ t('fixedPriceHint') }}
-                </div>
-              </div>
-            </el-form-item>
-          </el-form>
-
-          <el-form
-            :model="goodsEdit.formData"
-            label-width="120px"
-            ref="priceStockCommonFormRef"
-            :rules="goodsEdit.formRules"
-            class="page-form"
-          >
-            <el-form-item :label="t('isLimit')">
-              <div>
-                <el-switch
-                  v-model="goodsEdit.formData.is_limit"
-                  :active-value="1"
-                  :inactive-value="0"
-                />
-                <div class="mt-[10px] text-[12px] text-[#999] leading-[20px]">
-                  {{ t('isLimitTips') }}
-                </div>
-              </div>
-            </el-form-item>
-            <el-form-item
-              :label="t('limitType')"
-              prop="limit_type"
-              v-if="goodsEdit.formData.is_limit == '1'"
-            >
-              <div>
-                <el-radio-group v-model="goodsEdit.formData.limit_type">
-                  <el-radio :label="1">{{ t('singleTime') }}</el-radio>
-                  <el-radio :label="2">{{ t('singlePerson') }}</el-radio>
-                </el-radio-group>
-                <div class="mt-[10px] text-[12px] text-[#999] leading-[20px]">
-                  {{ t('limitTypeTips') }}
-                </div>
-              </div>
-            </el-form-item>
-            <el-form-item
-              :label="t('maxBuy')"
-              prop="max_buy"
-              v-if="goodsEdit.formData.is_limit == '1'"
-            >
-              <div>
-                <el-input
-                  v-model.trim="goodsEdit.formData.max_buy"
-                  clearable
-                  :placeholder="t('maxBuyPlaceholder')"
-                  class="input-width"
-                  maxlength="8"
-                  @keyup="filterNumber($event)"
-                >
-                  <template #append>{{
-                    goodsEdit.formData.unit
-                      ? goodsEdit.formData.unit
-                      : t('defaultUnit')
-                  }}</template>
-                </el-input>
-                <div class="mt-[10px] text-[12px] text-[#999] leading-[20px]">
-                  {{ t('maxBuyWarnTips') }}
-                </div>
-              </div>
-            </el-form-item>
-            <el-form-item :label="t('minBuy')" prop="min_buy">
-              <div>
-                <el-input
-                  v-model.trim="goodsEdit.formData.min_buy"
-                  clearable
-                  class="input-width"
-                  maxlength="8"
-                  @keyup="filterNumber($event)"
-                >
-                  <template #append>{{
-                    goodsEdit.formData.unit
-                      ? goodsEdit.formData.unit
-                      : t('defaultUnit')
-                  }}</template>
-                </el-input>
-                <div class="mt-[10px] text-[12px] text-[#999] leading-[20px]">
-                  {{ t('minBuyTips') }}
-                </div>
-              </div>
-            </el-form-item>
-          </el-form>
-        </el-tab-pane>
-        <el-tab-pane :label="t('deliveryTab')" name="delivery">
-          <el-form
-            :model="goodsEdit.formData"
-            label-width="120px"
-            ref="deliveryFormRef"
-            :rules="goodsEdit.formRules"
-            class="page-form"
-          >
-            <el-form-item :label="t('deliveryType')" prop="delivery_type">
-              <div>
-                <el-checkbox-group v-model="goodsEdit.formData.delivery_type">
-                  <!--                                    v-show="item.status == '1'"-->
-                  <el-checkbox
-                    v-for="(item, index) in deliveryTypeCheckBox"
-                    :key="index"
-                    :label="item.key"
-                    >{{ item.name }}</el-checkbox
-                  >
-                </el-checkbox-group>
-                <div
-                  v-if="deliveryTypeFlag"
-                  class="text-[12px] text-[#999] leading-[20px]"
-                >
-                  请先在配置设置中设置配送方式
-                </div>
-              </div>
-            </el-form-item>
+                        <el-form-item :label="t('memberDiscount')">
+                            <div>
+                                <el-radio-group v-model="goodsEdit.formData.member_discount">
+                                    <el-radio label="">{{ t('nonparticipation') }}</el-radio>
+                                    <el-radio label="discount">{{ t('discount') }}</el-radio>
+                                    <el-radio label="fixed_price">{{ t('fixedPrice') }}</el-radio>
+                                </el-radio-group>
+                                <div class="text-[12px] text-[#999] leading-[20px]" v-if="goodsEdit.formData.member_discount == 'discount'">{{t('discountHint')}}</div>
+                                <div class="text-[12px] text-[#999] leading-[20px]" v-if="goodsEdit.formData.member_discount == 'fixed_price'">{{t('fixedPriceHint')}}</div>
+                            </div>
+                        </el-form-item>
+                    </el-form>
+
+                    <el-form :model="goodsEdit.formData" label-width="120px" ref="priceStockCommonFormRef" :rules="goodsEdit.formRules" class="page-form">
+                        <el-form-item :label="t('isLimit')">
+                            <div>
+                                <el-switch v-model="goodsEdit.formData.is_limit" :active-value="1" :inactive-value="0" />
+                                <div class="mt-[10px] text-[12px] text-[#999] leading-[20px]">{{ t('isLimitTips') }}</div>
+                            </div>
+                        </el-form-item>
+                        <el-form-item :label="t('limitType')" prop="limit_type" v-if="goodsEdit.formData.is_limit == '1'">
+                            <div>
+                                <el-radio-group v-model="goodsEdit.formData.limit_type">
+                                    <el-radio :label="1">{{ t('singleTime') }}</el-radio>
+                                    <el-radio :label="2">{{ t('singlePerson') }}</el-radio>
+                                </el-radio-group>
+                                <div class="mt-[10px] text-[12px] text-[#999] leading-[20px]">{{ t('limitTypeTips') }}</div>
+                            </div>
+                        </el-form-item>
+                        <el-form-item :label="t('maxBuy')" prop="max_buy" v-if="goodsEdit.formData.is_limit == '1'">
+                            <div>
+                                <el-input v-model.trim="goodsEdit.formData.max_buy" clearable :placeholder="t('maxBuyPlaceholder')" class="input-width" maxlength="8" @keyup="filterNumber($event)">
+                                    <template #append>{{ goodsEdit.formData.unit ? goodsEdit.formData.unit : t('defaultUnit') }}</template>
+                                </el-input>
+                                <div class="mt-[10px] text-[12px] text-[#999] leading-[20px]">{{ t('maxBuyWarnTips') }}</div>
+                            </div>
+                        </el-form-item>
+                        <el-form-item :label="t('minBuy')" prop="min_buy">
+                            <div>
+                                <el-input v-model.trim="goodsEdit.formData.min_buy" clearable class="input-width" maxlength="8" @keyup="filterNumber($event)">
+                                    <template #append>{{ goodsEdit.formData.unit ? goodsEdit.formData.unit : t('defaultUnit') }}</template>
+                                </el-input>
+                                <div class="mt-[10px] text-[12px] text-[#999] leading-[20px]">{{ t('minBuyTips') }}</div>
+                            </div>
+                        </el-form-item>
+                    </el-form>
+                </el-tab-pane>
+                <el-tab-pane :label="t('deliveryTab')" name="delivery">
+
+                    <el-form :model="goodsEdit.formData" label-width="120px" ref="deliveryFormRef" :rules="goodsEdit.formRules" class="page-form">
+                        <el-form-item :label="t('deliveryType')" prop="delivery_type">
+                            <div>
+                                <el-checkbox-group v-model="goodsEdit.formData.delivery_type">
+<!--                                    v-show="item.status == '1'"-->
+                                    <el-checkbox v-for="(item, index) in deliveryTypeCheckBox" :key="index" :label="item.key">{{ item.name }}</el-checkbox>
+                                </el-checkbox-group>
+                                <div v-if="deliveryTypeFlag" class="text-[12px] text-[#999] leading-[20px]">请先在配置设置中设置配送方式</div>
+                            </div>
+                        </el-form-item>
 
-            <el-form-item
-              :label="t('isFreeShipping')"
-              v-show="goodsEdit.formData.delivery_type.indexOf('express') != -1"
-            >
-              <el-switch
-                v-model="goodsEdit.formData.is_free_shipping"
-                :active-value="1"
-                :inactive-value="0"
-              />
-            </el-form-item>
+                        <el-form-item :label="t('isFreeShipping')" v-show="goodsEdit.formData.delivery_type.indexOf('express') != -1">
+                            <el-switch v-model="goodsEdit.formData.is_free_shipping" :active-value="1" :inactive-value="0" />
+                        </el-form-item>
 
-            <el-form-item
-              :label="t('feeType')"
-              prop="fee_type"
-              v-show="
-                goodsEdit.formData.delivery_type.indexOf('express') != -1 &&
-                goodsEdit.formData.is_free_shipping == 0
-              "
-            >
-              <el-radio-group v-model="goodsEdit.formData.fee_type">
-                <el-radio label="template">{{ t('selectTemplate') }}</el-radio>
-                <el-radio label="fixed">{{ t('fixedShipping') }}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-            <el-form-item
-              :label="t('deliveryMoney')"
-              prop="delivery_money"
-              v-show="
-                goodsEdit.formData.delivery_type.indexOf('express') != -1 &&
-                goodsEdit.formData.is_free_shipping == 0 &&
-                goodsEdit.formData.fee_type == 'fixed'
-              "
-            >
-              <el-input
-                v-model.trim="goodsEdit.formData.delivery_money"
-                clearable
-                placeholder="0.00"
-                class="input-width"
-                maxlength="8"
-              >
-                <template #append>{{ t('yuan') }}</template>
-              </el-input>
-            </el-form-item>
-            <el-form-item
-              :label="t('deliveryTemplateId')"
-              prop="delivery_template_id"
-              v-show="
-                goodsEdit.formData.delivery_type.indexOf('express') != -1 &&
-                goodsEdit.formData.is_free_shipping == 0 &&
-                goodsEdit.formData.fee_type == 'template'
-              "
-            >
-              <el-select
-                v-model="goodsEdit.formData.delivery_template_id"
-                :placeholder="t('deliveryTemplateIdPlaceholder')"
-                filterable
-                autocomplete="off"
-                clearable
-              >
-                <el-option
-                  v-for="item in deliveryTemplateOptions"
-                  :key="item.template_id"
-                  :label="item.template_name"
-                  :value="item.template_id"
-                />
-              </el-select>
-              <div class="ml-[10px]">
-                <span
-                  class="cursor-pointer text-primary mr-[10px]"
-                  @click="refreshDeliveryTemplate"
-                  >{{ t('refresh') }}</span
-                >
-                <span
-                  class="cursor-pointer text-primary"
-                  @click="toDeliveryTemplateEvent"
-                  >{{ t('addDeliveryTemplateId') }}</span
-                >
-              </div>
-            </el-form-item>
-          </el-form>
-        </el-tab-pane>
-        <el-tab-pane :label="t('goodsArguments')" name="goods_arguments">
-          <el-form
-            :model="goodsEdit.formData"
-            label-width="120px"
-            ref="goodsArgumentsFormRef"
-            :rules="goodsEdit.formRules"
-            class="page-form"
-          >
-            <el-form-item :label="t('goodsArgumentsTemp')">
-              <div>
-                <el-select
-                  v-model="goodsEdit.formData.attr_id"
-                  :placeholder="t('goodsArgumentsTempPlaceholder')"
-                  clearable
-                  @change="goodsEdit.attrChange"
-                  @clear="goodsEdit.attrChange(-1)"
-                >
-                  <el-option
-                    v-for="item in goodsEdit.attrOptions"
-                    :key="item.attr_id"
-                    :label="item.attr_name"
-                    :value="item.attr_id"
-                  />
-                </el-select>
-                <div class="mt-[10px] text-[12px] text-[#999] leading-[20px]">
-                  {{ t('goodsArgumentsTempHint') }}
-                </div>
-                <table class="attr-table mt-[10px]">
-                  <colgroup>
-                    <col width="30%" />
-                    <col width="40%" />
-                    <col width="20%" />
-                    <col width="10%" />
-                  </colgroup>
-                  <thead class="bg-[#f7f7f7]">
-                    <tr>
-                      <th>{{ t('argumentsName') }}</th>
-                      <th>{{ t('argumentsValue') }}</th>
-                      <th class="prompt-block">
-                        <div class="flex items-center">
-                          <span>{{ t('sort') }}</span>
-                          <el-tooltip
-                            class="box-item"
-                            effect="dark"
-                            :content="t('argumentsSortHint')"
-                            placement="right"
-                          >
-                            <span
-                              class="iconfont iconwenhao cursor-pointer ml-[3px] mt-[3px] !text-[14px]"
-                            ></span>
-                          </el-tooltip>
-                        </div>
-                      </th>
-                      <th>{{ t('operation') }}</th>
-                    </tr>
-                  </thead>
-                  <tbody class="attr-new">
-                    <template v-if="goodsEdit.attrTableData.length">
-                      <tr
-                        class="goods-attr-tr goods-new-attr-tr"
-                        v-for="(item, index) in goodsEdit.attrTableData"
-                        :key="index"
-                      >
-                        <td v-if="item.attr_value_id > 0">
-                          {{ item.attr_value_name }}
-                        </td>
-                        <td v-else>
-                          <el-input
-                            v-model.trim="item.attr_value_name"
-                            maxlength="20"
-                            show-word-limit
-                            clearable
-                          />
-                        </td>
-                        <td>
-                          <el-input
-                            v-if="item.type == 'text'"
-                            maxlength="20"
-                            show-word-limit
-                            v-model.trim="item.select_child_val"
-                            clearable
-                          />
-                          <div v-else-if="item.type == 'radio'">
-                            <el-radio-group
-                              v-model="item.select_child_name"
-                              @change="goodsEdit.attrRadioChange(index, $event)"
-                            >
-                              <el-radio
-                                v-for="(childItem, childIndex) in item.child"
-                                :key="childIndex"
-                                :label="childItem.id"
-                                >{{ childItem.name }}</el-radio
-                              >
+                        <el-form-item :label="t('feeType')" prop="fee_type" v-show="goodsEdit.formData.delivery_type.indexOf('express') != -1 && goodsEdit.formData.is_free_shipping == 0">
+                            <el-radio-group v-model="goodsEdit.formData.fee_type">
+                                <el-radio label="template">{{ t('selectTemplate') }}</el-radio>
+                                <el-radio label="fixed">{{ t('fixedShipping') }}</el-radio>
                             </el-radio-group>
-                          </div>
-                          <div v-else-if="item.type == 'checkbox'">
-                            <el-checkbox-group
-                              v-model="item.select_child_name"
-                              @change="
-                                goodsEdit.attrCheckboxChange(index, $event)
-                              "
-                            >
-                              <el-checkbox
-                                v-for="(childItem, childIndex) in item.child"
-                                :key="childIndex"
-                                :label="childItem.id"
-                                >{{ childItem.name }}</el-checkbox
-                              >
-                            </el-checkbox-group>
-                          </div>
-                        </td>
-                        <td>
-                          <el-input
-                            v-model.trim="item.sort"
-                            maxlength="6"
-                            show-word-limit
-                            clearable
-                            @keyup="filterNumber($event)"
-                          />
-                        </td>
-                        <td>
-                          <span
-                            class="cursor-pointer text-[var(--el-color-primary)]"
-                            @click="goodsEdit.delAttr(index)"
-                            >{{ t('delAttr') }}</span
-                          >
-                        </td>
-                      </tr>
-                    </template>
-                    <tr v-else>
-                      <td colspan="4" class="text-center">{{ t('noData') }}</td>
-                    </tr>
-                  </tbody>
-                </table>
-                <el-button class="mt-[15px]" @click="goodsEdit.addAttr">{{
-                  t('addGoodsArguments')
-                }}</el-button>
-              </div>
-            </el-form-item>
-          </el-form>
-        </el-tab-pane>
-        <el-tab-pane :label="t('goodsDesc')" name="detail">
-          <el-form
-            :model="goodsEdit.formData"
-            label-width="120px"
-            ref="detailFormRef"
-            :rules="goodsEdit.formRules"
-            class="page-form"
-          >
-            <el-form-item :label="t('goodsDesc')" prop="goods_desc">
-              <editor
-                v-model="goodsEdit.formData.goods_desc"
-                :height="600"
-                class="editor-width"
-                @handleBlur="goodsEdit.handleBlur"
-              />
-            </el-form-item>
-          </el-form>
-        </el-tab-pane>
-      </el-tabs>
-    </el-card>
-
-    <div class="fixed-footer-wrap">
-      <div class="fixed-footer">
-        <el-button type="primary" @click="save()">{{ t('save') }}</el-button>
-        <el-button @click="goodsEdit.back()">{{ t('back') }}</el-button>
-      </div>
+                        </el-form-item>
+                        <el-form-item :label="t('deliveryMoney')" prop="delivery_money" v-show="goodsEdit.formData.delivery_type.indexOf('express') != -1 && goodsEdit.formData.is_free_shipping == 0 && goodsEdit.formData.fee_type == 'fixed'">
+                            <el-input v-model.trim="goodsEdit.formData.delivery_money" clearable placeholder="0.00" class="input-width" maxlength="8">
+                                <template #append>{{ t('yuan') }}</template>
+                            </el-input>
+                        </el-form-item>
+                        <el-form-item :label="t('deliveryTemplateId')" prop="delivery_template_id" v-show="goodsEdit.formData.delivery_type.indexOf('express') != -1 && goodsEdit.formData.is_free_shipping == 0 && goodsEdit.formData.fee_type == 'template'">
+                            <el-select v-model="goodsEdit.formData.delivery_template_id" :placeholder="t('deliveryTemplateIdPlaceholder')" filterable autocomplete="off" clearable>
+                                <el-option v-for="item in deliveryTemplateOptions" :key="item.template_id" :label="item.template_name" :value="item.template_id" />
+                            </el-select>
+                            <div class="ml-[10px]">
+                                <span class="cursor-pointer text-primary mr-[10px]" @click="refreshDeliveryTemplate">{{ t('refresh') }}</span>
+                                <span class="cursor-pointer text-primary" @click="toDeliveryTemplateEvent">{{ t('addDeliveryTemplateId') }}</span>
+                            </div>
+                        </el-form-item>
+                    </el-form>
+
+                </el-tab-pane>
+                 <el-tab-pane :label="t('goodsArguments')" name="goods_arguments">
+                    <el-form :model="goodsEdit.formData" label-width="120px" ref="goodsArgumentsFormRef" :rules="goodsEdit.formRules" class="page-form">
+
+                        <el-form-item :label="t('goodsArgumentsTemp')">
+                            <div>
+                                <el-select v-model="goodsEdit.formData.attr_id" :placeholder="t('goodsArgumentsTempPlaceholder')" clearable @change="goodsEdit.attrChange" @clear="goodsEdit.attrChange(-1)">
+                                    <el-option v-for="item in goodsEdit.attrOptions" :key="item.attr_id" :label="item.attr_name" :value="item.attr_id" />
+                                </el-select>
+                                <div class="mt-[10px] text-[12px] text-[#999] leading-[20px]">{{t('goodsArgumentsTempHint')}}</div>
+                                <table class="attr-table mt-[10px]">
+                                    <colgroup>
+                                        <col width="30%">
+                                        <col width="40%">
+                                        <col width="20%">
+                                        <col width="10%">
+                                    </colgroup>
+                                    <thead class="bg-[#f7f7f7]">
+                                        <tr>
+                                            <th>{{t('argumentsName')}}</th>
+                                            <th>{{t('argumentsValue')}}</th>
+                                            <th class="prompt-block">
+                                                <div class="flex items-center">
+                                                    <span>{{t('sort')}}</span>
+                                                    <el-tooltip class="box-item" effect="dark" :content="t('argumentsSortHint')" placement="right">
+                                                        <span class="iconfont iconwenhao cursor-pointer ml-[3px] mt-[3px] !text-[14px]"></span>
+                                                    </el-tooltip>
+                                                </div>
+                                            </th>
+                                            <th>{{t('operation')}}</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody class="attr-new">
+                                        <template v-if="goodsEdit.attrTableData.length">
+                                            <tr class="goods-attr-tr goods-new-attr-tr" v-for="(item,index) in goodsEdit.attrTableData" :key="index">
+                                                <td v-if="item.attr_value_id > 0">{{item.attr_value_name}}</td>
+                                                <td v-else>
+                                                    <el-input v-model.trim="item.attr_value_name" maxlength="20" show-word-limit clearable/>
+                                                </td>
+                                                <td>
+                                                    <el-input v-if="item.type == 'text'" maxlength="20" show-word-limit v-model.trim="item.select_child_val" clearable/>
+                                                    <div v-else-if="item.type == 'radio'">
+                                                        <el-radio-group v-model="item.select_child_name" @change="goodsEdit.attrRadioChange(index,$event)">
+                                                            <el-radio v-for="(childItem,childIndex) in item.child" :key="childIndex" :label="childItem.id">{{ childItem.name }}</el-radio>
+                                                        </el-radio-group>
+                                                    </div>
+                                                    <div v-else-if="item.type == 'checkbox'">
+                                                        <el-checkbox-group v-model="item.select_child_name" @change="goodsEdit.attrCheckboxChange(index,$event)">
+                                                            <el-checkbox v-for="(childItem,childIndex) in item.child" :key="childIndex" :label="childItem.id">{{ childItem.name }}</el-checkbox>
+                                                        </el-checkbox-group>
+                                                    </div>
+                                                </td>
+                                                <td>
+                                                    <el-input v-model.trim="item.sort" maxlength="6" show-word-limit clearable @keyup="filterNumber($event)"/>
+                                                </td>
+                                                <td>
+                                                    <span class="cursor-pointer text-[var(--el-color-primary)]" @click="goodsEdit.delAttr(index)">{{t('delAttr')}}</span>
+                                                </td>
+                                            </tr>
+                                        </template>
+                                        <tr v-else>
+                                            <td colspan="4" class="text-center">{{t('noData')}}</td>
+                                        </tr>
+                                    </tbody>
+                                </table>
+                                <el-button class="mt-[15px]" @click="goodsEdit.addAttr">{{t('addGoodsArguments')}}</el-button>
+                            </div>
+                        </el-form-item>
+
+                    </el-form>
+                </el-tab-pane>
+                <el-tab-pane :label="t('goodsDesc')" name="detail">
+                    <el-form :model="goodsEdit.formData" label-width="120px" ref="detailFormRef" :rules="goodsEdit.formRules" class="page-form">
+                        <el-form-item :label="t('goodsDesc')" prop="goods_desc">
+                            <editor v-model="goodsEdit.formData.goods_desc" :height="600" class="editor-width" @handleBlur="goodsEdit.handleBlur" />
+                        </el-form-item>
+                    </el-form>
+                </el-tab-pane>
+            </el-tabs>
+        </el-card>
+
+        <div class="fixed-footer-wrap">
+            <div class="fixed-footer">
+                <el-button type="primary" @click="save()">{{ t('save') }}</el-button>
+                <el-button @click="goodsEdit.back()">{{ t('back') }}</el-button>
+            </div>
+        </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
@@ -1294,10 +596,14 @@ import { FormInstance } from 'element-plus'
 import { Rank, ArrowLeft } from '@element-plus/icons-vue'
 import { filterNumber } from '@/utils/common'
 import { useRoute, useRouter } from 'vue-router'
-import { addGoods, editGoods, getGoodsInit } from '@/addon/shop/api/goods'
 import {
-  getShopDeliveryList,
-  getShippingTemplateList,
+    addGoods,
+    editGoods,
+    getGoodsInit
+} from '@/addon/shop/api/goods'
+import {
+    getShopDeliveryList,
+    getShippingTemplateList
 } from '@/addon/shop/api/delivery'
 import { useGoodsEdit } from './public/js/useGoodsEdit'
 
@@ -1317,157 +623,145 @@ const priceStockCommonFormRef = ref<FormInstance>()
 const specValueRef = ref()
 
 const goodsEdit = useGoodsEdit({
-  getFormRef() {
-    return {
-      basicFormRef: basicFormRef.value,
-      priceStockFormRef: priceStockFormRef.value,
-      deliveryFormRef: deliveryFormRef.value,
-      goodsArgumentsFormRef: goodsArgumentsFormRef.value,
-      detailFormRef: detailFormRef.value,
-      skuFormRef: skuFormRef.value,
-      specValueRef: specValueRef.value,
-      priceStockCommonFormRef: priceStockCommonFormRef.value,
-    }
-  },
-  addApi: addGoods,
-  editApi: editGoods,
-  formData: {
-    goods_type: 'real',
-  },
-  // 追加表单数据
-  appendFormData: {
-    // 配送设置
-    delivery_type: [],
-
-    is_free_shipping: 1,
-    fee_type: 'template',
-    delivery_money: '',
-    delivery_template_id: '',
-  },
-  // 追加刷新商品sku数据
-  appendRefreshGoodsSkuData: {
-    // 重量
-    weight: {
-      value: '',
-      regExp: 'special',
-      message: t('weightTips'),
+    getFormRef () {
+        return {
+            basicFormRef: basicFormRef.value,
+            priceStockFormRef: priceStockFormRef.value,
+            deliveryFormRef: deliveryFormRef.value,
+            goodsArgumentsFormRef: goodsArgumentsFormRef.value,
+            detailFormRef: detailFormRef.value,
+            skuFormRef: skuFormRef.value,
+            specValueRef: specValueRef.value,
+            priceStockCommonFormRef: priceStockCommonFormRef.value,
+        }
     },
-    // 体积
-    volume: {
-      value: '',
-      regExp: 'special',
-      message: t('volumeTips'),
+    addApi: addGoods,
+    editApi: editGoods,
+    formData: {
+        goods_type: 'real'
     },
-  },
-  // 追加单规格数据
-  appendSingleGoodsData(data: any) {
-    return {
-      weight: data.weight,
-      volume: data.volume,
-    }
-  },
-  // 表单验证规则
-  getFormRules(formData: any, regExp: any) {
-    return {
-      weight: [
-        {
-          trigger: 'blur',
-          validator: (rule: any, value: any, callback: any) => {
-            if (formData.spec_type == 'single' && value) {
-              if (isNaN(value) || !regExp.special.test(value)) {
-                callback(new Error(t('weightTips')))
-              } else if (value < 0) {
-                callback(new Error(t('weightNotZeroTips')))
-              } else {
-                callback()
-              }
-            } else {
-              callback()
-            }
-          },
-        },
-      ],
-      volume: [
-        {
-          trigger: 'blur',
-          validator: (rule: any, value: any, callback: any) => {
-            if (formData.spec_type == 'single' && value) {
-              if (isNaN(value) || !regExp.special.test(value)) {
-                callback(new Error(t('volumeTips')))
-              } else if (value < 0) {
-                callback(new Error(t('volumeNotZeroTips')))
-              } else {
-                callback()
-              }
-            } else {
-              callback()
-            }
-          },
-        },
-      ],
-      delivery_type: [
-        {
-          required: true,
-          message: t('deliveryTypePlaceholder'),
-          trigger: 'blur',
-        },
-      ],
-      delivery_money: [
-        {
-          trigger: 'blur',
-          validator: (rule: any, value: any, callback: any) => {
-            if (
-              formData.delivery_type.indexOf('express') != -1 &&
-              formData.is_free_shipping == 0 &&
-              formData.fee_type == 'fixed'
-            ) {
-              if (formData.delivery_template_id.length == 0 && value === '') {
-                callback(new Error(t('deliveryMoneyPlaceholder')))
-              } else if (isNaN(value) || !regExp.digit.test(value)) {
-                callback(new Error(t('deliveryMoneyTips')))
-              } else if (value < 0) {
-                callback(new Error(t('deliveryMoneyNotZeroTips')))
-              } else {
-                callback()
-              }
-            } else {
-              callback()
-            }
-          },
+    // 追加表单数据
+    appendFormData: {
+        // 配送设置
+        delivery_type: [],
+
+        is_free_shipping: 1,
+        fee_type: 'template',
+        delivery_money: '',
+        delivery_template_id: ''
+    },
+    // 追加刷新商品sku数据
+    appendRefreshGoodsSkuData: {
+        // 重量
+        weight: {
+            value: '',
+            regExp: 'special',
+            message: t('weightTips')
         },
-      ],
-      delivery_template_id: [
-        {
-          trigger: 'blur',
-          validator: (rule: any, value: any, callback: any) => {
-            if (
-              formData.delivery_type.indexOf('express') != -1 &&
-              formData.is_free_shipping == 0 &&
-              formData.fee_type == 'template'
-            ) {
-              if (formData.delivery_money.length == 0 && value === '') {
-                callback(new Error(t('deliveryTemplateIdPlaceholder')))
-              } else {
-                callback()
-              }
-            } else {
-              callback()
+        // 体积
+        volume: {
+            value: '',
+            regExp: 'special',
+            message: t('volumeTips')
+        }
+    },
+    // 追加单规格数据
+    appendSingleGoodsData (data: any) {
+        return {
+            weight: data.weight,
+            volume: data.volume
+        }
+    },
+    // 表单验证规则
+    getFormRules (formData: any, regExp: any) {
+        return {
+            weight: [
+                {
+                    trigger: 'blur',
+                    validator: (rule: any, value: any, callback: any) => {
+                        if (formData.spec_type == 'single' && value) {
+                            if (isNaN(value) || !regExp.special.test(value)) {
+                                callback(new Error(t('weightTips')))
+                            } else if (value < 0) {
+                                callback(new Error(t('weightNotZeroTips')))
+                            } else {
+                                callback()
+                            }
+                        } else {
+                            callback()
+                        }
+                    }
+                }
+            ],
+            volume: [
+                {
+                    trigger: 'blur',
+                    validator: (rule: any, value: any, callback: any) => {
+                        if (formData.spec_type == 'single' && value) {
+                            if (isNaN(value) || !regExp.special.test(value)) {
+                                callback(new Error(t('volumeTips')))
+                            } else if (value < 0) {
+                                callback(new Error(t('volumeNotZeroTips')))
+                            } else {
+                                callback()
+                            }
+                        } else {
+                            callback()
+                        }
+                    }
+                }
+            ],
+            delivery_type: [
+                { required: true, message: t('deliveryTypePlaceholder'), trigger: 'blur' }
+            ],
+            delivery_money: [
+                {
+                    trigger: 'blur',
+                    validator: (rule: any, value: any, callback: any) => {
+                        if (formData.delivery_type.indexOf('express') != -1 && formData.is_free_shipping == 0 && formData.fee_type == 'fixed') {
+                            if (formData.delivery_template_id.length == 0 && value === '') {
+                                callback(new Error(t('deliveryMoneyPlaceholder')))
+                            } else if (isNaN(value) || !regExp.digit.test(value)) {
+                                callback(new Error(t('deliveryMoneyTips')))
+                            } else if (value < 0) {
+                                callback(new Error(t('deliveryMoneyNotZeroTips')))
+                            } else {
+                                callback()
+                            }
+                        } else {
+                            callback()
+                        }
+                    }
+                }
+            ],
+            delivery_template_id: [
+                {
+                    trigger: 'blur',
+                    validator: (rule: any, value: any, callback: any) => {
+                        if (formData.delivery_type.indexOf('express') != -1 && formData.is_free_shipping == 0 && formData.fee_type == 'template') {
+                            if (formData.delivery_money.length == 0 && value === '') {
+                                callback(new Error(t('deliveryTemplateIdPlaceholder')))
+                            } else {
+                                callback()
+                            }
+                        } else {
+                            callback()
+                        }
+                    }
+                }
+            ]
+        }
+    },
+    // 表单验证
+    getVerify () {
+        return [
+            {
+                key: 'delivery',
+                verify: false,
+                ref: deliveryFormRef.value
             }
-          },
-        },
-      ],
+        ]
     }
-  },
-  // 表单验证
-  getVerify() {
-    return [
-      {
-        key: 'delivery',
-        verify: false,
-        ref: deliveryFormRef.value,
-      },
-    ]
-  },
 })
 
 // 配送方式复选框
@@ -1479,118 +773,107 @@ const deliveryTemplateOptions = reactive([])
 // 配送方式
 const deliveryTypeFlag = ref(false)
 getShopDeliveryList().then((res) => {
-  const data = res.data
-  if (data) {
-    deliveryTypeCheckBox.splice(0, deliveryTypeCheckBox.length, ...data)
-    // deliveryTypeFlag.value = deliveryTypeCheckBox.every(el => {
-    // return el.status == '2'
-    // })
-  }
+    const data = res.data
+    if (data) {
+        deliveryTypeCheckBox.splice(0, deliveryTypeCheckBox.length, ...data)
+        // deliveryTypeFlag.value = deliveryTypeCheckBox.every(el => {
+        // return el.status == '2'
+        // })
+    }
 })
 
 // 跳转到运费模板
 const toDeliveryTemplateEvent = () => {
-  const url = router.resolve({
-    path: '/shop/order/shipping/template',
-  })
-  window.open(url.href)
+    const url = router.resolve({
+        path: '/shop/order/shipping/template'
+    })
+    window.open(url.href)
 }
 
 // 运费模板
 const refreshDeliveryTemplate = () => {
-  getShippingTemplateList({}).then((res) => {
-    const data = res.data
-    if (data) {
-      deliveryTemplateOptions.splice(0, deliveryTemplateOptions.length, ...data)
-    }
-  })
+    getShippingTemplateList({}).then((res) => {
+        const data = res.data
+        if (data) {
+            deliveryTemplateOptions.splice(0, deliveryTemplateOptions.length, ...data)
+        }
+    })
 }
 
 refreshDeliveryTemplate()
 
 // 加载初始化数据
 getGoodsInit({
-  goods_id: goodsEdit.formData.goods_id,
+    goods_id: goodsEdit.formData.goods_id
 }).then((res) => {
-  const data = res.data
-  if (data) {
-    goodsEdit.handleGoodsInit(data)
-
-    if (goodsEdit.formData.goods_id && data.goods_info) {
-      // 配送设置
-      goodsEdit.formData.delivery_type = data.goods_info.delivery_type
-      goodsEdit.formData.is_free_shipping = data.goods_info.is_free_shipping
-      goodsEdit.formData.fee_type = data.goods_info.fee_type
-      goodsEdit.formData.delivery_money = data.goods_info.delivery_money
-      goodsEdit.formData.delivery_template_id =
-        data.goods_info.delivery_template_id
+    const data = res.data
+    if (data) {
+        goodsEdit.handleGoodsInit(data)
+
+        if (goodsEdit.formData.goods_id && data.goods_info) {
+            // 配送设置
+            goodsEdit.formData.delivery_type = data.goods_info.delivery_type
+            goodsEdit.formData.is_free_shipping = data.goods_info.is_free_shipping
+            goodsEdit.formData.fee_type = data.goods_info.fee_type
+            goodsEdit.formData.delivery_money = data.goods_info.delivery_money
+            goodsEdit.formData.delivery_template_id = data.goods_info.delivery_template_id
+        }
     }
-  }
 })
 
 // 多规格，重量 验证规则
 const skuWeightRules = () => {
-  return [
-    {
-      trigger: 'blur',
-      validator: (rule: any, value: any, callback: any) => {
-        if (goodsEdit.formData.spec_type == 'multi') {
-          if (
-            value.length > 0 &&
-            (isNaN(value) || !goodsEdit.regExp.special.test(value))
-          ) {
-            callback(t('weightTips'))
-          } else if (value < 0) {
-            callback(t('weightNotZeroTips'))
-          } else {
-            callback()
-          }
-        } else {
-          callback()
+    return [{
+        trigger: 'blur',
+        validator: (rule: any, value: any, callback: any) => {
+            if (goodsEdit.formData.spec_type == 'multi') {
+                if (value.length > 0 && (isNaN(value) || !goodsEdit.regExp.special.test(value))) {
+                    callback(t('weightTips'))
+                } else if (value < 0) {
+                    callback(t('weightNotZeroTips'))
+                } else {
+                    callback()
+                }
+            } else {
+                callback()
+            }
         }
-      },
-    },
-  ]
+    }]
 }
 
 // 多规格，体积 验证规则
 const skuVolumeRules = () => {
-  return [
-    {
-      trigger: 'blur',
-      validator: (rule: any, value: any, callback: any) => {
-        if (goodsEdit.formData.spec_type == 'multi') {
-          if (
-            value.length > 0 &&
-            (isNaN(value) || !goodsEdit.regExp.special.test(value))
-          ) {
-            callback(t('volumeTips'))
-          } else if (value < 0) {
-            callback(t('volumeNotZeroTips'))
-          } else {
-            callback()
-          }
-        } else {
-          callback()
+    return [{
+        trigger: 'blur',
+        validator: (rule: any, value: any, callback: any) => {
+            if (goodsEdit.formData.spec_type == 'multi') {
+                if (value.length > 0 && (isNaN(value) || !goodsEdit.regExp.special.test(value))) {
+                    callback(t('volumeTips'))
+                } else if (value < 0) {
+                    callback(t('volumeNotZeroTips'))
+                } else {
+                    callback()
+                }
+            } else {
+                callback()
+            }
         }
-      },
-    },
-  ]
+    }]
 }
 
 const save = () => {
-  goodsEdit.save()
+    goodsEdit.save()
 }
 </script>
 
 <style lang="scss" scoped>
-@import 'public/css/goods_edit.scss';
+	@import 'public/css/goods_edit.scss';
 </style>
 <style lang="scss">
-.edui-default .edui-editor {
-  z-index: 1 !important;
-}
-.el-cascader__tags.is-validate {
-  right: 30px !important;
-}
+    .edui-default .edui-editor{
+        z-index: 1 !important;
+    }
+    .el-cascader__tags.is-validate{
+        right: 30px !important;
+    }
 </style>
diff --git a/admin/src/addon/shop/views/goods/recycle.vue b/admin/src/addon/shop/views/goods/recycle.vue
index 5ca593aa..bd1bb356 100644
--- a/admin/src/addon/shop/views/goods/recycle.vue
+++ b/admin/src/addon/shop/views/goods/recycle.vue
@@ -1,188 +1,101 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
-
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="goodsTable.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('goodsName')" prop="goods_name">
-            <el-input
-              v-model.trim="goodsTable.searchParam.goods_name"
-              :placeholder="t('goodsNamePlaceholder')"
-              maxlength="60"
-            />
-          </el-form-item>
-          <el-form-item :label="t('goodsCategory')" prop="goods_category">
-            <el-cascader
-              v-model="goodsTable.searchParam.goods_category"
-              :options="goodsCategoryOptions"
-              :placeholder="t('goodsCategoryPlaceholder')"
-              clearable
-              :props="{ value: 'value', label: 'label', emitPath: false }"
-            />
-          </el-form-item>
-          <el-form-item :label="t('goodsType')" prop="goods_type">
-            <el-select
-              v-model="goodsTable.searchParam.goods_type"
-              :placeholder="t('goodsTypePlaceholder')"
-              clearable
-            >
-              <el-option
-                v-for="item in goodsType"
-                :key="item.type"
-                :label="item.name"
-                :value="item.type"
-              />
-            </el-select>
-          </el-form-item>
-
-          <el-form-item>
-            <el-button type="primary" @click="loadGoodsList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
-
-      <div class="mt-[10px]">
-        <div class="mb-[10px] flex items-center">
-          <el-checkbox
-            v-model="toggleCheckbox"
-            size="large"
-            class="px-[14px]"
-            @change="toggleChange"
-            :indeterminate="isIndeterminate"
-          />
-          <el-button @click="batchRecycle" size="small">{{
-            t('batchRecycle')
-          }}</el-button>
-        </div>
-
-        <el-table
-          :data="goodsTable.data"
-          size="large"
-          v-loading="goodsTable.loading"
-          ref="goodsListTableRef"
-          @sort-change="sortChange"
-          @selection-change="handleSelectionChange"
-        >
-          <template #empty>
-            <span>{{ !goodsTable.loading ? t('emptyData') : '' }}</span>
-          </template>
-          <el-table-column type="selection" width="55" />
-
-          <el-table-column
-            prop="goods_id"
-            :label="t('goodsInfo')"
-            min-width="300"
-          >
-            <template #default="{ row }">
-              <div class="flex items-center cursor-pointer">
-                <div
-                  class="min-w-[70px] h-[70px] flex items-center justify-center"
-                >
-                  <img
-                    class="max-w-[70px] max-h-[70px]"
-                    :src="img(row.goods_cover_thumb_small)"
-                  />
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+            </div>
+
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="goodsTable.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('goodsName')" prop="goods_name">
+                        <el-input v-model.trim="goodsTable.searchParam.goods_name" :placeholder="t('goodsNamePlaceholder')" maxlength="60" />
+                    </el-form-item>
+                    <el-form-item :label="t('goodsCategory')" prop="goods_category">
+                        <el-cascader v-model="goodsTable.searchParam.goods_category" :options="goodsCategoryOptions" :placeholder="t('goodsCategoryPlaceholder')" clearable :props="{ value: 'value', label: 'label', emitPath:false }"  />
+                    </el-form-item>
+                    <el-form-item :label="t('goodsType')" prop="goods_type">
+                        <el-select v-model="goodsTable.searchParam.goods_type" :placeholder="t('goodsTypePlaceholder')" clearable>
+                            <el-option v-for="item in goodsType" :key="item.type" :label="item.name" :value="item.type" />
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item>
+                        <el-button type="primary" @click="loadGoodsList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+
+            <div class="mt-[10px]">
+
+                <div class="mb-[10px] flex items-center">
+                    <el-checkbox v-model="toggleCheckbox" size="large" class="px-[14px]" @change="toggleChange" :indeterminate="isIndeterminate" />
+                    <el-button @click="batchRecycle" size="small">{{ t('batchRecycle') }}</el-button>
                 </div>
-                <div class="ml-2">
-                  <span :title="row.goods_name" class="multi-hidden">{{
-                    row.goods_name
-                  }}</span>
-                  <span class="text-primary text-[12px]">{{
-                    row.goods_type_name
-                  }}</span>
-                </div>
-              </div>
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            prop="price"
-            :label="t('price')"
-            min-width="120"
-            align="right"
-            sortable="custom"
-          >
-            <template #default="{ row }">
-              <div>￥{{ row.goodsSku.price }}</div>
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            prop="stock"
-            :label="t('stock')"
-            min-width="120"
-            sortable="custom"
-          />
-          <el-table-column
-            prop="sale_num"
-            :label="t('saleNum')"
-            min-width="100"
-            sortable="custom"
-          />
-          <el-table-column prop="status" :label="t('status')" min-width="100">
-            <template #default="{ row }">
-              <div v-if="row.status == 1">{{ t('statusOn') }}</div>
-              <div v-if="row.status == 0">{{ t('statusOff') }}</div>
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            prop="create_time"
-            :label="t('createTime')"
-            min-width="150"
-            sortable="custom"
-          >
-            <template #default="{ row }">
-              <div>{{ row.create_time }}</div>
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            :label="t('operation')"
-            fixed="right"
-            align="right"
-            min-width="120"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="recycleEvent(row)">{{
-                t('recycle')
-              }}</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <!-- <div class="flex items-center flex-1">
+
+                <el-table :data="goodsTable.data" size="large" v-loading="goodsTable.loading" ref="goodsListTableRef" @sort-change="sortChange" @selection-change="handleSelectionChange">
+                    <template #empty>
+                        <span>{{ !goodsTable.loading ? t('emptyData') : '' }}</span>
+                    </template>
+                    <el-table-column type="selection" width="55" />
+
+                    <el-table-column prop="goods_id" :label="t('goodsInfo')" min-width="300">
+                        <template #default="{ row }">
+                            <div class="flex items-center cursor-pointer">
+                                <div class="min-w-[70px] h-[70px] flex items-center justify-center">
+                                    <img class="max-w-[70px] max-h-[70px]" :src="img(row.goods_cover_thumb_small)" />
+                                </div>
+                                <div class="ml-2">
+                                    <span :title="row.goods_name" class="multi-hidden">{{ row.goods_name }}</span>
+                                    <span class="text-primary text-[12px]">{{ row.goods_type_name }}</span>
+                                </div>
+                            </div>
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column prop="price" :label="t('price')" min-width="120" align="right" sortable="custom">
+                        <template #default="{ row }">
+                            <div>￥{{ row.goodsSku.price }}</div>
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column prop="stock" :label="t('stock')" min-width="120" sortable="custom" />
+                    <el-table-column prop="sale_num" :label="t('saleNum')" min-width="100" sortable="custom" />
+                    <el-table-column prop="status" :label="t('status')" min-width="100">
+                        <template #default="{ row }">
+                            <div v-if="row.status == 1">{{ t('statusOn') }}</div>
+                            <div v-if="row.status == 0">{{ t('statusOff') }}</div>
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column prop="create_time" :label="t('createTime')" min-width="150" sortable="custom">
+                        <template #default="{ row }">
+                            <div>{{ row.create_time }}</div>
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column :label="t('operation')" fixed="right" align="right" min-width="120">
+                        <template #default="{ row }">
+                            <el-button type="primary" link @click="recycleEvent(row)">{{ t('recycle') }}</el-button>
+                        </template>
+                    </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <!-- <div class="flex items-center flex-1">
                         <el-checkbox v-model="toggleCheckbox" size="large" class="px-[14px]" @change="toggleChange" :indeterminate="isIndeterminate" />
                         <el-button @click="batchRecycle" size="small">{{ t('batchRecycle') }}</el-button>
                     </div> -->
 
-          <el-pagination
-            v-model:current-page="goodsTable.page"
-            v-model:page-size="goodsTable.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="goodsTable.total"
-            @size-change="loadGoodsList()"
-            @current-change="loadGoodsList"
-          />
-        </div>
-      </div>
-    </el-card>
-  </div>
+                    <el-pagination v-model:current-page="goodsTable.page" v-model:page-size="goodsTable.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="goodsTable.total"
+                        @size-change="loadGoodsList()" @current-change="loadGoodsList" />
+                </div>
+            </div>
+
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -194,10 +107,10 @@ import { useRoute } from 'vue-router'
 import { cloneDeep } from 'lodash-es'
 
 import {
-  getRecycleGoodsPageList,
-  getCategoryTree,
-  getGoodsType,
-  recycleGoods,
+    getRecycleGoodsPageList,
+    getCategoryTree,
+    getGoodsType,
+    recycleGoods
 } from '@/addon/shop/api/goods'
 
 const route = useRoute()
@@ -205,18 +118,18 @@ const pageName = route.meta.title
 const repeat = ref(false)
 
 const goodsTable = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    goods_name: '',
-    goods_category: [],
-    goods_type: '',
-    order: '',
-    sort: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        goods_name: '',
+        goods_category: [],
+        goods_type: '',
+        order: '',
+        sort: ''
+    }
 })
 
 const searchFormRef = ref()
@@ -229,43 +142,39 @@ const goodsType: any = reactive([])
 
 // 初始化数据
 const initData = () => {
-  // 查询商品分类树结构
-  getCategoryTree().then((res) => {
-    const data = res.data
-    if (data) {
-      const goodsCategoryTree: any = []
-      data.forEach((item: any) => {
-        const children: any = []
-        if (item.child_list) {
-          item.child_list.forEach((childItem: any) => {
-            children.push({
-              value: childItem.category_id,
-              label: childItem.category_name,
+    // 查询商品分类树结构
+    getCategoryTree().then((res) => {
+        const data = res.data
+        if (data) {
+            const goodsCategoryTree: any = []
+            data.forEach((item: any) => {
+                const children: any = []
+                if (item.child_list) {
+                    item.child_list.forEach((childItem: any) => {
+                        children.push({
+                            value: childItem.category_id,
+                            label: childItem.category_name
+                        })
+                    })
+                }
+                goodsCategoryTree.push({
+                    value: item.category_id,
+                    label: item.category_name,
+                    children
+                })
             })
-          })
+            goodsCategoryOptions.splice(0, goodsCategoryOptions.length, ...goodsCategoryTree)
         }
-        goodsCategoryTree.push({
-          value: item.category_id,
-          label: item.category_name,
-          children,
-        })
-      })
-      goodsCategoryOptions.splice(
-        0,
-        goodsCategoryOptions.length,
-        ...goodsCategoryTree
-      )
-    }
-  })
-  // 商品类型
-  getGoodsType().then((res) => {
-    const data = res.data
-    if (data) {
-      for (const k in data) {
-        goodsType.push(data[k])
-      }
-    }
-  })
+    })
+    // 商品类型
+    getGoodsType().then((res) => {
+        const data = res.data
+        if (data) {
+            for (const k in data) {
+                goodsType.push(data[k])
+            }
+        }
+    })
 }
 
 initData()
@@ -278,8 +187,8 @@ const isIndeterminate = ref(false)
 
 // 监听批量复选框事件
 const toggleChange = (value: any) => {
-  isIndeterminate.value = false
-  goodsListTableRef.value.toggleAllSelection()
+    isIndeterminate.value = false
+    goodsListTableRef.value.toggleAllSelection()
 }
 
 const goodsListTableRef = ref()
@@ -289,85 +198,76 @@ const multipleSelection: any = ref([])
 
 // 监听表格单行选中
 const handleSelectionChange = (val: []) => {
-  multipleSelection.value = val
-
-  toggleCheckbox.value = false
-  if (
-    multipleSelection.value.length > 0 &&
-    multipleSelection.value.length < goodsTable.data.length
-  ) {
-    isIndeterminate.value = true
-  } else {
-    isIndeterminate.value = false
-  }
-
-  if (
-    multipleSelection.value.length == goodsTable.data.length &&
-    goodsTable.data.length &&
-    multipleSelection.value.length
-  ) {
-    toggleCheckbox.value = true
-  }
+    multipleSelection.value = val
+
+    toggleCheckbox.value = false
+    if (multipleSelection.value.length > 0 && multipleSelection.value.length < goodsTable.data.length) {
+        isIndeterminate.value = true
+    } else {
+        isIndeterminate.value = false
+    }
+
+    if (multipleSelection.value.length == goodsTable.data.length && goodsTable.data.length && multipleSelection.value.length) {
+        toggleCheckbox.value = true
+    }
 }
 
 // 批量恢复商品
 const batchRecycle = () => {
-  if (multipleSelection.value.length == 0) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('batchEmptySelectedGoodsTips')}`,
-    })
-    return
-  }
-
-  ElMessageBox.confirm(t('batchGoodsRecycleTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    if (repeat.value) return
-    repeat.value = true
-
-    const goodsIds: any = []
-    multipleSelection.value.forEach((item: any) => {
-      goodsIds.push(item.goods_id)
-    })
+    if (multipleSelection.value.length == 0) {
+        ElMessage({
+            type: 'warning',
+            message: `${t('batchEmptySelectedGoodsTips')}`
+        })
+        return
+    }
+
+    ElMessageBox.confirm(t('batchGoodsRecycleTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        if (repeat.value) return
+        repeat.value = true
+
+        const goodsIds: any = []
+        multipleSelection.value.forEach((item: any) => {
+            goodsIds.push(item.goods_id)
+        })
 
-    recycleGoods({
-      goods_ids: goodsIds,
+        recycleGoods({
+            goods_ids: goodsIds
+        }).then(() => {
+            loadGoodsList()
+            toggleCheckbox.value = false
+            repeat.value = false
+        }).catch(() => {
+            repeat.value = false
+        })
     })
-      .then(() => {
-        loadGoodsList()
-        toggleCheckbox.value = false
-        repeat.value = false
-      })
-      .catch(() => {
-        repeat.value = false
-      })
-  })
 }
 
 /**
  * 获取商品列表
  */
 const loadGoodsList = (page: number = 1) => {
-  goodsTable.loading = true
-  goodsTable.page = page
-
-  const searchData = cloneDeep(goodsTable.searchParam)
-
-  getRecycleGoodsPageList({
-    page: goodsTable.page,
-    limit: goodsTable.limit,
-    ...searchData,
-  })
-    .then((res) => {
-      goodsTable.loading = false
-      goodsTable.data = res.data.data
-      goodsTable.total = res.data.total
-    })
-    .catch(() => {
-      goodsTable.loading = false
+    goodsTable.loading = true
+    goodsTable.page = page
+
+    const searchData = cloneDeep(goodsTable.searchParam)
+
+    getRecycleGoodsPageList({
+        page: goodsTable.page,
+        limit: goodsTable.limit,
+        ...searchData
+    }).then(res => {
+        goodsTable.loading = false
+        goodsTable.data = res.data.data
+        goodsTable.total = res.data.total
+    }).catch(() => {
+        goodsTable.loading = false
     })
 }
 
@@ -375,78 +275,79 @@ loadGoodsList()
 
 // 恢复商品
 const recycleEvent = (data: any) => {
-  ElMessageBox.confirm(t('goodsRecycleTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    if (repeat.value) return
-    repeat.value = true
-
-    recycleGoods({
-      goods_ids: data.goods_id,
-    })
-      .then((res: any) => {
-        if (res.code == 1) {
-          loadGoodsList()
+    ElMessageBox.confirm(t('goodsRecycleTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
         }
-        repeat.value = false
-      })
-      .catch(() => {
-        repeat.value = false
-      })
-  })
+    ).then(() => {
+        if (repeat.value) return
+        repeat.value = true
+
+        recycleGoods({
+            goods_ids: data.goods_id
+        }).then((res: any) => {
+            if (res.code == 1) {
+                loadGoodsList()
+            }
+            repeat.value = false
+        }).catch(() => {
+            repeat.value = false
+        })
+    })
 }
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
+    if (!formEl) return
+    formEl.resetFields()
 
-  loadGoodsList()
+    loadGoodsList()
 }
 
 // 监听排序
 const sortChange = (event: any) => {
-  let sort = ''
-  if (event.order == 'ascending') {
-    sort = 'asc'
-  } else if (event.order == 'descending') {
-    sort = 'desc'
-  }
-  if (sort) {
-    goodsTable.searchParam.order = event.prop
-    goodsTable.searchParam.sort = sort
-  }
-  loadGoodsList()
+    let sort = ''
+    if (event.order == 'ascending') {
+        sort = 'asc'
+    } else if (event.order == 'descending') {
+        sort = 'desc'
+    }
+    if (sort) {
+        goodsTable.searchParam.order = event.prop
+        goodsTable.searchParam.sort = sort
+    }
+    loadGoodsList()
 }
+
 </script>
 
 <style lang="scss" scoped>
 /* 多行超出隐藏 */
 .multi-hidden {
-  word-break: break-all;
-  text-overflow: ellipsis;
-  overflow: hidden;
-  display: -webkit-box;
-  -webkit-line-clamp: 2;
-  -webkit-box-orient: vertical;
+    word-break: break-all;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
 }
 </style>
 <style>
-.recyle .el-cascader-panel .el-radio {
-  width: 100% !important ;
-  height: 100% !important;
-  z-index: 10;
-  position: absolute;
-  top: 0px;
-  right: 0px;
+.recyle .el-cascader-panel .el-radio{
+    width: 100% !important ;
+    height: 100% !important;
+    z-index: 10;
+    position: absolute;
+    top: 0px;
+    right: 0px;
 }
 
-.recyle .el-cascader-panel .el-radio__input {
-  margin-left: 20px;
+.recyle .el-cascader-panel .el-radio__input{
+    margin-left: 20px;
 }
 
 .recyle .el-cascader-panel .el-cascader-node__label {
-  margin-left: 12px;
+    margin-left: 12px;
 }
 </style>
diff --git a/admin/src/addon/shop/views/goods/service.vue b/admin/src/addon/shop/views/goods/service.vue
index c9f52431..88c841aa 100644
--- a/admin/src/addon/shop/views/goods/service.vue
+++ b/admin/src/addon/shop/views/goods/service.vue
@@ -1,102 +1,65 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-        <el-button type="primary" @click="addEvent">
-          {{ t('addServe') }}
-        </el-button>
-      </div>
-
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="serveTable.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('serviceName')" prop="service_name">
-            <el-input
-              v-model.trim="serveTable.searchParam.service_name"
-              :placeholder="t('serviceNamePlaceholder')"
-            />
-          </el-form-item>
-
-          <el-form-item>
-            <el-button type="primary" @click="loadServeList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
-
-      <div class="mt-[10px]">
-        <el-table
-          :data="serveTable.data"
-          size="large"
-          v-loading="serveTable.loading"
-        >
-          <template #empty>
-            <span>{{ !serveTable.loading ? t('emptyData') : '' }}</span>
-          </template>
-          <el-table-column
-            prop="service_name"
-            :label="t('serviceName')"
-            min-width="120"
-          />
-          <!--					<el-table-column :label="t('image')" min-width="120">-->
-          <!--						<template #default="{ row }">-->
-          <!--							<div class="h-[50px]">-->
-          <!--							    <el-image class="w-[50px] h-[50px] " :src="img(row.image)" fit="contain">-->
-          <!--							        <template #error>-->
-          <!--							            <div class="image-slot">-->
-          <!--							                &lt;!&ndash; <img class="w-[30px] h-[30px]" src="@/addon/shop/assets/category_default.png" /> &ndash;&gt;-->
-          <!--							            </div>-->
-          <!--							        </template>-->
-          <!--							    </el-image>-->
-          <!--							</div>-->
-          <!--						</template>-->
-          <!--					</el-table-column>-->
-          <el-table-column prop="desc" :label="t('desc')" min-width="120" />
-          <el-table-column
-            :label="t('operation')"
-            fixed="right"
-            align="right"
-            min-width="120"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="editEvent(row)">{{
-                t('edit')
-              }}</el-button>
-              <el-button
-                type="primary"
-                link
-                @click="deleteEvent(row.service_id)"
-                >{{ t('delete') }}</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="serveTable.page"
-            v-model:page-size="serveTable.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="serveTable.total"
-            @size-change="loadServeList()"
-            @current-change="loadServeList"
-          />
-        </div>
-      </div>
-
-      <service-edit ref="editServeDialog" @complete="loadServeList" />
-    </el-card>
-  </div>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{pageName}}</span>
+                <el-button type="primary" @click="addEvent">
+                    {{ t('addServe') }}
+                </el-button>
+            </div>
+
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="serveTable.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('serviceName')" prop="service_name">
+                        <el-input v-model.trim="serveTable.searchParam.service_name" :placeholder="t('serviceNamePlaceholder')" />
+                    </el-form-item>
+
+                    <el-form-item>
+                        <el-button type="primary" @click="loadServeList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+
+            <div class="mt-[10px]">
+                <el-table :data="serveTable.data" size="large" v-loading="serveTable.loading">
+                    <template #empty>
+                        <span>{{ !serveTable.loading ? t('emptyData') : '' }}</span>
+                    </template>
+                    <el-table-column prop="service_name" :label="t('serviceName')" min-width="120" />
+<!--					<el-table-column :label="t('image')" min-width="120">-->
+<!--						<template #default="{ row }">-->
+<!--							<div class="h-[50px]">-->
+<!--							    <el-image class="w-[50px] h-[50px] " :src="img(row.image)" fit="contain">-->
+<!--							        <template #error>-->
+<!--							            <div class="image-slot">-->
+<!--							                &lt;!&ndash; <img class="w-[30px] h-[30px]" src="@/addon/shop/assets/category_default.png" /> &ndash;&gt;-->
+<!--							            </div>-->
+<!--							        </template>-->
+<!--							    </el-image>-->
+<!--							</div>-->
+<!--						</template>-->
+<!--					</el-table-column>-->
+                    <el-table-column prop="desc" :label="t('desc')" min-width="120" />
+                    <el-table-column :label="t('operation')" fixed="right" align="right" min-width="120">
+                       <template #default="{ row }">
+                           <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+                           <el-button type="primary" link @click="deleteEvent(row.service_id)">{{ t('delete') }}</el-button>
+                       </template>
+                    </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="serveTable.page" v-model:page-size="serveTable.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="serveTable.total"
+                        @size-change="loadServeList()" @current-change="loadServeList" />
+                </div>
+            </div>
+
+            <service-edit ref="editServeDialog" @complete="loadServeList" />
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -111,14 +74,14 @@ const route = useRoute()
 const pageName = route.meta.title
 
 const serveTable = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    service_name: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        service_name: ''
+    }
 })
 
 const searchFormRef = ref<FormInstance>()
@@ -127,21 +90,19 @@ const searchFormRef = ref<FormInstance>()
  * 获取商品服务列表
  */
 const loadServeList = (page: number = 1) => {
-  serveTable.loading = true
-  serveTable.page = page
-
-  getServePageList({
-    page: serveTable.page,
-    limit: serveTable.limit,
-    ...serveTable.searchParam,
-  })
-    .then((res) => {
-      serveTable.loading = false
-      serveTable.data = res.data.data
-      serveTable.total = res.data.total
-    })
-    .catch(() => {
-      serveTable.loading = false
+    serveTable.loading = true
+    serveTable.page = page
+
+    getServePageList({
+        page: serveTable.page,
+        limit: serveTable.limit,
+        ...serveTable.searchParam
+    }).then(res => {
+        serveTable.loading = false
+        serveTable.data = res.data.data
+        serveTable.total = res.data.total
+    }).catch(() => {
+        serveTable.loading = false
     })
 }
 loadServeList()
@@ -152,8 +113,8 @@ const editServeDialog: Record<string, any> | null = ref(null)
  * 添加商品服务
  */
 const addEvent = () => {
-  editServeDialog.value.setFormData()
-  editServeDialog.value.showDialog = true
+    editServeDialog.value.setFormData()
+    editServeDialog.value.showDialog = true
 }
 
 /**
@@ -161,32 +122,34 @@ const addEvent = () => {
  * @param data
  */
 const editEvent = (data: any) => {
-  editServeDialog.value.setFormData(data)
-  editServeDialog.value.showDialog = true
+    editServeDialog.value.setFormData(data)
+    editServeDialog.value.showDialog = true
 }
 
 /**
  * 删除商品服务
  */
 const deleteEvent = (id: number) => {
-  ElMessageBox.confirm(t('serveDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    deleteServe(id)
-      .then(() => {
-        loadServeList()
-      })
-      .catch(() => {})
-  })
+    ElMessageBox.confirm(t('serveDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        deleteServe(id).then(() => {
+            loadServeList()
+        }).catch(() => {
+        })
+    })
 }
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadServeList()
+    if (!formEl) return
+    formEl.resetFields()
+    loadServeList()
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
diff --git a/admin/src/addon/shop/views/goods/virtual_edit.vue b/admin/src/addon/shop/views/goods/virtual_edit.vue
index b00dafde..5665ac8c 100644
--- a/admin/src/addon/shop/views/goods/virtual_edit.vue
+++ b/admin/src/addon/shop/views/goods/virtual_edit.vue
@@ -1,1195 +1,559 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <el-page-header
-        :content="
-          goodsEdit.formData.goods_id ? t('updateGoods') : t('addGoods')
-        "
-        :icon="ArrowLeft"
-        @back="goodsEdit.back()"
-      />
-    </el-card>
-
-    <el-card class="box-card mt-[15px] !border-none" shadow="never">
-      <el-tabs
-        v-model="goodsEdit.activeName"
-        @tab-click="goodsEdit.tabHandleClick"
-      >
-        <el-tab-pane :label="t('basicInfoTab')" name="basic">
-          <el-form
-            :model="goodsEdit.formData"
-            label-width="120px"
-            ref="basicFormRef"
-            :rules="goodsEdit.formRules"
-            class="page-form"
-          >
-            <el-form-item
-              :label="t('goodsType')"
-              v-if="goodsEdit.formData.goods_id"
-            >
-              <template v-for="item in goodsEdit.goodsType" :key="item.type">
-                <div
-                  class="goods-type-wrap"
-                  :class="[
-                    goodsEdit.formData.goods_type == item.type
-                      ? 'selected'
-                      : 'disabled',
-                  ]"
-                >
-                  <div class="goods-type-name">{{ item.name }}</div>
-                  <div class="goods-type-desc">({{ item.desc }})</div>
-                  <template v-if="goodsEdit.formData.goods_type == item.type">
-                    <div class="triangle"></div>
-                    <div class="selected">✓</div>
-                  </template>
-                </div>
-              </template>
-            </el-form-item>
-            <el-form-item :label="t('goodsType')" v-else>
-              <div
-                class="goods-type-wrap"
-                :class="{
-                  selected: goodsEdit.formData.goods_type == item.type,
-                }"
-                v-for="item in goodsEdit.goodsType"
-                :key="item.type"
-                @click="goodsEdit.changeGoodsType(item)"
-              >
-                <div class="goods-type-name">{{ item.name }}</div>
-                <div class="goods-type-desc">({{ item.desc }})</div>
-                <template v-if="goodsEdit.formData.goods_type == item.type">
-                  <div class="triangle"></div>
-                  <div class="selected">✓</div>
-                </template>
-              </div>
-            </el-form-item>
-            <el-form-item :label="t('goodsName')" prop="goods_name">
-              <el-input
-                v-model.trim="goodsEdit.formData.goods_name"
-                clearable
-                :placeholder="t('goodsNamePlaceholder')"
-                class="input-width"
-                maxlength="60"
-                show-word-limit
-              />
-            </el-form-item>
-            <el-form-item :label="t('subTitle')" prop="sub_title">
-              <el-input
-                v-model.trim="goodsEdit.formData.sub_title"
-                clearable
-                :placeholder="t('subTitlePlaceholder')"
-                class="input-width"
-                maxlength="80"
-                show-word-limit
-              />
-            </el-form-item>
-            <el-form-item :label="t('goodsImage')" prop="goods_image">
-              <upload-image
-                v-model="goodsEdit.formData.goods_image"
-                :limit="10"
-              />
-            </el-form-item>
-            <!--                        <el-form-item :label="t('goodsVideo')">-->
-            <!--                            <upload-video v-model="goodsEdit.formData.goods_video" :limit="1" />-->
-            <!--                        </el-form-item>-->
-            <el-form-item :label="t('goodsCategory')" prop="goods_category">
-              <el-cascader
-                v-model="goodsEdit.formData.goods_category"
-                :options="goodsEdit.goodsCategoryOptions"
-                :props="goodsEdit.goodsCategoryProps"
-                clearable
-                filterable
-                @change="goodsEdit.categoryHandleChange"
-              />
-              <div class="ml-[10px]">
-                <span
-                  class="cursor-pointer text-primary mr-[10px]"
-                  @click="goodsEdit.refreshGoodsCategory(true)"
-                  >{{ t('refresh') }}</span
-                >
-                <span
-                  class="cursor-pointer text-primary"
-                  @click="goodsEdit.toGoodsCategoryEvent"
-                  >{{ t('addGoodsCategory') }}</span
-                >
-              </div>
-            </el-form-item>
-
-            <el-form-item :label="t('brand')">
-              <el-select
-                v-model="goodsEdit.formData.brand_id"
-                :placeholder="t('brandPlaceholder')"
-                clearable
-              >
-                <el-option
-                  v-for="item in goodsEdit.brandOptions"
-                  :key="item.brand_id"
-                  :label="item.brand_name"
-                  :value="item.brand_id"
-                />
-              </el-select>
-              <div class="ml-[10px]">
-                <span
-                  class="cursor-pointer text-primary mr-[10px]"
-                  @click="goodsEdit.refreshGoodsBrand(true)"
-                  >{{ t('refresh') }}</span
-                >
-                <span
-                  class="cursor-pointer text-primary"
-                  @click="goodsEdit.toGoodsBrandEvent"
-                  >{{ t('addGoodsBrand') }}</span
-                >
-              </div>
-            </el-form-item>
-
-            <el-form-item :label="t('poster')">
-              <el-select
-                v-model="goodsEdit.formData.poster_id"
-                :placeholder="t('posterPlaceholder')"
-                clearable
-              >
-                <el-option
-                  v-for="item in goodsEdit.posterOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-              <div class="ml-[10px]">
-                <span
-                  class="cursor-pointer text-primary mr-[10px]"
-                  @click="goodsEdit.refreshGoodsPoster(true)"
-                  >{{ t('refresh') }}</span
-                >
-                <span
-                  class="cursor-pointer text-primary"
-                  @click="goodsEdit.toPosterEvent"
-                  >{{ t('addGoodsPoster') }}</span
-                >
-              </div>
-            </el-form-item>
-
-            <div
-              class="ml-[120px] mb-[10px] text-[12px] text-[#999] leading-[20px]"
-            >
-              {{ t('posterTips') }}
-            </div>
-
-            <el-form-item :label="t('diyForm')">
-              <el-select
-                v-model="goodsEdit.formData.form_id"
-                :placeholder="t('diyFormPlaceholder')"
-                clearable
-              >
-                <el-option
-                  v-for="item in goodsEdit.diyFormOptions"
-                  :key="item.form_id"
-                  :label="item.page_title"
-                  :value="item.form_id"
-                />
-              </el-select>
-              <div class="ml-[10px]">
-                <span
-                  class="cursor-pointer text-primary mr-[10px]"
-                  @click="goodsEdit.refreshDiyForm(true)"
-                  >{{ t('refresh') }}</span
-                >
-                <span
-                  class="cursor-pointer text-primary"
-                  @click="goodsEdit.toDiyFormEvent"
-                  >{{ t('addDiyForm') }}</span
-                >
-              </div>
-            </el-form-item>
-
-            <el-form-item :label="t('label')">
-              <el-checkbox-group v-model="goodsEdit.formData.label_ids">
-                <el-checkbox
-                  :label="item.label_id"
-                  v-for="(item, index) in goodsEdit.labelOptions"
-                  :key="index"
-                  >{{ item.label_name }}</el-checkbox
-                >
-              </el-checkbox-group>
-              <div class="ml-[10px]">
-                <span
-                  class="cursor-pointer text-primary mr-[10px]"
-                  @click="goodsEdit.refreshGoodsLabel"
-                  >{{ t('refresh') }}</span
-                >
-                <span
-                  class="cursor-pointer text-primary"
-                  @click="goodsEdit.toGoodsLabelEvent"
-                  >{{ t('addGoodsLabel') }}</span
-                >
-              </div>
-            </el-form-item>
-            <el-form-item :label="t('goodsService')">
-              <el-checkbox-group v-model="goodsEdit.formData.service_ids">
-                <el-checkbox
-                  :label="item.service_id"
-                  v-for="(item, index) in goodsEdit.serviceOptions"
-                  :key="index"
-                  >{{ item.service_name }}</el-checkbox
-                >
-              </el-checkbox-group>
-              <div class="ml-[10px]">
-                <span
-                  class="cursor-pointer text-primary mr-[10px]"
-                  @click="goodsEdit.refreshGoodsService"
-                  >{{ t('refresh') }}</span
-                >
-                <span
-                  class="cursor-pointer text-primary"
-                  @click="goodsEdit.toGoodsServiceEvent"
-                  >{{ t('addGoodsService') }}</span
-                >
-              </div>
-            </el-form-item>
-
-            <el-form-item
-              :label="t('supplier')"
-              v-if="
-                goodsEdit.formData.addon_shop_supplier &&
-                goodsEdit.formData.addon_shop_supplier.status == 1
-              "
-            >
-              <el-select
-                v-model="goodsEdit.formData.supplier_id"
-                :placeholder="t('supplierPlaceholder')"
-                clearable
-              >
-                <el-option
-                  v-for="item in goodsEdit.supplierOptions"
-                  :key="item.supplier_id"
-                  :label="item.supplier_name"
-                  :value="item.supplier_id"
-                />
-              </el-select>
-              <div class="ml-[10px]">
-                <span
-                  class="cursor-pointer text-primary mr-[10px]"
-                  @click="goodsEdit.refreshSupplier"
-                  >{{ t('refresh') }}</span
-                >
-                <span
-                  class="cursor-pointer text-primary"
-                  @click="goodsEdit.toSupplierEvent"
-                  >{{ t('addSupplier') }}</span
-                >
-              </div>
-            </el-form-item>
-            <el-form-item :label="t('status')">
-              <el-radio-group v-model="goodsEdit.formData.status">
-                <el-radio label="1">{{ t('statusOn') }}</el-radio>
-                <el-radio label="0">{{ t('statusOff') }}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-            <el-form-item :label="t('isGive')">
-              <div>
-                <el-radio-group v-model="goodsEdit.formData.is_gift">
-                  <el-radio :label="1">{{ t('yes') }}</el-radio>
-                  <el-radio :label="0">{{ t('no') }}</el-radio>
-                </el-radio-group>
-                <div class="mt-[10px] text-[12px] text-[#999] leading-[20px]">
-                  {{ t('giftTips') }}
-                </div>
-              </div>
-            </el-form-item>
-            <el-form-item :label="t('unit')" prop="unit">
-              <el-input
-                v-model.trim="goodsEdit.formData.unit"
-                clearable
-                :placeholder="t('unitPlaceholder')"
-                class="input-width"
-                show-word-limit
-                maxlength="6"
-              />
-            </el-form-item>
-            <el-form-item :label="t('virtualSaleNum')" prop="virtual_sale_num">
-              <div>
-                <el-input
-                  v-model.trim="goodsEdit.formData.virtual_sale_num"
-                  clearable
-                  :placeholder="t('virtualSaleNumPlaceholder')"
-                  class="input-width"
-                  show-word-limit
-                  maxlength="8"
-                  @keyup="filterNumber($event)"
-                  @blur="
-                    goodsEdit.formData.virtual_sale_num = $event.target.value
-                  "
-                >
-                  <template #append>{{
-                    goodsEdit.formData.unit ? goodsEdit.formData.unit : '件'
-                  }}</template>
-                </el-input>
-                <div class="mt-[10px] text-[12px] text-[#999] leading-[20px]">
-                  {{ t('virtualSaleNumDesc') }}
-                </div>
-              </div>
-            </el-form-item>
-            <el-form-item :label="t('setDeliverGoods')">
-              <el-radio-group
-                v-model="goodsEdit.formData.virtual_auto_delivery"
-              >
-                <el-radio label="1" :disabled="isDisabledVirtual">{{
-                  t('autoDeliverGoods')
-                }}</el-radio>
-                <el-radio label="0" :disabled="isDisabledVirtual">{{
-                  t('handDeliverGoods')
-                }}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-            <el-form-item :label="t('setTakeGoods')">
-              <div>
-                <el-radio-group
-                  v-model="goodsEdit.formData.virtual_receive_type"
-                >
-                  <el-radio label="auto" :disabled="isDisabledVirtual">{{
-                    t('autoTakeGoods')
-                  }}</el-radio>
-                  <el-radio label="artificial" :disabled="isDisabledVirtual">{{
-                    t('handTakeGoods')
-                  }}</el-radio>
-                  <el-radio label="verify" :disabled="isDisabledVirtual">{{
-                    t('verifyTakeGoods')
-                  }}</el-radio>
-                </el-radio-group>
-                <div
-                  class="mt-[10px] text-[12px] text-[#999] leading-[20px]"
-                  v-show="goodsEdit.formData.virtual_receive_type == 'verify'"
-                >
-                  {{ t('virtualSetTips') }}
-                </div>
-              </div>
-            </el-form-item>
-            <el-form-item
-              :label="t('verifyVirtualIndate')"
-              v-if="goodsEdit.formData.virtual_receive_type == 'verify'"
-            >
-              <el-radio-group v-model="goodsEdit.formData.virtual_verify_type">
-                <el-radio label="0">{{ t('verifyVirtualIndateOne') }}</el-radio>
-                <el-radio label="1">{{ t('verifyVirtualIndateTwo') }}</el-radio>
-                <el-radio label="2">{{
-                  t('verifyVirtualIndateThree')
-                }}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-
-            <el-form-item
-              :label="t('virtualIndate')"
-              v-if="
-                goodsEdit.formData.virtual_receive_type == 'verify' &&
-                goodsEdit.formData.virtual_verify_type == 1
-              "
-              prop="virtual_indate_day"
-            >
-              <el-input
-                v-model.trim="goodsEdit.formData.virtual_indate_day"
-                clearable
-                class="input-width"
-                show-word-limit
-                maxlength="5"
-                @keyup="filterNumber($event)"
-              >
-                <template #append>{{ t('sky') }}</template>
-              </el-input>
-            </el-form-item>
-            <el-form-item
-              :label="t('virtualIndate')"
-              v-if="
-                goodsEdit.formData.virtual_receive_type == 'verify' &&
-                goodsEdit.formData.virtual_verify_type == 2
-              "
-              prop="virtual_indate"
-            >
-              <div>
-                <el-date-picker
-                  class="input-width"
-                  value-format="YYYY-MM-DD HH:mm:ss"
-                  v-model="goodsEdit.formData.virtual_indate"
-                  type="datetime"
-                  :disabled-date="disabledPastDates"
-                />
-                <div class="mt-[10px] text-[12px] text-[#999] leading-[20px]">
-                  {{ t('verifyHint') }}
-                </div>
-              </div>
-            </el-form-item>
-            <el-form-item :label="t('sort')" prop="sort">
-              <el-input
-                v-model.trim="goodsEdit.formData.sort"
-                clearable
-                :placeholder="t('sortPlaceholder')"
-                class="input-width"
-                show-word-limit
-                maxlength="8"
-                @keyup="filterNumber($event)"
-              />
-            </el-form-item>
-          </el-form>
-        </el-tab-pane>
-        <el-tab-pane :label="t('priceStockTab')" name="price_stock">
-          <el-form
-            :model="goodsEdit.formData"
-            label-width="120px"
-            ref="priceStockFormRef"
-            :rules="goodsEdit.formRules"
-            class="page-form"
-          >
-            <el-form-item :label="t('specType')" prop="spec_type">
-              <div>
-                <el-radio-group v-model="goodsEdit.formData.spec_type">
-                  <el-radio
-                    label="single"
-                    :disabled="goodsEdit.isDisabledPrice()"
-                    >{{ t('singleSpec') }}</el-radio
-                  >
-                  <el-radio
-                    label="multi"
-                    :disabled="goodsEdit.isDisabledPrice()"
-                    >{{ t('multiSpec') }}</el-radio
-                  >
-                </el-radio-group>
-                <div
-                  class="mt-[10px] text-[12px] text-[#999] leading-[20px]"
-                  v-if="goodsEdit.isDisabledPrice()"
-                >
-                  {{ t('participateInActiveDisableTips') }}
-                </div>
-              </div>
-            </el-form-item>
-
-            <template v-if="goodsEdit.formData.spec_type == 'single'">
-              <el-form-item :label="t('price')" prop="price">
-                <el-input
-                  v-model.trim="goodsEdit.formData.price"
-                  clearable
-                  placeholder="0.00"
-                  class="input-width"
-                  maxlength="8"
-                  :disabled="goodsEdit.isDisabledPrice()"
-                >
-                  <template #append>{{ t('yuan') }}</template>
-                </el-input>
-              </el-form-item>
-
-              <el-form-item :label="t('marketPrice')" prop="market_price">
-                <el-input
-                  v-model.trim="goodsEdit.formData.market_price"
-                  clearable
-                  placeholder="0.00"
-                  class="input-width"
-                  maxlength="8"
-                >
-                  <template #append>{{ t('yuan') }}</template>
-                </el-input>
-              </el-form-item>
-
-              <el-form-item :label="t('costPrice')" prop="cost_price">
-                <el-input
-                  v-model.trim="goodsEdit.formData.cost_price"
-                  clearable
-                  placeholder="0.00"
-                  class="input-width"
-                  maxlength="8"
-                >
-                  <template #append>{{ t('yuan') }}</template>
-                </el-input>
-              </el-form-item>
-              <el-form-item :label="t('goodsStock')" prop="stock">
-                <el-input
-                  v-model.trim="goodsEdit.formData.stock"
-                  clearable
-                  :placeholder="t('goodsStockPlaceholder')"
-                  class="input-width"
-                  maxlength="8"
-                  @keyup="filterNumber($event)"
-                  :disabled="goodsEdit.isDisabledPrice()"
-                >
-                  <template #append>{{
-                    goodsEdit.formData.unit
-                      ? goodsEdit.formData.unit
-                      : t('defaultUnit')
-                  }}</template>
-                </el-input>
-              </el-form-item>
-              <el-form-item :label="t('skuNo')">
-                <el-input
-                  v-model.trim="goodsEdit.formData.sku_no"
-                  clearable
-                  :placeholder="t('skuNoPlaceholder')"
-                  class="input-width"
-                  maxlength="50"
-                  @keyup="goodsEdit.filterSpecial($event)"
-                />
-              </el-form-item>
-            </template>
-          </el-form>
+    <div class="main-container">
+
+        <el-card class="box-card !border-none" shadow="never">
+            <el-page-header :content="goodsEdit.formData.goods_id ? t('updateGoods') : t('addGoods')" :icon="ArrowLeft" @back="goodsEdit.back()" />
+        </el-card>
+
+        <el-card class="box-card mt-[15px] !border-none" shadow="never">
+
+            <el-tabs v-model="goodsEdit.activeName" @tab-click="goodsEdit.tabHandleClick">
+                <el-tab-pane :label="t('basicInfoTab')" name="basic">
+
+                    <el-form :model="goodsEdit.formData" label-width="120px" ref="basicFormRef" :rules="goodsEdit.formRules" class="page-form">
+                        <el-form-item :label="t('goodsType')" v-if="goodsEdit.formData.goods_id">
+                            <template v-for="(item) in goodsEdit.goodsType" :key="item.type">
+                                <div class="goods-type-wrap" :class="[goodsEdit.formData.goods_type == item.type ? 'selected' : 'disabled']">
+                                    <div class="goods-type-name">{{ item.name }}</div>
+                                    <div class="goods-type-desc">({{ item.desc }})</div>
+                                    <template v-if="goodsEdit.formData.goods_type == item.type">
+                                        <div class="triangle"></div>
+                                        <div class="selected">✓</div>
+                                    </template>
+                                </div>
+                            </template>
+                        </el-form-item>
+                        <el-form-item :label="t('goodsType')" v-else>
+                            <div class="goods-type-wrap" :class="{ 'selected': goodsEdit.formData.goods_type == item.type }" v-for="(item) in goodsEdit.goodsType" :key="item.type" @click="goodsEdit.changeGoodsType(item)">
+                                <div class="goods-type-name">{{ item.name }}</div>
+                                <div class="goods-type-desc">({{ item.desc }})</div>
+                                <template v-if="goodsEdit.formData.goods_type == item.type">
+                                    <div class="triangle"></div>
+                                    <div class="selected">✓</div>
+                                </template>
+                            </div>
+                        </el-form-item>
+                        <el-form-item :label="t('goodsName')" prop="goods_name">
+                            <el-input v-model.trim="goodsEdit.formData.goods_name" clearable :placeholder="t('goodsNamePlaceholder')" class="input-width" maxlength="60" show-word-limit />
+                        </el-form-item>
+                        <el-form-item :label="t('subTitle')" prop="sub_title">
+                            <el-input v-model.trim="goodsEdit.formData.sub_title" clearable :placeholder="t('subTitlePlaceholder')" class="input-width" maxlength="80" show-word-limit />
+                        </el-form-item>
+                        <el-form-item :label="t('goodsImage')" prop="goods_image">
+                            <upload-image v-model="goodsEdit.formData.goods_image" :limit="10" />
+                        </el-form-item>
+<!--                        <el-form-item :label="t('goodsVideo')">-->
+<!--                            <upload-video v-model="goodsEdit.formData.goods_video" :limit="1" />-->
+<!--                        </el-form-item>-->
+                        <el-form-item :label="t('goodsCategory')" prop="goods_category">
+                            <el-cascader v-model="goodsEdit.formData.goods_category" :options="goodsEdit.goodsCategoryOptions" :props="goodsEdit.goodsCategoryProps" clearable filterable @change="goodsEdit.categoryHandleChange" />
+                            <div class="ml-[10px]">
+                                <span class="cursor-pointer text-primary mr-[10px]" @click="goodsEdit.refreshGoodsCategory(true)">{{ t('refresh') }}</span>
+                                <span class="cursor-pointer text-primary" @click="goodsEdit.toGoodsCategoryEvent">{{ t('addGoodsCategory') }}</span>
+                            </div>
+                        </el-form-item>
+
+                        <el-form-item :label="t('brand')">
+                            <el-select v-model="goodsEdit.formData.brand_id" :placeholder="t('brandPlaceholder')" clearable>
+                                <el-option v-for="item in goodsEdit.brandOptions" :key="item.brand_id" :label="item.brand_name" :value="item.brand_id" />
+                            </el-select>
+                            <div class="ml-[10px]">
+                                <span class="cursor-pointer text-primary mr-[10px]" @click="goodsEdit.refreshGoodsBrand(true)">{{ t('refresh') }}</span>
+                                <span class="cursor-pointer text-primary" @click="goodsEdit.toGoodsBrandEvent">{{ t('addGoodsBrand') }}</span>
+                            </div>
+                        </el-form-item>
+
+                        <el-form-item :label="t('poster')">
+                            <el-select v-model="goodsEdit.formData.poster_id" :placeholder="t('posterPlaceholder')" clearable>
+                                <el-option v-for="item in goodsEdit.posterOptions" :key="item.id" :label="item.name" :value="item.id" />
+                            </el-select>
+                            <div class="ml-[10px]">
+                                <span class="cursor-pointer text-primary mr-[10px]" @click="goodsEdit.refreshGoodsPoster(true)">{{ t('refresh') }}</span>
+                                <span class="cursor-pointer text-primary" @click="goodsEdit.toPosterEvent">{{ t('addGoodsPoster') }}</span>
+                            </div>
+                        </el-form-item>
 
-          <!-- 多规格 -->
-          <el-form
-            :model="goodsEdit.goodsSkuData"
-            label-width="120px"
-            ref="skuFormRef"
-            class="page-form"
-          >
-            <div
-              class="el-form-item asterisk-left"
-              v-show="goodsEdit.formData.spec_type == 'multi'"
-            >
-              <div class="el-form-item__label w-[120px]">
-                {{ t('goodsSku') }}
-              </div>
-              <div class="spec-wrap">
-                <!--规格项/规格值-->
-                <div class="spec-edit-list">
-                  <div
-                    class="spec-item"
-                    v-for="(item, index) in goodsEdit.goodsSpecFormat"
-                    :key="item.id"
-                  >
-                    <div class="spec-name-wrap">
-                      <el-input
-                        v-model.trim="item.spec_name"
-                        clearable
-                        :placeholder="t('specNamePlaceholder')"
-                        class="input-width"
-                        maxlength="20"
-                      />
-                    </div>
-                    <div class="spec-value-wrap">
-                      <ul ref="specValueRef">
-                        <li
-                          :class="'draggable-element' + index"
-                          v-for="(specValue, specIndex) in item.values"
-                          :key="specValue.id"
-                        >
-                          <el-input
-                            v-model.trim="specValue.spec_value_name"
-                            clearable
-                            :placeholder="t('specValueNamePlaceholder')"
-                            class="input-width"
-                            :suffix-icon="Rank"
-                            maxlength="20"
-                            @input="goodsEdit.specValueNameInputListener"
-                          >
-                          </el-input>
-                          <el-icon
-                            class="icon"
-                            :size="20"
-                            color="#7b7b7b"
-                            @click="goodsEdit.deleteSpecValue(index, specIndex)"
-                          >
-                            <CircleCloseFilled />
-                          </el-icon>
-                        </li>
-                      </ul>
-                      <span
-                        class="text-primary text-[14px] add-spec-value"
-                        @click="goodsEdit.addSpecValue(index)"
-                        >{{ t('addSpecValue') }}</span
-                      >
-                      <div class="box"></div>
-                    </div>
+                        <div class="ml-[120px] mb-[10px] text-[12px] text-[#999] leading-[20px]">{{ t('posterTips') }}</div>
 
-                    <el-icon
-                      class="del-spec"
-                      :size="20"
-                      color="#7b7b7b"
-                      @click="goodsEdit.deleteSpec(index)"
-                    >
-                      <CircleCloseFilled />
-                    </el-icon>
-                  </div>
-                </div>
+                        <el-form-item :label="t('diyForm')">
+                            <el-select v-model="goodsEdit.formData.form_id" :placeholder="t('diyFormPlaceholder')" clearable>
+                                <el-option v-for="item in goodsEdit.diyFormOptions" :key="item.form_id" :label="item.page_title" :value="item.form_id" />
+                            </el-select>
+                            <div class="ml-[10px]">
+                                <span class="cursor-pointer text-primary mr-[10px]" @click="goodsEdit.refreshDiyForm(true)">{{ t('refresh') }}</span>
+                                <span class="cursor-pointer text-primary" @click="goodsEdit.toDiyFormEvent">{{ t('addDiyForm') }}</span>
+                            </div>
+                        </el-form-item>
 
-                <div class="add-spec">
-                  <el-button type="primary" @click="goodsEdit.addSpec">{{
-                    t('addSpec')
-                  }}</el-button>
-                </div>
+                        <el-form-item :label="t('label')">
+                            <el-checkbox-group v-model="goodsEdit.formData.label_ids">
+                                <el-checkbox :label="item.label_id" v-for="(item, index) in goodsEdit.labelOptions" :key="index" >{{ item.label_name }}</el-checkbox>
+                            </el-checkbox-group>
+                            <div class="ml-[10px]">
+                                <span class="cursor-pointer text-primary mr-[10px]" @click="goodsEdit.refreshGoodsLabel">{{ t('refresh') }}</span>
+                                <span class="cursor-pointer text-primary" @click="goodsEdit.toGoodsLabelEvent">{{ t('addGoodsLabel') }}</span>
+                            </div>
+                        </el-form-item>
+                        <el-form-item :label="t('goodsService')">
+                            <el-checkbox-group v-model="goodsEdit.formData.service_ids">
+                                <el-checkbox :label="item.service_id" v-for="(item, index) in goodsEdit.serviceOptions" :key="index" >{{ item.service_name }}</el-checkbox>
+                            </el-checkbox-group>
+                            <div class="ml-[10px]">
+                                <span class="cursor-pointer text-primary mr-[10px]" @click="goodsEdit.refreshGoodsService">{{ t('refresh') }}</span>
+                                <span class="cursor-pointer text-primary" @click="goodsEdit.toGoodsServiceEvent">{{ t('addGoodsService') }}</span>
+                            </div>
+                        </el-form-item>
+
+                        <el-form-item :label="t('supplier')" v-if="goodsEdit.formData.addon_shop_supplier && goodsEdit.formData.addon_shop_supplier.status == 1">
+                            <el-select v-model="goodsEdit.formData.supplier_id" :placeholder="t('supplierPlaceholder')" clearable>
+                                <el-option v-for="item in goodsEdit.supplierOptions" :key="item.supplier_id" :label="item.supplier_name" :value="item.supplier_id" />
+                            </el-select>
+                            <div class="ml-[10px]">
+                                <span class="cursor-pointer text-primary mr-[10px]" @click="goodsEdit.refreshSupplier">{{ t('refresh') }}</span>
+                                <span class="cursor-pointer text-primary" @click="goodsEdit.toSupplierEvent">{{ t('addSupplier') }}</span>
+                            </div>
+                        </el-form-item>
+                        <el-form-item :label="t('status')">
+                            <el-radio-group v-model="goodsEdit.formData.status">
+                                <el-radio label="1">{{ t('statusOn') }}</el-radio>
+                                <el-radio label="0">{{ t('statusOff') }}</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                        <el-form-item :label="t('isGive')">
+                            <div>
+                                <el-radio-group v-model="goodsEdit.formData.is_gift">
+                                    <el-radio :label= "1">{{ t('yes') }}</el-radio>
+                                    <el-radio :label= "0">{{ t('no') }}</el-radio>
+                                </el-radio-group>
+                                <div class="mt-[10px] text-[12px] text-[#999] leading-[20px]">{{ t('giftTips') }}</div>
+                            </div>
+                        </el-form-item>
+                        <el-form-item :label="t('unit')" prop="unit">
+                            <el-input v-model.trim="goodsEdit.formData.unit" clearable :placeholder="t('unitPlaceholder')" class="input-width" show-word-limit maxlength="6" />
+                        </el-form-item>
+                        <el-form-item :label="t('virtualSaleNum')" prop="virtual_sale_num">
+                            <div>
+                                <el-input v-model.trim="goodsEdit.formData.virtual_sale_num" clearable :placeholder="t('virtualSaleNumPlaceholder')" class="input-width" show-word-limit maxlength="8" @keyup="filterNumber($event)" @blur="goodsEdit.formData.virtual_sale_num = $event.target.value">
+                                    <template #append>{{ goodsEdit.formData.unit ? goodsEdit.formData.unit : '件' }}</template>
+                                </el-input>
+                                <div class="mt-[10px] text-[12px] text-[#999] leading-[20px]">{{ t('virtualSaleNumDesc') }}</div>
+                            </div>
+                        </el-form-item>
+                        <el-form-item :label="t('setDeliverGoods')">
+                            <el-radio-group v-model="goodsEdit.formData.virtual_auto_delivery">
+                                <el-radio label="1" :disabled="isDisabledVirtual">{{ t('autoDeliverGoods') }}</el-radio>
+                                <el-radio label="0" :disabled="isDisabledVirtual">{{ t('handDeliverGoods') }}</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                        <el-form-item :label="t('setTakeGoods')">
+                            <div>
+                                <el-radio-group v-model="goodsEdit.formData.virtual_receive_type">
+                                    <el-radio label="auto" :disabled="isDisabledVirtual">{{ t('autoTakeGoods') }}</el-radio>
+                                    <el-radio label="artificial" :disabled="isDisabledVirtual">{{ t('handTakeGoods') }}</el-radio>
+                                    <el-radio label="verify" :disabled="isDisabledVirtual">{{ t('verifyTakeGoods') }}</el-radio>
+                                </el-radio-group>
+                                <div class="mt-[10px] text-[12px] text-[#999] leading-[20px]" v-show="goodsEdit.formData.virtual_receive_type == 'verify'">{{ t('virtualSetTips') }}</div>
+                            </div>
+                        </el-form-item>
+                        <el-form-item :label="t('verifyVirtualIndate')" v-if="goodsEdit.formData.virtual_receive_type == 'verify'">
+                            <el-radio-group v-model="goodsEdit.formData.virtual_verify_type">
+                                <el-radio label="0">{{ t('verifyVirtualIndateOne') }}</el-radio>
+                                <el-radio label="1">{{ t('verifyVirtualIndateTwo') }}</el-radio>
+                                <el-radio label="2">{{ t('verifyVirtualIndateThree') }}</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+
+                        <el-form-item :label="t('virtualIndate')" v-if="goodsEdit.formData.virtual_receive_type == 'verify' && goodsEdit.formData.virtual_verify_type == 1" prop="virtual_indate_day">
+                            <el-input v-model.trim="goodsEdit.formData.virtual_indate_day" clearable class="input-width" show-word-limit maxlength="5" @keyup="filterNumber($event)">
+                                <template #append>{{t('sky')}}</template>
+                            </el-input>
+                        </el-form-item>
+                        <el-form-item :label="t('virtualIndate')" v-if="goodsEdit.formData.virtual_receive_type == 'verify' && goodsEdit.formData.virtual_verify_type == 2" prop="virtual_indate">
+                             <div>
+                                 <el-date-picker
+                                    class="input-width"
+                                    value-format="YYYY-MM-DD HH:mm:ss"
+                                    v-model="goodsEdit.formData.virtual_indate"
+                                    type="datetime"
+                                    :disabled-date="disabledPastDates"
+                                />
+                                <div class="mt-[10px] text-[12px] text-[#999] leading-[20px]">{{t('verifyHint')}}</div>
+                             </div>
+                        </el-form-item>
+                        <el-form-item :label="t('sort')" prop="sort">
+                            <el-input v-model.trim="goodsEdit.formData.sort" clearable :placeholder="t('sortPlaceholder')" class="input-width" show-word-limit maxlength="8" @keyup="filterNumber($event)" />
+                        </el-form-item>
+
+                    </el-form>
+
+                </el-tab-pane>
+                <el-tab-pane :label="t('priceStockTab')" name="price_stock">
+                    <el-form :model="goodsEdit.formData" label-width="120px" ref="priceStockFormRef" :rules="goodsEdit.formRules" class="page-form">
+                        <el-form-item :label="t('specType')" prop="spec_type">
+                            <div>
+                                <el-radio-group v-model="goodsEdit.formData.spec_type">
+                                    <el-radio label="single" :disabled="goodsEdit.isDisabledPrice()">{{ t('singleSpec') }}</el-radio>
+                                    <el-radio label="multi" :disabled="goodsEdit.isDisabledPrice()">{{ t('multiSpec') }}</el-radio>
+                                </el-radio-group>
+                                <div class="mt-[10px] text-[12px] text-[#999] leading-[20px]" v-if="goodsEdit.isDisabledPrice()">{{ t('participateInActiveDisableTips') }}</div>
+                            </div>
+                        </el-form-item>
+
+                        <template v-if="goodsEdit.formData.spec_type == 'single'">
+                            <el-form-item :label="t('price')" prop="price">
+                                <el-input v-model.trim="goodsEdit.formData.price" clearable placeholder="0.00" class="input-width" maxlength="8" :disabled="goodsEdit.isDisabledPrice()">
+                                    <template #append>{{ t('yuan') }}</template>
+                                </el-input>
+                            </el-form-item>
+
+                            <el-form-item :label="t('marketPrice')" prop="market_price">
+                                <el-input v-model.trim="goodsEdit.formData.market_price" clearable placeholder="0.00" class="input-width" maxlength="8">
+                                    <template #append>{{ t('yuan') }}</template>
+                                </el-input>
+                            </el-form-item>
+
+                            <el-form-item :label="t('costPrice')" prop="cost_price">
+                                <el-input v-model.trim="goodsEdit.formData.cost_price" clearable placeholder="0.00" class="input-width" maxlength="8">
+                                    <template #append>{{ t('yuan') }}</template>
+                                </el-input>
+                            </el-form-item>
+                            <el-form-item :label="t('goodsStock')" prop="stock">
+                                <el-input v-model.trim="goodsEdit.formData.stock" clearable :placeholder="t('goodsStockPlaceholder')" class="input-width" maxlength="8" @keyup="filterNumber($event)" :disabled="goodsEdit.isDisabledPrice()">
+                                    <template #append>{{ goodsEdit.formData.unit ? goodsEdit.formData.unit : t('defaultUnit') }}</template>
+                                </el-input>
+                            </el-form-item>
+                            <el-form-item :label="t('skuNo')">
+                                <el-input v-model.trim="goodsEdit.formData.sku_no" clearable :placeholder="t('skuNoPlaceholder')" class="input-width" maxlength="50" @keyup="goodsEdit.filterSpecial($event)"  />
+                            </el-form-item>
+                        </template>
+
+                    </el-form>
+
+                    <!-- 多规格 -->
+                    <el-form :model="goodsEdit.goodsSkuData" label-width="120px" ref="skuFormRef" class="page-form">
+
+                        <div class="el-form-item asterisk-left" v-show="goodsEdit.formData.spec_type == 'multi'">
+                            <div class="el-form-item__label w-[120px]">{{ t('goodsSku') }}</div>
+                            <div class="spec-wrap">
+                                <!--规格项/规格值-->
+                                <div class="spec-edit-list">
+
+                                    <div class="spec-item" v-for="(item, index) in goodsEdit.goodsSpecFormat" :key="item.id">
+                                        <div class="spec-name-wrap">
+                                            <el-input v-model.trim="item.spec_name" clearable :placeholder="t('specNamePlaceholder')" class="input-width" maxlength="20" />
+                                        </div>
+                                        <div class="spec-value-wrap">
+                                            <ul ref="specValueRef">
+                                                <li :class="'draggable-element' + index" v-for="(specValue, specIndex) in item.values" :key="specValue.id">
+
+                                                    <el-input v-model.trim="specValue.spec_value_name" clearable
+                                                              :placeholder="t('specValueNamePlaceholder')" class="input-width"
+                                                              :suffix-icon="Rank" maxlength="20"
+                                                              @input="goodsEdit.specValueNameInputListener">
+
+                                                    </el-input>
+                                                    <el-icon class="icon" :size="20" color="#7b7b7b" @click="goodsEdit.deleteSpecValue(index, specIndex)">
+                                                        <CircleCloseFilled />
+                                                    </el-icon>
+
+                                                </li>
+                                            </ul>
+                                            <span class="text-primary text-[14px] add-spec-value" @click="goodsEdit.addSpecValue(index)">{{ t('addSpecValue') }}</span>
+                                            <div class="box"></div>
+                                        </div>
 
-                <!-- 批量设置 -->
-                <div
-                  class="batch-operation-sku"
-                  v-show="Object.keys(goodsEdit.goodsSkuData).length"
-                >
-                  <label>{{ t('batchOperationSku') }}</label>
+                                        <el-icon class="del-spec" :size="20" color="#7b7b7b" @click="goodsEdit.deleteSpec(index)">
+                                            <CircleCloseFilled />
+                                        </el-icon>
+                                    </div>
 
-                  <!--                                    <el-select v-model="goodsEdit.batchOperation.spec" class="set-spec-select" :placeholder="t('all')">-->
-                  <!--                                        <el-option :label="t('all')" value="" />-->
-                  <!--                                        <template v-for="(item, key) in goodsEdit.goodsSkuData" :key="key">-->
-                  <!--                                            <el-option v-if="item.spec_name" :label="item.spec_name" :value="key" />-->
-                  <!--                                        </template>-->
-                  <!--                                    </el-select>-->
+                                </div>
 
-                  <el-input
-                    v-if="!goodsEdit.isDisabledPrice()"
-                    v-model.trim="goodsEdit.batchOperation.price"
-                    clearable
-                    :placeholder="t('price')"
-                    class="set-input"
-                    maxlength="8"
-                  />
-                  <el-input
-                    v-model.trim="goodsEdit.batchOperation.market_price"
-                    clearable
-                    :placeholder="t('marketPrice')"
-                    class="set-input"
-                    maxlength="8"
-                  />
-                  <el-input
-                    v-model.trim="goodsEdit.batchOperation.cost_price"
-                    clearable
-                    :placeholder="t('costPrice')"
-                    class="set-input"
-                    maxlength="8"
-                  />
-                  <el-input
-                    v-if="!goodsEdit.isDisabledPrice()"
-                    v-model.trim="goodsEdit.batchOperation.stock"
-                    clearable
-                    :placeholder="t('stock')"
-                    class="set-input"
-                    maxlength="8"
-                  />
-                  <el-input
-                    v-model.trim="goodsEdit.batchOperation.sku_no"
-                    clearable
-                    maxlength="50"
-                    :placeholder="t('skuNo')"
-                    class="set-input"
-                  />
-                  <el-button type="primary" @click="goodsEdit.saveBatch">{{
-                    t('confirm')
-                  }}</el-button>
-                </div>
+                                <div class="add-spec">
+                                    <el-button type="primary" @click="goodsEdit.addSpec">{{ t('addSpec') }}</el-button>
+                                </div>
 
-                <!--sku列表-->
-                <div
-                  class="sku-table"
-                  v-show="Object.keys(goodsEdit.goodsSkuData).length"
-                >
-                  <div
-                    class="el-table--fit el-table--default el-table"
-                    style="width: 100%"
-                  >
-                    <div class="el-table__inner-wrapper">
-                      <div class="el-table__header-wrapper">
-                        <table
-                          class="el-table__header"
-                          border="0"
-                          cellpadding="0"
-                          cellspacing="0"
-                          style="width: 100%"
-                        >
-                          <thead>
-                            <tr>
-                              <th class="el-table__cell w-[50px]">
-                                <div class="cell">
-                                  <el-checkbox
-                                    v-model="goodsEdit.formData.skuCheckAll"
-                                    :indeterminate="
-                                      goodsEdit.formData.skuIsIndeterminate
-                                    "
-                                    @change="goodsEdit.skuHandleCheckAllChange"
-                                  ></el-checkbox>
+                                <!-- 批量设置 -->
+                                <div class="batch-operation-sku" v-show="Object.keys(goodsEdit.goodsSkuData).length">
+                                    <label>{{ t('batchOperationSku') }}</label>
+
+<!--                                    <el-select v-model="goodsEdit.batchOperation.spec" class="set-spec-select" :placeholder="t('all')">-->
+<!--                                        <el-option :label="t('all')" value="" />-->
+<!--                                        <template v-for="(item, key) in goodsEdit.goodsSkuData" :key="key">-->
+<!--                                            <el-option v-if="item.spec_name" :label="item.spec_name" :value="key" />-->
+<!--                                        </template>-->
+<!--                                    </el-select>-->
+
+                                    <el-input v-if="!goodsEdit.isDisabledPrice()" v-model.trim="goodsEdit.batchOperation.price" clearable :placeholder="t('price')" class="set-input" maxlength="8" />
+                                    <el-input v-model.trim="goodsEdit.batchOperation.market_price" clearable :placeholder="t('marketPrice')" class="set-input" maxlength="8" />
+                                    <el-input v-model.trim="goodsEdit.batchOperation.cost_price" clearable :placeholder="t('costPrice')" class="set-input" maxlength="8" />
+                                    <el-input v-if="!goodsEdit.isDisabledPrice()" v-model.trim="goodsEdit.batchOperation.stock" clearable :placeholder="t('stock')" class="set-input" maxlength="8" />
+                                    <el-input v-model.trim="goodsEdit.batchOperation.sku_no" clearable maxlength="50" :placeholder="t('skuNo')" class="set-input" />
+                                    <el-button type="primary" @click="goodsEdit.saveBatch">{{ t('confirm') }}</el-button>
                                 </div>
-                              </th>
-                              <template
-                                v-for="(
-                                  item, index
-                                ) in goodsEdit.goodsSpecFormat"
-                                :key="index"
-                              >
-                                <th
-                                  class="el-table__cell"
-                                  v-if="item.spec_name"
-                                >
-                                  <div class="cell">{{ item.spec_name }}</div>
-                                </th>
-                              </template>
 
-                              <th class="el-table__cell">
-                                <div class="cell">{{ t('image') }}</div>
-                              </th>
-                              <th class="el-table__cell">
-                                <div class="cell">{{ t('price') }}</div>
-                              </th>
-                              <th class="el-table__cell">
-                                <div class="cell">{{ t('marketPrice') }}</div>
-                              </th>
-                              <th class="el-table__cell">
-                                <div class="cell">{{ t('costPrice') }}</div>
-                              </th>
-                              <th class="el-table__cell">
-                                <div class="cell">{{ t('stock') }}</div>
-                              </th>
-                              <th class="el-table__cell">
-                                <div class="cell">{{ t('skuNo') }}</div>
-                              </th>
-                              <th class="el-table__cell">
-                                <div class="cell">{{ t('defaultSku') }}</div>
-                              </th>
-                            </tr>
-                          </thead>
-                        </table>
-                      </div>
-                      <el-checkbox-group
-                        v-model="goodsEdit.formData.skuCheckedCities"
-                        @change="goodsEdit.handleCheckedCitiesChange"
-                      >
-                        <div class="el-table__body-wrapper text-[14px]">
-                          <div class="el-scrollbar">
-                            <div
-                              class="el-scrollbar__wrap el-scrollbar__wrap--hidden-default"
-                            >
-                              <div
-                                class="el-scrollbar__view"
-                                style="
-                                  display: inline-block;
-                                  vertical-align: middle;
-                                "
-                              >
-                                <table
-                                  class="el-table__body"
-                                  cellspacing="0"
-                                  cellpadding="0"
-                                  border="0"
-                                  style="table-layout: fixed; width: 100%"
-                                >
-                                  <tbody tabindex="-1">
-                                    <tr
-                                      class="el-table__row"
-                                      v-for="(
-                                        item, key, index
-                                      ) in goodsEdit.goodsSkuData"
-                                      :key="key"
-                                    >
-                                      <td class="el-table__cell w-[50px]">
-                                        <div class="cell">
-                                          <el-checkbox
-                                            :label="key"
-                                            :key="key"
-                                            >{{ '' }}</el-checkbox
-                                          >
+                                <!--sku列表-->
+                                <div class="sku-table" v-show="Object.keys(goodsEdit.goodsSkuData).length">
+
+                                    <div class="el-table--fit el-table--default el-table" style="width: 100%;">
+                                        <div class="el-table__inner-wrapper">
+                                            <div class="el-table__header-wrapper">
+                                                <table class="el-table__header" border="0" cellpadding="0" cellspacing="0" style="width: 100%;">
+                                                    <thead>
+                                                        <tr>
+                                                            <th class="el-table__cell w-[50px]">
+                                                                <div class="cell">
+                                                                    <el-checkbox
+                                                                        v-model="goodsEdit.formData.skuCheckAll"
+                                                                        :indeterminate="goodsEdit.formData.skuIsIndeterminate"
+                                                                        @change="goodsEdit.skuHandleCheckAllChange"
+                                                                    ></el-checkbox>
+                                                                </div>
+                                                            </th>
+                                                            <template v-for="(item, index) in goodsEdit.goodsSpecFormat" :key="index">
+                                                                <th class="el-table__cell" v-if="item.spec_name">
+                                                                    <div class="cell">{{ item.spec_name }}</div>
+                                                                </th>
+                                                            </template>
+
+                                                            <th class="el-table__cell">
+                                                                <div class="cell">{{ t('image') }}</div>
+                                                            </th>
+                                                            <th class="el-table__cell">
+                                                                <div class="cell">{{ t('price') }}</div>
+                                                            </th>
+                                                            <th class="el-table__cell">
+                                                                <div class="cell">{{ t('marketPrice') }}</div>
+                                                            </th>
+                                                            <th class="el-table__cell">
+                                                                <div class="cell">{{ t('costPrice') }}</div>
+                                                            </th>
+                                                            <th class="el-table__cell">
+                                                                <div class="cell">{{ t('stock') }}</div>
+                                                            </th>
+                                                            <th class="el-table__cell">
+                                                                <div class="cell">{{ t('skuNo') }}</div>
+                                                            </th>
+                                                            <th class="el-table__cell">
+                                                                <div class="cell">{{ t('defaultSku') }}</div>
+                                                            </th>
+                                                        </tr>
+                                                    </thead>
+                                                </table>
+                                            </div>
+                                            <el-checkbox-group v-model="goodsEdit.formData.skuCheckedCities" @change="goodsEdit.handleCheckedCitiesChange">
+                                                <div class="el-table__body-wrapper text-[14px]">
+                                                    <div class="el-scrollbar">
+                                                        <div class="el-scrollbar__wrap el-scrollbar__wrap--hidden-default">
+                                                            <div class="el-scrollbar__view" style="display: inline-block; vertical-align: middle;">
+                                                                <table class="el-table__body" cellspacing="0" cellpadding="0" border="0" style="table-layout: fixed; width: 100%;">
+                                                                    <tbody tabindex="-1">
+                                                                        <tr class="el-table__row" v-for="(item, key, index) in goodsEdit.goodsSkuData" :key="key">
+                                                                            <td class="el-table__cell w-[50px]">
+                                                                                <div class="cell">
+                                                                                    <el-checkbox :label="key" :key="key">{{ '' }}</el-checkbox>
+                                                                                </div>
+                                                                            </td>
+                                                                            <template v-for="(c, cIndex) in goodsEdit.specData" :key="cIndex">
+                                                                                <td class="el-table__cell" :rowspan="c.rowSpan" v-if="c.index == index">
+                                                                                    <div class="cell">{{ c.spec_value_name }}</div>
+                                                                                </td>
+                                                                            </template>
+
+                                                                            <td class="el-table__cell">
+                                                                                <div class="cell">
+                                                                                    <upload-image v-model="item.sku_image" :limit="1" width="50px" height="50px" />
+                                                                                </div>
+                                                                            </td>
+
+                                                                            <td class="el-table__cell">
+                                                                                <div class="cell">
+                                                                                    <el-form-item :prop="key + '.price'" :rules="goodsEdit.skuPriceRules()" class="sku-form-item-wrap">
+                                                                                        <el-input v-model.trim="item.price" clearable placeholder="0.00" maxlength="8" :disabled="goodsEdit.isDisabledPrice()" />
+                                                                                    </el-form-item>
+                                                                                </div>
+                                                                            </td>
+                                                                            <td class="el-table__cell">
+                                                                                <div class="cell">
+                                                                                    <el-form-item :prop="key + '.market_price'" :rules="goodsEdit.skuMarketPriceRules()" class="sku-form-item-wrap">
+                                                                                        <el-input v-model.trim="item.market_price" clearable placeholder="0.00" maxlength="8" />
+                                                                                    </el-form-item>
+                                                                                </div>
+                                                                            </td>
+                                                                            <td class="el-table__cell">
+                                                                                <div class="cell">
+                                                                                    <el-form-item :prop="key + '.cost_price'" :rules="goodsEdit.skuCostPriceRules()" class="sku-form-item-wrap">
+                                                                                        <el-input v-model.trim="item.cost_price" clearable placeholder="0.00" maxlength="8" />
+                                                                                    </el-form-item>
+                                                                                </div>
+                                                                            </td>
+                                                                            <td class="el-table__cell">
+                                                                                <div class="cell">
+                                                                                    <el-form-item :prop="key + '.stock'" :rules="goodsEdit.skuStockRules()" class="sku-form-item-wrap">
+                                                                                        <el-input v-model.trim="item.stock" clearable placeholder="0" @input="goodsEdit.specStockSum" maxlength="8" :disabled="goodsEdit.isDisabledPrice()" />
+                                                                                    </el-form-item>
+                                                                                </div>
+                                                                            </td>
+                                                                            <td class="el-table__cell">
+                                                                                <div class="cell">
+                                                                                    <el-input v-model.trim="item.sku_no" clearable maxlength="50" />
+                                                                                </div>
+                                                                            </td>
+                                                                            <td class="el-table__cell">
+                                                                                <div class="cell">
+                                                                                    <el-switch v-model="item.is_default" :active-value="1" :inactive-value="0" @change="goodsEdit.specValueIsDefaultChangeListener($event, key)" />
+                                                                                </div>
+                                                                            </td>
+                                                                        </tr>
+                                                                    </tbody>
+                                                                </table>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </el-checkbox-group>
                                         </div>
-                                      </td>
-                                      <template
-                                        v-for="(
-                                          c, cIndex
-                                        ) in goodsEdit.specData"
-                                        :key="cIndex"
-                                      >
-                                        <td
-                                          class="el-table__cell"
-                                          :rowspan="c.rowSpan"
-                                          v-if="c.index == index"
-                                        >
-                                          <div class="cell">
-                                            {{ c.spec_value_name }}
-                                          </div>
-                                        </td>
-                                      </template>
+                                    </div>
 
-                                      <td class="el-table__cell">
-                                        <div class="cell">
-                                          <upload-image
-                                            v-model="item.sku_image"
-                                            :limit="1"
-                                            width="50px"
-                                            height="50px"
-                                          />
-                                        </div>
-                                      </td>
+                                </div>
 
-                                      <td class="el-table__cell">
-                                        <div class="cell">
-                                          <el-form-item
-                                            :prop="key + '.price'"
-                                            :rules="goodsEdit.skuPriceRules()"
-                                            class="sku-form-item-wrap"
-                                          >
-                                            <el-input
-                                              v-model.trim="item.price"
-                                              clearable
-                                              placeholder="0.00"
-                                              maxlength="8"
-                                              :disabled="
-                                                goodsEdit.isDisabledPrice()
-                                              "
-                                            />
-                                          </el-form-item>
-                                        </div>
-                                      </td>
-                                      <td class="el-table__cell">
-                                        <div class="cell">
-                                          <el-form-item
-                                            :prop="key + '.market_price'"
-                                            :rules="
-                                              goodsEdit.skuMarketPriceRules()
-                                            "
-                                            class="sku-form-item-wrap"
-                                          >
-                                            <el-input
-                                              v-model.trim="item.market_price"
-                                              clearable
-                                              placeholder="0.00"
-                                              maxlength="8"
-                                            />
-                                          </el-form-item>
-                                        </div>
-                                      </td>
-                                      <td class="el-table__cell">
-                                        <div class="cell">
-                                          <el-form-item
-                                            :prop="key + '.cost_price'"
-                                            :rules="
-                                              goodsEdit.skuCostPriceRules()
-                                            "
-                                            class="sku-form-item-wrap"
-                                          >
-                                            <el-input
-                                              v-model.trim="item.cost_price"
-                                              clearable
-                                              placeholder="0.00"
-                                              maxlength="8"
-                                            />
-                                          </el-form-item>
-                                        </div>
-                                      </td>
-                                      <td class="el-table__cell">
-                                        <div class="cell">
-                                          <el-form-item
-                                            :prop="key + '.stock'"
-                                            :rules="goodsEdit.skuStockRules()"
-                                            class="sku-form-item-wrap"
-                                          >
-                                            <el-input
-                                              v-model.trim="item.stock"
-                                              clearable
-                                              placeholder="0"
-                                              @input="goodsEdit.specStockSum"
-                                              maxlength="8"
-                                              :disabled="
-                                                goodsEdit.isDisabledPrice()
-                                              "
-                                            />
-                                          </el-form-item>
-                                        </div>
-                                      </td>
-                                      <td class="el-table__cell">
-                                        <div class="cell">
-                                          <el-input
-                                            v-model.trim="item.sku_no"
-                                            clearable
-                                            maxlength="50"
-                                          />
-                                        </div>
-                                      </td>
-                                      <td class="el-table__cell">
-                                        <div class="cell">
-                                          <el-switch
-                                            v-model="item.is_default"
-                                            :active-value="1"
-                                            :inactive-value="0"
-                                            @change="
-                                              goodsEdit.specValueIsDefaultChangeListener(
-                                                $event,
-                                                key
-                                              )
-                                            "
-                                          />
-                                        </div>
-                                      </td>
-                                    </tr>
-                                  </tbody>
-                                </table>
-                              </div>
                             </div>
-                          </div>
                         </div>
-                      </el-checkbox-group>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
 
-            <el-form-item :label="t('memberDiscount')">
-              <div>
-                <el-radio-group v-model="goodsEdit.formData.member_discount">
-                  <el-radio label="">{{ t('nonparticipation') }}</el-radio>
-                  <el-radio label="discount">{{ t('discount') }}</el-radio>
-                  <el-radio label="fixed_price">{{ t('fixedPrice') }}</el-radio>
-                </el-radio-group>
-                <div
-                  class="text-[12px] text-[#999] leading-[20px]"
-                  v-if="goodsEdit.formData.member_discount == 'discount'"
-                >
-                  {{ t('discountHint') }}
-                </div>
-                <div
-                  class="text-[12px] text-[#999] leading-[20px]"
-                  v-if="goodsEdit.formData.member_discount == 'fixed_price'"
-                >
-                  {{ t('fixedPriceHint') }}
-                </div>
-              </div>
-            </el-form-item>
-          </el-form>
-
-          <el-form
-            :model="goodsEdit.formData"
-            label-width="120px"
-            ref="priceStockCommonFormRef"
-            :rules="goodsEdit.formRules"
-            class="page-form"
-          >
-            <el-form-item :label="t('isLimit')">
-              <div>
-                <el-switch
-                  v-model="goodsEdit.formData.is_limit"
-                  :active-value="1"
-                  :inactive-value="0"
-                />
-                <div class="mt-[10px] text-[12px] text-[#999] leading-[20px]">
-                  {{ t('isLimitTips') }}
-                </div>
-              </div>
-            </el-form-item>
-            <el-form-item
-              :label="t('limitType')"
-              prop="limit_type"
-              v-if="goodsEdit.formData.is_limit == '1'"
-            >
-              <div>
-                <el-radio-group v-model="goodsEdit.formData.limit_type">
-                  <el-radio :label="1">{{ t('singleTime') }}</el-radio>
-                  <el-radio :label="2">{{ t('singlePerson') }}</el-radio>
-                </el-radio-group>
-                <div class="mt-[10px] text-[12px] text-[#999] leading-[20px]">
-                  {{ t('limitTypeTips') }}
-                </div>
-              </div>
-            </el-form-item>
-            <el-form-item
-              :label="t('maxBuy')"
-              prop="max_buy"
-              v-if="goodsEdit.formData.is_limit == '1'"
-            >
-              <div>
-                <el-input
-                  v-model.trim="goodsEdit.formData.max_buy"
-                  clearable
-                  :placeholder="t('maxBuyPlaceholder')"
-                  class="input-width"
-                  maxlength="8"
-                  @keyup="filterNumber($event)"
-                >
-                  <template #append>{{
-                    goodsEdit.formData.unit
-                      ? goodsEdit.formData.unit
-                      : t('defaultUnit')
-                  }}</template>
-                </el-input>
-                <div class="mt-[10px] text-[12px] text-[#999] leading-[20px]">
-                  {{ t('maxBuyWarnTips') }}
-                </div>
-              </div>
-            </el-form-item>
-            <el-form-item :label="t('minBuy')" prop="min_buy">
-              <div>
-                <el-input
-                  v-model.trim="goodsEdit.formData.min_buy"
-                  clearable
-                  class="input-width"
-                  maxlength="8"
-                  @keyup="filterNumber($event)"
-                >
-                  <template #append>{{
-                    goodsEdit.formData.unit
-                      ? goodsEdit.formData.unit
-                      : t('defaultUnit')
-                  }}</template>
-                </el-input>
-                <div class="mt-[10px] text-[12px] text-[#999] leading-[20px]">
-                  {{ t('minBuyTips') }}
-                </div>
-              </div>
-            </el-form-item>
-          </el-form>
-        </el-tab-pane>
-        <el-tab-pane :label="t('goodsArguments')" name="goods_arguments">
-          <el-form
-            :model="goodsEdit.formData"
-            label-width="120px"
-            ref="goodsArgumentsFormRef"
-            :rules="goodsEdit.formRules"
-            class="page-form"
-          >
-            <el-form-item :label="t('goodsArgumentsTemp')">
-              <div>
-                <el-select
-                  v-model="goodsEdit.formData.attr_id"
-                  :placeholder="t('goodsArgumentsTempPlaceholder')"
-                  clearable
-                  @change="goodsEdit.attrChange"
-                  @clear="goodsEdit.attrChange(-1)"
-                >
-                  <el-option
-                    v-for="item in goodsEdit.attrOptions"
-                    :key="item.attr_id"
-                    :label="item.attr_name"
-                    :value="item.attr_id"
-                  />
-                </el-select>
-                <div class="mt-[10px] text-[12px] text-[#999] leading-[20px]">
-                  {{ t('goodsArgumentsTempHint') }}
-                </div>
-                <table class="attr-table mt-[10px]">
-                  <colgroup>
-                    <col width="30%" />
-                    <col width="40%" />
-                    <col width="20%" />
-                    <col width="10%" />
-                  </colgroup>
-                  <thead class="bg-[#f7f7f7]">
-                    <tr>
-                      <th>{{ t('argumentsName') }}</th>
-                      <th>{{ t('argumentsValue') }}</th>
-                      <th class="prompt-block">
-                        <div class="flex items-center">
-                          <span>{{ t('sort') }}</span>
-                          <el-tooltip
-                            class="box-item"
-                            effect="dark"
-                            :content="t('argumentsSortHint')"
-                            placement="right"
-                          >
-                            <span
-                              class="iconfont iconwenhao cursor-pointer ml-[3px] mt-[3px] !text-[14px]"
-                            ></span>
-                          </el-tooltip>
-                        </div>
-                      </th>
-                      <th>{{ t('operation') }}</th>
-                    </tr>
-                  </thead>
-                  <tbody class="attr-new">
-                    <template v-if="goodsEdit.attrTableData.length">
-                      <tr
-                        class="goods-attr-tr goods-new-attr-tr"
-                        v-for="(item, index) in goodsEdit.attrTableData"
-                        :key="index"
-                      >
-                        <td v-if="item.attr_value_id > 0">
-                          {{ item.attr_value_name }}
-                        </td>
-                        <td v-else>
-                          <el-input
-                            maxlength="20"
-                            show-word-limit
-                            v-model.trim="item.attr_value_name"
-                            clearable
-                          />
-                        </td>
-                        <td>
-                          <el-input
-                            maxlength="20"
-                            show-word-limit
-                            v-if="item.type == 'text'"
-                            v-model.trim="item.select_child_val"
-                            clearable
-                          />
-                          <div v-else-if="item.type == 'radio'">
-                            <el-radio-group
-                              v-model="item.select_child_name"
-                              @change="goodsEdit.attrRadioChange(index, $event)"
-                            >
-                              <el-radio
-                                v-for="(childItem, childIndex) in item.child"
-                                :key="childIndex"
-                                :label="childItem.id"
-                                >{{ childItem.name }}</el-radio
-                              >
-                            </el-radio-group>
-                          </div>
-                          <div v-else-if="item.type == 'checkbox'">
-                            <el-checkbox-group
-                              v-model="item.select_child_name"
-                              @change="
-                                goodsEdit.attrCheckboxChange(index, $event)
-                              "
-                            >
-                              <el-checkbox
-                                v-for="(childItem, childIndex) in item.child"
-                                :key="childIndex"
-                                :label="childItem.id"
-                                >{{ childItem.name }}</el-checkbox
-                              >
-                            </el-checkbox-group>
-                          </div>
-                        </td>
-                        <td>
-                          <el-input
-                            maxlength="6"
-                            show-word-limit
-                            v-model.trim="item.sort"
-                            clearable
-                            @keyup="filterNumber($event)"
-                          />
-                        </td>
-                        <td>
-                          <span
-                            class="cursor-pointer text-[var(--el-color-primary)]"
-                            @click="goodsEdit.delAttr(index)"
-                            >{{ t('delAttr') }}</span
-                          >
-                        </td>
-                      </tr>
-                    </template>
-                    <tr v-else>
-                      <td colspan="4" class="text-center">{{ t('noData') }}</td>
-                    </tr>
-                  </tbody>
-                </table>
-                <el-button class="mt-[15px]" @click="goodsEdit.addAttr">{{
-                  t('addGoodsArguments')
-                }}</el-button>
-              </div>
-            </el-form-item>
-          </el-form>
-        </el-tab-pane>
-        <el-tab-pane :label="t('goodsDesc')" name="detail">
-          <el-form
-            :model="goodsEdit.formData"
-            label-width="120px"
-            ref="detailFormRef"
-            :rules="goodsEdit.formRules"
-            class="page-form"
-          >
-            <el-form-item :label="t('goodsDesc')" prop="goods_desc">
-              <editor
-                v-model="goodsEdit.formData.goods_desc"
-                :height="600"
-                class="editor-width"
-                @handleBlur="goodsEdit.handleBlur"
-              />
-            </el-form-item>
-          </el-form>
-        </el-tab-pane>
-      </el-tabs>
-    </el-card>
-    <div class="fixed-footer-wrap">
-      <div class="fixed-footer">
-        <el-button type="primary" @click="save()">{{ t('save') }}</el-button>
-        <el-button @click="goodsEdit.back()">{{ t('back') }}</el-button>
-      </div>
+                        <el-form-item :label="t('memberDiscount')">
+                            <div>
+                                <el-radio-group v-model="goodsEdit.formData.member_discount">
+                                    <el-radio label="">{{ t('nonparticipation') }}</el-radio>
+                                    <el-radio label="discount">{{ t('discount') }}</el-radio>
+                                    <el-radio label="fixed_price">{{ t('fixedPrice') }}</el-radio>
+                                </el-radio-group>
+                                <div class="text-[12px] text-[#999] leading-[20px]" v-if="goodsEdit.formData.member_discount == 'discount'">{{t('discountHint')}}</div>
+                                <div class="text-[12px] text-[#999] leading-[20px]" v-if="goodsEdit.formData.member_discount == 'fixed_price'">{{t('fixedPriceHint')}}</div>
+                            </div>
+                        </el-form-item>
+                    </el-form>
+
+                    <el-form :model="goodsEdit.formData" label-width="120px" ref="priceStockCommonFormRef" :rules="goodsEdit.formRules" class="page-form">
+                        <el-form-item :label="t('isLimit')">
+                            <div>
+                                <el-switch v-model="goodsEdit.formData.is_limit" :active-value="1" :inactive-value="0" />
+                                <div class="mt-[10px] text-[12px] text-[#999] leading-[20px]">{{ t('isLimitTips') }}</div>
+                            </div>
+                        </el-form-item>
+                        <el-form-item :label="t('limitType')" prop="limit_type" v-if="goodsEdit.formData.is_limit == '1'">
+                            <div>
+                                <el-radio-group v-model="goodsEdit.formData.limit_type">
+                                    <el-radio :label="1">{{ t('singleTime') }}</el-radio>
+                                    <el-radio :label="2">{{ t('singlePerson') }}</el-radio>
+                                </el-radio-group>
+                                <div class="mt-[10px] text-[12px] text-[#999] leading-[20px]">{{ t('limitTypeTips') }}</div>
+                            </div>
+                        </el-form-item>
+                        <el-form-item :label="t('maxBuy')" prop="max_buy" v-if="goodsEdit.formData.is_limit == '1'">
+                            <div>
+                                <el-input v-model.trim="goodsEdit.formData.max_buy" clearable :placeholder="t('maxBuyPlaceholder')" class="input-width" maxlength="8" @keyup="filterNumber($event)">
+                                    <template #append>{{ goodsEdit.formData.unit ? goodsEdit.formData.unit : t('defaultUnit') }}</template>
+                                </el-input>
+                                <div class="mt-[10px] text-[12px] text-[#999] leading-[20px]">{{ t('maxBuyWarnTips') }}</div>
+                            </div>
+                        </el-form-item>
+                        <el-form-item :label="t('minBuy')" prop="min_buy">
+                            <div>
+                                <el-input v-model.trim="goodsEdit.formData.min_buy" clearable class="input-width" maxlength="8" @keyup="filterNumber($event)">
+                                    <template #append>{{ goodsEdit.formData.unit ? goodsEdit.formData.unit : t('defaultUnit') }}</template>
+                                </el-input>
+                                <div class="mt-[10px] text-[12px] text-[#999] leading-[20px]">{{ t('minBuyTips') }}</div>
+                            </div>
+                        </el-form-item>
+                    </el-form>
+                </el-tab-pane>
+                <el-tab-pane :label="t('goodsArguments')" name="goods_arguments">
+                    <el-form :model="goodsEdit.formData" label-width="120px" ref="goodsArgumentsFormRef" :rules="goodsEdit.formRules" class="page-form">
+
+                        <el-form-item :label="t('goodsArgumentsTemp')">
+                            <div>
+                                <el-select v-model="goodsEdit.formData.attr_id" :placeholder="t('goodsArgumentsTempPlaceholder')" clearable @change="goodsEdit.attrChange" @clear="goodsEdit.attrChange(-1)">
+                                    <el-option v-for="item in goodsEdit.attrOptions" :key="item.attr_id" :label="item.attr_name" :value="item.attr_id" />
+                                </el-select>
+                                <div class="mt-[10px] text-[12px] text-[#999] leading-[20px]">{{t('goodsArgumentsTempHint')}}</div>
+                                <table class="attr-table mt-[10px]">
+                                    <colgroup>
+                                        <col width="30%">
+                                        <col width="40%">
+                                        <col width="20%">
+                                        <col width="10%">
+                                    </colgroup>
+                                    <thead class="bg-[#f7f7f7]">
+                                        <tr>
+                                            <th>{{t('argumentsName')}}</th>
+                                            <th>{{t('argumentsValue')}}</th>
+                                            <th class="prompt-block">
+                                                <div class="flex items-center">
+                                                    <span>{{t('sort')}}</span>
+                                                    <el-tooltip class="box-item" effect="dark" :content="t('argumentsSortHint')" placement="right">
+                                                        <span class="iconfont iconwenhao cursor-pointer ml-[3px] mt-[3px] !text-[14px]"></span>
+                                                    </el-tooltip>
+                                                </div>
+                                            </th>
+                                            <th>{{t('operation')}}</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody class="attr-new">
+                                        <template v-if="goodsEdit.attrTableData.length">
+                                            <tr class="goods-attr-tr goods-new-attr-tr" v-for="(item,index) in goodsEdit.attrTableData" :key="index">
+                                                <td v-if="item.attr_value_id > 0">{{item.attr_value_name}}</td>
+                                                <td v-else>
+                                                    <el-input  maxlength="20" show-word-limit v-model.trim="item.attr_value_name" clearable/>
+                                                </td>
+                                                <td>
+                                                    <el-input maxlength="20" show-word-limit v-if="item.type == 'text'" v-model.trim="item.select_child_val" clearable/>
+                                                    <div v-else-if="item.type == 'radio'">
+                                                        <el-radio-group v-model="item.select_child_name" @change="goodsEdit.attrRadioChange(index,$event)">
+                                                            <el-radio v-for="(childItem,childIndex) in item.child" :key="childIndex" :label="childItem.id">{{ childItem.name }}</el-radio>
+                                                        </el-radio-group>
+                                                    </div>
+                                                    <div v-else-if="item.type == 'checkbox'">
+                                                        <el-checkbox-group v-model="item.select_child_name" @change="goodsEdit.attrCheckboxChange(index,$event)">
+                                                            <el-checkbox v-for="(childItem,childIndex) in item.child" :key="childIndex" :label="childItem.id">{{ childItem.name }}</el-checkbox>
+                                                        </el-checkbox-group>
+                                                    </div>
+                                                </td>
+                                                <td>
+                                                    <el-input maxlength="6" show-word-limit v-model.trim="item.sort" clearable  @keyup="filterNumber($event)"/>
+                                                </td>
+                                                <td>
+                                                    <span class="cursor-pointer text-[var(--el-color-primary)]" @click="goodsEdit.delAttr(index)">{{t('delAttr')}}</span>
+                                                </td>
+                                            </tr>
+                                        </template>
+                                        <tr v-else>
+                                            <td colspan="4" class="text-center">{{t('noData')}}</td>
+                                        </tr>
+                                    </tbody>
+                                </table>
+                                <el-button class="mt-[15px]" @click="goodsEdit.addAttr">{{t('addGoodsArguments')}}</el-button>
+                            </div>
+                        </el-form-item>
+
+                    </el-form>
+                </el-tab-pane>
+                <el-tab-pane :label="t('goodsDesc')" name="detail">
+                    <el-form :model="goodsEdit.formData" label-width="120px" ref="detailFormRef" :rules="goodsEdit.formRules" class="page-form">
+                        <el-form-item :label="t('goodsDesc')" prop="goods_desc">
+                            <editor v-model="goodsEdit.formData.goods_desc" :height="600" class="editor-width" @handleBlur="goodsEdit.handleBlur" />
+                        </el-form-item>
+                    </el-form>
+                </el-tab-pane>
+            </el-tabs>
+
+        </el-card>
+        <div class="fixed-footer-wrap">
+            <div class="fixed-footer">
+                <el-button type="primary" @click="save()">{{ t('save') }}</el-button>
+                <el-button @click="goodsEdit.back()">{{ t('back') }}</el-button>
+            </div>
+        </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
@@ -1200,9 +564,9 @@ import { Rank, ArrowLeft } from '@element-plus/icons-vue'
 import { filterNumber, timeStampTurnTime } from '@/utils/common'
 import { useRoute, useRouter } from 'vue-router'
 import {
-  addVirtualGoods,
-  editVirtualGoods,
-  getVirtualGoodsInit,
+    addVirtualGoods,
+    editVirtualGoods,
+    getVirtualGoodsInit
 } from '@/addon/shop/api/goods'
 import { useGoodsEdit } from './public/js/useGoodsEdit'
 
@@ -1221,172 +585,130 @@ const priceStockCommonFormRef = ref<FormInstance>()
 const specValueRef = ref()
 
 const goodsEdit = useGoodsEdit({
-  getFormRef() {
-    return {
-      basicFormRef: basicFormRef.value,
-      priceStockFormRef: priceStockFormRef.value,
-      goodsArgumentsFormRef: goodsArgumentsFormRef.value,
-      detailFormRef: detailFormRef.value,
-      skuFormRef: skuFormRef.value,
-      specValueRef: specValueRef.value,
-      priceStockCommonFormRef: priceStockCommonFormRef.value,
+    getFormRef () {
+        return {
+            basicFormRef: basicFormRef.value,
+            priceStockFormRef: priceStockFormRef.value,
+            goodsArgumentsFormRef: goodsArgumentsFormRef.value,
+            detailFormRef: detailFormRef.value,
+            skuFormRef: skuFormRef.value,
+            specValueRef: specValueRef.value,
+            priceStockCommonFormRef: priceStockCommonFormRef.value,
+        }
+    },
+    addApi: addVirtualGoods,
+    editApi: editVirtualGoods,
+    formData: {
+        goods_type: 'virtual'
+    },
+    // 追加表单数据
+    appendFormData: {
+        virtual_auto_delivery: '0',
+        virtual_receive_type: 'auto',
+        virtual_verify_type: '0',
+        virtual_indate: '0',
+        virtual_indate_day: '0' // 几日有效的有效期
+    },
+    // 表单验证规则
+    getFormRules (formData: any, regExp: any) {
+        return {
+            virtual_indate_day: [
+                { required: true, message: t('virtualIndatePlaceholder'), trigger: 'blur' },
+                {
+                    trigger: 'blur',
+                    validator: (rule: any, value: any, callback: any) => {
+                        if (formData.virtual_receive_type == 'verify' && formData.virtual_verify_type == 1 && value < 1) {
+                            callback(new Error(t('virtualIndateErrorHint')))
+                        }
+                        callback()
+                    }
+                }
+            ],
+            virtual_indate: [
+                { required: true, message: t('virtualIndatePlaceholder'), trigger: 'blur' },
+                {
+                    trigger: 'blur',
+                    validator: (rule: any, value: any, callback: any) => {
+                        if (formData.virtual_receive_type == 'verify' && formData.virtual_verify_type == 2) {
+                            const date = new Date(value)
+                            const time = date.getTime()
+                            const date1 = new Date()
+                            const time1 = date1.getTime()
+                            if (time <= time1) { callback(new Error(t('virtualIndateErrorOneHint'))) }
+                        }
+                        callback()
+                    }
+                }
+            ]
+        }
     }
-  },
-  addApi: addVirtualGoods,
-  editApi: editVirtualGoods,
-  formData: {
-    goods_type: 'virtual',
-  },
-  // 追加表单数据
-  appendFormData: {
-    virtual_auto_delivery: '0',
-    virtual_receive_type: 'auto',
-    virtual_verify_type: '0',
-    virtual_indate: '0',
-    virtual_indate_day: '0', // 几日有效的有效期
-  },
-  // 表单验证规则
-  getFormRules(formData: any, regExp: any) {
-    return {
-      virtual_indate_day: [
-        {
-          required: true,
-          message: t('virtualIndatePlaceholder'),
-          trigger: 'blur',
-        },
-        {
-          trigger: 'blur',
-          validator: (rule: any, value: any, callback: any) => {
-            if (
-              formData.virtual_receive_type == 'verify' &&
-              formData.virtual_verify_type == 1 &&
-              value < 1
-            ) {
-              callback(new Error(t('virtualIndateErrorHint')))
-            }
-            callback()
-          },
-        },
-      ],
-      virtual_indate: [
-        {
-          required: true,
-          message: t('virtualIndatePlaceholder'),
-          trigger: 'blur',
-        },
-        {
-          trigger: 'blur',
-          validator: (rule: any, value: any, callback: any) => {
-            if (
-              formData.virtual_receive_type == 'verify' &&
-              formData.virtual_verify_type == 2
-            ) {
-              const date = new Date(value)
-              const time = date.getTime()
-              const date1 = new Date()
-              const time1 = date1.getTime()
-              if (time <= time1) {
-                callback(new Error(t('virtualIndateErrorOneHint')))
-              }
-            }
-            callback()
-          },
-        },
-      ],
-    }
-  },
 })
 
 const orderGoodsCount = ref(0)
 
 const isDisabledVirtual = computed(() => {
-  if (
-    goodsEdit.formData.virtual_receive_type == 'verify' &&
-    orderGoodsCount.value > 0
-  ) {
-    // 虚拟商品，并且设置为店内核销，若存在订单，则禁用，无法编辑
-    return true
-  }
-  return false
+    if (goodsEdit.formData.virtual_receive_type == 'verify' && orderGoodsCount.value > 0) {
+        // 虚拟商品，并且设置为店内核销，若存在订单，则禁用，无法编辑
+        return true
+    }
+    return false
 })
 
 // 加载初始化数据
 getVirtualGoodsInit({
-  goods_id: goodsEdit.formData.goods_id,
+    goods_id: goodsEdit.formData.goods_id
 }).then((res) => {
-  const data = res.data
-  if (data) {
-    goodsEdit.handleGoodsInit(data)
-
-    // 虚拟商品 收发货设置
-    if (goodsEdit.formData.goods_id && data.goods_info) {
-      orderGoodsCount.value = data.goods_info.order_goods_count
-
-      goodsEdit.formData.virtual_auto_delivery = String(
-        data.goods_info.virtual_auto_delivery
-      )
-      goodsEdit.formData.virtual_receive_type =
-        data.goods_info.virtual_receive_type
-      goodsEdit.formData.virtual_verify_type = String(
-        data.goods_info.virtual_verify_type
-      )
-      if (
-        data.goods_info.virtual_receive_type == 'verify' &&
-        data.goods_info.virtual_verify_type == 2
-      ) {
-        goodsEdit.formData.virtual_indate = timeStampTurnTime(
-          data.goods_info.virtual_indate
-        )
-      } else if (
-        data.goods_info.virtual_receive_type == 'verify' &&
-        data.goods_info.virtual_verify_type == 1
-      ) {
-        goodsEdit.formData.virtual_indate_day = data.goods_info.virtual_indate
-      }
+    const data = res.data
+    if (data) {
+        goodsEdit.handleGoodsInit(data)
+
+        // 虚拟商品 收发货设置
+        if (goodsEdit.formData.goods_id && data.goods_info) {
+            orderGoodsCount.value = data.goods_info.order_goods_count
+
+            goodsEdit.formData.virtual_auto_delivery = String(data.goods_info.virtual_auto_delivery)
+            goodsEdit.formData.virtual_receive_type = data.goods_info.virtual_receive_type
+            goodsEdit.formData.virtual_verify_type = String(data.goods_info.virtual_verify_type)
+            if (data.goods_info.virtual_receive_type == 'verify' && data.goods_info.virtual_verify_type == 2) {
+                goodsEdit.formData.virtual_indate = timeStampTurnTime(data.goods_info.virtual_indate)
+            } else if (data.goods_info.virtual_receive_type == 'verify' && data.goods_info.virtual_verify_type == 1) {
+                goodsEdit.formData.virtual_indate_day = data.goods_info.virtual_indate
+            }
+        }
     }
-  }
 })
 
 // 保存数据
 const save = () => {
-  goodsEdit.save((data: any) => {
-    // 收货设置
-    if (
-      data.virtual_receive_type == 'verify' &&
-      data.virtual_verify_type == 2
-    ) {
-      const date = new Date(data.virtual_indate)
-      data.virtual_indate = Math.floor(date.getTime() / 1000)
-    }
-    if (
-      data.virtual_receive_type == 'verify' &&
-      data.virtual_verify_type == 1
-    ) {
-      data.virtual_indate = data.virtual_indate_day
-    }
-    if (
-      data.virtual_receive_type == 'verify' &&
-      data.virtual_verify_type == 0
-    ) {
-      data.virtual_indate = 0
-    }
-  })
+    goodsEdit.save((data: any) => {
+        // 收货设置
+        if (data.virtual_receive_type == 'verify' && data.virtual_verify_type == 2) {
+            const date = new Date(data.virtual_indate)
+            data.virtual_indate = Math.floor(date.getTime() / 1000)
+        }
+        if (data.virtual_receive_type == 'verify' && data.virtual_verify_type == 1) {
+            data.virtual_indate = data.virtual_indate_day
+        }
+        if (data.virtual_receive_type == 'verify' && data.virtual_verify_type == 0) {
+            data.virtual_indate = 0
+        }
+    })
 }
 
-const disabledPastDates = (date: any) => {
-  return date.valueOf() < Date.now()
+const disabledPastDates = (date:any) => {
+    return date.valueOf() < Date.now()
 }
 </script>
 
 <style lang="scss" scoped>
-@import 'public/css/goods_edit.scss';
+    @import 'public/css/goods_edit.scss';
 </style>
 <style lang="scss">
-.edui-default .edui-editor {
-  z-index: 1 !important;
-}
+    .edui-default .edui-editor{
+        z-index: 1 !important;
+    }
 
-.el-cascader__tags.is-validate {
-  right: 30px !important;
-}
+    .el-cascader__tags.is-validate{
+        right: 30px !important;
+    }
 </style>
diff --git a/admin/src/addon/shop/views/index/index.vue b/admin/src/addon/shop/views/index/index.vue
index a6fdfc0b..999f160a 100644
--- a/admin/src/addon/shop/views/index/index.vue
+++ b/admin/src/addon/shop/views/index/index.vue
@@ -1,295 +1,211 @@
 <template>
-  <div class="main-container">
-    <!-- 实时概况 -->
-    <el-card shadow="never" class="!border-none">
-      <template #header>
-        <span class="text-lg font-extrabold mr-[10px]">{{
-          t('realtimeOverview')
-        }}</span>
-        <span class="text-sm text-[#a19f98]">{{ t('updateTime') }}</span>
-        <span class="text-sm text-[#a19f98]">{{ time }}</span>
-      </template>
-      <el-row>
-        <el-col :span="6">
-          <div class="ml-[10px]">
-            <div class="text-sm text-[#a19f98] leading-8">
-              <el-statistic :value="statToday.order_num">
-                <template #title>
-                  <div style="display: inline-flex; align-items: center">
-                    <span class="mr-[5px]">{{ t('todayOrderCount') }}</span>
-                    <el-tooltip
-                      class="box-item"
-                      effect="light"
-                      :content="t('todayOrderCount')"
-                      placement="top"
-                    >
-                      <el-icon>
-                        <QuestionFilled />
-                      </el-icon>
-                    </el-tooltip>
-                  </div>
-                </template>
-              </el-statistic>
-            </div>
-            <div class="text-sm text-[#a19f98] leading-8">
-              <span>{{ t('yesterday') }}</span>
-              <span>{{ statYesterday.order_num }}</span>
-            </div>
-            <div class="text-sm text-[#a19f98] leading-8 mt-[15px]">
-              <el-statistic
-                :title="t('orderCount')"
-                :value="statTotal.order_num"
-              />
-            </div>
-          </div>
-        </el-col>
-        <el-col :span="6">
-          <div class="ml-[10px]">
-            <div class="text-sm text-[#a19f98] leading-8">
-              <el-statistic :value="statToday.sale_money">
-                <template #title>
-                  <div style="display: inline-flex; align-items: center">
-                    <span class="mr-[5px]">{{ t('todayOrderSale') }}</span>
-                    <el-tooltip
-                      class="box-item"
-                      effect="light"
-                      :content="t('todayOrderSale')"
-                      placement="top"
-                    >
-                      <el-icon>
-                        <QuestionFilled />
-                      </el-icon>
-                    </el-tooltip>
-                  </div>
-                </template>
-              </el-statistic>
-            </div>
-            <div class="text-sm text-[#a19f98] leading-8">
-              <span>{{ t('yesterday') }}</span>
-              <span>{{ statYesterday.sale_money }}</span>
-            </div>
-            <div class="text-sm text-[#a19f98] leading-8 mt-[15px]">
-              <el-statistic
-                :title="t('salesTotal')"
-                :value="statTotal.sale_money"
-              />
-            </div>
-          </div>
-        </el-col>
-        <el-col :span="6">
-          <div class="ml-[10px]">
-            <div class="text-sm text-[#a19f98] leading-8">
-              <el-statistic :value="statToday.refund_money">
-                <template #title>
-                  <div style="display: inline-flex; align-items: center">
-                    <span class="mr-[5px]">{{ t('todayAddMemberCount') }}</span>
-                    <el-tooltip
-                      class="box-item"
-                      effect="light"
-                      :content="t('todayAddMemberCount')"
-                      placement="top"
-                    >
-                      <el-icon>
-                        <QuestionFilled />
-                      </el-icon>
-                    </el-tooltip>
-                  </div>
-                </template>
-              </el-statistic>
-            </div>
-            <div class="text-sm text-[#a19f98] leading-8">
-              <span>{{ t('yesterday') }}</span>
-              <span>{{ statYesterday.refund_money }}</span>
-            </div>
-            <div class="text-sm text-[#a19f98] leading-8 mt-[15px]">
-              <el-statistic
-                :title="t('memberTotal')"
-                :value="statTotal.refund_money"
-              />
-            </div>
-          </div>
-        </el-col>
-        <el-col :span="6">
-          <div class="ml-[10px]">
-            <div class="text-sm text-[#a19f98] leading-8">
-              <el-statistic :value="statToday.access_sum">
-                <template #title>
-                  <div style="display: inline-flex; align-items: center">
-                    <span class="mr-[5px]">{{ t('todayBrowseCount') }}</span>
-                    <el-tooltip
-                      class="box-item"
-                      effect="light"
-                      :content="t('todayBrowseCount')"
-                      placement="top"
-                    >
-                      <el-icon>
-                        <QuestionFilled />
-                      </el-icon>
-                    </el-tooltip>
-                  </div>
-                </template>
-              </el-statistic>
-            </div>
-            <div class="text-sm text-[#a19f98] leading-8">
-              <span>{{ t('yesterday') }}</span>
-              <span>{{ statYesterday.access_sum }}</span>
-            </div>
-            <div class="text-sm text-[#a19f98] leading-8 mt-[15px]">
-              <el-statistic
-                :title="t('browseTotal')"
-                :value="statTotal.access_sum"
-              />
-            </div>
-          </div>
-        </el-col>
-      </el-row>
-    </el-card>
-    <!-- 实时概况 end -->
-
-    <!-- 代办事项 -->
-    <el-card shadow="never" class="mt-[15px] !border-none">
-      <template #header>
-        <span class="text-lg font-extrabold">{{ t('agentMatters') }}</span>
-      </template>
-      <el-row>
-        <el-col
-          :span="4"
-          class="cursor-pointer"
-          @click="
-            router.push({ path: '/shop/order/index', query: { status: 1 } })
-          "
-        >
-          <div class="ml-[10px]">
-            <el-statistic :value="statOrder.wait_pay_order">
-              <template #title>
-                <div style="display: inline-flex; align-items: center">
-                  <span class="mr-[5px]">{{ t('waitPayOrder') }}</span>
-                  <el-tooltip
-                    class="box-item"
-                    effect="light"
-                    :content="t('waitPayOrder')"
-                    placement="top"
-                  >
-                    <el-icon>
-                      <QuestionFilled />
-                    </el-icon>
-                  </el-tooltip>
-                </div>
-              </template>
-            </el-statistic>
-          </div>
-        </el-col>
-        <el-col
-          :span="4"
-          class="cursor-pointer"
-          @click="
-            router.push({ path: '/shop/order/index', query: { status: 2 } })
-          "
-        >
-          <el-statistic :value="statOrder.wait_delivery_order">
-            <template #title>
-              <div style="display: inline-flex; align-items: center">
-                {{ t('waitDeliveryOrder') }}
-              </div>
-            </template>
-          </el-statistic>
-        </el-col>
-        <el-col
-          :span="4"
-          class="cursor-pointer"
-          @click="
-            router.push({ path: '/shop/order/index', query: { status: 3 } })
-          "
-        >
-          <el-statistic :value="statOrder.wait_take_order">
-            <template #title>
-              <div style="display: inline-flex; align-items: center">
-                {{ t('waitTakeOrder') }}
-              </div>
-            </template>
-          </el-statistic>
-        </el-col>
-        <el-col
-          :span="4"
-          class="cursor-pointer"
-          @click="router.push({ path: '/shop/order/refund' })"
-        >
-          <el-statistic :value="statOrder.refund_order">
-            <template #title>
-              <div style="display: inline-flex; align-items: center">
-                退款订单
-              </div>
-            </template>
-          </el-statistic>
-        </el-col>
-        <el-col
-          :span="4"
-          class="cursor-pointer"
-          @click="router.push({ path: '/shop/goods/list' })"
-        >
-          <el-statistic :value="statGoods.sale_goods_num">
-            <template #title>
-              <div style="display: inline-flex; align-items: center">
-                {{ t('saleGoodsNum') }}
-              </div>
-            </template>
-          </el-statistic>
-        </el-col>
-        <el-col
-          :span="4"
-          class="cursor-pointer"
-          @click="
-            router.push({ path: '/shop/goods/list', query: { status: 0 } })
-          "
-        >
-          <el-statistic :value="statGoods.warehouse_goods_num">
-            <template #title>
-              <div style="display: inline-flex; align-items: center">
-                {{ t('warehouseGoodsNum') }}
-              </div>
-            </template>
-          </el-statistic>
-        </el-col>
-      </el-row>
-    </el-card>
-    <!-- 代办事项 end -->
-
-    <!-- 订单趋势 -->
-    <el-row :gutter="15" class="mt-[15px]">
-      <el-col :span="12">
+    <div class="main-container">
+        <!-- 实时概况 -->
         <el-card shadow="never" class="!border-none">
-          <template #header>
-            <span class="text-lg font-extrabold">订单量趋势</span>
-          </template>
-          <div
-            ref="visitStat"
-            :style="{ width: '100%', height: '300px' }"
-          ></div>
+            <template #header>
+                <span class="text-lg font-extrabold mr-[10px]">{{t('realtimeOverview')}}</span>
+                <span class="text-sm text-[#a19f98]">{{t('updateTime')}}</span>
+                <span class="text-sm text-[#a19f98]">{{ time }}</span>
+            </template>
+            <el-row>
+                <el-col :span="6">
+                    <div class="ml-[10px]">
+                        <div class="text-sm text-[#a19f98] leading-8">
+                            <el-statistic :value="statToday.order_num">
+                                <template #title>
+                                    <div style="display: inline-flex; align-items: center">
+                                        <span class="mr-[5px]">{{t('todayOrderCount')}}</span>
+                                        <el-tooltip class="box-item" effect="light" :content="t('todayOrderCount')" placement="top">
+                                            <el-icon>
+                                                <QuestionFilled />
+                                            </el-icon>
+                                        </el-tooltip>
+                                    </div>
+                                </template>
+                            </el-statistic>
+                        </div>
+                        <div class="text-sm text-[#a19f98] leading-8">
+                            <span>{{t('yesterday')}}</span>
+                            <span>{{statYesterday.order_num}}</span>
+                        </div>
+                        <div class="text-sm text-[#a19f98] leading-8 mt-[15px]">
+                            <el-statistic :title="t('orderCount')" :value="statTotal.order_num" />
+                        </div>
+                    </div>
+                </el-col>
+                <el-col :span="6">
+                    <div class="ml-[10px]">
+                        <div class="text-sm text-[#a19f98] leading-8">
+                            <el-statistic :value="statToday.sale_money">
+                                <template #title>
+                                    <div style="display: inline-flex; align-items: center">
+                                        <span class="mr-[5px]">{{t('todayOrderSale')}}</span>
+                                        <el-tooltip class="box-item" effect="light" :content="t('todayOrderSale')" placement="top">
+                                            <el-icon>
+                                                <QuestionFilled />
+                                            </el-icon>
+                                        </el-tooltip>
+                                    </div>
+                                </template>
+                            </el-statistic>
+                        </div>
+                        <div class="text-sm text-[#a19f98] leading-8">
+                            <span>{{t('yesterday')}}</span>
+                            <span>{{statYesterday.sale_money}}</span>
+                        </div>
+                        <div class="text-sm text-[#a19f98] leading-8 mt-[15px]">
+                            <el-statistic :title="t('salesTotal')" :value="statTotal.sale_money" />
+                        </div>
+                    </div>
+                </el-col>
+                <el-col :span="6">
+                    <div class="ml-[10px]">
+                        <div class="text-sm text-[#a19f98] leading-8">
+                            <el-statistic :value="statToday.refund_money">
+                                <template #title>
+                                    <div style="display: inline-flex; align-items: center">
+                                        <span class="mr-[5px]">{{t('todayAddMemberCount')}}</span>
+                                        <el-tooltip class="box-item" effect="light" :content="t('todayAddMemberCount')" placement="top">
+                                            <el-icon>
+                                                <QuestionFilled />
+                                            </el-icon>
+                                        </el-tooltip>
+                                    </div>
+                                </template>
+                            </el-statistic>
+                        </div>
+                        <div class="text-sm text-[#a19f98] leading-8">
+                            <span>{{t('yesterday')}}</span>
+                            <span>{{statYesterday.refund_money}}</span>
+                        </div>
+                        <div class="text-sm text-[#a19f98] leading-8 mt-[15px]">
+                            <el-statistic :title="t('memberTotal')" :value="statTotal.refund_money" />
+                        </div>
+                    </div>
+                </el-col>
+                <el-col :span="6">
+                    <div class="ml-[10px]">
+                        <div class="text-sm text-[#a19f98] leading-8">
+                            <el-statistic :value="statToday.access_sum">
+                                <template #title>
+                                    <div style="display: inline-flex; align-items: center">
+                                        <span class="mr-[5px]">{{t('todayBrowseCount')}}</span>
+                                        <el-tooltip class="box-item" effect="light" :content="t('todayBrowseCount')" placement="top">
+                                            <el-icon>
+                                                <QuestionFilled />
+                                            </el-icon>
+                                        </el-tooltip>
+                                    </div>
+                                </template>
+                            </el-statistic>
+                        </div>
+                        <div class="text-sm text-[#a19f98] leading-8">
+                            <span>{{t('yesterday')}}</span>
+                            <span>{{statYesterday.access_sum}}</span>
+                        </div>
+                        <div class="text-sm text-[#a19f98] leading-8 mt-[15px]">
+                            <el-statistic :title="t('browseTotal')" :value="statTotal.access_sum" />
+                        </div>
+                    </div>
+                </el-col>
+            </el-row>
         </el-card>
-      </el-col>
-      <el-col :span="12">
-        <el-card shadow="never" class="!border-none">
-          <template #header>
-            <span class="text-lg font-extrabold">销售额（元）</span>
-          </template>
-          <div ref="hourStat" :style="{ width: '100%', height: '300px' }"></div>
+        <!-- 实时概况 end -->
+
+        <!-- 代办事项 -->
+        <el-card shadow="never" class="mt-[15px] !border-none">
+            <template #header>
+                <span class="text-lg font-extrabold">{{t('agentMatters')}}</span>
+            </template>
+            <el-row>
+                <el-col :span="4" class="cursor-pointer" @click="router.push({ path: '/shop/order/index', query: {status: 1}})">
+                    <div class="ml-[10px]">
+                        <el-statistic :value="statOrder.wait_pay_order">
+                            <template #title>
+                                <div style="display: inline-flex; align-items: center">
+                                    <span class="mr-[5px]">{{t('waitPayOrder')}}</span>
+                                    <el-tooltip class="box-item" effect="light" :content="t('waitPayOrder')" placement="top">
+                                        <el-icon>
+                                            <QuestionFilled />
+                                        </el-icon>
+                                    </el-tooltip>
+                                </div>
+                            </template>
+                        </el-statistic>
+                    </div>
+                </el-col>
+                <el-col :span="4" class="cursor-pointer" @click="router.push({ path: '/shop/order/index', query: {status: 2}})">
+                    <el-statistic :value="statOrder.wait_delivery_order">
+                        <template #title>
+                            <div style="display: inline-flex; align-items: center">{{t('waitDeliveryOrder')}}</div>
+                        </template>
+                    </el-statistic>
+                </el-col>
+                <el-col :span="4" class="cursor-pointer" @click="router.push({ path: '/shop/order/index', query: {status: 3}})">
+                    <el-statistic :value="statOrder.wait_take_order">
+                        <template #title>
+                            <div style="display: inline-flex; align-items: center">{{t('waitTakeOrder')}}</div>
+                        </template>
+                    </el-statistic>
+                </el-col>
+                <el-col :span="4" class="cursor-pointer" @click="router.push({ path: '/shop/order/refund'})">
+                    <el-statistic :value="statOrder.refund_order">
+                        <template #title>
+                            <div style="display: inline-flex; align-items: center">退款订单</div>
+                        </template>
+                    </el-statistic>
+                </el-col>
+                <el-col :span="4" class="cursor-pointer" @click="router.push({ path: '/shop/goods/list'})">
+                    <el-statistic :value="statGoods.sale_goods_num">
+                        <template #title>
+                            <div style="display: inline-flex; align-items: center">{{t('saleGoodsNum')}}</div>
+                        </template>
+                    </el-statistic>
+                </el-col>
+                <el-col :span="4" class="cursor-pointer" @click="router.push({ path: '/shop/goods/list', query: {status: 0}})">
+                    <el-statistic :value="statGoods.warehouse_goods_num">
+                        <template #title>
+                            <div style="display: inline-flex; align-items: center">{{t('warehouseGoodsNum')}}</div>
+                        </template>
+                    </el-statistic>
+                </el-col>
+            </el-row>
         </el-card>
-      </el-col>
-    </el-row>
-    <!-- 订单趋势 end -->
-  </div>
+        <!-- 代办事项 end -->
+
+        <!-- 订单趋势 -->
+        <el-row :gutter="15" class="mt-[15px]">
+            <el-col :span="12">
+                <el-card shadow="never" class="!border-none">
+                    <template #header>
+                        <span class="text-lg font-extrabold">订单量趋势</span>
+                    </template>
+                    <div ref="visitStat" :style="{ width: '100%', height: '300px' }"></div>
+                </el-card>
+            </el-col>
+            <el-col :span="12">
+                <el-card shadow="never" class="!border-none">
+                    <template #header>
+                        <span class="text-lg font-extrabold">销售额（元）</span>
+                    </template>
+                    <div ref="hourStat" :style="{ width: '100%', height: '300px' }"></div>
+                </el-card>
+            </el-col>
+        </el-row>
+        <!-- 订单趋势 end -->
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { ref } from 'vue'
 import { t } from '@/lang'
 import {
-  getShopCountList,
-  getShopTodayCountList,
-  getShopYesterdayCountList,
-  getShopStat,
-  getShopOrderStat,
-  getShopGoodsStat,
+    getShopCountList,
+    getShopTodayCountList,
+    getShopYesterdayCountList,
+    getShopStat,
+    getShopOrderStat,
+    getShopGoodsStat
 } from '@/addon/shop/api/shop'
 import * as echarts from 'echarts'
 import { useRouter } from 'vue-router'
@@ -298,136 +214,137 @@ const router = useRouter()
 const visitStat = ref<any>(null)
 const hourStat = ref<any>(null)
 
-interface statTotalType {
-  order_num: number
-  sale_money: number
-  refund_money: number
-  access_sum: number
+interface statTotalType{
+    order_num: number,
+    sale_money: number,
+    refund_money: number,
+    access_sum: number
 }
-interface statTodayType {
-  order_num: number
-  sale_money: number
-  refund_money: number
-  access_sum: number
+interface statTodayType{
+    order_num: number,
+    sale_money: number,
+    refund_money: number,
+    access_sum: number
 }
-interface statYesterdayType {
-  order_num: number
-  sale_money: number
-  refund_money: number
-  access_sum: number
+interface statYesterdayType{
+    order_num: number,
+    sale_money: number,
+    refund_money: number,
+    access_sum: number
 }
-interface statOrderType {
-  wait_pay_order: number
-  wait_delivery_order: number
-  wait_take_order: number
-  refund_order: number
+interface statOrderType{
+    wait_pay_order: number,
+    wait_delivery_order: number,
+    wait_take_order: number,
+    refund_order: number
 }
-interface statGoodsType {
-  sale_goods_num: number
-  warehouse_goods_num: number
+interface statGoodsType{
+    sale_goods_num: number,
+    warehouse_goods_num: number
 }
-interface statCountType {
-  order_num: number
-  time: string
-  sale_money: number
+interface statCountType{
+    order_num: number,
+    time: string,
+    sale_money: number
 }
-const statTotal = ref<statTotalType | any>([])
-const statToday = ref<statTodayType | any>([])
-const statYesterday = ref<statYesterdayType | any>([])
-const statCount = ref<statCountType | any>([])
-const statOrder = ref<statOrderType | any>([])
-const statGoods = ref<statGoodsType | any>([])
+const statTotal = ref<statTotalType|any>([])
+const statToday = ref<statTodayType|any>([])
+const statYesterday = ref<statYesterdayType|any>([])
+const statCount = ref<statCountType|any>([])
+const statOrder = ref<statOrderType|any>([])
+const statGoods = ref<statGoodsType|any>([])
 
 const getStatInfoFn = async () => {
-  let statTotalData = await (await getShopCountList()).data
-  for (let i in statTotalData) {
-    statTotalData[i] = Number(statTotalData[i])
-  }
-  statTotal.value = statTotalData
-  statToday.value = await (await getShopTodayCountList()).data
-  statYesterday.value = await (await getShopYesterdayCountList()).data
-  statOrder.value = await (await getShopOrderStat()).data
-  statGoods.value = await (await getShopGoodsStat()).data
-  statCount.value = await (await getShopStat()).data
-  setTimeout(() => {
-    drawChart('')
-    drawChartTo('')
-  }, 20)
+    let statTotalData = await (await getShopCountList()).data
+    for( let i in statTotalData){
+        statTotalData[i] = Number(statTotalData[i])
+
+    }
+    statTotal.value = statTotalData
+    statToday.value = await (await getShopTodayCountList()).data
+    statYesterday.value = await (await getShopYesterdayCountList()).data
+    statOrder.value = await (await getShopOrderStat()).data
+    statGoods.value = await (await getShopGoodsStat()).data
+    statCount.value = await (await getShopStat()).data
+    setTimeout(() => {
+        drawChart('')
+        drawChartTo('')
+    }, 20)
 }
 getStatInfoFn()
 
-const drawChart = (item: any) => {
-  let value = statCount.value.order_num
-  if (item) value = item
-  if (!visitStat.value) return
-  const visitStatChart = echarts.init(visitStat.value)
-  const visitStatOption = ref({
-    // title: {
-    //     text: '订单量趋势'
-    // },
-    legend: {},
-    xAxis: {
-      data: [],
-    },
-    yAxis: {},
-    tooltip: {
-      trigger: 'axis',
-    },
-    series: [
-      {
-        type: 'line',
-        data: [],
-      },
-    ],
-  })
-  visitStatOption.value.xAxis.data = statCount.value.time
-  visitStatOption.value.series[0].data = value
-  visitStatChart.setOption(visitStatOption.value)
+const drawChart = (item:any) => {
+    let value = statCount.value.order_num
+    if (item) value = item
+    if (!visitStat.value) return
+    const visitStatChart = echarts.init(visitStat.value)
+    const visitStatOption = ref({
+        // title: {
+        //     text: '订单量趋势'
+        // },
+        legend: {},
+        xAxis: {
+            data: []
+        },
+        yAxis: {},
+        tooltip: {
+            trigger: 'axis'
+        },
+        series: [
+            {
+                type: 'line',
+                data: []
+            }
+        ]
+    })
+    visitStatOption.value.xAxis.data = statCount.value.time
+    visitStatOption.value.series[0].data = value
+    visitStatChart.setOption(visitStatOption.value)
 }
-const drawChartTo = (item: any) => {
-  let valueTo = statCount.value.sale_money
-  if (item) valueTo = item
-  if (!hourStat.value) return
-  const hourStatChart = echarts.init(hourStat.value)
-  const hourStatOption = ref({
-    // title: {
-    //     text: '销售额（元）'
-    // },
-    legend: {},
-    xAxis: {
-      data: [],
-    },
-    yAxis: {},
-    tooltip: {
-      trigger: 'axis',
-    },
-    series: [
-      {
-        type: 'line',
-        data: [],
-      },
-    ],
-  })
-  hourStatOption.value.xAxis.data = statCount.value.time
-  hourStatOption.value.series[0].data = valueTo
-  hourStatChart.setOption(hourStatOption.value)
+const drawChartTo = (item:any) => {
+    let valueTo = statCount.value.sale_money
+    if (item) valueTo = item
+    if (!hourStat.value) return
+    const hourStatChart = echarts.init(hourStat.value)
+    const hourStatOption = ref({
+        // title: {
+        //     text: '销售额（元）'
+        // },
+        legend: {},
+        xAxis: {
+            data: []
+        },
+        yAxis: {},
+        tooltip: {
+            trigger: 'axis'
+        },
+        series: [
+            {
+                type: 'line',
+                data: []
+            }
+        ]
+    })
+    hourStatOption.value.xAxis.data = statCount.value.time
+    hourStatOption.value.series[0].data = valueTo
+    hourStatChart.setOption(hourStatOption.value)
 }
 const time = ref('')
 const nowTime = () => {
-  const date = new Date()
-  const year = date.getFullYear()
-  const month = date.getMonth() + 1
-  const day = date.getDate()
-  const hh = checkTime(date.getHours())
-  const mm = checkTime(date.getMinutes())
-  const ss = checkTime(date.getSeconds())
-  function checkTime(i: any) {
-    if (i < 10) {
-      return '0' + i
+    const date = new Date()
+    const year = date.getFullYear()
+    const month = date.getMonth() + 1
+    const day = date.getDate()
+    const hh = checkTime(date.getHours())
+    const mm = checkTime(date.getMinutes())
+    const ss = checkTime(date.getSeconds())
+    function checkTime (i:any) {
+        if (i < 10) {
+            return '0' + i
+        }
+        return i
     }
-    return i
-  }
-  time.value = year + '-' + month + '-' + day + ' ' + hh + ':' + mm + ':' + ss
+    time.value = year + '-' + month + '-' + day + ' ' + hh + ':' + mm + ':' + ss
 }
 nowTime()
 </script>
diff --git a/admin/src/addon/shop/views/marketing/coupon/add.vue b/admin/src/addon/shop/views/marketing/coupon/add.vue
index 05dc5572..a978d4bd 100644
--- a/admin/src/addon/shop/views/marketing/coupon/add.vue
+++ b/admin/src/addon/shop/views/marketing/coupon/add.vue
@@ -1,234 +1,153 @@
 <template>
-  <div class="main-container">
-    <el-card class="card !border-none" shadow="never">
-      <el-page-header :content="pageName" :icon="ArrowLeft" @back="back()" />
-    </el-card>
-
-    <!-- 表单 -->
-    <el-card class="box-card mt-[15px] !border-none" shadow="never">
-      <el-form
-        class="page-form"
-        :model="formData"
-        label-width="120px"
-        ref="formRef"
-        :rules="formRules"
-      >
-        <!-- 优惠券信息 -->
-        <!-- 优惠券名称 -->
-        <el-form-item :label="t('title')" prop="title">
-          <el-input
-            v-model.trim="formData.title"
-            clearable
-            :placeholder="t('titlePlaceholder')"
-            class="input-width"
-            :maxlength="20"
-          />
-        </el-form-item>
-
-        <!-- 优惠券面额 -->
-        <el-form-item :label="t('price')" prop="price">
-          <el-input
-            v-model.trim="formData.price"
-            clearable
-            :placeholder="t('pricePlaceholder')"
-            class="input-width"
-            maxlength="5"
-            @keyup="filterDigit($event)"
-          >
-            <template #append>元</template>
-          </el-input>
-        </el-form-item>
-
-        <!-- 优惠券类型 -->
-        <el-form-item :label="t('type')" prop="type">
-          <el-radio-group v-model="formData.type">
-            <el-radio :label="1">通用券</el-radio>
-            <el-radio :label="2">品类券</el-radio>
-            <el-radio :label="3">商品券</el-radio>
-          </el-radio-group>
-        </el-form-item>
-
-        <el-form-item v-if="formData.type == 2" prop="goods_category_ids">
-          <div>
-            <el-cascader
-              v-model="formData.goods_category_ids"
-              :options="options"
-              :props="props"
-              placeholder="请选择商品分类"
-              collapse-tags
-              collapse-tags-tooltip
-              clearable
-            />
-          </div>
-        </el-form-item>
-
-        <el-form-item v-if="formData.type == 3" prop="goods_ids">
-          <div>
-            <el-form-item>
-              <goods-select-popup
-                ref="goodsSelectPopupRef"
-                v-model="formData.goods_ids"
-                :min="1"
-                :max="99"
-              />
-            </el-form-item>
-          </div>
-        </el-form-item>
-
-        <!-- 使用门槛 -->
-        <el-form-item :label="t('threshold')">
-          <el-radio-group v-model="formData.threshold">
-            <el-radio :label="1">{{ t('reduction') }}</el-radio>
-            <el-radio :label="2">{{ t('noThreshold') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-
-        <el-form-item v-if="formData.threshold == 1" prop="min_condition_money">
-          最低满
-          <div class="flex items-center px-[5px]">
-            <el-input
-              v-model.trim="formData.min_condition_money"
-              @keyup="filterDigit($event)"
-              clearable
-              class="!w-[100px]"
-            />
-          </div>
-          元可用
-        </el-form-item>
-
-        <!-- 使用时间 -->
-        <el-form-item :label="t('validType')">
-          <el-radio-group v-model="formData.valid_type">
-            <el-radio :label="1">{{ t('days') }}</el-radio>
-            <el-radio :label="2">{{ t('times') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-
-        <el-form-item v-show="formData.valid_type == 1">
-          领劵后立即生效，有效期
-          <div class="flex items-center px-[5px]">
-            <el-input
-              v-model.trim="formData.length"
-              @keyup="filterNumber($event)"
-              clearable
-              class="!w-[100px]"
-            />
-          </div>
-          天
-        </el-form-item>
-
-        <el-form-item prop="valid_time" v-if="formData.valid_type == 2">
-          领劵后立即生效，使用时间截止至
-          <div class="w-[220px] pl-[5px]">
-            <el-date-picker v-model="formData.valid_time" type="datetime" />
-          </div>
-        </el-form-item>
-
-        <!--  活动信息  -->
-        <!-- 领取方式 -->
-        <el-form-item :label="t('receiveType')">
-          <div>
-            <el-radio-group v-model="formData.receive_type">
-              <el-radio :label="1">{{ t('user') }}</el-radio>
-              <el-radio :label="2">{{ t('grant') }}</el-radio>
-            </el-radio-group>
-          </div>
-          <div class="form-tip">
-            开启手动领取后，会员可以直接在优惠券列表以及优惠券推广中直接领取
-          </div>
-        </el-form-item>
-
-        <!--  领取时间  -->
-        <el-form-item
-          :label="t('receiveTime')"
-          v-show="formData.receive_type == 1"
-        >
-          <el-radio-group v-model="formData.receive_type_time">
-            <el-radio :label="1">{{ t('limitedTime') }}</el-radio>
-            <el-radio :label="2">{{ t('unlimitedTime') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-
-        <el-form-item
-          prop="receive_time"
-          v-show="formData.receive_type_time == 1 && formData.receive_type == 1"
-        >
-          <div class="w-[180px]">
-            <el-date-picker
-              v-model="formData.receive_time"
-              type="datetimerange"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-            />
-          </div>
-        </el-form-item>
-
-        <!--  优惠券数量  -->
-        <el-form-item
-          :label="t('receiveNumber')"
-          v-show="formData.receive_type == 1"
-        >
-          <el-radio-group v-model="formData.limit">
-            <el-radio :label="1">{{ t('limit') }}</el-radio>
-            <el-radio :label="2">{{ t('unlimited') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-
-        <el-form-item
-          v-show="formData.limit == 1 && formData.receive_type == 1"
-          prop="remain_count"
-        >
-          <div>
-            <el-input
-              onkeypress="return( /[\d]/.test(String.fromCharCode(event.keyCode) ) )"
-              v-model.trim="formData.remain_count"
-              clearable
-              :placeholder="t('remainCountPlaceholder')"
-              class="input-width"
-              :min="1"
-              :max="100000"
-              :controls="false"
-              maxlength="6"
-            >
-              <template #append>张</template>
-            </el-input>
-          </div>
-          <div class="form-tip">最多发放100000张</div>
-        </el-form-item>
-
-        <!-- 用户可领取数量 -->
-        <el-form-item
-          :label="t('userLimitCount')"
-          prop="limit_count"
-          v-show="formData.receive_type == 1"
-        >
-          <el-input
-            onkeypress="return( /[\d]/.test(String.fromCharCode(event.keyCode) ) )"
-            v-model.trim="formData.limit_count"
-            clearable
-            :placeholder="t('userLimitCountPlaceholder')"
-            class="input-width"
-            :min="1"
-            :max="100000"
-            maxlength="6"
-          >
-            <template #append>张</template>
-          </el-input>
-        </el-form-item>
-      </el-form>
-    </el-card>
-
-    <!-- 提交按钮 -->
-    <div class="fixed-footer-wrap">
-      <div class="fixed-footer">
-        <el-button type="primary" @click="onSave(formRef)">{{
-          t('save')
-        }}</el-button>
-        <el-button @click="back()">{{ t('cancel') }}</el-button>
-      </div>
+    <div class="main-container">
+
+        <el-card class="card !border-none" shadow="never">
+            <el-page-header :content="pageName" :icon="ArrowLeft" @back="back()" />
+        </el-card>
+
+        <!-- 表单 -->
+        <el-card class="box-card mt-[15px] !border-none" shadow="never">
+            <el-form class="page-form" :model="formData" label-width="120px" ref="formRef" :rules="formRules">
+                <!-- 优惠券信息 -->
+                <!-- 优惠券名称 -->
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model.trim="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" :maxlength="20" />
+                </el-form-item>
+
+                <!-- 优惠券面额 -->
+                <el-form-item :label="t('price')" prop="price">
+                    <el-input v-model.trim="formData.price" clearable :placeholder="t('pricePlaceholder')" class="input-width" maxlength="5" @keyup="filterDigit($event)">
+                        <template #append>元</template>
+                    </el-input>
+                </el-form-item>
+
+                <!-- 优惠券类型 -->
+                <el-form-item :label="t('type')" prop="type">
+                    <el-radio-group v-model="formData.type">
+                        <el-radio :label="1">通用券</el-radio>
+                        <el-radio :label="2">品类券</el-radio>
+                        <el-radio :label="3">商品券</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+                <el-form-item v-if="formData.type == 2" prop="goods_category_ids">
+                    <div>
+                        <el-cascader v-model="formData.goods_category_ids" :options="options" :props="props" placeholder="请选择商品分类" collapse-tags collapse-tags-tooltip clearable />
+                    </div>
+                </el-form-item>
+
+                <el-form-item v-if="formData.type == 3" prop="goods_ids">
+                    <div>
+                        <el-form-item>
+                            <goods-select-popup ref="goodsSelectPopupRef" v-model="formData.goods_ids" :min="1" :max="99" />
+                        </el-form-item>
+                    </div>
+                </el-form-item>
+
+                <!-- 使用门槛 -->
+                <el-form-item :label="t('threshold')">
+                    <el-radio-group v-model="formData.threshold">
+                        <el-radio :label="1">{{ t('reduction') }}</el-radio>
+                        <el-radio :label="2">{{ t('noThreshold') }}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+                <el-form-item v-if="formData.threshold == 1" prop="min_condition_money">
+                    最低满
+                    <div class="flex items-center px-[5px]">
+                        <el-input v-model.trim="formData.min_condition_money" @keyup="filterDigit($event)" clearable class="!w-[100px]" />
+                    </div>
+                    元可用
+                </el-form-item>
+
+                <!-- 使用时间 -->
+                <el-form-item :label="t('validType')">
+                    <el-radio-group v-model="formData.valid_type">
+                        <el-radio :label="1">{{ t('days') }}</el-radio>
+                        <el-radio :label="2">{{ t('times') }}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+                <el-form-item v-show="formData.valid_type == 1">
+                    领劵后立即生效，有效期
+                    <div class="flex items-center px-[5px]">
+                        <el-input v-model.trim="formData.length" @keyup="filterNumber($event)" clearable class="!w-[100px]" />
+                    </div>
+                    天
+                </el-form-item>
+
+                <el-form-item prop="valid_time" v-if="formData.valid_type == 2">
+                    领劵后立即生效，使用时间截止至 
+                    <div class="w-[220px] pl-[5px]">
+                        <el-date-picker v-model="formData.valid_time" type="datetime" />
+                    </div>
+                </el-form-item>
+
+                <!--  活动信息  -->
+                <!-- 领取方式 -->
+                <el-form-item :label="t('receiveType')">
+                    <div>
+                        <el-radio-group v-model="formData.receive_type">
+                            <el-radio :label="1">{{ t('user') }}</el-radio>
+                            <el-radio :label="2">{{ t('grant') }}</el-radio>
+                        </el-radio-group>
+                    </div>
+                    <div class="form-tip">开启手动领取后，会员可以直接在优惠券列表以及优惠券推广中直接领取</div>
+                </el-form-item>
+
+                <!--  领取时间  -->
+                <el-form-item :label="t('receiveTime')" v-show="formData.receive_type == 1">
+                    <el-radio-group v-model="formData.receive_type_time">
+                        <el-radio :label="1">{{ t('limitedTime') }}</el-radio>
+                        <el-radio :label="2">{{ t('unlimitedTime') }}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+                <el-form-item prop="receive_time" v-show="formData.receive_type_time == 1 && formData.receive_type == 1">
+                    <div class="w-[180px]">
+                        <el-date-picker v-model="formData.receive_time" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"/>
+                    </div>
+                </el-form-item>
+
+                <!--  优惠券数量  -->
+                <el-form-item :label="t('receiveNumber')" v-show="formData.receive_type == 1">
+                    <el-radio-group v-model="formData.limit">
+                        <el-radio :label="1">{{ t('limit') }}</el-radio>
+                        <el-radio :label="2">{{ t('unlimited') }}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+                <el-form-item v-show="formData.limit == 1 && formData.receive_type == 1" prop="remain_count">
+                    <div>
+                        <el-input onkeypress='return( /[\d]/.test(String.fromCharCode(event.keyCode) ) )'
+                            v-model.trim="formData.remain_count" clearable :placeholder="t('remainCountPlaceholder')"
+                            class="input-width" :min="1" :max="100000" :controls="false" maxlength="6">
+                            <template #append>张</template>
+                        </el-input>
+                    </div>
+                    <div class="form-tip">最多发放100000张</div>
+                </el-form-item>
+
+                <!-- 用户可领取数量 -->
+                <el-form-item :label="t('userLimitCount')" prop="limit_count" v-show="formData.receive_type == 1">
+                    <el-input onkeypress='return( /[\d]/.test(String.fromCharCode(event.keyCode) ) )'
+                        v-model.trim="formData.limit_count" clearable :placeholder="t('userLimitCountPlaceholder')"
+                        class="input-width" :min="1" :max="100000" maxlength="6">
+                        <template #append>张</template>
+                    </el-input>
+                </el-form-item>
+
+            </el-form>
+        </el-card>
+
+        <!-- 提交按钮 -->
+        <div class="fixed-footer-wrap">
+            <div class="fixed-footer">
+                <el-button type="primary" @click="onSave(formRef)">{{ t('save') }}</el-button>
+                <el-button @click="back()">{{ t('cancel') }}</el-button>
+            </div>
+        </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
@@ -254,230 +173,198 @@ const end = new Date()
 end.setTime(end.getTime() + 3600 * 1000 * 2 * 360) // 设置结束默认时间为当前时间30天后
 
 interface FormDataType {
-  title: string
-  price: string
-  type: number
-  limit: number
-  receive_type: number
-  remain_count: number
-  threshold: number
-  limit_count: number
-  min_condition_money: number
-  length: number
-  goods_ids: any[]
-  goods_category_ids: any[]
-  receive_type_time: number
-  valid_type: number
-  receive_time: any
-  valid_time: any
+    title: string
+    price: string
+    type: number
+    limit: number
+    receive_type: number
+    remain_count: number
+    threshold: number
+    limit_count: number
+    min_condition_money: number
+    length: number
+    goods_ids: any[]
+    goods_category_ids: any[]
+    receive_type_time: number
+    valid_type: number
+    receive_time: any
+    valid_time: any
 }
 
 const formData = ref<FormDataType>({
-  title: '', // 标题
-  price: '', // 面值
-  type: 1, // 优惠券类型 1通用优惠券 2商品品类优惠券 3商品优惠券
-  limit: 2,
-  receive_type: 1, // 领取方式
-  remain_count: 1000, // 剩余数量
-  threshold: 2, // 门槛
-  limit_count: 1, // 单个用户领取数量
-  // status: 1,  //状态 1 正常 2 未开启 3 已无效
-  min_condition_money: 1, // 商品最低多少金额可用优惠券
-  length: 30, // 有效期时长(天)
-  goods_ids: [], // 关联商品id
-  goods_category_ids: [], // 关联商品分类id
-  receive_type_time: 2,
-  valid_type: 1, // 有效方式，1=时长，2=范围
-  receive_time: [start, end],
-  valid_time: end,
+    title: '', // 标题
+    price: '', // 面值
+    type: 1, // 优惠券类型 1通用优惠券 2商品品类优惠券 3商品优惠券
+    limit: 2,
+    receive_type: 1, // 领取方式
+    remain_count: 1000, // 剩余数量
+    threshold: 2, // 门槛
+    limit_count: 1, // 单个用户领取数量
+    // status: 1,  //状态 1 正常 2 未开启 3 已无效
+    min_condition_money: 1, // 商品最低多少金额可用优惠券
+    length: 30, // 有效期时长(天)
+    goods_ids: [], // 关联商品id 
+    goods_category_ids: [], // 关联商品分类id
+    receive_type_time: 2,
+    valid_type: 1, // 有效方式，1=时长，2=范围
+    receive_time: [start, end],
+    valid_time: end
 })
 
 const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    title: [
-      { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
-    ],
-    price: [{ required: true, validator: priceRule, trigger: 'blur' }],
-    goods_ids: [{ required: true, message: t('请选择商品'), trigger: 'blur' }],
-    goods_category_ids: [
-      { required: true, message: t('请选择商品分类'), trigger: 'blur' },
-    ],
-    min_condition_money: [
-      { required: true, validator: minConditionMoney, trigger: 'blur' },
-    ],
-    valid_time: [{ required: true, validator: validTime, trigger: 'blur' }],
-    receive_time: [{ required: true, validator: receiveTime, trigger: 'blur' }],
-    remain_count: [{ required: true, validator: remainCount, trigger: 'blur' }],
-    limit_count: [
-      { required: true, validator: limitCountRule, trigger: 'blur' },
-    ],
-  }
+    return {
+        title: [
+            { required: true, message: t('titlePlaceholder'), trigger: 'blur' }
+        ],
+        price: [
+            { required: true, validator: priceRule, trigger: 'blur' }
+        ],
+        goods_ids: [
+            { required: true, message: t('请选择商品'), trigger: 'blur' }
+        ],
+        goods_category_ids: [
+            { required: true, message: t('请选择商品分类'), trigger: 'blur' }
+        ],
+        min_condition_money: [
+            { required: true, validator: minConditionMoney, trigger: 'blur' }
+        ],
+        valid_time:[
+            { required: true, validator: validTime, trigger: 'blur' }
+        ],
+        receive_time:[
+            { required: true, validator: receiveTime, trigger: 'blur' }
+        ],
+        remain_count: [
+            { required: true, validator: remainCount, trigger: 'blur' }
+        ],
+        limit_count: [
+            { required: true, validator: limitCountRule, trigger: 'blur' }
+        ]
+    }
 })
-
+ 
 const receiveTime = (rule: any, value: any, callback: any) => {
-  if (
-    formData.value.receive_type_time == 1 &&
-    formData.value.receive_type == 1
-  ) {
-    if (
-      !formData.value.receive_time[0] ||
-      timestampFn(formData.value.receive_time[0]) <= Date.now()
-    ) {
-      callback(new Error(t('领取开始时间不能小于等于当前时间')))
-    }
-    if (
-      !formData.value.receive_time[1] ||
-      timestampFn(formData.value.receive_time[1]) <=
-        timestampFn(formData.value.receive_time[0])
-    ) {
-      callback(new Error(t('领取结束时间不能小于等于领取开始时间')))
+    if(formData.value.receive_type_time == 1 && formData.value.receive_type == 1){
+        if (!formData.value.receive_time[0] || timestampFn(formData.value.receive_time[0]) <= Date.now()) {
+            callback(new Error(t('领取开始时间不能小于等于当前时间')))
+        }
+        if (!formData.value.receive_time[1] || timestampFn(formData.value.receive_time[1]) <= timestampFn(formData.value.receive_time[0])) {
+            callback(new Error(t('领取结束时间不能小于等于领取开始时间')))
+        }
     }
-  }
-  callback()
+    callback()
 }
 
 const validTime = (rule: any, value: any, callback: any) => {
-  if (
-    formData.value.valid_type == 2 &&
-    formData.value.valid_time <= Date.now()
-  ) {
-    callback(new Error(t('有效期不能小于等于当前时间')))
-  }
-  if (
-    formData.value.valid_type == 2 &&
-    formData.value.receive_type_time == 1 &&
-    formData.value.receive_type == 1
-  ) {
-    if (
-      timestampFn(formData.value.valid_time) <=
-      timestampFn(formData.value.receive_time[1])
-    ) {
-      callback(new Error(t('有效期不能小于等于领取结束时间')))
+    if (formData.value.valid_type == 2 && formData.value.valid_time <= Date.now()) {
+        callback(new Error(t('有效期不能小于等于当前时间')))
     }
-  }
-  callback()
+    if(formData.value.valid_type == 2 && formData.value.receive_type_time == 1 && formData.value.receive_type == 1){
+		if (timestampFn(formData.value.valid_time) <= timestampFn(formData.value.receive_time[1])) {
+			callback(new Error(t('有效期不能小于等于领取结束时间')))
+		}
+	}
+    callback()
 }
 
 const minConditionMoney = (rule: any, value: any, callback: any) => {
-  if (
-    formData.value.threshold == 1 &&
-    formData.value.min_condition_money <= 0
-  ) {
-    callback(new Error(t('使用门槛最低不能小于0元')))
-  }
-  callback()
+    if (formData.value.threshold == 1 && formData.value.min_condition_money <= 0 ) {
+        callback(new Error(t('使用门槛最低不能小于0元')))
+    }
+    callback()
 }
 
 const remainCount = (rule: any, value: any, callback: any) => {
-  if (
-    formData.value.remain_count != '' &&
-    formData.value.remain_count > 100000
-  ) {
-    callback(new Error(t('remainCountPlaceholder')))
-  }
-  if (
-    !formData.value.remain_count ||
-    (formData.value.remain_count != '' && formData.value.remain_count < 1)
-  ) {
-    callback(new Error(t('发放数量不能小于1张')))
-  }
-  callback()
+    if (formData.value.remain_count != '' && formData.value.remain_count > 100000) {
+        callback(new Error(t('remainCountPlaceholder')))
+    }
+    if (!formData.value.remain_count || formData.value.remain_count != '' && formData.value.remain_count < 1) {
+        callback(new Error(t('发放数量不能小于1张')))
+    }
+    callback()
 }
 const priceRule = (rule: any, value: any, callback: any) => {
-  if (
-    !formData.value.price ||
-    formData.value.price == '' ||
-    formData.value.price <= 0
-  ) {
-    callback(new Error(t('pricePlaceholder')))
-  }
-  callback()
+    if (!formData.value.price || formData.value.price == '' || formData.value.price <= 0) {
+        callback(new Error(t('pricePlaceholder')))
+    }
+    callback()
 }
 
 const limitCountRule = (rule: any, value: any, callback: any) => {
-  if (
-    !formData.value.limit_count ||
-    (formData.value.limit_count != '' && formData.value.limit_count < 1)
-  ) {
-    callback(new Error(t('userLimitCountPlaceholder')))
-  }
-  if (
-    formData.value.limit == 1 &&
-    formData.value.limit_count != '' &&
-    formData.value.remain_count != '' &&
-    parseInt(formData.value.limit_count) > parseInt(formData.value.remain_count)
-  ) {
-    callback(new Error(t('限领张数不能大于发放数量')))
-  }
-  callback()
+    if (!formData.value.limit_count || formData.value.limit_count != '' && formData.value.limit_count < 1) {
+        callback(new Error(t('userLimitCountPlaceholder')))
+    }
+	if (formData.value.limit == 1 && formData.value.limit_count != '' && formData.value.remain_count != '' && parseInt(formData.value.limit_count) > parseInt(formData.value.remain_count)) {
+        callback(new Error(t('限领张数不能大于发放数量')))
+    }
+    callback()
 }
 
 // 时间格式转换时间戳
-const timestampFn = (data) => {
-  var dateObject = new Date(data)
-  return dateObject.getTime()
+const timestampFn = (data)=>{
+    var dateObject = new Date(data);
+    return dateObject.getTime();
 }
 
 // 优惠券类型
 const props = { multiple: true }
 const options = ref([])
 const categoryList = () => {
-  getGoodsCategoryList({}).then((res) => {
-    options.value = res.data.goods_category_tree
-  })
+    getGoodsCategoryList({}).then((res) => {
+        options.value = res.data.goods_category_tree
+    })
 }
 categoryList()
 const onSave = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      let data = cloneDeep(formData.value)
-      if (data.type == 1) {
-        delete data.goods_category_ids
-        delete data.goods_ids
-      } else if (data.type == 2) {
-        delete data.goods_ids
-      } else if (data.type == 3) {
-        delete data.goods_category_ids
-      }
-      const save = addCoupon
-      save(data)
-        .then((res) => {
-          loading.value = false
-          history.back()
-        })
-        .catch((err) => {
-          loading.value = false
-        })
-    }
-  })
+    if (loading.value || !formEl) return
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+            let data = cloneDeep(formData.value);
+            if(data.type == 1){
+                delete data.goods_category_ids;
+                delete data.goods_ids;
+            }else if(data.type == 2){
+                delete data.goods_ids;
+            }else if(data.type == 3){
+                delete data.goods_category_ids;
+            }
+            const save = addCoupon
+            save(data).then(res => {
+                loading.value = false
+                history.back()
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
 }
 
 const back = () => {
-  router.push('/shop/marketing/coupon/list')
+    router.push('/shop/marketing/coupon/list')
 }
+
 </script>
 
 <style lang="scss">
 input::-webkit-outer-spin-button,
 input::-webkit-inner-spin-button {
-  -webkit-appearance: none !important;
-  -moz-appearance: none !important;
-  -o-appearance: none !important;
-  -ms-appearance: none !important;
-  appearance: none !important;
-  margin: 0;
+    -webkit-appearance: none !important;
+    -moz-appearance: none !important;
+    -o-appearance: none !important;
+    -ms-appearance: none !important;
+    appearance: none !important;
+    margin: 0;
 }
 
-input[type='number'] {
-  -webkit-appearance: textfield;
-  -moz-appearance: textfield;
-  -o-appearance: textfield;
-  -ms-appearance: textfield;
-  appearance: textfield;
+input[type="number"] {
+    -webkit-appearance: textfield;
+    -moz-appearance: textfield;
+    -o-appearance: textfield;
+    -ms-appearance: textfield;
+    appearance: textfield;
 }
 </style>
diff --git a/admin/src/addon/shop/views/marketing/coupon/components/coupon-collection.vue b/admin/src/addon/shop/views/marketing/coupon/components/coupon-collection.vue
index 5fd3d084..b009a9ed 100644
--- a/admin/src/addon/shop/views/marketing/coupon/components/coupon-collection.vue
+++ b/admin/src/addon/shop/views/marketing/coupon/components/coupon-collection.vue
@@ -1,159 +1,98 @@
 <template>
-  <el-drawer
-    v-model="showDialog"
-    :title="popTitle"
-    direction="rtl"
-    :before-close="handleClose"
-    class="collection-detail-drawer"
-  >
-    <div class="main-container" v-loading="loading">
-      <el-card class="box-card !border-none" shadow="never">
-        <el-row class="flex">
-          <el-col :span="8" class="min-w-[100px]">
-            <div class="statistic-card">
-              <el-statistic
-                :value="
-                  couponStatistics.receive_count
-                    ? Number.parseInt(couponStatistics.receive_count)
-                    : '0'
-                "
-              ></el-statistic>
-              <div class="statistic-footer">
-                <div class="footer-item text-[14px] text-[#666]">
-                  <span>{{ t('receiveCount') }}</span>
+    <el-drawer v-model="showDialog" :title="popTitle" direction="rtl" :before-close="handleClose" class="collection-detail-drawer">
+        <div class="main-container" v-loading="loading">
+            <el-card class="box-card !border-none" shadow="never">
+                <el-row class="flex">
+                    <el-col :span="8" class="min-w-[100px]">
+                        <div class="statistic-card">
+                            <el-statistic :value="couponStatistics.receive_count ? Number.parseInt(couponStatistics.receive_count) : '0'"></el-statistic>
+                            <div class="statistic-footer">
+                                <div class="footer-item text-[14px] text-[#666]">
+                                    <span>{{ t('receiveCount') }}</span>
+                                </div>
+                            </div>
+                        </div>
+                    </el-col>
+                    <el-col :span="8" class="min-w-[100px]">
+                        <div class="statistic-card">
+                            <el-statistic :value="couponStatistics.receive_use_count ? Number.parseInt(couponStatistics.receive_use_count) : '0'"></el-statistic>
+                            <div class="statistic-footer">
+                                <div class="footer-item text-[14px] text-[#666]">
+                                    <span>{{ t('receiveUseCount') }}</span>
+                                </div>
+                            </div>
+                        </div>
+                    </el-col>
+                    <el-col :span="8" class="min-w-[100px]">
+                        <div class="statistic-card">
+                            <el-statistic :value="couponStatistics.receive_expire_count ? Number.parseInt(couponStatistics.receive_expire_count) : '0'"></el-statistic>
+                            <div class="statistic-footer">
+                                <div class="footer-item text-[14px] text-[#666]">
+                                    <span>{{ t('receiveExpireCount') }}</span>
+                                </div>
+                            </div>
+                        </div>
+                    </el-col>
+                </el-row>
+            </el-card>
+
+            <el-card class="box-card !border-none mb-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="tableData.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('memberInfo')" prop="keywords">
+                        <el-input v-model.trim="tableData.searchParam.keywords" class="w-[240px]" :placeholder="t('memberInfoPlaceholder')" />
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="couponCollection()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+
+            <div class="mt-[10px]">
+                <el-table :data="tableData.data" ref="tableRef" size="large" v-loading="tableData.loading">
+                    <template #empty>
+                        <span>{{ !tableData.loading ? t('emptyData') : '' }}</span>
+                    </template>
+
+                    <el-table-column prop="title" :label="t('collectionTtitle')" />
+                    <el-table-column :label="t('userName')">
+                        <template #default="{ row }">
+                            <div class="flex flex-col">
+                                <span class="text-[12px] mt-[5px]">{{ row.member.nickname }}</span>
+                                <span class="text-[12px] mt-[5px]"> {{ row.member.mobile }}</span>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="receive_type_name" :label="t('collectionReceiveType')" />
+                    <el-table-column prop="create_time" :label="t('createTime')" />
+                    <el-table-column prop="expire_time" :label="t('expireTime')" />
+                    <el-table-column prop="status_name" :label="t('status')" />
+                    <el-table-column :label="t('useTime')">
+                        <template #default="{ row }">
+                            {{ row.use_time || '--' }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column  :label="t('validity')" >
+                        <template #default="{ row }">
+                            {{ row.create_time }}至{{ row.expire_time }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('operation')" fixed="right" align="right">
+                        <template #default="{ row }">
+                            <el-button type="primary" v-if="row.use_time != 0" link @click="showOrder(row)">{{ t('showOrder') }}</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="tableData.page" v-model:page-size="tableData.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="tableData.total"
+                        :page-sizes="[5,10,20,50,100]"
+                        @size-change="couponCollection()" @current-change="couponCollection" />
                 </div>
-              </div>
             </div>
-          </el-col>
-          <el-col :span="8" class="min-w-[100px]">
-            <div class="statistic-card">
-              <el-statistic
-                :value="
-                  couponStatistics.receive_use_count
-                    ? Number.parseInt(couponStatistics.receive_use_count)
-                    : '0'
-                "
-              ></el-statistic>
-              <div class="statistic-footer">
-                <div class="footer-item text-[14px] text-[#666]">
-                  <span>{{ t('receiveUseCount') }}</span>
-                </div>
-              </div>
-            </div>
-          </el-col>
-          <el-col :span="8" class="min-w-[100px]">
-            <div class="statistic-card">
-              <el-statistic
-                :value="
-                  couponStatistics.receive_expire_count
-                    ? Number.parseInt(couponStatistics.receive_expire_count)
-                    : '0'
-                "
-              ></el-statistic>
-              <div class="statistic-footer">
-                <div class="footer-item text-[14px] text-[#666]">
-                  <span>{{ t('receiveExpireCount') }}</span>
-                </div>
-              </div>
-            </div>
-          </el-col>
-        </el-row>
-      </el-card>
-
-      <el-card
-        class="box-card !border-none mb-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="tableData.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('memberInfo')" prop="keywords">
-            <el-input
-              v-model.trim="tableData.searchParam.keywords"
-              class="w-[240px]"
-              :placeholder="t('memberInfoPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="couponCollection()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
-
-      <div class="mt-[10px]">
-        <el-table
-          :data="tableData.data"
-          ref="tableRef"
-          size="large"
-          v-loading="tableData.loading"
-        >
-          <template #empty>
-            <span>{{ !tableData.loading ? t('emptyData') : '' }}</span>
-          </template>
-
-          <el-table-column prop="title" :label="t('collectionTtitle')" />
-          <el-table-column :label="t('userName')">
-            <template #default="{ row }">
-              <div class="flex flex-col">
-                <span class="text-[12px] mt-[5px]">{{
-                  row.member.nickname
-                }}</span>
-                <span class="text-[12px] mt-[5px]">
-                  {{ row.member.mobile }}</span
-                >
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="receive_type_name"
-            :label="t('collectionReceiveType')"
-          />
-          <el-table-column prop="create_time" :label="t('createTime')" />
-          <el-table-column prop="expire_time" :label="t('expireTime')" />
-          <el-table-column prop="status_name" :label="t('status')" />
-          <el-table-column :label="t('useTime')">
-            <template #default="{ row }">
-              {{ row.use_time || '--' }}
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('validity')">
-            <template #default="{ row }">
-              {{ row.create_time }}至{{ row.expire_time }}
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('operation')" fixed="right" align="right">
-            <template #default="{ row }">
-              <el-button
-                type="primary"
-                v-if="row.use_time != 0"
-                link
-                @click="showOrder(row)"
-                >{{ t('showOrder') }}</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="tableData.page"
-            v-model:page-size="tableData.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="tableData.total"
-            :page-sizes="[5, 10, 20, 50, 100]"
-            @size-change="couponCollection()"
-            @current-change="couponCollection"
-          />
         </div>
-      </div>
-    </div>
-  </el-drawer>
+        
+    </el-drawer>
 </template>
 
 <script lang="ts" setup>
@@ -168,7 +107,7 @@ const showDialog = ref(false)
 const loading = ref(false)
 const repeat = ref(false)
 let popTitle: string = '优惠券领取记录'
-let couponId = ''
+let couponId = '';
 
 const route = useRoute()
 const router = useRouter()
@@ -178,7 +117,7 @@ const password_input = ref(true)
 const password_copy_input = ref(true)
 
 const handleClose = (done: () => void) => {
-  showDialog.value = false
+    showDialog.value = false;
 }
 
 const activeName = ref('order')
@@ -186,14 +125,14 @@ const activeName = ref('order')
 const formData: Record<string, any> | null = ref(null)
 
 const tableData = reactive({
-  page: 1,
-  limit: 5,
-  total: 0,
-  loading: false,
-  data: [],
-  searchParam: {
-    keywords: '',
-  },
+    page: 1,
+    limit: 5,
+    total: 0,
+    loading: false,
+    data: [],
+    searchParam: {
+        keywords: ''
+    }
 })
 const searchFormRef = ref<FormInstance>()
 const couponStatistics = ref([])
@@ -201,61 +140,57 @@ const couponStatistics = ref([])
  * 获取领取记录列表
  */
 const couponCollection = () => {
-  tableData.loading = true
-  getCouponRecords({
-    page: tableData.page,
-    limit: tableData.limit,
-    id: couponId,
-    ...tableData.searchParam,
-  })
-    .then((res) => {
-      tableData.loading = false
-      tableData.data = res.data.data
-      tableData.total = res.data.total
-      console.log('tableData', tableData, couponId)
-    })
-    .catch(() => {
-      tableData.loading = false
+    tableData.loading = true
+    getCouponRecords({
+        page: tableData.page,
+        limit: tableData.limit,
+        id: couponId,
+        ...tableData.searchParam
+    }).then(res => {
+        tableData.loading = false
+        tableData.data = res.data.data
+        tableData.total = res.data.total
+        console.log("tableData",tableData,couponId);
+    }).catch(() => {
+        tableData.loading = false
     })
 
-  // 详情查询
-  getCouponInfo(couponId)
-    .then((res) => {
-      couponStatistics.value = res.data
-      loading.value = false
-    })
-    .catch(() => {
-      loading.value = false
+    // 详情查询
+    getCouponInfo(couponId).then(res => {
+        couponStatistics.value = res.data
+        loading.value = false
+    }).catch(() => {
+        loading.value = false
     })
 }
 
 // 订单详情
 const showOrder = (data: any) => {
-  showDialog.value = false
-  router.push('/shop/order/detail?order_id=' + data.trade_id)
+    showDialog.value = false;
+    router.push('/shop/order/detail?order_id=' + data.trade_id)
 }
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  couponCollection()
+    if (!formEl) return
+    formEl.resetFields()
+    couponCollection()
 }
 
 const setFormData = async (row: any = null) => {
-  couponId = row.id
-  formData.value = null
-  activeName.value = 'order'
-  couponCollection()
+    couponId = row.id;
+    formData.value = null;
+    activeName.value = 'order';
+    couponCollection();
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
 <style lang="scss">
-.collection-detail-drawer {
-  width: 1300px !important;
+.collection-detail-drawer{
+    width: 1300px !important;
 }
 </style>
diff --git a/admin/src/addon/shop/views/marketing/coupon/components/coupon-spread-popup.vue b/admin/src/addon/shop/views/marketing/coupon/components/coupon-spread-popup.vue
index 7d5afe64..613027cd 100644
--- a/admin/src/addon/shop/views/marketing/coupon/components/coupon-spread-popup.vue
+++ b/admin/src/addon/shop/views/marketing/coupon/components/coupon-spread-popup.vue
@@ -1,34 +1,26 @@
 <template>
-  <div>
-    <el-dialog
-      v-model="showDialog"
-      :title="t('couponSpreadTitle')"
-      width="500px"
-      :destroy-on-close="true"
-    >
-      <div class="promote-flex flex">
-        <div
-          class="promote-img flex justify-center items-center bg-[#f8f8f8] w-[150px] h-[150px]"
-        >
-          <el-image :src="wapImage" />
-        </div>
-
-        <div class="px-[20px] flex-1">
-          <div class="mb-[10px]">{{ t('spreadLink') }}</div>
-          <el-input class="mb-[10px]" readonly :value="wapPreview">
-            <template #append>
-              <el-button @click="copyEvent(wapPreview)">{{
-                t('copy')
-              }}</el-button>
-            </template>
-          </el-input>
-          <a class="text-primary" :href="wapImage" download>{{
-            t('downloadQrcode')
-          }}</a>
-        </div>
-      </div>
-    </el-dialog>
-  </div>
+    <div>
+        <el-dialog v-model="showDialog" :title="t('couponSpreadTitle')" width="500px" :destroy-on-close="true">
+
+            <div class="promote-flex flex">
+                <div class="promote-img flex justify-center items-center bg-[#f8f8f8] w-[150px] h-[150px]">
+                    <el-image :src="wapImage" />
+                </div>
+
+                <div class="px-[20px] flex-1">
+                    <div class="mb-[10px]">{{ t('spreadLink') }}</div>
+                    <el-input class="mb-[10px]" readonly :value="wapPreview">
+                        <template #append>
+                            <el-button @click="copyEvent(wapPreview)">{{ t('copy') }}</el-button>
+                        </template>
+                    </el-input>
+                    <a class="text-primary" :href="wapImage" download>{{ t('downloadQrcode') }}</a>
+                </div>
+
+            </div>
+
+        </el-dialog>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -52,67 +44,63 @@ const wapPreview = ref('')
 const page = ref('')
 
 getUrl().then((res: any) => {
-  wapUrl.value = res.data.wap_url
+    wapUrl.value = res.data.wap_url
 
-  // 生产模式禁止
-  if (import.meta.env.MODE == 'production') return
+    // 生产模式禁止
+    if (import.meta.env.MODE == 'production') return
 
-  wapDomain.value = res.data.wap_domain
+    wapDomain.value = res.data.wap_domain
 
-  // env文件配置过wap域名
-  if (wapDomain.value) {
-    wapUrl.value = wapDomain.value + '/wap'
-  }
+    // env文件配置过wap域名
+    if (wapDomain.value) {
+        wapUrl.value = wapDomain.value + '/wap'
+    }
 
-  const wapDomainStorage = storage.get('wap_domain')
-  if (wapDomainStorage) {
-    wapUrl.value = wapDomainStorage
-  }
+    const wapDomainStorage = storage.get('wap_domain')
+    if (wapDomainStorage) {
+        wapUrl.value = wapDomainStorage
+    }
 })
 
 const loadQrcode = () => {
-  wapPreview.value = `${wapUrl.value}${page.value}`
-  // errorCorrectionLevel：密度容错率L（低）H(高)
-  QRCode.toDataURL(wapPreview.value, {
-    errorCorrectionLevel: 'L',
-    margin: 0,
-    width: 120,
-  }).then((url) => {
-    wapImage.value = url
-  })
+    wapPreview.value = `${wapUrl.value}${page.value}`
+    // errorCorrectionLevel：密度容错率L（低）H(高)
+    QRCode.toDataURL(wapPreview.value, { errorCorrectionLevel: 'L', margin: 0, width: 120 }).then(url => {
+        wapImage.value = url
+    })
 }
 
 const show = (data: any) => {
-  Object.assign(coupon, data)
-  page.value = `/addon/shop/pages/coupon/detail?coupon_id=${coupon.id}`
-  loadQrcode()
-  showDialog.value = true
+    Object.assign(coupon, data)
+    page.value = `/addon/shop/pages/coupon/detail?coupon_id=${coupon.id}`
+    loadQrcode()
+    showDialog.value = true
 }
 
 // 复制
 const { copy, isSupported, copied } = useClipboard()
 const copyEvent = (text: string) => {
-  if (!isSupported.value) {
-    ElMessage({
-      message: t('notSupportCopy'),
-      type: 'warning',
-    })
-  }
-  copy(text)
+    if (!isSupported.value) {
+        ElMessage({
+            message: t('notSupportCopy'),
+            type: 'warning'
+        })
+    }
+    copy(text)
 }
 
 watch(copied, () => {
-  if (copied.value) {
-    ElMessage({
-      message: t('copySuccess'),
-      type: 'success',
-    })
-  }
+    if (copied.value) {
+        ElMessage({
+            message: t('copySuccess'),
+            type: 'success'
+        })
+    }
 })
 
 defineExpose({
-  showDialog,
-  show,
+    showDialog,
+    show
 })
 </script>
 
diff --git a/admin/src/addon/shop/views/marketing/coupon/edit.vue b/admin/src/addon/shop/views/marketing/coupon/edit.vue
index 5104d835..3687a844 100644
--- a/admin/src/addon/shop/views/marketing/coupon/edit.vue
+++ b/admin/src/addon/shop/views/marketing/coupon/edit.vue
@@ -1,251 +1,158 @@
 <template>
-  <div class="main-container">
-    <el-card class="card !border-none" shadow="never">
-      <el-page-header :content="pageName" :icon="ArrowLeft" @back="back()" />
-    </el-card>
-
-    <!-- 表单 -->
-    <el-card
-      class="box-card mt-[15px] !border-none"
-      shadow="never"
-      v-if="Object.keys(formData).length"
-      v-loading="loading"
-    >
-      <el-form
-        class="page-form"
-        :model="formData"
-        label-width="120px"
-        ref="formRef"
-        :rules="formRules"
-      >
-        <!-- 优惠券信息 -->
-        <!-- 优惠券名称 -->
-        <el-form-item :label="t('title')" prop="title">
-          <el-input
-            v-model.trim="formData.title"
-            clearable
-            :placeholder="t('titlePlaceholder')"
-            class="input-width"
-            :maxlength="20"
-          />
-        </el-form-item>
-
-        <!-- 优惠券面额 -->
-        <el-form-item :label="t('price')" prop="price">
-          <el-input
-            v-model.trim="formData.price"
-            @keyup="filterDigit($event)"
-            clearable
-            :placeholder="t('pricePlaceholder')"
-            class="input-width"
-            maxlength="5"
-          />
-        </el-form-item>
-
-        <!-- 优惠券类型 -->
-        <el-form-item :label="t('type')" prop="type">
-          <el-radio-group v-model="formData.type" disabled>
-            <el-radio :label="1">通用券</el-radio>
-            <el-radio :label="2">品类券</el-radio>
-            <el-radio :label="3">商品券</el-radio>
-          </el-radio-group>
-        </el-form-item>
-
-        <el-form-item v-if="formData.type == 2" prop="goods_category_ids">
-          <div>
-            <el-cascader
-              v-model="formData.goods_category_ids"
-              :options="options"
-              :props="props"
-              collapse-tags
-              collapse-tags-tooltip
-              clearable
-            />
-          </div>
-        </el-form-item>
-
-        <el-form-item v-if="formData.type == 3" prop="goods_ids">
-          <div>
-            <el-form-item>
-              <goods-select-popup
-                ref="goodsSelectPopupRef"
-                v-model="formData.goods_ids"
-                :min="1"
-                :max="99"
-              />
-            </el-form-item>
-          </div>
-        </el-form-item>
-
-        <!-- 使用门槛 -->
-        <el-form-item :label="t('threshold')">
-          <el-radio-group v-model="formData.threshold">
-            <el-radio :label="1">{{ t('reduction') }}</el-radio>
-            <el-radio :label="2">{{ t('noThreshold') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-
-        <el-form-item v-if="formData.threshold == 1" prop="min_condition_money">
-          最低满
-          <div class="flex items-center px-[5px]">
-            <el-input
-              v-model.trim="formData.min_condition_money"
-              @keyup="filterDigit($event)"
-              clearable
-              class="!w-[100px]"
-            />
-          </div>
-          元可用
-        </el-form-item>
-
-        <!-- 使用时间 -->
-        <el-form-item :label="t('validType')">
-          <el-radio-group v-model="formData.valid_type">
-            <el-radio :label="1">{{ t('days') }}</el-radio>
-            <el-radio :label="2">{{ t('times') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-
-        <el-form-item v-show="formData.valid_type == 1">
-          领劵后立即生效，有效期
-          <div class="flex items-center px-[5px]">
-            <el-input
-              v-model.trim="formData.length"
-              @keyup="filterNumber($event)"
-              clearable
-              class="!w-[100px]"
-            />
-          </div>
-          天
-        </el-form-item>
-
-        <el-form-item prop="valid_time" v-if="formData.valid_type == 2">
-          领劵后立即生效，使用时间截止至
-          <div class="w-[220px] pl-[5px]">
-            <el-date-picker
-              v-model="formData.valid_time"
-              type="datetime"
-              :placeholder="t('validTimePlaceholder')"
-            />
-          </div>
-        </el-form-item>
-
-        <!--  活动信息  -->
-        <!-- 领取方式 -->
-        <el-form-item :label="t('receiveType')">
-          <div>
-            <el-radio-group v-model="formData.receive_type">
-              <el-radio :label="1">{{ t('user') }}</el-radio>
-              <el-radio :label="2">{{ t('grant') }}</el-radio>
-            </el-radio-group>
-          </div>
-          <div class="form-tip">
-            开启手动领取后，会员可以直接在优惠券列表以及优惠券推广中直接领取
-          </div>
-        </el-form-item>
-
-        <!--  领取时间  -->
-        <el-form-item
-          :label="t('receiveTime')"
-          v-show="formData.receive_type == 1"
-        >
-          <el-radio-group v-model="formData.receive_type_time">
-            <el-radio :label="1">{{ t('limitedTime') }}</el-radio>
-            <el-radio :label="2">{{ t('unlimitedTime') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-
-        <el-form-item
-          prop="receive_time"
-          v-show="formData.receive_type_time == 1 && formData.receive_type == 1"
-        >
-          <div class="w-[180px]">
-            <el-date-picker
-              v-model="formData.receive_time"
-              type="datetimerange"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-            />
-          </div>
-        </el-form-item>
-
-        <!--  优惠券数量  -->
-        <el-form-item
-          :label="t('receiveNumber')"
-          v-show="formData.receive_type == 1"
-        >
-          <el-radio-group v-model="formData.limit">
-            <el-radio :label="1">{{ t('limit') }}</el-radio>
-            <el-radio :label="2">{{ t('unlimited') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-
-        <el-form-item
-          v-show="formData.limit == 1 && formData.receive_type == 1"
-          prop="remain_count"
-        >
-          <div>
-            <el-input
-              onkeypress="return( /[\d]/.test(String.fromCharCode(event.keyCode) ) )"
-              v-model.trim="formData.remain_count"
-              clearable
-              :placeholder="t('remainCountPlaceholder')"
-              class="input-width"
-              :min="formData.remain_count"
-              :max="100000"
-              :controls="false"
-              maxlength="6"
-            >
-              <template #append>张</template>
-            </el-input>
-          </div>
-        </el-form-item>
-
-        <!-- 用户可领取数量 -->
-        <el-form-item
-          :label="t('userLimitCount')"
-          prop="limit_count"
-          v-show="formData.receive_type == 1"
-        >
-          <el-input
-            onkeypress="return( /[\d]/.test(String.fromCharCode(event.keyCode) ) )"
-            v-model.trim="formData.limit_count"
-            clearable
-            :placeholder="t('userLimitCountPlaceholder')"
-            class="input-width"
-            :min="1"
-            :max="100000"
-            maxlength="6"
-          >
-            <template #append>张</template>
-          </el-input>
-          <div class="form-tip">每个会员通过前端直接可领用数量</div>
-        </el-form-item>
-      </el-form>
-    </el-card>
-
-    <!-- 提交按钮 -->
-    <div class="fixed-footer-wrap">
-      <div class="fixed-footer">
-        <el-button type="primary" @click="onSave(formRef)">{{
-          t('save')
-        }}</el-button>
-        <el-button @click="back()">{{ t('cancel') }}</el-button>
-      </div>
+    <div class="main-container">
+
+        <el-card class="card !border-none" shadow="never">
+            <el-page-header :content="pageName" :icon="ArrowLeft" @back="back()" />
+        </el-card>
+
+        <!-- 表单 -->
+        <el-card class="box-card mt-[15px] !border-none " shadow="never" v-if="Object.keys(formData).length" v-loading="loading">
+            <el-form class="page-form" :model="formData" label-width="120px" ref="formRef" :rules="formRules">
+                <!-- 优惠券信息 -->
+                <!-- 优惠券名称 -->
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model.trim="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" :maxlength="20" />
+                </el-form-item>
+
+                <!-- 优惠券面额 -->
+                <el-form-item :label="t('price')" prop="price">
+                    <el-input v-model.trim="formData.price" @keyup="filterDigit($event)"  clearable :placeholder="t('pricePlaceholder')" class="input-width" maxlength="5" />
+                </el-form-item>
+
+                <!-- 优惠券类型 -->
+                <el-form-item :label="t('type')" prop="type">
+                    <el-radio-group v-model="formData.type" disabled>
+                        <el-radio :label="1">通用券</el-radio>
+                        <el-radio :label="2">品类券</el-radio>
+                        <el-radio :label="3">商品券</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+                <el-form-item v-if="formData.type == 2" prop="goods_category_ids">
+                    <div>
+                        <el-cascader v-model="formData.goods_category_ids" :options="options" :props="props" collapse-tags collapse-tags-tooltip clearable />
+                    </div>
+                </el-form-item>
+
+                <el-form-item v-if="formData.type == 3" prop="goods_ids">
+                    <div>
+                        <el-form-item>
+                            <goods-select-popup ref="goodsSelectPopupRef" v-model="formData.goods_ids" :min="1" :max="99" />
+                        </el-form-item>
+                    </div>
+                </el-form-item>
+
+                <!-- 使用门槛 -->
+                <el-form-item :label="t('threshold')">
+                    <el-radio-group v-model="formData.threshold">
+                        <el-radio :label="1">{{ t('reduction') }}</el-radio>
+                        <el-radio :label="2">{{ t('noThreshold') }}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+                <el-form-item v-if="formData.threshold == 1" prop="min_condition_money">
+                    最低满
+                    <div class="flex items-center px-[5px]">
+                        <el-input v-model.trim="formData.min_condition_money" @keyup="filterDigit($event)" clearable class="!w-[100px]" />
+                    </div>
+                    元可用
+                </el-form-item>
+
+                <!-- 使用时间 -->
+                <el-form-item :label="t('validType')">
+                    <el-radio-group v-model="formData.valid_type">
+                        <el-radio :label="1">{{ t('days') }}</el-radio>
+                        <el-radio :label="2">{{ t('times') }}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+                <el-form-item v-show="formData.valid_type == 1">
+                    领劵后立即生效，有效期
+                    <div class="flex items-center px-[5px]">
+                        <el-input v-model.trim="formData.length" @keyup="filterNumber($event)" clearable class="!w-[100px]" />
+                    </div>
+                    天
+                </el-form-item>
+
+                <el-form-item prop="valid_time" v-if="formData.valid_type == 2">
+                    领劵后立即生效，使用时间截止至
+                    <div class="w-[220px] pl-[5px]">
+                        <el-date-picker v-model="formData.valid_time" type="datetime" :placeholder="t('validTimePlaceholder')" />
+                    </div>
+                </el-form-item>
+
+                <!--  活动信息  -->
+                <!-- 领取方式 -->
+                <el-form-item :label="t('receiveType')">
+                    <div>
+                        <el-radio-group v-model="formData.receive_type" >
+                            <el-radio :label="1">{{ t('user') }}</el-radio>
+                            <el-radio :label="2">{{ t('grant') }}</el-radio>
+                        </el-radio-group>
+                    </div>
+                    <div class="form-tip">开启手动领取后，会员可以直接在优惠券列表以及优惠券推广中直接领取</div>
+                </el-form-item>
+
+                <!--  领取时间  -->
+                <el-form-item :label="t('receiveTime')" v-show="formData.receive_type == 1">
+                    <el-radio-group v-model="formData.receive_type_time">
+                        <el-radio :label="1">{{ t('limitedTime') }}</el-radio>
+                        <el-radio :label="2">{{ t('unlimitedTime') }}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+                <el-form-item prop="receive_time" v-show="formData.receive_type_time == 1 && formData.receive_type == 1">
+                    <div class="w-[180px]">
+                        <el-date-picker v-model="formData.receive_time" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"/>
+                    </div>
+                </el-form-item>
+
+                <!--  优惠券数量  -->
+                <el-form-item :label="t('receiveNumber')" v-show="formData.receive_type == 1">
+                    <el-radio-group v-model="formData.limit">
+                        <el-radio :label="1">{{ t('limit') }}</el-radio>
+                        <el-radio :label="2">{{ t('unlimited') }}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+                <el-form-item v-show="formData.limit == 1 && formData.receive_type == 1" prop="remain_count">
+                    <div>
+                        <el-input onkeypress='return( /[\d]/.test(String.fromCharCode(event.keyCode) ) )'
+                            v-model.trim="formData.remain_count" clearable :placeholder="t('remainCountPlaceholder')"
+                            class="input-width" :min="formData.remain_count" :max="100000" :controls="false" maxlength="6">
+                            <template #append>张</template>
+                        </el-input>
+                    </div>
+                </el-form-item>
+
+                <!-- 用户可领取数量 -->
+                <el-form-item :label="t('userLimitCount')" prop="limit_count" v-show="formData.receive_type == 1">
+                    <el-input onkeypress='return( /[\d]/.test(String.fromCharCode(event.keyCode) ) )'
+                        v-model.trim="formData.limit_count" clearable :placeholder="t('userLimitCountPlaceholder')"
+                        class="input-width" :min="1" :max="100000" maxlength="6">
+                        <template #append>张</template>
+                    </el-input>
+                    <div class="form-tip">每个会员通过前端直接可领用数量</div>
+                </el-form-item>
+
+            </el-form>
+        </el-card>
+
+        <!-- 提交按钮 -->
+        <div class="fixed-footer-wrap">
+            <div class="fixed-footer">
+                <el-button type="primary" @click="onSave(formRef)">{{ t('save') }}</el-button>
+                <el-button @click="back()">{{ t('cancel') }}</el-button>
+            </div>
+        </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
 import { ref, computed, onMounted } from 'vue'
 import { t } from '@/lang'
 import { useRoute, useRouter } from 'vue-router'
-import {
-  getGoodsCategoryList,
-  editCoupon,
-  getCouponInfo,
-} from '@/addon/shop/api/marketing'
+import { getGoodsCategoryList, editCoupon, getCouponInfo } from '@/addon/shop/api/marketing'
 import type { FormInstance } from 'element-plus'
 import { ArrowLeft } from '@element-plus/icons-vue'
 import { filterNumber, filterDigit } from '@/utils/common'
@@ -264,264 +171,225 @@ const end = new Date()
 
 end.setTime(end.getTime() + 3600 * 1000 * 2 * 360) // 设置结束默认时间为当前时间30天后
 const initialFormData = {
-  title: '', // 名称
-  price: '', // 面值
-  type: 1, // 优惠券类型 1通用券 2品类券 3商品券
-  limit: 2,
-  receive_type: 2, // 领取方式
-  remain_count: 1000, // 剩余数量
-  threshold: 2, // 门槛
-  limit_count: '', // 单个用户领取数量
-  // status: 1,  //状态 1 正常 2 未开启 3 已无效
-  min_condition_money: '', // 商品最低多少金额可用优惠券
-  length: 30, // 有效期时长(天)
-  goods_ids: [], // 关联商品id
-  goods_category_ids: [], // 关联商品分类id
-  receive_type_time: 2,
-  valid_type: 1, // 有效方式，1=时长，2=范围
-  receive_time: [start, end],
-  valid_time: end,
+    title: '', // 名称
+    price: '', // 面值
+    type: 1, // 优惠券类型 1通用券 2品类券 3商品券
+    limit: 2,
+    receive_type: 2, // 领取方式
+    remain_count: 1000, // 剩余数量
+    threshold: 2, // 门槛
+    limit_count: '', // 单个用户领取数量
+    // status: 1,  //状态 1 正常 2 未开启 3 已无效
+    min_condition_money: '', // 商品最低多少金额可用优惠券
+    length: 30, // 有效期时长(天)
+    goods_ids: [], // 关联商品id
+    goods_category_ids: [], // 关联商品分类id
+    receive_type_time: 2,
+    valid_type: 1, // 有效方式，1=时长，2=范围
+    receive_time: [start, end],
+    valid_time: end
 }
 const formData: Record<string, any> = ref({ ...initialFormData })
 const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    title: [
-      { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
-    ],
-    price: [{ required: true, validator: priceRule, trigger: 'blur' }],
-    goods_ids: [{ required: true, message: t('请选择商品'), trigger: 'blur' }],
-    goods_category_ids: [
-      { required: true, message: t('请选择商品分类'), trigger: 'blur' },
-    ],
-    min_condition_money: [
-      { required: true, validator: minConditionMoney, trigger: 'blur' },
-    ],
-    valid_time: [{ required: true, validator: validTime, trigger: 'blur' }],
-    receive_time: [{ required: true, validator: receiveTime, trigger: 'blur' }],
-    remain_count: [{ required: true, validator: remainCount, trigger: 'blur' }],
-    limit_count: [
-      { required: true, validator: limitCountRule, trigger: 'blur' },
-    ],
-  }
+    return {
+        title: [
+            { required: true, message: t('titlePlaceholder'), trigger: 'blur' }
+        ],
+        price: [
+            { required: true, validator: priceRule, trigger: 'blur' }
+        ],
+        goods_ids: [
+            { required: true, message: t('请选择商品'), trigger: 'blur' }
+        ],
+        goods_category_ids: [
+            { required: true, message: t('请选择商品分类'), trigger: 'blur' }
+        ],
+        min_condition_money: [
+            { required: true, validator: minConditionMoney, trigger: 'blur' }
+        ],
+        valid_time: [
+            { required: true, validator: validTime, trigger: 'blur' }
+        ],
+        receive_time: [
+            { required: true, validator: receiveTime, trigger: 'blur' }
+        ],
+        remain_count: [
+            { required: true, validator: remainCount, trigger: 'blur' }
+        ],
+        limit_count: [
+            { required: true, validator: limitCountRule, trigger: 'blur' }
+        ]
+    }
 })
 
 const receiveTime = (rule: any, value: any, callback: any) => {
-  if (
-    formData.value.receive_type_time == 1 &&
-    formData.value.receive_type == 1
-  ) {
-    if (
-      !formData.value.receive_time[0] ||
-      timestampFn(formData.value.receive_time[0]) <= Date.now()
-    ) {
-      callback(new Error(t('领取开始时间不能小于等于当前时间')))
-    }
-    if (
-      !formData.value.receive_time[1] ||
-      timestampFn(formData.value.receive_time[1]) <=
-        timestampFn(formData.value.receive_time[0])
-    ) {
-      callback(new Error(t('领取结束时间不能小于等于领取开始时间')))
+    if (formData.value.receive_type_time == 1 && formData.value.receive_type == 1) {
+        if (!formData.value.receive_time[0] || timestampFn(formData.value.receive_time[0]) <= Date.now()) {
+            callback(new Error(t('领取开始时间不能小于等于当前时间')))
+        }
+        if (!formData.value.receive_time[1] || timestampFn(formData.value.receive_time[1]) <= timestampFn(formData.value.receive_time[0])) {
+            callback(new Error(t('领取结束时间不能小于等于领取开始时间')))
+        }
     }
-  }
-  callback()
+    callback()
 }
 
 const validTime = (rule: any, value: any, callback: any) => {
-  if (
-    formData.value.valid_type == 2 &&
-    formData.value.valid_time <= Date.now()
-  ) {
-    callback(new Error(t('有效期不能小于等于当前时间')))
-  }
-  if (
-    formData.value.valid_type == 2 &&
-    formData.value.receive_type_time == 1 &&
-    formData.value.receive_type == 1
-  ) {
-    if (
-      timestampFn(formData.value.valid_time) <=
-      timestampFn(formData.value.receive_time[1])
-    ) {
-      callback(new Error(t('有效期不能小于等于领取结束时间')))
+    if (formData.value.valid_type == 2 && formData.value.valid_time <= Date.now()) {
+        callback(new Error(t('有效期不能小于等于当前时间')))
     }
-  }
-  callback()
+    if(formData.value.valid_type == 2 && formData.value.receive_type_time == 1 && formData.value.receive_type == 1){
+		if (timestampFn(formData.value.valid_time) <= timestampFn(formData.value.receive_time[1])) {
+			callback(new Error(t('有效期不能小于等于领取结束时间')))
+		}
+	}
+    callback()
 }
 
 const minConditionMoney = (rule: any, value: any, callback: any) => {
-  if (
-    formData.value.threshold == 1 &&
-    formData.value.min_condition_money <= 0
-  ) {
-    callback(new Error(t('使用门槛最低不能小于0元')))
-  }
-  callback()
+    if (formData.value.threshold == 1 && formData.value.min_condition_money <= 0) {
+        callback(new Error(t('使用门槛最低不能小于0元')))
+    }
+    callback()
 }
 
 const remainCount = (rule: any, value: any, callback: any) => {
-  if (
-    formData.value.remain_count != '' &&
-    formData.value.remain_count > 100000
-  ) {
-    callback(new Error(t('remainCountPlaceholder')))
-  }
-  if (
-    !formData.value.remain_count ||
-    (formData.value.remain_count != '' && formData.value.remain_count < 1)
-  ) {
-    callback(new Error(t('发放数量不能小于1张')))
-  }
-  callback()
+    if (formData.value.remain_count != '' && formData.value.remain_count > 100000) {
+        callback(new Error(t('remainCountPlaceholder')))
+    }
+    if (!formData.value.remain_count || formData.value.remain_count != '' && formData.value.remain_count < 1) {
+        callback(new Error(t('发放数量不能小于1张')))
+    }
+    callback()
 }
 const priceRule = (rule: any, value: any, callback: any) => {
-  if (
-    !formData.value.price ||
-    formData.value.price == '' ||
-    formData.value.price <= 0
-  ) {
-    callback(new Error(t('pricePlaceholder')))
-  }
-  callback()
+    if (!formData.value.price || formData.value.price == '' || formData.value.price <= 0) {
+        callback(new Error(t('pricePlaceholder')))
+    }
+    callback()
 }
 
 const limitCountRule = (rule: any, value: any, callback: any) => {
-  if (
-    !formData.value.limit_count ||
-    (formData.value.limit_count != '' && formData.value.limit_count < 1)
-  ) {
-    callback(new Error(t('userLimitCountPlaceholder')))
-  }
-  if (
-    formData.value.limit == 1 &&
-    formData.value.limit_count != '' &&
-    formData.value.remain_count != '' &&
-    parseInt(formData.value.limit_count) > parseInt(formData.value.remain_count)
-  ) {
-    callback(new Error(t('限领张数不能大于发放数量')))
-  }
-  callback()
+    if (!formData.value.limit_count || formData.value.limit_count != '' && formData.value.limit_count < 1) {
+        callback(new Error(t('userLimitCountPlaceholder')))
+    }
+	if (formData.value.limit == 1 && formData.value.limit_count != '' && formData.value.remain_count != '' && parseInt(formData.value.limit_count) > parseInt(formData.value.remain_count)) {
+        callback(new Error(t('限领张数不能大于发放数量')))
+    }
+    callback()
 }
 
 // 优惠券类型
 const props = { multiple: true }
 const options = ref([])
 const categoryList = () => {
-  getGoodsCategoryList({}).then((res) => {
-    options.value = res.data.goods_category_tree
-  })
+    getGoodsCategoryList({}).then((res) => {
+        options.value = res.data.goods_category_tree
+    })
 }
 const onSave = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      const data = cloneDeep(formData.value)
-      if (data.type == 1) {
-        delete data.goods_category_ids
-        delete data.goods_ids
-      } else if (data.type == 2) {
-        delete data.goods_ids
-      } else if (data.type == 3) {
-        delete data.goods_category_ids
-      }
-      const save = editCoupon
-      save(data)
-        .then((res) => {
-          loading.value = false
-          history.back()
-        })
-        .catch(() => {
-          loading.value = false
-        })
-    }
-  })
+    if (loading.value || !formEl) return
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+            const data = cloneDeep(formData.value)
+            if (data.type == 1) {
+                delete data.goods_category_ids
+                delete data.goods_ids
+            } else if (data.type == 2) {
+                delete data.goods_ids
+            } else if (data.type == 3) {
+                delete data.goods_category_ids
+            }
+            const save = editCoupon
+            save(data).then(res => {
+                loading.value = false
+                history.back()
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
 }
 onMounted(async () => {
-  await categoryList()
-  getCouponInfoFn(couponId)
+    await categoryList()
+    getCouponInfoFn(couponId)
 })
 
 // 时间格式转换时间戳
 const timestampFn = (data) => {
-  const dateObject = new Date(data)
-  return dateObject.getTime()
+    const dateObject = new Date(data)
+    return dateObject.getTime()
 }
 
 // 详情查询
 const getCouponInfoFn = (id: any) => {
-  loading.value = true
-  getCouponInfo(id)
-    .then((res) => {
-      formData.value = Object.assign(formData.value, res.data)
-      if (
-        parseInt(formData.value.start_time) != 0 &&
-        parseInt(formData.value.end_time) != 0
-      ) {
-        const start_time = new Date(formData.value.start_time)
-        const end_time = new Date(formData.value.end_time)
-        formData.value.receive_type_time = 1
-        formData.value.receive_time = [start_time, end_time]
-      }
-
-      if (res.data.valid_end_time)
-        formData.value.valid_time = res.data.valid_end_time
-
-      if (formData.value.type == 2) {
-        goodsCategoryFormatting(formData.value.goods_category_ids)
-      }
-      loading.value = false
-    })
-    .catch(() => {
-      loading.value = false
+    loading.value = true
+    getCouponInfo(id).then(res => {
+        formData.value = Object.assign(formData.value, res.data)
+        if (parseInt(formData.value.start_time) != 0 && parseInt(formData.value.end_time) != 0) {
+            const start_time = new Date(formData.value.start_time)
+            const end_time = new Date(formData.value.end_time)
+            formData.value.receive_type_time = 1
+            formData.value.receive_time = [start_time, end_time]
+        }
+
+        if (res.data.valid_end_time) formData.value.valid_time = res.data.valid_end_time
+
+        if (formData.value.type == 2) {
+            goodsCategoryFormatting(formData.value.goods_category_ids)
+        }
+        loading.value = false
+    }).catch(() => {
+        loading.value = false
     })
 }
 
 const goodsCategoryFormatting = (data: any) => {
-  const arr: any = []
-  data.forEach((item: any, index: any) => {
-    options.value.forEach((twoItem: any, twoIndex) => {
-      if (twoItem.value == item) {
-        arr[index] = []
-        arr[index].push(twoItem.value)
-      } else {
-        twoItem.children.forEach((threeItem: any, threeIndex: any) => {
-          if (threeItem.value == item) {
-            arr[index] = []
-            arr[index].push(twoItem.value)
-            arr[index].push(threeItem.value)
-          }
+    const arr: any = []
+    data.forEach((item: any, index: any) => {
+        options.value.forEach((twoItem: any, twoIndex) => {
+            if (twoItem.value == item) {
+                arr[index] = []
+                arr[index].push(twoItem.value)
+            } else {
+                twoItem.children.forEach((threeItem: any, threeIndex: any) => {
+                    if (threeItem.value == item) {
+                        arr[index] = []
+                        arr[index].push(twoItem.value)
+                        arr[index].push(threeItem.value)
+                    }
+                })
+            }
         })
-      }
     })
-  })
-  formData.value.goods_category_ids = arr
+    formData.value.goods_category_ids = arr
 }
 
 const back = () => {
-  router.push('/shop/marketing/coupon/list')
+    router.push('/shop/marketing/coupon/list')
 }
 </script>
 
 <style lang="scss">
 input::-webkit-outer-spin-button,
 input::-webkit-inner-spin-button {
-  -webkit-appearance: none !important;
-  -moz-appearance: none !important;
-  -o-appearance: none !important;
-  -ms-appearance: none !important;
-  appearance: none !important;
-  margin: 0;
+    -webkit-appearance: none !important;
+    -moz-appearance: none !important;
+    -o-appearance: none !important;
+    -ms-appearance: none !important;
+    appearance: none !important;
+    margin: 0;
 }
 
-input[type='number'] {
-  -webkit-appearance: textfield;
-  -moz-appearance: textfield;
-  -o-appearance: textfield;
-  -ms-appearance: textfield;
-  appearance: textfield;
+input[type="number"] {
+    -webkit-appearance: textfield;
+    -moz-appearance: textfield;
+    -o-appearance: textfield;
+    -ms-appearance: textfield;
+    appearance: textfield;
 }
 </style>
diff --git a/admin/src/addon/shop/views/marketing/coupon/list.vue b/admin/src/addon/shop/views/marketing/coupon/list.vue
index 1a535f29..89fcf320 100644
--- a/admin/src/addon/shop/views/marketing/coupon/list.vue
+++ b/admin/src/addon/shop/views/marketing/coupon/list.vue
@@ -1,205 +1,125 @@
 <template>
-  <div class="main-container">
-    <!-- 添加优惠券按钮 -->
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-        <el-button type="primary" @click="handleChange">
-          {{ t('addCoupon') }}
-        </el-button>
-      </div>
-
-      <!-- 搜索 -->
-      <el-card
-        class="box-card !border-none my-[20px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="tableData.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('title')" prop="title">
-            <el-input
-              v-model.trim="tableData.searchParam.title"
-              :placeholder="t('titlePlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('statusName')" prop="status">
-            <el-select
-              v-model="tableData.searchParam.status"
-              clearable
-              class="input-item"
-            >
-              <el-option
-                v-for="(item, index) in statusList"
-                :key="index"
-                :label="item"
-                :value="index"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="loadCouponList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
-
-      <!-- 列表 -->
-      <div class="mt-[10px]">
-        <el-table
-          :data="tableData.data"
-          size="large"
-          v-loading="tableData.loading"
-        >
-          <template #empty>
-            <span>{{ !tableData.loading ? t('emptyData') : '' }}</span>
-          </template>
-
-          <el-table-column prop="title" :label="t('title')" min-width="130" />
-          <el-table-column prop="type_name" :label="t('type')" min-width="98" />
-          <el-table-column prop="price" :label="t('price')" min-width="100">
-            <template #default="{ row }">
-              <span>¥{{ row.price }}</span>
-            </template>
-          </el-table-column>
-
-          <el-table-column :label="t('receiveType')" min-width="130">
-            <template #default="{ row }">
-              <span v-if="row.receive_type == 1">是</span>
-              <span v-else>否</span>
-            </template>
-          </el-table-column>
-
-          <el-table-column :label="t('sumCount')" min-width="160">
-            <template #default="{ row }">
-              <span v-if="row.receive_type == 1 && row.sum_count != '-1'"
-                >{{ row.remain_count || 0 }} / {{ row.sum_count || 0 }}</span
-              >
-              <span v-else>不限量</span>
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('remainCount')" min-width="140">
-            <template #default="{ row }">
-              <span
-                >{{ row.receive_count || 0 }} / {{ row.receive_use_count || 0 }}
-              </span>
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('threshold')" min-width="130">
-            <template #default="{ row }">
-              <span v-if="row.min_condition_money == '0.00'">无门槛</span>
-              <span v-else>满{{ row.min_condition_money }}元可用</span>
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('validType')" min-width="190">
-            <template #default="{ row }">
-              <template v-if="row.receive_type == 1">
-                <span v-if="row.valid_type == 1">
-                  领取之日起{{ row.length || '' }} 天内有效</span
-                >
-                <span v-else>
-                  使用截止时间至{{ row.valid_end_time || '' }}
-                </span>
-              </template>
-              <span v-else>--</span>
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('receiveTypeTime')" min-width="210">
-            <template #default="{ row }">
-              <div v-if="row.receive_type == 1">
-                <div
-                  v-if="
-                    parseInt(row.start_time) != 0 && parseInt(row.end_time) != 0
-                  "
-                  class="flex flex-col"
-                >
-                  <span>开始时间：{{ row.start_time }}</span>
-                  <span>结束时间：{{ row.end_time }}</span>
+    <div class="main-container">
+        <!-- 添加优惠券按钮 -->
+        <el-card class="box-card !border-none" shadow="never">
+
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+                <el-button type="primary" @click="handleChange">
+                    {{ t('addCoupon') }}
+                </el-button>
+            </div>
+
+             <!-- 搜索 -->
+            <el-card class="box-card !border-none my-[20px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="tableData.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('title')" prop="title">
+                        <el-input v-model.trim="tableData.searchParam.title" :placeholder="t('titlePlaceholder')" />
+                    </el-form-item>
+                    <el-form-item :label="t('statusName')" prop='status'>
+						<el-select v-model="tableData.searchParam.status" clearable class="input-item">
+							<el-option v-for="(item, index) in statusList" :key="index" :label="item" :value="index"></el-option>
+						</el-select>
+					</el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="loadCouponList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+
+             <!-- 列表 -->
+            <div class="mt-[10px]">
+                <el-table :data="tableData.data" size="large" v-loading="tableData.loading">
+                    <template #empty>
+                        <span>{{ !tableData.loading ? t('emptyData') : '' }}</span>
+                    </template>
+
+                    <el-table-column prop="title" :label="t('title')" min-width="130" />
+                    <el-table-column prop="type_name" :label="t('type')" min-width="98" />
+                    <el-table-column prop="price" :label="t('price')" min-width="100" >
+                        <template #default="{ row }">
+                            <span >¥{{row.price}}</span>
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column  :label="t('receiveType')" min-width="130" >
+                        <template #default="{ row }">
+                            <span v-if="row.receive_type == 1">是</span>
+                            <span v-else >否</span>
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column  :label="t('sumCount')" min-width="160">
+                        <template #default="{ row }">
+                            <span v-if="row.receive_type == 1 && row.sum_count != '-1'">{{ row.remain_count || 0 }} / {{ row.sum_count || 0 }}</span>
+                            <span v-else>不限量</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column  :label="t('remainCount')" min-width="140">
+                        <template #default="{ row }">
+                            <span >{{ row.receive_count || 0}} / {{ row.receive_use_count || 0}} </span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column  :label="t('threshold')" min-width="130" >
+                        <template #default="{ row }">
+                            <span v-if="row.min_condition_money == '0.00'">无门槛</span>
+                            <span v-else >满{{ row.min_condition_money }}元可用</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column  :label="t('validType')" min-width="190">
+                        <template #default="{ row }">
+                            <template v-if="row.receive_type == 1">
+                                <span v-if="row.valid_type == 1">  领取之日起{{ row.length || '' }} 天内有效</span>
+                                <span v-else> 使用截止时间至{{ row.valid_end_time || ''}} </span>
+                            </template>
+                            <span v-else>--</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column  :label="t('receiveTypeTime')" min-width="210">
+                        <template #default="{ row }">
+                            <div v-if="row.receive_type == 1">
+                                <div v-if="parseInt(row.start_time) != 0 && parseInt(row.end_time) !=0" class="flex flex-col">
+                                    <span>开始时间：{{row.start_time}}</span>
+                                    <span>结束时间：{{row.end_time}}</span>
+                                </div>
+                                <div v-else>不限时</div>
+                            </div>
+                            <span v-else>--</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="status_name" :label="t('statusName')" min-width="98" />
+                    <el-table-column :label="t('operation')" fixed="right" align="right" min-width="160">
+                       <template #default="{ row }">
+                        <el-button type="primary" link @click="spreadEvent(row)">{{ t('spreadGoods') }}</el-button>
+                            <el-button type="primary" link @click="editEvent(row)" v-if="row.status == 0 || row.status == 1">{{ t('edit') }}</el-button>
+                            <el-button type="primary" link @click="deleteEvent(row)" v-if="row.status != 1">{{ t('delete') }}</el-button>
+                            <el-button type="primary" link @click="closeEvent(row)" v-if="row.status == 1">{{ t('close') }}</el-button>
+                            <el-button type="primary" link @click="collectionEvent(row)">{{ t('receive') }}</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="tableData.page" v-model:page-size="tableData.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="tableData.total"
+                        @size-change="loadCouponList()" @current-change="loadCouponList" />
                 </div>
-                <div v-else>不限时</div>
-              </div>
-              <span v-else>--</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="status_name"
-            :label="t('statusName')"
-            min-width="98"
-          />
-          <el-table-column
-            :label="t('operation')"
-            fixed="right"
-            align="right"
-            min-width="160"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="spreadEvent(row)">{{
-                t('spreadGoods')
-              }}</el-button>
-              <el-button
-                type="primary"
-                link
-                @click="editEvent(row)"
-                v-if="row.status == 0 || row.status == 1"
-                >{{ t('edit') }}</el-button
-              >
-              <el-button
-                type="primary"
-                link
-                @click="deleteEvent(row)"
-                v-if="row.status != 1"
-                >{{ t('delete') }}</el-button
-              >
-              <el-button
-                type="primary"
-                link
-                @click="closeEvent(row)"
-                v-if="row.status == 1"
-                >{{ t('close') }}</el-button
-              >
-              <el-button type="primary" link @click="collectionEvent(row)">{{
-                t('receive')
-              }}</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="tableData.page"
-            v-model:page-size="tableData.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="tableData.total"
-            @size-change="loadCouponList()"
-            @current-change="loadCouponList"
-          />
-        </div>
-      </div>
-    </el-card>
-    <!-- 商品推广弹出框 -->
-    <coupon-spread-popup ref="couponSpreadPopupRef" />
-    <coupon-collection ref="couponCollectionRef" />
-  </div>
+            </div>
+        </el-card>
+        <!-- 商品推广弹出框 -->
+        <coupon-spread-popup ref="couponSpreadPopupRef"/>
+        <coupon-collection ref="couponCollectionRef"/> 
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
-import {
-  getCouponList,
-  deleteCoupon,
-  closeCoupon,
-  getCouponStatusList,
-} from '@/addon/shop/api/marketing'
+import { getCouponList, deleteCoupon, closeCoupon,getCouponStatusList } from '@/addon/shop/api/marketing'
 import { ElMessageBox, FormInstance } from 'element-plus'
 import { t } from '@/lang'
 import couponSpreadPopup from '@/addon/shop/views/marketing/coupon/components/coupon-spread-popup.vue'
-import { setTablePageStorage, getTablePageStorage } from '@/utils/common'
+import { setTablePageStorage,getTablePageStorage } from "@/utils/common";
 import couponCollection from '@/addon/shop/views/marketing/coupon/components/coupon-collection.vue'
 
 const router = useRouter()
@@ -208,49 +128,43 @@ const pageName = route.meta.title
 const statusList = ref(null)
 // 表单内容
 const tableData = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    title: '',
-    status: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        title: '',
+        status:'',
+    }
 })
 
 const searchFormRef = ref<FormInstance>()
 
-const getCouponStatusListFn = () => {
-  getCouponStatusList().then((res) => {
-    statusList.value = res.data
-  })
+const getCouponStatusListFn = () =>{
+    getCouponStatusList().then(res=>{
+        statusList.value = res.data
+    })
 }
 getCouponStatusListFn()
 const loadCouponList = (page: number = 1) => {
-  tableData.loading = true
-  tableData.page = page
-
-  getCouponList({
-    page: tableData.page,
-    limit: tableData.limit,
-    ...tableData.searchParam,
-  })
-    .then((res) => {
-      tableData.loading = false
-      tableData.data = res.data.data
-      tableData.total = res.data.total
-      setTablePageStorage(
-        tableData.page,
-        tableData.limit,
-        tableData.searchParam
-      )
-    })
-    .catch(() => {
-      tableData.loading = false
+    tableData.loading = true
+    tableData.page = page
+
+    getCouponList({
+        page: tableData.page,
+        limit: tableData.limit,
+        ...tableData.searchParam
+    }).then(res => {
+        tableData.loading = false
+        tableData.data = res.data.data
+        tableData.total = res.data.total
+        setTablePageStorage(tableData.page, tableData.limit, tableData.searchParam);
+    }).catch(() => {
+        tableData.loading = false
     })
 }
-loadCouponList(getTablePageStorage(tableData.searchParam).page)
+loadCouponList(getTablePageStorage(tableData.searchParam).page);
 
 // 优惠券领取记录
 const couponCollectionRef: any = ref(null)
@@ -259,61 +173,64 @@ const couponCollectionRef: any = ref(null)
 const couponSpreadPopupRef: any = ref(null)
 
 const spreadEvent = (data: any) => {
-  couponSpreadPopupRef.value.show(data)
+    couponSpreadPopupRef.value.show(data)
 }
 // 添加优惠券
 const handleChange = () => {
-  router.push('/shop/marketing/coupon/add')
+    router.push('/shop/marketing/coupon/add')
 }
 // 编辑优惠券
 const editEvent = (data: any) => {
-  router.push('/shop/marketing/coupon/edit?id=' + data.id)
+    router.push('/shop/marketing/coupon/edit?id=' + data.id)
 }
 
 // 领取记录
 const collectionEvent = (data: any) => {
-  let parameter = { id: data.id }
-  couponCollectionRef.value.setFormData(parameter)
-  couponCollectionRef.value.showDialog = true
+    let parameter = {id: data.id};
+    couponCollectionRef.value.setFormData(parameter);
+    couponCollectionRef.value.showDialog = true;
 }
 
 /**
  * 删除
  */
 const deleteEvent = (data: any) => {
-  ElMessageBox.confirm(t('couponDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    deleteCoupon(data.id)
-      .then(() => {
-        loadCouponList()
-      })
-      .catch(() => {})
-  })
+    ElMessageBox.confirm(t('couponDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        deleteCoupon(data.id).then(() => {
+            loadCouponList()
+        }).catch(() => {
+        })
+    })
 }
 
 // 关闭
 const closeEvent = (data: any) => {
-  ElMessageBox.confirm(t('couponColseTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    closeCoupon(data.id)
-      .then(() => {
-        loadCouponList()
-      })
-      .catch(() => {})
-  })
+    ElMessageBox.confirm(t('couponColseTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        closeCoupon(data.id).then(() => {
+            loadCouponList()
+        }).catch(() => {
+        })
+    })
 }
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadCouponList()
+    if (!formEl) return
+    formEl.resetFields()
+    loadCouponList()
 }
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/addon/shop/views/marketing/discount/add.vue b/admin/src/addon/shop/views/marketing/discount/add.vue
index 60f660be..935d1a44 100644
--- a/admin/src/addon/shop/views/marketing/discount/add.vue
+++ b/admin/src/addon/shop/views/marketing/discount/add.vue
@@ -1,420 +1,222 @@
 <template>
-  <div class="main-container">
-    <el-card class="card !border-none" shadow="never">
-      <el-page-header :content="pageName" :icon="ArrowLeft" @back="back()" />
-    </el-card>
-
-    <!-- 表单 -->
-    <el-card
-      class="box-card mt-[15px] !border-none"
-      shadow="never"
-      v-loading="loading"
-    >
-      <el-form
-        :model="formData"
-        label-width="120px"
-        ref="formRef"
-        :rules="formRules"
-        class="page-form"
-      >
-        <!-- 活动名称： -->
-        <el-form-item :label="t('name')" prop="active_name">
-          <div>
-            <el-input
-              v-model.trim="formData.active_name"
-              clearable
-              :placeholder="t('namePlaceholder')"
-              class="input-width"
-              :maxlength="20"
-            />
-            <p class="text-[14px] text-[#999]">{{ t('nameTip') }}</p>
-          </div>
-        </el-form-item>
-        <!-- 活动标题： -->
-        <el-form-item :label="t('title')" prop="active_desc">
-          <div>
-            <el-input
-              v-model.trim="formData.active_desc"
-              clearable
-              :placeholder="t('titlePlaceholder')"
-              class="input-width"
-              :maxlength="20"
-            />
-            <p class="text-[14px] text-[#999]">{{ t('titleTip') }}</p>
-          </div>
-        </el-form-item>
-        <!-- 活动时间 -->
-        <el-form-item :label="t('activityTime')" prop="discount_time">
-          <div class="w-[180px]">
-            <el-date-picker
-              v-model="formData.discount_time"
-              type="datetimerange"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-            />
-          </div>
-        </el-form-item>
-        <!-- 选择商品 -->
-        <el-form-item :label="t('selectProduct')" class="!m-0">
-          <goods-select-popup
-            ref="goodsSelectPopupRef"
-            v-model="formData.goods_ids"
-            @goodsSelect="goodsSelect"
-            :min="1"
-            :max="99"
-          />
-        </el-form-item>
-        <el-form-item prop="goods_list"></el-form-item>
-        <el-form-item v-if="formData.goods_list.length && goodsTable.data">
-          <div class="w-full sku_list">
-            <el-table
-              class="!w-[1400px] !max-w-[100%]"
-              :data="goodsTable.list"
-              size="large"
-              ref="goods_listTableRef"
-              @selection-change="handleSelectionChange"
-            >
-              <template #empty>
-                <span>{{ t('emptyData') }}</span>
-              </template>
-
-              <el-table-column type="selection" width="55" />
-              <el-table-column
-                :label="t('goodsSelectPopupGoodsInfo')"
-                min-width="300"
-              >
-                <template #default="{ row }">
-                  <div class="flex items-center cursor-pointer">
-                    <div
-                      class="min-w-[60px] h-[60px] flex items-center justify-center"
-                    >
-                      <el-image
-                        v-if="row.goods_cover_thumb_small"
-                        class="w-[60px] h-[60px]"
-                        :src="img(row.goods_cover_thumb_small)"
-                        fit="contain"
-                      >
-                        <template #error>
-                          <div class="image-slot">
-                            <img
-                              class="w-[60px] h-[60px]"
-                              src="@/addon/shop/assets/goods_default.png"
-                            />
-                          </div>
-                        </template>
-                      </el-image>
-                      <img
-                        v-else
-                        class="w-[70px] h-[60px]"
-                        src="@/addon/shop/assets/goods_default.png"
-                        fit="contain"
-                      />
+    <div class="main-container">
+
+        <el-card class="card !border-none" shadow="never">
+            <el-page-header :content="pageName" :icon="ArrowLeft" @back="back()" />
+        </el-card>
+
+        <!-- 表单 -->
+        <el-card class="box-card mt-[15px] !border-none" shadow="never" v-loading="loading">
+            <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form">
+                <!-- 活动名称： -->
+                <el-form-item :label="t('name')" prop="active_name">
+                    <div>
+                        <el-input v-model.trim="formData.active_name" clearable :placeholder="t('namePlaceholder')" class="input-width" :maxlength="20" />
+                        <p class=" text-[14px] text-[#999]">{{ t('nameTip') }}</p>
                     </div>
-                    <div class="ml-2">
-                      <span :title="row.goods_name" class="multi-hidden">{{
-                        row.goods_name
-                      }}</span>
-                      <span class="text-primary text-[12px]">{{
-                        row.goods_type_name
-                      }}</span>
+                </el-form-item>
+                <!-- 活动标题： -->
+                <el-form-item :label="t('title')" prop="active_desc">
+                    <div>
+                        <el-input v-model.trim="formData.active_desc" clearable :placeholder="t('titlePlaceholder')" class="input-width" :maxlength="20" />
+                        <p class=" text-[14px] text-[#999]">{{ t('titleTip') }}</p>
                     </div>
-                  </div>
-                </template>
-              </el-table-column>
-              <el-table-column prop="price" :label="t('price')" min-width="130">
-                <template #default="{ row }">
-                  <div>￥{{ row.goodsSku.price }}</div>
-                </template>
-              </el-table-column>
-
-              <el-table-column :label="t('discounts')" width="170">
-                <template #default="{ row, $index }">
-                  <el-form-item
-                    v-if="!row.goodsSku.sku_spec_format"
-                    :key="row.goods_id"
-                    :prop="'goods_list.' + row.index + '.discount_rate'"
-                    :rules="[
-                      {
-                        trigger: 'blur',
-                        validator: (rule: any, value: any, callback: any) => {
-                          if (value.length == 0) {
-                            callback(t('discountsPlaceholder'))
-                          } else if (
-                            isNaN(value) ||
-                            !regExp.number.test(value)
-                          ) {
-                            callback(t('discountsTips'))
-                          } else if (value <= 0) {
-                            callback(t('discountsTipsTwo'))
-                          } else if (value > 9.9) {
-                            callback(t('discountsTipsThree'))
-                          } else {
-                            callback()
-                          }
-                        },
-                      },
-                    ]"
-                    class="sku-form-item-wrap"
-                  >
-                    <el-input
-                      v-model.trim="row.discount_rate"
-                      @blur="inputBlur(row, 'discount', row.index)"
-                      clearable
-                      placeholder="0.00"
-                      maxlength="8"
-                    />
-                  </el-form-item>
-                  <el-form-item
-                    :prop="'goods_list.' + row.index + '.valid'"
-                    :rules="[
-                      {
-                        trigger: 'blur',
-                        validator: (rule: any, value: any, callback: any) => {
-                          if (!value) {
-                            callback(t('skuDiscountSettingsPlaceholder'))
-                          } else {
-                            callback()
-                          }
-                        },
-                      },
-                    ]"
-                    v-else
-                  >
-                    <span
-                      v-if="
-                        row.valid &&
-                        row.min_discount_rate != Infinity &&
-                        row.max_discount_rate != -Infinity
-                      "
-                      >{{
-                        row.min_discount_rate == row.max_discount_rate
-                          ? row.min_discount_rate
-                          : row.min_discount_rate + '-' + row.max_discount_rate
-                      }}</span
-                    >
-                    <span v-else>--</span>
-                  </el-form-item>
-                </template>
-              </el-table-column>
-              <el-table-column :label="t('reduceMoney')" width="170">
-                <template #default="{ row, $index }">
-                  <el-form-item
-                    v-if="!row.goodsSku.sku_spec_format"
-                    :key="row.goods_id"
-                    :prop="'goods_list.' + row.index + '.reduce_money'"
-                    :rules="[
-                      {
-                        trigger: 'blur',
-                        validator: (rule: any, value: any, callback: any) => {
-                          if (value.length == 0) {
-                            callback(t('reduceMoneyPlaceholder'))
-                          } else if (
-                            isNaN(value) ||
-                            !regExp.digit.test(value)
-                          ) {
-                            callback(t('reduceMoneyTips'))
-                          } else if (value <= 0) {
-                            callback(t('reduceMoneyTipsTwo'))
-                          } else if (value >= parseFloat(row.goodsSku.price)) {
-                            callback(t('reduceMoneyTipsThree'))
-                          } else {
-                            callback()
-                          }
-                        },
-                      },
-                    ]"
-                    class="sku-form-item-wrap"
-                  >
-                    <el-input
-                      v-model.trim="row.reduce_money"
-                      @blur="inputBlur(row, 'reduce', row.index)"
-                      clearable
-                      placeholder="0.00"
-                      maxlength="8"
-                    />
-                  </el-form-item>
-                  <el-form-item v-else>
-                    <span
-                      v-if="
-                        row.valid &&
-                        row.min_reduce_money != Infinity &&
-                        row.max_reduce_money != -Infinity
-                      "
-                      >{{
-                        row.min_reduce_money == row.max_reduce_money
-                          ? row.min_reduce_money
-                          : row.min_reduce_money + '-' + row.max_reduce_money
-                      }}</span
-                    >
-                    <span v-else>--</span>
-                  </el-form-item>
-                </template>
-              </el-table-column>
-              <el-table-column :label="t('promotional')" width="170">
-                <template #default="{ row, $index }">
-                  <el-form-item
-                    v-if="!row.goodsSku.sku_spec_format"
-                    :key="row.goods_id"
-                    :prop="'goods_list.' + row.index + '.specify_price'"
-                    :rules="[
-                      {
-                        trigger: 'blur',
-                        validator: (rule: any, value: any, callback: any) => {
-                          if (value.length == 0) {
-                            callback(t('promotionalPlaceholder'))
-                          } else if (
-                            isNaN(value) ||
-                            !regExp.digit.test(value)
-                          ) {
-                            callback(t('promotionalTips'))
-                          } else if (value <= 0) {
-                            callback(t('promotionalTipsTwo'))
-                          } else if (value >= parseFloat(row.goodsSku.price)) {
-                            callback(t('promotionalTipsThree'))
-                          } else {
-                            callback()
-                          }
-                        },
-                      },
-                    ]"
-                    class="sku-form-item-wrap"
-                  >
-                    <el-input
-                      v-model.trim="row.specify_price"
-                      clearable
-                      @blur="inputBlur(row, 'specify', row.index)"
-                      placeholder="0.00"
-                      maxlength="8"
-                    />
-                  </el-form-item>
-                  <el-form-item v-else>
-                    <span
-                      v-if="
-                        row.valid &&
-                        row.min_specify_price != Infinity &&
-                        row.max_specify_price != -Infinity
-                      "
-                      >{{
-                        row.min_specify_price == row.max_specify_price
-                          ? row.min_specify_price
-                          : row.min_specify_price + '-' + row.max_specify_price
-                      }}</span
-                    >
-                    <span v-else>--</span>
-                  </el-form-item>
-                </template>
-              </el-table-column>
-              <el-table-column :label="t('discountType')" width="130">
-                <template #default="{ row }">
-                  <span v-if="!row.goodsSku.sku_spec_format">{{
-                    row.discount_type == 'discount'
-                      ? t('discounts')
-                      : row.discount_type == 'reduce'
-                        ? t('reduceMoney')
-                        : t('promotional')
-                  }}</span>
-                  <el-form-item v-else>请在设置中查看</el-form-item>
-                </template>
-              </el-table-column>
-              <el-table-column
-                :label="t('operation')"
-                align="right"
-                min-width="160"
-              >
-                <template #default="{ row }">
-                  <!-- <el-button type="primary" link @click="enabledEvent(row)">{{ row.is_enabled?t('noEnabled'):t('enabled') }}</el-button> -->
-                  <el-button
-                    v-if="row.goodsSku.sku_spec_format"
-                    type="primary"
-                    link
-                    @click="
-                      skuDiscountSettingsEvent(formData.goods_list[row.index])
-                    "
-                  >
-                    {{ t('skuDiscountSettings') }}
-                  </el-button>
-                  <el-button
-                    type="primary"
-                    link
-                    @click="deleteEvent(row.index)"
-                    >{{ t('delete') }}</el-button
-                  >
-                </template>
-              </el-table-column>
-            </el-table>
-            <div
-              class="flex items-center justify-between mt-[15px] !w-[1400px] !max-w-[100%]"
-            >
-              <div class="flex items-center mb-[15px]">
-                <el-checkbox
-                  v-model="toggleCheckbox"
-                  size="large"
-                  class="!mr-[15px]"
-                  @change="toggleChange"
-                  :indeterminate="isIndeterminate"
-                >
-                  <span>已选 {{ multipleSelection.length }} 项</span>
-                </el-checkbox>
-
-                <label>{{ t('batchOperation') }}</label>
-                <!-- <el-select v-model="batchOperation.discount_type" class="!w-[130px] ml-[10px]" @change="batchOperation.discountNumber=''">
+                </el-form-item>
+                <!-- 活动时间 -->
+                <el-form-item :label="t('activityTime')" prop="discount_time">
+                    <div class="w-[180px]">
+                        <el-date-picker v-model="formData.discount_time" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"/>
+                    </div>
+                </el-form-item>
+                <!-- 选择商品 -->
+                <el-form-item :label="t('selectProduct')" class="!m-0">
+                    <goods-select-popup ref="goodsSelectPopupRef" v-model="formData.goods_ids" @goodsSelect="goodsSelect" :min="1" :max="99" />
+                </el-form-item>
+                <el-form-item prop="goods_list"></el-form-item>
+                <el-form-item v-if="formData.goods_list.length&& goodsTable.data">
+                    <div class="w-full sku_list">
+                        <el-table class="!w-[1400px] !max-w-[100%]" :data="goodsTable.list" size="large" ref="goods_listTableRef" @selection-change="handleSelectionChange">
+                            <template #empty>
+                                <span>{{ t('emptyData')}}</span>
+                            </template>
+
+                            <el-table-column type="selection" width="55" />
+                            <el-table-column :label="t('goodsSelectPopupGoodsInfo')" min-width="300">
+                                <template #default="{ row }">
+                                    <div class="flex items-center cursor-pointer">
+                                        <div class="min-w-[60px] h-[60px] flex items-center justify-center">
+                                            <el-image v-if="row.goods_cover_thumb_small" class="w-[60px] h-[60px]" :src="img(row.goods_cover_thumb_small)" fit="contain">
+                                                <template #error>
+                                                    <div class="image-slot">
+                                                        <img class="w-[60px] h-[60px]" src="@/addon/shop/assets/goods_default.png" />
+                                                    </div>
+                                                </template>
+                                            </el-image>
+                                            <img v-else class="w-[70px] h-[60px]" src="@/addon/shop/assets/goods_default.png" fit="contain" />
+                                        </div>
+                                        <div class="ml-2">
+                                            <span :title="row.goods_name" class="multi-hidden">{{ row.goods_name }}</span>
+                                            <span class="text-primary text-[12px]">{{ row.goods_type_name }}</span>
+                                        </div>
+                                    </div>
+                                </template>
+                            </el-table-column>
+                            <el-table-column prop="price" :label="t('price')" min-width="130">
+                                <template #default="{ row }">
+                                    <div>￥{{ row.goodsSku.price }}</div>
+                                </template>
+                            </el-table-column>
+
+                            <el-table-column :label="t('discounts')" width="170">
+                                <template #default="{ row,$index }">
+                                    <el-form-item v-if="!row.goodsSku.sku_spec_format" :key="row.goods_id" :prop="'goods_list.'+row.index + '.discount_rate'" :rules="[{
+                                        trigger: 'blur',
+                                        validator: (rule: any, value: any, callback: any) => {
+                                            if (value.length == 0) {
+                                                callback(t('discountsPlaceholder'))
+                                            } else if (isNaN(value) || !regExp.number.test(value)) {
+                                                callback(t('discountsTips'))
+                                            } else if (value <= 0) {
+                                                callback(t('discountsTipsTwo'))
+                                            } else if (value>9.9) {
+                                                callback(t('discountsTipsThree'))
+                                            } else {
+                                                callback();
+                                            }
+                                        }
+                                    }]" class="sku-form-item-wrap">
+                                        <el-input v-model.trim="row.discount_rate" @blur="inputBlur(row,'discount',row.index)" clearable placeholder="0.00" maxlength="8" />
+                                    </el-form-item>
+                                    <el-form-item :prop="'goods_list.'+row.index + '.valid'" :rules="[{
+                                        trigger: 'blur',
+                                        validator: (rule: any, value: any, callback: any) => {
+                                            if (!value) {
+                                                callback(t('skuDiscountSettingsPlaceholder'))
+                                            } else {
+                                                callback();
+                                            }
+                                        }
+                                    }]" v-else>
+                                    <span v-if="row.valid && row.min_discount_rate!=Infinity&&row.max_discount_rate!=-Infinity">{{ row.min_discount_rate==row.max_discount_rate?row.min_discount_rate:row.min_discount_rate+'-'+row.max_discount_rate }}</span>
+                                    <span v-else>--</span>
+                                    </el-form-item>
+                                </template>
+                            </el-table-column>
+                            <el-table-column :label="t('reduceMoney')" width="170">
+                                <template #default="{ row,$index }">
+                                    <el-form-item v-if="!row.goodsSku.sku_spec_format" :key="row.goods_id" :prop="'goods_list.'+row.index + '.reduce_money'" :rules="[{
+                                        trigger: 'blur',
+                                        validator: (rule: any, value: any, callback: any) => {
+                                                if (value.length == 0) {
+                                                    callback(t('reduceMoneyPlaceholder'))
+                                                } else if (isNaN(value) || !regExp.digit.test(value)) {
+                                                    callback(t('reduceMoneyTips'))
+                                                } else if (value <=0) {
+                                                    callback(t('reduceMoneyTipsTwo'))
+                                                } else if (value >= parseFloat(row.goodsSku.price) ) {
+                                                    callback(t('reduceMoneyTipsThree'))
+                                                } else {
+                                                    callback();
+                                                }
+                                        }
+                                        }]" class="sku-form-item-wrap">
+                                        <el-input v-model.trim="row.reduce_money" @blur="inputBlur(row,'reduce',row.index)" clearable placeholder="0.00" maxlength="8" />
+                                    </el-form-item>
+                                    <el-form-item v-else>
+                                        <span v-if="row.valid && row.min_reduce_money!=Infinity&&row.max_reduce_money!=-Infinity">{{ row.min_reduce_money==row.max_reduce_money?row.min_reduce_money:row.min_reduce_money+'-'+row.max_reduce_money }}</span>
+                                        <span v-else>--</span>
+                                    </el-form-item>
+                                </template>
+                            </el-table-column>
+                            <el-table-column :label="t('promotional')" width="170">
+                                <template #default="{ row,$index }">
+                                    <el-form-item v-if="!row.goodsSku.sku_spec_format" :key="row.goods_id" :prop="'goods_list.'+row.index + '.specify_price'" :rules="[{
+                                        trigger: 'blur',
+                                        validator: (rule: any, value: any, callback: any) => {
+                                                if (value.length == 0) {
+                                                    callback(t('promotionalPlaceholder'))
+                                                } else if (isNaN(value) || !regExp.digit.test(value)) {
+                                                    callback(t('promotionalTips'))
+                                                } else if (value <=0 ) {
+                                                    callback(t('promotionalTipsTwo'))
+                                                }else if (value >= parseFloat(row.goodsSku.price) ) {
+                                                    callback(t('promotionalTipsThree'))
+                                                } else {
+                                                    callback();
+                                                }
+                                        }
+                                    }]" class="sku-form-item-wrap">
+                                        <el-input v-model.trim="row.specify_price" clearable @blur="inputBlur(row,'specify',row.index)" placeholder="0.00" maxlength="8" />
+                                    </el-form-item>
+                                    <el-form-item v-else>
+                                        <span v-if="row.valid && row.min_specify_price!=Infinity&&row.max_specify_price!=-Infinity">{{ row.min_specify_price==row.max_specify_price?row.min_specify_price:row.min_specify_price+'-'+row.max_specify_price }}</span>
+                                        <span v-else>--</span>
+                                    </el-form-item>
+                                </template>
+                            </el-table-column>
+                            <el-table-column :label="t('discountType')" width="130">
+                                <template #default="{ row }">
+                                    <span v-if="!row.goodsSku.sku_spec_format">{{row.discount_type=='discount'?t('discounts'):row.discount_type=='reduce'?t('reduceMoney'):t('promotional')}}</span>
+                                    <el-form-item v-else>请在设置中查看</el-form-item>
+                                </template>
+                            </el-table-column>
+                            <el-table-column :label="t('operation')"  align="right" min-width="160">
+                                <template #default="{row}">
+                                    <!-- <el-button type="primary" link @click="enabledEvent(row)">{{ row.is_enabled?t('noEnabled'):t('enabled') }}</el-button> -->
+                                    <el-button v-if="row.goodsSku.sku_spec_format" type="primary" link @click="skuDiscountSettingsEvent(formData.goods_list[row.index])">
+                                        {{t('skuDiscountSettings') }}
+                                    </el-button>
+                                    <el-button type="primary" link @click="deleteEvent(row.index)">{{t('delete') }}</el-button>
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                        <div class="flex items-center justify-between mt-[15px] !w-[1400px] !max-w-[100%]">
+                            <div class="flex items-center mb-[15px]">
+                                <el-checkbox v-model="toggleCheckbox" size="large" class="!mr-[15px]" @change="toggleChange" :indeterminate="isIndeterminate">
+                                    <span>已选 {{ multipleSelection.length }} 项</span>
+                                </el-checkbox>
+
+                                <label>{{ t('batchOperation') }}</label>
+                                <!-- <el-select v-model="batchOperation.discount_type" class="!w-[130px] ml-[10px]" @change="batchOperation.discountNumber=''">
                                     <el-option :label="t('discounts')" value="discount" />
                                     <el-option :label="t('reduceMoney')" value="reduce" />
                                     <el-option :label="t('promotional')" value="specify" />
                                 </el-select> -->
-                <el-input
-                  v-model.trim="batchOperation.discountNumber"
-                  clearable
-                  :placeholder="
-                    batchOperation.discount_type == 'discount'
-                      ? t('discounts')
-                      : batchOperation.discount_type == 'reduce'
-                        ? t('reduceMoney')
-                        : t('promotional')
-                  "
-                  class="!w-[130px] ml-[10px]"
-                  maxlength="8"
-                />
-                <el-button class="ml-[10px]" type="primary" @click="saveBatch"
-                  >{{ t('confirm') }}
-                </el-button>
-              </div>
-              <el-pagination
-                v-model:current-page="goodsTable.page"
-                v-model:page-size="goodsTable.limit"
-                layout="total, prev, pager, next, jumper"
-                :total="goodsTable.total"
-                @current-change="setGoodsList"
-              />
-            </div>
-          </div>
-        </el-form-item>
-      </el-form>
-    </el-card>
+                                <el-input v-model.trim="batchOperation.discountNumber" clearable
+                                          :placeholder="batchOperation.discount_type=='discount'?t('discounts'):batchOperation.discount_type=='reduce'?t('reduceMoney'):t('promotional')"
+                                          class="!w-[130px] ml-[10px]" maxlength="8" />
+                                <el-button class="ml-[10px]" type="primary" @click="saveBatch">{{ t('confirm') }}
+                                </el-button>
+                            </div>
+                            <el-pagination v-model:current-page="goodsTable.page" v-model:page-size="goodsTable.limit"
+                                           layout="total, prev, pager, next, jumper" :total="goodsTable.total"
+                                           @current-change="setGoodsList" />
+                        </div>
+                    </div>
+                </el-form-item>
+            </el-form>
+        </el-card>
 
-    <goods-sku-popup ref="goodsSkuPopupRef" @skuSave="skuSave" />
+        <goods-sku-popup ref="goodsSkuPopupRef" @skuSave="skuSave" />
 
-    <!-- 提交按钮 -->
-    <div class="fixed-footer-wrap">
-      <div class="fixed-footer">
-        <el-button type="primary" @click="onSave(formRef)">{{
-          t('save')
-        }}</el-button>
-        <el-button @click="back()">{{ t('cancel') }}</el-button>
-      </div>
+        <!-- 提交按钮 -->
+        <div class="fixed-footer-wrap">
+            <div class="fixed-footer">
+                <el-button type="primary" @click="onSave(formRef)">{{ t('save') }}</el-button>
+                <el-button @click="back()">{{ t('cancel') }}</el-button>
+            </div>
+        </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
-import { ref, computed, reactive, nextTick } from 'vue'
-import { t } from '@/lang'
-import { useRoute, useRouter } from 'vue-router'
-import { addActiveDiscount } from '@/addon/shop/api/marketing'
-import { FormInstance, ElMessage } from 'element-plus'
+import {ref, computed, reactive, nextTick} from 'vue'
+import {t} from '@/lang'
+import {useRoute, useRouter} from 'vue-router'
+import {addActiveDiscount} from "@/addon/shop/api/marketing";
+import {FormInstance, ElMessage} from 'element-plus'
 import { ArrowLeft } from '@element-plus/icons-vue'
-import { deepClone, img } from '@/utils/common'
+import {deepClone, img} from '@/utils/common'
 import goodsSelectPopup from '@/addon/shop/views/goods/components/goods-select-popup.vue'
 import goodsSkuPopup from '@/addon/shop/views/marketing/discount/components/goods-sku-popup.vue'
 
@@ -429,299 +231,274 @@ const goodsSelectPopupRef: any = ref(null)
 end_time.setTime(end_time.getTime() + 3600 * 1000 * 2 * 360) // 设置结束默认时间为当前时间30天后
 
 const initialFormData = {
-  active_name: '', // 名称
-  active_desc: '', // 标题
-  active_status: '',
-  start_time: '',
-  end_time: '',
-  goods_data: '',
-  goods_ids: [],
-  goods_list: [],
-  discount_time: [start_time, end_time],
+    active_name: '', // 名称
+    active_desc: '', // 标题
+    active_status: '',
+    start_time: '',
+    end_time: '',
+    goods_data: '',
+    goods_ids: [],
+    goods_list: [],
+    discount_time: [start_time, end_time],
 }
-const formData: Record<string, any> = ref({ ...initialFormData })
+const formData: Record<string, any> = ref({...initialFormData})
 const formRef = ref<FormInstance>()
 
 // 表单验证规则
 // 正则表达式
 const regExp = {
-  number: /^\d{0,10}(.?\d{0,1})$/,
-  digit: /^\d{0,10}(.?\d{0,2})$/,
+    number: /^\d{0,10}(.?\d{0,1})$/,
+    digit: /^\d{0,10}(.?\d{0,2})$/
 }
 
 const formRules = computed(() => {
-  return {
-    active_name: [
-      { required: true, message: t('namePlaceholder'), trigger: 'blur' },
-      { validator: noSpaceValidator, trigger: 'blur' },
-    ],
-    active_desc: [
-      { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
-      { validator: noSpaceValidator, trigger: 'blur' },
-    ],
-    goods_list: [
-      {
-        required: true,
-        message: t('selectProductPlaceholder'),
-        trigger: 'change',
-      },
-    ],
-    discount_time: [
-      { required: true, validator: receiveTime, trigger: 'change' },
-    ],
-  }
+    return {
+        active_name: [
+            {required: true, message: t('namePlaceholder'), trigger: 'blur'},
+            { validator: noSpaceValidator, trigger: 'blur' }
+        ],
+        active_desc: [
+            {required: true, message: t('titlePlaceholder'), trigger: 'blur'},
+            { validator: noSpaceValidator, trigger: 'blur' }
+        ],
+        goods_list: [
+            {required: true, message: t('selectProductPlaceholder'), trigger: 'change'}
+        ],
+        discount_time: [
+            {required: true, validator: receiveTime, trigger: 'change'}
+        ],
+    }
 })
 
-const noSpaceValidator = (rule: any, value: any, callback: any) => {
-  if (value.trim() === '') {
-    return callback(new Error(t('noSpaceAllowed')))
-  }
-  callback() // 通过验证
+const noSpaceValidator = (rule: any, value: any, callback: any)=>{
+    if (value.trim() === '') {
+        return callback(new Error(t('noSpaceAllowed')));
+    }
+    callback(); // 通过验证
 }
 
 const receiveTime = (rule: any, value: any, callback: any) => {
-  if (
-    !formData.value.discount_time ||
-    (formData.value.discount_time &&
-      !formData.value.discount_time[0] &&
-      !formData.value.discount_time[1])
-  ) {
-    callback(new Error(t('请选择活动时间')))
-  } else if (!formData.value.discount_time[0]) {
-    callback(new Error(t('请选择活动开始时间')))
-  } else if (!formData.value.discount_time[1]) {
-    callback(new Error(t('请选择活动结束时间')))
-  } else if (
-    formData.value.discount_time[1] <= formData.value.discount_time[0]
-  ) {
-    callback(new Error(t('活动结束时间不能小于等于活动开始时间')))
-  }
-  callback()
+    if (!formData.value.discount_time || (formData.value.discount_time && !formData.value.discount_time[0] && !formData.value.discount_time[1])) {
+        callback(new Error(t('请选择活动时间')))
+    } else if (!formData.value.discount_time[0]) {
+        callback(new Error(t('请选择活动开始时间')))
+    } else if (!formData.value.discount_time[1]) {
+        callback(new Error(t('请选择活动结束时间')))
+    } else if (formData.value.discount_time[1] <= formData.value.discount_time[0]) {
+        callback(new Error(t('活动结束时间不能小于等于活动开始时间')))
+    }
+    callback()
 }
 
 const validFn = (row: any) => {
-  if (row.discount_rate.length == 0) {
-    return false
-  } else if (
-    isNaN(row.discount_rate) ||
-    !regExp.number.test(row.discount_rate)
-  ) {
-    return false
-  } else if (row.discount_rate <= 0) {
-    return false
-  } else if (row.discount_rate > 9.9) {
-    return false
-  } else if (row.reduce_money.length == 0) {
-    return false
-  } else if (isNaN(row.reduce_money) || !regExp.digit.test(row.reduce_money)) {
-    return false
-  } else if (row.reduce_money <= 0) {
-    return false
-  } else if (row.reduce_money >= parseFloat(row.goodsSku.price)) {
-    return false
-  } else if (row.specify_price.length == 0) {
-    return false
-  } else if (
-    isNaN(row.specify_price) ||
-    !regExp.digit.test(row.specify_price)
-  ) {
-    return false
-  } else if (row.specify_price <= 0) {
-    return false
-  } else if (row.specify_price >= parseFloat(row.goodsSku.price)) {
-    return false
-  } else {
-    return true
-  }
+    if (row.discount_rate.length == 0) {
+        return false
+    } else if (isNaN(row.discount_rate) || !regExp.number.test(row.discount_rate)) {
+        return false
+    } else if (row.discount_rate <= 0) {
+        return false
+    } else if (row.discount_rate > 9.9) {
+        return false
+    } else if (row.reduce_money.length == 0) {
+        return false
+    } else if (isNaN(row.reduce_money) || !regExp.digit.test(row.reduce_money)) {
+        return false
+    } else if (row.reduce_money <= 0) {
+        return false
+    } else if (row.reduce_money >= parseFloat(row.goodsSku.price)) {
+        return false
+    } else if (row.specify_price.length == 0) {
+        return false
+    } else if (isNaN(row.specify_price) || !regExp.digit.test(row.specify_price)) {
+        return false
+    } else if (row.specify_price <= 0) {
+        return false
+    } else if (row.specify_price >= parseFloat(row.goodsSku.price)) {
+        return false
+    } else {
+        return true
+    }
 }
 
 const onSave = (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  for (var i = 0; i < formData.value.goods_list.length; i++) {
-    let el = formData.value.goods_list[i]
-    if (el.goodsSku.sku_spec_format) {
-      if (!el.valid) {
-        let page = Math.ceil(
-          i + 1 <= goodsTable.limit ? 1 : (i + 1) / goodsTable.limit
-        )
-        goodsTable.list = goodsTable.data[page - 1]
-        goodsTable.page = page
-        break
-      } else {
-        el.sku_list = el.skuList
-      }
-    } else {
-      if (!validFn(el)) {
-        let page = Math.ceil(
-          i + 1 <= goodsTable.limit ? 1 : (i + 1) / goodsTable.limit
-        )
-        goodsTable.list = goodsTable.data[page - 1]
-        goodsTable.page = page
-        break
-      } else {
-        el.skuList[0].discount_rate = el.discount_rate
-        el.skuList[0].reduce_money = el.reduce_money
-        el.skuList[0].specify_price = el.specify_price
-        el.skuList[0].discount_price = el.discount_price
-        el.skuList[0].discount_type = el.discount_type
-        el.skuList[0].is_enabled = el.is_enabled
-        el.sku_list = el.skuList
-      }
+    if (loading.value || !formEl) return
+    for (var i = 0; i < formData.value.goods_list.length; i++) {
+        let el = formData.value.goods_list[i]
+        if (el.goodsSku.sku_spec_format) {
+            if (!el.valid) {
+                let page = Math.ceil(i + 1 <= goodsTable.limit ? 1 : (i + 1) / goodsTable.limit)
+                goodsTable.list = goodsTable.data[page - 1]
+                goodsTable.page = page
+                break;
+            } else {
+                el.sku_list = el.skuList
+            }
+        } else {
+            if (!validFn(el)) {
+                let page = Math.ceil(i + 1 <= goodsTable.limit ? 1 : (i + 1) / goodsTable.limit)
+                goodsTable.list = goodsTable.data[page - 1]
+                goodsTable.page = page
+                break;
+            } else {
+                el.skuList[0].discount_rate = el.discount_rate
+                el.skuList[0].reduce_money = el.reduce_money
+                el.skuList[0].specify_price = el.specify_price
+                el.skuList[0].discount_price = el.discount_price
+                el.skuList[0].discount_type = el.discount_type
+                el.skuList[0].is_enabled = el.is_enabled
+                el.sku_list = el.skuList
+            }
+        }
     }
-  }
-  nextTick(async () => {
-    await formEl.validate((valid) => {
-      if (valid) {
-        loading.value = true
-        formData.value.start_time = formData.value.discount_time[0]
-        formData.value.end_time = formData.value.discount_time[1]
-        formData.value.goods_data = JSON.stringify(formData.value.goods_list)
-        addActiveDiscount(formData.value)
-          .then((res) => {
-            loading.value = false
-            history.back()
-          })
-          .catch(() => {
-            loading.value = false
-          })
-      }
+    nextTick(async () => {
+        await formEl.validate((valid) => {
+            if (valid) {
+                loading.value = true
+                formData.value.start_time = formData.value.discount_time[0]
+                formData.value.end_time = formData.value.discount_time[1]
+                formData.value.goods_data = JSON.stringify(formData.value.goods_list)
+                addActiveDiscount(formData.value).then(res => {
+                    loading.value = false
+                    history.back()
+                }).catch(() => {
+                    loading.value = false
+                })
+            }
+        })
     })
-  })
-}
 
-interface goodsTableInterface {
-  page: number
-  limit: number
-  total: number
-  data: any
-  list: Array<any>
 }
 
+    interface goodsTableInterface {
+        page: number,
+        limit: number,
+        total: number,
+        data: any,
+        list: Array<any>,
+    }
+
 const goodsTable = reactive<goodsTableInterface>({
-  page: 1,
-  limit: 5,
-  total: 0,
-  data: [],
-  list: [],
+    page: 1,
+    limit: 5,
+    total: 0,
+    data: [],
+    list: []
 })
 
 const goodsSelect = (value: any) => {
-  if (formData.value.goods_list.length) {
-    let goods_list = deepClone(Object.values(value)).map(
-      (el: any, index: number) => {
-        if (!el.goodsSku.sku_spec_format) {
-          el.discount_type = 'discount'
-          el.discount_rate = ''
-          el.reduce_money = ''
-          el.specify_price = ''
-          el.is_enabled = 1
-        } else {
-          el.skuList = setSku(el.skuList)
-        }
-        el.index = index
-        el.valid = false
-        formData.value.goods_list.forEach((v: any) => {
-          if (v.goods_id == el.goods_id) {
-            el = Object.assign(el, v) //合并已填写数据及新选择的数据
+    if (formData.value.goods_list.length) {
+        let goods_list = deepClone(Object.values(value)).map((el: any, index: number) => {
+            if (!el.goodsSku.sku_spec_format) {
+                el.discount_type = 'discount'
+                el.discount_rate = ''
+                el.reduce_money = ''
+                el.specify_price = ''
+                el.is_enabled = 1
+            } else {
+                el.skuList = setSku(el.skuList)
+            }
             el.index = index
-          }
+            el.valid = false
+            formData.value.goods_list.forEach((v: any) => {
+                if (v.goods_id == el.goods_id){
+                    el = Object.assign(el, v)//合并已填写数据及新选择的数据 
+                    el.index = index
+                } 
+                    
+            })
+            return el
         })
-        return el
-      }
-    )
-    formData.value.goods_list = goods_list
-  } else {
-    formData.value.goods_list = deepClone(Object.values(value)).map(
-      (el: any, index: number) => {
-        if (!el.goodsSku.sku_spec_format) {
-          el.discount_type = 'discount'
-          el.discount_rate = ''
-          el.reduce_money = ''
-          el.specify_price = ''
-          el.is_enabled = 1
-        } else {
-          el.skuList = setSku(el.skuList)
-        }
-        el.index = index
-        el.valid = false
-        return el
-      }
-    )
-  }
-  setGoodsList()
-  if (formRef.value) formRef.value.validateField('goods_list').catch(() => {})
-  // getGoodsSkuNoPageListFn(value.join(','))
+        formData.value.goods_list = goods_list
+    } else {
+        formData.value.goods_list = deepClone(Object.values(value)).map((el: any, index: number) => {
+            if (!el.goodsSku.sku_spec_format) {
+                el.discount_type = 'discount'
+                el.discount_rate = ''
+                el.reduce_money = ''
+                el.specify_price = ''
+                el.is_enabled = 1
+            } else {
+                el.skuList = setSku(el.skuList)
+            }
+            el.index = index
+            el.valid = false
+            return el
+        })
+    }
+    setGoodsList()
+    if(formRef.value) formRef.value.validateField('goods_list').catch(()=>{})
+    // getGoodsSkuNoPageListFn(value.join(','))
 }
 
 //设置sku初始数据
 const setSku = (sku: []) => {
-  return sku.map((el: any) => {
-    if (!el.discount_rate) {
-      el.discount_type = 'discount'
-      el.discount_rate = ''
-      el.reduce_money = ''
-      el.specify_price = ''
-      el.is_enabled = 1
-    }
-    return el
-  })
+    return sku.map((el: any) => {
+        if (!el.discount_rate) {
+            el.discount_type = 'discount'
+            el.discount_rate = ''
+            el.reduce_money = ''
+            el.specify_price = ''
+            el.is_enabled = 1
+        }
+        return el
+    })
 }
 
 //设置展示商品
 const setGoodsList = (page = 1) => {
-  if (formData.value.goods_list.length) {
-    goodsTable.data = splitArray(formData.value.goods_list, goodsTable.limit)
-    goodsTable.list = goodsTable.data[page - 1]
-    goodsTable.total = parseInt(formData.value.goods_list.length.toString())
-  } else {
-    goodsTable.data = []
-    goodsTable.list = []
-    goodsTable.total = 0
-    goodsTable.page = 1
-  }
+    if (formData.value.goods_list.length) {
+        goodsTable.data = splitArray(formData.value.goods_list, goodsTable.limit)
+        goodsTable.list = goodsTable.data[page - 1]
+        goodsTable.total = parseInt(formData.value.goods_list.length.toString())
+    } else {
+        goodsTable.data = []
+        goodsTable.list = []
+        goodsTable.total = 0
+        goodsTable.page = 1
+    }
 }
 
 //完整数据转分页数据
 const splitArray = (array: [], size: number) => {
-  var result = []
-  for (var i = 0; i < array.length; i += size) {
-    result.push(array.slice(i, i + size))
-  }
-  return result
+    var result = [];
+    for (var i = 0; i < array.length; i += size) {
+        result.push(array.slice(i, i + size));
+    }
+    return result;
 }
 
 //删除商品
 const deleteEvent = (index: number) => {
-  formData.value.goods_list.splice(index, 1)
-  formData.value.goods_list.forEach((el: any, index: number) => {
-    el.index = index
-  })
-  formData.value.goods_ids.splice(index, 1)
-  setGoodsList(goodsTable.page)
-  if (formRef.value) formRef.value.validateField('goods_list').catch(() => {})
+    formData.value.goods_list.splice(index, 1)
+    formData.value.goods_list.forEach((el: any, index: number) => {
+        el.index = index
+    })
+    formData.value.goods_ids.splice(index, 1)
+    setGoodsList(goodsTable.page)
+    if(formRef.value) formRef.value.validateField('goods_list').catch(()=>{})
 }
 
 //设置sku折扣
 const goodsSkuPopupRef = ref()
 const skuDiscountSettingsEvent = (row: any) => {
-  goodsSkuPopupRef.value?.show(row)
+    goodsSkuPopupRef.value?.show(row)
 }
 
 const skuSave = (row: any) => {
-  formData.value.goods_list.forEach((el: any) => {
-    if (el.goods_id == row.goods_id) el = deepClone(Object.assign(el, row))
-  })
+    formData.value.goods_list.forEach((el: any) => {
+        if (el.goods_id == row.goods_id) el = deepClone(Object.assign(el, row))
+    })
 }
 
-/*****批量设置 ****/
-interface batchOperationInterface {
-  discount_type: any
-  discountNumber: any
-}
+    /*****批量设置 ****/
+    interface batchOperationInterface {
+        discount_type: any,
+        discountNumber: any,
+    }
 
 const batchOperation = ref<batchOperationInterface>({
-  discount_type: 'discount',
-  discountNumber: '',
+    discount_type: 'discount',
+    discountNumber: ''
 })
 
 // 批量复选框
@@ -732,8 +509,8 @@ const isIndeterminate = ref(false)
 
 // 监听批量复选框事件
 const toggleChange = (value: any) => {
-  isIndeterminate.value = false
-  goods_listTableRef.value.toggleAllSelection()
+    isIndeterminate.value = false
+    goods_listTableRef.value.toggleAllSelection()
 }
 const goods_listTableRef = ref()
 
@@ -742,319 +519,255 @@ const multipleSelection: any = ref([])
 
 // 监听表格单行选中
 const handleSelectionChange = (val: []) => {
-  multipleSelection.value = val
+    multipleSelection.value = val
 
-  toggleCheckbox.value = false
-  if (
-    multipleSelection.value.length > 0 &&
-    multipleSelection.value.length < goodsTable.list.length
-  ) {
-    isIndeterminate.value = true
-  } else {
-    isIndeterminate.value = false
-  }
+    toggleCheckbox.value = false
+    if (multipleSelection.value.length > 0 && multipleSelection.value.length < goodsTable.list.length) {
+        isIndeterminate.value = true
+    } else {
+        isIndeterminate.value = false
+    }
 
-  if (multipleSelection.value.length == goodsTable.list.length) {
-    toggleCheckbox.value = true
-  }
+    if (multipleSelection.value.length == goodsTable.list.length) {
+        toggleCheckbox.value = true
+    }
 }
 
 const saveBatch = () => {
-  if (!multipleSelection.value.length) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('batchEmptySelectedGoodsTips')}`,
-    })
-    return
-  }
-  if (batchOperation.value.discount_type == 'discount') {
-    if (batchOperation.value.discountNumber.length == 0) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('discountsPlaceholder')}`,
-      })
-      return
-    } else if (
-      isNaN(batchOperation.value.discountNumber) ||
-      !regExp.number.test(batchOperation.value.discountNumber)
-    ) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('discountsTips')}`,
-      })
-      return
-    } else if (batchOperation.value.discountNumber <= 0) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('discountsTipsTwo')}`,
-      })
-      return
-    } else if (batchOperation.value.discountNumber > 9.9) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('discountsTipsThree')}`,
-      })
-      return
-    }
-  } else if (batchOperation.value.discount_type == 'reduce') {
-    if (batchOperation.value.discountNumber.length == 0) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('reduceMoneyPlaceholder')}`,
-      })
-      return
-    } else if (
-      isNaN(batchOperation.value.discountNumber) ||
-      !regExp.digit.test(batchOperation.value.discountNumber)
-    ) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('reduceMoneyTips')}`,
-      })
-      return
-    } else if (batchOperation.value.discountNumber <= 0) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('reduceMoneyTipsTwo')}`,
-      })
-      return
+    if (!multipleSelection.value.length) {
+        ElMessage({
+            type: 'warning',
+            message: `${t('batchEmptySelectedGoodsTips')}`
+        })
+        return
     }
-  } else {
-    if (batchOperation.value.discountNumber.length == 0) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('promotionalPlaceholder')}`,
-      })
-      return
-    } else if (
-      isNaN(batchOperation.value.discountNumber) ||
-      !regExp.digit.test(batchOperation.value.discountNumber)
-    ) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('promotionalTips')}`,
-      })
-      return
-    } else if (batchOperation.value.discountNumber <= 0) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('promotionalTipsTwo')}`,
-      })
-      return
+    if (batchOperation.value.discount_type == 'discount') {
+        if (batchOperation.value.discountNumber.length == 0) {
+            ElMessage({
+                type: 'warning',
+                message: `${t('discountsPlaceholder')}`
+            })
+            return
+        } else if (isNaN(batchOperation.value.discountNumber) || !regExp.number.test(batchOperation.value.discountNumber)) {
+            ElMessage({
+                type: 'warning',
+                message: `${t('discountsTips')}`
+            })
+            return
+        } else if (batchOperation.value.discountNumber <= 0) {
+            ElMessage({
+                type: 'warning',
+                message: `${t('discountsTipsTwo')}`
+            })
+            return
+        } else if (batchOperation.value.discountNumber > 9.9) {
+            ElMessage({
+                type: 'warning',
+                message: `${t('discountsTipsThree')}`
+            })
+            return
+        }
+    } else if (batchOperation.value.discount_type == 'reduce') {
+        if (batchOperation.value.discountNumber.length == 0) {
+            ElMessage({
+                type: 'warning',
+                message: `${t('reduceMoneyPlaceholder')}`
+            })
+            return
+        } else if (isNaN(batchOperation.value.discountNumber) || !regExp.digit.test(batchOperation.value.discountNumber)) {
+            ElMessage({
+                type: 'warning',
+                message: `${t('reduceMoneyTips')}`
+            })
+            return
+        } else if (batchOperation.value.discountNumber <= 0) {
+            ElMessage({
+                type: 'warning',
+                message: `${t('reduceMoneyTipsTwo')}`
+            })
+            return
+        }
+
+    } else {
+        if (batchOperation.value.discountNumber.length == 0) {
+            ElMessage({
+                type: 'warning',
+                message: `${t('promotionalPlaceholder')}`
+            })
+            return
+        } else if (isNaN(batchOperation.value.discountNumber) || !regExp.digit.test(batchOperation.value.discountNumber)) {
+            ElMessage({
+                type: 'warning',
+                message: `${t('promotionalTips')}`
+            })
+            return
+        } else if (batchOperation.value.discountNumber <= 0) {
+            ElMessage({
+                type: 'warning',
+                message: `${t('promotionalTipsTwo')}`
+            })
+            return
+        }
     }
-  }
-  formData.value.goods_list.forEach((el: any, index: number) => {
-    multipleSelection.value.forEach((v: any) => {
-      if (v.goods_id === el.goods_id) {
-        if (!el.goodsSku.sku_spec_format) {
-          if (batchOperation.value.discount_type == 'discount') {
-            //折扣
-            el.discount_rate = batchOperation.value.discountNumber + ''
-            //实际
-            el.specify_price = (
-              el.goodsSku.price *
-              (batchOperation.value.discountNumber / 10)
-            ).toFixed(2)
-            el.discount_price = (
-              el.goodsSku.price *
-              (batchOperation.value.discountNumber / 10)
-            ).toFixed(2)
-            //减价
-            el.reduce_money = (el.goodsSku.price - el.specify_price).toFixed(2)
-          } else if (batchOperation.value.discount_type == 'reduce') {
-            //减价
-            el.reduce_money = batchOperation.value.discountNumber + ''
-            el.specify_price = el.goodsSku.price - el.reduce_money.toFixed(2)
-            el.discount_price = (el.goodsSku.price - el.reduce_money).toFixed(2)
-            el.discount_rate = (
-              (el.specify_price / el.goodsSku.price) *
-              10
-            ).toFixed(1)
-          } else {
-            //实际
-            el.specify_price = batchOperation.value.discountNumber + ''
-            el.discount_price = batchOperation.value.discountNumber + ''
-            el.reduce_money = (el.goodsSku.price - el.specify_price).toFixed(2)
-            el.discount_rate = (
-              (el.specify_price / el.goodsSku.price) *
-              10
-            ).toFixed(1)
-          }
-          el.discount_type = batchOperation.value.discount_type + ''
-        } else {
-          el.skuList.forEach((sku: any) => {
-            if (sku.is_enabled === 1) {
-              if (batchOperation.value.discount_type == 'discount') {
-                //折扣
-                sku.discount_rate = batchOperation.value.discountNumber + ''
-                //实际
-                sku.specify_price = (
-                  sku.price *
-                  (batchOperation.value.discountNumber / 10)
-                ).toFixed(2)
-                sku.discount_price = (
-                  sku.price *
-                  (batchOperation.value.discountNumber / 10)
-                ).toFixed(2)
-                //减价
-                sku.reduce_money = (sku.price - sku.specify_price).toFixed(2)
-              } else if (batchOperation.value.discount_type == 'reduce') {
-                //减价
-                sku.reduce_money = batchOperation.value.discountNumber + ''
-                sku.specify_price = sku.price - sku.reduce_money.toFixed(2)
-                sku.discount_price = (sku.price - sku.reduce_money).toFixed(2)
-                sku.discount_rate = (
-                  (sku.specify_price / sku.price) *
-                  10
-                ).toFixed(1)
-              } else {
-                //实际
-                sku.specify_price = batchOperation.value.discountNumber + ''
-                sku.discount_price = batchOperation.value.discountNumber + ''
-                sku.reduce_money = (sku.price - sku.specify_price).toFixed(2)
-                sku.discount_rate = (
-                  (sku.specify_price / sku.price) *
-                  10
-                ).toFixed(1)
-              }
-              sku.discount_type = batchOperation.value.discount_type + ''
+    formData.value.goods_list.forEach((el: any, index: number) => {
+        multipleSelection.value.forEach((v: any) => {
+
+            if (v.goods_id === el.goods_id) {
+                if (!el.goodsSku.sku_spec_format) {
+                    if (batchOperation.value.discount_type == 'discount') {
+                        //折扣
+                        el.discount_rate = batchOperation.value.discountNumber + ''
+                        //实际
+                        el.specify_price = (el.goodsSku.price * (batchOperation.value.discountNumber / 10)).toFixed(2)
+                        el.discount_price = (el.goodsSku.price * (batchOperation.value.discountNumber / 10)).toFixed(2)
+                        //减价
+                        el.reduce_money = (el.goodsSku.price - el.specify_price).toFixed(2)
+                    } else if (batchOperation.value.discount_type == 'reduce') {//减价
+                        el.reduce_money = batchOperation.value.discountNumber + ''
+                        el.specify_price = el.goodsSku.price - el.reduce_money.toFixed(2)
+                        el.discount_price = (el.goodsSku.price - el.reduce_money).toFixed(2)
+                        el.discount_rate = (el.specify_price / el.goodsSku.price * 10).toFixed(1)
+
+                    } else {//实际
+                        el.specify_price = batchOperation.value.discountNumber + ''
+                        el.discount_price = batchOperation.value.discountNumber + ''
+                        el.reduce_money = (el.goodsSku.price - el.specify_price).toFixed(2)
+                        el.discount_rate = (el.specify_price / el.goodsSku.price * 10).toFixed(1)
+                    }
+                    el.discount_type = batchOperation.value.discount_type + ''
+                } else {
+                    el.skuList.forEach((sku: any) => {
+                        if(sku.is_enabled===1){
+                            if (batchOperation.value.discount_type == 'discount') {
+                                //折扣
+                                sku.discount_rate = batchOperation.value.discountNumber + ''
+                                //实际
+                                sku.specify_price = (sku.price * (batchOperation.value.discountNumber / 10)).toFixed(2)
+                                sku.discount_price = (sku.price * (batchOperation.value.discountNumber / 10)).toFixed(2)
+                                //减价
+                                sku.reduce_money = (sku.price - sku.specify_price).toFixed(2)
+                            } else if (batchOperation.value.discount_type == 'reduce') {//减价
+                                sku.reduce_money = batchOperation.value.discountNumber + ''
+                                sku.specify_price = sku.price - sku.reduce_money.toFixed(2)
+                                sku.discount_price = (sku.price - sku.reduce_money).toFixed(2)
+                                sku.discount_rate = (sku.specify_price / sku.price * 10).toFixed(1)
+
+                            } else {//实际
+                                sku.specify_price = batchOperation.value.discountNumber + ''
+                                sku.discount_price = batchOperation.value.discountNumber + ''
+                                sku.reduce_money = (sku.price - sku.specify_price).toFixed(2)
+                                sku.discount_rate = (sku.specify_price / sku.price * 10).toFixed(1)
+                            }
+                            sku.discount_type = batchOperation.value.discount_type + ''
+                        }
+                    })
+                    let discount_rate_list = el.skuList.filter((sku:any)=>sku.is_enabled===1).map((sku:any)=>Number(sku.discount_rate))
+                    let reduce_money_list = el.skuList.filter((sku:any)=>sku.is_enabled===1).map((sku:any)=>Number(sku.reduce_money))
+                    let specify_price_list = el.skuList.filter((sku:any)=>sku.is_enabled===1).map((sku:any)=>Number(sku.specify_price))
+                    el.max_discount_rate = Math.max(...discount_rate_list)
+                    el.min_discount_rate = Math.min(...discount_rate_list)
+                    el.max_reduce_money = Math.max(...reduce_money_list)
+                    el.min_reduce_money = Math.min(...reduce_money_list)
+                    el.max_specify_price = Math.max(...specify_price_list)
+                    el.min_specify_price = Math.min(...specify_price_list)
+                }
+                el.valid = true
             }
-          })
-          let discount_rate_list = el.skuList
-            .filter((sku: any) => sku.is_enabled === 1)
-            .map((sku: any) => Number(sku.discount_rate))
-          let reduce_money_list = el.skuList
-            .filter((sku: any) => sku.is_enabled === 1)
-            .map((sku: any) => Number(sku.reduce_money))
-          let specify_price_list = el.skuList
-            .filter((sku: any) => sku.is_enabled === 1)
-            .map((sku: any) => Number(sku.specify_price))
-          el.max_discount_rate = Math.max(...discount_rate_list)
-          el.min_discount_rate = Math.min(...discount_rate_list)
-          el.max_reduce_money = Math.max(...reduce_money_list)
-          el.min_reduce_money = Math.min(...reduce_money_list)
-          el.max_specify_price = Math.max(...specify_price_list)
-          el.min_specify_price = Math.min(...specify_price_list)
-        }
-        el.valid = true
-      }
+        })
     })
-  })
-  // isIndeterminate.value = false
-  // toggleCheckbox.value = false
-  // batchOperation.value.discountNumber = ''
-  // goods_listTableRef.value.clearSelection()
+    // isIndeterminate.value = false
+    // toggleCheckbox.value = false
+    // batchOperation.value.discountNumber = ''
+    // goods_listTableRef.value.clearSelection()
 }
 
 /**** 修改单行 *****/
 const inputBlur = (row: any, discount_type: string, index: number) => {
-  if (discount_type == 'discount') {
-    if (row.discount_rate.length) {
-      //实际
-      row.specify_price = (
-        row.goodsSku.price *
-        (row.discount_rate / 10)
-      ).toFixed(2)
-      row.discount_price = (
-        row.goodsSku.price *
-        (row.discount_rate / 10)
-      ).toFixed(2)
-      //减价
-      row.reduce_money = (row.goodsSku.price - row.specify_price).toFixed(2)
-      if (formRef.value) {
-        formRef.value
-          .validateField('goods_list.' + index + '.specify_price')
-          .catch(() => {})
-        formRef.value
-          .validateField('goods_list.' + index + '.reduce_money')
-          .catch(() => {})
-      }
-    }
-  } else if (discount_type == 'reduce') {
-    //减价
-    if (row.reduce_money.length) {
-      row.specify_price = (row.goodsSku.price - row.reduce_money).toFixed(2)
-      row.discount_price = (row.goodsSku.price - row.reduce_money).toFixed(2)
-      row.discount_rate = (
-        (row.specify_price / row.goodsSku.price) *
-        10
-      ).toFixed(1)
-      if (formRef.value) {
-        formRef.value
-          .validateField('goods_list.' + index + '.discount_rate')
-          .catch(() => {})
-        formRef.value
-          .validateField('goods_list.' + index + '.specify_price')
-          .catch(() => {})
-      }
-    }
-  } else {
-    //实际
-    if (row.specify_price.length) {
-      row.discount_price = row.specify_price + ''
-      row.reduce_money = (row.goodsSku.price - row.specify_price).toFixed(2)
-      row.discount_rate = (
-        (row.specify_price / row.goodsSku.price) *
-        10
-      ).toFixed(1)
-      if (formRef.value) {
-        formRef.value
-          .validateField('goods_list.' + index + '.discount_rate')
-          .catch(() => {})
-        formRef.value
-          .validateField('goods_list.' + index + '.reduce_money')
-          .catch(() => {})
-      }
+    if (discount_type == 'discount') {
+        if (row.discount_rate.length) {
+            //实际
+            row.specify_price = (row.goodsSku.price * (row.discount_rate / 10)).toFixed(2)
+            row.discount_price = (row.goodsSku.price * (row.discount_rate / 10)).toFixed(2)
+            //减价
+            row.reduce_money = (row.goodsSku.price - row.specify_price).toFixed(2)
+            if (formRef.value) {
+                formRef.value.validateField('goods_list.' + index + '.specify_price').catch(() => {})
+                formRef.value.validateField('goods_list.' + index + '.reduce_money').catch(() => {})
+            }
+        }
+    } else if (discount_type == 'reduce') {//减价
+        if (row.reduce_money.length) {
+            row.specify_price = (row.goodsSku.price - row.reduce_money).toFixed(2)
+            row.discount_price = (row.goodsSku.price - row.reduce_money).toFixed(2)
+            row.discount_rate = (row.specify_price / row.goodsSku.price * 10).toFixed(1)
+            if (formRef.value) {
+                formRef.value.validateField('goods_list.' + index + '.discount_rate').catch(() => {})
+                formRef.value.validateField('goods_list.' + index + '.specify_price').catch(() => {})
+            }
+        }
+
+    } else {//实际
+        if (row.specify_price.length) {
+            row.discount_price = row.specify_price + ''
+            row.reduce_money = (row.goodsSku.price - row.specify_price).toFixed(2)
+            row.discount_rate = (row.specify_price / row.goodsSku.price * 10).toFixed(1)
+            if (formRef.value) {
+                formRef.value.validateField('goods_list.' + index + '.discount_rate').catch(() => {})
+                formRef.value.validateField('goods_list.' + index + '.reduce_money').catch(() => {})
+            }
+        }
+
     }
-  }
-  row.discount_type = discount_type + ''
+    row.discount_type = discount_type + ''
+
 }
 
 //sku状态
 const enabledEvent = (row: any) => {
-  row.is_enabled = row.is_enabled ? 0 : 1
-  if (row.is_enabled) {
-    row.discount_type = 'discount'
-    row.discount_rate = ''
-    row.reduce_money = ''
-    row.specify_price = ''
-  } else {
-    row.discount_type = 'discount'
-    row.discount_rate = '10'
-    row.reduce_money = '0'
-    row.specify_price = row.goodsSku.price + ''
-  }
+    row.is_enabled = row.is_enabled ? 0 : 1
+    if (row.is_enabled) {
+        row.discount_type = 'discount'
+        row.discount_rate = ''
+        row.reduce_money = ''
+        row.specify_price = ''
+    } else {
+        row.discount_type = 'discount'
+        row.discount_rate = '10'
+        row.reduce_money = '0'
+        row.specify_price = row.goodsSku.price + ''
+    }
+
 }
 const back = () => {
-  router.push('/shop/marketing/discount/list')
+    router.push('/shop/marketing/discount/list')
 }
 </script>
 
 <style lang="scss" scoped>
-input::-webkit-outer-spin-button,
-input::-webkit-inner-spin-button {
-  -webkit-appearance: none !important;
-  -moz-appearance: none !important;
-  -o-appearance: none !important;
-  -ms-appearance: none !important;
-  appearance: none !important;
-  margin: 0;
-}
+    input::-webkit-outer-spin-button,
+    input::-webkit-inner-spin-button {
+        -webkit-appearance: none !important;
+        -moz-appearance: none !important;
+        -o-appearance: none !important;
+        -ms-appearance: none !important;
+        appearance: none !important;
+        margin: 0;
+    }
 
-input[type='number'] {
-  -webkit-appearance: textfield;
-  -moz-appearance: textfield;
-  -o-appearance: textfield;
-  -ms-appearance: textfield;
-  appearance: textfield;
-}
+    input[type="number"] {
+        -webkit-appearance: textfield;
+        -moz-appearance: textfield;
+        -o-appearance: textfield;
+        -ms-appearance: textfield;
+        appearance: textfield;
+    }
 
-.sku-form-item-wrap :deep(.el-form-item__content) {
-  margin-left: 0 !important;
-}
+    .sku-form-item-wrap :deep(.el-form-item__content) {
+        margin-left: 0 !important;
+    }
 
-.sku_list :deep(.cell) {
-  // min-height: 60px !important;
-  overflow: initial !important;
-}
+    .sku_list :deep(.cell) {
+        // min-height: 60px !important;
+        overflow: initial !important;
+    }
 </style>
diff --git a/admin/src/addon/shop/views/marketing/discount/components/discount-detail.vue b/admin/src/addon/shop/views/marketing/discount/components/discount-detail.vue
index d4672e17..4d9e011d 100644
--- a/admin/src/addon/shop/views/marketing/discount/components/discount-detail.vue
+++ b/admin/src/addon/shop/views/marketing/discount/components/discount-detail.vue
@@ -1,429 +1,243 @@
 <template>
-  <el-drawer
-    v-model="showDialog"
-    title="活动详情"
-    direction="rtl"
-    :before-close="handleClose"
-    class="member-detail-drawer"
-  >
-    <div class="main-container" v-loading="loading">
-      <el-tabs v-model="activeName" class="pb-[10px]" @tab-change="handleClick">
-        <el-tab-pane label="基础信息" name="basicInfo" />
-        <el-tab-pane label="活动商品" name="goodsList" />
-        <el-tab-pane label="活动订单" name="orderList" />
-        <el-tab-pane label="活动会员" name="memberList" />
-      </el-tabs>
-      <div v-if="activeName == 'basicInfo'">
-        <el-form
-          class="mt-[15px]"
-          :model="formData"
-          label-width="100px"
-          ref="formRef"
-          label-position="left"
-          v-if="Object.keys(formData).length"
-        >
-          <div class="relative" shadow="never" v-if="formData">
-            <el-row>
-              <el-col :span="8">
-                <el-form-item :label="t('activeName')">
-                  <div class="input-width">
-                    <span>{{ formData.active_name }}</span>
-                  </div>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item :label="t('title')">
-                  <div class="input-width">
-                    <span>{{ formData.active_desc }}</span>
-                  </div>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item :label="t('status')">
-                  <div class="input-width">
-                    <span>{{ formData.active_status_name }}</span>
-                  </div>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item :label="t('paymentAmount')">
-                  <div class="input-width">
-                    <span>{{ formData.active_order_money }}</span>
-                  </div>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item :label="t('participationMemberCount')">
-                  <div class="input-width">
-                    <span>{{ formData.active_member_num }}</span>
-                  </div>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item :label="t('payOrderCount')">
-                  <div class="input-width">
-                    <span>{{ formData.active_order_num }}</span>
-                  </div>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item :label="t('startTime')">
-                  <div class="input-width">
-                    <span>{{ formData.start_time }}</span>
-                  </div>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item :label="t('endTime')">
-                  <div class="input-width">
-                    <span>{{ formData.end_time }}</span>
-                  </div>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item :label="t('createTime')">
-                  <div class="input-width">
-                    <span>{{ formData.create_time }}</span>
-                  </div>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </div>
-        </el-form>
-      </div>
-      <div v-if="activeName == 'goodsList'">
-        <el-form :inline="true" :model="goodsParams.searchParam">
-          <el-form-item :label="t('keyword')" prop="keyword">
-            <el-input
-              v-model.trim="goodsParams.searchParam.keyword"
-              :placeholder="t('keywordPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button
-              type="primary"
-              @click="getActiveDiscountGoodsPageListFn()"
-              >{{ t('search') }}</el-button
-            >
-          </el-form-item>
-        </el-form>
-        <el-table
-          :data="goodsParams.data"
-          size="large"
-          v-loading="goodsParams.loading"
-        >
-          <template #empty>
-            <span>{{ !goodsParams.loading ? t('emptyData') : '' }}</span>
-          </template>
-          <el-table-column
-            prop="goods_id"
-            :label="t('goodsInfo')"
-            min-width="300"
-          >
-            <template #default="{ row }">
-              <div
-                v-if="row.goods"
-                class="flex items-center cursor-pointer"
-                @click="previewEvent(row)"
-              >
-                <div
-                  class="min-w-[70px] h-[70px] flex items-center justify-center"
-                >
-                  <el-image
-                    v-if="row.goods.goods_cover_thumb_small"
-                    class="w-[70px] h-[70px]"
-                    :src="img(row.goods.goods_cover_thumb_small)"
-                    fit="contain"
-                  >
-                    <template #error>
-                      <div class="image-slot">
-                        <img
-                          class="w-[70px] h-[70px]"
-                          src="@/addon/shop/assets/goods_default.png"
-                        />
-                      </div>
+    <el-drawer v-model="showDialog" title="活动详情" direction="rtl" :before-close="handleClose" class="member-detail-drawer">
+        <div class="main-container" v-loading="loading">
+            <el-tabs v-model="activeName" class="pb-[10px]" @tab-change="handleClick">
+                <el-tab-pane label="基础信息" name="basicInfo" />
+                <el-tab-pane label="活动商品" name="goodsList" />
+                <el-tab-pane label="活动订单" name="orderList" />
+                <el-tab-pane label="活动会员" name="memberList" />
+            </el-tabs>
+            <div v-if="activeName == 'basicInfo'">
+                <el-form class="mt-[15px]" :model="formData" label-width="100px" ref="formRef" label-position="left" v-if="Object.keys(formData).length">
+                    <div class="relative" shadow="never" v-if="formData">
+                        <el-row>
+                            <el-col :span="8">
+                                <el-form-item :label="t('activeName')">
+                                    <div class="input-width">
+                                        <span>{{formData.active_name}}</span>
+                                    </div>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item :label="t('title')">
+                                    <div class="input-width">
+                                        <span>{{formData.active_desc}}</span>
+                                    </div>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item :label="t('status')">
+                                    <div class="input-width">
+                                        <span>{{formData.active_status_name}}</span>
+                                    </div>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item :label="t('paymentAmount')">
+                                    <div class="input-width">
+                                        <span>{{formData.active_order_money}}</span>
+                                    </div>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item :label="t('participationMemberCount')">
+                                    <div class="input-width">
+                                        <span>{{formData.active_member_num}}</span>
+                                    </div>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item :label="t('payOrderCount')">
+                                    <div class="input-width">
+                                        <span>{{formData.active_order_num}}</span>
+                                    </div>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item :label="t('startTime')">
+                                    <div class="input-width">
+                                        <span>{{formData.start_time}}</span>
+                                    </div>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item :label="t('endTime')">
+                                    <div class="input-width">
+                                        <span>{{formData.end_time}}</span>
+                                    </div>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item :label="t('createTime')">
+                                    <div class="input-width">
+                                        <span>{{formData.create_time}}</span>
+                                    </div>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                    </div>
+                </el-form>
+            </div>
+            <div v-if="activeName == 'goodsList'">
+                <el-form :inline="true" :model="goodsParams.searchParam">
+                    <el-form-item :label="t('keyword')" prop="keyword">
+                        <el-input v-model.trim="goodsParams.searchParam.keyword" :placeholder="t('keywordPlaceholder')" />
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="getActiveDiscountGoodsPageListFn()">{{ t('search') }}</el-button>
+                    </el-form-item>
+                </el-form>
+                <el-table :data="goodsParams.data" size="large" v-loading="goodsParams.loading">
+                    <template #empty>
+                        <span>{{ !goodsParams.loading ? t('emptyData') : '' }}</span>
                     </template>
-                  </el-image>
-                  <img
-                    v-else
-                    class="w-[70px] h-[70px]"
-                    src="@/addon/shop/assets/goods_default.png"
-                    fit="contain"
-                  />
+                    <el-table-column prop="goods_id" :label="t('goodsInfo')" min-width="300">
+                        <template #default="{ row }">
+                            <div v-if="row.goods" class="flex items-center cursor-pointer" @click="previewEvent(row)">
+                                <div class="min-w-[70px] h-[70px] flex items-center justify-center">
+                                    <el-image v-if="row.goods.goods_cover_thumb_small" class="w-[70px] h-[70px]" :src="img(row.goods.goods_cover_thumb_small)" fit="contain">
+                                        <template #error>
+                                            <div class="image-slot">
+                                                <img class="w-[70px] h-[70px]" src="@/addon/shop/assets/goods_default.png" />
+                                            </div>
+                                        </template>
+                                    </el-image>
+                                    <img v-else class="w-[70px] h-[70px]" src="@/addon/shop/assets/goods_default.png" fit="contain" />
+                                </div>
+                                <div class="ml-2">
+                                    <span :title="row.goods.goods_name" class="multi-hidden">{{ row.goods.goods_name }}</span>
+                                </div>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('price')" min-width="120">
+                        <template #default="{ row }">
+                            <span v-if="row.goodsSku">￥{{ row.goodsSku.price }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="active_goods_order_money" :label="t('paymentAmount')" min-width="100" />
+                    
+                    <el-table-column prop="active_goods_order_num" :label="t('orderCount')" min-width="100" />
+                    <el-table-column prop="active_goods_member_num" :label="t('activeMemberNum')" min-width="100" />
+                    <el-table-column prop="active_goods_success_num" :label="t('activeSuccessNum')" min-width="100" />
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="goodsParams.page" v-model:page-size="goodsParams.limit" :page-sizes="[6,10,20,30,50,100]" 
+                        layout="total, sizes, prev, pager, next, jumper" :total="goodsParams.total"
+                        @size-change="getActiveDiscountGoodsPageListFn()" @current-change="getActiveDiscountGoodsPageListFn" />
                 </div>
-                <div class="ml-2">
-                  <span :title="row.goods.goods_name" class="multi-hidden">{{
-                    row.goods.goods_name
-                  }}</span>
-                </div>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('price')" min-width="120">
-            <template #default="{ row }">
-              <span v-if="row.goodsSku">￥{{ row.goodsSku.price }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="active_goods_order_money"
-            :label="t('paymentAmount')"
-            min-width="100"
-          />
-
-          <el-table-column
-            prop="active_goods_order_num"
-            :label="t('orderCount')"
-            min-width="100"
-          />
-          <el-table-column
-            prop="active_goods_member_num"
-            :label="t('activeMemberNum')"
-            min-width="100"
-          />
-          <el-table-column
-            prop="active_goods_success_num"
-            :label="t('activeSuccessNum')"
-            min-width="100"
-          />
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="goodsParams.page"
-            v-model:page-size="goodsParams.limit"
-            :page-sizes="[6, 10, 20, 30, 50, 100]"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="goodsParams.total"
-            @size-change="getActiveDiscountGoodsPageListFn()"
-            @current-change="getActiveDiscountGoodsPageListFn"
-          />
-        </div>
-      </div>
-      <div v-if="activeName == 'orderList'">
-        <el-form
-          :inline="true"
-          :model="orderParams.searchParam"
-          ref="orderSearchFormRef"
-        >
-          <el-form-item :label="t('orderInfo')" prop="search_name">
-            <el-input
-              class="input-item"
-              v-model.trim="orderParams.searchParam.search_name"
-            />
-          </el-form-item>
-          <el-form-item :label="t('payType')" prop="status">
-            <el-select
-              v-model="orderParams.searchParam.status"
-              clearable
-              class="input-item"
-            >
-              <el-option :label="t('toBePaid')" value="1"></el-option>
-              <el-option :label="t('toBeShipped')" value="2"></el-option>
-              <el-option :label="t('shipped')" value="3"></el-option>
-              <el-option :label="t('completed')" value="5"></el-option>
-              <el-option :label="t('closed')" value="-1"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="t('createTime')" prop="create_time">
-            <el-date-picker
-              v-model="orderParams.searchParam.create_time"
-              type="datetimerange"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              :start-placeholder="t('startDate')"
-              :end-placeholder="t('endDate')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('payTime')" prop="pay_time">
-            <el-date-picker
-              v-model="orderParams.searchParam.pay_time"
-              type="datetimerange"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              :start-placeholder="t('startDate')"
-              :end-placeholder="t('endDate')"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button
-              type="primary"
-              @click="getActiveDiscountOrderPageListFn()"
-              >{{ t('search') }}</el-button
-            >
-            <el-button @click="orderResetForm(orderSearchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-        <el-table
-          :data="orderParams.data"
-          size="large"
-          v-loading="orderParams.loading"
-        >
-          <template #empty>
-            <span>{{ !orderParams.loading ? t('emptyData') : '' }}</span>
-          </template>
-          <el-table-column
-            prop="order_no"
-            :label="t('orderNo')"
-            min-width="100"
-          >
-            <template #default="{ row }">
-              <span
-                class="cursor-pointer text-primary"
-                @click="toGoodsCategoryEvent(row.order_id)"
-                >{{ row.order_no }}</span
-              >
-            </template>
-          </el-table-column>
+            </div>
+            <div v-if="activeName == 'orderList'">
+                <el-form :inline="true" :model="orderParams.searchParam" ref="orderSearchFormRef">
 
-          <el-table-column
-            prop="order_money"
-            :label="t('orderMoney')"
-            min-width="100"
-          />
-          <el-table-column :label="t('buyInfo')" min-width="120">
-            <template #default="{ row }">
-              <div class="flex flex-col">
-                <span
-                  class="text-[12px] text-primary cursor-pointer"
-                  @click="detailEvent(row.member.member_id)"
-                  >{{ row.member.nickname }}</span
-                >
-                <span class="text-[12px] mt-[5px]"
-                  >{{ row.taker_name }} {{ row.taker_mobile }}</span
-                >
-                <span class="text-[12px] mt-[5px]">{{
-                  row.taker_full_address
-                }}</span>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('payType')" min-width="120">
-            <template #default="{ row }">
-              <span>{{
-                row.pay && row.pay.type_name ? row.pay.type_name : ''
-              }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('orderStatus')" min-width="100">
-            <template #default="{ row }">
-              <span class="text-[14px]">{{ row.order_status_data.name }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="create_time"
-            :label="t('createTime')"
-            min-width="100"
-          />
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="orderParams.page"
-            v-model:page-size="orderParams.limit"
-            :page-sizes="[4, 10, 20, 30, 50, 100]"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="orderParams.total"
-            @size-change="getActiveDiscountOrderPageListFn()"
-            @current-change="getActiveDiscountOrderPageListFn"
-          />
-        </div>
-      </div>
-      <div v-if="activeName == 'memberList'">
-        <el-table
-          :data="memberParams.data"
-          size="large"
-          v-loading="memberParams.loading"
-        >
-          <template #empty>
-            <span>{{ !memberParams.loading ? t('emptyData') : '' }}</span>
-          </template>
-          <el-table-column
-            prop="goods_id"
-            :label="t('memberInfo')"
-            min-width="200"
-          >
-            <template #default="{ row }">
-              <div
-                class="flex items-center cursor-pointer"
-                @click="detailEvent(row.member.member_id)"
-              >
-                <div
-                  class="min-w-[50px] h-[50px] flex items-center justify-center"
-                >
-                  <el-image
-                    v-if="row.member.headimg"
-                    class="w-[50px] h-[50px]"
-                    :src="img(row.member.headimg)"
-                    fit="contain"
-                  >
-                    <template #error>
-                      <div class="image-slot">
-                        <img
-                          class="w-[50px] h-[50px] rounded-full"
-                          src="@/app/assets/images/member_head.png"
-                          alt=""
-                        />
-                      </div>
+                    <el-form-item :label="t('orderInfo')" prop='search_name'>
+                        <el-input class="input-item" v-model.trim="orderParams.searchParam.search_name" />
+                    </el-form-item>
+                    <el-form-item :label="t('payType')" prop='status'>
+                        <el-select v-model="orderParams.searchParam.status" clearable class="input-item">
+                            <el-option :label="t('toBePaid')" value="1"></el-option>
+                            <el-option :label="t('toBeShipped')" value="2"></el-option>
+                            <el-option :label="t('shipped')" value="3"></el-option>
+                            <el-option :label="t('completed')" value="5"></el-option>
+                            <el-option :label="t('closed')" value="-1"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item :label="t('createTime')" prop="create_time">
+                        <el-date-picker v-model="orderParams.searchParam.create_time" type="datetimerange"
+                            value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')"
+                            :end-placeholder="t('endDate')" />
+                    </el-form-item>
+                    <el-form-item :label="t('payTime')" prop="pay_time">
+                        <el-date-picker v-model="orderParams.searchParam.pay_time" type="datetimerange"
+                            value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')"
+                            :end-placeholder="t('endDate')" />
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="getActiveDiscountOrderPageListFn()">{{ t('search') }}</el-button>
+                        <el-button @click="orderResetForm(orderSearchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+                <el-table :data="orderParams.data" size="large" v-loading="orderParams.loading">
+                    <template #empty>
+                        <span>{{ !orderParams.loading ? t('emptyData') : '' }}</span>
                     </template>
-                  </el-image>
-                  <img
-                    class="w-[50px] h-[50px] rounded-full"
-                    v-else
-                    src="@/app/assets/images/member_head.png"
-                    alt=""
-                  />
+                    <el-table-column prop="order_no" :label="t('orderNo')" min-width="100">
+                        <template #default="{ row }">
+                          <span class="cursor-pointer text-primary" @click="toGoodsCategoryEvent(row.order_id)">{{ row.order_no }}</span>
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column prop="order_money" :label="t('orderMoney')" min-width="100" />
+                    <el-table-column :label="t('buyInfo')" min-width="120">
+                        <template #default="{row}">
+                            <div class="flex flex-col">
+                                <span class="text-[12px] text-primary cursor-pointer" @click="detailEvent(row.member.member_id)">{{ row.member.nickname }}</span>
+                                <span class="text-[12px] mt-[5px]">{{ row.taker_name }} {{row.taker_mobile }}</span>
+                                <span class="text-[12px] mt-[5px]">{{ row.taker_full_address }}</span>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('payType')" min-width="120">
+                        <template #default="{row}">
+                            <span>{{ row.pay && row.pay.type_name ? row.pay.type_name : ''}}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('orderStatus')" min-width="100">
+                        <template #default="{row}">
+                            <span class="text-[14px]">{{ row.order_status_data.name }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="create_time" :label="t('createTime')" min-width="100" />
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="orderParams.page" v-model:page-size="orderParams.limit"  :page-sizes="[4,10,20,30,50,100]" 
+                        layout="total, sizes, prev, pager, next, jumper" :total="orderParams.total"
+                        @size-change="getActiveDiscountOrderPageListFn()" @current-change="getActiveDiscountOrderPageListFn" />
                 </div>
-                <div class="ml-2">
-                  <span
-                    :title="row.member.nickname || row.member.username"
-                    class="multi-hidden"
-                    >{{ row.member.nickname || row.member.username }}</span
-                  >
-                  <span class="text-primary text-[12px]">{{
-                    row.mobile || ''
-                  }}</span>
+            </div>
+            <div v-if="activeName == 'memberList'">
+                <el-table :data="memberParams.data" size="large" v-loading="memberParams.loading">
+                    <template #empty>
+                        <span>{{ !memberParams.loading ? t('emptyData') : '' }}</span>
+                    </template>
+                    <el-table-column prop="goods_id" :label="t('memberInfo')" min-width="200">
+                        <template #default="{ row }">
+                            <div class="flex items-center cursor-pointer" @click="detailEvent(row.member.member_id)">
+                                <div class="min-w-[50px] h-[50px] flex items-center justify-center">
+                                    <el-image v-if="row.member.headimg" class="w-[50px] h-[50px]" :src="img(row.member.headimg)" fit="contain">
+                                        <template #error>
+                                            <div class="image-slot">
+                                                <img class="w-[50px] h-[50px] rounded-full" src="@/app/assets/images/member_head.png" alt="">
+                                            </div>
+                                        </template>
+                                    </el-image>
+                                    <img class="w-[50px] h-[50px] rounded-full" v-else src="@/app/assets/images/member_head.png" alt="">
+                                </div>
+                                <div class="ml-2">
+                                    <span :title="(row.member.nickname || row.member.username)" class="multi-hidden">{{row.member.nickname || row.member.username}}</span>
+                                    <span class="text-primary text-[12px]">{{row.mobile || ''}}</span>
+                                </div>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="active_order_money" :label="t('consumptionMoney')" min-width="100" />
+                    <el-table-column prop="member_count" :label="t('participationNum')" min-width="100" />
+                    <el-table-column prop="create_time" :label="t('orderTime')" min-width="100" />
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="memberParams.page" v-model:page-size="memberParams.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="memberParams.total"
+                        @size-change="getActiveDiscountMemberPageList()" @current-change="getActiveDiscountMemberPageList" />
                 </div>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="active_order_money"
-            :label="t('consumptionMoney')"
-            min-width="100"
-          />
-          <el-table-column
-            prop="member_count"
-            :label="t('participationNum')"
-            min-width="100"
-          />
-          <el-table-column
-            prop="create_time"
-            :label="t('orderTime')"
-            min-width="100"
-          />
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="memberParams.page"
-            v-model:page-size="memberParams.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="memberParams.total"
-            @size-change="getActiveDiscountMemberPageList()"
-            @current-change="getActiveDiscountMemberPageList"
-          />
+            </div>
         </div>
-      </div>
-    </div>
-  </el-drawer>
+    </el-drawer>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
 import { t } from '@/lang'
-import {
-  getActiveDiscountInfo,
-  getActiveDiscountGoodsPageList,
-  getActiveDiscountOrderPageList,
-  getActiveDiscountMemberPageList,
-} from '@/addon/shop/api/marketing'
+import {getActiveDiscountInfo, getActiveDiscountGoodsPageList, getActiveDiscountOrderPageList, getActiveDiscountMemberPageList} from "@/addon/shop/api/marketing";
 import { FormInstance } from 'element-plus'
 import { useRouter, useRoute } from 'vue-router'
 import { img } from '@/utils/common'
@@ -435,168 +249,163 @@ const showDialog = ref(false)
 const loading = ref(false)
 let id = ''
 const activeName = ref('basicInfo')
-const formData: Record<string, any> = ref({})
+const formData:Record<string, any> = ref({})
 
-const handleClick = (data: string) => {
-  activeName.value = data
+const handleClick = (data:string) => {
+    activeName.value = data
 }
 
 const handleClose = (done: () => void) => {
-  activeName.value = 'basicInfo'
-  showDialog.value = false
+    activeName.value = 'basicInfo';
+    showDialog.value = false;
 }
 
-const getActiveDiscountInfoFn = (id: number) => {
-  loading.value = true
-  getActiveDiscountInfo(id).then((res: any) => {
-    formData.value = Object.assign(formData.value, res.data)
-    loading.value = false
-  })
+const getActiveDiscountInfoFn = (id:number)=>{
+    loading.value = true
+    getActiveDiscountInfo(id).then((res:any)=>{
+        formData.value = Object.assign(formData.value,res.data)
+        loading.value = false
+    })
 }
 
 // 活动商品
 const goodsParams = reactive({
-  page: 1,
-  limit: 6,
-  total: 0,
-  loading: false,
-  data: [],
-  searchParam: {
-    keyword: '',
-    active_id: id,
-  },
+    page: 1,
+    limit: 6,
+    total: 0,
+    loading: false,
+    data: [],
+    searchParam: {
+        keyword: '',
+        active_id: id
+    }
 })
-const getActiveDiscountGoodsPageListFn = (page: number = 1) => {
-  goodsParams.loading = true
-  goodsParams.page = page
-  getActiveDiscountGoodsPageList({
-    page: goodsParams.page,
-    limit: goodsParams.limit,
-    ...goodsParams.searchParam,
-  })
-    .then((res) => {
-      goodsParams.loading = false
-      goodsParams.data = res.data.data
-      goodsParams.total = res.data.total
-    })
-    .catch(() => {
-      goodsParams.loading = false
+const getActiveDiscountGoodsPageListFn = (page: number = 1)=>{
+    goodsParams.loading = true
+    goodsParams.page = page
+    getActiveDiscountGoodsPageList({
+        page: goodsParams.page,
+        limit: goodsParams.limit,
+        ...goodsParams.searchParam
+    }).then(res=>{
+        goodsParams.loading = false
+        goodsParams.data = res.data.data
+        goodsParams.total = res.data.total
+    }).catch(() => {
+        goodsParams.loading = false
     })
 }
 // 商品预览
 const previewEvent = (data: any) => {
-  const url = router.resolve({
-    path: '/preview/wap',
-    query: {
-      page: `/addon/shop/pages/goods/detail?goods_id=${data.goods_id}`,
-    },
-  })
-  window.open(url.href)
+    const url = router.resolve({
+        path: '/preview/wap',
+        query: {
+            page: `/addon/shop/pages/goods/detail?goods_id=${data.goods_id}`
+        }
+    })
+    window.open(url.href)
 }
 // 活动订单
 const orderSearchFormRef = ref()
 const orderParams = reactive({
-  page: 1,
-  limit: 4,
-  total: 0,
-  loading: false,
-  data: [],
-  searchParam: {
-    search_name: '',
-    status: '',
-    create_time: [],
-    pay_time: [],
-    active_id: '',
-  },
+    page: 1,
+    limit: 4,
+    total: 0,
+    loading: false,
+    data: [],
+    searchParam: {
+        search_name: '',
+        status: '',
+        create_time: [],
+        pay_time: [],
+        active_id: ''
+    }
 })
 
-const getActiveDiscountOrderPageListFn = (page: number = 1) => {
-  orderParams.loading = true
-  orderParams.page = page
-  getActiveDiscountOrderPageList({
-    page: orderParams.page,
-    limit: orderParams.limit,
-    ...orderParams.searchParam,
-  })
-    .then((res) => {
-      orderParams.loading = false
-      orderParams.data = res.data.data
-      orderParams.total = res.data.total
-    })
-    .catch(() => {
-      orderParams.loading = false
+const getActiveDiscountOrderPageListFn = (page: number = 1)=>{
+    orderParams.loading = true
+    orderParams.page = page
+    getActiveDiscountOrderPageList({
+        page: orderParams.page,
+        limit: orderParams.limit,
+        ...orderParams.searchParam
+    }).then(res => {
+        orderParams.loading = false
+        orderParams.data = res.data.data
+        orderParams.total = res.data.total
+    }).catch(() => {
+        orderParams.loading = false
     })
 }
 const orderResetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  orderParams.searchParam.create_time = []
-  getActiveDiscountOrderPageListFn()
+    if (!formEl) return
+    formEl.resetFields()
+    orderParams.searchParam.create_time = [];
+    getActiveDiscountOrderPageListFn()
 }
 //活动会员
-const memberParams = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: false,
-  data: [],
-  searchParam: {
-    active_id: id,
-  },
+const memberParams =  reactive({
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: false,
+    data: [],
+    searchParam: {
+        active_id: id
+    }
 })
-const getActiveDiscountMemberPageListFn = (page: number = 1) => {
-  memberParams.loading = true
-  memberParams.page = page
-  getActiveDiscountMemberPageList({
-    page: memberParams.page,
-    limit: memberParams.limit,
-    ...memberParams.searchParam,
-  })
-    .then((res: any) => {
-      memberParams.loading = false
-      memberParams.data = res.data.data
-      memberParams.total = res.data.total
-    })
-    .catch(() => {
-      memberParams.loading = false
+const getActiveDiscountMemberPageListFn= (page: number = 1)=>{
+    memberParams.loading = true
+    memberParams.page = page
+    getActiveDiscountMemberPageList({
+        page: memberParams.page,
+        limit: memberParams.limit,
+        ...memberParams.searchParam
+    }).then((res:any)=>{
+        memberParams.loading = false
+        memberParams.data = res.data.data
+        memberParams.total = res.data.total
+    }).catch(() => {
+        memberParams.loading = false
     })
 }
 
 //查看会员详情
-const detailEvent = (member_id: number) => {
-  let routeData = router.resolve(`/member/detail?id=${member_id}`)
-  window.open(routeData.href, ' blank')
+const detailEvent = (member_id:number)=> {
+    let routeData = router.resolve(`/member/detail?id=${member_id}`)
+    window.open(routeData.href, ' blank');
 }
 
 const setFormData = async (row: any = null) => {
-  id = row.id
+    id = row.id;
+    
+    memberParams.searchParam.active_id = row.id;
+    orderParams.searchParam.active_id = row.id;
+    goodsParams.searchParam.active_id = row.id;
 
-  memberParams.searchParam.active_id = row.id
-  orderParams.searchParam.active_id = row.id
-  goodsParams.searchParam.active_id = row.id
-
-  getActiveDiscountMemberPageListFn()
-  getActiveDiscountOrderPageListFn()
-  getActiveDiscountGoodsPageListFn()
-  getActiveDiscountInfoFn(Number(id))
+    getActiveDiscountMemberPageListFn()
+    getActiveDiscountOrderPageListFn()
+    getActiveDiscountGoodsPageListFn()
+    getActiveDiscountInfoFn(Number(id))
 }
 
-const toGoodsCategoryEvent = (order_id: any) => {
+const toGoodsCategoryEvent = (order_id:any) => {
   // 你可以在这里根据 orderNo 来动态传递参数
   const url = router.resolve({
-    path: '/shop/order/detail',
+    path: "/shop/order/detail",
     query: { order_id: order_id }, // 传递 orderNo 到商品分类页面
-  })
-  window.open(url.href)
-}
+  });
+  window.open(url.href);
+};
+
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 <style lang="scss">
-.member-detail-drawer {
-  width: 1300px !important;
+.member-detail-drawer{
+    width: 1300px !important;
 }
 </style>
diff --git a/admin/src/addon/shop/views/marketing/discount/components/goods-sku-popup.vue b/admin/src/addon/shop/views/marketing/discount/components/goods-sku-popup.vue
index c0dfe914..ada3e188 100644
--- a/admin/src/addon/shop/views/marketing/discount/components/goods-sku-popup.vue
+++ b/admin/src/addon/shop/views/marketing/discount/components/goods-sku-popup.vue
@@ -1,666 +1,522 @@
 <template>
-  <el-drawer v-model="showDialog" :title="t('skuDiscountSettings')" size="55%">
-    <el-form
-      :model="formData"
-      label-width="120px"
-      ref="formRef"
-      class="page-form"
-      v-if="showDialog"
-    >
-      <div class="w-full sku_list">
-        <el-table
-          class="!w-[1400px] !max-w-[100%]"
-          v-if="goodsTable.list.length"
-          :data="goodsTable.list"
-          size="large"
-          ref="goods_listTableRef"
-          @selection-change="handleSelectionChange"
-        >
-          <template #empty>
-            <span>{{ t('emptyData') }}</span>
-          </template>
-          <el-table-column type="selection" width="55" />
-          <el-table-column
-            :label="t('goodsSelectPopupGoodsInfo')"
-            min-width="300"
-          >
-            <template #default="{ row }">
-              <div class="flex items-center cursor-pointer">
-                <div
-                  class="min-w-[60px] h-[60px] flex items-center justify-center"
-                >
-                  <el-image
-                    v-if="row.sku_image"
-                    class="w-[60px] h-[60px]"
-                    :src="img(row.sku_image)"
-                    fit="contain"
-                  >
-                    <template #error>
-                      <div class="image-slot">
-                        <img
-                          class="w-[60px] h-[60px]"
-                          src="@/addon/shop/assets/goods_default.png"
-                        />
-                      </div>
-                    </template>
-                  </el-image>
-                  <img
-                    v-else
-                    class="w-[70px] h-[60px]"
-                    src="@/addon/shop/assets/goods_default.png"
-                    fit="contain"
-                  />
-                </div>
-                <div class="ml-2">
-                  <span :title="row.sku_name" class="multi-hidden">{{
-                    row.sku_name || row.goods?.goods_name
-                  }}</span>
-                </div>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="price" :label="t('price')" min-width="130" />
-
-          <el-table-column :label="t('discounts')" width="170">
-            <template #default="{ row }">
-              <el-form-item
-                v-if="row.is_enabled"
-                :key="row.sku_id"
-                :prop="'skuList.' + row.index + '.discount_rate'"
-                :rules="[
-                  {
-                    trigger: 'blur',
-                    validator: (rule: any, value: any, callback: any) => {
-                      if (value.length == 0) {
-                        callback(t('discountsPlaceholder'))
-                      } else if (isNaN(value) || !regExp.number.test(value)) {
-                        callback(t('discountsTips'))
-                      } else if (value <= 0) {
-                        callback(t('discountsTipsTwo'))
-                      } else if (value > 9.9) {
-                        callback(t('discountsTipsThree'))
-                      } else {
-                        callback()
-                      }
-                    },
-                  },
-                ]"
-                class="sku-form-item-wrap"
-              >
-                <el-input
-                  v-model.trim="row.discount_rate"
-                  @blur="inputBlur(row, 'discount', row.index)"
-                  clearable
-                  placeholder="0.00"
-                  maxlength="8"
-                />
-              </el-form-item>
-              <span v-else>{{ row.discount_rate }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('reduceMoney')" width="170">
-            <template #default="{ row }">
-              <el-form-item
-                v-if="row.is_enabled"
-                :key="row.sku_id"
-                :prop="'skuList.' + row.index + '.reduce_money'"
-                :rules="[
-                  {
-                    trigger: 'blur',
-                    validator: (rule: any, value: any, callback: any) => {
-                      if (value.length == 0) {
-                        callback(t('reduceMoneyPlaceholder'))
-                      } else if (isNaN(value) || !regExp.digit.test(value)) {
-                        callback(t('reduceMoneyTips'))
-                      } else if (value <= 0) {
-                        callback(t('reduceMoneyTipsTwo'))
-                      } else if (value >= parseFloat(row.price)) {
-                        callback(t('reduceMoneyTipsThree'))
-                      } else {
-                        callback()
-                      }
-                    },
-                  },
-                ]"
-                class="sku-form-item-wrap"
-              >
-                <el-input
-                  v-model.trim="row.reduce_money"
-                  @blur="inputBlur(row, 'reduce', row.index)"
-                  clearable
-                  placeholder="0.00"
-                  maxlength="8"
-                />
-              </el-form-item>
-              <span v-else>{{ row.reduce_money }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('promotional')" width="170">
-            <template #default="{ row }">
-              <el-form-item
-                v-if="row.is_enabled"
-                :key="row.sku_id"
-                :prop="'skuList.' + row.index + '.specify_price'"
-                :rules="[
-                  {
-                    trigger: 'blur',
-                    validator: (rule: any, value: any, callback: any) => {
-                      if (value.length == 0) {
-                        callback(t('promotionalPlaceholder'))
-                      } else if (isNaN(value) || !regExp.digit.test(value)) {
-                        callback(t('promotionalTips'))
-                      } else if (value <= 0) {
-                        callback(t('promotionalTipsTwo'))
-                      } else if (value >= parseFloat(row.price)) {
-                        callback(t('promotionalTipsThree'))
-                      } else {
-                        callback()
-                      }
-                    },
-                  },
-                ]"
-                class="sku-form-item-wrap"
-              >
-                <el-input
-                  v-model.trim="row.specify_price"
-                  clearable
-                  @blur="inputBlur(row, 'specify', row.index)"
-                  placeholder="0.00"
-                  maxlength="8"
-                />
-              </el-form-item>
-              <span v-else>{{ row.specify_price }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('discountType')" width="130">
-            <template #default="{ row }">
-              <span>{{
-                row.discount_type == 'discount'
-                  ? t('discounts')
-                  : row.discount_type == 'reduce'
-                    ? t('reduceMoney')
-                    : t('promotional')
-              }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            :label="t('operation')"
-            fixed="right"
-            align="right"
-            min-width="160"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="enabledEvent(row)">{{
-                row.is_enabled ? t('noEnabled') : t('enabled')
-              }}</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div
-          class="flex items-center justify-between mt-[15px] !w-[1400px] !max-w-[100%]"
-        >
-          <div class="flex items-center mb-[15px]">
-            <el-checkbox
-              v-model="toggleCheckbox"
-              size="large"
-              class="!mr-[15px]"
-              @change="toggleChange"
-              :indeterminate="isIndeterminate"
-            >
-              <span>已选{{ multipleSelection.length }}项</span>
-            </el-checkbox>
-
-            <label>{{ t('batchOperation') }}</label>
-            <el-select
-              v-model="batchOperation.discount_type"
-              class="!w-[130px] ml-[10px]"
-              @change="batchOperation.discountNumber = ''"
-            >
-              <el-option :label="t('discounts')" value="discount" />
-              <el-option :label="t('reduceMoney')" value="reduce" />
-              <el-option :label="t('promotional')" value="specify" />
-            </el-select>
-            <el-input
-              v-model.trim="batchOperation.discountNumber"
-              clearable
-              :placeholder="
-                batchOperation.discount_type == 'discount'
-                  ? t('discounts')
-                  : batchOperation.discount_type == 'reduce'
-                    ? t('reduceMoney')
-                    : t('promotional')
-              "
-              class="!w-[130px] ml-[10px]"
-              maxlength="8"
-            />
-            <el-button class="ml-[10px]" type="primary" @click="saveBatch">{{
-              t('confirm')
-            }}</el-button>
-          </div>
-          <el-pagination
-            v-model:current-page="goodsTable.page"
-            v-model:page-size="goodsTable.limit"
-            layout="total, prev, pager, next, jumper"
-            :total="goodsTable.total"
-            @current-change="setGoodsList"
-          />
-        </div>
-      </div>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button type="primary" @click="save(formRef)">{{
-          t('confirm')
-        }}</el-button>
-      </span>
-    </template>
-  </el-drawer>
+	<el-drawer v-model="showDialog" :title="t('skuDiscountSettings')" size="55%">
+		<el-form :model="formData" label-width="120px" ref="formRef" class="page-form" v-if="showDialog">
+			<div class="w-full sku_list">
+				<el-table class="!w-[1400px] !max-w-[100%]" v-if="goodsTable.list.length" :data="goodsTable.list" size="large" ref="goods_listTableRef" @selection-change="handleSelectionChange">
+					<template #empty>
+						<span>{{ t('emptyData')}}</span>
+					</template>
+					<el-table-column type="selection" width="55" />
+					<el-table-column :label="t('goodsSelectPopupGoodsInfo')" min-width="300">
+						<template #default="{ row }">
+							<div class="flex items-center cursor-pointer">
+								<div class="min-w-[60px] h-[60px] flex items-center justify-center">
+									<el-image v-if="row.sku_image" class="w-[60px] h-[60px]" :src="img(row.sku_image)" fit="contain">
+										<template #error>
+											<div class="image-slot">
+												<img class="w-[60px] h-[60px]" src="@/addon/shop/assets/goods_default.png" />
+											</div>
+										</template>
+									</el-image>
+									<img v-else class="w-[70px] h-[60px]" src="@/addon/shop/assets/goods_default.png" fit="contain" />
+								</div>
+								<div class="ml-2">
+									<span :title="row.sku_name" class="multi-hidden">{{ row.sku_name||row.goods?.goods_name }}</span>
+								</div>
+							</div>
+						</template>
+					</el-table-column>
+					<el-table-column prop="price" :label="t('price')" min-width="130" />
+
+					<el-table-column :label="t('discounts')" width="170">
+						<template #default="{ row }">
+							<el-form-item v-if="row.is_enabled" :key="row.sku_id" :prop="'skuList.'+row.index + '.discount_rate'" :rules="[{
+                                        trigger: 'blur',
+                                        validator: (rule: any, value: any, callback: any) => {
+                                            if (value.length == 0) {
+                                                callback(t('discountsPlaceholder'))
+                                            } else if (isNaN(value) || !regExp.number.test(value)) {
+                                                callback(t('discountsTips'))
+                                            } else if (value <= 0) {
+                                                callback(t('discountsTipsTwo'))
+                                            } else if (value>9.9) {
+                                                callback(t('discountsTipsThree'))
+                                            } else {
+                                                callback();
+                                            }
+                                        }
+                                    }]" class="sku-form-item-wrap">
+								<el-input v-model.trim="row.discount_rate" @blur="inputBlur(row,'discount',row.index)" clearable placeholder="0.00" maxlength="8" />
+							</el-form-item>
+							<span v-else>{{row.discount_rate}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column :label="t('reduceMoney')" width="170">
+						<template #default="{ row }">
+							<el-form-item v-if="row.is_enabled" :key="row.sku_id" :prop="'skuList.'+row.index + '.reduce_money'" :rules="[{
+                                        trigger: 'blur',
+                                        validator: (rule: any, value: any, callback: any) => {
+                                                if (value.length == 0) {
+                                                    callback(t('reduceMoneyPlaceholder'))
+                                                } else if (isNaN(value) || !regExp.digit.test(value)) {
+                                                    callback(t('reduceMoneyTips'))
+                                                } else if (value <=0) {
+                                                    callback(t('reduceMoneyTipsTwo'))
+                                                } else if (value >= parseFloat(row.price) ) {
+                                                    callback(t('reduceMoneyTipsThree'))
+                                                } else {
+                                                    callback();
+                                                }
+                                        }
+                                        }]" class="sku-form-item-wrap">
+								<el-input v-model.trim="row.reduce_money" @blur="inputBlur(row,'reduce',row.index)" clearable placeholder="0.00" maxlength="8" />
+							</el-form-item>
+							<span v-else>{{row.reduce_money}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column :label="t('promotional')" width="170">
+						<template #default="{ row }">
+							<el-form-item v-if="row.is_enabled" :key="row.sku_id" :prop="'skuList.'+row.index + '.specify_price'" :rules="[{
+                                        trigger: 'blur',
+                                        validator: (rule: any, value: any, callback: any) => {
+                                                if (value.length == 0) {
+                                                    callback(t('promotionalPlaceholder'))
+                                                } else if (isNaN(value) || !regExp.digit.test(value)) {
+                                                    callback(t('promotionalTips'))
+                                                } else if (value <=0 ) {
+                                                    callback(t('promotionalTipsTwo'))
+                                                }else if (value >= parseFloat(row.price) ) {
+                                                    callback(t('promotionalTipsThree'))
+                                                } else {
+                                                    callback();
+                                                }
+                                        }
+                                    }]" class="sku-form-item-wrap">
+								<el-input v-model.trim="row.specify_price" clearable @blur="inputBlur(row,'specify',row.index)" placeholder="0.00" maxlength="8" />
+							</el-form-item>
+							<span v-else>{{row.specify_price}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column :label="t('discountType')" width="130">
+						<template #default="{ row }">
+							<span>{{row.discount_type=='discount'?t('discounts'):row.discount_type=='reduce'?t('reduceMoney'):t('promotional')}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column :label="t('operation')" fixed="right" align="right" min-width="160">
+						<template #default="{row}">
+							<el-button type="primary" link @click="enabledEvent(row)">{{ row.is_enabled?t('noEnabled'):t('enabled') }}</el-button>
+						</template>
+					</el-table-column>
+				</el-table>
+				<div class="flex items-center justify-between mt-[15px] !w-[1400px] !max-w-[100%]">
+					<div class="flex items-center mb-[15px]">
+						<el-checkbox v-model="toggleCheckbox" size="large" class="!mr-[15px]" @change="toggleChange" :indeterminate="isIndeterminate">
+							<span>已选{{ multipleSelection.length }}项</span>
+						</el-checkbox>
+
+						<label>{{ t('batchOperation') }}</label>
+						<el-select v-model="batchOperation.discount_type" class="!w-[130px] ml-[10px]" @change="batchOperation.discountNumber=''">
+							<el-option :label="t('discounts')" value="discount" />
+							<el-option :label="t('reduceMoney')" value="reduce" />
+							<el-option :label="t('promotional')" value="specify" />
+						</el-select>
+						<el-input v-model.trim="batchOperation.discountNumber" clearable
+						          :placeholder="batchOperation.discount_type=='discount'?t('discounts'):batchOperation.discount_type=='reduce'?t('reduceMoney'):t('promotional')"
+						          class="!w-[130px] ml-[10px]" maxlength="8" />
+						<el-button class="ml-[10px]" type="primary" @click="saveBatch">{{ t('confirm') }}</el-button>
+					</div>
+					<el-pagination v-model:current-page="goodsTable.page" v-model:page-size="goodsTable.limit"
+					               layout="total, prev, pager, next, jumper" :total="goodsTable.total"
+					               @current-change="setGoodsList" />
+				</div>
+			</div>
+		</el-form>
+		<template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t("cancel") }}</el-button>
+                <el-button type="primary" @click="save(formRef)">{{ t("confirm") }}</el-button>
+            </span>
+		</template>
+	</el-drawer>
 </template>
 
 <script lang="ts" setup>
-import { t } from '@/lang'
-import { img, deepClone } from '@/utils/common'
-import { FormInstance, ElMessage } from 'element-plus'
-import { ref, reactive, nextTick } from 'vue'
-
-const showDialog = ref(false)
-const emit = defineEmits(['skuSave'])
-const formData: Record<string, any> = ref({ skuList: [] })
-const formRef = ref<FormInstance>()
-
-// 表单验证规则
-// 正则表达式
-const regExp = {
-  number: /^\d{0,10}(.?\d{0,1})$/,
-  digit: /^\d{0,10}(.?\d{0,2})$/,
-}
-
-const show = (data: any) => {
-  formData.value = deepClone(data)
-  //设置校验下标
-  formData.value.skuList.forEach((el: any, index: number) => {
-    el.index = index
-  })
-  setGoodsList()
-  showDialog.value = true
-}
-
-//设置展示商品
-interface goodsTableInterface {
-  page: number
-  limit: number
-  total: number
-  data: any
-  list: Array<any>
-}
-
-const goodsTable = reactive<goodsTableInterface>({
-  page: 1,
-  limit: 5,
-  total: 0,
-  data: [],
-  list: [],
-})
-
-const setGoodsList = (page = 1) => {
-  if (formData.value.skuList.length) {
-    goodsTable.data = splitArray(formData.value.skuList, goodsTable.limit)
-    goodsTable.list = goodsTable.data[page - 1]
-    goodsTable.total = parseInt(formData.value.skuList.length.toString())
-    nextTick(() => {
-      batchOperation.value.discountNumber = ''
-      multipleSelection.value = []
-      if (goods_listTableRef.value) goods_listTableRef.value.clearSelection()
-      if (isIndeterminate.value) isIndeterminate.value = false
-      if (toggleCheckbox.value) toggleCheckbox.value = false
-    })
-  } else {
-    goodsTable.data = []
-    goodsTable.list = []
-    goodsTable.total = 0
-    goodsTable.page = 1
-  }
-}
-
-//完整数据转分页数据
-const splitArray = (array: [], size: number) => {
-  var result = []
-  for (var i = 0; i < array.length; i += size) {
-    result.push(array.slice(i, i + size))
-  }
-  return result
-}
-
-/*****批量设置 ****/
-interface batchOperationInterface {
-  discount_type: any
-  discountNumber: any
-}
-
-const batchOperation = ref<batchOperationInterface>({
-  discount_type: 'discount',
-  discountNumber: '',
-})
-
-// 批量复选框
-const toggleCheckbox = ref()
-
-// 复选框中间状态
-const isIndeterminate = ref(false)
-
-// 监听批量复选框事件
-const toggleChange = (value: any) => {
-  isIndeterminate.value = false
-  goods_listTableRef.value.toggleAllSelection()
-}
-const goods_listTableRef = ref()
-
-// 选中数据
-const multipleSelection: any = ref([])
-
-// 监听表格单行选中
-const handleSelectionChange = (val: []) => {
-  multipleSelection.value = val
-
-  toggleCheckbox.value = false
-  if (
-    multipleSelection.value.length > 0 &&
-    multipleSelection.value.length < goodsTable.list.length
-  ) {
-    isIndeterminate.value = true
-  } else {
-    isIndeterminate.value = false
-  }
-
-  if (multipleSelection.value.length == goodsTable.list.length) {
-    toggleCheckbox.value = true
-  }
-}
-const saveBatch = () => {
-  if (!multipleSelection.value.length) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('batchEmptySelectedGoodsTips')}`,
+    import {t} from "@/lang";
+    import {img, deepClone} from "@/utils/common";
+    import {FormInstance, ElMessage} from 'element-plus'
+    import {ref, reactive, nextTick} from "vue";
+
+    const showDialog = ref(false);
+    const emit = defineEmits(["skuSave"]);
+    const formData: Record<string, any> = ref({skuList: []})
+    const formRef = ref<FormInstance>()
+
+    // 表单验证规则
+    // 正则表达式
+    const regExp = {
+        number: /^\d{0,10}(.?\d{0,1})$/,
+        digit: /^\d{0,10}(.?\d{0,2})$/
+    }
+
+    const show = (data: any) => {
+        formData.value = deepClone(data)
+        //设置校验下标
+        formData.value.skuList.forEach((el: any, index: number) => {
+            el.index = index
+        })
+        setGoodsList()
+        showDialog.value = true;
+    };
+
+    //设置展示商品
+    interface goodsTableInterface {
+        page: number,
+        limit: number,
+        total: number,
+        data: any,
+        list: Array<any>,
+    }
+
+    const goodsTable = reactive<goodsTableInterface>({
+        page: 1,
+        limit: 5,
+        total: 0,
+        data: [],
+        list: []
     })
-    return
-  }
-  if (batchOperation.value.discount_type == 'discount') {
-    if (batchOperation.value.discountNumber.length == 0) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('discountsPlaceholder')}`,
-      })
-      return
-    } else if (
-      isNaN(batchOperation.value.discountNumber) ||
-      !regExp.number.test(batchOperation.value.discountNumber)
-    ) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('discountsTips')}`,
-      })
-      return
-    } else if (batchOperation.value.discountNumber <= 0) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('discountsTipsTwo')}`,
-      })
-      return
-    } else if (batchOperation.value.discountNumber > 9.9) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('discountsTipsThree')}`,
-      })
-      return
+
+    const setGoodsList = (page = 1) => {
+        if (formData.value.skuList.length) {
+            goodsTable.data = splitArray(formData.value.skuList, goodsTable.limit)
+            goodsTable.list = goodsTable.data[page - 1]
+            goodsTable.total = parseInt(formData.value.skuList.length.toString())
+            nextTick(()=>{
+                batchOperation.value.discountNumber = ''
+                multipleSelection.value = []
+                if(goods_listTableRef.value) goods_listTableRef.value.clearSelection()
+                if(isIndeterminate.value) isIndeterminate.value = false
+                if(toggleCheckbox.value) toggleCheckbox.value = false
+            })
+        } else {
+            goodsTable.data = []
+            goodsTable.list = []
+            goodsTable.total = 0
+            goodsTable.page = 1
+        }
+    }
+
+    //完整数据转分页数据
+    const splitArray = (array: [], size: number) => {
+        var result = [];
+        for (var i = 0; i < array.length; i += size) {
+            result.push(array.slice(i, i + size));
+        }
+        return result;
     }
-  } else if (batchOperation.value.discount_type == 'reduce') {
-    if (batchOperation.value.discountNumber.length == 0) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('reduceMoneyPlaceholder')}`,
-      })
-      return
-    } else if (
-      isNaN(batchOperation.value.discountNumber) ||
-      !regExp.digit.test(batchOperation.value.discountNumber)
-    ) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('reduceMoneyTips')}`,
-      })
-      return
-    } else if (batchOperation.value.discountNumber <= 0) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('reduceMoneyTipsTwo')}`,
-      })
-      return
+
+    /*****批量设置 ****/
+    interface batchOperationInterface {
+        discount_type: any,
+        discountNumber: any,
     }
-  } else {
-    if (batchOperation.value.discountNumber.length == 0) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('promotionalPlaceholder')}`,
-      })
-      return
-    } else if (
-      isNaN(batchOperation.value.discountNumber) ||
-      !regExp.digit.test(batchOperation.value.discountNumber)
-    ) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('promotionalTips')}`,
-      })
-      return
-    } else if (batchOperation.value.discountNumber <= 0) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('promotionalTipsTwo')}`,
-      })
-      return
+
+    const batchOperation = ref<batchOperationInterface>({
+        discount_type: 'discount',
+        discountNumber: ''
+    })
+
+    // 批量复选框
+    const toggleCheckbox = ref()
+
+    // 复选框中间状态
+    const isIndeterminate = ref(false)
+
+    // 监听批量复选框事件
+    const toggleChange = (value: any) => {
+        isIndeterminate.value = false
+        goods_listTableRef.value.toggleAllSelection()
     }
-  }
-  formData.value.skuList.forEach((el: any, index: number) => {
-    multipleSelection.value.forEach((v: any) => {
-      if (v.sku_id === el.sku_id && el.is_enabled === 1) {
+    const goods_listTableRef = ref()
+
+    // 选中数据
+    const multipleSelection: any = ref([])
+
+    // 监听表格单行选中
+    const handleSelectionChange = (val: []) => {
+        multipleSelection.value = val
+
+        toggleCheckbox.value = false
+        if (multipleSelection.value.length > 0 && multipleSelection.value.length < goodsTable.list.length) {
+            isIndeterminate.value = true
+        } else {
+            isIndeterminate.value = false
+        }
+
+        if (multipleSelection.value.length == goodsTable.list.length) {
+            toggleCheckbox.value = true
+        }
+    }
+    const saveBatch = () => {
+        if (!multipleSelection.value.length) {
+            ElMessage({
+                type: 'warning',
+                message: `${t('batchEmptySelectedGoodsTips')}`
+            })
+            return
+        }
         if (batchOperation.value.discount_type == 'discount') {
-          //折扣
-          el.discount_rate = batchOperation.value.discountNumber + ''
-          //实际
-          el.specify_price = (
-            el.price *
-            (batchOperation.value.discountNumber / 10)
-          ).toFixed(2)
-          el.discount_price = (
-            el.price *
-            (batchOperation.value.discountNumber / 10)
-          ).toFixed(2)
-          //减价
-          el.reduce_money = (el.price - el.specify_price).toFixed(2)
+            if (batchOperation.value.discountNumber.length == 0) {
+                ElMessage({
+                    type: 'warning',
+                    message: `${t('discountsPlaceholder')}`
+                })
+                return
+            } else if (isNaN(batchOperation.value.discountNumber) || !regExp.number.test(batchOperation.value.discountNumber)) {
+                ElMessage({
+                    type: 'warning',
+                    message: `${t('discountsTips')}`
+                })
+                return
+            } else if (batchOperation.value.discountNumber <= 0) {
+                ElMessage({
+                    type: 'warning',
+                    message: `${t('discountsTipsTwo')}`
+                })
+                return
+            } else if (batchOperation.value.discountNumber > 9.9) {
+                ElMessage({
+                    type: 'warning',
+                    message: `${t('discountsTipsThree')}`
+                })
+                return
+            }
         } else if (batchOperation.value.discount_type == 'reduce') {
-          //减价
-          el.reduce_money = batchOperation.value.discountNumber + ''
-          el.specify_price = (el.price - el.reduce_money).toFixed(2)
-          el.discount_price = (el.price - el.reduce_money).toFixed(2)
-          el.discount_rate = ((el.specify_price / el.price) * 10).toFixed(1)
+            if (batchOperation.value.discountNumber.length == 0) {
+                ElMessage({
+                    type: 'warning',
+                    message: `${t('reduceMoneyPlaceholder')}`
+                })
+                return
+            } else if (isNaN(batchOperation.value.discountNumber) || !regExp.digit.test(batchOperation.value.discountNumber)) {
+                ElMessage({
+                    type: 'warning',
+                    message: `${t('reduceMoneyTips')}`
+                })
+                return
+            } else if (batchOperation.value.discountNumber <= 0) {
+                ElMessage({
+                    type: 'warning',
+                    message: `${t('reduceMoneyTipsTwo')}`
+                })
+                return
+            }
+
         } else {
-          //实际
-          el.specify_price = batchOperation.value.discountNumber + ''
-          el.discount_price = batchOperation.value.discountNumber + ''
-          el.reduce_money = (el.price - el.specify_price).toFixed(2)
-          el.discount_rate = ((el.specify_price / el.price) * 10).toFixed(1)
+            if (batchOperation.value.discountNumber.length == 0) {
+                ElMessage({
+                    type: 'warning',
+                    message: `${t('promotionalPlaceholder')}`
+                })
+                return
+            } else if (isNaN(batchOperation.value.discountNumber) || !regExp.digit.test(batchOperation.value.discountNumber)) {
+                ElMessage({
+                    type: 'warning',
+                    message: `${t('promotionalTips')}`
+                })
+                return
+            } else if (batchOperation.value.discountNumber <= 0) {
+                ElMessage({
+                    type: 'warning',
+                    message: `${t('promotionalTipsTwo')}`
+                })
+                return
+            }
+        }
+        formData.value.skuList.forEach((el: any, index: number) => {
+            multipleSelection.value.forEach((v: any) => {
+
+                if (v.sku_id === el.sku_id&&el.is_enabled===1) {
+                    
+                    if (batchOperation.value.discount_type == 'discount') {
+                        //折扣
+                        el.discount_rate = batchOperation.value.discountNumber + ''
+                        //实际
+                        el.specify_price = (el.price * (batchOperation.value.discountNumber / 10)).toFixed(2)
+                        el.discount_price = (el.price * (batchOperation.value.discountNumber / 10)).toFixed(2)
+                        //减价
+                        el.reduce_money = (el.price - el.specify_price).toFixed(2)
+                    } else if (batchOperation.value.discount_type == 'reduce') {//减价
+                        el.reduce_money = batchOperation.value.discountNumber + ''
+                        el.specify_price = (el.price - el.reduce_money).toFixed(2)
+                        el.discount_price = (el.price - el.reduce_money).toFixed(2)
+                        el.discount_rate = (el.specify_price / el.price * 10).toFixed(1)
+
+                    } else {//实际
+                        el.specify_price = batchOperation.value.discountNumber + ''
+                        el.discount_price = batchOperation.value.discountNumber + ''
+                        el.reduce_money = (el.price - el.specify_price).toFixed(2)
+                        el.discount_rate = (el.specify_price / el.price * 10).toFixed(1)
+                    }
+                    el.discount_type = batchOperation.value.discount_type + ''
+                    if (formRef.value) {
+                        formRef.value.validateField('skuList.' + index + '.discount_rate')
+                        formRef.value.validateField('skuList.' + index + '.specify_price')
+                        formRef.value.validateField('skuList.' + index + '.reduce_money')
+                    }
+                }
+            })
+        })
+        // isIndeterminate.value = false
+        // toggleCheckbox.value = false
+        // batchOperation.value.discountNumber = ''
+        // goods_listTableRef.value.clearSelection()
+    }
+
+    /**** 修改单行 *****/
+    const inputBlur = (row: any, discount_type: string, index: number) => {
+        if (discount_type == 'discount') {
+            if (row.discount_rate.length) {
+                //实际
+                row.specify_price = (row.price * (row.discount_rate / 10)).toFixed(2)
+                row.discount_price = (row.price * (row.discount_rate / 10)).toFixed(2)
+                //减价
+                row.reduce_money = (row.price - row.specify_price).toFixed(2)
+            }
+        } else if (discount_type == 'reduce') { // 减价
+            if (row.reduce_money.length) {
+                row.specify_price = (row.price - row.reduce_money).toFixed(2)
+                row.discount_price = (row.price - row.reduce_money).toFixed(2)
+                row.discount_rate = (row.specify_price / row.price * 10).toFixed(1)
+            }
+
+        } else { // 实际
+            if (row.specify_price.length) {
+                row.discount_price = row.specify_price + ''
+                row.reduce_money = (row.price - row.specify_price).toFixed(2)
+                row.discount_rate = (row.specify_price / row.price * 10).toFixed(1)
+            }
+
         }
-        el.discount_type = batchOperation.value.discount_type + ''
+        row.discount_type = discount_type + ''
         if (formRef.value) {
-          formRef.value.validateField('skuList.' + index + '.discount_rate')
-          formRef.value.validateField('skuList.' + index + '.specify_price')
-          formRef.value.validateField('skuList.' + index + '.reduce_money')
+            // console.log('skuList.' + index + '.discount_rate')
+            // formRef.value.validateField('skuList.'+ index + '.discount_rate').catch(()=>{})
+            // formRef.value.validateField('skuList.'+ index + '.specify_price').catch(()=>{})
+            // formRef.value.validateField('skuList.'+ index + '.reduce_money').catch(()=>{})
         }
-      }
-    })
-  })
-  // isIndeterminate.value = false
-  // toggleCheckbox.value = false
-  // batchOperation.value.discountNumber = ''
-  // goods_listTableRef.value.clearSelection()
-}
-
-/**** 修改单行 *****/
-const inputBlur = (row: any, discount_type: string, index: number) => {
-  if (discount_type == 'discount') {
-    if (row.discount_rate.length) {
-      //实际
-      row.specify_price = (row.price * (row.discount_rate / 10)).toFixed(2)
-      row.discount_price = (row.price * (row.discount_rate / 10)).toFixed(2)
-      //减价
-      row.reduce_money = (row.price - row.specify_price).toFixed(2)
-    }
-  } else if (discount_type == 'reduce') {
-    // 减价
-    if (row.reduce_money.length) {
-      row.specify_price = (row.price - row.reduce_money).toFixed(2)
-      row.discount_price = (row.price - row.reduce_money).toFixed(2)
-      row.discount_rate = ((row.specify_price / row.price) * 10).toFixed(1)
     }
-  } else {
-    // 实际
-    if (row.specify_price.length) {
-      row.discount_price = row.specify_price + ''
-      row.reduce_money = (row.price - row.specify_price).toFixed(2)
-      row.discount_rate = ((row.specify_price / row.price) * 10).toFixed(1)
+
+    //sku状态
+    const enabledEvent = (row: any) => {
+        row.is_enabled = row.is_enabled ? 0 : 1
+        if (row.is_enabled) {
+            row.discount_type = 'discount'
+            row.discount_rate = ''
+            row.reduce_money = ''
+            row.specify_price = ''
+        } else {
+            row.discount_type = 'discount'
+            row.discount_rate = '10'
+            row.reduce_money = '0'
+            row.specify_price = row.price + ''
+        }
+
     }
-  }
-  row.discount_type = discount_type + ''
-  if (formRef.value) {
-    // console.log('skuList.' + index + '.discount_rate')
-    // formRef.value.validateField('skuList.'+ index + '.discount_rate').catch(()=>{})
-    // formRef.value.validateField('skuList.'+ index + '.specify_price').catch(()=>{})
-    // formRef.value.validateField('skuList.'+ index + '.reduce_money').catch(()=>{})
-  }
-}
-
-//sku状态
-const enabledEvent = (row: any) => {
-  row.is_enabled = row.is_enabled ? 0 : 1
-  if (row.is_enabled) {
-    row.discount_type = 'discount'
-    row.discount_rate = ''
-    row.reduce_money = ''
-    row.specify_price = ''
-  } else {
-    row.discount_type = 'discount'
-    row.discount_rate = '10'
-    row.reduce_money = '0'
-    row.specify_price = row.price + ''
-  }
-}
-const validFn = (row: any) => {
-  if (row.is_enabled === 0) {
-    return true
-  }
-  if (row.discount_rate.length == 0) {
-    return false
-  } else if (
-    isNaN(row.discount_rate) ||
-    !regExp.number.test(row.discount_rate)
-  ) {
-    return false
-  } else if (row.discount_rate <= 0) {
-    return false
-  } else if (row.discount_rate > 9.9) {
-    return false
-  } else if (row.reduce_money.length == 0) {
-    return false
-  } else if (isNaN(row.reduce_money) || !regExp.digit.test(row.reduce_money)) {
-    return false
-  } else if (row.reduce_money <= 0) {
-    return false
-  } else if (row.reduce_money >= parseFloat(row.price)) {
-    return false
-  } else if (row.specify_price.length == 0) {
-    return false
-  } else if (
-    isNaN(row.specify_price) ||
-    !regExp.digit.test(row.specify_price)
-  ) {
-    return false
-  } else if (row.specify_price <= 0) {
-    return false
-  } else if (row.specify_price >= parseFloat(row.price)) {
-    return false
-  } else {
-    return true
-  }
-}
-
-const save = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  for (var i = 0; i < formData.value.skuList.length; i++) {
-    if (!validFn(formData.value.skuList[i])) {
-      let page = Math.ceil(
-        i + 1 <= goodsTable.limit ? 1 : (i + 1) / goodsTable.limit
-      )
-      goodsTable.list = goodsTable.data[page - 1]
-      goodsTable.page = page
-      break
+    const validFn = (row: any) => {
+        if(row.is_enabled===0){
+            return true
+        }
+        if (row.discount_rate.length == 0) {
+            return false
+        } else if (isNaN(row.discount_rate) || !regExp.number.test(row.discount_rate)) {
+            return false
+        } else if (row.discount_rate <= 0) {
+            return false
+        } else if (row.discount_rate > 9.9) {
+            return false
+        } else if (row.reduce_money.length == 0) {
+            return false
+        } else if (isNaN(row.reduce_money) || !regExp.digit.test(row.reduce_money)) {
+            return false
+        } else if (row.reduce_money <= 0) {
+            return false
+        } else if (row.reduce_money >= parseFloat(row.price)) {
+            return false
+        } else if (row.specify_price.length == 0) {
+            return false
+        } else if (isNaN(row.specify_price) || !regExp.digit.test(row.specify_price)) {
+            return false
+        } else if (row.specify_price <= 0) {
+            return false
+        } else if (row.specify_price >= parseFloat(row.price)) {
+            return false
+        } else {
+            return true
+        }
     }
-  }
-  nextTick(async () => {
-    await formEl.validate((valid) => {
-      if (valid) {
-        formData.value.valid = true
-        let discount_rate_list = formData.value.skuList
-          .filter((el: any) => el.is_enabled === 1)
-          .map((el: any) => Number(el.discount_rate))
-        let reduce_money_list = formData.value.skuList
-          .filter((el: any) => el.is_enabled === 1)
-          .map((el: any) => Number(el.reduce_money))
-        let specify_price_list = formData.value.skuList
-          .filter((el: any) => el.is_enabled === 1)
-          .map((el: any) => Number(el.specify_price))
-        formData.value.max_discount_rate = Math.max(...discount_rate_list)
-        formData.value.min_discount_rate = Math.min(...discount_rate_list)
-        formData.value.max_reduce_money = Math.max(...reduce_money_list)
-        formData.value.min_reduce_money = Math.min(...reduce_money_list)
-        formData.value.max_specify_price = Math.max(...specify_price_list)
-        formData.value.min_specify_price = Math.min(...specify_price_list)
-        emit('skuSave', formData.value)
-        showDialog.value = false
-      }
-    })
-  })
-}
-defineExpose({
-  show,
-})
+
+    const save = (formEl: FormInstance | undefined) => {
+        if (!formEl) return
+        for (var i = 0; i < formData.value.skuList.length; i++) {
+            if (!validFn(formData.value.skuList[i])) {
+                let page = Math.ceil(i + 1 <= goodsTable.limit ? 1 : (i + 1) / goodsTable.limit)
+                goodsTable.list = goodsTable.data[page - 1]
+                goodsTable.page = page
+                break;
+            }
+            
+        }
+        nextTick(async () => {
+            await formEl.validate((valid) => {
+                if (valid) {
+                    formData.value.valid = true
+                    let discount_rate_list = formData.value.skuList.filter((el:any)=>el.is_enabled===1).map((el:any)=>Number(el.discount_rate))
+                    let reduce_money_list = formData.value.skuList.filter((el:any)=>el.is_enabled===1).map((el:any)=>Number(el.reduce_money))
+                    let specify_price_list = formData.value.skuList.filter((el:any)=>el.is_enabled===1).map((el:any)=>Number(el.specify_price))
+                    formData.value.max_discount_rate = Math.max(...discount_rate_list)
+                    formData.value.min_discount_rate = Math.min(...discount_rate_list)
+                    formData.value.max_reduce_money = Math.max(...reduce_money_list)
+                    formData.value.min_reduce_money = Math.min(...reduce_money_list)
+                    formData.value.max_specify_price = Math.max(...specify_price_list)
+                    formData.value.min_specify_price = Math.min(...specify_price_list)
+                    emit("skuSave", formData.value);
+                    showDialog.value = false;
+                }
+            })
+        })
+
+    };
+    defineExpose({
+        show
+    });
 </script>
 
 <style lang="scss" scoped>
-input::-webkit-outer-spin-button,
-input::-webkit-inner-spin-button {
-  -webkit-appearance: none !important;
-  -moz-appearance: none !important;
-  -o-appearance: none !important;
-  -ms-appearance: none !important;
-  appearance: none !important;
-  margin: 0;
-}
-
-input[type='number'] {
-  -webkit-appearance: textfield;
-  -moz-appearance: textfield;
-  -o-appearance: textfield;
-  -ms-appearance: textfield;
-  appearance: textfield;
-}
-
-.sku-form-item-wrap :deep(.el-form-item__content) {
-  margin-left: 0 !important;
-}
-
-.sku_list :deep(.cell) {
-  // min-height: 60px !important;
-  overflow: initial !important;
-}
+	input::-webkit-outer-spin-button,
+	input::-webkit-inner-spin-button {
+		-webkit-appearance: none !important;
+		-moz-appearance: none !important;
+		-o-appearance: none !important;
+		-ms-appearance: none !important;
+		appearance: none !important;
+		margin: 0;
+	}
+
+	input[type="number"] {
+		-webkit-appearance: textfield;
+		-moz-appearance: textfield;
+		-o-appearance: textfield;
+		-ms-appearance: textfield;
+		appearance: textfield;
+	}
+
+	.sku-form-item-wrap :deep(.el-form-item__content) {
+		margin-left: 0 !important;
+	}
+
+	.sku_list :deep(.cell) {
+		// min-height: 60px !important;
+		overflow: initial !important;
+	}
 </style>
+  
\ No newline at end of file
diff --git a/admin/src/addon/shop/views/marketing/discount/config.vue b/admin/src/addon/shop/views/marketing/discount/config.vue
index 43f0a84e..b7119cad 100644
--- a/admin/src/addon/shop/views/marketing/discount/config.vue
+++ b/admin/src/addon/shop/views/marketing/discount/config.vue
@@ -1,183 +1,137 @@
 <template>
-  <div class="main-container" v-loading="loading">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
+    <div class="main-container" v-loading="loading">
+        <el-card class="box-card !border-none" shadow="never">
 
-      <div class="flex mt-[20px]">
-        <div
-          class="relative overflow-hidden w-[340px] h-[680px] z-0 bg-[#f5f5f5]"
-        >
-          <img
-            class="absolute top-0 left-0 z-10 pointer-events-none"
-            src="@/addon/shop/assets/discount_config.png"
-          />
-          <div class="absolute top-0 left-0 w-[340px]">
-            <img
-              class="w-full h-[256px]"
-              v-if="isShow"
-              src="@/addon/shop/assets/discount_banner.png"
-            />
-            <el-carousel height="256px" arrow="never" v-else>
-              <template
-                v-for="(item, index) in formData.list"
-                :key="'img' + index"
-              >
-                <el-carousel-item v-if="item.imageUrl">
-                  <img class="w-full h-full" :src="img(item.imageUrl)" />
-                </el-carousel-item>
-              </template>
-            </el-carousel>
-          </div>
-        </div>
-        <div class="ml-[20px]">
-          <h3 class="panel-title !text-sm">{{ t('headTitle') }}</h3>
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+            </div>
+
+            <div class="flex mt-[20px]">
+                <div class="relative overflow-hidden w-[340px] h-[680px] z-0 bg-[#f5f5f5]">
+                    <img class="absolute top-0 left-0 z-10 pointer-events-none" src="@/addon/shop/assets/discount_config.png"/>
+                    <div class="absolute top-0 left-0 w-[340px]">
+                        <img class="w-full h-[256px]" v-if="isShow" src="@/addon/shop/assets/discount_banner.png">
+                        <el-carousel height="256px" arrow="never" v-else>
+                            <template v-for="(item,index) in formData.list" :key="'img'+index">
+                                <el-carousel-item v-if="item.imageUrl">
+                                    <img class="w-full h-full" :src="img(item.imageUrl)">
+                                </el-carousel-item>
+                            </template>
+                        </el-carousel>
+                    </div>
+                </div>
+                <div class="ml-[20px]">
+                    <h3 class="panel-title !text-sm">{{t('headTitle')}}</h3>
 
-          <el-form
-            class="page-form"
-            :model="formData"
-            label-width="120px"
-            ref="formRef"
-          >
-            <div
-              v-for="(item, index) in formData.list"
-              class="border-[1px] border-[var(--el-border-color)] border-dashed w-[500px] pt-[15px] mb-[15px] relative item"
-              :key="index"
-            >
-              <el-form-item
-                :label="t('image')"
-                :prop="`list.${index}.imageUrl`"
-                :rules="[
-                  {
-                    required: true,
-                    trigger: 'change',
-                    validator: (rule: any, value: any, callback: any) => {
-                      if (!value) {
-                        callback(t('imagePlaceholder'))
-                      }
-                      callback()
-                    },
-                  },
-                ]"
-              >
-                <upload-image v-model="item.imageUrl" :limit="1" />
-              </el-form-item>
-              <el-form-item
-                :label="t('toLink')"
-                :prop="`list.${index}.toLink.name`"
-                :rules="[
-                  {
-                    required: true,
-                    trigger: 'change',
-                    validator: (rule: any, value: any, callback: any) => {
-                      if (!value) {
-                        callback(t('toLinkPlaceholder'))
-                      }
-                      callback()
-                    },
-                  },
-                ]"
-              >
-                <diy-link v-model="item.toLink" />
-              </el-form-item>
-              <span
-                v-if="formData.list.length > 1"
-                class="cursor-pointer absolute top-[-8px] right-[-8px] delete"
-                @click="deleteConfigList(index)"
-                ><el-icon color="#bbbbbb" size="20px"
-                  ><CircleCloseFilled /></el-icon
-              ></span>
+                    <el-form class="page-form" :model="formData" label-width="120px" ref="formRef">
+                        <div v-for="(item,index) in formData.list" class="border-[1px] border-[var(--el-border-color)] border-dashed w-[500px] pt-[15px] mb-[15px] relative item" :key="index">
+                            <el-form-item :label="t('image')" :prop="`list.${index}.imageUrl`"  :rules="[{
+                                required: true,
+                                trigger: 'change',
+                                validator: (rule: any, value: any, callback: any) => {
+                                    if (!value) {
+                                        callback(t('imagePlaceholder'))
+                                    }
+                                    callback()
+                                }
+                            }]">
+                                <upload-image v-model="item.imageUrl"  :limit="1"/>
+                            </el-form-item>
+                            <el-form-item :label="t('toLink')" :prop="`list.${index}.toLink.name`"  :rules="[{
+                                required: true,
+                                trigger: 'change',
+                                validator: (rule: any, value: any, callback: any) => {
+                                    if (!value) {
+                                        callback(t('toLinkPlaceholder'))
+                                    }
+                                    callback()
+                                }
+                            }]">
+                                <diy-link v-model="item.toLink"/>
+                            </el-form-item>
+                            <span v-if="formData.list.length>1" class="cursor-pointer absolute top-[-8px] right-[-8px] delete" @click="deleteConfigList(index)"><el-icon color="#bbbbbb" size="20px"><CircleCloseFilled /></el-icon></span>
+                        </div>
+                        <div class="flex w-full justify-center">
+                            <el-button class="w-[400px]" @click="addConfigList">{{ t('addConfigList') }}</el-button>
+                        </div>
+                    </el-form>
+                </div>
             </div>
-            <div class="flex w-full justify-center">
-              <el-button class="w-[400px]" @click="addConfigList">{{
-                t('addConfigList')
-              }}</el-button>
+        </el-card>
+
+        <!-- 提交按钮 -->
+        <div class="fixed-footer-wrap">
+            <div class="fixed-footer">
+                <el-button type="primary" @click="onSave(formRef)">{{ t('save') }}</el-button>
             </div>
-          </el-form>
         </div>
-      </div>
-    </el-card>
-
-    <!-- 提交按钮 -->
-    <div class="fixed-footer-wrap">
-      <div class="fixed-footer">
-        <el-button type="primary" @click="onSave(formRef)">{{
-          t('save')
-        }}</el-button>
-      </div>
     </div>
-  </div>
 </template>
 
 <script setup lang="ts">
-import { ref, computed } from 'vue'
+import { ref,computed } from 'vue'
 import { t } from '@/lang'
 import { img } from '@/utils/common'
-import {
-  getActiveDiscountConfig,
-  editActiveDiscountConfig,
-} from '@/addon/shop/api/marketing'
+import {getActiveDiscountConfig,editActiveDiscountConfig} from "@/addon/shop/api/marketing";
 import { FormInstance } from 'element-plus'
 import { useRoute } from 'vue-router'
 
 const route = useRoute()
 const pageName = route.meta.title
 const loading = ref(false)
-const isShow = computed(() => {
-  return formData.value.list.every((el: any) => el.imageUrl == '')
+const isShow = computed(()=>{
+    return formData.value.list.every((el:any)=>el.imageUrl=='')
 })
 
 const formData: Record<string, any> = ref({
-  list: [{ imageUrl: '', toLink: { name: '' } }],
+    list: [
+        {imageUrl: '', toLink: {name: ''}},
+    ]
 })
 
 const formRef = ref<FormInstance>()
-const getActiveDiscountConfigFn = () => {
-  loading.value = true
-  getActiveDiscountConfig()
-    .then((res: any) => {
-      if (res.data.length) formData.value.list = res.data
-      loading.value = false
-    })
-    .catch(() => {
-      loading.value = false
+const getActiveDiscountConfigFn=()=>{
+    loading.value = true
+    getActiveDiscountConfig().then((res:any)=>{
+        if(res.data.length) formData.value.list=res.data
+        loading.value = false
+    }).catch(() => {
+        loading.value = false
     })
+    
 }
 getActiveDiscountConfigFn()
-const addConfigList = () => {
-  formData.value.list.push({ imageUrl: '', toLink: { name: '' } })
+const addConfigList = ()=>{
+    formData.value.list.push({imageUrl:'',toLink:{name: ''}})
 }
-const deleteConfigList = (index: number) => {
-  formData.value.list.splice(index, 1)
+const deleteConfigList = (index:number)=>{
+    formData.value.list.splice(index,1)
 }
 const onSave = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      editActiveDiscountConfig(formData.value)
-        .then((res: any) => {
-          loading.value = false
-          getActiveDiscountConfigFn()
-        })
-        .catch(() => {
-          loading.value = false
-        })
-    }
-  })
+    if (loading.value || !formEl) return
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+            editActiveDiscountConfig(formData.value).then((res:any) => {
+                loading.value = false
+                getActiveDiscountConfigFn()
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
 }
 </script>
 
 <style lang="scss" scoped>
-.item {
-  .delete {
-    display: none;
-  }
-  &:hover {
-    .delete {
-      display: block;
+    .item {
+        .delete {
+            display:none;
+        }
+        &:hover {
+            .delete {
+                display:block;
+            }
+        }
     }
-  }
-}
 </style>
diff --git a/admin/src/addon/shop/views/marketing/discount/detail.vue b/admin/src/addon/shop/views/marketing/discount/detail.vue
index 6bcc5c8f..54f6c066 100644
--- a/admin/src/addon/shop/views/marketing/discount/detail.vue
+++ b/admin/src/addon/shop/views/marketing/discount/detail.vue
@@ -1,428 +1,246 @@
 <template>
-  <div class="main-container" v-loading="loading">
-    <el-card class="card !border-none" shadow="never">
-      <el-page-header :content="pageName" :icon="ArrowLeft" @back="back()" />
-    </el-card>
+    <div class="main-container" v-loading="loading">
 
-    <el-form
-      class="page-form mt-[15px]"
-      :model="formData"
-      label-width="100px"
-      ref="formRef"
-      label-position="left"
-      v-if="Object.keys(formData).length"
-    >
-      <el-card
-        class="box-card !border-none relative"
-        shadow="never"
-        v-if="formData"
-      >
-        <h3 class="panel-title">{{ t('baseInfo') }}</h3>
-        <div class="px-[30px] mb-[20px]">
-          <el-row>
-            <el-col :span="8">
-              <el-form-item :label="t('name')">
-                <div class="input-width">
-                  <span>{{ formData.active_name }}</span>
-                </div>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item :label="t('title')">
-                <div class="input-width">
-                  <span>{{ formData.active_desc }}</span>
-                </div>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item :label="t('status')">
-                <div class="input-width">
-                  <span>{{ formData.active_status_name }}</span>
-                </div>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item :label="t('paymentAmount')">
-                <div class="input-width">
-                  <span>{{ formData.active_order_money }}</span>
-                </div>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item :label="t('memberCount')">
-                <div class="input-width">
-                  <span>{{ formData.active_member_num }}</span>
-                </div>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item :label="t('orderCount')">
-                <div class="input-width">
-                  <span>{{ formData.active_order_num }}</span>
-                </div>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item :label="t('startTime')">
-                <div class="input-width">
-                  <span>{{ formData.start_time }}</span>
-                </div>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item :label="t('endTime')">
-                <div class="input-width">
-                  <span>{{ formData.end_time }}</span>
-                </div>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item :label="t('createTime')">
-                <div class="input-width">
-                  <span>{{ formData.create_time }}</span>
+        <el-card class="card !border-none" shadow="never">
+            <el-page-header :content="pageName" :icon="ArrowLeft" @back="back()" />
+        </el-card>
+
+        <el-form class="page-form mt-[15px]" :model="formData" label-width="100px" ref="formRef" label-position="left" v-if="Object.keys(formData).length">
+            <el-card class="box-card !border-none relative" shadow="never" v-if="formData">
+                <h3 class="panel-title">{{ t('baseInfo') }}</h3>
+                <div class="px-[30px] mb-[20px]">
+                    <el-row>
+                        <el-col :span="8">
+                            <el-form-item :label="t('name')">
+                                <div class="input-width">
+                                    <span>{{formData.active_name}}</span>
+                                </div>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item :label="t('title')">
+                                <div class="input-width">
+                                    <span>{{formData.active_desc}}</span>
+                                </div>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item :label="t('status')">
+                                <div class="input-width">
+                                    <span>{{formData.active_status_name}}</span>
+                                </div>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item :label="t('paymentAmount')">
+                                <div class="input-width">
+                                    <span>{{formData.active_order_money}}</span>
+                                </div>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item :label="t('memberCount')">
+                                <div class="input-width">
+                                    <span>{{formData.active_member_num}}</span>
+                                </div>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item :label="t('orderCount')">
+                                <div class="input-width">
+                                    <span>{{formData.active_order_num}}</span>
+                                </div>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item :label="t('startTime')">
+                                <div class="input-width">
+                                    <span>{{formData.start_time}}</span>
+                                </div>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item :label="t('endTime')">
+                                <div class="input-width">
+                                    <span>{{formData.end_time}}</span>
+                                </div>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item :label="t('createTime')">
+                                <div class="input-width">
+                                    <span>{{formData.create_time}}</span>
+                                </div>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
                 </div>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </div>
-      </el-card>
-    </el-form>
-    <el-card
-      class="box-card !border-none relative"
-      shadow="never"
-      v-if="Object.keys(formData).length"
-    >
-      <el-tabs v-model="activeName" class="py-[10px]" @tab-change="handleClick">
-        <el-tab-pane label="活动商品" name="goodsList" />
-        <el-tab-pane label="活动订单" name="orderList" />
-        <el-tab-pane label="活动会员" name="memberList" />
-      </el-tabs>
-      <div v-if="activeName == 'goodsList'">
-        <el-form :inline="true" :model="goodsParams.searchParam">
-          <el-form-item :label="t('keyword')" prop="keyword">
-            <el-input
-              v-model.trim="goodsParams.searchParam.keyword"
-              clearable
-              :placeholder="t('keywordPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button
-              type="primary"
-              @click="getActiveDiscountGoodsPageListFn()"
-              >{{ t('search') }}</el-button
-            >
-          </el-form-item>
+            </el-card>
         </el-form>
-        <el-table
-          :data="goodsParams.data"
-          size="large"
-          v-loading="goodsParams.loading"
-        >
-          <template #empty>
-            <span>{{ !goodsParams.loading ? t('emptyData') : '' }}</span>
-          </template>
-          <el-table-column
-            prop="goods_id"
-            :label="t('goodsInfo')"
-            min-width="300"
-          >
-            <template #default="{ row }">
-              <div
-                v-if="row.goods"
-                class="flex items-center cursor-pointer"
-                @click="previewEvent(row)"
-              >
-                <div
-                  class="min-w-[70px] h-[70px] flex items-center justify-center"
-                >
-                  <el-image
-                    v-if="row.goods.goods_cover_thumb_small"
-                    class="w-[70px] h-[70px]"
-                    :src="img(row.goods.goods_cover_thumb_small)"
-                    fit="contain"
-                  >
-                    <template #error>
-                      <div class="image-slot">
-                        <img
-                          class="w-[70px] h-[70px]"
-                          src="@/addon/shop/assets/goods_default.png"
-                        />
-                      </div>
+        <el-card class="box-card !border-none relative" shadow="never" v-if="Object.keys(formData).length">
+            <el-tabs v-model="activeName" class="py-[10px]" @tab-change="handleClick">
+                <el-tab-pane label="活动商品" name="goodsList" />
+                <el-tab-pane label="活动订单" name="orderList" />
+                <el-tab-pane label="活动会员" name="memberList" />
+            </el-tabs>
+            <div v-if="activeName == 'goodsList'">
+                <el-form :inline="true" :model="goodsParams.searchParam">
+                    <el-form-item :label="t('keyword')" prop="keyword">
+                        <el-input v-model.trim="goodsParams.searchParam.keyword" clearable :placeholder="t('keywordPlaceholder')" />
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="getActiveDiscountGoodsPageListFn()">{{ t('search') }}</el-button>
+                    </el-form-item>
+                </el-form>
+                <el-table :data="goodsParams.data" size="large" v-loading="goodsParams.loading">
+                    <template #empty>
+                        <span>{{ !goodsParams.loading ? t('emptyData') : '' }}</span>
                     </template>
-                  </el-image>
-                  <img
-                    v-else
-                    class="w-[70px] h-[70px]"
-                    src="@/addon/shop/assets/goods_default.png"
-                    fit="contain"
-                  />
+                    <el-table-column prop="goods_id" :label="t('goodsInfo')" min-width="300">
+                        <template #default="{ row }">
+                            <div v-if="row.goods" class="flex items-center cursor-pointer" @click="previewEvent(row)">
+                                <div class="min-w-[70px] h-[70px] flex items-center justify-center">
+                                    <el-image v-if="row.goods.goods_cover_thumb_small" class="w-[70px] h-[70px]" :src="img(row.goods.goods_cover_thumb_small)" fit="contain">
+                                        <template #error>
+                                            <div class="image-slot">
+                                                <img class="w-[70px] h-[70px]" src="@/addon/shop/assets/goods_default.png" />
+                                            </div>
+                                        </template>
+                                    </el-image>
+                                    <img v-else class="w-[70px] h-[70px]" src="@/addon/shop/assets/goods_default.png" fit="contain" />
+                                </div>
+                                <div class="ml-2">
+                                    <span :title="row.goods.goods_name" class="multi-hidden">{{ row.goods.goods_name }}</span>
+                                </div>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('price')" min-width="120">
+                        <template #default="{ row }">
+                            <span v-if="row.goodsSku">￥{{ row.goodsSku.price }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="active_goods_order_money" :label="t('paymentAmount')" min-width="100" />
+                    
+                    <el-table-column prop="active_goods_order_num" :label="t('orderCount')" min-width="100" />
+                    <el-table-column prop="active_goods_member_num" :label="t('activeMemberNum')" min-width="100" />
+                    <el-table-column prop="active_goods_success_num" :label="t('activeSuccessNum')" min-width="100" />
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="goodsParams.page" v-model:page-size="goodsParams.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="goodsParams.total"
+                        @size-change="getActiveDiscountGoodsPageListFn()" @current-change="getActiveDiscountGoodsPageListFn" />
                 </div>
-                <div class="ml-2">
-                  <span :title="row.goods.goods_name" class="multi-hidden">{{
-                    row.goods.goods_name
-                  }}</span>
-                </div>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('price')" min-width="120">
-            <template #default="{ row }">
-              <span v-if="row.goodsSku">￥{{ row.goodsSku.price }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="active_goods_order_money"
-            :label="t('paymentAmount')"
-            min-width="100"
-          />
+            </div>
+            <div v-if="activeName == 'orderList'">
+                <el-form :inline="true" :model="orderParams.searchParam" ref="orderSearchFormRef">
 
-          <el-table-column
-            prop="active_goods_order_num"
-            :label="t('orderCount')"
-            min-width="100"
-          />
-          <el-table-column
-            prop="active_goods_member_num"
-            :label="t('activeMemberNum')"
-            min-width="100"
-          />
-          <el-table-column
-            prop="active_goods_success_num"
-            :label="t('activeSuccessNum')"
-            min-width="100"
-          />
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="goodsParams.page"
-            v-model:page-size="goodsParams.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="goodsParams.total"
-            @size-change="getActiveDiscountGoodsPageListFn()"
-            @current-change="getActiveDiscountGoodsPageListFn"
-          />
-        </div>
-      </div>
-      <div v-if="activeName == 'orderList'">
-        <el-form
-          :inline="true"
-          :model="orderParams.searchParam"
-          ref="orderSearchFormRef"
-        >
-          <el-form-item :label="t('orderInfo')" prop="search_name">
-            <el-input
-              class="input-item"
-              v-model.trim="orderParams.searchParam.search_name"
-            />
-          </el-form-item>
-          <el-form-item :label="t('payType')" prop="status">
-            <el-select
-              v-model="orderParams.searchParam.status"
-              clearable
-              class="input-item"
-            >
-              <el-option :label="t('toBePaid')" value="1"></el-option>
-              <el-option :label="t('toBeShipped')" value="2"></el-option>
-              <el-option :label="t('shipped')" value="3"></el-option>
-              <el-option :label="t('completed')" value="5"></el-option>
-              <el-option :label="t('closed')" value="-1"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="t('createTime')" prop="create_time">
-            <el-date-picker
-              v-model="orderParams.searchParam.create_time"
-              type="datetimerange"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              :start-placeholder="t('startDate')"
-              :end-placeholder="t('endDate')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('payTime')" prop="pay_time">
-            <el-date-picker
-              v-model="orderParams.searchParam.pay_time"
-              type="datetimerange"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              :start-placeholder="t('startDate')"
-              :end-placeholder="t('endDate')"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button
-              type="primary"
-              @click="getActiveDiscountOrderPageListFn()"
-              >{{ t('search') }}</el-button
-            >
-            <el-button @click="orderResetForm(orderSearchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-        <el-table
-          :data="orderParams.data"
-          size="large"
-          v-loading="orderParams.loading"
-        >
-          <template #empty>
-            <span>{{ !orderParams.loading ? t('emptyData') : '' }}</span>
-          </template>
-          <el-table-column
-            prop="order_no"
-            :label="t('orderNo')"
-            min-width="100"
-          />
-          <el-table-column
-            prop="order_money"
-            :label="t('orderMoney')"
-            min-width="100"
-          />
-          <el-table-column :label="t('buyInfo')" min-width="120">
-            <template #default="{ row }">
-              <div class="flex flex-col">
-                <span
-                  class="text-[12px] text-primary cursor-pointer"
-                  @click="detailEvent(row.member.member_id)"
-                  >{{ row.member.nickname }}</span
-                >
-                <span class="text-[12px] mt-[5px]"
-                  >{{ row.taker_name }} {{ row.taker_mobile }}</span
-                >
-                <span class="text-[12px] mt-[5px]">{{
-                  row.taker_full_address
-                }}</span>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('payType')" min-width="120">
-            <template #default="{ row }">
-              <span>{{
-                row.pay && row.pay.type_name ? row.pay.type_name : ''
-              }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('orderStatus')" min-width="100">
-            <template #default="{ row }">
-              <span class="text-[14px]">{{ row.order_status_data.name }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="create_time"
-            :label="t('createTime')"
-            min-width="100"
-          />
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="orderParams.page"
-            v-model:page-size="orderParams.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="orderParams.total"
-            @size-change="getActiveDiscountOrderPageListFn()"
-            @current-change="getActiveDiscountOrderPageListFn"
-          />
-        </div>
-      </div>
-      <div v-if="activeName == 'memberList'">
-        <el-table
-          :data="memberParams.data"
-          size="large"
-          v-loading="memberParams.loading"
-        >
-          <template #empty>
-            <span>{{ !memberParams.loading ? t('emptyData') : '' }}</span>
-          </template>
-          <el-table-column
-            prop="goods_id"
-            :label="t('memberInfo')"
-            min-width="200"
-          >
-            <template #default="{ row }">
-              <div
-                class="flex items-center cursor-pointer"
-                @click="detailEvent(row.member.member_id)"
-              >
-                <div
-                  class="min-w-[50px] h-[50px] flex items-center justify-center"
-                >
-                  <el-image
-                    v-if="row.member.headimg"
-                    class="w-[50px] h-[50px]"
-                    :src="img(row.member.headimg)"
-                    fit="contain"
-                  >
-                    <template #error>
-                      <div class="image-slot">
-                        <img
-                          class="w-[50px] h-[50px] rounded-full"
-                          src="@/app/assets/images/member_head.png"
-                          alt=""
-                        />
-                      </div>
+                    <el-form-item :label="t('orderInfo')" prop='search_name'>
+                        <el-input class="input-item" v-model.trim="orderParams.searchParam.search_name" />
+                    </el-form-item>
+                    <el-form-item :label="t('payType')" prop='status'>
+                        <el-select v-model="orderParams.searchParam.status" clearable class="input-item">
+                            <el-option :label="t('toBePaid')" value="1"></el-option>
+                            <el-option :label="t('toBeShipped')" value="2"></el-option>
+                            <el-option :label="t('shipped')" value="3"></el-option>
+                            <el-option :label="t('completed')" value="5"></el-option>
+                            <el-option :label="t('closed')" value="-1"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item :label="t('createTime')" prop="create_time">
+                        <el-date-picker v-model="orderParams.searchParam.create_time" type="datetimerange"
+                            value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')"
+                            :end-placeholder="t('endDate')" />
+                    </el-form-item>
+                    <el-form-item :label="t('payTime')" prop="pay_time">
+                        <el-date-picker v-model="orderParams.searchParam.pay_time" type="datetimerange"
+                            value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')"
+                            :end-placeholder="t('endDate')" />
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="getActiveDiscountOrderPageListFn()">{{ t('search') }}</el-button>
+                        <el-button @click="orderResetForm(orderSearchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+                <el-table :data="orderParams.data" size="large" v-loading="orderParams.loading">
+                    <template #empty>
+                        <span>{{ !orderParams.loading ? t('emptyData') : '' }}</span>
                     </template>
-                  </el-image>
-                  <img
-                    class="w-[50px] h-[50px] rounded-full"
-                    v-else
-                    src="@/app/assets/images/member_head.png"
-                    alt=""
-                  />
+                    <el-table-column prop="order_no" :label="t('orderNo')" min-width="100" />
+                    <el-table-column prop="order_money" :label="t('orderMoney')" min-width="100" />
+                    <el-table-column :label="t('buyInfo')" min-width="120">
+                        <template #default="{row}">
+                            <div class="flex flex-col">
+                                <span class="text-[12px] text-primary cursor-pointer" @click="detailEvent(row.member.member_id)">{{ row.member.nickname }}</span>
+                                <span class="text-[12px] mt-[5px]">{{ row.taker_name }} {{row.taker_mobile }}</span>
+                                <span class="text-[12px] mt-[5px]">{{ row.taker_full_address }}</span>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('payType')" min-width="120">
+                        <template #default="{row}">
+                            <span>{{ row.pay && row.pay.type_name ? row.pay.type_name : ''}}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('orderStatus')" min-width="100">
+                        <template #default="{row}">
+                            <span class="text-[14px]">{{ row.order_status_data.name }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="create_time" :label="t('createTime')" min-width="100" />
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="orderParams.page" v-model:page-size="orderParams.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="orderParams.total"
+                        @size-change="getActiveDiscountOrderPageListFn()" @current-change="getActiveDiscountOrderPageListFn" />
                 </div>
-                <div class="ml-2">
-                  <span
-                    :title="row.member.nickname || row.member.username"
-                    class="multi-hidden"
-                    >{{ row.member.nickname || row.member.username }}</span
-                  >
-                  <span class="text-primary text-[12px]">{{
-                    row.mobile || ''
-                  }}</span>
+            </div>
+            <div v-if="activeName == 'memberList'">
+                <el-table :data="memberParams.data" size="large" v-loading="memberParams.loading">
+                    <template #empty>
+                        <span>{{ !memberParams.loading ? t('emptyData') : '' }}</span>
+                    </template>
+                    <el-table-column prop="goods_id" :label="t('memberInfo')" min-width="200">
+                        <template #default="{ row }">
+                            <div class="flex items-center cursor-pointer" @click="detailEvent(row.member.member_id)">
+                                <div class="min-w-[50px] h-[50px] flex items-center justify-center">
+                                    <el-image v-if="row.member.headimg" class="w-[50px] h-[50px]" :src="img(row.member.headimg)" fit="contain">
+                                        <template #error>
+                                            <div class="image-slot">
+                                                <img class="w-[50px] h-[50px] rounded-full" src="@/app/assets/images/member_head.png" alt="">
+                                            </div>
+                                        </template>
+                                    </el-image>
+                                    <img class="w-[50px] h-[50px] rounded-full" v-else src="@/app/assets/images/member_head.png" alt="">
+                                </div>
+                                <div class="ml-2">
+                                    <span :title="(row.member.nickname || row.member.username)" class="multi-hidden">{{row.member.nickname || row.member.username}}</span>
+                                    <span class="text-primary text-[12px]">{{row.mobile || ''}}</span>
+                                </div>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="active_order_money" :label="t('consumptionMoney')" min-width="100" />
+                    <el-table-column prop="member_count" :label="t('participationNum')" min-width="100" />
+                    <el-table-column prop="create_time" :label="t('orderTime')" min-width="100" />
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="memberParams.page" v-model:page-size="memberParams.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="memberParams.total"
+                        @size-change="getActiveDiscountMemberPageList()" @current-change="getActiveDiscountMemberPageList" />
                 </div>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="active_order_money"
-            :label="t('consumptionMoney')"
-            min-width="100"
-          />
-          <el-table-column
-            prop="member_count"
-            :label="t('participationNum')"
-            min-width="100"
-          />
-          <el-table-column
-            prop="create_time"
-            :label="t('orderTime')"
-            min-width="100"
-          />
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="memberParams.page"
-            v-model:page-size="memberParams.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="memberParams.total"
-            @size-change="getActiveDiscountMemberPageList()"
-            @current-change="getActiveDiscountMemberPageList"
-          />
-        </div>
-      </div>
-    </el-card>
-  </div>
+            </div>
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { ref, onMounted, reactive } from 'vue'
 import { t } from '@/lang'
 import { img } from '@/utils/common'
-import { FormInstance } from 'element-plus'
+import {FormInstance } from 'element-plus'
 import { ArrowLeft } from '@element-plus/icons-vue'
-import {
-  getActiveDiscountInfo,
-  getActiveDiscountGoodsPageList,
-  getActiveDiscountOrderPageList,
-  getActiveDiscountMemberPageList,
-} from '@/addon/shop/api/marketing'
+import {getActiveDiscountInfo, getActiveDiscountGoodsPageList, getActiveDiscountOrderPageList, getActiveDiscountMemberPageList} from "@/addon/shop/api/marketing";
 import { useRoute, useRouter } from 'vue-router'
 
 const route = useRoute()
@@ -430,140 +248,134 @@ const router = useRouter()
 const pageName = route.meta.title
 
 const back = () => {
-  router.push('/shop/marketing/discount/list')
+    router.push('/shop/marketing/discount/list')
 }
 
-const formData: Record<string, any> = ref({})
+const formData:Record<string, any> = ref({})
 const loading = ref(false)
 const activeName = ref('goodsList')
 
-const handleClick = (data: string) => {
-  activeName.value = data
+const handleClick = (data:string) => {
+    activeName.value = data
 }
 
 onMounted(() => {
-  if (route.query.id) getActiveDiscountInfoFn(Number(route.query.id))
+    if(route.query.id) getActiveDiscountInfoFn(Number(route.query.id))
 })
-const getActiveDiscountInfoFn = (id: number) => {
-  loading.value = true
-  getActiveDiscountInfo(id).then((res: any) => {
-    formData.value = Object.assign(formData.value, res.data)
-    loading.value = false
-  })
+const getActiveDiscountInfoFn = (id:number)=>{
+    loading.value = true
+    getActiveDiscountInfo(id).then((res:any)=>{
+        formData.value = Object.assign(formData.value,res.data)
+        loading.value = false
+    })
 }
 // 活动商品
 const goodsParams = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: false,
-  data: [],
-  searchParam: {
-    keyword: '',
-    active_id: route.query.id,
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: false,
+    data: [],
+    searchParam: {
+        keyword: '',
+        active_id: route.query.id
+    }
 })
-const getActiveDiscountGoodsPageListFn = (page: number = 1) => {
-  goodsParams.loading = true
-  goodsParams.page = page
-  getActiveDiscountGoodsPageList({
-    page: goodsParams.page,
-    limit: goodsParams.limit,
-    ...goodsParams.searchParam,
-  })
-    .then((res) => {
-      goodsParams.loading = false
-      goodsParams.data = res.data.data
-      goodsParams.total = res.data.total
-    })
-    .catch(() => {
-      goodsParams.loading = false
+const getActiveDiscountGoodsPageListFn = (page: number = 1)=>{
+    goodsParams.loading = true
+    goodsParams.page = page
+    getActiveDiscountGoodsPageList({
+        page: goodsParams.page,
+        limit: goodsParams.limit,
+        ...goodsParams.searchParam
+    }).then(res=>{
+        goodsParams.loading = false
+        goodsParams.data = res.data.data
+        goodsParams.total = res.data.total
+    }).catch(() => {
+        goodsParams.loading = false
     })
 }
 getActiveDiscountGoodsPageListFn()
 // 商品预览
 const previewEvent = (data: any) => {
-  const url = router.resolve({
-    path: '/preview/wap',
-    query: {
-      page: `/addon/shop/pages/goods/detail?goods_id=${data.goods_id}`,
-    },
-  })
-  window.open(url.href)
+    const url = router.resolve({
+        path: '/preview/wap',
+        query: {
+            page: `/addon/shop/pages/goods/detail?goods_id=${data.goods_id}`
+        }
+    })
+    window.open(url.href)
 }
 // 活动订单
 const orderSearchFormRef = ref()
 const orderParams = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: false,
-  data: [],
-  searchParam: {
-    search_name: '',
-    status: '',
-    create_time: [],
-    pay_time: [],
-    active_id: route.query.id,
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: false,
+    data: [],
+    searchParam: {
+        search_name: '',
+        status: '',
+        create_time: [],
+        pay_time: [],
+        active_id: route.query.id
+    }
 })
-const getActiveDiscountOrderPageListFn = (page: number = 1) => {
-  orderParams.loading = true
-  orderParams.page = page
-  getActiveDiscountOrderPageList({
-    page: orderParams.page,
-    limit: orderParams.limit,
-    ...orderParams.searchParam,
-  })
-    .then((res) => {
-      orderParams.loading = false
-      orderParams.data = res.data.data
-      orderParams.total = res.data.total
-    })
-    .catch(() => {
-      orderParams.loading = false
+const getActiveDiscountOrderPageListFn = (page: number = 1)=>{
+    orderParams.loading = true
+    orderParams.page = page
+    getActiveDiscountOrderPageList({
+        page: orderParams.page,
+        limit: orderParams.limit,
+        ...orderParams.searchParam
+    }).then(res => {
+        orderParams.loading = false
+        orderParams.data = res.data.data
+        orderParams.total = res.data.total
+    }).catch(() => {
+        orderParams.loading = false
     })
 }
 getActiveDiscountOrderPageListFn()
 const orderResetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  getActiveDiscountOrderPageListFn()
+    if (!formEl) return
+    formEl.resetFields()
+    getActiveDiscountOrderPageListFn()
 }
 //活动会员
-const memberParams = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: false,
-  data: [],
-  searchParam: {
-    active_id: route.query.id,
-  },
+const memberParams =  reactive({
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: false,
+    data: [],
+    searchParam: {
+        active_id:route.query.id
+    }
 })
-const getActiveDiscountMemberPageListFn = (page: number = 1) => {
-  memberParams.loading = true
-  memberParams.page = page
-  getActiveDiscountMemberPageList({
-    page: memberParams.page,
-    limit: memberParams.limit,
-    ...memberParams.searchParam,
-  })
-    .then((res: any) => {
-      memberParams.loading = false
-      memberParams.data = res.data.data
-      memberParams.total = res.data.total
-    })
-    .catch(() => {
-      memberParams.loading = false
+const getActiveDiscountMemberPageListFn= (page: number = 1)=>{
+    memberParams.loading = true
+    memberParams.page = page
+    getActiveDiscountMemberPageList({
+        page: memberParams.page,
+        limit: memberParams.limit,
+        ...memberParams.searchParam
+    }).then((res:any)=>{
+        memberParams.loading = false
+        memberParams.data = res.data.data
+        memberParams.total = res.data.total
+    }).catch(() => {
+        memberParams.loading = false
     })
 }
 getActiveDiscountMemberPageListFn()
 
 //查看会员详情
-const detailEvent = (member_id: number) => {
-  let routeData = router.resolve(`/member/detail?id=${member_id}`)
-  window.open(routeData.href, ' blank')
+const detailEvent = (member_id:number)=> {
+    let routeData = router.resolve(`/member/detail?id=${member_id}`)
+    window.open(routeData.href, ' blank');
 }
 </script>
 
diff --git a/admin/src/addon/shop/views/marketing/discount/edit.vue b/admin/src/addon/shop/views/marketing/discount/edit.vue
index b6135748..b80c2c6a 100644
--- a/admin/src/addon/shop/views/marketing/discount/edit.vue
+++ b/admin/src/addon/shop/views/marketing/discount/edit.vue
@@ -1,425 +1,225 @@
 <template>
-  <div class="main-container">
-    <el-card class="card !border-none" shadow="never">
-      <el-page-header :content="pageName" :icon="ArrowLeft" @back="back()" />
-    </el-card>
+    <div class="main-container">
 
-    <!-- 表单 -->
-    <el-card
-      class="box-card mt-[15px] !border-none"
-      shadow="never"
-      v-loading="loading"
-    >
-      <el-form
-        :model="formData"
-        label-width="120px"
-        ref="formRef"
-        :rules="formRules"
-        class="page-form"
-      >
-        <!-- 活动名称 -->
-        <el-form-item :label="t('name')" prop="active_name">
-          <div>
-            <el-input
-              v-model.trim="formData.active_name"
-              clearable
-              :placeholder="t('namePlaceholder')"
-              class="input-width"
-              :maxlength="20"
-            />
-            <p class="text-[14px] text-[#999]">{{ t('nameTip') }}</p>
-          </div>
-        </el-form-item>
-        <!-- 活动标题 -->
-        <el-form-item :label="t('title')" prop="active_desc">
-          <div>
-            <el-input
-              v-model.trim="formData.active_desc"
-              clearable
-              :placeholder="t('titlePlaceholder')"
-              class="input-width"
-              :maxlength="20"
-            />
-            <p class="text-[14px] text-[#999]">{{ t('titleTip') }}</p>
-          </div>
-        </el-form-item>
-        <!-- 活动时间 -->
-        <el-form-item :label="t('activityTime')" prop="discount_time">
-          <div class="w-[180px]">
-            <el-date-picker
-              v-model="formData.discount_time"
-              type="datetimerange"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-            />
-          </div>
-        </el-form-item>
-        <!-- 选择商品 -->
-        <el-form-item :label="t('selectProduct')" class="!m-0">
-          <goods-select-popup
-            ref="goodsSelectPopupRef"
-            v-model="formData.goods_ids"
-            @goodsSelect="goodsSelect"
-            :min="1"
-            :max="99"
-          />
-        </el-form-item>
-        <el-form-item prop="goods_list"></el-form-item>
-        <el-form-item v-if="formData.goods_list.length && goodsTable.data">
-          <div class="w-full sku_list">
-            <el-table
-              class="!w-[1400px] !max-w-[100%]"
-              :data="goodsTable.list"
-              size="large"
-              ref="goods_listTableRef"
-              @selection-change="handleSelectionChange"
-            >
-              <template #empty>
-                <span>{{ t('emptyData') }}</span>
-              </template>
+        <el-card class="card !border-none" shadow="never">
+            <el-page-header :content="pageName" :icon="ArrowLeft" @back="back()" />
+        </el-card>
 
-              <el-table-column type="selection" width="55" />
-
-              <el-table-column
-                :label="t('goodsSelectPopupGoodsInfo')"
-                min-width="300"
-              >
-                <template #default="{ row }">
-                  <div class="flex items-center cursor-pointer">
-                    <div
-                      class="min-w-[60px] h-[60px] flex items-center justify-center"
-                    >
-                      <el-image
-                        v-if="row.goods_cover_thumb_small"
-                        class="w-[60px] h-[60px]"
-                        :src="img(row.goods_cover_thumb_small)"
-                        fit="contain"
-                      >
-                        <template #error>
-                          <div class="image-slot">
-                            <img
-                              class="w-[60px] h-[60px]"
-                              src="@/addon/shop/assets/goods_default.png"
-                            />
-                          </div>
-                        </template>
-                      </el-image>
-                      <img
-                        v-else
-                        class="w-[70px] h-[60px]"
-                        src="@/addon/shop/assets/goods_default.png"
-                        fit="contain"
-                      />
+        <!-- 表单 -->
+        <el-card class="box-card mt-[15px] !border-none" shadow="never" v-loading="loading">
+            <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form">
+                <!-- 活动名称 -->
+                <el-form-item :label="t('name')" prop="active_name">
+                    <div>
+                        <el-input v-model.trim="formData.active_name" clearable :placeholder="t('namePlaceholder')" class="input-width" :maxlength="20" />
+                        <p class=" text-[14px] text-[#999]">{{ t('nameTip') }}</p>
+                    </div>
+                </el-form-item>
+                <!-- 活动标题 -->
+                <el-form-item :label="t('title')" prop="active_desc">
+                    <div>
+                        <el-input v-model.trim="formData.active_desc" clearable :placeholder="t('titlePlaceholder')" class="input-width" :maxlength="20" />
+                        <p class=" text-[14px] text-[#999]">{{ t('titleTip') }}</p>
                     </div>
-                    <div class="ml-2">
-                      <span :title="row.goods_name" class="multi-hidden">{{
-                        row.goods_name
-                      }}</span>
-                      <span class="text-primary text-[12px]">{{
-                        row.goods_type_name
-                      }}</span>
+                </el-form-item>
+                <!-- 活动时间 -->
+                <el-form-item :label="t('activityTime')" prop="discount_time">
+                    <div class="w-[180px]">
+                        <el-date-picker v-model="formData.discount_time" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"/>
                     </div>
-                  </div>
-                </template>
-              </el-table-column>
+                </el-form-item>
+                <!-- 选择商品 -->
+                <el-form-item :label="t('selectProduct')" class="!m-0">
+                    <goods-select-popup ref="goodsSelectPopupRef" v-model="formData.goods_ids" @goodsSelect="goodsSelect" :min="1" :max="99" />
+                </el-form-item>
+                <el-form-item prop="goods_list"></el-form-item>
+                <el-form-item v-if="formData.goods_list.length&& goodsTable.data">
+                    <div class="w-full sku_list">
+
+                        <el-table class="!w-[1400px] !max-w-[100%]" :data="goodsTable.list" size="large" ref="goods_listTableRef" @selection-change="handleSelectionChange">
+                            <template #empty>
+                                <span>{{ t('emptyData')}}</span>
+                            </template>
 
-              <el-table-column prop="price" :label="t('price')" min-width="130">
-                <template #default="{ row }">
-                  <div>￥{{ row.goodsSku.price }}</div>
-                </template>
-              </el-table-column>
+                            <el-table-column type="selection" width="55" />
 
-              <el-table-column :label="t('discounts')" width="170">
-                <template #default="{ row, $index }">
-                  <el-form-item
-                    v-if="!row.goodsSku.sku_spec_format"
-                    :key="row.goods_id"
-                    :prop="'goods_list.' + row.index + '.discount_rate'"
-                    :rules="[
-                      {
-                        trigger: 'blur',
-                        validator: (rule: any, value: any, callback: any) => {
-                          if (value.length == 0) {
-                            callback(t('discountsPlaceholder'))
-                          } else if (
-                            isNaN(value) ||
-                            !regExp.number.test(value)
-                          ) {
-                            callback(t('discountsTips'))
-                          } else if (value <= 0) {
-                            callback(t('discountsTipsTwo'))
-                          } else if (value > 9.9) {
-                            callback(t('discountsTipsThree'))
-                          } else {
-                            callback()
-                          }
-                        },
-                      },
-                    ]"
-                    class="sku-form-item-wrap"
-                  >
-                    <el-input
-                      v-model.trim="row.discount_rate"
-                      @blur="inputBlur(row, 'discount', row.index)"
-                      clearable
-                      placeholder="0.00"
-                      maxlength="8"
-                    />
-                  </el-form-item>
-                  <el-form-item
-                    :prop="'goods_list.' + row.index + '.valid'"
-                    :rules="[
-                      {
-                        trigger: 'blur',
-                        validator: (rule: any, value: any, callback: any) => {
-                          if (!value) {
-                            callback(t('skuDiscountSettingsPlaceholder'))
-                          } else {
-                            callback()
-                          }
-                        },
-                      },
-                    ]"
-                    v-else
-                  >
-                    <span
-                      v-if="
-                        row.valid &&
-                        row.min_discount_rate != Infinity &&
-                        row.max_discount_rate != -Infinity
-                      "
-                      >{{
-                        row.min_discount_rate == row.max_discount_rate
-                          ? row.min_discount_rate
-                          : row.min_discount_rate + '-' + row.max_discount_rate
-                      }}</span
-                    >
-                    <span v-else>--</span>
-                  </el-form-item>
-                </template>
-              </el-table-column>
-              <el-table-column :label="t('reduceMoney')" width="170">
-                <template #default="{ row, $index }">
-                  <el-form-item
-                    v-if="!row.goodsSku.sku_spec_format"
-                    :key="row.goods_id"
-                    :prop="'goods_list.' + row.index + '.reduce_money'"
-                    :rules="[
-                      {
-                        trigger: 'blur',
-                        validator: (rule: any, value: any, callback: any) => {
-                          if (value.length == 0) {
-                            callback(t('reduceMoneyPlaceholder'))
-                          } else if (
-                            isNaN(value) ||
-                            !regExp.digit.test(value)
-                          ) {
-                            callback(t('reduceMoneyTips'))
-                          } else if (value <= 0) {
-                            callback(t('reduceMoneyTipsTwo'))
-                          } else if (value >= parseFloat(row.goodsSku.price)) {
-                            callback(t('reduceMoneyTipsThree'))
-                          } else {
-                            callback()
-                          }
-                        },
-                      },
-                    ]"
-                    class="sku-form-item-wrap"
-                  >
-                    <el-input
-                      v-model.trim="row.reduce_money"
-                      @blur="inputBlur(row, 'reduce', row.index)"
-                      clearable
-                      placeholder="0.00"
-                      maxlength="8"
-                    />
-                  </el-form-item>
-                  <el-form-item v-else>
-                    <span
-                      v-if="
-                        row.valid &&
-                        row.min_reduce_money != Infinity &&
-                        row.max_reduce_money != -Infinity
-                      "
-                      >{{
-                        row.min_reduce_money == row.max_reduce_money
-                          ? row.min_reduce_money
-                          : row.min_reduce_money + '-' + row.max_reduce_money
-                      }}</span
-                    >
-                    <span v-else>--</span>
-                  </el-form-item>
-                </template>
-              </el-table-column>
-              <el-table-column :label="t('promotional')" width="170">
-                <template #default="{ row, $index }">
-                  <el-form-item
-                    v-if="!row.goodsSku.sku_spec_format"
-                    :key="row.goods_id"
-                    :prop="'goods_list.' + row.index + '.specify_price'"
-                    :rules="[
-                      {
-                        trigger: 'blur',
-                        validator: (rule: any, value: any, callback: any) => {
-                          if (value.length == 0) {
-                            callback(t('promotionalPlaceholder'))
-                          } else if (
-                            isNaN(value) ||
-                            !regExp.digit.test(value)
-                          ) {
-                            callback(t('promotionalTips'))
-                          } else if (value <= 0) {
-                            callback(t('promotionalTipsTwo'))
-                          } else if (value >= parseFloat(row.goodsSku.price)) {
-                            callback(t('promotionalTipsThree'))
-                          } else {
-                            callback()
-                          }
-                        },
-                      },
-                    ]"
-                    class="sku-form-item-wrap"
-                  >
-                    <el-input
-                      v-model.trim="row.specify_price"
-                      clearable
-                      @blur="inputBlur(row, 'specify', row.index)"
-                      placeholder="0.00"
-                      maxlength="8"
-                    />
-                  </el-form-item>
-                  <el-form-item v-else>
-                    <span
-                      v-if="
-                        row.valid &&
-                        row.min_specify_price != Infinity &&
-                        row.max_specify_price != -Infinity
-                      "
-                      >{{
-                        row.min_specify_price == row.max_specify_price
-                          ? row.min_specify_price
-                          : row.min_specify_price + '-' + row.max_specify_price
-                      }}</span
-                    >
-                    <span v-else>--</span>
-                  </el-form-item>
-                </template>
-              </el-table-column>
-              <el-table-column :label="t('discountType')" width="130">
-                <template #default="{ row }">
-                  <span v-if="!row.goodsSku.sku_spec_format">{{
-                    row.discount_type == 'discount'
-                      ? t('discounts')
-                      : row.discount_type == 'reduce'
-                        ? t('reduceMoney')
-                        : t('promotional')
-                  }}</span>
-                  <el-form-item v-else>请在设置中查看</el-form-item>
-                </template>
-              </el-table-column>
-              <el-table-column
-                :label="t('operation')"
-                align="right"
-                min-width="160"
-              >
-                <template #default="{ row }">
-                  <!-- <el-button type="primary" link @click="enabledEvent(row)">{{ row.is_enabled?t('noEnabled'):t('enabled') }}</el-button> -->
-                  <el-button
-                    v-if="row.goodsSku.sku_spec_format"
-                    type="primary"
-                    link
-                    @click="
-                      skuDiscountSettingsEvent(formData.goods_list[row.index])
-                    "
-                  >
-                    {{ t('skuDiscountSettings') }}
-                  </el-button>
-                  <el-button type="primary" link @click="deleteEvent(row.index)"
-                    >{{ t('delete') }}
-                  </el-button>
-                </template>
-              </el-table-column>
-            </el-table>
-            <div
-              class="flex items-center justify-between mt-[15px] !w-[1400px] !max-w-[100%]"
-            >
-              <div class="flex items-center mb-[15px]">
-                <el-checkbox
-                  v-model="toggleCheckbox"
-                  size="large"
-                  class="!mr-[15px]"
-                  @change="toggleChange"
-                  :indeterminate="isIndeterminate"
-                >
-                  <span>已选 {{ multipleSelection.length }} 项</span>
-                </el-checkbox>
+                            <el-table-column :label="t('goodsSelectPopupGoodsInfo')" min-width="300">
+                                <template #default="{ row }">
+                                    <div class="flex items-center cursor-pointer">
+                                        <div class="min-w-[60px] h-[60px] flex items-center justify-center">
+                                            <el-image v-if="row.goods_cover_thumb_small" class="w-[60px] h-[60px]" :src="img(row.goods_cover_thumb_small)" fit="contain">
+                                                <template #error>
+                                                    <div class="image-slot">
+                                                        <img class="w-[60px] h-[60px]" src="@/addon/shop/assets/goods_default.png" />
+                                                    </div>
+                                                </template>
+                                            </el-image>
+                                            <img v-else class="w-[70px] h-[60px]" src="@/addon/shop/assets/goods_default.png" fit="contain" />
+                                        </div>
+                                        <div class="ml-2">
+                                            <span :title="row.goods_name" class="multi-hidden">{{ row.goods_name }}</span>
+                                            <span class="text-primary text-[12px]">{{ row.goods_type_name }}</span>
+                                        </div>
+                                    </div>
+                                </template>
+                            </el-table-column>
 
-                <label>{{ t('batchOperation') }}</label>
-                <!-- <el-select v-model="batchOperation.discount_type" class="!w-[130px] ml-[10px]" @change="batchOperation.discountNumber=''">
+                            <el-table-column prop="price" :label="t('price')" min-width="130">
+                                <template #default="{ row }">
+                                    <div>￥{{ row.goodsSku.price }}</div>
+                                </template>
+                            </el-table-column>
+
+                            <el-table-column :label="t('discounts')" width="170">
+                                <template #default="{ row,$index }">
+                                    <el-form-item v-if="!row.goodsSku.sku_spec_format" :key="row.goods_id" :prop="'goods_list.'+row.index + '.discount_rate'" :rules="[{
+                                        trigger: 'blur',
+                                        validator: (rule: any, value: any, callback: any) => {
+                                            if (value.length == 0) {
+                                                callback(t('discountsPlaceholder'))
+                                            } else if (isNaN(value) || !regExp.number.test(value)) {
+                                                callback(t('discountsTips'))
+                                            } else if (value <= 0) {
+                                                callback(t('discountsTipsTwo'))
+                                            } else if (value>9.9) {
+                                                callback(t('discountsTipsThree'))
+                                            } else {
+                                                callback();
+                                            }
+                                        }
+                                    }]" class="sku-form-item-wrap">
+                                        <el-input v-model.trim="row.discount_rate" @blur="inputBlur(row,'discount',row.index)" clearable placeholder="0.00" maxlength="8" />
+                                    </el-form-item>
+                                    <el-form-item :prop="'goods_list.'+row.index + '.valid'" :rules="[{
+                                        trigger: 'blur',
+                                        validator: (rule: any, value: any, callback: any) => {
+                                            if (!value) {
+                                                callback(t('skuDiscountSettingsPlaceholder'))
+                                            } else {
+                                                callback();
+                                            }
+                                        }
+                                    }]" v-else>
+                                    <span v-if="row.valid && row.min_discount_rate!=Infinity&&row.max_discount_rate!=-Infinity">{{ row.min_discount_rate==row.max_discount_rate?row.min_discount_rate:row.min_discount_rate+'-'+row.max_discount_rate }}</span>
+                                    <span v-else>--</span>
+                                    </el-form-item>
+                                </template>
+                            </el-table-column>
+                            <el-table-column :label="t('reduceMoney')" width="170">
+                                <template #default="{ row,$index }">
+                                    <el-form-item v-if="!row.goodsSku.sku_spec_format" :key="row.goods_id" :prop="'goods_list.'+row.index + '.reduce_money'" :rules="[{
+                                        trigger: 'blur',
+                                        validator: (rule: any, value: any, callback: any) => {
+                                                if (value.length == 0) {
+                                                    callback(t('reduceMoneyPlaceholder'))
+                                                } else if (isNaN(value) || !regExp.digit.test(value)) {
+                                                    callback(t('reduceMoneyTips'))
+                                                } else if (value <=0) {
+                                                    callback(t('reduceMoneyTipsTwo'))
+                                                } else if (value >= parseFloat(row.goodsSku.price) ) {
+                                                    callback(t('reduceMoneyTipsThree'))
+                                                } else {
+                                                    callback();
+                                                }
+                                        }
+                                        }]" class="sku-form-item-wrap">
+                                        <el-input v-model.trim="row.reduce_money" @blur="inputBlur(row,'reduce',row.index)" clearable placeholder="0.00" maxlength="8" />
+                                    </el-form-item>
+                                    <el-form-item v-else>
+                                        <span v-if="row.valid && row.min_reduce_money!=Infinity&&row.max_reduce_money!=-Infinity">{{ row.min_reduce_money==row.max_reduce_money?row.min_reduce_money:row.min_reduce_money+'-'+row.max_reduce_money }}</span>
+                                        <span v-else>--</span>
+                                    </el-form-item>
+                                </template>
+                            </el-table-column>
+                            <el-table-column :label="t('promotional')" width="170">
+                                <template #default="{ row,$index }">
+                                    <el-form-item v-if="!row.goodsSku.sku_spec_format" :key="row.goods_id" :prop="'goods_list.'+row.index + '.specify_price'" :rules="[{
+                                        trigger: 'blur',
+                                        validator: (rule: any, value: any, callback: any) => {
+                                                if (value.length == 0) {
+                                                    callback(t('promotionalPlaceholder'))
+                                                } else if (isNaN(value) || !regExp.digit.test(value)) {
+                                                    callback(t('promotionalTips'))
+                                                } else if (value <=0 ) {
+                                                    callback(t('promotionalTipsTwo'))
+                                                }else if (value >= parseFloat(row.goodsSku.price) ) {
+                                                    callback(t('promotionalTipsThree'))
+                                                } else {
+                                                    callback();
+                                                }
+                                        }
+                                    }]" class="sku-form-item-wrap">
+                                        <el-input v-model.trim="row.specify_price" clearable @blur="inputBlur(row,'specify',row.index)" placeholder="0.00" maxlength="8" />
+                                    </el-form-item>
+                                    <el-form-item v-else>
+                                        <span v-if="row.valid && row.min_specify_price!=Infinity&&row.max_specify_price!=-Infinity">{{ row.min_specify_price==row.max_specify_price?row.min_specify_price:row.min_specify_price+'-'+row.max_specify_price }}</span>
+                                        <span v-else>--</span>
+                                    </el-form-item>
+                                </template>
+                            </el-table-column>
+                            <el-table-column :label="t('discountType')" width="130">
+                                <template #default="{ row }">
+                                    <span v-if="!row.goodsSku.sku_spec_format">{{row.discount_type=='discount'?t('discounts'):row.discount_type=='reduce'?t('reduceMoney'):t('promotional')}}</span>
+                                    <el-form-item v-else>请在设置中查看</el-form-item>
+                                </template>
+                            </el-table-column>
+                            <el-table-column :label="t('operation')" align="right" min-width="160">
+                                <template #default="{row}">
+                                    <!-- <el-button type="primary" link @click="enabledEvent(row)">{{ row.is_enabled?t('noEnabled'):t('enabled') }}</el-button> -->
+                                    <el-button v-if="row.goodsSku.sku_spec_format" type="primary" link @click="skuDiscountSettingsEvent(formData.goods_list[row.index])">
+                                        {{t('skuDiscountSettings') }}
+                                    </el-button>
+                                    <el-button type="primary" link @click="deleteEvent(row.index)">{{t('delete') }}
+                                    </el-button>
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                        <div class="flex items-center justify-between mt-[15px] !w-[1400px] !max-w-[100%]">
+                            <div class="flex items-center mb-[15px]">
+                                <el-checkbox v-model="toggleCheckbox" size="large" class="!mr-[15px]" @change="toggleChange" :indeterminate="isIndeterminate">
+                                    <span>已选 {{ multipleSelection.length }} 项</span>
+                                </el-checkbox>
+
+                                <label>{{ t('batchOperation') }}</label>
+                                <!-- <el-select v-model="batchOperation.discount_type" class="!w-[130px] ml-[10px]" @change="batchOperation.discountNumber=''">
                                     <el-option :label="t('discounts')" value="discount" />
                                     <el-option :label="t('reduceMoney')" value="reduce" />
                                     <el-option :label="t('promotional')" value="specify" />
                                 </el-select> -->
-                <el-input
-                  v-model.trim="batchOperation.discountNumber"
-                  clearable
-                  :placeholder="
-                    batchOperation.discount_type == 'discount'
-                      ? t('discounts')
-                      : batchOperation.discount_type == 'reduce'
-                        ? t('reduceMoney')
-                        : t('promotional')
-                  "
-                  class="!w-[130px] ml-[10px]"
-                  maxlength="8"
-                />
-                <el-button
-                  class="ml-[10px]"
-                  type="primary"
-                  @click="saveBatch"
-                  >{{ t('confirm') }}</el-button
-                >
-              </div>
-              <el-pagination
-                v-model:current-page="goodsTable.page"
-                v-model:page-size="goodsTable.limit"
-                layout="total, prev, pager, next, jumper"
-                :total="goodsTable.total"
-                @current-change="setGoodsList"
-              />
-            </div>
-          </div>
-        </el-form-item>
-      </el-form>
-    </el-card>
+                                <el-input v-model.trim="batchOperation.discountNumber" clearable
+                                          :placeholder="batchOperation.discount_type=='discount'?t('discounts'):batchOperation.discount_type=='reduce'?t('reduceMoney'):t('promotional')"
+                                          class="!w-[130px] ml-[10px]" maxlength="8" />
+                                <el-button class="ml-[10px]" type="primary" @click="saveBatch">{{ t('confirm') }}</el-button>
+                            </div>
+                            <el-pagination v-model:current-page="goodsTable.page" v-model:page-size="goodsTable.limit"
+                                           layout="total, prev, pager, next, jumper" :total="goodsTable.total"
+                                           @current-change="setGoodsList" />
+                        </div>
+                    </div>
+                </el-form-item>
+            </el-form>
+        </el-card>
 
-    <goods-sku-popup ref="goodsSkuPopupRef" @skuSave="skuSave" />
+        <goods-sku-popup ref="goodsSkuPopupRef" @skuSave="skuSave" />
 
-    <!-- 提交按钮 -->
-    <div class="fixed-footer-wrap">
-      <div class="fixed-footer">
-        <el-button type="primary" @click="onSave(formRef)">{{
-          t('save')
-        }}</el-button>
-        <el-button @click="back()">{{ t('cancel') }}</el-button>
-      </div>
+        <!-- 提交按钮 -->
+        <div class="fixed-footer-wrap">
+            <div class="fixed-footer">
+                <el-button type="primary" @click="onSave(formRef)">{{ t('save') }}</el-button>
+                <el-button @click="back()">{{ t('cancel') }}</el-button>
+            </div>
+        </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
-import { ref, computed, onMounted, reactive, nextTick } from 'vue'
-import { t } from '@/lang'
-import { useRoute, useRouter } from 'vue-router'
-import {
-  getActiveDiscountInfo,
-  editActiveDiscount,
-} from '@/addon/shop/api/marketing'
-import { FormInstance, ElMessage } from 'element-plus'
+import {ref, computed, onMounted, reactive, nextTick} from 'vue'
+import {t} from '@/lang'
+import {useRoute, useRouter} from 'vue-router'
+import { getActiveDiscountInfo, editActiveDiscount} from "@/addon/shop/api/marketing";
+import {FormInstance, ElMessage} from 'element-plus'
 import { ArrowLeft } from '@element-plus/icons-vue'
-import { deepClone, img } from '@/utils/common'
+import {deepClone, img} from '@/utils/common'
 import goodsSelectPopup from '@/addon/shop/views/goods/components/goods-select-popup.vue'
 import goodsSkuPopup from '@/addon/shop/views/marketing/discount/components/goods-sku-popup.vue'
 
@@ -433,307 +233,283 @@ const end_time = new Date()
 const goodsSelectPopupRef: any = ref(null)
 end_time.setTime(end_time.getTime() + 3600 * 1000 * 2 * 360) // 设置结束默认时间为当前时间30天后
 const initialFormData = {
-  active_name: '', // 名称
-  active_desc: '', // 标题
-  active_status: '',
-  start_time: '',
-  end_time: '',
-  goods_data: '',
-  goods_ids: [],
-  goods_list: [],
-  discount_time: [start_time, end_time],
+    active_name: '', // 名称
+    active_desc: '', // 标题
+    active_status: '',
+    start_time: '',
+    end_time: '',
+    goods_data: '',
+    goods_ids: [],
+    goods_list: [],
+    discount_time: [start_time, end_time],
 }
-const formData: Record<string, any> = ref({ ...initialFormData })
+const formData: Record<string, any> = ref({...initialFormData})
 const formRef = ref<FormInstance>()
 // 表单验证规则
 // 正则表达式
 const regExp = {
-  number: /^\d{0,10}(.?\d{0,1})$/,
-  digit: /^\d{0,10}(.?\d{0,2})$/,
+    number: /^\d{0,10}(.?\d{0,1})$/,
+    digit: /^\d{0,10}(.?\d{0,2})$/
 }
 const formRules = computed(() => {
-  return {
-    active_name: [
-      { required: true, message: t('namePlaceholder'), trigger: 'blur' },
-      { validator: noSpaceValidator, trigger: 'blur' },
-    ],
-    active_desc: [
-      { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
-      { validator: noSpaceValidator, trigger: 'blur' },
-    ],
-    goods_list: [
-      {
-        required: true,
-        message: t('selectProductPlaceholder'),
-        trigger: 'change',
-      },
-    ],
-    discount_time: [
-      { required: true, validator: receiveTime, trigger: 'change' },
-    ],
-  }
+    return {
+        active_name: [
+            {required: true, message: t('namePlaceholder'), trigger: 'blur'},
+            { validator: noSpaceValidator, trigger: 'blur' }
+        ],
+        active_desc: [
+            {required: true, message: t('titlePlaceholder'), trigger: 'blur'},
+            { validator: noSpaceValidator, trigger: 'blur' }
+        ],
+        goods_list: [
+            {required: true, message: t('selectProductPlaceholder'), trigger: 'change'}
+        ],
+        discount_time: [
+            {required: true, validator: receiveTime, trigger: 'change'}
+        ],
+    }
 })
-const noSpaceValidator = (rule: any, value: any, callback: any) => {
-  if (value.trim() === '') {
-    return callback(new Error(t('noSpaceAllowed')))
-  }
-  callback() // 通过验证
+const noSpaceValidator = (rule: any, value: any, callback: any)=>{
+    if (value.trim() === '') {
+        return callback(new Error(t('noSpaceAllowed')));
+    }
+    callback(); // 通过验证
 }
 const receiveTime = (rule: any, value: any, callback: any) => {
-  if (
-    !formData.value.discount_time ||
-    (formData.value.discount_time &&
-      !formData.value.discount_time[0] &&
-      !formData.value.discount_time[1])
-  ) {
-    callback(new Error(t('请选择活动时间')))
-  } else if (!formData.value.discount_time[0]) {
-    callback(new Error(t('请选择活动开始时间')))
-  } else if (!formData.value.discount_time[1]) {
-    callback(new Error(t('请选择活动结束时间')))
-  } else if (
-    formData.value.discount_time[1] <= formData.value.discount_time[0]
-  ) {
-    callback(new Error(t('活动结束时间不能小于等于活动开始时间')))
-  }
+    if (!formData.value.discount_time || (formData.value.discount_time && !formData.value.discount_time[0] && !formData.value.discount_time[1])) {
+        callback(new Error(t('请选择活动时间')))
+    } else if (!formData.value.discount_time[0]) {
+        callback(new Error(t('请选择活动开始时间')))
+    } else if (!formData.value.discount_time[1]) {
+        callback(new Error(t('请选择活动结束时间')))
+    } else if (formData.value.discount_time[1] <= formData.value.discount_time[0]) {
+        callback(new Error(t('活动结束时间不能小于等于活动开始时间')))
+    }
 
-  callback()
+    callback()
 }
 onMounted(() => {
-  if (route.query.id) getActiveDiscountInfoFn(Number(route.query.id))
+    if (route.query.id) getActiveDiscountInfoFn(Number(route.query.id))
 })
 const getActiveDiscountInfoFn = (id: number) => {
-  loading.value = true
-  getActiveDiscountInfo(id).then((res: any) => {
-    formData.value = Object.assign(formData.value, res.data)
-    formData.value.discount_time = [res.data.start_time, res.data.end_time]
-    if (formData.value.active_goods_info) {
-      formData.value.active_goods_info.forEach((el: any) => {
-        formData.value.goods_ids.push(el.goods_id)
+    loading.value = true
+    getActiveDiscountInfo(id).then((res: any) => {
+        formData.value = Object.assign(formData.value, res.data)
+        formData.value.discount_time = [res.data.start_time, res.data.end_time]
+        if(formData.value.active_goods_info){
+           formData.value.active_goods_info.forEach((el: any) => {
+                formData.value.goods_ids.push(el.goods_id)
+                
+                formData.value.goods_list.push(el)
 
-        formData.value.goods_list.push(el)
-      })
-      setGoodsList()
-    }
-    loading.value = false
-  })
+            })
+            setGoodsList()
+        }
+        loading.value = false
+    })
 }
 const validFn = (row: any) => {
-  if (row.discount_rate.length == 0) {
-    return false
-  } else if (
-    isNaN(row.discount_rate) ||
-    !regExp.number.test(row.discount_rate)
-  ) {
-    return false
-  } else if (row.discount_rate <= 0) {
-    return false
-  } else if (row.discount_rate > 9.9) {
-    return false
-  } else if (row.reduce_money.length == 0) {
-    return false
-  } else if (isNaN(row.reduce_money) || !regExp.digit.test(row.reduce_money)) {
-    return false
-  } else if (row.reduce_money <= 0) {
-    return false
-  } else if (row.reduce_money >= parseFloat(row.goodsSku.price)) {
-    return false
-  } else if (row.specify_price.length == 0) {
-    return false
-  } else if (
-    isNaN(row.specify_price) ||
-    !regExp.digit.test(row.specify_price)
-  ) {
-    return false
-  } else if (row.specify_price <= 0) {
-    return false
-  } else if (row.specify_price >= parseFloat(row.goodsSku.price)) {
-    return false
-  } else {
-    return true
-  }
+    if (row.discount_rate.length == 0) {
+        return false
+    } else if (isNaN(row.discount_rate) || !regExp.number.test(row.discount_rate)) {
+        return false
+    } else if (row.discount_rate <= 0) {
+        return false
+    } else if (row.discount_rate > 9.9) {
+        return false
+    } else if (row.reduce_money.length == 0) {
+        return false
+    } else if (isNaN(row.reduce_money) || !regExp.digit.test(row.reduce_money)) {
+        return false
+    } else if (row.reduce_money <= 0) {
+        return false
+    } else if (row.reduce_money >= parseFloat(row.goodsSku.price)) {
+        return false
+    } else if (row.specify_price.length == 0) {
+        return false
+    } else if (isNaN(row.specify_price) || !regExp.digit.test(row.specify_price)) {
+        return false
+    } else if (row.specify_price <= 0) {
+        return false
+    } else if (row.specify_price >= parseFloat(row.goodsSku.price)) {
+        return false
+    } else {
+        return true
+    }
 }
 const onSave = (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  for (var i = 0; i < formData.value.goods_list.length; i++) {
-    let el = formData.value.goods_list[i]
-    if (el.goodsSku.sku_spec_format) {
-      if (!el.valid) {
-        let page = Math.ceil(
-          i + 1 <= goodsTable.limit ? 1 : (i + 1) / goodsTable.limit
-        )
-        goodsTable.list = goodsTable.data[page - 1]
-        goodsTable.page = page
-        break
-      } else {
-        el.sku_list = el.skuList
-      }
-    } else {
-      if (!validFn(el)) {
-        let page = Math.ceil(
-          i + 1 <= goodsTable.limit ? 1 : (i + 1) / goodsTable.limit
-        )
-        goodsTable.list = goodsTable.data[page - 1]
-        goodsTable.page = page
-        break
-      } else {
-        el.skuList[0].discount_rate = el.discount_rate
-        el.skuList[0].reduce_money = el.reduce_money
-        el.skuList[0].specify_price = el.specify_price
-        el.skuList[0].discount_price = el.discount_price
-        el.skuList[0].discount_type = el.discount_type
-        el.skuList[0].is_enabled = el.is_enabled
-        el.sku_list = el.skuList
-      }
+    if (loading.value || !formEl) return
+    for (var i = 0; i < formData.value.goods_list.length; i++) {
+        let el = formData.value.goods_list[i]
+        if (el.goodsSku.sku_spec_format) {
+            if (!el.valid) {
+                let page = Math.ceil(i + 1 <= goodsTable.limit ? 1 : (i + 1) / goodsTable.limit)
+                goodsTable.list = goodsTable.data[page - 1]
+                goodsTable.page = page
+                break;
+            } else {
+                el.sku_list = el.skuList
+            }
+        } else {
+            if (!validFn(el)) {
+                let page = Math.ceil(i + 1 <= goodsTable.limit ? 1 : (i + 1) / goodsTable.limit)
+                goodsTable.list = goodsTable.data[page - 1]
+                goodsTable.page = page
+                break;
+            } else {
+                el.skuList[0].discount_rate = el.discount_rate
+                el.skuList[0].reduce_money = el.reduce_money
+                el.skuList[0].specify_price = el.specify_price
+                el.skuList[0].discount_price = el.discount_price
+                el.skuList[0].discount_type = el.discount_type
+                el.skuList[0].is_enabled = el.is_enabled
+                el.sku_list = el.skuList
+            }
+        }
     }
-  }
-  nextTick(async () => {
-    await formEl.validate((valid) => {
-      if (valid) {
-        loading.value = true
-        formData.value.start_time = formData.value.discount_time[0]
-        formData.value.end_time = formData.value.discount_time[1]
-        formData.value.goods_data = JSON.stringify(formData.value.goods_list)
-        editActiveDiscount(formData.value)
-          .then((res) => {
-            loading.value = false
-            history.back()
-          })
-          .catch(() => {
-            loading.value = false
-          })
-      }
+    nextTick(async () => {
+        await formEl.validate((valid) => {
+            if (valid) {
+                loading.value = true
+                formData.value.start_time = formData.value.discount_time[0]
+                formData.value.end_time = formData.value.discount_time[1]
+                formData.value.goods_data = JSON.stringify(formData.value.goods_list)
+                editActiveDiscount(formData.value).then(res => {
+                    loading.value = false
+                    history.back()
+                }).catch(() => {
+                    loading.value = false
+                })
+            }
+        })
     })
-  })
+
 }
 
 interface goodsTableInterface {
-  page: number
-  limit: number
-  total: number
-  data: any
-  list: Array<any>
+    page: number,
+    limit: number,
+    total: number,
+    data: any,
+    list: Array<any>,
 }
 
 const goodsTable = reactive<goodsTableInterface>({
-  page: 1,
-  limit: 5,
-  total: 0,
-  data: [],
-  list: [],
+    page: 1,
+    limit: 5,
+    total: 0,
+    data: [],
+    list: []
 })
 
 const goodsSelect = (value: any) => {
-  if (formData.value.goods_list.length) {
-    let goods_list = deepClone(Object.values(value)).map(
-      (el: any, index: number) => {
-        if (!el.goodsSku.sku_spec_format) {
-          el.discount_type = 'discount'
-          el.discount_rate = ''
-          el.reduce_money = ''
-          el.specify_price = ''
-          el.is_enabled = 1
-        } else {
-          el.skuList = setSku(el.skuList)
-        }
-        el.valid = false
-        el.index = index
-        formData.value.goods_list.forEach((v: any) => {
-          if (v.goods_id == el.goods_id) {
-            el = Object.assign(el, v) //合并已填写数据及新选择的数据
+    if (formData.value.goods_list.length) {
+        let goods_list = deepClone(Object.values(value)).map((el: any, index: number) => {
+             if (!el.goodsSku.sku_spec_format) {
+                el.discount_type = 'discount'
+                el.discount_rate = ''
+                el.reduce_money = ''
+                el.specify_price = ''
+                el.is_enabled = 1
+            } else {
+                el.skuList = setSku(el.skuList)
+            }
+            el.valid = false
             el.index = index
-          }
+            formData.value.goods_list.forEach((v: any) => {
+                if (v.goods_id == el.goods_id){
+                  el = Object.assign(el, v)//合并已填写数据及新选择的数据  
+                   el.index = index
+                } 
+               
+            })
+            return el
         })
-        return el
-      }
-    )
-    formData.value.goods_list = goods_list
-  } else {
-    formData.value.goods_list = deepClone(Object.values(value)).map(
-      (el: any, index: number) => {
-        if (!el.goodsSku.sku_spec_format) {
-          el.discount_type = 'discount'
-          el.discount_rate = ''
-          el.reduce_money = ''
-          el.specify_price = ''
-          el.is_enabled = 1
-        } else {
-          el.skuList = setSku(el.skuList)
-        }
-        el.index = index
-        el.valid = false
-        return el
-      }
-    )
-  }
-  setGoodsList()
-  if (formRef.value) formRef.value.validateField('goods_list').catch(() => {})
-  // getGoodsSkuNoPageListFn(value.join(','))
+        formData.value.goods_list = goods_list
+    } else {
+        formData.value.goods_list = deepClone(Object.values(value)).map((el: any, index: number) => {
+            if (!el.goodsSku.sku_spec_format) {
+                el.discount_type = 'discount'
+                el.discount_rate = ''
+                el.reduce_money = ''
+                el.specify_price = ''
+                el.is_enabled = 1
+            } else {
+                el.skuList = setSku(el.skuList)
+            }
+            el.index = index
+            el.valid = false
+            return el
+        })
+    }
+    setGoodsList()
+    if(formRef.value) formRef.value.validateField('goods_list').catch(()=>{})
+    // getGoodsSkuNoPageListFn(value.join(','))
 }
 //设置sku初始数据
 const setSku = (sku: []) => {
-  return sku.map((el: any) => {
-    if (!el.discount_rate) {
-      el.discount_type = 'discount'
-      el.discount_rate = ''
-      el.reduce_money = ''
-      el.specify_price = ''
-      el.is_enabled = 1
-    }
-    return el
-  })
+    return sku.map((el: any) => {
+        if (!el.discount_rate) {
+            el.discount_type = 'discount'
+            el.discount_rate = ''
+            el.reduce_money = ''
+            el.specify_price = ''
+            el.is_enabled = 1
+        }
+        return el
+    })
 }
 //设置展示商品
 const setGoodsList = (page = 1) => {
-  if (formData.value.goods_list.length) {
-    goodsTable.data = splitArray(formData.value.goods_list, goodsTable.limit)
-    goodsTable.list = goodsTable.data[page - 1]
-    goodsTable.total = parseInt(formData.value.goods_list.length.toString())
-  } else {
-    goodsTable.data = []
-    goodsTable.list = []
-    goodsTable.total = 0
-    goodsTable.page = 1
-  }
+    if (formData.value.goods_list.length) {
+        goodsTable.data = splitArray(formData.value.goods_list, goodsTable.limit)
+        goodsTable.list = goodsTable.data[page - 1]
+        goodsTable.total = parseInt(formData.value.goods_list.length.toString())
+    } else {
+        goodsTable.data = []
+        goodsTable.list = []
+        goodsTable.total = 0
+        goodsTable.page = 1
+    }
 }
 //完整数据转分页数据
 const splitArray = (array: [], size: number) => {
-  var result = []
-  for (var i = 0; i < array.length; i += size) {
-    result.push(array.slice(i, i + size))
-  }
-  return result
+    var result = [];
+    for (var i = 0; i < array.length; i += size) {
+        result.push(array.slice(i, i + size));
+    }
+    return result;
 }
 //删除商品
 const deleteEvent = (index: number) => {
-  formData.value.goods_list.splice(index, 1)
-  formData.value.goods_list.forEach((el: any, index: number) => {
-    el.index = index
-  })
-  formData.value.goods_ids.splice(index, 1)
-  setGoodsList(goodsTable.page)
-  if (formRef.value) formRef.value.validateField('goods_list').catch(() => {})
+    formData.value.goods_list.splice(index, 1)
+    formData.value.goods_list.forEach((el: any, index: number) => {
+        el.index = index
+    })
+    formData.value.goods_ids.splice(index, 1)
+    setGoodsList(goodsTable.page)
+    if(formRef.value) formRef.value.validateField('goods_list').catch(()=>{})
 }
 //设置sku折扣
 const goodsSkuPopupRef = ref()
 const skuDiscountSettingsEvent = (row: any) => {
-  goodsSkuPopupRef.value?.show(row)
+    goodsSkuPopupRef.value?.show(row)
 }
 const skuSave = (row: any) => {
-  formData.value.goods_list.forEach((el: any) => {
-    if (el.goods_id == row.goods_id) el = deepClone(Object.assign(el, row))
-  })
+    formData.value.goods_list.forEach((el: any) => {
+        if (el.goods_id == row.goods_id) el = deepClone(Object.assign(el, row))
+    })
 }
 
 /*****批量设置 ****/
 interface batchOperationInterface {
-  discount_type: any
-  discountNumber: any
+    discount_type: any,
+    discountNumber: any,
 }
 
 const batchOperation = ref<batchOperationInterface>({
-  discount_type: 'discount',
-  discountNumber: '',
+    discount_type: 'discount',
+    discountNumber: ''
 })
 
 // 批量复选框
@@ -744,8 +520,8 @@ const isIndeterminate = ref(false)
 
 // 监听批量复选框事件
 const toggleChange = (value: any) => {
-  isIndeterminate.value = false
-  goods_listTableRef.value.toggleAllSelection()
+    isIndeterminate.value = false
+    goods_listTableRef.value.toggleAllSelection()
 }
 const goods_listTableRef = ref()
 
@@ -754,301 +530,235 @@ const multipleSelection: any = ref([])
 
 // 监听表格单行选中
 const handleSelectionChange = (val: []) => {
-  multipleSelection.value = val
+    multipleSelection.value = val
 
-  toggleCheckbox.value = false
-  if (
-    multipleSelection.value.length > 0 &&
-    multipleSelection.value.length < goodsTable.list.length
-  ) {
-    isIndeterminate.value = true
-  } else {
-    isIndeterminate.value = false
-  }
+    toggleCheckbox.value = false
+    if (multipleSelection.value.length > 0 && multipleSelection.value.length < goodsTable.list.length) {
+        isIndeterminate.value = true
+    } else {
+        isIndeterminate.value = false
+    }
 
-  if (multipleSelection.value.length == goodsTable.list.length) {
-    toggleCheckbox.value = true
-  }
+    if (multipleSelection.value.length == goodsTable.list.length) {
+        toggleCheckbox.value = true
+    }
 }
 const saveBatch = () => {
-  if (!multipleSelection.value.length) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('batchEmptySelectedGoodsTips')}`,
-    })
-    return
-  }
-  if (batchOperation.value.discount_type == 'discount') {
-    if (batchOperation.value.discountNumber.length == 0) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('discountsPlaceholder')}`,
-      })
-      return
-    } else if (
-      isNaN(batchOperation.value.discountNumber) ||
-      !regExp.number.test(batchOperation.value.discountNumber)
-    ) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('discountsTips')}`,
-      })
-      return
-    } else if (batchOperation.value.discountNumber <= 0) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('discountsTipsTwo')}`,
-      })
-      return
-    } else if (batchOperation.value.discountNumber > 9.9) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('discountsTipsThree')}`,
-      })
-      return
-    }
-  } else if (batchOperation.value.discount_type == 'reduce') {
-    if (batchOperation.value.discountNumber.length == 0) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('reduceMoneyPlaceholder')}`,
-      })
-      return
-    } else if (
-      isNaN(batchOperation.value.discountNumber) ||
-      !regExp.digit.test(batchOperation.value.discountNumber)
-    ) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('reduceMoneyTips')}`,
-      })
-      return
-    } else if (batchOperation.value.discountNumber <= 0) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('reduceMoneyTipsTwo')}`,
-      })
-      return
+    if (!multipleSelection.value.length) {
+        ElMessage({
+            type: 'warning',
+            message: `${t('batchEmptySelectedGoodsTips')}`
+        })
+        return
     }
-  } else {
-    if (batchOperation.value.discountNumber.length == 0) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('promotionalPlaceholder')}`,
-      })
-      return
-    } else if (
-      isNaN(batchOperation.value.discountNumber) ||
-      !regExp.digit.test(batchOperation.value.discountNumber)
-    ) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('promotionalTips')}`,
-      })
-      return
-    } else if (batchOperation.value.discountNumber <= 0) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('promotionalTipsTwo')}`,
-      })
-      return
+    if (batchOperation.value.discount_type == 'discount') {
+        if (batchOperation.value.discountNumber.length == 0) {
+            ElMessage({
+                type: 'warning',
+                message: `${t('discountsPlaceholder')}`
+            })
+            return
+        } else if (isNaN(batchOperation.value.discountNumber) || !regExp.number.test(batchOperation.value.discountNumber)) {
+            ElMessage({
+                type: 'warning',
+                message: `${t('discountsTips')}`
+            })
+            return
+        } else if (batchOperation.value.discountNumber <= 0) {
+            ElMessage({
+                type: 'warning',
+                message: `${t('discountsTipsTwo')}`
+            })
+            return
+        } else if (batchOperation.value.discountNumber > 9.9) {
+            ElMessage({
+                type: 'warning',
+                message: `${t('discountsTipsThree')}`
+            })
+            return
+        }
+    } else if (batchOperation.value.discount_type == 'reduce') {
+        if (batchOperation.value.discountNumber.length == 0) {
+            ElMessage({
+                type: 'warning',
+                message: `${t('reduceMoneyPlaceholder')}`
+            })
+            return
+        } else if (isNaN(batchOperation.value.discountNumber) || !regExp.digit.test(batchOperation.value.discountNumber)) {
+            ElMessage({
+                type: 'warning',
+                message: `${t('reduceMoneyTips')}`
+            })
+            return
+        } else if (batchOperation.value.discountNumber <= 0) {
+            ElMessage({
+                type: 'warning',
+                message: `${t('reduceMoneyTipsTwo')}`
+            })
+            return
+        }
+
+    } else {
+        if (batchOperation.value.discountNumber.length == 0) {
+            ElMessage({
+                type: 'warning',
+                message: `${t('promotionalPlaceholder')}`
+            })
+            return
+        } else if (isNaN(batchOperation.value.discountNumber) || !regExp.digit.test(batchOperation.value.discountNumber)) {
+            ElMessage({
+                type: 'warning',
+                message: `${t('promotionalTips')}`
+            })
+            return
+        } else if (batchOperation.value.discountNumber <= 0) {
+            ElMessage({
+                type: 'warning',
+                message: `${t('promotionalTipsTwo')}`
+            })
+            return
+        }
     }
-  }
-  formData.value.goods_list.forEach((el: any, index: number) => {
-    multipleSelection.value.forEach((v: any) => {
-      if (v.goods_id === el.goods_id) {
-        if (!el.goodsSku.sku_spec_format) {
-          if (batchOperation.value.discount_type == 'discount') {
-            //折扣
-            el.discount_rate = batchOperation.value.discountNumber + ''
-            //实际
-            el.specify_price = (
-              el.goodsSku.price *
-              (batchOperation.value.discountNumber / 10)
-            ).toFixed(2)
-            el.discount_price = (
-              el.goodsSku.price *
-              (batchOperation.value.discountNumber / 10)
-            ).toFixed(2)
-            //减价
-            el.reduce_money = (el.goodsSku.price - el.specify_price).toFixed(2)
-          } else if (batchOperation.value.discount_type == 'reduce') {
-            //减价
-            el.reduce_money = batchOperation.value.discountNumber + ''
-            el.specify_price = el.goodsSku.price - el.reduce_money.toFixed(2)
-            el.discount_price = (el.goodsSku.price - el.reduce_money).toFixed(2)
-            el.discount_rate = (
-              (el.specify_price / el.goodsSku.price) *
-              10
-            ).toFixed(1)
-          } else {
-            //实际
-            el.specify_price = batchOperation.value.discountNumber + ''
-            el.discount_price = batchOperation.value.discountNumber + ''
-            el.reduce_money = (el.goodsSku.price - el.specify_price).toFixed(2)
-            el.discount_rate = (
-              (el.specify_price / el.goodsSku.price) *
-              10
-            ).toFixed(1)
-          }
-          el.discount_type = batchOperation.value.discount_type + ''
-        } else {
-          el.skuList.forEach((sku: any) => {
-            if (sku.is_enabled === 1) {
-              if (batchOperation.value.discount_type == 'discount') {
-                //折扣
-                sku.discount_rate = batchOperation.value.discountNumber + ''
-                //实际
-                sku.specify_price = (
-                  sku.price *
-                  (batchOperation.value.discountNumber / 10)
-                ).toFixed(2)
-                sku.discount_price = (
-                  sku.price *
-                  (batchOperation.value.discountNumber / 10)
-                ).toFixed(2)
-                //减价
-                sku.reduce_money = (sku.price - sku.specify_price).toFixed(2)
-              } else if (batchOperation.value.discount_type == 'reduce') {
-                //减价
-                sku.reduce_money = batchOperation.value.discountNumber + ''
-                sku.specify_price = sku.price - sku.reduce_money.toFixed(2)
-                sku.discount_price = (sku.price - sku.reduce_money).toFixed(2)
-                sku.discount_rate = (
-                  (sku.specify_price / sku.price) *
-                  10
-                ).toFixed(1)
-              } else {
-                //实际
-                sku.specify_price = batchOperation.value.discountNumber + ''
-                sku.discount_price = batchOperation.value.discountNumber + ''
-                sku.reduce_money = (sku.price - sku.specify_price).toFixed(2)
-                sku.discount_rate = (
-                  (sku.specify_price / sku.price) *
-                  10
-                ).toFixed(1)
-              }
-              sku.discount_type = batchOperation.value.discount_type + ''
+    formData.value.goods_list.forEach((el: any, index: number) => {
+        multipleSelection.value.forEach((v: any) => {
+
+            if (v.goods_id === el.goods_id) {
+                if (!el.goodsSku.sku_spec_format) {
+                    if (batchOperation.value.discount_type == 'discount') {
+                        //折扣
+                        el.discount_rate = batchOperation.value.discountNumber + ''
+                        //实际
+                        el.specify_price = (el.goodsSku.price * (batchOperation.value.discountNumber / 10)).toFixed(2)
+                        el.discount_price = (el.goodsSku.price * (batchOperation.value.discountNumber / 10)).toFixed(2)
+                        //减价
+                        el.reduce_money = (el.goodsSku.price - el.specify_price).toFixed(2)
+                    } else if (batchOperation.value.discount_type == 'reduce') {//减价
+                        el.reduce_money = batchOperation.value.discountNumber + ''
+                        el.specify_price = el.goodsSku.price - el.reduce_money.toFixed(2)
+                        el.discount_price = (el.goodsSku.price - el.reduce_money).toFixed(2)
+                        el.discount_rate = (el.specify_price / el.goodsSku.price * 10).toFixed(1)
+
+                    } else {//实际
+                        el.specify_price = batchOperation.value.discountNumber + ''
+                        el.discount_price = batchOperation.value.discountNumber + ''
+                        el.reduce_money = (el.goodsSku.price - el.specify_price).toFixed(2)
+                        el.discount_rate = (el.specify_price / el.goodsSku.price * 10).toFixed(1)
+                    }
+                    el.discount_type = batchOperation.value.discount_type + ''
+                } else {
+                    el.skuList.forEach((sku: any) => {
+                        if(sku.is_enabled===1){
+                            if (batchOperation.value.discount_type == 'discount') {
+                            //折扣
+                            sku.discount_rate = batchOperation.value.discountNumber + ''
+                            //实际
+                            sku.specify_price = (sku.price * (batchOperation.value.discountNumber / 10)).toFixed(2)
+                            sku.discount_price = (sku.price * (batchOperation.value.discountNumber / 10)).toFixed(2)
+                            //减价
+                            sku.reduce_money = (sku.price - sku.specify_price).toFixed(2)
+                        } else if (batchOperation.value.discount_type == 'reduce') {//减价
+                            sku.reduce_money = batchOperation.value.discountNumber + ''
+                            sku.specify_price = sku.price - sku.reduce_money.toFixed(2)
+                            sku.discount_price = (sku.price - sku.reduce_money).toFixed(2)
+                            sku.discount_rate = (sku.specify_price / sku.price * 10).toFixed(1)
+
+                        } else {//实际
+                            sku.specify_price = batchOperation.value.discountNumber + ''
+                            sku.discount_price = batchOperation.value.discountNumber + ''
+                            sku.reduce_money = (sku.price - sku.specify_price).toFixed(2)
+                            sku.discount_rate = (sku.specify_price / sku.price * 10).toFixed(1)
+                        }
+                        sku.discount_type = batchOperation.value.discount_type + ''
+                        }
+                    })
+                    let discount_rate_list = el.skuList.filter((sku:any)=>sku.is_enabled===1).map((sku:any)=>Number(sku.discount_rate))
+                    let reduce_money_list = el.skuList.filter((sku:any)=>sku.is_enabled===1).map((sku:any)=>Number(sku.reduce_money))
+                    let specify_price_list = el.skuList.filter((sku:any)=>sku.is_enabled===1).map((sku:any)=>Number(sku.specify_price))
+                    el.max_discount_rate = Math.max(...discount_rate_list)
+                    el.min_discount_rate = Math.min(...discount_rate_list)
+                    el.max_reduce_money = Math.max(...reduce_money_list)
+                    el.min_reduce_money = Math.min(...reduce_money_list)
+                    el.max_specify_price = Math.max(...specify_price_list)
+                    el.min_specify_price = Math.min(...specify_price_list)
+                }
+                el.valid = true
             }
-          })
-          let discount_rate_list = el.skuList
-            .filter((sku: any) => sku.is_enabled === 1)
-            .map((sku: any) => Number(sku.discount_rate))
-          let reduce_money_list = el.skuList
-            .filter((sku: any) => sku.is_enabled === 1)
-            .map((sku: any) => Number(sku.reduce_money))
-          let specify_price_list = el.skuList
-            .filter((sku: any) => sku.is_enabled === 1)
-            .map((sku: any) => Number(sku.specify_price))
-          el.max_discount_rate = Math.max(...discount_rate_list)
-          el.min_discount_rate = Math.min(...discount_rate_list)
-          el.max_reduce_money = Math.max(...reduce_money_list)
-          el.min_reduce_money = Math.min(...reduce_money_list)
-          el.max_specify_price = Math.max(...specify_price_list)
-          el.min_specify_price = Math.min(...specify_price_list)
-        }
-        el.valid = true
-      }
+        })
     })
-  })
-  // isIndeterminate.value = false
-  // toggleCheckbox.value = false
-  // batchOperation.value.discountNumber = ''
-  // goods_listTableRef.value.clearSelection()
+    // isIndeterminate.value = false
+    // toggleCheckbox.value = false
+    // batchOperation.value.discountNumber = ''
+    // goods_listTableRef.value.clearSelection()
 }
 /**** 修改单行 *****/
 const inputBlur = (row: any, discount_type: string, index: number) => {
-  if (discount_type == 'discount') {
-    if (row.discount_rate.length) {
-      //实际
-      row.specify_price = (
-        row.goodsSku.price *
-        (row.discount_rate / 10)
-      ).toFixed(2)
-      row.discount_price = (
-        row.goodsSku.price *
-        (row.discount_rate / 10)
-      ).toFixed(2)
-      //减价
-      row.reduce_money = (row.goodsSku.price - row.specify_price).toFixed(2)
-      if (formRef.value) {
-        formRef.value
-          .validateField('goods_list.' + index + '.specify_price')
-          .catch(() => {})
-        formRef.value
-          .validateField('goods_list.' + index + '.reduce_money')
-          .catch(() => {})
-      }
-    }
-  } else if (discount_type == 'reduce') {
-    //减价
-    if (row.reduce_money.length) {
-      row.specify_price = (row.goodsSku.price - row.reduce_money).toFixed(2)
-      row.discount_price = (row.goodsSku.price - row.reduce_money).toFixed(2)
-      row.discount_rate = (
-        (row.specify_price / row.goodsSku.price) *
-        10
-      ).toFixed(1)
-      if (formRef.value) {
-        formRef.value
-          .validateField('goods_list.' + index + '.discount_rate')
-          .catch(() => {})
-        formRef.value
-          .validateField('goods_list.' + index + '.specify_price')
-          .catch(() => {})
-      }
-    }
-  } else {
-    //实际
-    if (row.specify_price.length) {
-      row.discount_price = row.specify_price + ''
-      row.reduce_money = (row.goodsSku.price - row.specify_price).toFixed(2)
-      row.discount_rate = (
-        (row.specify_price / row.goodsSku.price) *
-        10
-      ).toFixed(1)
-      if (formRef.value) {
-        formRef.value
-          .validateField('goods_list.' + index + '.discount_rate')
-          .catch(() => {})
-        formRef.value
-          .validateField('goods_list.' + index + '.reduce_money')
-          .catch(() => {})
-      }
+    if (discount_type == 'discount') {
+        if (row.discount_rate.length) {
+            //实际
+            row.specify_price = (row.goodsSku.price * (row.discount_rate / 10)).toFixed(2)
+            row.discount_price = (row.goodsSku.price * (row.discount_rate / 10)).toFixed(2)
+            //减价
+            row.reduce_money = (row.goodsSku.price - row.specify_price).toFixed(2)
+            if (formRef.value) {
+                formRef.value.validateField('goods_list.' + index + '.specify_price').catch(() => {})
+                formRef.value.validateField('goods_list.' + index + '.reduce_money').catch(() => {})
+            }
+        }
+    } else if (discount_type == 'reduce') {//减价
+        if (row.reduce_money.length) {
+            row.specify_price = (row.goodsSku.price - row.reduce_money).toFixed(2)
+            row.discount_price = (row.goodsSku.price - row.reduce_money).toFixed(2)
+            row.discount_rate = (row.specify_price / row.goodsSku.price * 10).toFixed(1)
+            if (formRef.value) {
+                formRef.value.validateField('goods_list.' + index + '.discount_rate').catch(() => {})
+                formRef.value.validateField('goods_list.' + index + '.specify_price').catch(() => {})
+            }
+        }
+
+    } else {//实际
+        if (row.specify_price.length) {
+            row.discount_price = row.specify_price + ''
+            row.reduce_money = (row.goodsSku.price - row.specify_price).toFixed(2)
+            row.discount_rate = (row.specify_price / row.goodsSku.price * 10).toFixed(1)
+            if (formRef.value) {
+                formRef.value.validateField('goods_list.' + index + '.discount_rate').catch(() => {})
+                formRef.value.validateField('goods_list.' + index + '.reduce_money').catch(() => {})
+            }
+        }
     }
-  }
-  row.discount_type = discount_type + ''
+    row.discount_type = discount_type + ''
+
 }
 const back = () => {
-  router.push('/shop/marketing/discount/list')
+    router.push('/shop/marketing/discount/list')
 }
 </script>
 
 <style lang="scss" scoped>
-input::-webkit-outer-spin-button,
-input::-webkit-inner-spin-button {
-  -webkit-appearance: none !important;
-  -moz-appearance: none !important;
-  -o-appearance: none !important;
-  -ms-appearance: none !important;
-  appearance: none !important;
-  margin: 0;
-}
+    input::-webkit-outer-spin-button,
+    input::-webkit-inner-spin-button {
+        -webkit-appearance: none !important;
+        -moz-appearance: none !important;
+        -o-appearance: none !important;
+        -ms-appearance: none !important;
+        appearance: none !important;
+        margin: 0;
+    }
 
-input[type='number'] {
-  -webkit-appearance: textfield;
-  -moz-appearance: textfield;
-  -o-appearance: textfield;
-  -ms-appearance: textfield;
-  appearance: textfield;
-}
+    input[type="number"] {
+        -webkit-appearance: textfield;
+        -moz-appearance: textfield;
+        -o-appearance: textfield;
+        -ms-appearance: textfield;
+        appearance: textfield;
+    }
 
-.sku-form-item-wrap :deep(.el-form-item__content) {
-  margin-left: 0 !important;
-}
+    .sku-form-item-wrap :deep(.el-form-item__content) {
+        margin-left: 0 !important;
+    }
 
-.sku_list :deep(.cell) {
-  // min-height: 60px !important;
-  overflow: initial !important;
-}
+    .sku_list :deep(.cell) {
+        // min-height: 60px !important;
+        overflow: initial !important;
+    }
 </style>
diff --git a/admin/src/addon/shop/views/marketing/discount/list.vue b/admin/src/addon/shop/views/marketing/discount/list.vue
index 300ce958..eb557a4f 100644
--- a/admin/src/addon/shop/views/marketing/discount/list.vue
+++ b/admin/src/addon/shop/views/marketing/discount/list.vue
@@ -1,174 +1,82 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-        <el-button type="primary" @click="handleChange">
-          {{ t('addDiscount') }}
-        </el-button>
-      </div>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
 
-      <!-- 搜索 -->
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="tableData.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('name')" prop="active_name">
-            <el-input
-              v-model.trim="tableData.searchParam.active_name"
-              :placeholder="t('namePlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('status')" prop="active_status">
-            <el-select
-              v-model="tableData.searchParam.active_status"
-              clearable
-              :placeholder="t('statusPlaceholder')"
-              class="input-item"
-            >
-              <el-option
-                v-for="(item, key) in activeStatusOption"
-                :key="key"
-                :label="item"
-                :value="key"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="loadDiscountList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+                <el-button type="primary" @click="handleChange">
+                    {{ t('addDiscount') }}
+                </el-button>
+            </div>
 
-      <!-- 列表 -->
-      <div>
-        <el-table
-          :data="tableData.data"
-          size="large"
-          v-loading="tableData.loading"
-        >
-          <template #empty>
-            <span>{{ !tableData.loading ? t('emptyData') : '' }}</span>
-          </template>
+            <!-- 搜索 -->
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="tableData.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('name')" prop="active_name">
+                        <el-input v-model.trim="tableData.searchParam.active_name" :placeholder="t('namePlaceholder')" />
+                    </el-form-item>
+                    <el-form-item :label="t('status')" prop='active_status'>
+                        <el-select v-model="tableData.searchParam.active_status" clearable :placeholder="t('statusPlaceholder')" class="input-item">
+                            <el-option v-for="(item, key) in activeStatusOption" :key="key" :label="item" :value="key"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="loadDiscountList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
 
-          <el-table-column
-            prop="active_name"
-            :label="t('name')"
-            min-width="130"
-          />
-          <el-table-column
-            prop="active_desc"
-            :label="t('title')"
-            min-width="130"
-          />
-          <el-table-column
-            prop="active_status_name"
-            :label="t('status')"
-            min-width="130"
-          />
-          <el-table-column
-            prop="active_order_money"
-            :label="t('paymentAmount')"
-            min-width="130"
-          />
-          <el-table-column
-            prop="active_order_num"
-            :label="t('orderCount')"
-            min-width="130"
-          />
-          <el-table-column
-            prop="active_member_num"
-            :label="t('memberCount')"
-            min-width="130"
-          />
-          <el-table-column :label="t('discountTime')" min-width="150">
-            <template #default="{ row }">
-              <div>
-                <p>开始：{{ row.start_time }}</p>
-                <p>结束：{{ row.end_time }}</p>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            :label="t('operation')"
-            fixed="right"
-            align="right"
-            min-width="160"
-          >
-            <template #default="{ row }">
-              <el-button
-                v-if="
-                  row.active_status == 'not_active' ||
-                  row.active_status == 'active'
-                "
-                type="primary"
-                link
-                @click="editEvent(row.active_id)"
-                >{{ t('edit') }}</el-button
-              >
-              <el-button
-                type="primary"
-                link
-                @click="detailEvent(row.active_id)"
-                >{{ t('detail') }}</el-button
-              >
-              <el-button
-                v-if="row.active_status == 'active'"
-                type="primary"
-                link
-                @click="closeEvent(row.active_id)"
-                >{{ t('close') }}</el-button
-              >
-              <el-button
-                v-if="row.active_status != 'active'"
-                type="primary"
-                link
-                @click="deleteEvent(row.active_id)"
-                >{{ t('delete') }}</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
+            <!-- 列表 -->
+            <div>
+                <el-table :data="tableData.data" size="large" v-loading="tableData.loading">
+                    <template #empty>
+                        <span>{{ !tableData.loading ? t('emptyData') : '' }}</span>
+                    </template>
 
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="tableData.page"
-            v-model:page-size="tableData.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="tableData.total"
-            @size-change="loadDiscountList()"
-            @current-change="loadDiscountList"
-          />
-        </div>
-      </div>
-    </el-card>
-    <discount-detail ref="discountDetailDialog"></discount-detail>
-  </div>
+                    <el-table-column prop="active_name" :label="t('name')" min-width="130" />
+                    <el-table-column prop="active_desc" :label="t('title')" min-width="130" />
+                    <el-table-column prop="active_status_name" :label="t('status')" min-width="130" />
+                    <el-table-column prop="active_order_money" :label="t('paymentAmount')" min-width="130" />
+                    <el-table-column prop="active_order_num" :label="t('orderCount')" min-width="130" />
+                    <el-table-column prop="active_member_num" :label="t('memberCount')" min-width="130" />
+                    <el-table-column :label="t('discountTime')"  min-width="150">
+                        <template #default="{ row }">
+                            <div>
+                                <p>开始：{{ row.start_time }}</p>
+                                <p>结束：{{ row.end_time }}</p>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('operation')" fixed="right" align="right" min-width="160">
+                       <template #default="{ row }">
+                            <el-button v-if="row.active_status=='not_active'||row.active_status=='active'" type="primary" link @click="editEvent(row.active_id)">{{ t('edit') }}</el-button>
+                            <el-button type="primary" link @click="detailEvent(row.active_id)">{{ t('detail') }}</el-button>
+                            <el-button v-if="row.active_status=='active'" type="primary" link @click="closeEvent(row.active_id)">{{ t('close') }}</el-button>
+                            <el-button v-if="row.active_status!='active'" type="primary" link @click="deleteEvent(row.active_id)">{{ t('delete') }}</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="tableData.page" v-model:page-size="tableData.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="tableData.total"
+                        @size-change="loadDiscountList()" @current-change="loadDiscountList" />
+                </div>
+            </div>
+        </el-card>
+        <discount-detail ref="discountDetailDialog"></discount-detail>
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { ElMessageBox, FormInstance } from 'element-plus'
-import {
-  getActiveDiscountPageList,
-  getActiveDiscountStatusList,
-  closeActiveDiscount,
-  deleteActiveDiscount,
-} from '@/addon/shop/api/marketing'
+import { getActiveDiscountPageList,getActiveDiscountStatusList,closeActiveDiscount,deleteActiveDiscount } from "@/addon/shop/api/marketing";
 import { t } from '@/lang'
 import discountDetail from '@/addon/shop/views/marketing/discount/components/discount-detail.vue'
-import { setTablePageStorage, getTablePageStorage } from '@/utils/common'
+import { setTablePageStorage,getTablePageStorage } from "@/utils/common";
 
 const router = useRouter()
 const route = useRoute()
@@ -176,96 +84,92 @@ const pageName = route.meta.title
 
 // 表单内容
 const tableData = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: false,
-  data: [],
-  searchParam: {
-    active_name: '',
-    active_status: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: false,
+    data: [],
+    searchParam: {
+        active_name: '',
+        active_status:''
+    }
 })
 const searchFormRef = ref<FormInstance>()
 const loadDiscountList = (page: number = 1) => {
-  tableData.loading = true
-  tableData.page = page
+    tableData.loading = true
+    tableData.page = page
 
-  getActiveDiscountPageList({
-    page: tableData.page,
-    limit: tableData.limit,
-    ...tableData.searchParam,
-  })
-    .then((res) => {
-      tableData.loading = false
-      tableData.data = res.data.data
-      tableData.total = res.data.total
-      setTablePageStorage(
-        tableData.page,
-        tableData.limit,
-        tableData.searchParam
-      )
-    })
-    .catch(() => {
-      tableData.loading = false
+    getActiveDiscountPageList({
+        page: tableData.page,
+        limit: tableData.limit,
+        ...tableData.searchParam
+    }).then(res => {
+        tableData.loading = false
+        tableData.data = res.data.data
+        tableData.total = res.data.total
+        setTablePageStorage(tableData.page, tableData.limit, tableData.searchParam);
+    }).catch(() => {
+        tableData.loading = false
     })
 }
-loadDiscountList(getTablePageStorage(tableData.searchParam).page)
+loadDiscountList(getTablePageStorage(tableData.searchParam).page);
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadDiscountList()
+    if (!formEl) return
+    formEl.resetFields()
+    loadDiscountList()
 }
 //获取状态列表
 const activeStatusOption = ref({})
-const getActiveDiscountStatusListFn = () => {
-  getActiveDiscountStatusList().then((res) => {
-    activeStatusOption.value = res.data
-  })
+const getActiveDiscountStatusListFn=()=>{
+    getActiveDiscountStatusList().then(res=>{
+        activeStatusOption.value = res.data
+    })
 }
 getActiveDiscountStatusListFn()
 // 添加折扣券
 const handleChange = () => {
-  router.push('/shop/marketing/discount/add')
+    router.push('/shop/marketing/discount/add')
 }
 //详情
 const discountDetailDialog: Record<string, any> | null = ref(null)
-const detailEvent = (id: number) => {
-  let data = { id: id }
-  discountDetailDialog.value.setFormData(data)
-  discountDetailDialog.value.showDialog = true
+const detailEvent=(id:number)=>{
+    let data = {id: id};
+    discountDetailDialog.value.setFormData(data);
+    discountDetailDialog.value.showDialog = true;
 }
 //编辑折扣券
-const editEvent = (id: number) => {
-  router.push({ path: '/shop/marketing/discount/edit', query: { id } })
+const editEvent = (id:number)=>{
+    router.push({path:'/shop/marketing/discount/edit',query:{id}})
 }
 //关闭
-const closeEvent = (id: number) => {
-  ElMessageBox.confirm(t('closeTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    closeActiveDiscount(id)
-      .then(() => {
-        loadDiscountList()
-      })
-      .catch(() => {})
-  })
+const closeEvent = (id:number)=>{
+    ElMessageBox.confirm(t('closeTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        closeActiveDiscount(id).then(() => {
+            loadDiscountList()
+        }).catch(() => {
+        })
+    })
 }
 //删除
-const deleteEvent = (id: number) => {
-  ElMessageBox.confirm(t('deleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    deleteActiveDiscount(id)
-      .then(() => {
-        loadDiscountList()
-      })
-      .catch(() => {})
-  })
+const deleteEvent = (id:number)=>{
+    ElMessageBox.confirm(t('deleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        deleteActiveDiscount(id).then(() => {
+            loadDiscountList()
+        }).catch(() => {
+        })
+    })
 }
 </script>
 
diff --git a/admin/src/addon/shop/views/marketing/exchange/components/goods-select-popup.vue b/admin/src/addon/shop/views/marketing/exchange/components/goods-select-popup.vue
index c321215f..78224026 100644
--- a/admin/src/addon/shop/views/marketing/exchange/components/goods-select-popup.vue
+++ b/admin/src/addon/shop/views/marketing/exchange/components/goods-select-popup.vue
@@ -1,235 +1,170 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="t('goodsSelectPopupSelectGoodsDialog')"
-    width="60%"
-    :destroy-on-close="true"
-  >
-    <el-form :inline="true" :model="tableData.searchParam" ref="searchFormRef">
-      <el-form-item :label="t('goodsSelectPopupGoodsName')" prop="active_name">
-        <el-input
-          v-model.trim="tableData.searchParam.name"
-          :placeholder="t('goodsSelectPopupGoodsNamePlaceholder')"
-        />
-      </el-form-item>
-      <el-form-item :label="t('status')" prop="status">
-        <el-select
-          v-model="tableData.searchParam.status"
-          clearable
-          :placeholder="t('goodsSelectPopupGoodsStatusPlaceholder')"
-          class="input-item"
-        >
-          <el-option
-            v-for="(item, key) in statusOption"
-            :key="key"
-            :label="item"
-            :value="key"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" @click="loadExchangeGoodsList()">{{
-          t('search')
-        }}</el-button>
-        <el-button @click="resetForm(searchFormRef)">{{
-          t('reset')
-        }}</el-button>
-      </el-form-item>
-    </el-form>
-    <!-- 列表 -->
-    <div class="mt-[10px]">
-      <el-table
-        :data="tableData.data"
-        ref="tableRef"
-        row-key="id"
-        size="large"
-        v-loading="tableData.loading"
-        @selection-change="handleSelectionChange"
-      >
-        <template #empty>
-          <span>{{ !tableData.loading ? t('emptyData') : '' }}</span>
-        </template>
-        <el-table-column type="selection" width="55" reserve-selection />
-        <el-table-column
-          :label="t('goodsSelectPopupGoodsInfo')"
-          min-width="130"
-        >
-          <template #default="{ row }">
-            <div class="flex items-center cursor-pointer">
-              <div
-                class="min-w-[60px] h-[60px] flex items-center justify-center"
-              >
-                <el-image
-                  v-if="row.image"
-                  class="w-[60px] h-[60px]"
-                  :src="img(row.image)"
-                  fit="contain"
-                >
-                  <template #error>
-                    <div class="image-slot">
-                      <img
-                        class="w-[60px] h-[60px]"
-                        src="@/addon/shop/assets/goods_default.png"
-                      />
-                    </div>
-                  </template>
-                </el-image>
-                <img
-                  v-else
-                  class="w-[70px] h-[60px]"
-                  src="@/addon/shop/assets/goods_default.png"
-                  fit="contain"
-                />
-              </div>
-              <div class="ml-2">
-                <span :title="row.names" class="multi-hidden">{{
-                  row.names
-                }}</span>
-              </div>
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column :label="t('goodsSelectPopupPrice')" min-width="130">
-          <template #default="{ row }">
-            <p v-if="row.point">
-              {{ row.point }}{{ t('goodsSelectPopupGoodsPointUnit') }}
-            </p>
-            <p v-if="row.price">
-              {{ row.price }}{{ t('goodsSelectPopupGoodsPriceUnit') }}
-            </p>
-          </template>
-        </el-table-column>
-        <el-table-column
-          :label="t('goodsSelectPopupStock')"
-          min-width="130"
-          align="right"
-        >
-          <template #default="{ row }">
-            <span>{{ row.stock }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="mt-[16px] flex justify-end">
-        <el-pagination
-          v-model:current-page="tableData.page"
-          v-model:page-size="tableData.limit"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="tableData.total"
-          @size-change="loadExchangeGoodsList()"
-          @current-change="loadExchangeGoodsList"
-        />
-      </div>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button type="primary" @click="save">{{ t('confirm') }}</el-button>
-      </span>
-    </template>
-  </el-dialog>
+	<el-dialog v-model="showDialog" :title="t('goodsSelectPopupSelectGoodsDialog')" width="60%" :destroy-on-close="true">
+		<el-form :inline="true" :model="tableData.searchParam" ref="searchFormRef">
+			<el-form-item :label="t('goodsSelectPopupGoodsName')" prop="active_name">
+				<el-input v-model.trim="tableData.searchParam.name" :placeholder="t('goodsSelectPopupGoodsNamePlaceholder')" />
+			</el-form-item>
+			<el-form-item :label="t('status')" prop='status'>
+				<el-select v-model="tableData.searchParam.status" clearable :placeholder="t('goodsSelectPopupGoodsStatusPlaceholder')" class="input-item">
+					<el-option v-for="(item, key) in statusOption" :key="key" :label="item" :value="key"></el-option>
+				</el-select>
+			</el-form-item>
+			<el-form-item>
+				<el-button type="primary" @click="loadExchangeGoodsList()">{{ t('search') }}</el-button>
+				<el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+			</el-form-item>
+		</el-form>
+		<!-- 列表 -->
+		<div class="mt-[10px]">
+			<el-table :data="tableData.data" ref="tableRef" row-key="id" size="large" v-loading="tableData.loading" @selection-change="handleSelectionChange">
+				<template #empty>
+					<span>{{ !tableData.loading ? t('emptyData') : '' }}</span>
+				</template>
+				<el-table-column type="selection" width="55" reserve-selection />
+				<el-table-column :label="t('goodsSelectPopupGoodsInfo')" min-width="130">
+					<template #default="{ row }">
+						<div class="flex items-center cursor-pointer">
+							<div class="min-w-[60px] h-[60px] flex items-center justify-center">
+								<el-image v-if="row.image" class="w-[60px] h-[60px]" :src="img(row.image)" fit="contain">
+									<template #error>
+										<div class="image-slot">
+											<img class="w-[60px] h-[60px]" src="@/addon/shop/assets/goods_default.png" />
+										</div>
+									</template>
+								</el-image>
+								<img v-else class="w-[70px] h-[60px]" src="@/addon/shop/assets/goods_default.png" fit="contain" />
+							</div>
+							<div class="ml-2">
+								<span :title="row.names" class="multi-hidden">{{ row.names }}</span>
+							</div>
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column :label="t('goodsSelectPopupPrice')" min-width="130">
+					<template #default="{ row }">
+						<p v-if="row.point">{{ row.point }}{{ t('goodsSelectPopupGoodsPointUnit') }}</p>
+						<p v-if="row.price">{{ row.price }}{{ t('goodsSelectPopupGoodsPriceUnit') }}</p>
+					</template>
+				</el-table-column>
+				<el-table-column :label="t('goodsSelectPopupStock')" min-width="130" align="right">
+					<template #default="{ row }">
+						<span>{{ row.stock }}</span>
+					</template>
+				</el-table-column>
+			</el-table>
+			<div class="mt-[16px] flex justify-end">
+				<el-pagination v-model:current-page="tableData.page" v-model:page-size="tableData.limit"
+	               layout="total, sizes, prev, pager, next, jumper" :total="tableData.total"
+	               @size-change="loadExchangeGoodsList()" @current-change="loadExchangeGoodsList" />
+			</div>
+		</div>
+		<template #footer>
+          <span class="dialog-footer">
+            <el-button @click="showDialog = false">{{ t("cancel") }}</el-button>
+            <el-button type="primary" @click="save">{{ t("confirm") }}</el-button>
+          </span>
+		</template>
+	</el-dialog>
 </template>
 
 <script lang="ts" setup>
-import { t } from '@/lang'
-import { img } from '@/utils/common'
-import {
-  getActiveExchangePageList,
-  getActiveExchangeStatus,
-} from '@/addon/shop/api/marketing'
-import { ref, nextTick, reactive } from 'vue'
-import { FormInstance, ElMessage } from 'element-plus'
+    import {t} from "@/lang";
+    import {img} from "@/utils/common";
+    import {getActiveExchangePageList, getActiveExchangeStatus} from "@/addon/shop/api/marketing";
+    import {ref, nextTick, reactive} from "vue";
+    import {FormInstance, ElMessage} from 'element-plus'
 
-const showDialog = ref(false)
-const tableRef = ref()
-// 表单内容
-const tableData = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: false,
-  data: [],
-  searchParam: {
-    name: '',
-    status: '',
-    create_time: [],
-  },
-})
-const prop = defineProps({
-  max: {
-    type: Number,
-    default: 0,
-  },
-  min: {
-    type: Number,
-    default: 0,
-  },
-})
-const searchFormRef = ref<FormInstance>()
-const loadExchangeGoodsList = (page: number = 1) => {
-  tableData.loading = true
-  tableData.page = page
+    const showDialog = ref(false);
+    const tableRef = ref();
+    // 表单内容
+    const tableData = reactive({
+        page: 1,
+        limit: 10,
+        total: 0,
+        loading: false,
+        data: [],
+        searchParam: {
+            name: '',
+            status: '',
+            create_time: []
+        }
+    })
+    const prop = defineProps({
+        max: {
+            type: Number,
+            default: 0
+        },
+        min: {
+            type: Number,
+            default: 0
+        }
+    });
+    const searchFormRef = ref<FormInstance>()
+    const loadExchangeGoodsList = (page: number = 1) => {
+        tableData.loading = true
+        tableData.page = page
+
+        getActiveExchangePageList({
+            page: tableData.page,
+            limit: tableData.limit,
+            ...tableData.searchParam
+        }).then((res: any) => {
+            tableData.loading = false
+            tableData.data = res.data.data
+            tableData.total = res.data.total
+            if (ids.value.length) {
+                nextTick(() => {
+                    tableData.data.forEach((el: any) => {
+                        if (ids.value.includes(el.id)) {
 
-  getActiveExchangePageList({
-    page: tableData.page,
-    limit: tableData.limit,
-    ...tableData.searchParam,
-  })
-    .then((res: any) => {
-      tableData.loading = false
-      tableData.data = res.data.data
-      tableData.total = res.data.total
-      if (ids.value.length) {
-        nextTick(() => {
-          tableData.data.forEach((el: any) => {
-            if (ids.value.includes(el.id)) {
-              tableRef.value.toggleRowSelection(el, true)
+                            tableRef.value.toggleRowSelection(el, true);
+                        }
+                    })
+                })
             }
-          })
+
+        }).catch(() => {
+            tableData.loading = false
         })
-      }
-    })
-    .catch(() => {
-      tableData.loading = false
-    })
-}
-//获取状态列表
-const statusOption = ref([])
-const getActiveExchangeStatusFn = () => {
-  getActiveExchangeStatus().then((res) => {
-    statusOption.value = res.data
-  })
-}
-getActiveExchangeStatusFn()
-const emit = defineEmits(['select'])
-const ids = ref<Array<any>>([])
-const show = (data: any) => {
-  ids.value = data
-  showDialog.value = true
-  loadExchangeGoodsList()
-}
-// 选中数据
-const multipleSelection: any = ref([])
+    }
+    //获取状态列表
+    const statusOption = ref([])
+    const getActiveExchangeStatusFn = () => {
+        getActiveExchangeStatus().then(res => {
+            statusOption.value = res.data
+        })
+    }
+    getActiveExchangeStatusFn()
+    const emit = defineEmits(["select"]);
+    const ids = ref<Array<any>>([])
+    const show = (data: any) => {
+        ids.value = data
+        showDialog.value = true;
+        loadExchangeGoodsList()
+    };
+    // 选中数据
+    const multipleSelection: any = ref([]);
 
-// 监听表格单行选中
-const handleSelectionChange = (val: []) => {
-  multipleSelection.value = val
-}
+    // 监听表格单行选中
+    const handleSelectionChange = (val: []) => {
+        multipleSelection.value = val;
+    };
 
-const save = () => {
-  if (prop.min && multipleSelection.value.length < prop.min) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('goodsSelectPopupGoodsMinTip')}${prop.min}${t('goodsSelectPopupPiece')}`,
-    })
-    return
-  }
+    const save = () => {
+        if (prop.min && multipleSelection.value.length < prop.min) {
+            ElMessage({
+                type: 'warning',
+                message: `${t('goodsSelectPopupGoodsMinTip')}${prop.min}${t('goodsSelectPopupPiece')}`,
+            });
+            return;
+        }
 
-  emit('select', multipleSelection.value)
-  showDialog.value = false
-  if (tableRef.value) tableRef.value.clearSelection()
-}
-defineExpose({
-  show,
-})
+        emit("select", multipleSelection.value);
+        showDialog.value = false;
+        if (tableRef.value) tableRef.value.clearSelection();
+    };
+    defineExpose({
+        show
+    });
 </script>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/admin/src/addon/shop/views/marketing/exchange/components/goods-sku-select.vue b/admin/src/addon/shop/views/marketing/exchange/components/goods-sku-select.vue
index 2e4c27ab..913e30b7 100644
--- a/admin/src/addon/shop/views/marketing/exchange/components/goods-sku-select.vue
+++ b/admin/src/addon/shop/views/marketing/exchange/components/goods-sku-select.vue
@@ -1,138 +1,101 @@
 <template>
-  <div>
-    <el-dialog
-      v-model="showDialog"
-      :title="t('goodsSkuTitle')"
-      width="60%"
-      :destroy-on-close="true"
-    >
-      <el-table
-        class="!max-w-[100%]"
-        :data="tableData"
-        size="large"
-        ref="tableRef"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55" />
-        <el-table-column
-          :label="t('goodsSelectPopupGoodsInfo')"
-          min-width="300"
-        >
-          <template #default="{ row }">
-            <div class="flex items-center cursor-pointer">
-              <div
-                class="min-w-[60px] h-[60px] flex items-center justify-center"
-              >
-                <el-image
-                  v-if="row.sku_image"
-                  class="w-[60px] h-[60px]"
-                  :src="img(row.sku_image)"
-                  fit="contain"
-                >
-                  <template #error>
-                    <div class="image-slot">
-                      <img
-                        class="w-[60px] h-[60px]"
-                        src="@/addon/shop/assets/goods_default.png"
-                      />
-                    </div>
-                  </template>
-                </el-image>
-                <img
-                  v-else
-                  class="w-[70px] h-[60px]"
-                  src="@/addon/shop/assets/goods_default.png"
-                  fit="contain"
-                />
-              </div>
-              <div class="ml-2">
-                <span :title="row.sku_name" class="multi-hidden">{{
-                  row.sku_name || row.goods?.goods_name
-                }}</span>
-              </div>
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="goods_price"
-          :label="t('price')"
-          min-width="170"
-        />
-        <el-table-column
-          prop="goods_stock"
-          :label="t('goodsStock')"
-          min-width="170"
-        />
-      </el-table>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-          <el-button type="primary" @click="save">{{ t('confirm') }}</el-button>
-        </span>
-      </template>
-    </el-dialog>
-  </div>
+	<div>
+		<el-dialog v-model="showDialog" :title="t('goodsSkuTitle')" width="60%" :destroy-on-close="true">
+			<el-table class="!max-w-[100%]" :data="tableData" size="large" ref="tableRef" @selection-change="handleSelectionChange">
+				<el-table-column type="selection" width="55" />
+				<el-table-column :label="t('goodsSelectPopupGoodsInfo')" min-width="300">
+					<template #default="{ row }">
+						<div class="flex items-center cursor-pointer">
+							<div class="min-w-[60px] h-[60px] flex items-center justify-center">
+								<el-image v-if="row.sku_image" class="w-[60px] h-[60px]" :src="img(row.sku_image)" fit="contain">
+									<template #error>
+										<div class="image-slot">
+											<img class="w-[60px] h-[60px]" src="@/addon/shop/assets/goods_default.png" />
+										</div>
+									</template>
+								</el-image>
+								<img v-else class="w-[70px] h-[60px]" src="@/addon/shop/assets/goods_default.png" fit="contain" />
+							</div>
+							<div class="ml-2">
+								<span :title="row.sku_name" class="multi-hidden">{{ row.sku_name||row.goods?.goods_name }}</span>
+							</div>
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column prop="goods_price" :label="t('price')" min-width="170" />
+				<el-table-column prop="goods_stock" :label="t('goodsStock')" min-width="170" />
+			</el-table>
+			<template #footer>
+		        <span class="dialog-footer">
+		          <el-button @click="showDialog = false">{{ t("cancel") }}</el-button>
+		          <el-button type="primary" @click="save">{{ t("confirm") }}</el-button>
+		        </span>
+			</template>
+		</el-dialog>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { t } from '@/lang'
-import { img } from '@/utils/common'
-import { getGoodsSkuList } from '@/addon/shop/api/goods'
-import { ref, nextTick } from 'vue'
+    import {t} from "@/lang";
+    import {img} from "@/utils/common";
+    import {getGoodsSkuList} from '@/addon/shop/api/goods'
+    import {ref, nextTick} from "vue";
 
-const showDialog = ref(false)
-const loading = ref(false)
-const tableRef = ref()
-const tableData = ref()
-const prop = defineProps({
-  id: {
-    type: String,
-    default: '',
-  },
-})
-const emit = defineEmits(['skuSelect'])
-const show = (data: any) => {
-  showDialog.value = true
-  loading.value = true
-  let sku_ids = data.map((el: any) => el.sku_id)
-  getGoodsSkuList({
-    goods_id: prop.id,
-  }).then((res) => {
-    tableData.value = res.data.map((el: any) => {
-      el.goods_stock = el.stock + ''
-      el.goods_price = el.price + ''
-      el.limit_num = ''
-      el.stock = ''
-      el.point = ''
-      el.price = ''
-      return el
-    })
-    nextTick(() => {
-      res.data.forEach((el: any) => {
-        tableRef.value?.toggleRowSelection(el, false)
-        if (sku_ids.includes(el.sku_id))
-          tableRef.value.toggleRowSelection(el, true)
-      })
-      loading.value = false
-    })
-  })
-}
-// 选中数据
-const multipleSelection: any = ref([])
+    const showDialog = ref(false);
+    const loading = ref(false)
+    const tableRef = ref();
+    const tableData = ref();
+    const prop = defineProps({
+        id: {
+            type: String,
+            default: '',
+        },
+    });
+    const emit = defineEmits(["skuSelect"]);
+    const show = (data: any) => {
+        showDialog.value = true;
+        loading.value = true
+        let sku_ids = data.map((el: any) => el.sku_id);
+        getGoodsSkuList({
+            goods_id: prop.id
+        }).then(res => {
+            tableData.value = res.data.map((el: any) => {
+                el.goods_stock = el.stock + ''
+                el.goods_price = el.price + ''
+                el.limit_num = ''
+                el.stock = ''
+                el.point = ''
+                el.price = ''
+                return el
+            })
+            nextTick(() => {
+                res.data.forEach((el: any) => {
+                    tableRef.value?.toggleRowSelection(el, false);
+                    if (sku_ids.includes(el.sku_id))
+                        tableRef.value.toggleRowSelection(el, true);
+                });
+                loading.value = false
+            })
 
-// 监听表格单行选中
-const handleSelectionChange = (val: []) => {
-  multipleSelection.value = val
-}
+        })
 
-const save = () => {
-  emit('skuSelect', multipleSelection.value)
-  showDialog.value = false
-  if (tableRef.value) tableRef.value.clearSelection()
-}
-defineExpose({
-  show,
-})
+    };
+    // 选中数据
+    const multipleSelection: any = ref([]);
+
+    // 监听表格单行选中
+    const handleSelectionChange = (val: []) => {
+        multipleSelection.value = val;
+    };
+
+    const save = () => {
+        emit("skuSelect", multipleSelection.value);
+        showDialog.value = false;
+        if (tableRef.value) tableRef.value.clearSelection();
+    };
+    defineExpose({
+        show
+    });
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/addon/shop/views/marketing/exchange/goods_add.vue b/admin/src/addon/shop/views/marketing/exchange/goods_add.vue
index 7d55d558..90099e1a 100644
--- a/admin/src/addon/shop/views/marketing/exchange/goods_add.vue
+++ b/admin/src/addon/shop/views/marketing/exchange/goods_add.vue
@@ -1,798 +1,466 @@
 <template>
-  <div class="main-container" v-loading="loading">
-    <el-card class="card !border-none" shadow="never">
-      <el-page-header :content="pageName" :icon="ArrowLeft" @back="back()" />
-    </el-card>
-
-    <!-- 表单 -->
-    <el-form
-      class="page-form mt-[15px]"
-      :model="formData"
-      label-width="120px"
-      ref="formRef"
-      :rules="formRules"
-    >
-      <!-- 基础设置 -->
-      <el-card class="box-card !border-none" shadow="never">
-        <h3 class="panel-title !text-sm">{{ t('baseInfo') }}</h3>
-
-        <!-- 选择商品： -->
-        <el-form-item
-          :label="t('goodsSelect')"
-          class="!m-0"
-          v-if="formData.type == 'goods'"
-        >
-          <div>
-            <goods-select-popup
-              ref="goodsSelectPopupRef"
-              v-model="formData.goods_ids"
-              @goodsSelect="goodsSelect"
-              :min="1"
-              :max="1"
-            />
-
-            <div
-              class="flex min-w-[512px] relative border-[1px] border-[#e7e7e7] border-solid mt-[16px]"
-              v-if="formData.goods_ids.length"
-            >
-              <div
-                class="min-w-[78px] h-[78px] flex items-center justify-center"
-              >
-                <el-image
-                  v-if="formData.goods_info.goods_cover"
-                  class="w-[78px] h-[78px]"
-                  :src="img(formData.goods_info.goods_cover)"
-                  fit="contain"
-                >
-                  <template #error>
-                    <div class="image-slot">
-                      <img
-                        class="w-[78px] h-[78px]"
-                        src="@/addon/shop/assets/goods_default.png"
-                      />
+    <div class="main-container" v-loading="loading">
+
+        <el-card class="card !border-none" shadow="never">
+            <el-page-header :content="pageName" :icon="ArrowLeft" @back="back()" />
+        </el-card>
+
+        <!-- 表单 -->
+        <el-form class="page-form mt-[15px]" :model="formData" label-width="120px" ref="formRef" :rules="formRules">
+            <!-- 基础设置 -->
+            <el-card class="box-card !border-none" shadow="never">
+                <h3 class="panel-title !text-sm">{{ t('baseInfo') }}</h3>
+
+                <!-- 选择商品： -->
+                <el-form-item :label="t('goodsSelect')" class="!m-0" v-if="formData.type=='goods'">
+                    <div>
+                        <goods-select-popup ref="goodsSelectPopupRef" v-model="formData.goods_ids" @goodsSelect="goodsSelect" :min="1" :max="1" />
+
+                        <div class="flex min-w-[512px] relative border-[1px] border-[#e7e7e7] border-solid mt-[16px]" v-if="formData.goods_ids.length">
+                            <div class="min-w-[78px] h-[78px] flex items-center justify-center">
+                                <el-image v-if="formData.goods_info.goods_cover" class="w-[78px] h-[78px]" :src="img(formData.goods_info.goods_cover)" fit="contain">
+                                    <template #error>
+                                        <div class="image-slot">
+                                            <img class="w-[78px] h-[78px]" src="@/addon/shop/assets/goods_default.png" />
+                                        </div>
+                                    </template>
+                                </el-image>
+                                <img v-else class="w-[78px] h-[78px]" src="@/addon/shop/assets/goods_default.png" fit="contain" />
+                            </div>
+                            <div class="flex-1 py-[5px] pl-[10px] pr-[30px]">
+                                <div class="text-[14px]">{{ formData.goods_info.goods_name }}</div>
+                                <div class="text-[14px] !text-[var(--el-color-primary)]">{{ formData.goods_info.goods_price }}</div>
+                            </div>
+                            <el-icon class="absolute right-[10px] top-[10px] cursor-pointer" @click="deleteGoods">
+                                <Close size="24px" color="#999" />
+                            </el-icon>
+                        </div>
                     </div>
-                  </template>
-                </el-image>
-                <img
-                  v-else
-                  class="w-[78px] h-[78px]"
-                  src="@/addon/shop/assets/goods_default.png"
-                  fit="contain"
-                />
-              </div>
-              <div class="flex-1 py-[5px] pl-[10px] pr-[30px]">
-                <div class="text-[14px]">
-                  {{ formData.goods_info.goods_name }}
-                </div>
-                <div class="text-[14px] !text-[var(--el-color-primary)]">
-                  {{ formData.goods_info.goods_price }}
-                </div>
-              </div>
-              <el-icon
-                class="absolute right-[10px] top-[10px] cursor-pointer"
-                @click="deleteGoods"
-              >
-                <Close size="24px" color="#999" />
-              </el-icon>
-            </div>
-          </div>
-        </el-form-item>
-        <el-form-item
-          prop="product_list"
-          v-if="formData.type == 'goods'"
-        ></el-form-item>
-
-        <!-- 商品名称： -->
-        <el-form-item :label="t('goodsName')" prop="names">
-          <el-input
-            v-model.trim="formData.names"
-            type="textarea"
-            clearable
-            :placeholder="t('goodsNamePlaceholder')"
-            class="!w-[512px]"
-            show-word-limit
-            :maxlength="60"
-          />
-        </el-form-item>
-        <!-- 商品标题： -->
-        <el-form-item :label="t('goodsTitle')">
-          <el-input
-            v-model.trim="formData.title"
-            type="textarea"
-            clearable
-            :placeholder="t('goodsTitlePlaceholder')"
-            class="!w-[512px]"
-            show-word-limit
-            :maxlength="60"
-          />
-        </el-form-item>
-        <!-- 商品图片 -->
-        <el-form-item :label="t('image')" prop="image">
-          <upload-image v-model="formData.image" :limit="6" />
-        </el-form-item>
-      </el-card>
-
-      <el-card
-        class="box-card !border-none"
-        shadow="never"
-        v-if="
-          formData.type == 'goods' &&
-          formData.goods_info &&
-          formData.product_list.length
-        "
-      >
-        <h3 class="panel-title !text-sm">{{ t('redemptionSettings') }}</h3>
-
-        <el-form-item>
-          <div class="w-full sku_list">
-            <div class="flex items-center mb-[15px]">
-              <el-checkbox
-                v-model="toggleCheckbox"
-                size="large"
-                class="!mr-[15px]"
-                @change="toggleChange"
-                :indeterminate="isIndeterminate"
-              >
-                <span>已选{{ multipleSelection.length }}项</span>
-              </el-checkbox>
-
-              <label>{{ t('batchOperation') }}</label>
-              <el-input
-                v-model.trim="batchOperation.stock"
-                clearable
-                :placeholder="t('stock')"
-                class="!w-[130px] ml-[10px]"
-                maxlength="8"
-              />
-              <el-input
-                v-model.trim="batchOperation.limit_num"
-                clearable
-                :placeholder="t('limit')"
-                class="!w-[130px] ml-[10px]"
-                maxlength="8"
-              />
-              <el-input
-                v-model.trim="batchOperation.point"
-                clearable
-                :placeholder="t('integralUnit')"
-                class="!w-[130px] ml-[10px]"
-                maxlength="8"
-              />
-              <el-input
-                v-model.trim="batchOperation.price"
-                clearable
-                :placeholder="t('newPrice')"
-                class="!w-[130px] ml-[10px]"
-                maxlength="8"
-              />
-              <el-button class="ml-[10px]" type="primary" @click="saveBatch">{{
-                t('confirm')
-              }}</el-button>
-            </div>
-            <el-table
-              class="!max-w-[100%]"
-              :data="formData.product_list"
-              size="large"
-              ref="productListTableRef"
-              @selection-change="handleSelectionChange"
-            >
-              <template #empty>
-                <span>{{ t('emptyData') }}</span>
-              </template>
-              <el-table-column type="selection" width="55" />
-              <el-table-column
-                :label="t('goodsSelectPopupGoodsInfo')"
-                min-width="300"
-              >
-                <template #default="{ row }">
-                  <div class="flex items-center cursor-pointer">
-                    <div
-                      class="min-w-[60px] h-[60px] flex items-center justify-center"
-                    >
-                      <el-image
-                        v-if="row.sku_image"
-                        class="w-[60px] h-[60px]"
-                        :src="img(row.sku_image)"
-                        fit="contain"
-                      >
-                        <template #error>
-                          <div class="image-slot">
-                            <img
-                              class="w-[60px] h-[60px]"
-                              src="@/addon/shop/assets/goods_default.png"
-                            />
-                          </div>
-                        </template>
-                      </el-image>
-                      <img
-                        v-else
-                        class="w-[70px] h-[60px]"
-                        src="@/addon/shop/assets/goods_default.png"
-                        fit="contain"
-                      />
+                </el-form-item>
+                <el-form-item prop="product_list" v-if="formData.type=='goods'"></el-form-item>
+
+                <!-- 商品名称： -->
+                <el-form-item :label="t('goodsName')" prop="names">
+                    <el-input v-model.trim="formData.names" type="textarea" clearable :placeholder="t('goodsNamePlaceholder')" class="!w-[512px]" show-word-limit :maxlength="60" />
+                </el-form-item>
+                <!-- 商品标题： -->
+                <el-form-item :label="t('goodsTitle')">
+                    <el-input v-model.trim="formData.title" type="textarea" clearable :placeholder="t('goodsTitlePlaceholder')" class="!w-[512px]" show-word-limit :maxlength="60" />
+                </el-form-item>
+                <!-- 商品图片 -->
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" :limit="6"/>
+                </el-form-item>
+            </el-card>
+
+            <el-card class="box-card !border-none" shadow="never" v-if="formData.type=='goods'&&formData.goods_info&&formData.product_list.length">
+                <h3 class="panel-title !text-sm">{{ t('redemptionSettings') }}</h3>
+
+                <el-form-item>
+                    <div class="w-full sku_list">
+                        <div class="flex items-center mb-[15px]">
+                            <el-checkbox v-model="toggleCheckbox" size="large" class="!mr-[15px]" @change="toggleChange" :indeterminate="isIndeterminate">
+                                <span>已选{{ multipleSelection.length }}项</span>
+                            </el-checkbox>
+
+                            <label>{{ t('batchOperation') }}</label>
+                            <el-input v-model.trim="batchOperation.stock" clearable :placeholder="t('stock')" class="!w-[130px] ml-[10px]" maxlength="8" />
+                            <el-input v-model.trim="batchOperation.limit_num" clearable :placeholder="t('limit')" class="!w-[130px] ml-[10px]" maxlength="8" />
+                            <el-input v-model.trim="batchOperation.point" clearable :placeholder="t('integralUnit')" class="!w-[130px] ml-[10px]" maxlength="8" />
+                            <el-input v-model.trim="batchOperation.price" clearable :placeholder="t('newPrice')" class="!w-[130px] ml-[10px]" maxlength="8" />
+                            <el-button class="ml-[10px]" type="primary" @click="saveBatch">{{ t('confirm') }}</el-button>
+                        </div>
+                        <el-table class="!max-w-[100%]" :data="formData.product_list" size="large" ref="productListTableRef" @selection-change="handleSelectionChange">
+                            <template #empty>
+                                <span>{{ t('emptyData')}}</span>
+                            </template>
+                            <el-table-column type="selection" width="55" />
+                            <el-table-column :label="t('goodsSelectPopupGoodsInfo')" min-width="300">
+                                <template #default="{ row }">
+                                    <div class="flex items-center cursor-pointer">
+                                        <div class="min-w-[60px] h-[60px] flex items-center justify-center">
+                                            <el-image v-if="row.sku_image" class="w-[60px] h-[60px]" :src="img(row.sku_image)" fit="contain">
+                                                <template #error>
+                                                    <div class="image-slot">
+                                                        <img class="w-[60px] h-[60px]" src="@/addon/shop/assets/goods_default.png" />
+                                                    </div>
+                                                </template>
+                                            </el-image>
+                                            <img v-else class="w-[70px] h-[60px]" src="@/addon/shop/assets/goods_default.png" fit="contain" />
+                                        </div>
+                                        <div class="ml-2">
+                                            <span :title="row.sku_name" class="multi-hidden">{{ row.sku_name||row.goods?.goods_name }}</span>
+                                        </div>
+                                    </div>
+                                </template>
+                            </el-table-column>
+                            <el-table-column prop="goods_price" :label="t('price')" min-width="170" />
+                            <el-table-column prop="goods_stock" :label="t('goodsStock')" min-width="170" />
+                            <el-table-column :label="t('stock')" min-width="200">
+                                <template #default="{ row,$index }">
+                                    <el-form-item v-if="row.is_enabled" :prop="'product_list.'+ $index + '.stock'" :rules="[{
+                                        trigger: 'blur',
+                                        validator: (rule: any, value: any, callback: any) => {
+                                                if (value.length == 0) {
+                                                    callback(t('stockPlaceholder'))
+                                                } else if (isNaN(value) || !regExp.number.test(value)) {
+                                                    callback(t('stockTips'))
+                                                } else if (value <=0) {
+                                                    callback(t('stockTipsTwo'))
+                                                }else if(parseInt(value)>parseInt(row.goods_stock)){
+                                                    callback(t('stockTipsThree'))
+                                                }else {
+                                                    callback();
+                                                }
+                                        }
+                                        }]" class="sku-form-item-wrap">
+                                        <!-- @blur="inputBlur(row,'reduce',$index)" -->
+                                        <el-input v-model.trim="row.stock"  class="!w-[200px]" clearable placeholder="0" maxlength="8" />
+                                    </el-form-item>
+                                    <span v-else>--</span>
+                                </template>
+                            </el-table-column>
+                            <el-table-column :label="t('limit')" min-width="200">
+                                <template #header>
+                                    <div style="display: inline-flex; align-items: center">
+                                        <span class="mr-[5px]">{{ t('limit') }}</span>
+                                        <el-tooltip class="box-item" effect="light" :content="t('limitRules')" placement="top">
+                                        <el-icon color="#666">
+                                            <QuestionFilled />
+                                        </el-icon>
+                                        </el-tooltip>
+                                    </div>
+                                </template>
+                                <template #default="{ row,$index }">
+                                    <el-form-item v-if="row.is_enabled" :prop="'product_list.'+ $index + '.limit_num'" :rules="[{
+                                        trigger: 'blur',
+                                        validator: (rule: any, value: any, callback: any) => {
+                                                if (value.length == 0) {
+                                                    callback(t('limitPlaceholder'))
+                                                } else if (isNaN(value) || !regExp.number.test(value)) {
+                                                    callback(t('limitTips'))
+                                                } else if (value <=0) {
+                                                    callback(t('limitTipsTwo'))
+                                                } else if (value > Number(row.stock)) {
+                                                    callback(t('limitTipsThree'))
+                                                } else if(parseInt(value)>parseInt(row.goods_stock)){
+                                                    callback(t('stockTipsThree'))
+                                                } else {
+                                                    callback();
+                                                }
+                                        }
+                                        }]" class="sku-form-item-wrap">
+                                        <!-- @blur="inputBlur(row,'reduce',$index)" -->
+                                            <el-input v-model.trim="row.limit_num" class="!w-[200px]" clearable placeholder="0" maxlength="8" >
+                                                <template #append>
+                                                    <span>{{t('limitUnit')}}</span>
+                                                </template>
+                                            </el-input>
+                                        </el-form-item>
+                                        <span v-else>--</span>
+                                </template>
+                            </el-table-column>
+                            <el-table-column :label="t('money')" min-width="550" align="center">
+                                <template #default="{ row,$index }">
+                                    <div class="flex justify-center">
+                                        <el-form-item v-if="row.is_enabled" :prop="'product_list.'+ $index + '.point'" :rules="[{
+                                            trigger: 'blur',
+                                            validator: (rule: any, value: any, callback: any) => {
+                                                    if (value.length == 0) {
+                                                        callback(t('pointPlaceholder'))
+                                                    } else if (isNaN(value) || !regExp.number.test(value)) {
+                                                            callback(t('pointTips'))
+                                                        } else if (value <=0) {
+                                                            callback(t('pointTipsTwo'))
+                                                        } else{
+                                                            callback();
+                                                        }
+                                            }
+                                            }]" class="sku-form-item-wrap">
+                                            <!-- @blur="inputBlur(row,'reduce',$index)" -->
+                                            <el-input v-model.trim="row.point" class="!w-[200px]"  clearable placeholder="0" maxlength="8" >
+                                                <template #append>
+                                                    <span>{{t('integralUnit')}}</span>
+                                                </template>
+                                            </el-input>
+                                        </el-form-item>
+                                        <span v-else>--</span>
+                                        <span v-if="row.is_enabled" class="mx-[20px]">+</span>
+                                        <el-form-item v-if="row.is_enabled" :prop="'product_list.'+ $index + '.price'" :rules="[{
+                                            trigger: 'blur',
+                                            validator: (rule: any, value: any, callback: any) => {
+                                                    if(value.length){
+                                                        if (isNaN(value) || !regExp.digit.test(value)) {
+                                                            callback(t('moneyTips'))
+                                                        } else if (value <0) {
+                                                            callback(t('moneyTipsTwo'))
+                                                        }else{
+                                                            callback();
+                                                        }
+                                                    }else {
+                                                        callback();
+                                                    }
+                                            }
+                                            }]" class="sku-form-item-wrap">
+                                            <!-- @blur="inputBlur(row,'reduce',$index)" -->
+                                            <el-input v-model.trim="row.price" class="!w-[200px]"  clearable placeholder="0.00" maxlength="8" >
+                                                <template #append>
+                                                    <span>{{t('prickUnit')}}</span>
+                                                </template>
+                                            </el-input>
+                                        </el-form-item>
+                                    </div>
+                                </template>
+                            </el-table-column>
+                            <el-table-column :label="t('operation')" fixed="right" align="right" min-width="160">
+                                <template #default="{row}">
+                                    <el-button type="primary" link @click="enabledEvent(row)">{{ row.is_enabled?t('noEnabled'):t('enabled') }}</el-button>
+                                </template>
+                            </el-table-column>
+                        </el-table>
                     </div>
-                    <div class="ml-2">
-                      <span :title="row.sku_name" class="multi-hidden">{{
-                        row.sku_name || row.goods?.goods_name
-                      }}</span>
-                    </div>
-                  </div>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="goods_price"
-                :label="t('price')"
-                min-width="170"
-              />
-              <el-table-column
-                prop="goods_stock"
-                :label="t('goodsStock')"
-                min-width="170"
-              />
-              <el-table-column :label="t('stock')" min-width="200">
-                <template #default="{ row, $index }">
-                  <el-form-item
-                    v-if="row.is_enabled"
-                    :prop="'product_list.' + $index + '.stock'"
-                    :rules="[
-                      {
-                        trigger: 'blur',
-                        validator: (rule: any, value: any, callback: any) => {
-                          if (value.length == 0) {
+                </el-form-item>
+            </el-card>
+
+            <el-card class="box-card !border-none" shadow="never" v-if="formData.type=='coupon'&&formData.product_list.length">
+                <h3 class="panel-title !text-sm">{{ t('redemptionSettings') }}</h3>
+
+                <!-- 兑换库存 -->
+                <el-form-item :label="t('stock')" prop="stock"  :rules="[{
+                    required: true,
+                    trigger: 'blur',
+                    validator: (rule: any, value: any, callback: any) => {
+                        if (value.length == 0) {
                             callback(t('stockPlaceholder'))
-                          } else if (
-                            isNaN(value) ||
-                            !regExp.number.test(value)
-                          ) {
+                        } else if (isNaN(value) || !regExp.number.test(value)) {
                             callback(t('stockTips'))
-                          } else if (value <= 0) {
+                        } else if (value <=0) {
                             callback(t('stockTipsTwo'))
-                          } else if (
-                            parseInt(value) > parseInt(row.goods_stock)
-                          ) {
-                            callback(t('stockTipsThree'))
-                          } else {
-                            callback()
-                          }
-                        },
-                      },
-                    ]"
-                    class="sku-form-item-wrap"
-                  >
-                    <!-- @blur="inputBlur(row,'reduce',$index)" -->
-                    <el-input
-                      v-model.trim="row.stock"
-                      class="!w-[200px]"
-                      clearable
-                      placeholder="0"
-                      maxlength="8"
-                    />
-                  </el-form-item>
-                  <span v-else>--</span>
-                </template>
-              </el-table-column>
-              <el-table-column :label="t('limit')" min-width="200">
-                <template #header>
-                  <div style="display: inline-flex; align-items: center">
-                    <span class="mr-[5px]">{{ t('limit') }}</span>
-                    <el-tooltip
-                      class="box-item"
-                      effect="light"
-                      :content="t('limitRules')"
-                      placement="top"
-                    >
-                      <el-icon color="#666">
-                        <QuestionFilled />
-                      </el-icon>
-                    </el-tooltip>
-                  </div>
-                </template>
-                <template #default="{ row, $index }">
-                  <el-form-item
-                    v-if="row.is_enabled"
-                    :prop="'product_list.' + $index + '.limit_num'"
-                    :rules="[
-                      {
-                        trigger: 'blur',
-                        validator: (rule: any, value: any, callback: any) => {
-                          if (value.length == 0) {
-                            callback(t('limitPlaceholder'))
-                          } else if (
-                            isNaN(value) ||
-                            !regExp.number.test(value)
-                          ) {
-                            callback(t('limitTips'))
-                          } else if (value <= 0) {
-                            callback(t('limitTipsTwo'))
-                          } else if (value > Number(row.stock)) {
-                            callback(t('limitTipsThree'))
-                          } else if (
-                            parseInt(value) > parseInt(row.goods_stock)
-                          ) {
+                        }else if(formData.product_list[0].sum_count != '-1' && parseInt(value)>parseInt(formData.product_list[0].sum_count.sum_count)){
                             callback(t('stockTipsThree'))
-                          } else {
-                            callback()
-                          }
-                        },
-                      },
-                    ]"
-                    class="sku-form-item-wrap"
-                  >
-                    <!-- @blur="inputBlur(row,'reduce',$index)" -->
-                    <el-input
-                      v-model.trim="row.limit_num"
-                      class="!w-[200px]"
-                      clearable
-                      placeholder="0"
-                      maxlength="8"
-                    >
-                      <template #append>
-                        <span>{{ t('limitUnit') }}</span>
-                      </template>
-                    </el-input>
-                  </el-form-item>
-                  <span v-else>--</span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                :label="t('money')"
-                min-width="550"
-                align="center"
-              >
-                <template #default="{ row, $index }">
-                  <div class="flex justify-center">
-                    <el-form-item
-                      v-if="row.is_enabled"
-                      :prop="'product_list.' + $index + '.point'"
-                      :rules="[
-                        {
-                          trigger: 'blur',
-                          validator: (rule: any, value: any, callback: any) => {
-                            if (value.length == 0) {
-                              callback(t('pointPlaceholder'))
-                            } else if (
-                              isNaN(value) ||
-                              !regExp.number.test(value)
-                            ) {
-                              callback(t('pointTips'))
-                            } else if (value <= 0) {
-                              callback(t('pointTipsTwo'))
-                            } else {
-                              callback()
-                            }
-                          },
-                        },
-                      ]"
-                      class="sku-form-item-wrap"
-                    >
-                      <!-- @blur="inputBlur(row,'reduce',$index)" -->
-                      <el-input
-                        v-model.trim="row.point"
-                        class="!w-[200px]"
-                        clearable
-                        placeholder="0"
-                        maxlength="8"
-                      >
-                        <template #append>
-                          <span>{{ t('integralUnit') }}</span>
-                        </template>
-                      </el-input>
-                    </el-form-item>
-                    <span v-else>--</span>
-                    <span v-if="row.is_enabled" class="mx-[20px]">+</span>
-                    <el-form-item
-                      v-if="row.is_enabled"
-                      :prop="'product_list.' + $index + '.price'"
-                      :rules="[
-                        {
-                          trigger: 'blur',
-                          validator: (rule: any, value: any, callback: any) => {
-                            if (value.length) {
-                              if (isNaN(value) || !regExp.digit.test(value)) {
-                                callback(t('moneyTips'))
-                              } else if (value < 0) {
-                                callback(t('moneyTipsTwo'))
-                              } else {
-                                callback()
-                              }
+                        }else {
+                            callback();
+                        }
+                    }
+                }]">
+                    <el-input v-model.trim="formData.stock" clearable :placeholder="t('stockPlaceholder')" class="input-width" />
+                </el-form-item>
+                <!-- 兑换限制 -->
+                <el-form-item :label="t('limit')" prop="limit_num"  :rules="[{
+                    trigger: 'blur',
+                    validator: (rule: any, value: any, callback: any) => {
+                        if(value){
+                            if (isNaN(value) || !regExp.number.test(value)) {
+                                callback(t('limitTips'))
+                            } else if (value <=0) {
+                                callback(t('limitTipsTwo'))
                             } else {
-                              callback()
+                                callback();
                             }
-                          },
-                        },
-                      ]"
-                      class="sku-form-item-wrap"
-                    >
-                      <!-- @blur="inputBlur(row,'reduce',$index)" -->
-                      <el-input
-                        v-model.trim="row.price"
-                        class="!w-[200px]"
-                        clearable
-                        placeholder="0.00"
-                        maxlength="8"
-                      >
-                        <template #append>
-                          <span>{{ t('prickUnit') }}</span>
-                        </template>
-                      </el-input>
-                    </el-form-item>
-                  </div>
-                </template>
-              </el-table-column>
-              <el-table-column
-                :label="t('operation')"
-                fixed="right"
-                align="right"
-                min-width="160"
-              >
-                <template #default="{ row }">
-                  <el-button type="primary" link @click="enabledEvent(row)">{{
-                    row.is_enabled ? t('noEnabled') : t('enabled')
-                  }}</el-button>
-                </template>
-              </el-table-column>
-            </el-table>
-          </div>
-        </el-form-item>
-      </el-card>
-
-      <el-card
-        class="box-card !border-none"
-        shadow="never"
-        v-if="formData.type == 'coupon' && formData.product_list.length"
-      >
-        <h3 class="panel-title !text-sm">{{ t('redemptionSettings') }}</h3>
-
-        <!-- 兑换库存 -->
-        <el-form-item
-          :label="t('stock')"
-          prop="stock"
-          :rules="[
-            {
-              required: true,
-              trigger: 'blur',
-              validator: (rule: any, value: any, callback: any) => {
-                if (value.length == 0) {
-                  callback(t('stockPlaceholder'))
-                } else if (isNaN(value) || !regExp.number.test(value)) {
-                  callback(t('stockTips'))
-                } else if (value <= 0) {
-                  callback(t('stockTipsTwo'))
-                } else if (
-                  formData.product_list[0].sum_count != '-1' &&
-                  parseInt(value) >
-                    parseInt(formData.product_list[0].sum_count.sum_count)
-                ) {
-                  callback(t('stockTipsThree'))
-                } else {
-                  callback()
-                }
-              },
-            },
-          ]"
-        >
-          <el-input
-            v-model.trim="formData.stock"
-            clearable
-            :placeholder="t('stockPlaceholder')"
-            class="input-width"
-          />
-        </el-form-item>
-        <!-- 兑换限制 -->
-        <el-form-item
-          :label="t('limit')"
-          prop="limit_num"
-          :rules="[
-            {
-              trigger: 'blur',
-              validator: (rule: any, value: any, callback: any) => {
-                if (value) {
-                  if (isNaN(value) || !regExp.number.test(value)) {
-                    callback(t('limitTips'))
-                  } else if (value <= 0) {
-                    callback(t('limitTipsTwo'))
-                  } else {
-                    callback()
-                  }
-                } else {
-                  callback()
-                }
-              },
-            },
-          ]"
-        >
-          <el-input
-            v-model.trim="formData.limit_num"
-            clearable
-            :placeholder="t('limitPlaceholder')"
-            class="input-width"
-          />
-        </el-form-item>
-        <!-- 兑换价 -->
-        <el-form-item :label="t('money')" required>
-          <div class="flex justify-center">
-            <el-form-item
-              prop="point"
-              :rules="[
-                {
-                  trigger: 'blur',
-                  validator: (rule: any, value: any, callback: any) => {
-                    if (value.length == 0) {
-                      callback(t('pointPlaceholder'))
-                    }
-                    if (isNaN(value) || !regExp.number.test(value)) {
-                      callback(t('pointTips'))
-                    } else if (value <= 0) {
-                      callback(t('pointTipsTwo'))
-                    } else {
-                      callback()
+                        }else{
+                            callback();
+                        }
                     }
-                  },
-                },
-              ]"
-              class="sku-form-item-wrap"
-            >
-              <!-- @blur="inputBlur(row,'reduce',$index)" -->
-              <el-input
-                v-model.trim="formData.point"
-                class="!w-[200px]"
-                clearable
-                placeholder="0"
-                maxlength="8"
-              >
-                <template #append>
-                  <span>{{ t('integralUnit') }}</span>
-                </template>
-              </el-input>
-            </el-form-item>
-            <span class="mx-[20px]">+</span>
-            <el-form-item
-              prop="price"
-              :rules="[
-                {
-                  trigger: 'blur',
-                  validator: (rule: any, value: any, callback: any) => {
-                    if (value.length) {
-                      if (isNaN(value) || !regExp.digit.test(value)) {
-                        callback(t('moneyTips'))
-                      } else if (value < 0) {
-                        callback(t('moneyTipsTwo'))
-                      } else {
-                        callback()
-                      }
-                    } else {
-                      callback()
+                }]">
+                    <el-input v-model.trim="formData.limit_num" clearable :placeholder="t('limitPlaceholder')" class="input-width" />
+                </el-form-item>
+                <!-- 兑换价 -->
+                <el-form-item :label="t('money')" required>
+                    <div class="flex justify-center">
+                                        <el-form-item prop="point" :rules="[{
+                                            trigger: 'blur',
+                                            validator: (rule: any, value: any, callback: any) => {
+                                                    if (value.length == 0) {
+                                                        callback(t('pointPlaceholder'))
+                                                    } if (isNaN(value) || !regExp.number.test(value)) {
+                                                            callback(t('pointTips'))
+                                                        } else if (value <=0) {
+                                                            callback(t('pointTipsTwo'))
+                                                        } else{
+                                                            callback();
+                                                        }
+                                                    }
+                                            }]" class="sku-form-item-wrap">
+                                            <!-- @blur="inputBlur(row,'reduce',$index)" -->
+                                            <el-input v-model.trim="formData.point" class="!w-[200px]"  clearable placeholder="0" maxlength="8" >
+                                                <template #append>
+                                                    <span>{{t('integralUnit')}}</span>
+                                                </template>
+                                            </el-input>
+                                        </el-form-item>
+                                        <span class="mx-[20px]">+</span>
+                                        <el-form-item prop="price" :rules="[{
+                                            trigger: 'blur',
+                                            validator: (rule: any, value: any, callback: any) => {
+                                                     if(value.length){
+                                                        if (isNaN(value) || !regExp.digit.test(value)) {
+                                                            callback(t('moneyTips'))
+                                                        } else if (value <0) {
+                                                            callback(t('moneyTipsTwo'))
+                                                        }else{
+                                                            callback();
+                                                        }
+                                                    }else {
+                                                        callback();
+                                                    }
+                                            }
+                                            }]" class="sku-form-item-wrap">
+                                            <!-- @blur="inputBlur(row,'reduce',$index)" -->
+                                            <el-input v-model.trim="formData.price" class="!w-[200px]"  clearable placeholder="0.00" maxlength="8" >
+                                                <template #append>
+                                                    <span>{{t('prickUnit')}}</span>
+                                                </template>
+                                            </el-input>
+                                        </el-form-item>
+                                    </div>
+                </el-form-item>
+            </el-card>
+
+            <el-card class="box-card !border-none" shadow="never" v-if="formData.type=='balance'">
+                <h3 class="panel-title !text-sm">{{ t('redemptionSettings') }}</h3>
+                <!-- 兑换余额 -->
+                <el-form-item :label="t('balance')" prop="balance"  :rules="[{
+                    required: true,
+                    trigger: 'blur',
+                    validator: (rule: any, value: any, callback: any) => {
+                        if (value.length == 0) {
+                            callback(t('balancePlaceholder'))
+                        } else if (isNaN(value) || !regExp.digit.test(value)) {
+                            callback(t('balanceTips'))
+                        } else if (value <=0) {
+                            callback(t('balanceTipsTwo'))
+                        }else {
+                            callback();
+                        }
                     }
-                  },
-                },
-              ]"
-              class="sku-form-item-wrap"
-            >
-              <!-- @blur="inputBlur(row,'reduce',$index)" -->
-              <el-input
-                v-model.trim="formData.price"
-                class="!w-[200px]"
-                clearable
-                placeholder="0.00"
-                maxlength="8"
-              >
-                <template #append>
-                  <span>{{ t('prickUnit') }}</span>
-                </template>
-              </el-input>
-            </el-form-item>
-          </div>
-        </el-form-item>
-      </el-card>
-
-      <el-card
-        class="box-card !border-none"
-        shadow="never"
-        v-if="formData.type == 'balance'"
-      >
-        <h3 class="panel-title !text-sm">{{ t('redemptionSettings') }}</h3>
-        <!-- 兑换余额 -->
-        <el-form-item
-          :label="t('balance')"
-          prop="balance"
-          :rules="[
-            {
-              required: true,
-              trigger: 'blur',
-              validator: (rule: any, value: any, callback: any) => {
-                if (value.length == 0) {
-                  callback(t('balancePlaceholder'))
-                } else if (isNaN(value) || !regExp.digit.test(value)) {
-                  callback(t('balanceTips'))
-                } else if (value <= 0) {
-                  callback(t('balanceTipsTwo'))
-                } else {
-                  callback()
-                }
-              },
-            },
-          ]"
-        >
-          <el-input
-            v-model.trim="formData.balance"
-            clearable
-            :placeholder="t('balancePlaceholder')"
-            class="input-width"
-          />
-        </el-form-item>
-        <!-- 余额类型 -->
-        <el-form-item :label="t('balance')">
-          <el-radio-group v-model="formData.isBalance" class="ml-4">
-            <el-radio :label="0" size="large">可提现余额</el-radio>
-            <el-radio :label="1" size="large">不可提现余额</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <!-- 兑换库存 -->
-        <el-form-item
-          :label="t('stock')"
-          prop="stock"
-          :rules="[
-            {
-              required: true,
-              trigger: 'blur',
-              validator: (rule: any, value: any, callback: any) => {
-                if (value.length == 0) {
-                  callback(t('stockPlaceholder'))
-                } else if (isNaN(value) || !regExp.number.test(value)) {
-                  callback(t('stockTips'))
-                } else if (value <= 0) {
-                  callback(t('stockTipsTwo'))
-                } else {
-                  callback()
-                }
-              },
-            },
-          ]"
-        >
-          <el-input
-            v-model.trim="formData.stock"
-            clearable
-            :placeholder="t('stockPlaceholder')"
-            class="input-width"
-          />
-        </el-form-item>
-        <!-- 兑换限制 -->
-        <el-form-item
-          :label="t('limit')"
-          prop="limit_num"
-          :rules="[
-            {
-              trigger: 'blur',
-              validator: (rule: any, value: any, callback: any) => {
-                if (value) {
-                  if (isNaN(value) || !regExp.number.test(value)) {
-                    callback(t('limitTips'))
-                  } else if (value <= 0) {
-                    callback(t('limitTipsTwo'))
-                  } else {
-                    callback()
-                  }
-                } else {
-                  callback()
-                }
-              },
-            },
-          ]"
-        >
-          <el-input
-            v-model.trim="formData.limit_num"
-            clearable
-            :placeholder="t('limitPlaceholder')"
-            class="input-width"
-          />
-        </el-form-item>
-        <!-- 兑换价 -->
-        <el-form-item :label="t('money')" required>
-          <div class="flex justify-center">
-            <el-form-item
-              prop="point"
-              :rules="[
-                {
-                  trigger: 'blur',
-                  validator: (rule: any, value: any, callback: any) => {
-                    if (value.length == 0) {
-                      callback(t('pointPlaceholder'))
-                    } else if (value.length) {
-                      if (isNaN(value) || !regExp.number.test(value)) {
-                        callback(t('pointTips'))
-                      } else if (value <= 0) {
-                        callback(t('pointTipsTwo'))
-                      } else {
-                        callback()
-                      }
-                    } else {
-                      callback()
+                }]">
+                    <el-input v-model.trim="formData.balance" clearable :placeholder="t('balancePlaceholder')" class="input-width" />
+                </el-form-item>
+                <!-- 余额类型 -->
+                <el-form-item :label="t('balance')">
+                    <el-radio-group v-model="formData.isBalance" class="ml-4">
+                        <el-radio :label="0" size="large">可提现余额</el-radio>
+                        <el-radio :label="1" size="large">不可提现余额</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <!-- 兑换库存 -->
+                <el-form-item :label="t('stock')" prop="stock"  :rules="[{
+                    required: true,
+                    trigger: 'blur',
+                    validator: (rule: any, value: any, callback: any) => {
+                        if (value.length == 0) {
+                            callback(t('stockPlaceholder'))
+                        } else if (isNaN(value) || !regExp.number.test(value)) {
+                            callback(t('stockTips'))
+                        } else if (value <=0) {
+                            callback(t('stockTipsTwo'))
+                        }else {
+                            callback();
+                        }
                     }
-                  },
-                },
-              ]"
-              class="sku-form-item-wrap"
-            >
-              <!-- @blur="inputBlur(row,'reduce',$index)" -->
-              <el-input
-                v-model.trim="formData.point"
-                class="!w-[200px]"
-                clearable
-                placeholder="0"
-                maxlength="8"
-              >
-                <template #append>
-                  <span>{{ t('integralUnit') }}</span>
-                </template>
-              </el-input>
-            </el-form-item>
-            <span class="mx-[20px]">+</span>
-            <el-form-item
-              prop="price"
-              :rules="[
-                {
-                  trigger: 'blur',
-                  validator: (rule: any, value: any, callback: any) => {
-                    if (value.length) {
-                      if (isNaN(value) || !regExp.digit.test(value)) {
-                        callback(t('moneyTips'))
-                      } else if (value < 0) {
-                        callback(t('moneyTipsTwo'))
-                      } else {
-                        callback()
-                      }
-                    } else {
-                      callback()
+                }]">
+                    <el-input v-model.trim="formData.stock" clearable :placeholder="t('stockPlaceholder')" class="input-width" />
+                </el-form-item>
+                <!-- 兑换限制 -->
+                <el-form-item :label="t('limit')" prop="limit_num"  :rules="[{
+                    trigger: 'blur',
+                    validator: (rule: any, value: any, callback: any) => {
+                        if(value){
+                            if (isNaN(value) || !regExp.number.test(value)) {
+                                callback(t('limitTips'))
+                            } else if (value <=0) {
+                                callback(t('limitTipsTwo'))
+                            } else {
+                                callback();
+                            }
+                        }else{
+                            callback();
+                        }
                     }
-                  },
-                },
-              ]"
-              class="sku-form-item-wrap"
-            >
-              <!-- @blur="inputBlur(row,'reduce',$index)" -->
-              <el-input
-                v-model.trim="formData.price"
-                class="!w-[200px]"
-                clearable
-                placeholder="0.00"
-                maxlength="8"
-              >
-                <template #append>
-                  <span>{{ t('prickUnit') }}</span>
-                </template>
-              </el-input>
-            </el-form-item>
-          </div>
-        </el-form-item>
-      </el-card>
-
-      <el-card class="box-card !border-none" shadow="never">
-        <h3 class="panel-title !text-sm">{{ t('goodsDetail') }}</h3>
-        <el-form-item>
-          <editor v-model="formData.content" :height="600" class="!w-[512px]" />
-        </el-form-item>
-      </el-card>
-    </el-form>
-
-    <!-- 提交按钮 -->
-    <div class="fixed-footer-wrap">
-      <div class="fixed-footer">
-        <el-button type="primary" @click="onSave(formRef)">{{
-          t('save')
-        }}</el-button>
-        <el-button @click="back()">{{ t('cancel') }}</el-button>
-      </div>
+                }]">
+                    <el-input v-model.trim="formData.limit_num" clearable :placeholder="t('limitPlaceholder')" class="input-width" />
+                </el-form-item>
+                <!-- 兑换价 -->
+                <el-form-item :label="t('money')" required>
+                    <div class="flex justify-center">
+                        <el-form-item prop="point" :rules="[{
+                            trigger: 'blur',
+                            validator: (rule: any, value: any, callback: any) => {
+                                if (value.length == 0) {
+                                    callback(t('pointPlaceholder'))
+                                                    } else if(value.length){
+                                                        if (isNaN(value) || !regExp.number.test(value)) {
+                                                            callback(t('pointTips'))
+                                                        } else if (value <=0) {
+                                                            callback(t('pointTipsTwo'))
+                                                        } else{
+                                                            callback();
+                                                        }
+                                                    } else {
+                                                        callback();
+                                                    }
+                                            }
+                                            }]" class="sku-form-item-wrap">
+                                            <!-- @blur="inputBlur(row,'reduce',$index)" -->
+                                            <el-input v-model.trim="formData.point" class="!w-[200px]"  clearable placeholder="0" maxlength="8" >
+                                                <template #append>
+                                                    <span>{{t('integralUnit')}}</span>
+                                                </template>
+                                            </el-input>
+                                        </el-form-item>
+                                        <span class="mx-[20px]">+</span>
+                                        <el-form-item prop="price" :rules="[{
+                                            trigger: 'blur',
+                                            validator: (rule: any, value: any, callback: any) => {
+                                                    if(value.length){
+                                                        if (isNaN(value) || !regExp.digit.test(value)) {
+                                                            callback(t('moneyTips'))
+                                                        } else if (value <0) {
+                                                            callback(t('moneyTipsTwo'))
+                                                        }else{
+                                                            callback();
+                                                        }
+                                                    }else {
+                                                        callback();
+                                                    }
+                                            }
+                                            }]" class="sku-form-item-wrap">
+                                            <!-- @blur="inputBlur(row,'reduce',$index)" -->
+                                            <el-input v-model.trim="formData.price" class="!w-[200px]"  clearable placeholder="0.00" maxlength="8" >
+                                                <template #append>
+                                                    <span>{{t('prickUnit')}}</span>
+                                                </template>
+                                            </el-input>
+                                        </el-form-item>
+                                    </div>
+                </el-form-item>
+            </el-card>
+
+            <el-card class="box-card !border-none" shadow="never">
+                <h3 class="panel-title !text-sm">{{ t('goodsDetail') }}</h3>
+                <el-form-item>
+                    <editor v-model="formData.content" :height="600"  class="!w-[512px]" />
+                </el-form-item>
+            </el-card>
+        </el-form>
+
+        <!-- 提交按钮 -->
+        <div class="fixed-footer-wrap">
+            <div class="fixed-footer">
+                <el-button type="primary" @click="onSave(formRef)">{{ t('save') }}</el-button>
+                <el-button @click="back()">{{ t('cancel') }}</el-button>
+            </div>
+        </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
 import { ref, computed, reactive } from 'vue'
 import { t } from '@/lang'
-import { img, deepClone } from '@/utils/common'
-import { FormInstance, ElMessage } from 'element-plus'
+import { img,deepClone } from '@/utils/common'
+import { FormInstance,ElMessage } from 'element-plus'
 import { ArrowLeft } from '@element-plus/icons-vue'
-import { addActiveExchange } from '@/addon/shop/api/marketing'
+import { addActiveExchange } from "@/addon/shop/api/marketing";
 import goodsSelectPopup from '@/addon/shop/views/goods/components/goods-select-popup.vue'
 import couponSelectPopup from '@/addon/shop/views/goods/components/coupon-select-popup.vue'
 import { useRoute, useRouter } from 'vue-router'
@@ -804,133 +472,123 @@ const pageName = route.meta.title
 const loading = ref(false)
 // 商品类型
 const goodsType = reactive([
-  { name: '商品', type: 'goods' },
-  // {name:'优惠券',type:'coupon'},
-  // {name:'余额',type:'balance'},
+    {name:'商品',type:'goods'},
+    // {name:'优惠券',type:'coupon'},
+    // {name:'余额',type:'balance'},
 ])
 const initialFormData = {
-  type: 'goods', // 名称
-  names: '', // 标题
-  title: '',
-  image: '',
-  goods_ids: [],
-  coupon_ids: [],
-  product_list: [],
-  stock: '',
-  limit_num: '',
-  point: '',
-  price: '',
-  balance: '',
-  isBalance: 1,
-  content: '',
+    type: 'goods', // 名称
+    names: '', // 标题
+    title:'',
+    image:'',
+    goods_ids:[],
+    coupon_ids:[],
+    product_list:[],
+    stock:'',
+    limit_num:'',
+    point:'',
+    price:'',
+    balance:'',
+    isBalance:1,
+    content:''
 }
 const formData: Record<string, any> = ref({ ...initialFormData })
 const formRef = ref<FormInstance>()
 // 表单验证规则
 // 正则表达式
 const regExp = {
-  required: /[\S]+/,
-  number: /^\d{0,10}$/,
-  digit: /^\d{0,10}(.?\d{0,2})$/,
-  special: /^\d{0,10}(.?\d{0,3})$/,
+    required: /[\S]+/,
+    number: /^\d{0,10}$/,
+    digit: /^\d{0,10}(.?\d{0,2})$/,
+    special: /^\d{0,10}(.?\d{0,3})$/
 }
 const formRules = computed(() => {
-  return {
-    names: [
-      { required: true, message: t('goodsNamePlaceholder'), trigger: 'blur' },
-    ],
-    image: [
-      { required: true, message: t('imagePlaceholder'), trigger: 'change' },
-    ],
-    product_list: [
-      {
-        required: true,
-        message: t('selectGoodsPlaceholder'),
-        trigger: 'change',
-      },
-    ],
-    coupon_ids: [
-      {
-        required: true,
-        message: t('couponSelectPlaceholder'),
-        trigger: 'change',
-      },
-    ],
-  }
+    return {
+        names: [
+            { required: true, message: t('goodsNamePlaceholder'), trigger: 'blur' }
+        ],
+        image: [
+            { required: true, message: t('imagePlaceholder'), trigger: 'change' }
+        ],
+        product_list: [
+            { required: true, message: t('selectGoodsPlaceholder'), trigger: 'change' }
+        ],
+        coupon_ids: [
+            { required: true, message: t('couponSelectPlaceholder'), trigger: 'change' }
+        ],
+    }
 })
-const changeGoodsType = (item: any) => {
-  formData.value.type = item.type
-  formData.value.coupon_ids = []
-  formData.value.goods_ids = []
-  if (formData.value.type == 'goods') {
-    formData.value.goods_info = {}
-  } else {
-    if (formData.value.goods_info) delete formData.value.goods_info
-  }
-  formData.value.product_list = []
+const changeGoodsType=(item:any)=>{
+    formData.value.type = item.type
+    formData.value.coupon_ids = []
+    formData.value.goods_ids = []
+    if(formData.value.type == 'goods'){
+        formData.value.goods_info = {}
+    }else {
+        if(formData.value.goods_info) delete formData.value.goods_info
+    }
+    formData.value.product_list = []
 }
 
 /********* 商品 **********/
 //删除商品
-const deleteGoods = () => {
-  delete formData.value.goods_info
-  formData.value.goods_ids = []
-  formData.value.product_list = []
+const deleteGoods = ()=>{
+    delete formData.value.goods_info
+    formData.value.goods_ids = []
+    formData.value.product_list = []
 }
 //设置商品sku是否参与
-const enabledEvent = (row: any) => {
-  row.is_enabled = row.is_enabled ? 0 : 1
-  if (formData.value.product_list.every((el: any) => el.is_enabled === 0)) {
-    row.is_enabled = 1
-    ElMessage({
-      type: 'warning',
-      message: `${t('noEnabledTip')}`,
-    })
-    return
-  }
-  row.stock = ''
-  row.limit_num = ''
-  row.point = ''
-  row.price = ''
+const enabledEvent =  (row:any)=>{
+    row.is_enabled = row.is_enabled ? 0 : 1
+    if(formData.value.product_list.every((el:any)=>el.is_enabled===0)){
+        row.is_enabled = 1
+        ElMessage({
+             type: 'warning',
+            message: `${t('noEnabledTip')}`
+        })
+        return
+    }
+    row.stock = '';
+    row.limit_num = '';
+    row.point = '';
+    row.price = '';
 }
 const goodsSelectPopupRef = ref()
-const goodsSelect = (value: any) => {
-  const goods_info: any = Object.values(deepClone(value))[0]
-  formData.value.product_list = deepClone(
-    goods_info.skuList.map((el: any) => {
-      el.goods_stock = el.stock + ''
-      el.goods_price = el.price + ''
-      el.limit_num = ''
-      el.stock = ''
-      el.point = ''
-      el.price = ''
-      el.is_enabled = 1
-      return el
-    })
-  )
-  formData.value.goods_info = {
-    goods_name: goods_info.goods_name,
-    goods_cover: goods_info.goods_cover,
-    goods_price: goods_info.goodsSku.price,
-    goods_id: goods_info.goods_id,
-  }
-  formData.value.image = goods_info.goods_image
-  formData.value.names = goods_info.goods_name
-  formData.value.title = goods_info.sub_title
-  formData.value.content = goods_info.goods_desc
-  if (formRef.value) formRef.value.validateField('product_list').catch(() => {})
+const goodsSelect = (value:any)=>{
+    const goods_info:any=Object.values(deepClone(value))[0]
+    formData.value.product_list =deepClone(goods_info.skuList.map((el:any)=>{
+        el.goods_stock = el.stock + ''
+        el.goods_price = el.price + ''
+        el.limit_num = ''
+        el.stock = ''
+        el.point = ''
+        el.price = ''
+        el.is_enabled = 1
+        return el
+    }))
+    formData.value.goods_info = {
+        goods_name:goods_info.goods_name,
+        goods_cover:goods_info.goods_cover,
+        goods_price:goods_info.goodsSku.price,
+        goods_id:goods_info.goods_id
+    }
+    formData.value.image = goods_info.goods_image
+    formData.value.names = goods_info.goods_name
+    formData.value.title = goods_info.sub_title
+    formData.value.content = goods_info.goods_desc
+    if(formRef.value) formRef.value.validateField('product_list').catch(()=>{})
 }
 interface batchOperationInterface {
-  stock: any
-  limit_num: any
-  point: any
-  price: any
+    stock:any,
+    limit_num:any,
+    point:any,
+    price:any,
 }
 const batchOperation = ref<batchOperationInterface>({
-  stock: '',
-  limit_num: '',
-  point: '',
-  price: '',
+    stock:'',
+    limit_num:'',
+    point:'',
+    price:'',
 })
 // 批量复选框
 const toggleCheckbox = ref()
@@ -940,8 +598,8 @@ const isIndeterminate = ref(false)
 
 // 监听批量复选框事件
 const toggleChange = (value: any) => {
-  isIndeterminate.value = false
-  productListTableRef.value.toggleAllSelection()
+    isIndeterminate.value = false
+    productListTableRef.value.toggleAllSelection()
 }
 const productListTableRef = ref()
 
@@ -950,268 +608,231 @@ const multipleSelection: any = ref([])
 
 // 监听表格单行选中
 const handleSelectionChange = (val: []) => {
-  multipleSelection.value = val
+    multipleSelection.value = val
 
-  toggleCheckbox.value = false
-  if (
-    multipleSelection.value.length > 0 &&
-    multipleSelection.value.length < formData.value.product_list.length
-  ) {
-    isIndeterminate.value = true
-  } else {
-    isIndeterminate.value = false
-  }
+    toggleCheckbox.value = false
+    if (multipleSelection.value.length > 0 && multipleSelection.value.length < formData.value.product_list.length) {
+        isIndeterminate.value = true
+    } else {
+        isIndeterminate.value = false
+    }
 
-  if (multipleSelection.value.length == formData.value.product_list.length) {
-    toggleCheckbox.value = true
-  }
+    if (multipleSelection.value.length == formData.value.product_list.length) {
+        toggleCheckbox.value = true
+    }
 }
 //批量设置确认按钮
-const saveBatch = () => {
-  if (!multipleSelection.value.length) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('batchEmptySelectedGoodsTips')}`,
-    })
-    return
-  }
-  if (batchOperation.value.stock) {
-    if (
-      isNaN(batchOperation.value.stock) ||
-      !regExp.number.test(batchOperation.value.stock)
-    ) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('stockTips')}`,
-      })
-      return
-    } else if (batchOperation.value.stock <= 0) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('stockTipsTwo')}`,
-      })
-      return
+const saveBatch = ()=>{
+    if(!multipleSelection.value.length){
+        ElMessage({
+            type: 'warning',
+            message: `${t('batchEmptySelectedGoodsTips')}`
+        })
+        return
     }
-  }
-  if (batchOperation.value.limit_num) {
-    if (
-      isNaN(batchOperation.value.limit_num) ||
-      !regExp.number.test(batchOperation.value.limit_num)
-    ) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('limitTips')}`,
-      })
-      return
-    } else if (batchOperation.value.limit_num <= 0) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('limitTipsTwo')}`,
-      })
-      return
+    if(batchOperation.value.stock){
+        if (isNaN(batchOperation.value.stock) || !regExp.number.test(batchOperation.value.stock)) {
+            ElMessage({
+                type: 'warning',
+                message: `${t('stockTips')}`
+            })
+            return
+        } else if (batchOperation.value.stock <=0) {
+            ElMessage({
+                type: 'warning',
+                message: `${t('stockTipsTwo')}`
+            })
+            return
+        }
     }
-  }
-  if (batchOperation.value.point) {
-    if (
-      isNaN(batchOperation.value.point) ||
-      !regExp.number.test(batchOperation.value.point)
-    ) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('pointTips')}`,
-      })
-      return
-    } else if (batchOperation.value.point <= 0) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('pointTipsTwo')}`,
-      })
-      return
+    if(batchOperation.value.limit_num){
+        if (isNaN(batchOperation.value.limit_num) || !regExp.number.test(batchOperation.value.limit_num)) {
+            ElMessage({
+                type: 'warning',
+                message: `${t('limitTips')}`
+            })
+            return
+        } else if (batchOperation.value.limit_num <=0) {
+            ElMessage({
+                type: 'warning',
+                message: `${t('limitTipsTwo')}`
+            })
+            return
+        }
     }
-  }
-  if (batchOperation.value.price) {
-    if (
-      isNaN(batchOperation.value.price) ||
-      !regExp.digit.test(batchOperation.value.price)
-    ) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('moneyTips')}`,
-      })
-      return
-    } else if (batchOperation.value.price < 0) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('moneyTipsTwo')}`,
-      })
-      return
+    if(batchOperation.value.point){
+        if (isNaN(batchOperation.value.point) || !regExp.number.test(batchOperation.value.point)) {
+            ElMessage({
+                type: 'warning',
+                message: `${t('pointTips')}`
+            })
+            return
+        } else if (batchOperation.value.point <=0) {
+            ElMessage({
+                type: 'warning',
+                message: `${t('pointTipsTwo')}`
+            })
+            return
+        }
     }
-  }
-  formData.value.product_list.forEach((el: any, index: number) => {
-    multipleSelection.value.forEach((v: any) => {
-      if (v.sku_id === el.sku_id) {
-        if (batchOperation.value.stock)
-          el.stock = batchOperation.value.stock + ''
-        if (batchOperation.value.limit_num)
-          el.limit_num = batchOperation.value.limit_num + ''
-        if (batchOperation.value.point)
-          el.point = batchOperation.value.point + ''
-        if (batchOperation.value.price)
-          el.price = batchOperation.value.price + ''
-        if (formRef.value) {
-          formRef.value
-            .validateField('product_list.' + index + '.stock')
-            .catch(() => {})
-          formRef.value
-            .validateField('product_list.' + index + '.limit_num')
-            .catch(() => {})
-          formRef.value
-            .validateField('product_list.' + index + '.point')
-            .catch(() => {})
-          formRef.value
-            .validateField('product_list.' + index + '.price')
-            .catch(() => {})
+    if(batchOperation.value.price){
+        if (isNaN(batchOperation.value.price) || !regExp.digit.test(batchOperation.value.price)) {
+            ElMessage({
+                type: 'warning',
+                message: `${t('moneyTips')}`
+            })
+            return
+        } else if (batchOperation.value.price <0) {
+            ElMessage({
+                type: 'warning',
+                message: `${t('moneyTipsTwo')}`
+            })
+            return
         }
-      }
+    }
+    formData.value.product_list.forEach((el:any,index:number)=>{
+        multipleSelection.value.forEach((v:any)=>{
+            if(v.sku_id === el.sku_id){
+                if(batchOperation.value.stock) el.stock = batchOperation.value.stock+''
+                if(batchOperation.value.limit_num) el.limit_num = batchOperation.value.limit_num+''
+                if(batchOperation.value.point) el.point = batchOperation.value.point+''
+                if(batchOperation.value.price) el.price = batchOperation.value.price+''
+                if(formRef.value){
+                    formRef.value.validateField('product_list.'+ index + '.stock').catch(()=>{})
+                    formRef.value.validateField('product_list.'+ index + '.limit_num').catch(()=>{})
+                    formRef.value.validateField('product_list.'+ index + '.point').catch(()=>{})
+                    formRef.value.validateField('product_list.'+ index + '.price').catch(()=>{})
+                }
+            }
+        })
+
     })
-  })
-  isIndeterminate.value = false
-  toggleCheckbox.value = false
-  batchOperation.value = {
-    stock: '',
-    limit_num: '',
-    point: '',
-    price: '',
-  }
-  productListTableRef.value.clearSelection()
+    isIndeterminate.value = false
+    toggleCheckbox.value = false
+    batchOperation.value={
+            stock:'',
+            limit_num:'',
+            point:'',
+            price:'',
+    }
+    productListTableRef.value.clearSelection()
 }
 /********** 优惠券 ***********/
-const couponSelect = (value: any) => {
-  formData.value.product_list = Object.values(value)
+const couponSelect = (value:any)=>{
+    formData.value.product_list = Object.values(value)
 }
 /**** 提交 ****/
 const onSave = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-
-      if (formData.value.type == 'goods') {
-        formData.value.product_detail = JSON.stringify(
-          formData.value.product_list
-            .map((el: any) => {
-              return {
-                goods_id: el.goods_id,
-                sku_id: el.sku_id,
-                point: el.point || '0',
-                price: el.price || '0',
-                limit_num: el.limit_num || '0',
-                stock: el.stock || '0',
-                is_enabled: el.is_enabled,
-              }
-            })
-            .filter((el: any) => el.is_enabled === 1)
-        )
-      } else if (formData.value.type == 'coupon') {
-        formData.value.product_detail = JSON.stringify(
-          formData.value.product_list.map((el: any) => {
-            return {
-              coupon_id: el.id,
+    if (loading.value || !formEl) return
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+           
+            if(formData.value.type == 'goods'){
+                formData.value.product_detail = JSON.stringify(formData.value.product_list.map((el:any)=>{
+                    return {
+                        goods_id:el.goods_id,
+                        sku_id:el.sku_id,
+                        point:el.point||'0',
+                        price:el.price||'0',
+                        limit_num:el.limit_num||'0',
+                        stock:el.stock||'0',
+                        is_enabled:el.is_enabled
+                    }
+                }).filter((el:any)=>el.is_enabled===1))
+            } else if(formData.value.type == 'coupon'){
+                formData.value.product_detail = JSON.stringify(formData.value.product_list.map((el:any)=>{
+                    return {
+                        coupon_id:el.id,
+                    }
+                }))
+            }else{
+                if(formData.value.isBalance){
+                    formData.value.product_detail=JSON.stringify([{balance:formData.value.balance}])
+                }else{
+                    formData.value.product_detail=JSON.stringify([{money:formData.value.balance}])
+                }
             }
-          })
-        )
-      } else {
-        if (formData.value.isBalance) {
-          formData.value.product_detail = JSON.stringify([
-            { balance: formData.value.balance },
-          ])
-        } else {
-          formData.value.product_detail = JSON.stringify([
-            { money: formData.value.balance },
-          ])
+            // formData.value.goods_data =  JSON.stringify(formData.value.product_list.filter((el:any)=>{
+            //     return el.is_enabled==1
+            // }))
+            const save = addActiveExchange
+            save(formData.value).then(res => {
+                loading.value = false
+                history.back()
+            }).catch(() => {
+                loading.value = false
+            })
         }
-      }
-      // formData.value.goods_data =  JSON.stringify(formData.value.product_list.filter((el:any)=>{
-      //     return el.is_enabled==1
-      // }))
-      const save = addActiveExchange
-      save(formData.value)
-        .then((res) => {
-          loading.value = false
-          history.back()
-        })
-        .catch(() => {
-          loading.value = false
-        })
-    }
-  })
+    })
 }
 const back = () => {
-  router.push('/shop/marketing/exchange/goods_list')
+    router.push('/shop/marketing/exchange/goods_list')
 }
 </script>
 
 <style lang="scss" scoped>
 .goods-type-wrap {
-  width: 120px;
-  height: 60px;
-  background: #fff;
-  border-radius: 3px;
-  float: left;
-  text-align: center;
-  // padding-top: 8px;
-  position: relative;
-  cursor: pointer;
-  line-height: 23px;
-  border: 1px solid #e7e7e7;
+    width: 120px;
+    height: 60px;
+    background: #fff;
+    border-radius: 3px;
+    float: left;
+    text-align: center;
+    // padding-top: 8px;
+    position: relative;
+    cursor: pointer;
+    line-height: 23px;
+    border: 1px solid #e7e7e7;
 
-  .goods-type-name {
-    font-size: 14px;
-    font-weight: 600;
-    color: rgba(0, 0, 0, 0.85);
-  }
+    .goods-type-name {
+        font-size: 14px;
+        font-weight: 600;
+        color: rgba(0, 0, 0, .85);
+    }
 
-  .goods-type-desc {
-    font-size: 12px;
-    font-weight: 400;
-    color: #999;
-  }
+    .goods-type-desc {
+        font-size: 12px;
+        font-weight: 400;
+        color: #999;
+    }
+
+    .triangle {
+        position: absolute;
+        bottom: 0;
+        right: 0;
+        width: 0;
+        height: 0;
+        border-bottom: 26px solid var(--el-color-primary);
+        border-left: 26px solid transparent;
+    }
 
-  .triangle {
-    position: absolute;
-    bottom: 0;
-    right: 0;
-    width: 0;
-    height: 0;
-    border-bottom: 26px solid var(--el-color-primary);
-    border-left: 26px solid transparent;
-  }
+    .selected {
+        position: absolute;
+        bottom: -2px;
+        right: 2px;
+        color: #fff;
+    }
 
-  .selected {
-    position: absolute;
-    bottom: -2px;
-    right: 2px;
-    color: #fff;
-  }
+    &.selected {
+        border: 1px solid var(--el-color-primary);
+    }
 
-  &.selected {
-    border: 1px solid var(--el-color-primary);
-  }
+    &.disabled {
+        cursor: not-allowed;
 
-  &.disabled {
-    cursor: not-allowed;
+        .goods-type-name {
+            color: #999;
+        }
+    }
 
-    .goods-type-name {
-      color: #999;
+    &:nth-child(2n) {
+        margin: 0 12px;
     }
-  }
 
-  &:nth-child(2n) {
-    margin: 0 12px;
-  }
 }
 .sku_list :deep(.cell) {
-  // min-height: 60px !important;
-  overflow: initial !important;
+    // min-height: 60px !important;
+    overflow: initial !important;
 }
 </style>
diff --git a/admin/src/addon/shop/views/marketing/exchange/goods_edit.vue b/admin/src/addon/shop/views/marketing/exchange/goods_edit.vue
index 33ca9871..74ef02cd 100644
--- a/admin/src/addon/shop/views/marketing/exchange/goods_edit.vue
+++ b/admin/src/addon/shop/views/marketing/exchange/goods_edit.vue
@@ -1,772 +1,461 @@
 <template>
-  <div class="main-container" v-loading="loading">
-    <el-card class="card !border-none" shadow="never">
-      <el-page-header :content="pageName" :icon="ArrowLeft" @back="back()" />
-    </el-card>
+    <div class="main-container" v-loading="loading">
 
-    <!-- 表单 -->
-    <el-form
-      class="page-form mt-[15px]"
-      :model="formData"
-      label-width="120px"
-      ref="formRef"
-      :rules="formRules"
-    >
-      <el-card class="box-card !border-none" shadow="never">
-        <h3 class="panel-title !text-sm">{{ t('baseInfo') }}</h3>
+		<el-card class="card !border-none" shadow="never">
+		    <el-page-header :content="pageName" :icon="ArrowLeft" @back="back()" />
+		</el-card>
 
-        <!-- 选择商品 -->
-        <el-form-item :label="t('goodsSelect')" v-if="formData.type == 'goods'">
-          <div
-            class="flex min-w-[512px] relative border-[1px] border-[#e7e7e7] border-solid mt-[16px]"
-            v-if="Object.keys(formData.goods_info).length"
-          >
-            <div class="min-w-[78px] h-[78px] flex items-center justify-center">
-              <el-image
-                v-if="formData.goods_info.goods_cover"
-                class="w-[78px] h-[78px]"
-                :src="img(formData.goods_info.goods_cover)"
-                fit="contain"
-              >
-                <template #error>
-                  <div class="image-slot">
-                    <img
-                      class="w-[78px] h-[78px]"
-                      src="@/addon/shop/assets/goods_default.png"
-                    />
-                  </div>
-                </template>
-              </el-image>
-              <img
-                v-else
-                class="w-[78px] h-[78px]"
-                src="@/addon/shop/assets/goods_default.png"
-                fit="contain"
-              />
-            </div>
-            <div class="flex-1 py-[5px] pl-[10px] pr-[30px]">
-              <div class="text-[14px]">
-                {{ formData.goods_info.goods_name }}
-              </div>
-              <div class="text-[14px] !text-[var(--el-color-primary)]">
-                {{ formData.goods_info.goods_price }}
-              </div>
-            </div>
-          </div>
-        </el-form-item>
-        <!-- 商品名称 -->
-        <el-form-item :label="t('goodsName')" prop="names">
-          <el-input
-            v-model.trim="formData.names"
-            type="textarea"
-            clearable
-            :placeholder="t('goodsNamePlaceholder')"
-            class="!w-[512px]"
-            show-word-limit
-            :maxlength="60"
-          />
-        </el-form-item>
-        <!-- 商品标题 -->
-        <el-form-item :label="t('goodsTitle')">
-          <el-input
-            v-model.trim="formData.title"
-            type="textarea"
-            clearable
-            :placeholder="t('goodsTitlePlaceholder')"
-            class="!w-[512px]"
-            show-word-limit
-            :maxlength="60"
-          />
-        </el-form-item>
-        <!-- 商品图片 -->
-        <el-form-item :label="t('image')" prop="image">
-          <upload-image v-model="formData.image" :limit="6" />
-        </el-form-item>
-      </el-card>
+        <!-- 表单 -->
+        <el-form class="page-form mt-[15px]" :model="formData" label-width="120px" ref="formRef" :rules="formRules">
+            <el-card class="box-card !border-none" shadow="never">
+                <h3 class="panel-title !text-sm">{{ t('baseInfo') }}</h3>
 
-      <el-card
-        class="box-card !border-none"
-        shadow="never"
-        v-if="formData.type == 'goods'"
-      >
-        <h3 class="panel-title !text-sm">{{ t('redemptionSettings') }}</h3>
+                <!-- 选择商品 -->
+                <el-form-item :label="t('goodsSelect')" v-if="formData.type=='goods'">
+                        <div class="flex min-w-[512px] relative border-[1px] border-[#e7e7e7] border-solid mt-[16px]" v-if="Object.keys(formData.goods_info).length">
+                            <div class="min-w-[78px] h-[78px] flex items-center justify-center">
+                                <el-image v-if="formData.goods_info.goods_cover" class="w-[78px] h-[78px]" :src="img(formData.goods_info.goods_cover)" fit="contain">
+                                    <template #error>
+                                        <div class="image-slot">
+                                            <img class="w-[78px] h-[78px]" src="@/addon/shop/assets/goods_default.png" />
+                                        </div>
+                                    </template>
+                                </el-image>
+                                <img v-else class="w-[78px] h-[78px]" src="@/addon/shop/assets/goods_default.png" fit="contain" />
+                            </div>
+                            <div class="flex-1 py-[5px] pl-[10px] pr-[30px]">
+                                <div class="text-[14px]">{{ formData.goods_info.goods_name }}</div>
+                                <div class="text-[14px] !text-[var(--el-color-primary)]">{{ formData.goods_info.goods_price }}</div>
+                            </div>
+                        </div>
+                </el-form-item>
+                <!-- 商品名称 -->
+                <el-form-item :label="t('goodsName')" prop="names">
+                    <el-input v-model.trim="formData.names" type="textarea" clearable :placeholder="t('goodsNamePlaceholder')" class="!w-[512px]" show-word-limit :maxlength="60" />
+                </el-form-item>
+                <!-- 商品标题 -->
+                <el-form-item :label="t('goodsTitle')">
+                    <el-input v-model.trim="formData.title" type="textarea" clearable :placeholder="t('goodsTitlePlaceholder')" class="!w-[512px]" show-word-limit :maxlength="60" />
+                </el-form-item>
+                <!-- 商品图片 -->
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image"  :limit="6"/>
+                </el-form-item>
+            </el-card>
 
-        <el-form-item v-if="formData.product_list.length">
-          <div class="w-full sku_list">
-            <div class="flex items-center mb-[15px]">
-              <el-checkbox
-                v-model="toggleCheckbox"
-                size="large"
-                class="!mr-[15px]"
-                @change="toggleChange"
-                :indeterminate="isIndeterminate"
-              >
-                <span>已选{{ multipleSelection.length }}项</span>
-              </el-checkbox>
+            <el-card class="box-card !border-none" shadow="never" v-if="formData.type=='goods'">
+                <h3 class="panel-title !text-sm">{{ t('redemptionSettings') }}</h3>
 
-              <label>{{ t('batchOperation') }}</label>
-              <el-input
-                v-model.trim="batchOperation.stock"
-                clearable
-                :placeholder="t('stock')"
-                class="!w-[130px] ml-[10px]"
-                maxlength="8"
-              />
-              <el-input
-                v-model.trim="batchOperation.limit_num"
-                clearable
-                :placeholder="t('limit')"
-                class="!w-[130px] ml-[10px]"
-                maxlength="8"
-              />
-              <el-input
-                v-model.trim="batchOperation.point"
-                clearable
-                :placeholder="t('integralUnit')"
-                class="!w-[130px] ml-[10px]"
-                maxlength="8"
-              />
-              <el-input
-                v-model.trim="batchOperation.price"
-                clearable
-                :placeholder="t('newPrice')"
-                class="!w-[130px] ml-[10px]"
-                maxlength="8"
-              />
-              <el-button class="ml-[10px]" type="primary" @click="saveBatch">{{
-                t('confirm')
-              }}</el-button>
-            </div>
-            <el-table
-              class="!max-w-[100%]"
-              :data="formData.product_list"
-              size="large"
-              ref="productListTableRef"
-              @selection-change="handleSelectionChange"
-            >
-              <template #empty>
-                <span>{{ t('emptyData') }}</span>
-              </template>
-              <el-table-column type="selection" width="55" />
-              <el-table-column
-                :label="t('goodsSelectPopupGoodsInfo')"
-                min-width="300"
-              >
-                <template #default="{ row }">
-                  <div class="flex items-center cursor-pointer">
-                    <div
-                      class="min-w-[60px] h-[60px] flex items-center justify-center"
-                    >
-                      <el-image
-                        v-if="row.sku_image"
-                        class="w-[60px] h-[60px]"
-                        :src="img(row.sku_image)"
-                        fit="contain"
-                      >
-                        <template #error>
-                          <div class="image-slot">
-                            <img
-                              class="w-[60px] h-[60px]"
-                              src="@/addon/shop/assets/goods_default.png"
-                            />
-                          </div>
-                        </template>
-                      </el-image>
-                      <img
-                        v-else
-                        class="w-[70px] h-[60px]"
-                        src="@/addon/shop/assets/goods_default.png"
-                        fit="contain"
-                      />
-                    </div>
-                    <div class="ml-2">
-                      <span :title="row.sku_name" class="multi-hidden">{{
-                        row.sku_name || row.goods?.goods_name
-                      }}</span>
+                <el-form-item v-if="formData.product_list.length">
+                    <div class="w-full sku_list">
+                        <div class="flex items-center mb-[15px]">
+                            <el-checkbox v-model="toggleCheckbox" size="large" class="!mr-[15px]" @change="toggleChange" :indeterminate="isIndeterminate">
+                                <span>已选{{ multipleSelection.length }}项</span>
+                            </el-checkbox>
+
+                            <label>{{ t('batchOperation') }}</label>
+                            <el-input v-model.trim="batchOperation.stock" clearable :placeholder="t('stock')" class="!w-[130px] ml-[10px]" maxlength="8" />
+                            <el-input v-model.trim="batchOperation.limit_num" clearable :placeholder="t('limit')" class="!w-[130px] ml-[10px]" maxlength="8" />
+                            <el-input v-model.trim="batchOperation.point" clearable :placeholder="t('integralUnit')" class="!w-[130px] ml-[10px]" maxlength="8" />
+                            <el-input v-model.trim="batchOperation.price" clearable :placeholder="t('newPrice')" class="!w-[130px] ml-[10px]" maxlength="8" />
+                            <el-button class="ml-[10px]" type="primary" @click="saveBatch">{{ t('confirm') }}</el-button>
+                        </div>
+                        <el-table class="!max-w-[100%]" :data="formData.product_list" size="large" ref="productListTableRef" @selection-change="handleSelectionChange">
+                            <template #empty>
+                                <span>{{ t('emptyData')}}</span>
+                            </template>
+                            <el-table-column type="selection" width="55" />
+                            <el-table-column :label="t('goodsSelectPopupGoodsInfo')" min-width="300">
+                                <template #default="{ row }">
+                                    <div class="flex items-center cursor-pointer">
+                                        <div class="min-w-[60px] h-[60px] flex items-center justify-center">
+                                            <el-image v-if="row.sku_image" class="w-[60px] h-[60px]" :src="img(row.sku_image)" fit="contain">
+                                                <template #error>
+                                                    <div class="image-slot">
+                                                        <img class="w-[60px] h-[60px]" src="@/addon/shop/assets/goods_default.png" />
+                                                    </div>
+                                                </template>
+                                            </el-image>
+                                            <img v-else class="w-[70px] h-[60px]" src="@/addon/shop/assets/goods_default.png" fit="contain" />
+                                        </div>
+                                        <div class="ml-2">
+                                            <span :title="row.sku_name" class="multi-hidden">{{ row.sku_name||row.goods?.goods_name }}</span>
+                                        </div>
+                                    </div>
+                                </template>
+                            </el-table-column>
+                            <el-table-column prop="goods_price" :label="t('price')" min-width="170" />
+                            <el-table-column prop="goods_stock" :label="t('goodsStock')" min-width="170" />
+                            <el-table-column :label="t('stock')" min-width="200">
+                                <template #default="{ row,$index }">
+                                    <el-form-item v-if="row.is_enabled" :prop="'product_list.'+ $index + '.stock'" :rules="[{
+                                        trigger: 'blur',
+                                        validator: (rule: any, value: any, callback: any) => {
+                                                if (value.length == 0) {
+                                                    callback(t('stockPlaceholder'))
+                                                } else if (isNaN(value) || !regExp.number.test(value)) {
+                                                    callback(t('stockTips'))
+                                                } else if (value <=0) {
+                                                    callback(t('stockTipsTwo'))
+                                                }else if(parseInt(value)>parseInt(row.goods_stock)){
+                                                    callback(t('stockTipsThree'))
+                                                }else {
+                                                    callback();
+                                                }
+                                        }
+                                        }]" class="sku-form-item-wrap">
+                                        <!-- @blur="inputBlur(row,'reduce',$index)" -->
+                                        <el-input v-model.trim="row.stock"  class="!w-[200px]" clearable placeholder="0" maxlength="8" />
+                                    </el-form-item>
+                                    <span v-else>--</span>
+                                </template>
+                            </el-table-column>
+                            <el-table-column :label="t('limit')" min-width="200">
+                                <template #header>
+                                    <div style="display: inline-flex; align-items: center">
+                                        <span class="mr-[5px]">{{ t('limit') }}</span>
+                                        <el-tooltip class="box-item" effect="light" :content="t('limitRules')" placement="top">
+                                        <el-icon color="#666">
+                                            <QuestionFilled />
+                                        </el-icon>
+                                        </el-tooltip>
+                                    </div>
+                                </template>
+                                <template #default="{ row,$index }">
+                                    <el-form-item v-if="row.is_enabled" :prop="'product_list.'+ $index + '.limit_num'" :rules="[{
+                                        trigger: 'blur',
+                                        validator: (rule: any, value: any, callback: any) => {
+                                                if (value.length == 0) {
+                                                    callback(t('limitPlaceholder'))
+                                                } else if (isNaN(value) || !regExp.number.test(value)) {
+                                                    callback(t('limitTips'))
+                                                } else if (value <=0) {
+                                                    callback(t('limitTipsTwo'))
+                                                } else if (value > Number(row.stock)) {
+                                                    callback(t('limitTipsThree'))
+                                                } else if(parseInt(value)>parseInt(row.goods_stock)){
+                                                    callback(t('stockTipsThree'))
+                                                } else { 
+                                                    callback();
+                                                }
+                                        }
+                                        }]" class="sku-form-item-wrap">
+                                        <!-- @blur="inputBlur(row,'reduce',$index)" -->
+                                        <el-input v-model.trim="row.limit_num" class="!w-[200px]" clearable placeholder="0" maxlength="8" >
+                                            <template #append>
+                                                <span>{{t('limitUnit')}}</span>
+                                            </template>
+                                        </el-input>
+                                        </el-form-item>
+                                        <span v-else>--</span>
+                                </template>
+                            </el-table-column>
+                            <el-table-column :label="t('money')" min-width="550" align="center">
+                                <template #default="{ row,$index }">
+                                    <div class="flex justify-center">
+                                        <el-form-item v-if="row.is_enabled" :prop="'product_list.'+ $index + '.point'" :rules="[{
+                                            trigger: 'blur',
+                                            validator: (rule: any, value: any, callback: any) => {
+                                                    if (value.length == 0) {
+                                                        callback(t('pointPlaceholder'))
+                                                    } else if (isNaN(value) || !regExp.number.test(value)) {
+                                                            callback(t('pointTips'))
+                                                        } else if (value <=0) {
+                                                            callback(t('pointTipsTwo'))
+                                                        } else{
+                                                            callback();
+                                                        }
+                                                    }
+                                            }]" class="sku-form-item-wrap">
+                                            <!-- @blur="inputBlur(row,'reduce',$index)" -->
+                                            <el-input v-model.trim="row.point" class="!w-[200px]"  clearable placeholder="0" maxlength="8" >
+                                                <template #append>
+                                                    <span>{{t('integralUnit')}}</span>
+                                                </template>
+                                            </el-input>
+                                        </el-form-item>
+                                        <span v-else>--</span>
+                                        <span v-if="row.is_enabled" class="mx-[20px]">+</span>
+                                        <el-form-item v-if="row.is_enabled" :prop="'product_list.'+ $index + '.price'" :rules="[{
+                                            trigger: 'blur',
+                                            validator: (rule: any, value: any, callback: any) => {
+                                                    if(value.length){
+                                                        if (isNaN(value) || !regExp.digit.test(value)) {
+                                                            callback(t('moneyTips'))
+                                                        } else if (value <0) {
+                                                            callback(t('moneyTipsTwo'))
+                                                        }else{
+                                                            callback();
+                                                        }
+                                                    }else {
+                                                        callback();
+                                                    }
+                                            }
+                                            }]" class="sku-form-item-wrap">
+                                            <!-- @blur="inputBlur(row,'reduce',$index)" -->
+                                            <el-input v-model.trim="row.price" class="!w-[200px]"  clearable placeholder="0.00" maxlength="8" >
+                                                <template #append>
+                                                    <span>{{t('prickUnit')}}</span>
+                                                </template>
+                                            </el-input>
+                                        </el-form-item>
+                                    </div>
+                                </template>
+                            </el-table-column>
+                            <el-table-column :label="t('operation')" fixed="right" align="right" min-width="160">
+                                <template #default="{row}">
+                                    <el-button type="primary" link @click="enabledEvent(row)">{{ row.is_enabled?t('noEnabled'):t('enabled') }}</el-button>
+                                </template>
+                            </el-table-column>
+                        </el-table>
                     </div>
-                  </div>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="goods_price"
-                :label="t('price')"
-                min-width="170"
-              />
-              <el-table-column
-                prop="goods_stock"
-                :label="t('goodsStock')"
-                min-width="170"
-              />
-              <el-table-column :label="t('stock')" min-width="200">
-                <template #default="{ row, $index }">
-                  <el-form-item
-                    v-if="row.is_enabled"
-                    :prop="'product_list.' + $index + '.stock'"
-                    :rules="[
-                      {
-                        trigger: 'blur',
-                        validator: (rule: any, value: any, callback: any) => {
-                          if (value.length == 0) {
+                </el-form-item>
+            </el-card>
+
+            <el-card class="box-card !border-none" shadow="never" v-if="formData.type=='coupon'&&formData.product_list.length">
+                <h3 class="panel-title !text-sm">{{ t('redemptionSettings') }}</h3>
+
+                <!-- 兑换库存 -->
+                <el-form-item :label="t('stock')" prop="stock"  :rules="[{
+                    required: true,
+                    trigger: 'blur',
+                    validator: (rule: any, value: any, callback: any) => {
+                        if (value.length == 0) {
                             callback(t('stockPlaceholder'))
-                          } else if (
-                            isNaN(value) ||
-                            !regExp.number.test(value)
-                          ) {
+                        } else if (isNaN(value) || !regExp.number.test(value)) {
                             callback(t('stockTips'))
-                          } else if (value <= 0) {
+                        } else if (value <=0) {
                             callback(t('stockTipsTwo'))
-                          } else if (
-                            parseInt(value) > parseInt(row.goods_stock)
-                          ) {
-                            callback(t('stockTipsThree'))
-                          } else {
-                            callback()
-                          }
-                        },
-                      },
-                    ]"
-                    class="sku-form-item-wrap"
-                  >
-                    <!-- @blur="inputBlur(row,'reduce',$index)" -->
-                    <el-input
-                      v-model.trim="row.stock"
-                      class="!w-[200px]"
-                      clearable
-                      placeholder="0"
-                      maxlength="8"
-                    />
-                  </el-form-item>
-                  <span v-else>--</span>
-                </template>
-              </el-table-column>
-              <el-table-column :label="t('limit')" min-width="200">
-                <template #header>
-                  <div style="display: inline-flex; align-items: center">
-                    <span class="mr-[5px]">{{ t('limit') }}</span>
-                    <el-tooltip
-                      class="box-item"
-                      effect="light"
-                      :content="t('limitRules')"
-                      placement="top"
-                    >
-                      <el-icon color="#666">
-                        <QuestionFilled />
-                      </el-icon>
-                    </el-tooltip>
-                  </div>
-                </template>
-                <template #default="{ row, $index }">
-                  <el-form-item
-                    v-if="row.is_enabled"
-                    :prop="'product_list.' + $index + '.limit_num'"
-                    :rules="[
-                      {
-                        trigger: 'blur',
-                        validator: (rule: any, value: any, callback: any) => {
-                          if (value.length == 0) {
-                            callback(t('limitPlaceholder'))
-                          } else if (
-                            isNaN(value) ||
-                            !regExp.number.test(value)
-                          ) {
-                            callback(t('limitTips'))
-                          } else if (value <= 0) {
-                            callback(t('limitTipsTwo'))
-                          } else if (value > Number(row.stock)) {
-                            callback(t('limitTipsThree'))
-                          } else if (
-                            parseInt(value) > parseInt(row.goods_stock)
-                          ) {
+                        }else if(formData.product_list[0].remain_count != '-1'&&value>formData.product_list[0].remain_count.remain_count){
                             callback(t('stockTipsThree'))
-                          } else {
-                            callback()
-                          }
-                        },
-                      },
-                    ]"
-                    class="sku-form-item-wrap"
-                  >
-                    <!-- @blur="inputBlur(row,'reduce',$index)" -->
-                    <el-input
-                      v-model.trim="row.limit_num"
-                      class="!w-[200px]"
-                      clearable
-                      placeholder="0"
-                      maxlength="8"
-                    >
-                      <template #append>
-                        <span>{{ t('limitUnit') }}</span>
-                      </template>
-                    </el-input>
-                  </el-form-item>
-                  <span v-else>--</span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                :label="t('money')"
-                min-width="550"
-                align="center"
-              >
-                <template #default="{ row, $index }">
-                  <div class="flex justify-center">
-                    <el-form-item
-                      v-if="row.is_enabled"
-                      :prop="'product_list.' + $index + '.point'"
-                      :rules="[
-                        {
-                          trigger: 'blur',
-                          validator: (rule: any, value: any, callback: any) => {
-                            if (value.length == 0) {
-                              callback(t('pointPlaceholder'))
-                            } else if (
-                              isNaN(value) ||
-                              !regExp.number.test(value)
-                            ) {
-                              callback(t('pointTips'))
-                            } else if (value <= 0) {
-                              callback(t('pointTipsTwo'))
-                            } else {
-                              callback()
-                            }
-                          },
-                        },
-                      ]"
-                      class="sku-form-item-wrap"
-                    >
-                      <!-- @blur="inputBlur(row,'reduce',$index)" -->
-                      <el-input
-                        v-model.trim="row.point"
-                        class="!w-[200px]"
-                        clearable
-                        placeholder="0"
-                        maxlength="8"
-                      >
-                        <template #append>
-                          <span>{{ t('integralUnit') }}</span>
-                        </template>
-                      </el-input>
-                    </el-form-item>
-                    <span v-else>--</span>
-                    <span v-if="row.is_enabled" class="mx-[20px]">+</span>
-                    <el-form-item
-                      v-if="row.is_enabled"
-                      :prop="'product_list.' + $index + '.price'"
-                      :rules="[
-                        {
-                          trigger: 'blur',
-                          validator: (rule: any, value: any, callback: any) => {
-                            if (value.length) {
-                              if (isNaN(value) || !regExp.digit.test(value)) {
-                                callback(t('moneyTips'))
-                              } else if (value < 0) {
-                                callback(t('moneyTipsTwo'))
-                              } else {
-                                callback()
-                              }
-                            } else {
-                              callback()
-                            }
-                          },
-                        },
-                      ]"
-                      class="sku-form-item-wrap"
-                    >
-                      <!-- @blur="inputBlur(row,'reduce',$index)" -->
-                      <el-input
-                        v-model.trim="row.price"
-                        class="!w-[200px]"
-                        clearable
-                        placeholder="0.00"
-                        maxlength="8"
-                      >
-                        <template #append>
-                          <span>{{ t('prickUnit') }}</span>
-                        </template>
-                      </el-input>
-                    </el-form-item>
-                  </div>
-                </template>
-              </el-table-column>
-              <el-table-column
-                :label="t('operation')"
-                fixed="right"
-                align="right"
-                min-width="160"
-              >
-                <template #default="{ row }">
-                  <el-button type="primary" link @click="enabledEvent(row)">{{
-                    row.is_enabled ? t('noEnabled') : t('enabled')
-                  }}</el-button>
-                </template>
-              </el-table-column>
-            </el-table>
-          </div>
-        </el-form-item>
-      </el-card>
-
-      <el-card
-        class="box-card !border-none"
-        shadow="never"
-        v-if="formData.type == 'coupon' && formData.product_list.length"
-      >
-        <h3 class="panel-title !text-sm">{{ t('redemptionSettings') }}</h3>
-
-        <!-- 兑换库存 -->
-        <el-form-item
-          :label="t('stock')"
-          prop="stock"
-          :rules="[
-            {
-              required: true,
-              trigger: 'blur',
-              validator: (rule: any, value: any, callback: any) => {
-                if (value.length == 0) {
-                  callback(t('stockPlaceholder'))
-                } else if (isNaN(value) || !regExp.number.test(value)) {
-                  callback(t('stockTips'))
-                } else if (value <= 0) {
-                  callback(t('stockTipsTwo'))
-                } else if (
-                  formData.product_list[0].remain_count != '-1' &&
-                  value > formData.product_list[0].remain_count.remain_count
-                ) {
-                  callback(t('stockTipsThree'))
-                } else {
-                  callback()
-                }
-              },
-            },
-          ]"
-        >
-          <el-input
-            v-model.trim="formData.stock"
-            clearable
-            :placeholder="t('stockPlaceholder')"
-            class="input-width"
-          />
-        </el-form-item>
-        <!-- 兑换限制 -->
-        <el-form-item
-          :label="t('limit')"
-          prop="limit_num"
-          :rules="[
-            {
-              trigger: 'blur',
-              validator: (rule: any, value: any, callback: any) => {
-                if (value) {
-                  if (isNaN(value) || !regExp.number.test(value)) {
-                    callback(t('limitTips'))
-                  } else if (value <= 0) {
-                    callback(t('limitTipsTwo'))
-                  } else {
-                    callback()
-                  }
-                } else {
-                  callback()
-                }
-              },
-            },
-          ]"
-        >
-          <el-input
-            v-model.trim="formData.limit_num"
-            clearable
-            :placeholder="t('limitPlaceholder')"
-            class="input-width"
-          />
-        </el-form-item>
-        <!-- 兑换价 -->
-        <el-form-item :label="t('money')" required>
-          <div class="flex justify-center">
-            <el-form-item
-              prop="point"
-              :rules="[
-                {
-                  trigger: 'blur',
-                  validator: (rule: any, value: any, callback: any) => {
-                    if (value.length == 0) {
-                      callback(t('pointPlaceholder'))
-                    } else if (value.length) {
-                      if (isNaN(value) || !regExp.number.test(value)) {
-                        callback(t('pointTips'))
-                      } else if (value <= 0) {
-                        callback(t('pointTipsTwo'))
-                      } else {
-                        callback()
-                      }
-                    } else {
-                      callback()
+                        }else {
+                            callback();
+                        }
                     }
-                  },
-                },
-              ]"
-              class="sku-form-item-wrap"
-            >
-              <!-- @blur="inputBlur(row,'reduce',$index)" -->
-              <el-input
-                v-model.trim="formData.point"
-                class="!w-[200px]"
-                clearable
-                placeholder="0"
-                maxlength="8"
-              >
-                <template #append>
-                  <span>{{ t('integralUnit') }}</span>
-                </template>
-              </el-input>
-            </el-form-item>
-            <span class="mx-[20px]">+</span>
-            <el-form-item
-              prop="price"
-              :rules="[
-                {
-                  trigger: 'blur',
-                  validator: (rule: any, value: any, callback: any) => {
-                    if (value.length) {
-                      if (isNaN(value) || !regExp.digit.test(value)) {
-                        callback(t('moneyTips'))
-                      } else if (value < 0) {
-                        callback(t('moneyTipsTwo'))
-                      } else {
-                        callback()
-                      }
-                    } else {
-                      callback()
+                }]">
+                    <el-input v-model.trim="formData.stock" clearable :placeholder="t('stockPlaceholder')" class="input-width" />
+                </el-form-item>
+                <!-- 兑换限制 -->
+                <el-form-item :label="t('limit')" prop="limit_num"  :rules="[{
+                    trigger: 'blur',
+                    validator: (rule: any, value: any, callback: any) => {
+                        if(value){
+                            if (isNaN(value) || !regExp.number.test(value)) {
+                                callback(t('limitTips'))
+                            } else if (value <=0) {
+                                callback(t('limitTipsTwo'))
+                            }else {
+                                callback();
+                            }
+                        }else{
+                            callback();
+                        }
                     }
-                  },
-                },
-              ]"
-              class="sku-form-item-wrap"
-            >
-              <!-- @blur="inputBlur(row,'reduce',$index)" -->
-              <el-input
-                v-model.trim="formData.price"
-                class="!w-[200px]"
-                clearable
-                placeholder="0.00"
-                maxlength="8"
-              >
-                <template #append>
-                  <span>{{ t('prickUnit') }}</span>
-                </template>
-              </el-input>
-            </el-form-item>
-          </div>
-        </el-form-item>
-      </el-card>
+                }]">
+                    <el-input v-model.trim="formData.limit_num" clearable :placeholder="t('limitPlaceholder')" class="input-width" />
+                </el-form-item>
+                <!-- 兑换价 -->
+	            <el-form-item :label="t('money')" required>
+		            <div class="flex justify-center">
+			            <el-form-item prop="point" :rules="[{
+                                            trigger: 'blur',
+                                            validator: (rule: any, value: any, callback: any) => {
+                                                    if (value.length == 0) {
+                                                        callback(t('pointPlaceholder'))
+                                                    } else if(value.length){
+                                                        if (isNaN(value) || !regExp.number.test(value)) {
+                                                            callback(t('pointTips'))
+                                                        } else if (value <=0) {
+                                                            callback(t('pointTipsTwo'))
+                                                        } else{
+                                                            callback();
+                                                        }
+                                                    } else {
+                                                        callback();
+                                                    }
+                                            }
+                                            }]" class="sku-form-item-wrap">
+				            <!-- @blur="inputBlur(row,'reduce',$index)" -->
+				            <el-input v-model.trim="formData.point" class="!w-[200px]" clearable placeholder="0" maxlength="8">
+					            <template #append>
+						            <span>{{t('integralUnit')}}</span>
+					            </template>
+				            </el-input>
+			            </el-form-item>
+			            <span class="mx-[20px]">+</span>
+			            <el-form-item prop="price" :rules="[{
+                                            trigger: 'blur',
+                                            validator: (rule: any, value: any, callback: any) => {
+                                                    if(value.length){
+                                                        if (isNaN(value) || !regExp.digit.test(value)) {
+                                                            callback(t('moneyTips'))
+                                                        } else if (value <0) {
+                                                            callback(t('moneyTipsTwo'))
+                                                        }else{
+                                                            callback();
+                                                        }
+                                                    }else {
+                                                        callback();
+                                                    }
+                                            }
+                                            }]" class="sku-form-item-wrap">
+				            <!-- @blur="inputBlur(row,'reduce',$index)" -->
+				            <el-input v-model.trim="formData.price" class="!w-[200px]" clearable placeholder="0.00" maxlength="8">
+					            <template #append>
+						            <span>{{t('prickUnit')}}</span>
+					            </template>
+				            </el-input>
+			            </el-form-item>
+		            </div>
+	            </el-form-item>
+            </el-card>
 
-      <el-card
-        class="box-card !border-none"
-        shadow="never"
-        v-if="formData.type == 'balance'"
-      >
-        <h3 class="panel-title !text-sm">{{ t('redemptionSettings') }}</h3>
+            <el-card class="box-card !border-none" shadow="never" v-if="formData.type=='balance'">
+                <h3 class="panel-title !text-sm">{{ t('redemptionSettings') }}</h3>
 
-        <!-- 兑换余额 -->
-        <el-form-item
-          :label="t('balance')"
-          prop="balance"
-          :rules="[
-            {
-              required: true,
-              trigger: 'blur',
-              validator: (rule: any, value: any, callback: any) => {
-                if (value.length == 0) {
-                  callback(t('balancePlaceholder'))
-                } else if (isNaN(value) || !regExp.digit.test(value)) {
-                  callback(t('balanceTips'))
-                } else if (value <= 0) {
-                  callback(t('balanceTipsTwo'))
-                } else {
-                  callback()
-                }
-              },
-            },
-          ]"
-        >
-          <el-input
-            v-model.trim="formData.balance"
-            clearable
-            :placeholder="t('balancePlaceholder')"
-            class="input-width"
-          />
-        </el-form-item>
-        <!-- 余额类型 -->
-        <el-form-item :label="t('balance')">
-          <el-radio-group v-model="formData.isBalance" class="ml-4">
-            <el-radio :label="0" size="large">可提现余额</el-radio>
-            <el-radio :label="1" size="large">不可提现余额</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <!-- 兑换库存 -->
-        <el-form-item
-          :label="t('stock')"
-          prop="stock"
-          :rules="[
-            {
-              required: true,
-              trigger: 'blur',
-              validator: (rule: any, value: any, callback: any) => {
-                if (value.length == 0) {
-                  callback(t('stockPlaceholder'))
-                } else if (isNaN(value) || !regExp.number.test(value)) {
-                  callback(t('stockTips'))
-                } else if (value <= 0) {
-                  callback(t('stockTipsTwo'))
-                } else {
-                  callback()
-                }
-              },
-            },
-          ]"
-        >
-          <el-input
-            v-model.trim="formData.stock"
-            clearable
-            :placeholder="t('stockPlaceholder')"
-            class="input-width"
-          />
-        </el-form-item>
-        <!-- 兑换限制 -->
-        <el-form-item
-          :label="t('limit')"
-          prop="limit_num"
-          :rules="[
-            {
-              trigger: 'blur',
-              validator: (rule: any, value: any, callback: any) => {
-                if (value) {
-                  if (isNaN(value) || !regExp.number.test(value)) {
-                    callback(t('limitTips'))
-                  } else if (value <= 0) {
-                    callback(t('limitTipsTwo'))
-                  } else {
-                    callback()
-                  }
-                } else {
-                  callback()
-                }
-              },
-            },
-          ]"
-        >
-          <el-input
-            v-model.trim="formData.limit_num"
-            clearable
-            :placeholder="t('limitPlaceholder')"
-            class="input-width"
-          />
-        </el-form-item>
-        <!-- 兑换价 -->
-        <el-form-item :label="t('money')" required>
-          <div class="flex justify-center">
-            <el-form-item
-              prop="point"
-              :rules="[
-                {
-                  trigger: 'blur',
-                  validator: (rule: any, value: any, callback: any) => {
-                    if (value.length == 0) {
-                      callback(t('pointPlaceholder'))
-                    } else if (value.length) {
-                      if (isNaN(value) || !regExp.number.test(value)) {
-                        callback(t('pointTips'))
-                      } else if (value <= 0) {
-                        callback(t('pointTipsTwo'))
-                      } else {
-                        callback()
-                      }
-                    } else {
-                      callback()
+                <!-- 兑换余额 -->
+                <el-form-item :label="t('balance')" prop="balance"  :rules="[{
+                    required: true,
+                    trigger: 'blur',
+                    validator: (rule: any, value: any, callback: any) => {
+                        if (value.length == 0) {
+                            callback(t('balancePlaceholder'))
+                        } else if (isNaN(value) || !regExp.digit.test(value)) {
+                            callback(t('balanceTips'))
+                        } else if (value <=0) {
+                            callback(t('balanceTipsTwo'))
+                        }else {
+                            callback();
+                        }
+                    }
+                }]">
+                    <el-input v-model.trim="formData.balance" clearable :placeholder="t('balancePlaceholder')" class="input-width" />
+                </el-form-item>
+                <!-- 余额类型 -->
+                <el-form-item :label="t('balance')">
+                    <el-radio-group v-model="formData.isBalance" class="ml-4">
+                        <el-radio :label="0" size="large">可提现余额</el-radio>
+                        <el-radio :label="1" size="large">不可提现余额</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <!-- 兑换库存 -->
+                <el-form-item :label="t('stock')" prop="stock"  :rules="[{
+                    required: true,
+                    trigger: 'blur',
+                    validator: (rule: any, value: any, callback: any) => {
+                        if (value.length == 0) {
+                            callback(t('stockPlaceholder'))
+                        } else if (isNaN(value) || !regExp.number.test(value)) {
+                            callback(t('stockTips'))
+                        } else if (value <=0) {
+                            callback(t('stockTipsTwo'))
+                        }else {
+                            callback();
+                        }
                     }
-                  },
-                },
-              ]"
-              class="sku-form-item-wrap"
-            >
-              <!-- @blur="inputBlur(row,'reduce',$index)" -->
-              <el-input
-                v-model.trim="formData.point"
-                class="!w-[200px]"
-                clearable
-                placeholder="0"
-                maxlength="8"
-              >
-                <template #append>
-                  <span>{{ t('integralUnit') }}</span>
-                </template>
-              </el-input>
-            </el-form-item>
-            <span class="mx-[20px]">+</span>
-            <el-form-item
-              prop="price"
-              :rules="[
-                {
-                  trigger: 'blur',
-                  validator: (rule: any, value: any, callback: any) => {
-                    if (value.length) {
-                      if (isNaN(value) || !regExp.digit.test(value)) {
-                        callback(t('moneyTips'))
-                      } else if (value < 0) {
-                        callback(t('moneyTipsTwo'))
-                      } else {
-                        callback()
-                      }
-                    } else {
-                      callback()
+                }]">
+                    <el-input v-model.trim="formData.stock" clearable :placeholder="t('stockPlaceholder')" class="input-width" />
+                </el-form-item>
+                <!-- 兑换限制 -->
+                <el-form-item :label="t('limit')" prop="limit_num"  :rules="[{
+                    trigger: 'blur',
+                    validator: (rule: any, value: any, callback: any) => {
+                        if(value){
+                            if (isNaN(value) || !regExp.number.test(value)) {
+                                callback(t('limitTips'))
+                            } else if (value <=0) {
+                                callback(t('limitTipsTwo'))
+                            } else {
+                                callback();
+                            }
+                        }else{
+                            callback();
+                        }
                     }
-                  },
-                },
-              ]"
-              class="sku-form-item-wrap"
-            >
-              <!-- @blur="inputBlur(row,'reduce',$index)" -->
-              <el-input
-                v-model.trim="formData.price"
-                class="!w-[200px]"
-                clearable
-                placeholder="0.00"
-                maxlength="8"
-              >
-                <template #append>
-                  <span>{{ t('prickUnit') }}</span>
-                </template>
-              </el-input>
-            </el-form-item>
-          </div>
-        </el-form-item>
-      </el-card>
+                }]">
+                    <el-input v-model.trim="formData.limit_num" clearable :placeholder="t('limitPlaceholder')" class="input-width" />
+                </el-form-item>
+                <!-- 兑换价 -->
+                <el-form-item :label="t('money')" required>
+                    <div class="flex justify-center">
+                        <el-form-item prop="point" :rules="[{
+                            trigger: 'blur',
+                            validator: (rule: any, value: any, callback: any) => {
+                                if (value.length == 0) {
+                                    callback(t('pointPlaceholder'))
+                                                    } else if(value.length){
+                                                        if (isNaN(value) || !regExp.number.test(value)) {
+                                                            callback(t('pointTips'))
+                                                        } else if (value <=0) {
+                                                            callback(t('pointTipsTwo'))
+                                                        } else{
+                                                            callback();
+                                                        }
+                                                    } else {
+                                                        callback();
+                                                    }
+                                            }
+                                            }]" class="sku-form-item-wrap">
+                                            <!-- @blur="inputBlur(row,'reduce',$index)" -->
+                                            <el-input v-model.trim="formData.point" class="!w-[200px]"  clearable placeholder="0" maxlength="8" >
+                                                <template #append>
+                                                    <span>{{t('integralUnit')}}</span>
+                                                </template>
+                                            </el-input>
+                                        </el-form-item>
+                                        <span class="mx-[20px]">+</span>
+                                        <el-form-item prop="price" :rules="[{
+                                            trigger: 'blur',
+                                            validator: (rule: any, value: any, callback: any) => {
+                                                    if(value.length){
+                                                        if (isNaN(value) || !regExp.digit.test(value)) {
+                                                            callback(t('moneyTips'))
+                                                        } else if (value <0) {
+                                                            callback(t('moneyTipsTwo'))
+                                                        }else{
+                                                            callback();
+                                                        }
+                                                    }else {
+                                                        callback();
+                                                    }
+                                            }
+                                            }]" class="sku-form-item-wrap">
+                                            <!-- @blur="inputBlur(row,'reduce',$index)" -->
+                                            <el-input v-model.trim="formData.price" class="!w-[200px]"  clearable placeholder="0.00" maxlength="8" >
+                                                <template #append>
+                                                    <span>{{t('prickUnit')}}</span>
+                                                </template>
+                                            </el-input>
+                                        </el-form-item>
+                                    </div>
+                </el-form-item>
+            </el-card>
 
-      <el-card class="box-card !border-none" shadow="never">
-        <h3 class="panel-title !text-sm">{{ t('goodsDetail') }}</h3>
-        <el-form-item>
-          <editor v-model="formData.content" :height="600" class="!w-[512px]" />
-        </el-form-item>
-      </el-card>
-    </el-form>
+            <el-card class="box-card !border-none" shadow="never">
+                <h3 class="panel-title !text-sm">{{ t('goodsDetail') }}</h3>
+                <el-form-item>
+                    <editor v-model="formData.content" :height="600"  class="!w-[512px]" />
+                </el-form-item>
+            </el-card>
+        </el-form>
 
-    <!-- 提交按钮 -->
-    <div class="fixed-footer-wrap">
-      <div class="fixed-footer">
-        <el-button type="primary" @click="onSave(formRef)">{{
-          t('save')
-        }}</el-button>
-        <el-button @click="back()">{{ t('cancel') }}</el-button>
-      </div>
+        <!-- 提交按钮 -->
+		<div class="fixed-footer-wrap">
+			<div class="fixed-footer">
+				<el-button type="primary" @click="onSave(formRef)">{{ t('save') }}</el-button>
+				<el-button @click="back()">{{ t('cancel') }}</el-button>
+			</div>
+		</div>
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
 import { ref, computed, onMounted, reactive } from 'vue'
 import { t } from '@/lang'
-import { img, deepClone } from '@/utils/common'
-import { FormInstance, ElMessage } from 'element-plus'
+import { img,deepClone } from '@/utils/common'
+import { FormInstance,ElMessage } from 'element-plus'
 import { ArrowLeft } from '@element-plus/icons-vue'
-import {
-  getActiveExchangeInfo,
-  editActiveExchange,
-} from '@/addon/shop/api/marketing'
+import { getActiveExchangeInfo,editActiveExchange } from "@/addon/shop/api/marketing";
 import { useRoute, useRouter } from 'vue-router'
 
 const route = useRoute()
@@ -776,113 +465,103 @@ const pageName = route.meta.title
 const loading = ref(true)
 // 商品类型
 const goodsType = reactive([
-  { name: '商品', type: 'goods' },
-  // {name:'优惠券',type:'coupon'},
-  // {name:'余额',type:'balance'},
+    {name:'商品',type:'goods'},
+    // {name:'优惠券',type:'coupon'},
+    // {name:'余额',type:'balance'},
 ])
 const initialFormData = {
-  type: 'goods', // 名称
-  names: '', // 标题
-  title: '',
-  image: '',
-  goods_info: {},
-  coupon_ids: [],
-  product_list: [],
-  stock: '',
-  limit_num: '',
-  point: '',
-  price: '',
-  balance: '',
-  isBalance: 1,
-  content: '',
+    type: 'goods', // 名称
+    names: '', // 标题
+    title:'',
+    image:'',
+    goods_info:{},
+    coupon_ids:[],
+    product_list:[],
+    stock:'',
+    limit_num:'',
+    point:'',
+    price:'',
+    balance:'',
+    isBalance:1,
+    content:''
 }
 const formData: Record<string, any> = ref({ ...initialFormData })
 const formRef = ref<FormInstance>()
 // 表单验证规则
 // 正则表达式
 const regExp = {
-  required: /[\S]+/,
-  number: /^\d{0,10}$/,
-  digit: /^\d{0,10}(.?\d{0,2})$/,
-  special: /^\d{0,10}(.?\d{0,3})$/,
+    required: /[\S]+/,
+    number: /^\d{0,10}$/,
+    digit: /^\d{0,10}(.?\d{0,2})$/,
+    special: /^\d{0,10}(.?\d{0,3})$/
 }
 const formRules = computed(() => {
-  return {
-    names: [
-      { required: true, message: t('goodsNamePlaceholder'), trigger: 'blur' },
-    ],
-    image: [
-      { required: true, message: t('imagePlaceholder'), trigger: 'change' },
-    ],
-    coupon_ids: [
-      {
-        required: true,
-        message: t('couponSelectPlaceholder'),
-        trigger: 'change',
-      },
-    ],
-    product_list: [
-      { required: true, message: t('goodsSkuPlaceholder'), trigger: 'change' },
-    ],
-  }
+    return {
+        names: [
+            { required: true, message: t('goodsNamePlaceholder'), trigger: 'blur' }
+        ],
+        image: [
+            { required: true, message: t('imagePlaceholder'), trigger: 'change' }
+        ],
+        coupon_ids: [
+            { required: true, message: t('couponSelectPlaceholder'), trigger: 'change' }
+        ],
+        product_list: [
+            { required: true, message: t('goodsSkuPlaceholder'), trigger: 'change' }
+        ],
+    }
 })
 //获取详情
-const getActiveExchangeInfoFn = (id: number) => {
-  loading.value = true
-  getActiveExchangeInfo(id)
-    .then((res: any) => {
-      formData.value = Object.assign(formData.value, res.data)
-      if (formData.value.type == 'goods') {
-        formData.value.product_list = res.data.goods_list
-      } else if (formData.value.type == 'coupon') {
-        formData.value.product_list = []
-        formData.value.product_list.push(deepClone(formData.value.coupon_info))
-      } else {
-        formData.value.balance = formData.value.product_detail[0].balance
-          ? formData.value.product_detail[0].balance
-          : formData.value.product_detail[0].money
-        formData.value.isBalance = formData.value.product_detail[0].balance
-          ? 1
-          : 0
-      }
-      loading.value = false
-    })
-    .catch(() => {
-      loading.value = false
+const getActiveExchangeInfoFn=(id:number)=>{
+    loading.value = true
+    getActiveExchangeInfo(id).then((res:any)=>{
+        formData.value = Object.assign(formData.value,res.data)
+        if(formData.value.type=='goods'){
+            formData.value.product_list = res.data.goods_list
+        }else if(formData.value.type=='coupon'){
+            formData.value.product_list =[]
+            formData.value.product_list.push(deepClone(formData.value.coupon_info))
+        }else{
+            formData.value.balance = formData.value.product_detail[0].balance?formData.value.product_detail[0].balance: formData.value.product_detail[0].money
+            formData.value.isBalance = formData.value.product_detail[0].balance?1: 0
+        }
+        loading.value = false
+    }).catch(()=>{
+        loading.value = false
     })
 }
 onMounted(() => {
-  if (route.query.id) getActiveExchangeInfoFn(Number(route.query.id))
+    if(route.query.id) getActiveExchangeInfoFn(Number(route.query.id))
 })
 /********* 商品 **********/
 const goodsSkuSelectRef = ref()
 //设置商品sku是否参与
-const enabledEvent = (row: any) => {
-  row.is_enabled = row.is_enabled ? 0 : 1
-  if (formData.value.product_list.every((el: any) => el.is_enabled === 0)) {
-    row.is_enabled = 1
-    ElMessage({
-      type: 'warning',
-      message: `${t('noEnabledTip')}`,
-    })
-    return
-  }
-  row.stock = ''
-  row.limit_num = ''
-  row.point = ''
-  row.price = ''
+const enabledEvent =  (row:any)=>{
+    row.is_enabled = row.is_enabled ? 0 : 1
+    if(formData.value.product_list.every((el:any)=>el.is_enabled===0)){
+        row.is_enabled = 1
+        ElMessage({
+             type: 'warning',
+            message: `${t('noEnabledTip')}`
+        })
+        return
+    }
+    row.stock = '';
+    row.limit_num = '';
+    row.point = '';
+    row.price = '';
 }
 interface batchOperationInterface {
-  stock: any
-  limit_num: any
-  point: any
-  price: any
+    stock:any,
+    limit_num:any,
+    point:any,
+    price:any,
 }
 const batchOperation = ref<batchOperationInterface>({
-  stock: '',
-  limit_num: '',
-  point: '',
-  price: '',
+    stock:'',
+    limit_num:'',
+    point:'',
+    price:'',
 })
 // 批量复选框
 const toggleCheckbox = ref()
@@ -892,8 +571,8 @@ const isIndeterminate = ref(false)
 
 // 监听批量复选框事件
 const toggleChange = (value: any) => {
-  isIndeterminate.value = false
-  productListTableRef.value.toggleAllSelection()
+    isIndeterminate.value = false
+    productListTableRef.value.toggleAllSelection()
 }
 const productListTableRef = ref()
 
@@ -902,253 +581,224 @@ const multipleSelection: any = ref([])
 
 // 监听表格单行选中
 const handleSelectionChange = (val: []) => {
-  multipleSelection.value = val
+    multipleSelection.value = val
 
-  toggleCheckbox.value = false
-  if (
-    multipleSelection.value.length > 0 &&
-    multipleSelection.value.length < formData.value.product_list.length
-  ) {
-    isIndeterminate.value = true
-  } else {
-    isIndeterminate.value = false
-  }
+    toggleCheckbox.value = false
+    if (multipleSelection.value.length > 0 && multipleSelection.value.length < formData.value.product_list.length) {
+        isIndeterminate.value = true
+    } else {
+        isIndeterminate.value = false
+    }
 
-  if (multipleSelection.value.length == formData.value.product_list.length) {
-    toggleCheckbox.value = true
-  }
+    if (multipleSelection.value.length == formData.value.product_list.length) {
+        toggleCheckbox.value = true
+    }
 }
 //批量设置确认按钮
-const saveBatch = () => {
-  if (!multipleSelection.value.length) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('batchEmptySelectedGoodsTips')}`,
-    })
-    return
-  }
-  if (batchOperation.value.stock) {
-    if (
-      isNaN(Number(batchOperation.value.stock)) ||
-      !regExp.number.test(batchOperation.value.stock)
-    ) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('stockTips')}`,
-      })
-      return
-    } else if (batchOperation.value.stock <= 0) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('stockTipsTwo')}`,
-      })
-      return
+const saveBatch = ()=> {
+    if (!multipleSelection.value.length) {
+        ElMessage({
+            type: 'warning',
+            message: `${t('batchEmptySelectedGoodsTips')}`
+        })
+        return
     }
-  }
-  if (batchOperation.value.limit_num) {
-    if (
-      isNaN(batchOperation.value.limit_num) ||
-      !regExp.number.test(batchOperation.value.limit_num)
-    ) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('limitTips')}`,
-      })
-      return
-    } else if (batchOperation.value.limit_num <= 0) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('limitTipsTwo')}`,
-      })
-      return
+    if (batchOperation.value.stock) {
+        if (isNaN(Number(batchOperation.value.stock)) || !regExp.number.test(batchOperation.value.stock)) {
+            ElMessage({
+                type: 'warning',
+                message: `${t('stockTips')}`
+            })
+            return
+        } else if (batchOperation.value.stock <= 0) {
+            ElMessage({
+                type: 'warning',
+                message: `${t('stockTipsTwo')}`
+            })
+            return
+        }
     }
-  }
-  if (batchOperation.value.point) {
-    if (
-      isNaN(batchOperation.value.point) ||
-      !regExp.number.test(batchOperation.value.point)
-    ) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('pointTips')}`,
-      })
-      return
-    } else if (batchOperation.value.point <= 0) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('pointTipsTwo')}`,
-      })
-      return
+    if (batchOperation.value.limit_num) {
+        if (isNaN(batchOperation.value.limit_num) || !regExp.number.test(batchOperation.value.limit_num)) {
+            ElMessage({
+                type: 'warning',
+                message: `${t('limitTips')}`
+            })
+            return
+        } else if (batchOperation.value.limit_num <= 0) {
+            ElMessage({
+                type: 'warning',
+                message: `${t('limitTipsTwo')}`
+            })
+            return
+        }
     }
-  }
-  if (batchOperation.value.price) {
-    if (
-      isNaN(batchOperation.value.price) ||
-      !regExp.digit.test(batchOperation.value.price)
-    ) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('moneyTips')}`,
-      })
-      return
-    } else if (batchOperation.value.price <= 0) {
-      ElMessage({
-        type: 'warning',
-        message: `${t('moneyTipsTwo')}`,
-      })
-      return
+    if (batchOperation.value.point) {
+        if (isNaN(batchOperation.value.point) || !regExp.number.test(batchOperation.value.point)) {
+            ElMessage({
+                type: 'warning',
+                message: `${t('pointTips')}`
+            })
+            return
+        } else if (batchOperation.value.point <= 0) {
+            ElMessage({
+                type: 'warning',
+                message: `${t('pointTipsTwo')}`
+            })
+            return
+        }
     }
-  }
-  formData.value.product_list.forEach((el: any, index: number) => {
-    multipleSelection.value.forEach((v: any) => {
-      if (v.sku_id === el.sku_id) {
-        if (batchOperation.value.stock)
-          el.stock = batchOperation.value.stock + ''
-        if (batchOperation.value.limit_num)
-          el.limit_num = batchOperation.value.limit_num + ''
-        if (batchOperation.value.point)
-          el.point = batchOperation.value.point + ''
-        if (batchOperation.value.price)
-          el.price = batchOperation.value.price + ''
-        if (formRef.value) {
-          formRef.value.validateField('product_list.' + index + '.stock')
-          formRef.value.validateField('product_list.' + index + '.limit_num')
-          formRef.value.validateField('product_list.' + index + '.point')
-          formRef.value.validateField('product_list.' + index + '.price')
+    if (batchOperation.value.price) {
+        if (isNaN(batchOperation.value.price) || !regExp.digit.test(batchOperation.value.price)) {
+            ElMessage({
+                type: 'warning',
+                message: `${t('moneyTips')}`
+            })
+            return
+        } else if (batchOperation.value.price <= 0) {
+            ElMessage({
+                type: 'warning',
+                message: `${t('moneyTipsTwo')}`
+            })
+            return
         }
-      }
+    }
+    formData.value.product_list.forEach((el: any, index: number) => {
+        multipleSelection.value.forEach((v: any) => {
+            if (v.sku_id === el.sku_id) {
+                if(batchOperation.value.stock) el.stock = batchOperation.value.stock+''
+                if(batchOperation.value.limit_num) el.limit_num = batchOperation.value.limit_num+''
+                if(batchOperation.value.point) el.point = batchOperation.value.point+''
+                if(batchOperation.value.price) el.price = batchOperation.value.price+''
+                if (formRef.value) {
+                    formRef.value.validateField('product_list.' + index + '.stock')
+                    formRef.value.validateField('product_list.' + index + '.limit_num')
+                    formRef.value.validateField('product_list.' + index + '.point')
+                    formRef.value.validateField('product_list.' + index + '.price')
+                }
+            }
+        })
+
     })
-  })
-  isIndeterminate.value = false
-  toggleCheckbox.value = false
-  batchOperation.value = {
-    stock: '',
-    limit_num: '',
-    point: '',
-    price: '',
-  }
-  productListTableRef.value.clearSelection()
+    isIndeterminate.value = false
+    toggleCheckbox.value = false
+    batchOperation.value = {
+        stock: '',
+        limit_num: '',
+        point: '',
+        price: ''
+    }
+    productListTableRef.value.clearSelection()
 }
 /********** 优惠券 ***********/
 /**** 提交 ****/
 const onSave = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      if (formData.value.type == 'goods') {
-        formData.value.product_detail = JSON.stringify(
-          formData.value.product_list
-            .map((el: any) => {
-              return {
-                goods_id: el.goods_id,
-                sku_id: el.sku_id,
-                point: el.point,
-                price: el.price,
-                limit_num: el.limit_num,
-                stock: el.stock,
-                is_enabled: el.is_enabled,
-              }
-            })
-            .filter((el: any) => el.is_enabled === 1)
-        )
-      } else if (formData.value.type == 'coupon') {
-        formData.value.product_detail = JSON.stringify(
-          formData.value.product_list.map((el: any) => {
-            return {
-              coupon_id: el.id,
+    if (loading.value || !formEl) return
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+            if(formData.value.type == 'goods'){
+                formData.value.product_detail = JSON.stringify(formData.value.product_list.map((el:any)=>{
+                    return {
+                        goods_id:el.goods_id,
+                        sku_id:el.sku_id,
+                        point:el.point,
+                        price:el.price,
+                        limit_num:el.limit_num,
+                        stock:el.stock,
+                        is_enabled:el.is_enabled
+                    }
+                }).filter((el:any)=>el.is_enabled===1))
+            } else if(formData.value.type == 'coupon'){
+                formData.value.product_detail = JSON.stringify(formData.value.product_list.map((el:any)=>{
+                    return {
+                        coupon_id:el.id,
+                    }
+                }))
+            }else{
+                if(formData.value.isBalance){
+                    formData.value.product_detail=JSON.stringify([{balance:formData.value.balance}])
+                }else{
+                    formData.value.product_detail=JSON.stringify([{money:formData.value.balance}])
+                }
             }
-          })
-        )
-      } else {
-        if (formData.value.isBalance) {
-          formData.value.product_detail = JSON.stringify([
-            { balance: formData.value.balance },
-          ])
-        } else {
-          formData.value.product_detail = JSON.stringify([
-            { money: formData.value.balance },
-          ])
+            // formData.value.goods_data = JSON.stringify(formData.value.product_list)
+            editActiveExchange(formData.value).then(res => {
+                loading.value = false
+                router.push('/shop/marketing/exchange/goods_list')
+            }).catch(() => {
+                loading.value = false
+            })
         }
-      }
-      // formData.value.goods_data = JSON.stringify(formData.value.product_list)
-      editActiveExchange(formData.value)
-        .then((res) => {
-          loading.value = false
-          router.push('/shop/marketing/exchange/goods_list')
-        })
-        .catch(() => {
-          loading.value = false
-        })
-    }
-  })
+    })
 }
 const back = () => {
-  router.push('/shop/marketing/exchange/goods_list')
+    router.push('/shop/marketing/exchange/goods_list')
 }
 </script>
 
 <style lang="scss" scoped>
 .goods-type-wrap {
-  width: 120px;
-  height: 60px;
-  background: #fff;
-  border-radius: 3px;
-  float: left;
-  text-align: center;
-  // padding-top: 8px;
-  position: relative;
-  cursor: pointer;
-  line-height: 23px;
-  border: 1px solid #e7e7e7;
+    width: 120px;
+    height: 60px;
+    background: #fff;
+    border-radius: 3px;
+    float: left;
+    text-align: center;
+    // padding-top: 8px;
+    position: relative;
+    cursor: pointer;
+    line-height: 23px;
+    border: 1px solid #e7e7e7;
+
+    .goods-type-name {
+        font-size: 14px;
+        font-weight: 600;
+        color: rgba(0, 0, 0, .85);
+    }
 
-  .goods-type-name {
-    font-size: 14px;
-    font-weight: 600;
-    color: rgba(0, 0, 0, 0.85);
-  }
+    .goods-type-desc {
+        font-size: 12px;
+        font-weight: 400;
+        color: #999;
+    }
 
-  .goods-type-desc {
-    font-size: 12px;
-    font-weight: 400;
-    color: #999;
-  }
+    .triangle {
+        position: absolute;
+        bottom: 0;
+        right: 0;
+        width: 0;
+        height: 0;
+        border-bottom: 26px solid var(--el-color-primary);
+        border-left: 26px solid transparent;
+    }
 
-  .triangle {
-    position: absolute;
-    bottom: 0;
-    right: 0;
-    width: 0;
-    height: 0;
-    border-bottom: 26px solid var(--el-color-primary);
-    border-left: 26px solid transparent;
-  }
+    .selected {
+        position: absolute;
+        bottom: -2px;
+        right: 2px;
+        color: #fff;
+    }
 
-  .selected {
-    position: absolute;
-    bottom: -2px;
-    right: 2px;
-    color: #fff;
-  }
+    &.selected {
+        border: 1px solid var(--el-color-primary);
+    }
 
-  &.selected {
-    border: 1px solid var(--el-color-primary);
-  }
+    &.disabled {
+        cursor: not-allowed;
 
-  &.disabled {
-    cursor: not-allowed;
+        .goods-type-name {
+            color: #999;
+        }
+    }
 
-    .goods-type-name {
-      color: #999;
+    &:nth-child(2n) {
+        margin: 0 12px;
     }
-  }
 
-  &:nth-child(2n) {
-    margin: 0 12px;
-  }
 }
 .sku_list :deep(.cell) {
-  // min-height: 60px !important;
-  overflow: initial !important;
+    // min-height: 60px !important;
+    overflow: initial !important;
 }
 </style>
diff --git a/admin/src/addon/shop/views/marketing/exchange/goods_list.vue b/admin/src/addon/shop/views/marketing/exchange/goods_list.vue
index 96c8f422..d0c4e43e 100644
--- a/admin/src/addon/shop/views/marketing/exchange/goods_list.vue
+++ b/admin/src/addon/shop/views/marketing/exchange/goods_list.vue
@@ -1,205 +1,110 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-        <el-button type="primary" @click="handleChange">
-          {{ t('addGoods') }}
-        </el-button>
-      </div>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
 
-      <!-- 搜索 -->
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="tableData.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('goodsName')" prop="names">
-            <el-input
-              v-model.trim="tableData.searchParam.names"
-              :placeholder="t('goodsNamePlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('status')" prop="status">
-            <el-select
-              v-model="tableData.searchParam.status"
-              clearable
-              :placeholder="t('statusPlaceholder')"
-              class="input-item"
-            >
-              <el-option
-                v-for="(item, key) in statusOption"
-                :key="key"
-                :label="item"
-                :value="key"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="t('createTime')" prop="create_time">
-            <el-date-picker
-              v-model="tableData.searchParam.create_time"
-              type="datetimerange"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              :start-placeholder="t('startDate')"
-              :end-placeholder="t('endDate')"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="loadExchangeGoodsList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+                <el-button type="primary" @click="handleChange">
+                    {{ t('addGoods') }}
+                </el-button>
+            </div>
 
-      <!-- 列表 -->
-      <div class="mt-[10px]">
-        <el-table
-          :data="tableData.data"
-          size="large"
-          v-loading="tableData.loading"
-        >
-          <template #empty>
-            <span>{{ !tableData.loading ? t('emptyData') : '' }}</span>
-          </template>
+            <!-- 搜索 -->
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="tableData.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('goodsName')" prop="names">
+                        <el-input v-model.trim="tableData.searchParam.names" :placeholder="t('goodsNamePlaceholder')" />
+                    </el-form-item>
+                    <el-form-item :label="t('status')" prop='status'>
+						<el-select v-model="tableData.searchParam.status" clearable :placeholder="t('statusPlaceholder')" class="input-item">
+							<el-option v-for="(item, key) in statusOption" :key="key" :label="item" :value="key"></el-option>
+						</el-select>
+					</el-form-item>
+                    <el-form-item :label="t('createTime')" prop="create_time">
+						<el-date-picker v-model="tableData.searchParam.create_time" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+					</el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="loadExchangeGoodsList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
 
-          <el-table-column :label="t('goods')" min-width="130">
-            <template #default="{ row }">
-              <div class="flex items-center cursor-pointer">
-                <div
-                  class="min-w-[60px] h-[60px] flex items-center justify-center"
-                >
-                  <el-image
-                    v-if="row.goods_cover_thumb_small"
-                    class="w-[60px] h-[60px]"
-                    :src="img(row.goods_cover_thumb_small)"
-                    fit="contain"
-                  >
-                    <template #error>
-                      <div class="image-slot">
-                        <img
-                          class="w-[60px] h-[60px]"
-                          src="@/addon/shop/assets/goods_default.png"
-                        />
-                      </div>
+            <!-- 列表 -->
+            <div class="mt-[10px]">
+                <el-table :data="tableData.data" size="large" v-loading="tableData.loading">
+                    <template #empty>
+                        <span>{{ !tableData.loading ? t('emptyData') : '' }}</span>
                     </template>
-                  </el-image>
-                  <img
-                    v-else
-                    class="w-[70px] h-[60px]"
-                    src="@/addon/shop/assets/goods_default.png"
-                    fit="contain"
-                  />
-                </div>
-                <div class="ml-2">
-                  <span :title="row.names" class="multi-hidden">{{
-                    row.names
-                  }}</span>
-                </div>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('exchangePrice')" min-width="130">
-            <template #default="{ row }">
-              <p v-if="row.point">{{ row.point }}{{ t('pointUnit') }}</p>
-              <p v-if="row.price">{{ row.price }}{{ t('priceUnit') }}</p>
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('redeemedAndSurplus')" min-width="130">
-            <template #default="{ row }">
-              <span>{{ row.total_exchange_num }}/{{ row.stock }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="create_time"
-            :label="t('createTime')"
-            min-width="150"
-          >
-            <template #default="{ row }">
-              <div>{{ row.create_time }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="status_name"
-            :label="t('status')"
-            min-width="130"
-          />
-          <el-table-column
-            :label="t('operation')"
-            fixed="right"
-            align="right"
-            min-width="160"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="editEvent(row.id)">{{
-                t('edit')
-              }}</el-button>
-              <el-button type="primary" link @click="spreadEvent(row)">{{
-                t('spreadGoods')
-              }}</el-button>
-              <el-button
-                v-if="row.status"
-                type="primary"
-                link
-                @click="statusEvent(row.id, 0)"
-                >{{ t('down') }}</el-button
-              >
-              <el-button
-                v-else
-                type="primary"
-                link
-                @click="statusEvent(row.id, 1)"
-                >{{ t('up') }}</el-button
-              >
-              <el-button
-                v-if="!row.status"
-                type="primary"
-                link
-                @click="deleteEvent(row.id)"
-                >{{ t('delete') }}</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
 
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="tableData.page"
-            v-model:page-size="tableData.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="tableData.total"
-            @size-change="loadExchangeGoodsList()"
-            @current-change="loadExchangeGoodsList"
-          />
-        </div>
-      </div>
-    </el-card>
+                    <el-table-column :label="t('goods')" min-width="130" >
+                        <template #default="{ row }">
+                            <div class="flex items-center cursor-pointer">
+                                <div class="min-w-[60px] h-[60px] flex items-center justify-center">
+                                    <el-image v-if="row.goods_cover_thumb_small" class="w-[60px] h-[60px]" :src="img(row.goods_cover_thumb_small)" fit="contain">
+                                        <template #error>
+                                            <div class="image-slot">
+                                                <img class="w-[60px] h-[60px]" src="@/addon/shop/assets/goods_default.png" />
+                                            </div>
+                                        </template>
+                                    </el-image>
+                                    <img v-else class="w-[70px] h-[60px]" src="@/addon/shop/assets/goods_default.png" fit="contain" />
+                                </div>
+                                <div class="ml-2">
+                                    <span :title="row.names" class="multi-hidden">{{ row.names }}</span>
+                                </div>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('exchangePrice')" min-width="130">
+                        <template #default="{ row }">
+                            <p v-if="row.point">{{ row.point }}{{ t('pointUnit') }}</p>
+                            <p v-if="row.price">{{ row.price }}{{ t('priceUnit') }}</p>
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('redeemedAndSurplus')" min-width="130" >
+                        <template #default="{ row }">
+                            <span>{{ row.total_exchange_num }}/{{ row.stock }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="create_time" :label="t('createTime')" min-width="150">
+                        <template #default="{ row }">
+                            <div>{{ row.create_time }}</div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="status_name" :label="t('status')" min-width="130" />
+                    <el-table-column :label="t('operation')" fixed="right" align="right" min-width="160">
+                       <template #default="{ row }">
+                            <el-button  type="primary" link @click="editEvent(row.id)">{{ t('edit') }}</el-button>
+                            <el-button type="primary" link @click="spreadEvent(row)">{{ t('spreadGoods') }}</el-button>
+                            <el-button v-if="row.status" type="primary" link @click="statusEvent(row.id,0)">{{ t('down') }}</el-button>
+                            <el-button v-else type="primary" link @click="statusEvent(row.id,1)">{{ t('up') }}</el-button>
+                            <el-button v-if="!row.status" type="primary" link @click="deleteEvent(row.id)">{{ t('delete') }}</el-button>
+						</template>
+                    </el-table-column>
+                </el-table>
+
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="tableData.page" v-model:page-size="tableData.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="tableData.total"
+                        @size-change="loadExchangeGoodsList()" @current-change="loadExchangeGoodsList" />
+                </div>
+            </div>
+        </el-card>
 
-    <!-- 商品推广弹出框 -->
-    <goods-spread-popup ref="goodsSpreadPopupRef" />
-  </div>
+        <!-- 商品推广弹出框 -->
+        <goods-spread-popup ref="goodsSpreadPopupRef" />
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { t } from '@/lang'
 import { reactive, ref } from 'vue'
-import { img, setTablePageStorage, getTablePageStorage } from '@/utils/common'
+import { img,setTablePageStorage,getTablePageStorage } from '@/utils/common'
 import { useRoute, useRouter } from 'vue-router'
 import { ElMessageBox, FormInstance } from 'element-plus'
 import goodsSpreadPopup from '@/addon/shop/views/goods/components/goods-spread-popup.vue'
-import {
-  getActiveExchangePageList,
-  deleteActiveExchange,
-  editActiveExchangeStatus,
-  getActiveExchangeStatus,
-} from '@/addon/shop/api/marketing'
+import { getActiveExchangePageList, deleteActiveExchange, editActiveExchangeStatus, getActiveExchangeStatus } from '@/addon/shop/api/marketing'
 
 const route = useRoute()
 const router = useRouter()
@@ -207,97 +112,93 @@ const pageName = route.meta.title
 
 // 表单内容
 const tableData = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: false,
-  data: [],
-  searchParam: {
-    names: '',
-    status: '',
-    create_time: [],
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: false,
+    data: [],
+    searchParam: {
+        names: '',
+        status: '',
+        create_time: []
+    }
 })
 const searchFormRef = ref<FormInstance>()
 const loadExchangeGoodsList = (page: number = 1) => {
-  tableData.loading = true
-  tableData.page = page
+    tableData.loading = true
+    tableData.page = page
 
-  getActiveExchangePageList({
-    page: tableData.page,
-    limit: tableData.limit,
-    ...tableData.searchParam,
-  })
-    .then((res) => {
-      tableData.loading = false
-      tableData.data = res.data.data
-      tableData.total = res.data.total
-      setTablePageStorage(
-        tableData.page,
-        tableData.limit,
-        tableData.searchParam
-      )
-    })
-    .catch(() => {
-      tableData.loading = false
+    getActiveExchangePageList({
+        page: tableData.page,
+        limit: tableData.limit,
+        ...tableData.searchParam
+    }).then(res => {
+        tableData.loading = false
+        tableData.data = res.data.data
+        tableData.total = res.data.total
+        setTablePageStorage(tableData.page, tableData.limit, tableData.searchParam);
+    }).catch(() => {
+        tableData.loading = false
     })
 }
-loadExchangeGoodsList(getTablePageStorage(tableData.searchParam).page)
+loadExchangeGoodsList(getTablePageStorage(tableData.searchParam).page);
 // 获取状态列表
 const statusOption = ref([])
 const getActiveExchangeStatusFn = () => {
-  getActiveExchangeStatus().then((res) => {
-    statusOption.value = res.data
-  })
+    getActiveExchangeStatus().then(res => {
+        statusOption.value = res.data
+    })
 }
 getActiveExchangeStatusFn()
 // 添加商品
 const handleChange = () => {
-  router.push('/shop/marketing/exchange/goods_add')
+    router.push('/shop/marketing/exchange/goods_add')
 }
 
 // 编辑商品
-const editEvent = (id: number) => {
-  router.push({ path: '/shop/marketing/exchange/goods_edit', query: { id } })
+const editEvent = (id:number) => {
+    router.push({ path: '/shop/marketing/exchange/goods_edit', query: { id } })
 }
 // 商品推广
 const goodsSpreadPopupRef: any = ref(null)
 
 const spreadEvent = (data: any) => {
-  goodsSpreadPopupRef.value.show(data, 'point')
+    goodsSpreadPopupRef.value.show(data, 'point')
 }
 // 上下架
-const statusEvent = (id: number, status: number) => {
-  ElMessageBox.confirm(status ? t('upTips') : t('downTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    editActiveExchangeStatus({ id, status })
-      .then(() => {
-        loadExchangeGoodsList()
-      })
-      .catch(() => {})
-  })
+const statusEvent = (id:number, status:number) => {
+    ElMessageBox.confirm(status ? t('upTips') : t('downTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        editActiveExchangeStatus({ id, status }).then(() => {
+            loadExchangeGoodsList()
+        }).catch(() => {
+        })
+    })
 }
 // 删除
-const deleteEvent = (id: number) => {
-  ElMessageBox.confirm(t('deleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    deleteActiveExchange(id)
-      .then(() => {
-        loadExchangeGoodsList()
-      })
-      .catch(() => {})
-  })
+const deleteEvent = (id:number) => {
+    ElMessageBox.confirm(t('deleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        deleteActiveExchange(id).then(() => {
+            loadExchangeGoodsList()
+        }).catch(() => {
+        })
+    })
 }
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadExchangeGoodsList()
+    if (!formEl) return
+    formEl.resetFields()
+    loadExchangeGoodsList()
 }
 </script>
 
diff --git a/admin/src/addon/shop/views/marketing/exchange/order_list.vue b/admin/src/addon/shop/views/marketing/exchange/order_list.vue
index 41b8b661..4fdd87ba 100644
--- a/admin/src/addon/shop/views/marketing/exchange/order_list.vue
+++ b/admin/src/addon/shop/views/marketing/exchange/order_list.vue
@@ -1,214 +1,132 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
 
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="orderTable.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('orderInfo')" prop="search_name">
-            <el-select
-              v-model="orderTable.searchParam.search_type"
-              clearable
-              class="input-item"
-            >
-              <el-option :label="t('orderNo')" value="order_no"></el-option>
-              <el-option
-                :label="t('outTradeNo')"
-                value="out_trade_no"
-              ></el-option>
-            </el-select>
-            <el-input
-              class="input-item ml-3"
-              v-model.trim="orderTable.searchParam.search_name"
-            />
-          </el-form-item>
-          <el-form-item :label="t('payType')" prop="pay_type">
-            <el-select
-              v-model="orderTable.searchParam.pay_type"
-              clearable
-              class="input-item"
-            >
-              <el-option
-                v-for="(item, index) in payTypeData"
-                :key="index"
-                :label="item.name"
-                :value="item.key"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="t('fromType')" prop="order_from">
-            <el-select
-              v-model="orderTable.searchParam.order_from"
-              clearable
-              class="input-item"
-            >
-              <el-option
-                v-for="(item, index) in orderFromData"
-                :key="index"
-                :label="item"
-                :value="index"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="t('createTime')" prop="create_time">
-            <el-date-picker
-              v-model="orderTable.searchParam.create_time"
-              type="datetimerange"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              :start-placeholder="t('startDate')"
-              :end-placeholder="t('endDate')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('payTime')" prop="pay_time">
-            <el-date-picker
-              v-model="orderTable.searchParam.pay_time"
-              type="datetimerange"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              :start-placeholder="t('startDate')"
-              :end-placeholder="t('endDate')"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="loadOrderList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
-
-      <el-tabs v-model="activeName" class="demo-tabs" @tab-change="handleClick">
-        <el-tab-pane :label="t('all')" name=""></el-tab-pane>
-        <el-tab-pane :label="t('toBeShipped')" name="2"></el-tab-pane>
-        <el-tab-pane :label="t('shipped')" name="3"></el-tab-pane>
-        <el-tab-pane :label="t('completed')" name="5"></el-tab-pane>
-        <el-tab-pane :label="t('closed')" name="-1"></el-tab-pane>
-      </el-tabs>
-
-      <el-table
-        :data="orderTable.data"
-        size="large"
-        v-loading="orderTable.loading"
-      >
-        <template #empty>
-          <span>{{ !orderTable.loading ? t('emptyData') : '' }}</span>
-        </template>
-
-        <el-table-column :label="t('orderNo')" min-width="250">
-          <template #default="{ row }">
-            <span class="text-[14px]">{{ row.order_no }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column :label="t('orderGoods')" min-width="350">
-          <template #default="{ row }">
-            <div class="flex cursor-pointer" v-for="item in row.order_goods">
-              <div class="flex items-center min-w-[50px] mr-[10px]">
-                <img
-                  class="w-[50px] h-[50px]"
-                  v-if="item.goods_image_thumb_small"
-                  :src="img(item.goods_image_thumb_small)"
-                  alt=""
-                />
-                <img
-                  class="w-[50px] h-[50px]"
-                  v-else
-                  src="@/addon/shop/assets/goods_default.png"
-                  alt=""
-                />
-              </div>
-              <div class="flex flex-col">
-                <p class="multi-hidden text-[14px]">{{ item.goods_name }}</p>
-                <span class="text-[12px] text-[#999]">{{ item.sku_name }}</span>
-              </div>
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
             </div>
-          </template>
-        </el-table-column>
-        <el-table-column :label="t('goodsPriceNumber')" min-width="200">
-          <template #default="{ row }">
-            <div class="flex flex-col" v-for="item in row.order_goods">
-              <span v-if="row.activity_type == 'exchange'" class="text-[14px]">
-                {{ item.extend.point }}{{ t('point') }}
-                <span v-if="parseFloat(item.extend.price)"
-                  >+￥{{ item.extend.price }}</span
-                >
-              </span>
-              <span v-else class="text-[13px]">￥{{ item.price }}</span>
-              <span class="text-[13px] mt-[5px]"
-                >{{ item.num }}{{ t('piece') }}</span
-              >
+
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="orderTable.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('orderInfo')" prop='search_name'>
+                        <el-select v-model="orderTable.searchParam.search_type" clearable class="input-item">
+                            <el-option :label="t('orderNo')" value="order_no"></el-option>
+                            <el-option :label="t('outTradeNo')" value="out_trade_no"></el-option>
+                        </el-select>
+                        <el-input class="input-item ml-3" v-model.trim="orderTable.searchParam.search_name" />
+                    </el-form-item>
+                    <el-form-item :label="t('payType')" prop='pay_type'>
+                        <el-select v-model="orderTable.searchParam.pay_type" clearable class="input-item">
+                            <el-option v-for="(item, index) in payTypeData" :key="index" :label="item.name" :value="item.key"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item :label="t('fromType')" prop='order_from'>
+                        <el-select v-model="orderTable.searchParam.order_from" clearable class="input-item">
+                            <el-option v-for="(item, index) in orderFromData" :key="index" :label="item" :value="index"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item :label="t('createTime')" prop="create_time">
+                        <el-date-picker v-model="orderTable.searchParam.create_time" type="datetimerange"
+                            value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')"
+                            :end-placeholder="t('endDate')" />
+                    </el-form-item>
+                    <el-form-item :label="t('payTime')" prop="pay_time">
+                        <el-date-picker v-model="orderTable.searchParam.pay_time" type="datetimerange"
+                            value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')"
+                            :end-placeholder="t('endDate')" />
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="loadOrderList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+
+            <el-tabs v-model="activeName" class="demo-tabs" @tab-change="handleClick">
+                <el-tab-pane :label="t('all')" name=""></el-tab-pane>
+                <el-tab-pane :label="t('toBeShipped')" name="2"></el-tab-pane>
+                <el-tab-pane :label="t('shipped')" name="3"></el-tab-pane>
+                <el-tab-pane :label="t('completed')" name="5"></el-tab-pane>
+                <el-tab-pane :label="t('closed')" name="-1"></el-tab-pane>
+            </el-tabs>
+
+            <el-table :data="orderTable.data" size="large" v-loading="orderTable.loading">
+                <template #empty>
+                    <span>{{ !orderTable.loading ? t('emptyData') : '' }}</span>
+                </template>
+
+                <el-table-column :label="t('orderNo')" min-width="250">
+                    <template #default="{ row }">
+                        <span class="text-[14px]">{{ row.order_no }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column :label="t('orderGoods')" min-width="350">
+                    <template #default="{ row }">
+                        <div class="flex cursor-pointer" v-for="item in row.order_goods">
+                            <div class="flex items-center min-w-[50px] mr-[10px]">
+                                <img class="w-[50px] h-[50px]" v-if="item.goods_image_thumb_small" :src="img(item.goods_image_thumb_small)" alt="">
+                                <img class="w-[50px] h-[50px]" v-else src="@/addon/shop/assets/goods_default.png" alt="">
+                            </div>
+                            <div class="flex flex-col">
+                                <p class="multi-hidden text-[14px]">{{ item.goods_name }}</p>
+                                <span class="text-[12px] text-[#999]">{{ item.sku_name }}</span>
+                            </div>
+                        </div>
+                    </template>
+                </el-table-column>
+                <el-table-column :label="t('goodsPriceNumber')" min-width="200">
+                    <template #default="{ row }">
+                        <div class="flex flex-col" v-for="item in row.order_goods">
+                            <span v-if="row.activity_type == 'exchange'" class="text-[14px]">
+                                {{ item.extend.point }}{{ t('point') }}
+                                <span v-if="parseFloat(item.extend.price)">+￥{{ item.extend.price }}</span>
+                            </span>
+                            <span v-else class="text-[13px]">￥{{ item.price }}</span>
+                            <span class="text-[13px] mt-[5px]">{{ item.num }}{{ t('piece') }}</span>
+                        </div>
+                    </template>
+                </el-table-column>
+                <el-table-column :label="t('orderMoney')" min-width="200">
+                    <template #default="{ row }">
+                        <span v-if="row.activity_type == 'exchange'" class="text-[14px]">
+                            {{ row.point }}{{ t('point') }}
+                            <span v-if="parseFloat(row.order_money)">+￥{{ row.order_money }}</span>
+                        </span>
+                        <span v-else class="text-[14px]">￥{{ row.order_money }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column :label="t('createTime')" min-width="200">
+                    <template #default="{ row }">
+                        <span class="text-[14px]">{{ row.create_time }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column :label="t('orderStatus')" min-width="100">
+                    <template #default="{ row }">
+                        <span class="text-[14px]">{{ row.status_name.name }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column :label="t('操作')" fixed="right" align="right" min-width="100">
+                    <template #default="{ row }">
+                        <el-button type="primary" link @click="detailEvent(row)">{{ t('info') }}</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <div class="mt-[16px] flex justify-end">
+                <el-pagination v-model:current-page="orderTable.page" v-model:page-size="orderTable.limit"
+                    layout="total, sizes, prev, pager, next, jumper" :total="orderTable.total"
+                    @size-change="loadOrderList()" @current-change="loadOrderList" />
             </div>
-          </template>
-        </el-table-column>
-        <el-table-column :label="t('orderMoney')" min-width="200">
-          <template #default="{ row }">
-            <span v-if="row.activity_type == 'exchange'" class="text-[14px]">
-              {{ row.point }}{{ t('point') }}
-              <span v-if="parseFloat(row.order_money)"
-                >+￥{{ row.order_money }}</span
-              >
-            </span>
-            <span v-else class="text-[14px]">￥{{ row.order_money }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column :label="t('createTime')" min-width="200">
-          <template #default="{ row }">
-            <span class="text-[14px]">{{ row.create_time }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column :label="t('orderStatus')" min-width="100">
-          <template #default="{ row }">
-            <span class="text-[14px]">{{ row.status_name.name }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          :label="t('操作')"
-          fixed="right"
-          align="right"
-          min-width="100"
-        >
-          <template #default="{ row }">
-            <el-button type="primary" link @click="detailEvent(row)">{{
-              t('info')
-            }}</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
 
-      <div class="mt-[16px] flex justify-end">
-        <el-pagination
-          v-model:current-page="orderTable.page"
-          v-model:page-size="orderTable.limit"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="orderTable.total"
-          @size-change="loadOrderList()"
-          @current-change="loadOrderList"
-        />
-      </div>
-    </el-card>
-  </div>
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
 import { t } from '@/lang'
-import {
-  getOrderList,
-  getOrderStatus,
-  getOrderPayType,
-  getOrderFrom,
-} from '@/addon/shop/api/order'
-import { img, setTablePageStorage, getTablePageStorage } from '@/utils/common'
+import { getOrderList, getOrderStatus, getOrderPayType, getOrderFrom } from '@/addon/shop/api/order'
+import { img,setTablePageStorage,getTablePageStorage } from '@/utils/common'
 import { FormInstance } from 'element-plus'
 import { useRouter, useRoute } from 'vue-router'
 
@@ -221,37 +139,37 @@ const statusData = ref([])
 const payTypeData = ref<any[]>([])
 const orderFromData = ref([])
 const setFormData = async () => {
-  statusData.value = await (await getOrderStatus()).data
-  payTypeData.value = await (await getOrderPayType()).data
-  orderFromData.value = await (await getOrderFrom()).data
+    statusData.value = await (await getOrderStatus()).data
+    payTypeData.value = await (await getOrderPayType()).data
+    orderFromData.value = await (await getOrderFrom()).data
 }
 
 setFormData()
 
 interface OrderTable {
-  page: number
-  limit: number
-  total: number
-  loading: boolean
-  data: any[]
-  searchParam: any
+    page: number
+    limit: number
+    total: number
+    loading: boolean
+    data: any[]
+    searchParam: any,
 }
 const orderTable = reactive<OrderTable>({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    search_type: 'order_no',
-    search_name: '',
-    pay_type: '',
-    order_from: '',
-    status: '',
-    create_time: [],
-    pay_time: [],
-    activity_type: 'exchange',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        search_type: 'order_no',
+        search_name: '',
+        pay_type: '',
+        order_from: '',
+        status: '',
+        create_time: [],
+        pay_time: [],
+        activity_type:'exchange'
+    }
 })
 
 const searchFormRef = ref<FormInstance>()
@@ -260,54 +178,48 @@ const searchFormRef = ref<FormInstance>()
  * 获取订单列表
  */
 const loadOrderList = (page: number = 1) => {
-  orderTable.loading = true
-  orderTable.page = page
-
-  getOrderList({
-    page: orderTable.page,
-    limit: orderTable.limit,
-    ...orderTable.searchParam,
-  })
-    .then((res) => {
-      orderTable.loading = false
-      orderTable.data = res.data.data.map((el: any) => {
-        el.order_goods.forEach((v: any) => {
-          v.rowNum = el.order_goods.length
+    orderTable.loading = true
+    orderTable.page = page
+
+    getOrderList({
+        page: orderTable.page,
+        limit: orderTable.limit,
+        ...orderTable.searchParam
+    }).then(res => {
+        orderTable.loading = false
+        orderTable.data = res.data.data.map((el: any) => {
+            el.order_goods.forEach((v: any) => {
+                v.rowNum = el.order_goods.length
+            })
+            return el
         })
-        return el
-      })
-      orderTable.total = res.data.total
-      setTablePageStorage(
-        orderTable.page,
-        orderTable.limit,
-        orderTable.searchParam
-      )
-    })
-    .catch(() => {
-      orderTable.loading = false
+        orderTable.total = res.data.total
+        setTablePageStorage(orderTable.page, orderTable.limit, orderTable.searchParam);
+    }).catch(() => {
+        orderTable.loading = false
     })
 }
-loadOrderList(getTablePageStorage(orderTable.searchParam).page)
+loadOrderList(getTablePageStorage(orderTable.searchParam).page);
 
 const handleClick = (event: any) => {
-  orderTable.searchParam.status = event
-  loadOrderList()
+    orderTable.searchParam.status = event
+    loadOrderList()
 }
 
 // 订单详情
 const detailEvent = (data: any) => {
-  router.push('/shop/order/detail?order_id=' + data.order_id)
+    router.push('/shop/order/detail?order_id=' + data.order_id)
 }
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadOrderList()
+    if (!formEl) return
+    formEl.resetFields()
+    loadOrderList()
 }
 </script>
 
 <style lang="scss" scoped>
-.input-item {
-  width: 150px !important;
-}
+    .input-item {
+    	width: 150px !important;
+    }
 </style>
diff --git a/admin/src/addon/shop/views/marketing/goods_rank/components/rank-select-popup.vue b/admin/src/addon/shop/views/marketing/goods_rank/components/rank-select-popup.vue
index e15b2c99..48b22232 100644
--- a/admin/src/addon/shop/views/marketing/goods_rank/components/rank-select-popup.vue
+++ b/admin/src/addon/shop/views/marketing/goods_rank/components/rank-select-popup.vue
@@ -1,122 +1,59 @@
 <template>
-  <div>
-    <div @click="show">
-      <slot>
-        <el-button>{{ t('rankSelectPopupSelectRankButton') }}</el-button>
-        <div class="inline-block ml-[10px] text-[14px]" v-show="rankIds.length">
-          <span>{{ t('goodsSelectPopupSelect') }}</span>
-          <span class="text-primary mx-[2px]">{{ rankIds.length }}</span>
-          <span>{{ t('goodsSelectPopupPiece') }}</span>
+    <div>
+        <div @click="show">
+        <slot>
+            <el-button>{{ t('rankSelectPopupSelectRankButton') }}</el-button>
+            <div class="inline-block ml-[10px] text-[14px]" v-show="rankIds.length">
+                <span>{{ t('goodsSelectPopupSelect') }}</span>
+                <span class="text-primary mx-[2px]">{{ rankIds.length }}</span>
+                <span>{{ t('goodsSelectPopupPiece') }}</span>
+            </div>
+        </slot>
         </div>
-      </slot>
-    </div>
-    <el-dialog
-      v-model="showDialog"
-      :name="t('rankSelect')"
-      width="1000px"
-      :close-on-press-escape="false"
-      :destroy-on-close="true"
-      :close-on-click-modal="false"
-    >
-      <el-form
-        :inline="true"
-        :model="rankTable.searchParam"
-        ref="searchFormRef"
-      >
-        <el-form-item
-          :label="t('rankName')"
-          prop="keyword"
-          class="form-item-wrap"
-        >
-          <el-input
-            v-model.trim="rankTable.searchParam.name"
-            :placeholder="t('rankNamePlaceholder')"
-            maxlength="60"
-          />
-        </el-form-item>
-        <el-form-item class="form-item-wrap">
-          <el-button type="primary" @click="loadRankList()">{{
-            t('search')
-          }}</el-button>
-          <el-button @click="resetForm(searchFormRef)">{{
-            t('reset')
-          }}</el-button>
-        </el-form-item>
-      </el-form>
+        <el-dialog v-model="showDialog" :name="t('rankSelect')" width="1000px" :close-on-press-escape="false" :destroy-on-close="true" :close-on-click-modal="false">
+        <el-form :inline="true" :model="rankTable.searchParam" ref="searchFormRef">
+            <el-form-item :label="t('rankName')" prop="keyword" class="form-item-wrap">
+                <el-input v-model.trim="rankTable.searchParam.name" :placeholder="t('rankNamePlaceholder')" maxlength="60" />
+            </el-form-item>
+            <el-form-item class="form-item-wrap">
+                <el-button type="primary" @click="loadRankList()">{{ t('search') }}</el-button>
+                <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+            </el-form-item>
+        </el-form>
 
-      <el-table
-        :data="rankTable.data"
-        size="large"
-        v-loading="rankTable.loading"
-        ref="rankListTableRef"
-        max-height="400"
-        @select="handleSelectChange"
-        @select-all="handleSelectAllChange"
-      >
-        <template #empty>
-          <span>{{ !rankTable.loading ? t('emptyData') : '' }}</span>
-        </template>
-        <!-- 多选框 -->
-        <el-table-column type="selection" width="55" />
-        <el-table-column prop="name" :label="t('rankName')" min-width="130" />
-        <el-table-column
-          prop="show_goods_num"
-          :label="t('showGoodsNum')"
-          min-width="130"
-        />
-        <el-table-column
-          prop="goods_source_name"
-          :label="t('goodsSourceName')"
-          min-width="130"
-        />
-        <el-table-column
-          prop="rule_type_name"
-          :label="t('ruleTypeName')"
-          min-width="130"
-        />
-        <el-table-column
-          prop="rank_type_name"
-          :label="t('rankTypeName')"
-          min-width="130"
-        />
-      </el-table>
+        <el-table :data="rankTable.data" size="large" v-loading="rankTable.loading" ref="rankListTableRef" max-height="400" @select="handleSelectChange" @select-all="handleSelectAllChange">
+            <template #empty>
+                <span>{{ !rankTable.loading ? t('emptyData') : '' }}</span>
+            </template>
+            <!-- 多选框 -->
+            <el-table-column type="selection" width="55" />
+            <el-table-column prop="name" :label="t('rankName')" min-width="130" />
+            <el-table-column prop="show_goods_num" :label="t('showGoodsNum')" min-width="130" />
+            <el-table-column prop="goods_source_name" :label="t('goodsSourceName')" min-width="130" />
+            <el-table-column prop="rule_type_name" :label="t('ruleTypeName')" min-width="130" />
+            <el-table-column prop="rank_type_name" :label="t('rankTypeName')" min-width="130" />
+        </el-table>
 
-      <div class="mt-[16px] flex">
-        <div class="flex items-center flex-1">
-          <div
-            class="layui-table-bottom-left-container mr-[10px]"
-            v-show="selectRankNum"
-          >
-            <span>{{ t('goodsSelectPopupBeforeTip') }}</span>
-            <span class="text-primary mx-[2px]">{{ selectRankNum }}</span>
-            <span>{{ t('rankSelectPopupAfterTip') }}</span>
-          </div>
-          <el-button
-            type="primary"
-            link
-            @click="clear"
-            v-show="selectRankNum"
-            >{{ t('goodsSelectPopupClearGoods') }}</el-button
-          >
+        <div class="mt-[16px] flex">
+            <div class="flex items-center flex-1">
+                <div class="layui-table-bottom-left-container mr-[10px]" v-show="selectRankNum">
+                    <span>{{ t('goodsSelectPopupBeforeTip') }}</span>
+                    <span class="text-primary mx-[2px]">{{ selectRankNum }}</span>
+                    <span>{{ t('rankSelectPopupAfterTip') }}</span>
+                </div>
+                <el-button type="primary" link @click="clear" v-show="selectRankNum">{{ t('goodsSelectPopupClearGoods') }}</el-button>
+            </div>
+            <el-pagination v-model:current-page="rankTable.page" v-model:page-size="rankTable.limit" layout="total, sizes, prev, pager, next, jumper" :total="rankTable.total" @size-change="loadRankList()" @current-change="loadRankList" />
         </div>
-        <el-pagination
-          v-model:current-page="rankTable.page"
-          v-model:page-size="rankTable.limit"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="rankTable.total"
-          @size-change="loadRankList()"
-          @current-change="loadRankList"
-        />
-      </div>
 
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-          <el-button type="primary" @click="save">{{ t('confirm') }}</el-button>
-        </span>
-      </template>
-    </el-dialog>
-  </div>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" @click="save">{{ t('confirm') }}</el-button>
+            </span>
+        </template>
+        </el-dialog>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -127,30 +64,30 @@ import { ElMessage } from 'element-plus'
 import { getSelectRankPageList } from '@/addon/shop/api/marketing'
 
 const prop = defineProps({
-  modelValue: {
-    type: String,
-    default: '',
-  },
-  max: {
-    type: Number,
-    default: 0,
-  },
-  min: {
-    type: Number,
-    default: 0,
-  },
-})
+    modelValue: {
+        type: String,
+        default: ''
+    },
+    max: {
+        type: Number,
+        default: 0
+    },
+    min: {
+        type: Number,
+        default: 0
+    }
+});
 
-const emit = defineEmits(['update:modelValue', 'rankSelect'])
+const emit = defineEmits(['update:modelValue', 'rankSelect']);
 
 const rankIds = computed({
-  get() {
-    return prop.modelValue
-  },
-  set(value) {
-    emit('update:modelValue', value)
-  },
-})
+    get() {
+        return prop.modelValue;
+    },
+    set(value) {
+        emit('update:modelValue', value);
+    }
+});
 
 const showDialog = ref(false)
 
@@ -159,19 +96,19 @@ const selectRank: any = reactive({})
 
 // 已选榜单数量
 const selectRankNum: any = computed(() => {
-  return Object.keys(selectRank).length
+    return Object.keys(selectRank).length
 })
 
 const rankTable = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    name: '',
-    verify_rank_ids: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        name: '',
+        verify_rank_ids:'',
+    }
 })
 
 const searchFormRef = ref()
@@ -183,172 +120,167 @@ const multipleSelection: any = ref([])
 
 // 监听表格复选框
 const handleSelectChange = (selection: any, row: any) => {
-  if (prop.max === 1) {
-    // 单选模式
-    rankListTableRef.value.clearSelection() // 清除所有选中状态
-    rankListTableRef.value.toggleRowSelection(row, true)
-    for (const key in selectRank) {
-      delete selectRank[key]
-    }
-    selectRank['rank_' + row.rank_id] = row
-  } else {
-    let isSelected = false
-    for (let i = 0; i < selection.length; i++) {
-      if (selection[i].rank_id === row.rank_id) {
-        isSelected = true
-        break
-      }
-    }
-    if (isSelected) {
-      selectRank['rank_' + row.rank_id] = row
+    if (prop.max === 1) {
+        // 单选模式
+        rankListTableRef.value.clearSelection(); // 清除所有选中状态
+        rankListTableRef.value.toggleRowSelection(row, true);
+        for (const key in selectRank) {
+            delete selectRank[key];
+        }
+        selectRank['rank_' + row.rank_id] = row;
     } else {
-      delete selectRank['rank_' + row.rank_id]
+        let isSelected = false;
+        for (let i = 0; i < selection.length; i++) {
+            if (selection[i].rank_id === row.rank_id) {
+                isSelected = true;
+                break;
+            }
+        }
+        if (isSelected) {
+            selectRank['rank_' + row.rank_id] = row;
+        } else {
+            delete selectRank['rank_' + row.rank_id];
+        }
     }
-  }
 }
 
 // 监听表格全选
 const handleSelectAllChange = (selection: any) => {
-  if (prop.max == 1) {
-    rankListTableRef.value.clearSelection()
-    for (const key in selectRank) {
-      delete selectRank[key]
-    }
-  } else {
-    if (selection.length) {
-      selection.forEach((item: any) => {
-        selectRank['rank_' + item.rank_id] = item
-      })
+    if (prop.max == 1) {
+        rankListTableRef.value.clearSelection();
+        for (const key in selectRank) {
+            delete selectRank[key];
+        }
     } else {
-      rankTable.data.forEach((item: any) => {
-        delete selectRank['rank_' + item.rank_id]
-      })
+        if (selection.length) {
+            selection.forEach((item: any) => {
+                selectRank['rank_' + item.rank_id] = item;
+            });
+        } else {
+            rankTable.data.forEach((item: any) => {
+                delete selectRank['rank_' + item.rank_id];
+            });
+        }
     }
-  }
 }
 
 // 表格设置选中状态
 const setRankSelected = () => {
-  nextTick(() => {
-    if (!rankListTableRef.value) return
-    for (let i = 0; i < rankTable.data.length; i++) {
-      rankListTableRef.value.toggleRowSelection(rankTable.data[i], false)
-      if (selectRank['rank_' + rankTable.data[i].rank_id]) {
-        rankListTableRef.value.toggleRowSelection(rankTable.data[i], true)
-      }
-    }
-  })
+    nextTick(() => {
+        if (!rankListTableRef.value) return;
+        for (let i = 0; i < rankTable.data.length; i++) {
+            rankListTableRef.value.toggleRowSelection(rankTable.data[i], false);
+            if (selectRank['rank_' + rankTable.data[i].rank_id]) {
+                rankListTableRef.value.toggleRowSelection(rankTable.data[i], true);
+            }
+        }
+    });
 }
 
 /**
  * 获取榜单列表
  */
 const loadRankList = (page: number = 1, callback: any = null) => {
-  rankTable.loading = true
-  rankTable.page = page
+    rankTable.loading = true
+    rankTable.page = page
 
-  const searchData: any = cloneDeep(rankTable.searchParam)
-  getSelectRankPageList({
-    page: rankTable.page,
-    limit: rankTable.limit,
-    ...searchData,
-  })
-    .then((res) => {
-      rankTable.loading = false
-      rankTable.data = res.data.data
-      rankTable.total = res.data.total
+    const searchData: any = cloneDeep(rankTable.searchParam);
+    getSelectRankPageList({
+        page: rankTable.page,
+        limit: rankTable.limit,
+        ...searchData
+    }).then(res => {
+        rankTable.loading = false
+        rankTable.data = res.data.data
+        rankTable.total = res.data.total
 
-      if (callback) callback(res.data.verify_rank_ids)
+        if (callback) callback(res.data.verify_rank_ids)
 
-      setRankSelected()
-    })
-    .catch(() => {
-      rankTable.loading = false
+        setRankSelected();
+    }).catch(() => {
+        rankTable.loading = false
     })
+
 }
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  rankTable.searchParam.verify_rank_ids = ''
-  rankTable.searchParam.name = ''
-  loadRankList()
+    if (!formEl) return
+    formEl.resetFields()
+    rankTable.searchParam.verify_rank_ids = '';
+    rankTable.searchParam.name = '';
+    loadRankList()
 }
 
 const show = () => {
-  // 检测商品id集合是否存在，移除不存在的商品id，纠正数据准确性
-  rankTable.searchParam.verify_rank_ids = rankIds.value
+    // 检测商品id集合是否存在，移除不存在的商品id，纠正数据准确性
+    rankTable.searchParam.verify_rank_ids = rankIds.value;
 
-  loadRankList(1, (verify_rank_ids: any) => {
-    // 第一次打开弹出框时，纠正数据，并且赋值已选榜单
-    if (rankIds.value) {
-      rankIds.value.splice(0, rankIds.value.length, ...verify_rank_ids)
-      rankIds.value.forEach((item: any) => {
-        if (!selectRank['rank_' + item]) {
-          selectRank['rank_' + item] = {}
-        }
-      })
-      // 赋值已选择的榜单
-      for (let i = 0; i < rankTable.data.length; i++) {
-        if (rankIds.value.indexOf(rankTable.data[i].rank_id) != -1) {
-          selectRank['rank_' + rankTable.data[i].rank_id] = rankTable.data[i]
+    loadRankList(1, (verify_rank_ids: any) => {
+        // 第一次打开弹出框时，纠正数据，并且赋值已选榜单
+        if (rankIds.value) {
+            rankIds.value.splice(0, rankIds.value.length, ...verify_rank_ids)
+            rankIds.value.forEach((item: any) => {
+                if (!selectRank['rank_' + item]) {
+                    selectRank['rank_' + item] = {};
+                }
+            })
+            // 赋值已选择的榜单
+            for (let i = 0; i < rankTable.data.length; i++) {
+                if (rankIds.value.indexOf(rankTable.data[i].rank_id) != -1) {
+                    selectRank['rank_' + rankTable.data[i].rank_id] = rankTable.data[i];
+                }
+            }
         }
-      }
-    }
-  })
-  showDialog.value = true
+    })
+    showDialog.value = true
 }
 
 // 清空已选榜单
 const clear = () => {
-  for (let k in selectRank) {
-    delete selectRank[k]
-  }
-  setRankSelected()
+    for (let k in selectRank) {
+        delete selectRank[k];
+    }
+    setRankSelected();
 }
 const save = () => {
-  if (prop.min && selectRankNum.value < prop.min) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('rankSelectPopupGoodsMinTip')}${prop.min}${t('goodsSelectPopupPiece')}`,
-    })
-    return
-  }
-  if (
-    prop.max &&
-    prop.max > 0 &&
-    selectRankNum.value &&
-    selectRankNum.value > prop.max
-  ) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('rankSelectPopupGoodsMaxTip')}${prop.max}${t('goodsSelectPopupPiece')}`,
-    })
-    return
-  }
-  let ids: any = []
-  for (let k in selectRank) {
-    ids.push(parseInt(k.replace('rank_', '')))
-  }
-  rankIds.value.splice(0, rankIds.value.length, ...ids)
-  emit('rankSelect', selectRank)
-  showDialog.value = false
+    if (prop.min && selectRankNum.value < prop.min) {
+        ElMessage({
+            type: 'warning',
+            message: `${t('rankSelectPopupGoodsMinTip')}${prop.min}${t('goodsSelectPopupPiece')}`,
+        });
+        return;
+    }
+    if (prop.max && prop.max > 0 && selectRankNum.value && selectRankNum.value > prop.max) {
+        ElMessage({
+            type: 'warning',
+            message: `${t('rankSelectPopupGoodsMaxTip')}${prop.max}${t('goodsSelectPopupPiece')}`,
+        });
+        return;
+    }
+    let ids: any = [];
+    for (let k in selectRank) {
+        ids.push(parseInt(k.replace('rank_', '')));
+    }
+    rankIds.value.splice(0, rankIds.value.length, ...ids)
+    emit('rankSelect',selectRank)
+    showDialog.value = false
 }
 
 defineExpose({
-  showDialog,
-  selectRank,
-  selectRankNum,
+    showDialog,
+    selectRank,
+    selectRankNum
 })
 </script>
 
 <style lang="scss" scoped>
 .form-item-wrap {
-  margin-right: 10px !important;
-  margin-bottom: 10px !important;
+    margin-right: 10px !important;
+    margin-bottom: 10px !important;
 
-  &.last-child {
-    margin-right: 0 !important;
-  }
+    &.last-child {
+        margin-right: 0 !important;
+    }
 }
 </style>
+
diff --git a/admin/src/addon/shop/views/marketing/goods_rank/config.vue b/admin/src/addon/shop/views/marketing/goods_rank/config.vue
index f4b3a4c8..826b287a 100644
--- a/admin/src/addon/shop/views/marketing/goods_rank/config.vue
+++ b/admin/src/addon/shop/views/marketing/goods_rank/config.vue
@@ -1,127 +1,105 @@
 <template>
-  <div>
-    <!-- 榜单设置 -->
-    <el-card class="box-card !border-none main-container" shadow="never">
-      <div class="flex justify-between items-center mb-[10px]">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
+    <div>
+        <!-- 榜单设置 -->
+        <el-card class="box-card !border-none main-container" shadow="never">
+            <div class="flex justify-between items-center mb-[10px]">
+                <span class="text-page-title">{{ pageName }}</span>
+            </div>
 
-      <el-form
-        :model="formData"
-        label-width="120px"
-        ref="formRef"
-        :rules="formRules"
-        class="page-form"
-      >
-        <el-card class="box-card !border-none" shadow="never">
-          <!-- <el-form-item :label="t('rankName')" prop="rank_name">
+            <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form">
+                <el-card class="box-card !border-none" shadow="never">
+                    <!-- <el-form-item :label="t('rankName')" prop="rank_name">
                         <div class="flex items-center mx-[5px]">
                             <el-input v-model.trim="formData.rank_name" clearable class="input-width" :placeholder="t('rankNamePlaceholder')" maxlength="20" show-word-limit />
                         </div>
                     </el-form-item> -->
-          <el-form-item
-            :label="t('rankImages')"
-            prop="rank_images"
-            :rules="[
-              {
-                required: true,
-                trigger: 'change',
-                validator: (rule: any, value: any, callback: any) => {
-                  if (!value) {
-                    callback(t('imagePlaceholder'))
-                  }
-                  callback()
-                },
-              },
-            ]"
-          >
-            <upload-image v-model="formData.rank_images" :limit="1" />
-          </el-form-item>
-          <el-form-item :label="t('noColor')">
-            <el-color-picker v-model="formData.no_color" show-alpha />
-          </el-form-item>
-          <el-form-item :label="t('selectedColor')">
-            <el-color-picker v-model="formData.select_color" show-alpha />
-          </el-form-item>
-          <el-form-item :label="t('selectedBgColor')">
-            <el-color-picker
-              v-model="formData.select_bg_color_start"
-              show-alpha
-            />
-            <icon
-              name="iconfont iconmap-connect"
-              size="20px"
-              class="block !text-gray-400 mx-[5px]"
-            />
-            <el-color-picker
-              v-model="formData.select_bg_color_end"
-              show-alpha
-            />
-          </el-form-item>
+                    <el-form-item :label="t('rankImages')" prop="rank_images" :rules="[{
+                        required: true,
+                        trigger: 'change',
+                        validator: (rule: any, value: any, callback: any) => {
+                        if (!value) {
+                            callback(t('imagePlaceholder'))
+                        }
+                        callback()
+                        }
+                    }]">
+                        <upload-image v-model="formData.rank_images" :limit="1" />
+                    </el-form-item>
+                    <el-form-item :label="t('noColor')">
+                        <el-color-picker v-model="formData.no_color" show-alpha  />
+                    </el-form-item>
+                    <el-form-item :label="t('selectedColor')">
+                        <el-color-picker v-model="formData.select_color" show-alpha  />
+                    </el-form-item>
+                    <el-form-item :label="t('selectedBgColor')">
+                        <el-color-picker v-model="formData.select_bg_color_start" show-alpha />
+                        <icon name="iconfont iconmap-connect" size="20px" class="block !text-gray-400 mx-[5px]" />
+                        <el-color-picker v-model="formData.select_bg_color_end" show-alpha />
+                    </el-form-item>
 
-          <!-- <el-form-item :label="t('rankRemark')" prop="rank_remark">
+                    <!-- <el-form-item :label="t('rankRemark')" prop="rank_remark">
                         <el-input v-model="formData.rank_remark" :placeholder="t('rankRemarkPlaceholder')" type="textarea" maxlength="500" show-word-limit rows="5" class="!w-[400px]" clearable />
                         <el-button class="ml-[20px]" type="primary" @click="defaultRankRemarkEvent()" plain>{{ t('useDefaultRankRemark') }}</el-button>
                     </el-form-item> -->
+                </el-card>
+            </el-form>
         </el-card>
-      </el-form>
-    </el-card>
 
-    <!-- 提交按钮 -->
-    <div class="fixed-footer-wrap">
-      <div class="fixed-footer h-[48px]">
-        <el-button type="primary" @click="onSave">{{ t('save') }}</el-button>
-      </div>
+        <!-- 提交按钮 -->
+        <div class="fixed-footer-wrap">
+            <div class="fixed-footer h-[48px]">
+                <el-button type="primary" @click="onSave">{{ t("save") }}</el-button>
+            </div>
+        </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
-import { ref, computed } from 'vue'
-import { t } from '@/lang'
-import { useRoute } from 'vue-router'
-import { FormInstance } from 'element-plus'
-import { getRankConfig, setRankConfig } from '@/addon/shop/api/marketing'
+import { ref, computed } from "vue";
+import { t } from "@/lang";
+import { useRoute } from "vue-router";
+import { FormInstance } from "element-plus";
+import { getRankConfig, setRankConfig } from "@/addon/shop/api/marketing";
 
-const route = useRoute()
-const pageName = route.meta.title
+const route = useRoute();
+const pageName = route.meta.title;
 
 const formData = ref({
-  // rank_name: "",
-  // rank_remark: "",
-  no_color: '#FFFCF5',
-  select_color: '#FF4142',
-  select_bg_color_start: '#FFFFFF',
-  select_bg_color_end: '#FFEBD7',
-  rank_images: '',
-})
+    // rank_name: "",
+    // rank_remark: "",
+    no_color: "#FFFCF5",
+    select_color: "#FF4142",
+    select_bg_color_start: "#FFFFFF",
+    select_bg_color_end: "#FFEBD7",
+    rank_images: "",
+});
 
-const formRef = ref<FormInstance>()
+const formRef = ref<FormInstance>();
 
 const formRules = computed(() => {
-  return {
-    // rank_name: [
-    //     { required: true, message: t("rankNamePlaceholder"), trigger: "blur" },
-    // ],
-    rank_images: [
-      {
-        required: true,
-        message: t('imagePlaceholder'),
-        trigger: 'change',
-      },
-    ],
-  }
-})
+    return {
+        // rank_name: [
+        //     { required: true, message: t("rankNamePlaceholder"), trigger: "blur" },
+        // ],
+        rank_images: [
+            {
+                required: true,
+                message: t("imagePlaceholder"),
+                trigger: "change",
+            },
+        ],
+    };
+});
 
 const getRankConfigFn = () => {
-  getRankConfig().then((res: any) => {
-    Object.keys(formData.value).forEach((key) => {
-      if (res.data[key]) formData.value[key] = res.data[key]
+    getRankConfig().then((res: any) => {
+        Object.keys(formData.value).forEach((key) => {
+            if (res.data[key]) formData.value[key] = res.data[key];
+        });
     })
-  })
-}
+};
 
-getRankConfigFn()
+getRankConfigFn();
 
 /**
  * 使用默认说明
@@ -131,25 +109,23 @@ getRankConfigFn()
 // }
 
 /**** 提交 ****/
-const preventDuplication = ref(false)
+const preventDuplication = ref(false);
 const onSave = async () => {
-  if (preventDuplication.value) return
-  await formRef.value?.validate(async (valid) => {
-    if (valid) {
-      preventDuplication.value = true
-      console.log(formData.value)
+    if (preventDuplication.value) return;
+    await formRef.value?.validate(async(valid) => {
+        if (valid) {
+            preventDuplication.value = true;
+            console.log(formData.value);
 
-      setRankConfig(formData.value)
-        .then(() => {
-          getRankConfigFn()
-          preventDuplication.value = false
-        })
-        .catch(() => {
-          preventDuplication.value = false
-        })
-    }
-  })
-}
+            setRankConfig(formData.value).then(() => {
+                getRankConfigFn();
+                preventDuplication.value = false;
+            }).catch(() => {
+                preventDuplication.value = false;
+            });
+        }
+    });
+};
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/addon/shop/views/marketing/goods_rank/edit.vue b/admin/src/addon/shop/views/marketing/goods_rank/edit.vue
index c2417398..babd2a37 100644
--- a/admin/src/addon/shop/views/marketing/goods_rank/edit.vue
+++ b/admin/src/addon/shop/views/marketing/goods_rank/edit.vue
@@ -1,433 +1,246 @@
 <template>
-  <div class="main-container">
+  <div  class="main-container">
     <el-card class="box-card !border-none" shadow="never">
-      <el-page-header
-        :content="rank_id ? t('updateRanking') : t('addRanking')"
-        :icon="ArrowLeft"
-        @back="back()"
-      />
+      <el-page-header :content="rank_id ? t('updateRanking') : t('addRanking')" :icon="ArrowLeft" @back="back()" />
     </el-card>
 
-    <el-card
-      class="box-card mt-[15px] !border-none"
-      shadow="never"
-      v-loading="loading"
-    >
-      <el-form
-        :model="formData"
-        label-width="120px"
-        ref="formRef"
-        :rules="formRules"
-        class="page-form"
-      >
+    <el-card class="box-card mt-[15px] !border-none" shadow="never" v-loading="loading">
+      <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form">
         <el-form-item :label="t('rankName')" prop="name">
-          <el-input
-            v-model.trim="formData.name"
-            clearable
-            :placeholder="t('rankNamePlaceholder')"
-            class="input-width"
-            maxlength="10"
-            show-word-limit
-          />
+          <el-input v-model.trim="formData.name" clearable :placeholder="t('rankNamePlaceholder')" class="input-width" maxlength="10" show-word-limit />
         </el-form-item>
 
         <el-form-item :label="t('rankType')" prop="rank_type">
-          <el-select
-            v-model="formData.rank_type"
-            :placeholder="t('rankTypePlaceholder')"
-            clearable
-          >
-            <el-option
-              v-for="(value, key) in formList.rankTypeList"
-              :key="key"
-              :label="value"
-              :value="key"
-            />
+          <el-select v-model="formData.rank_type" :placeholder="t('rankTypePlaceholder')" clearable>
+            <el-option v-for="(value, key) in formList.rankTypeList" :key="key" :label="value" :value="key" />
           </el-select>
         </el-form-item>
-        <div
-          class="ml-[120px] mb-[10px] text-[12px] text-[#999] leading-[20px]"
-        >
-          {{ t('rankTypeTips') }}
-        </div>
+        <div class="ml-[120px] mb-[10px] text-[12px] text-[#999] leading-[20px]">{{ t('rankTypeTips') }}</div>
         <el-form-item :label="t('ruleType')" prop="rule_type">
           <el-radio-group v-model="formData.rule_type">
-            <el-radio
-              v-for="(value, key) in formList.ruleTypeList"
-              :key="key"
-              :label="key"
-              >{{ value }}</el-radio
-            >
+            <el-radio v-for="(value, key) in formList.ruleTypeList" :key="key" :label="key">{{ value }}</el-radio>
           </el-radio-group>
         </el-form-item>
 
         <el-form-item :label="t('goodsSource')" prop="goods_source">
           <el-radio-group v-model="formData.goods_source">
-            <el-radio
-              v-for="(value, key) in formList.goodsSourceList"
-              :key="key"
-              :label="key"
-              >{{ value }}</el-radio
-            >
+            <el-radio v-for="(value, key) in formList.goodsSourceList" :key="key" :label="key">{{ value }}</el-radio>
           </el-radio-group>
         </el-form-item>
 
-        <el-form-item
-          :label="t('selectGoods')"
-          prop="goods_json"
-          v-if="formData.goods_source == 'goods'"
-        >
-          <goods-select-popup
-            ref="goodsSelectPopupRef"
-            v-model="formData.goods_ids"
-            @goodsSelect="goodsSelect"
-            :min="1"
-            :max="99"
-          />
+        <el-form-item :label="t('selectGoods')" prop="goods_json" v-if="formData.goods_source == 'goods'">
+          <goods-select-popup ref="goodsSelectPopupRef" v-model="formData.goods_ids" @goodsSelect="goodsSelect" :min="1" :max="99" />
         </el-form-item>
 
-        <el-form-item
-          v-if="
-            goods_json && goods_json.length && formData.goods_source == 'goods'
-          "
-        >
+        <el-form-item v-if="goods_json && goods_json.length && formData.goods_source == 'goods' ">
           <el-table :data="goods_json" size="large" max-height="400">
-            <el-table-column
-              prop="goods_id"
-              :label="t('goodsSelectPopupGoodsInfo')"
-              min-width="300"
-            >
+            <el-table-column prop="goods_id" :label="t('goodsSelectPopupGoodsInfo')" min-width="300">
               <template #default="{ row }">
                 <div class="flex items-center cursor-pointer">
-                  <div
-                    class="min-w-[60px] h-[60px] flex items-center justify-center"
-                  >
-                    <el-image
-                      v-if="row.goods_image"
-                      class="w-[60px] h-[60px]"
-                      :src="img(row.goods_image)"
-                      fit="contain"
-                    >
+                  <div class="min-w-[60px] h-[60px] flex items-center justify-center">
+                    <el-image v-if="row.goods_image" class="w-[60px] h-[60px]" :src="img(row.goods_image)" fit="contain">
                       <template #error>
                         <div class="image-slot">
-                          <img
-                            class="w-[60px] h-[60px]"
-                            src="@/addon/shop/assets/goods_default.png"
-                          />
+                          <img class="w-[60px] h-[60px]" src="@/addon/shop/assets/goods_default.png" />
                         </div>
                       </template>
                     </el-image>
-                    <img
-                      v-else
-                      class="w-[70px] h-[60px]"
-                      src="@/addon/shop/assets/goods_default.png"
-                      fit="contain"
-                    />
+                    <img v-else class="w-[70px] h-[60px]" src="@/addon/shop/assets/goods_default.png" fit="contain" />
                   </div>
                   <div class="ml-2">
-                    <span :title="row.sku_name" class="multi-hidden">{{
-                      row.sku_name
-                        ? row.goods_name + ' ' + row.sku_name
-                        : row.goods_name
-                    }}</span>
-                    <span class="text-primary text-[12px]">{{
-                      row.goods_type_name
-                    }}</span>
+                    <span :title="row.sku_name" class="multi-hidden">{{row.sku_name ? row.goods_name + " " + row.sku_name: row.goods_name}}</span>
+                    <span class="text-primary text-[12px]">{{row.goods_type_name}}</span>
                   </div>
                 </div>
               </template>
             </el-table-column>
 
-            <el-table-column
-              prop="price"
-              :label="t('goodsSelectPopupPrice')"
-              min-width="120"
-            >
+            <el-table-column prop="price" :label="t('goodsSelectPopupPrice')" min-width="120">
               <template #default="{ row }">
                 <div>￥{{ row.price }}</div>
               </template>
             </el-table-column>
 
             <el-table-column prop="sort" :label="t('sort')" min-width="120">
-              <template #header>
-                <div style="display: inline-flex; align-items: center">
-                  <span class="mr-[5px]">{{ t('sort') }}</span>
-                  <el-tooltip
-                    class="box-item"
-                    effect="light"
-                    :content="t('sortRules')"
-                    placement="top"
-                  >
-                    <el-icon color="#666">
-                      <QuestionFilled />
-                    </el-icon>
-                  </el-tooltip>
-                </div>
-              </template>
-              <template #default="{ row }">
-                <el-input
-                  @keyup="filterNumber($event)"
-                  v-model.number="row.sort"
-                  class="w-[70px]"
-                  maxlength="8"
-                />
-              </template>
-            </el-table-column>
-
-            <el-table-column
-              :label="t('operation')"
-              align="right"
-              min-width="160"
-            >
+                <template #header>
+                    <div style="display: inline-flex; align-items: center">
+                        <span class="mr-[5px]">{{ t('sort') }}</span>
+                        <el-tooltip class="box-item" effect="light" :content="t('sortRules')" placement="top">
+                          <el-icon color="#666">
+                              <QuestionFilled />
+                          </el-icon>
+                        </el-tooltip>
+                    </div>
+                </template>
+                <template #default="{ row }">
+                <el-input @keyup="filterNumber($event)" v-model.number ="row.sort" class="w-[70px]" maxlength="8"  />
+                </template>
+          </el-table-column>
+
+            <el-table-column :label="t('operation')" align="right" min-width="160">
               <template #default="{ row, $index }">
-                <el-button
-                  type="primary"
-                  link
-                  @click="deleteGoodsEvent(row, $index)"
-                  >{{ t('delete') }}</el-button
-                >
+                <el-button type="primary" link @click="deleteGoodsEvent(row, $index)">{{ t("delete") }}</el-button>
               </template>
             </el-table-column>
           </el-table>
         </el-form-item>
 
-        <el-form-item
-          :label="t('goodsSelectPopupGoodsCategory')"
-          prop="category_ids"
-          v-if="formData.goods_source == 'category'"
-        >
-          <el-cascader
-            v-model="formData.category_ids"
-            :options="goodsCategoryOptions"
-            :props="goodsCategoryProps"
-            clearable
-            filterable
-            @change="categoryHandleChange"
-            popper-class="choice"
-          />
+        <el-form-item :label="t('goodsSelectPopupGoodsCategory')" prop="category_ids" v-if="formData.goods_source == 'category'">
+          <el-cascader v-model="formData.category_ids" :options="goodsCategoryOptions" :props="goodsCategoryProps" clearable filterable @change="categoryHandleChange" popper-class="choice" />
           <div class="ml-[10px]">
-            <span
-              class="cursor-pointer text-primary mr-[10px]"
-              @click="refreshGoodsCategory(true)"
-              >{{ t('refresh') }}</span
-            >
-            <span
-              class="cursor-pointer text-primary"
-              @click="toGoodsCategoryEvent"
-              >{{ t('addCategory') }}</span
-            >
+            <span class="cursor-pointer text-primary mr-[10px]" @click="refreshGoodsCategory(true)">{{ t("refresh")}}</span>
+            <span class="cursor-pointer text-primary" @click="toGoodsCategoryEvent">{{ t("addCategory") }}</span>
           </div>
         </el-form-item>
 
-        <el-form-item
-          :label="t('brand')"
-          prop="brand_ids"
-          v-if="formData.goods_source == 'brand'"
-        >
-          <el-select
-            v-model="formData.brand_ids"
-            :placeholder="t('brandPlaceholder')"
-            clearable
-            multiple
-          >
-            <el-option
-              v-for="item in brandOptions"
-              :key="item.brand_id"
-              :label="item.brand_name"
-              :value="item.brand_id"
-            />
+        <el-form-item :label="t('brand')" prop="brand_ids" v-if="formData.goods_source == 'brand'">
+          <el-select v-model="formData.brand_ids" :placeholder="t('brandPlaceholder')" clearable multiple>
+            <el-option v-for="item in brandOptions" :key="item.brand_id" :label="item.brand_name" :value="item.brand_id" />
           </el-select>
           <div class="ml-[10px]">
-            <span
-              class="cursor-pointer text-primary mr-[10px]"
-              @click="refreshGoodsBrand(true)"
-              >{{ t('refresh') }}</span
-            >
-            <span
-              class="cursor-pointer text-primary"
-              @click="toGoodsBrandEvent"
-              >{{ t('addBrand') }}</span
-            >
+            <span class="cursor-pointer text-primary mr-[10px]" @click="refreshGoodsBrand(true)">{{ t("refresh")}}</span>
+            <span class="cursor-pointer text-primary" @click="toGoodsBrandEvent">{{ t("addBrand") }}</span>
           </div>
         </el-form-item>
 
-        <el-form-item
-          :label="t('label')"
-          prop="label_ids"
-          v-if="formData.goods_source == 'label'"
-        >
+        <el-form-item :label="t('label')" prop="label_ids" v-if="formData.goods_source == 'label'">
           <el-checkbox-group v-model="formData.label_ids">
-            <el-checkbox
-              :label="item.label_id"
-              v-for="(item, index) in labelOptions"
-              :key="index"
-              >{{ item.label_name }}</el-checkbox
-            >
+            <el-checkbox :label="item.label_id" v-for="(item, index) in labelOptions" :key="index">{{ item.label_name}}</el-checkbox>
           </el-checkbox-group>
           <div class="ml-[10px]">
-            <span
-              class="cursor-pointer text-primary mr-[10px]"
-              @click="refreshGoodsLabel"
-              >{{ t('refresh') }}</span
-            >
-            <span
-              class="cursor-pointer text-primary"
-              @click="toGoodsLabelEvent"
-              >{{ t('addLabel') }}</span
-            >
+            <span class="cursor-pointer text-primary mr-[10px]" @click="refreshGoodsLabel">{{ t("refresh") }}</span>
+            <span class="cursor-pointer text-primary" @click="toGoodsLabelEvent">{{ t("addLabel") }}</span>
           </div>
         </el-form-item>
 
         <el-form-item :label="t('sort')" prop="sort">
-          <el-input
-            v-model.number="formData.sort"
-            clearable
-            :placeholder="t('sortPlaceholder')"
-            class="input-width"
-            maxlength="8"
-            show-word-limit
-            @keyup="filterNumber($event)"
-            @blur="formData.sort = $event.target.value"
-          />
+          <el-input v-model.number="formData.sort" clearable :placeholder="t('sortPlaceholder')" class="input-width" maxlength="8" show-word-limit  @keyup="filterNumber($event)" @blur="formData.sort = $event.target.value" />
         </el-form-item>
         <el-form-item :label="t('isShow')" prop="status">
-          <el-switch
-            v-model="formData.status"
-            :active-value="1"
-            :inactive-value="0"
-          />
+            <el-switch v-model="formData.status" :active-value="1" :inactive-value="0" />
         </el-form-item>
       </el-form>
     </el-card>
 
     <div class="fixed-footer-wrap">
       <div class="fixed-footer">
-        <el-button type="primary" @click="save()">{{ t('save') }}</el-button>
-        <el-button @click="back()">{{ t('cancel') }}</el-button>
+        <el-button type="primary" @click="save()">{{ t("save") }}</el-button>
+        <el-button @click="back()">{{ t("cancel") }}</el-button>
       </div>
     </div>
   </div>
 </template>
 
 <script lang="ts" setup>
-import { ref, computed, reactive } from 'vue'
-import { t } from '@/lang'
-import { useRoute, useRouter } from 'vue-router'
-import { ArrowLeft } from '@element-plus/icons-vue'
-import { FormInstance, ElMessage } from 'element-plus'
-import {
-  optionData,
-  getRankInfo,
-  addGoodRank,
-  editGoodRank,
-} from '@/addon/shop/api/marketing'
-import goodsSelectPopup from '@/addon/shop/views/goods/components/goods-select-popup.vue'
-import {
-  getBrandList,
-  getLabelList,
-  getCategoryTree,
-} from '@/addon/shop/api/goods'
-import { img, deepClone, filterNumber } from '@/utils/common'
-
-const router = useRouter()
-const route = useRoute()
-const loading = ref(true)
-const rank_id = route.query.rank_id
-const goods_json = ref([])
+import { ref, computed, reactive } from "vue";
+import { t } from "@/lang";
+import { useRoute, useRouter } from "vue-router";
+import { ArrowLeft } from "@element-plus/icons-vue";
+import { FormInstance, ElMessage } from "element-plus";
+import {optionData,getRankInfo,addGoodRank,editGoodRank,} from "@/addon/shop/api/marketing";
+import goodsSelectPopup from "@/addon/shop/views/goods/components/goods-select-popup.vue";
+import {getBrandList,getLabelList,getCategoryTree} from "@/addon/shop/api/goods";
+import {img, deepClone ,filterNumber} from '@/utils/common'
+
+const router = useRouter();
+const route = useRoute();
+const loading = ref(true);
+const rank_id = route.query.rank_id;
+const goods_json = ref([]);
 const formData = reactive({
-  name: '',
-  goods_source: 'all',
-  rank_type: '',
-  sort: '',
-  rule_type: 'sale',
-  category_ids: [],
-  status: 1,
-  brand_ids: [],
-  label_ids: [],
-  goods_json: <Array<any>>[],
-  goods_ids: [],
-})
+    name: "",
+    goods_source: "all",
+    rank_type: "",
+    sort: "",
+    rule_type: "sale",
+    category_ids: [],
+    status: 1,
+    brand_ids: [],
+    label_ids: [],
+    goods_json: <Array<any>>[],
+    goods_ids: [],
+});
 
 const formList = reactive({
-  rankTypeList: [],
-  goodsSourceList: [],
-  ruleTypeList: [],
-})
-const formRef = ref<FormInstance>()
+    rankTypeList: [],
+    goodsSourceList: [],
+    ruleTypeList: [],
+});
+const formRef = ref<FormInstance>();
 const formRules = computed(() => {
   return {
     name: [
-      { required: true, message: t('rankNamePlaceholder'), trigger: 'blur' },
+      { required: true, message: t("rankNamePlaceholder"), trigger: "blur" },
     ],
     rule_type: [
       {
         required: true,
-        message: t('ruleTypePlaceholder'),
-        trigger: 'change',
+        message: t("ruleTypePlaceholder"),
+        trigger: "change",
       },
     ],
     rank_type: [
       {
         required: true,
-        message: t('rankTypePlaceholder'),
-        trigger: 'change',
+        message: t("rankTypePlaceholder"),
+        trigger: "change",
       },
     ],
     goods_source: [
       {
         required: true,
-        message: t('goodsSourcePlaceholder'),
-        trigger: 'change',
+        message: t("goodsSourcePlaceholder"),
+        trigger: "change",
       },
     ],
     label_ids: [
       {
         validator: (rule: any, value: any, callback: any) => {
-          if (formData.goods_source === 'label') {
+          if (formData.goods_source === "label") {
             if (!value || value.length === 0) {
-              callback(t('labelTips')) // 提示错误信息
+              callback(t("labelTips")); // 提示错误信息
             } else {
-              callback() // 校验通过
+              callback(); // 校验通过
             }
           } else {
-            callback()
+            callback();
           }
         },
-        trigger: 'change',
+        trigger: "change",
       },
     ],
     brand_ids: [
       {
         required: true,
         validator: (rule: any, value: any, callback: any) => {
-          if (formData.goods_source === 'brand') {
+          if (formData.goods_source === "brand") {
             if (!value || value.length === 0) {
-              callback(t('brandTips')) // 提示错误信息
+              callback(t("brandTips")); // 提示错误信息
             } else {
-              callback() // 校验通过
+              callback(); // 校验通过
             }
           } else {
-            callback()
+            callback();
           }
         },
-        trigger: 'change',
+        trigger: "change",
       },
     ],
     category_ids: [
       {
         required: true,
         validator: (rule: any, value: any, callback: any) => {
-          if (formData.goods_source === 'category') {
+          if (formData.goods_source === "category") {
             if (!value || value.length === 0) {
-              callback(t('categoryTips')) // 提示错误信息
+              callback(t("categoryTips")); // 提示错误信息
             } else {
-              callback() // 校验通过
+              callback(); // 校验通过
             }
           } else {
-            callback()
+            callback();
           }
         },
-        trigger: 'change',
+        trigger: "change",
       },
     ],
     goods_json: [
@@ -435,265 +248,264 @@ const formRules = computed(() => {
         required: true,
         trigger: 'blur',
         validator: (rule: any, value: any, callback: any) => {
-          if (formData.goods_source == 'goods') {
-            if (goods_json.value.length == 0) {
-              callback(new Error(t('goodsJsonEmpty')))
-            } else {
-              callback()
+            if (formData.goods_source == 'goods') {
+                if (goods_json.value.length == 0) {
+                    callback(new Error(t('goodsJsonEmpty')))
+                } else {
+                    callback()
+                }
             }
-          }
-        },
-      },
+        }
+      }
     ],
-  }
-})
-
-const getRankDetails = () => {
-  optionData().then((res) => {
-    loading.value = false
-    formList.rankTypeList = res.data.rank_type
-    formList.goodsSourceList = res.data.goods_source
-    formList.ruleTypeList = res.data.rule_type
-  })
-  if (rank_id) {
-    // 获取详情
-    loading.value = true
-    const id = Number(rank_id)
-    getRankInfo(id).then((res) => {
-      const data = res.data
-      if (data) {
-        Object.assign(formData, data)
-        if (formData.goods_source == 'goods') {
-          formData.goods_ids.splice(0, formData.goods_ids.length)
-          formData.goods_json.forEach((item: any) => {
-            formData.goods_ids.push(item.goods_id)
-          })
+  };
+});
+
+const getRankDetails= () => {
+    optionData().then((res) => {
+        loading.value = false;
+        formList.rankTypeList = res.data.rank_type;
+        formList.goodsSourceList = res.data.goods_source;
+        formList.ruleTypeList = res.data.rule_type;
+    });
+    if (rank_id) {
+        // 获取详情
+        loading.value = true;
+        const id = Number(rank_id);
+        getRankInfo(id).then((res) => {
+        const data = res.data;
+        if (data) {
+            Object.assign(formData, data);
+            if (formData.goods_source == 'goods') {
+            formData.goods_ids.splice(0, formData.goods_ids.length);
+            formData.goods_json.forEach((item: any) => {
+                formData.goods_ids.push( item.goods_id)
+            })
+
+            }
+            goods_json.value = data.goods_list.map((item: any) => {
+            return {
+                goods_id: item.goods_id,
+                sort: item.sort,
+                price:item.goodsSku.price,
+                goods_type_name: item.goods_type_name,
+                goods_name: item.goods_name,
+                goods_image: item.goodsSku.sku_image,
+            };
+            });
+            loading.value = false;
+
         }
-        goods_json.value = data.goods_list.map((item: any) => {
-          return {
-            goods_id: item.goods_id,
-            sort: item.sort,
-            price: item.goodsSku.price,
-            goods_type_name: item.goods_type_name,
-            goods_name: item.goods_name,
-            goods_image: item.goodsSku.sku_image,
-          }
         })
-        loading.value = false
-      }
-    })
-  }
-}
-getRankDetails()
+    }
+};
+getRankDetails();
 
 // 商品分类
-const goodsCategoryOptions = reactive([])
+const goodsCategoryOptions = reactive([]);
 const goodsCategoryProps = {
-  multiple: true,
-}
+     multiple: true,
+};
 
 const categoryHandleChange = (value: any) => {
-  console.log(value, formData.category_ids, formData.category_ids.toString())
-}
+    console.log(value, formData.category_ids, formData.category_ids.toString());
+};
 
 // 跳转到商品分类，添加分类
 const toGoodsCategoryEvent = () => {
-  const url = router.resolve({
-    path: '/shop/goods/category',
-  })
-  window.open(url.href)
-}
+    const url = router.resolve({
+        path: "/shop/goods/category",
+    });
+    window.open(url.href);
+};
 
 // 刷新商品分类
 const refreshGoodsCategory = (bool = false) => {
-  getCategoryTree().then((res) => {
-    const data = res.data
-    if (data) {
-      const goodsCategoryTree: any = []
-      data.forEach((item: any) => {
-        const children: any = []
-        if (item.child_list) {
-          item.child_list.forEach((childItem: any) => {
-            children.push({
-              value: childItem.category_id,
-              label: childItem.category_name,
-            })
-          })
+    getCategoryTree().then((res) => {
+        const data = res.data;
+        if (data) {
+        const goodsCategoryTree: any = [];
+        data.forEach((item: any) => {
+            const children: any = [];
+            if (item.child_list) {
+            item.child_list.forEach((childItem: any) => {
+                children.push({
+                value: childItem.category_id,
+                label: childItem.category_name,
+                });
+            });
+            }
+            goodsCategoryTree.push({
+            value: item.category_id,
+            label: item.category_name,
+            children,
+            });
+        });
+        goodsCategoryOptions.splice(
+            0,
+            goodsCategoryOptions.length,
+            ...goodsCategoryTree
+        );
+        if (bool) {
+            ElMessage({
+            message: t("refreshSuccess"),
+            type: "success",
+            });
         }
-        goodsCategoryTree.push({
-          value: item.category_id,
-          label: item.category_name,
-          children,
-        })
-      })
-      goodsCategoryOptions.splice(
-        0,
-        goodsCategoryOptions.length,
-        ...goodsCategoryTree
-      )
-      if (bool) {
-        ElMessage({
-          message: t('refreshSuccess'),
-          type: 'success',
-        })
-      }
-    }
-  })
-}
+        }
+    });
+};
 
-refreshGoodsCategory()
+refreshGoodsCategory();
 
 // 品牌列表下拉框
-const brandOptions = reactive([])
+const brandOptions = reactive([]);
 
 // 跳转到商品品牌，添加品牌
 const toGoodsBrandEvent = () => {
-  const url = router.resolve({
-    path: '/shop/goods/brand',
-  })
-  window.open(url.href)
-}
+    const url = router.resolve({
+        path: "/shop/goods/brand",
+    });
+    window.open(url.href);
+};
 
 // 商品品牌
 const refreshGoodsBrand = (bool = false) => {
-  getBrandList({}).then((res) => {
-    const data = res.data
-    if (data) {
-      brandOptions.splice(0, brandOptions.length, ...data)
-      if (bool) {
-        ElMessage({
-          message: t('refreshSuccess'),
-          type: 'success',
-        })
-      }
-    }
-  })
-}
+    getBrandList({}).then((res) => {
+        const data = res.data;
+        if (data) {
+        brandOptions.splice(0, brandOptions.length, ...data);
+        if (bool) {
+            ElMessage({
+            message: t("refreshSuccess"),
+            type: "success",
+            });
+        }
+        }
+    });
+};
 
-refreshGoodsBrand()
+refreshGoodsBrand();
 
 // 标签组列表复选框
-const labelOptions = reactive([])
+const labelOptions = reactive([]);
 
 // 跳转到商品标签，添加标签
 const toGoodsLabelEvent = () => {
-  const url = router.resolve({
-    path: '/shop/goods/label',
-  })
-  window.open(url.href)
-}
+    const url = router.resolve({
+        path: "/shop/goods/label",
+    });
+    window.open(url.href);
+};
 
 // 商品标签
 const refreshGoodsLabel = (bool = false) => {
-  getLabelList({}).then((res) => {
-    const data = res.data
-    if (data) {
-      labelOptions.splice(0, labelOptions.length, ...data)
-      if (bool) {
-        ElMessage({
-          message: t('refreshSuccess'),
-          type: 'success',
-        })
-      }
-    }
-  })
-}
+    getLabelList({}).then((res) => {
+        const data = res.data;
+        if (data) {
+        labelOptions.splice(0, labelOptions.length, ...data);
+        if (bool) {
+            ElMessage({
+            message: t("refreshSuccess"),
+            type: "success",
+            });
+        }
+        }
+    });
+};
 
-refreshGoodsLabel()
+refreshGoodsLabel();
 
 //选择商品
 const goodsSelect = (value: any) => {
-  let arr = []
-  for (let key in value) {
-    let goods_sku: any = value[key]
-    let sku: any = {
-      goods_id: goods_sku.goods_id,
-      price: goods_sku.goodsSku.price,
-      goods_type_name: goods_sku.goods_type_name,
-      goods_image: goods_sku.goods_cover,
-      goods_name: goods_sku.goods_name,
-    }
+    let arr = [];
+    for (let key in value) {
+        let goods_sku: any = value[key];
+        let sku: any = {
+            goods_id: goods_sku.goods_id,
+            price: goods_sku.goodsSku.price,
+            goods_type_name: goods_sku.goods_type_name,
+            goods_image: goods_sku.goods_cover,
+            goods_name: goods_sku.goods_name,
+        };
     if (goods_json.value.length) {
-      goods_json.value.forEach((el: any) => {
-        if (el.goods_id == sku.goods_id) {
-          sku = Object.assign(sku, el)
-        }
-      })
+        goods_json.value.forEach((el: any) => {
+            if (el.goods_id == sku.goods_id) {
+                sku = Object.assign(sku, el)
+            }
+        })
+    }
+        arr.push(deepClone(sku))
     }
-    arr.push(deepClone(sku))
-  }
-  goods_json.value = arr
-}
+    goods_json.value = arr;
+};
 
 // 删除商品
 const deleteGoodsEvent = (row: any, index: any) => {
-  goods_json.value.splice(index, 1)
-  formData.goods_ids.splice(formData.goods_ids.indexOf(row.goods_id), 1)
-}
+    goods_json.value.splice(index, 1);
+    formData.goods_ids.splice(formData.goods_ids.indexOf(row.goods_id), 1);
+};
 
-const preventDuplication = ref(false)
+const preventDuplication = ref(false);
 const save = async () => {
-  // 触发表单校验
-  if (preventDuplication.value) return
-
-  await formRef.value?.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      formData.goods_json = goods_json.value.map((item: any) => {
-        return {
-          goods_id: item.goods_id, // 保留 goods_id
-          sort: item.sort, // 保留 sort 排序号
-        }
-      })
-
-      const goodsCategory: any = []
-      formData.category_ids.forEach((item: any) => {
+    // 触发表单校验
+    if (preventDuplication.value) return;
+
+    await formRef.value?.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+        formData.goods_json = goods_json.value.map((item: any) => {
+            return {
+            goods_id: item.goods_id,  // 保留 goods_id
+            sort: item.sort,          // 保留 sort 排序号
+            };
+        });
+
+        const goodsCategory:any = []
+        formData.category_ids.forEach((item: any) => {
         if (Array.isArray(item) && item.length === 2) {
-          goodsCategory.push(item[1])
-        } else if (Array.isArray(item) && item.length === 1) {
-          goodsCategory.push(item[0])
+            goodsCategory.push(item[1]);
+        } else if(Array.isArray(item) && item.length === 1) {
+            goodsCategory.push(item[0]);
+        }else{
+            goodsCategory.push(item);
+        }
+    });
+        formData.category_ids = goodsCategory
+        if (rank_id) {
+            formData.id = rank_id; // 将 rank_id 拼接到 dataToSubmit 中
+            editGoodRank(formData).then((res) => {
+                loading.value = false
+                preventDuplication.value = false;
+                if (res.data) {
+                    router.push("/shop/marketing/goods_rank/list");
+                }
+            }).catch(() => {
+                loading.value = false;
+                preventDuplication.value = false;
+            });
         } else {
-          goodsCategory.push(item)
+            addGoodRank(formData).then((res) => {
+                loading.value = false
+                preventDuplication.value = false;
+                if (res.data) {
+                    router.push("/shop/marketing/goods_rank/list");
+                }
+            }).catch(() => {
+                loading.value = false;
+                preventDuplication.value = false;
+            });
         }
-      })
-      formData.category_ids = goodsCategory
-      if (rank_id) {
-        formData.id = rank_id // 将 rank_id 拼接到 dataToSubmit 中
-        editGoodRank(formData)
-          .then((res) => {
-            loading.value = false
-            preventDuplication.value = false
-            if (res.data) {
-              router.push('/shop/marketing/goods_rank/list')
-            }
-          })
-          .catch(() => {
-            loading.value = false
-            preventDuplication.value = false
-          })
-      } else {
-        addGoodRank(formData)
-          .then((res) => {
-            loading.value = false
-            preventDuplication.value = false
-            if (res.data) {
-              router.push('/shop/marketing/goods_rank/list')
-            }
-          })
-          .catch(() => {
-            loading.value = false
-            preventDuplication.value = false
-          })
-      }
-    } else {
-      preventDuplication.value = false
-    }
-  })
-}
+        } else {
+        preventDuplication.value = false;
+        }
+    });
+};
 
 const back = () => {
   router.push('/shop/marketing/goods_rank/list')
-}
+};
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
diff --git a/admin/src/addon/shop/views/marketing/goods_rank/list.vue b/admin/src/addon/shop/views/marketing/goods_rank/list.vue
index 60cda735..e684c93a 100644
--- a/admin/src/addon/shop/views/marketing/goods_rank/list.vue
+++ b/admin/src/addon/shop/views/marketing/goods_rank/list.vue
@@ -1,196 +1,94 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-        <el-button type="primary" @click="handleChange">{{
-          t('addRanking')
-        }}</el-button>
-      </div>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+                <el-button type="primary" @click="handleChange">{{ t("addRanking") }}</el-button>
+            </div>
 
-      <!-- 搜索 -->
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="tableData.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('rankName')" prop="rankName">
-            <el-input
-              v-model.trim="tableData.searchParam.name"
-              :placeholder="t('rankNamePlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="loadRankList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
+            <!-- 搜索 -->
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="tableData.searchParam" ref="searchFormRef">
+                <el-form-item :label="t('rankName')" prop="rankName">
+                    <el-input v-model.trim="tableData.searchParam.name" :placeholder="t('rankNamePlaceholder')" />
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="loadRankList()">{{ t("search") }}</el-button>
+                    <el-button @click="resetForm(searchFormRef)">{{ t("reset") }}</el-button>
+                </el-form-item>
+                </el-form>
+            </el-card>
 
-      <!-- 列表 -->
-      <div>
-        <div class="mb-[10px] flex items-center">
-          <el-checkbox
-            v-model="toggleCheckbox"
-            size="large"
-            class="px-[14px]"
-            @change="toggleChange"
-            :indeterminate="isIndeterminate"
-          />
-          <el-button @click="batchDeleteGoods" size="small">{{
-            t('batchDeletion')
-          }}</el-button>
-        </div>
-        <el-table
-          :data="tableData.data"
-          size="large"
-          v-loading="tableData.loading"
-          ref="goodBankListTableRef"
-          @sort-change="sortChange"
-          @selection-change="handleSelectionChange"
-        >
-          <template #empty>
-            <span>{{ !tableData.loading ? t('emptyData') : '' }}</span>
-          </template>
-          <el-table-column type="selection" width="55" />
-          <el-table-column prop="name" :label="t('rankName')" min-width="130" />
-          <el-table-column
-            prop="show_goods_num"
-            :label="t('showGoodsNum')"
-            min-width="130"
-          />
-          <el-table-column
-            prop="goods_source_name"
-            :label="t('goodsSource')"
-            min-width="130"
-          />
-          <el-table-column
-            prop="rule_type_name"
-            :label="t('ruleType')"
-            min-width="130"
-          />
-          <el-table-column
-            prop="rank_type_name"
-            :label="t('rankType')"
-            min-width="130"
-          />
-          <el-table-column prop="status" :label="t('isShow')" width="130">
-            <template #default="{ row }">
-              <el-tag
-                class="cursor-pointer"
-                :type="row.status != 0 ? 'success' : 'danger'"
-                @click="showClick(row)"
-                >{{ row.status != 0 ? '开启' : '关闭' }}</el-tag
-              >
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="sort"
-            min-width="120"
-            :show-overflow-tooltip="true"
-            sortable="custom"
-          >
-            <template #header>
-              <div style="display: inline-flex; align-items: center">
-                <span class="mr-[5px]">{{ t('sort') }}</span>
-                <el-tooltip
-                  class="box-item"
-                  effect="light"
-                  :content="t('sortRules')"
-                  placement="top"
-                >
-                  <el-icon color="#666">
-                    <QuestionFilled />
-                  </el-icon>
-                </el-tooltip>
-              </div>
-            </template>
-            <template #default="{ row }">
-              <el-input
-                v-model.number="row.sort"
-                class="w-[70px]"
-                maxlength="8"
-                @blur="sortInputListener(row.sort, row)"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="create_time"
-            :label="t('createTime')"
-            min-width="150"
-            sortable="custom"
-          >
-            <template #default="{ row }">
-              <div>{{ row.create_time }}</div>
-            </template>
-          </el-table-column>
+            <!-- 列表 -->
+            <div>
+                <div class="mb-[10px] flex items-center">
+                    <el-checkbox v-model="toggleCheckbox" size="large" class="px-[14px]" @change="toggleChange" :indeterminate="isIndeterminate" />
+                    <el-button @click="batchDeleteGoods" size="small">{{t("batchDeletion")}}</el-button>
+                </div>
+                <el-table :data="tableData.data" size="large" v-loading="tableData.loading" ref="goodBankListTableRef" @sort-change="sortChange" @selection-change="handleSelectionChange">
+                    <template #empty>
+                        <span>{{ !tableData.loading ? t("emptyData") : "" }}</span>
+                    </template>
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column prop="name" :label="t('rankName')" min-width="130" />
+                    <el-table-column prop="show_goods_num" :label="t('showGoodsNum')" min-width="130" />
+                    <el-table-column prop="goods_source_name" :label="t('goodsSource')" min-width="130" />
+                    <el-table-column prop="rule_type_name" :label="t('ruleType')" min-width="130" />
+                    <el-table-column prop="rank_type_name" :label="t('rankType')" min-width="130" />
+                    <el-table-column prop="status" :label="t('isShow')" width="130">
+                        <template #default="{ row }">
+                            <el-tag class="cursor-pointer" :type="row.status != 0 ? 'success' : 'danger'" @click="showClick(row)">{{ row.status != 0 ? '开启' : '关闭' }}</el-tag>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="sort" min-width="120" :show-overflow-tooltip="true" sortable="custom">
+                        <template #header>
+                        <div style="display: inline-flex; align-items: center">
+                            <span class="mr-[5px]">{{ t('sort') }}</span>
+                            <el-tooltip class="box-item" effect="light" :content="t('sortRules')" placement="top">
+                            <el-icon color="#666">
+                                <QuestionFilled />
+                            </el-icon>
+                            </el-tooltip>
+                        </div>
+                        </template>
+                        <template #default="{ row }">
+                        <el-input v-model.number="row.sort" class="w-[70px]" maxlength="8" @blur="sortInputListener(row.sort, row)" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="create_time" :label="t('createTime')" min-width="150" sortable="custom">
+                        <template #default="{ row }">
+                        <div>{{ row.create_time }}</div>
+                        </template>
+                    </el-table-column>
 
-          <el-table-column
-            :label="t('operation')"
-            fixed="right"
-            align="right"
-            min-width="120"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="editEvent(row)">{{
-                t('edit')
-              }}</el-button>
-              <el-button
-                type="primary"
-                link
-                @click="deleteEvent(row.rank_id)"
-                >{{ t('delete') }}</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="tableData.page"
-            v-model:page-size="tableData.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="tableData.total"
-            @size-change="loadRankList()"
-            @current-change="loadRankList"
-          />
-        </div>
-      </div>
-    </el-card>
-  </div>
+                    <el-table-column :label="t('operation')" fixed="right" align="right" min-width="120">
+                        <template #default="{ row }">
+                        <el-button type="primary" link @click="editEvent(row)">{{t("edit")}}</el-button>
+                        <el-button type="primary" link @click="deleteEvent(row.rank_id)">{{ t("delete") }}</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="tableData.page" v-model:page-size="tableData.limit" layout="total, sizes, prev, pager, next, jumper" :total="tableData.total" @size-change="loadRankList()" @current-change="loadRankList" />
+                </div>
+            </div>
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
-import { ref, reactive } from 'vue'
-import { t } from '@/lang'
-import { useRoute, useRouter } from 'vue-router'
-import {
-  getRankPageList,
-  deleteGoodRank,
-  batchDelete,
-  modifyGoodsRankSort,
-  editRankStatus,
-} from '@/addon/shop/api/marketing'
-import { FormInstance, ElMessage, ElMessageBox } from 'element-plus'
-import {
-  img,
-  debounce,
-  setTablePageStorage,
-  getTablePageStorage,
-} from '@/utils/common'
+import { ref, reactive } from "vue";
+import { t } from "@/lang";
+import { useRoute, useRouter } from "vue-router";
+import {getRankPageList,deleteGoodRank,batchDelete,modifyGoodsRankSort,editRankStatus} from "@/addon/shop/api/marketing";
+import { FormInstance, ElMessage, ElMessageBox } from "element-plus";
+import { img, debounce,setTablePageStorage,getTablePageStorage } from "@/utils/common";
 
-const router = useRouter()
-const route = useRoute()
-const pageName = route.meta.title
-const repeat = ref(false)
-const searchFormRef = ref<FormInstance>()
+const router = useRouter();
+const route = useRoute();
+const pageName = route.meta.title;
+const repeat = ref(false);
+const searchFormRef = ref<FormInstance>();
 
 // 表单内容
 const tableData = reactive({
@@ -200,189 +98,182 @@ const tableData = reactive({
   loading: false,
   data: [],
   searchParam: {
-    name: '',
+    name: "",
     order: '',
-    sort: '',
+    sort: ''
   },
-})
+});
 
 // 获取列表
 const loadRankList = (page: number = 1) => {
-  tableData.loading = true
-  tableData.page = page
+    tableData.loading = true;
+    tableData.page = page;
 
-  getRankPageList({
-    page: tableData.page,
-    limit: tableData.limit,
-    ...tableData.searchParam,
-  })
-    .then((res) => {
-      tableData.loading = false
-      tableData.data = res.data.data
-      tableData.total = res.data.total
-      setTablePageStorage(
-        tableData.page,
-        tableData.limit,
-        tableData.searchParam
-      )
-    })
-    .catch(() => {
-      tableData.loading = false
-    })
-}
+    getRankPageList({
+        page: tableData.page,
+        limit: tableData.limit,
+        ...tableData.searchParam,
+    }).then((res) => {
+        tableData.loading = false;
+        tableData.data = res.data.data;
+        tableData.total = res.data.total;
+        setTablePageStorage(tableData.page, tableData.limit, tableData.searchParam);
+    }).catch(() => {
+        tableData.loading = false;
+    });
+};
 
-loadRankList(getTablePageStorage(tableData.searchParam).page)
+loadRankList(getTablePageStorage(tableData.searchParam).page);
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  tableData.searchParam.name = ''
-  loadRankList()
-}
+  if (!formEl) return;
+  formEl.resetFields();
+  tableData.searchParam.name = "";
+  loadRankList();
+};
 
 // 添加榜单
 const handleChange = () => {
-  router.push('/shop/marketing/goods_rank/edit')
-}
+  router.push("/shop/marketing/goods_rank/edit");
+};
 
 const editEvent = (data: any) => {
-  router.push('/shop/marketing/goods_rank/edit?rank_id=' + data.rank_id)
-}
+  router.push("/shop/marketing/goods_rank/edit?rank_id=" + data.rank_id);
+};
 
 const showClick = (row: any) => {
-  row.status = row.status === 1 ? 0 : 1
-  const obj = {
-    rank_id: row.rank_id,
-    status: row.status,
-  }
-  editRankStatus(obj)
+    row.status = row.status === 1 ? 0 : 1
+    const obj = {
+        rank_id: row.rank_id,
+        status: row.status,
+    }
+    editRankStatus(obj)
 }
 
 // 删除
 const deleteEvent = (id: number) => {
-  ElMessageBox.confirm(t('deleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
+  ElMessageBox.confirm(t("deleteTips"), t("warning"), {
+    confirmButtonText: t("confirm"),
+    cancelButtonText: t("cancel"),
+    type: "warning",
   }).then(() => {
     deleteGoodRank(id).then(() => {
-      loadRankList()
-    })
-  })
-}
+        loadRankList();
+      })
+  });
+};
 
 // 监听排序
 const sortChange = (event: any) => {
-  let sort = ''
-  if (event.order == 'ascending') {
-    sort = 'asc'
-  } else if (event.order == 'descending') {
-    sort = 'desc'
-  }
-  if (sort) {
-    tableData.searchParam.order = event.prop
-    tableData.searchParam.sort = sort
-  }
-  loadRankList()
+    let sort = ''
+    if (event.order == 'ascending') {
+        sort = 'asc'
+    } else if (event.order == 'descending') {
+        sort = 'desc'
+    }
+    if (sort) {
+      tableData.searchParam.order = event.prop
+      tableData.searchParam.sort = sort
+    }
+    loadRankList()
 }
 
 // 批量复选框
-const toggleCheckbox = ref()
+const toggleCheckbox = ref();
 
 // 复选框中间状态
-const isIndeterminate = ref(false)
+const isIndeterminate = ref(false);
 
 // 监听批量复选框事件
 const toggleChange = (value: any) => {
-  isIndeterminate.value = false
-  goodBankListTableRef.value.toggleAllSelection()
-}
+  isIndeterminate.value = false;
+  goodBankListTableRef.value.toggleAllSelection();
+};
 
-const goodBankListTableRef = ref()
+const goodBankListTableRef = ref();
 
 // 选中数据
-const multipleSelection: any = ref([])
+const multipleSelection: any = ref([]);
 
 // 监听表格单行选中
 const handleSelectionChange = (val: []) => {
-  multipleSelection.value = val
+  multipleSelection.value = val;
 
-  toggleCheckbox.value = false
+  toggleCheckbox.value = false;
   if (
     multipleSelection.value.length > 0 &&
     multipleSelection.value.length < tableData.data.length
   ) {
-    isIndeterminate.value = true
+    isIndeterminate.value = true;
   } else {
-    isIndeterminate.value = false
+    isIndeterminate.value = false;
   }
 
   if (multipleSelection.value.length == tableData.data.length) {
-    toggleCheckbox.value = true
+    toggleCheckbox.value = true;
   }
-}
+};
 
 // 批量删除
 const batchDeleteGoods = () => {
   if (multipleSelection.value.length == 0) {
     ElMessage({
-      type: 'warning',
-      message: `${t('batchEmptySelectedGoodsTips')}`,
-    })
-    return
+      type: "warning",
+      message: `${t("batchEmptySelectedGoodsTips")}`,
+    });
+    return;
   }
 
-  ElMessageBox.confirm(t('batchGoodsDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
+  ElMessageBox.confirm(t("batchGoodsDeleteTips"), t("warning"), {
+    confirmButtonText: t("confirm"),
+    cancelButtonText: t("cancel"),
+    type: "warning",
   }).then(() => {
-    if (repeat.value) return
-    repeat.value = true
+    if (repeat.value) return;
+    repeat.value = true;
 
-    const rankIds: any = []
+    const rankIds: any = [];
     multipleSelection.value.forEach((item: any) => {
-      rankIds.push(item.rank_id)
-    })
+      rankIds.push(item.rank_id);
+    });
 
     batchDelete({
       rank_id: rankIds,
-    })
-      .then(() => {
-        loadRankList()
-        repeat.value = false
-      })
-      .catch(() => {
-        repeat.value = false
-      })
-  })
-}
+    }).then(() => {
+      loadRankList();
+      repeat.value = false;
+    }).catch(() => {
+      repeat.value = false;
+    });
+  });
+};
 
 // 正则表达式
 const regExp = {
   number: /^\d{0,10}$/,
   digit: /^\d{0,10}(.?\d{0,2})$/,
-}
+};
 
 // 修改排序号
 const sortInputListener = debounce((sort, row) => {
   if (isNaN(sort) || !regExp.number.test(sort)) {
     ElMessage({
-      type: 'warning',
-      message: `${t('sortTips')}`,
-    })
-    return
+      type: "warning",
+      message: `${t("sortTips")}`,
+    });
+    return;
   }
   if (sort > 99999999) {
-    row.sort = 99999999
+    row.sort = 99999999;
   }
   modifyGoodsRankSort({
     rank_id: row.rank_id,
     sort,
   }).then((res) => {
-    loadRankList()
-  })
-})
+    loadRankList();
+  });
+});
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/addon/shop/views/marketing/index.vue b/admin/src/addon/shop/views/marketing/index.vue
index d267f79f..ebc0cdb9 100644
--- a/admin/src/addon/shop/views/marketing/index.vue
+++ b/admin/src/addon/shop/views/marketing/index.vue
@@ -1,48 +1,36 @@
 <template>
-  <div class="main-container w-full" v-loading="loading">
-    <div v-for="(item, index) in detail.appList" :key="index">
-      <el-card
-        class="box-card !border-none"
-        shadow="never"
-        v-if="item.child != ''"
-      >
-        <div class="flex justify-between items-center">
-          <span class="text-page-title">{{ item.name }}</span>
-        </div>
-        <div class="flex flex-wrap plug-list pb-10 plug-large">
-          <div v-for="(ite, index) in item.child" :key="index">
-            <div
-              class="relative app-item cursor-pointer px-4 mr-4 mt-[20px] bg-[#f7f7f7] border-[1px] hover:border-primary"
-            >
-              <div @click="toLink(ite.url)" class="flex py-5 items-center">
-                <div class="flex justify-center items-center">
-                  <el-image
-                    class="w-[40px] h-[40px]"
-                    :src="img(ite.icon)"
-                    fit="contain"
-                  >
-                    <template #error>
-                      <div class="image-slot">
-                        <img
-                          class="w-[50px] h-[50px]"
-                          src="@/app/assets/images/index/app_default.png"
-                        />
-                      </div>
-                    </template>
-                  </el-image>
+    <div class="main-container w-full " v-loading="loading">
+
+        <div v-for="(item, index) in detail.appList" :key="index">
+
+            <el-card class="box-card !border-none" shadow="never" v-if="item.child != ''">
+                <div class="flex justify-between items-center">
+                    <span class="text-page-title">{{item.name}}</span>
                 </div>
-                <div class="flex flex-col justify-between text-left w-[190px]">
-                  <p class="app-text w-[190px] text-[17px] text-[#222] pl-3">
-                    {{ ite.title }}
-                  </p>
+                <div class="flex flex-wrap plug-list pb-10 plug-large">
+                    <div v-for="(ite, index) in item.child" :key="index">
+                        <div class="relative app-item cursor-pointer px-4 mr-4 mt-[20px] bg-[#f7f7f7] border-[1px] hover:border-primary">
+                            <div @click="toLink(ite.url)"  class="flex py-5 items-center">
+                                <div class="flex justify-center items-center">
+                                    <el-image class="w-[40px] h-[40px]" :src="img(ite.icon)" fit="contain">
+                                        <template #error>
+                                            <div class="image-slot">
+                                                <img class="w-[50px] h-[50px]" src="@/app/assets/images/index/app_default.png" />
+                                            </div>
+                                        </template>
+                                    </el-image>
+                                </div>
+                                <div class="flex flex-col justify-between text-left w-[190px]">
+                                    <p class="app-text w-[190px] text-[17px] text-[#222] pl-3">{{ ite.title }}</p>
+                                </div>
+                            </div>
+
+                        </div>
+                    </div>
                 </div>
-              </div>
-            </div>
-          </div>
+            </el-card>
         </div>
-      </el-card>
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
@@ -54,50 +42,50 @@ import storage from '@/utils/storage'
 
 const router = useRouter()
 const loading = ref(true)
-interface appListType {
-  name: string
-  child: {
-    title: string
-    icon: string
-    url: string
-  }[]
+interface appListType{
+    name: string
+    child: {
+        title: string
+        icon: string
+        url: string
+    }[]
 }
-interface detailType {
-  appList: appListType[]
+interface detailType{
+    appList: appListType[]
 }
 const detail = reactive<detailType>({
-  appList: [],
+    appList: []
 })
 
 const getAppList = async () => {
-  const addon = storage.get('menuAppStorage')
-  const res = await getMarketingIndex({ addon })
+    const addon = storage.get('menuAppStorage')
+    const res = await getMarketingIndex({ addon })
 
-  detail.appList = res.data
-  loading.value = false
+    detail.appList = res.data
+    loading.value = false
 }
 
 getAppList()
 
 const toLink = (link: RouteLocationRaw) => {
-  router.push(link)
+    router.push(link)
 }
+
 </script>
 
 <style lang="scss" scoped>
-.main-container,
-.empty {
-  min-height: calc(100vh - 84px);
+.main-container,.empty{
+    min-height: calc(100vh - 84px);
 }
 .app-text {
-  overflow: hidden; /* 超出部分隐藏 */
-  white-space: nowrap; /* 禁止文本换行 */
-  text-overflow: ellipsis; /* 显示省略号 */
-}
-.app-item:hover .with-ite {
-  display: block;
-}
-.el-form-item {
-  margin-bottom: 0px !important;
+	overflow: hidden; /* 超出部分隐藏 */
+	white-space: nowrap; /* 禁止文本换行 */
+	text-overflow: ellipsis; /* 显示省略号 */
 }
+    .app-item:hover .with-ite {
+		display: block;
+	}
+	.el-form-item {
+		margin-bottom: 0px !important;
+	}
 </style>
diff --git a/admin/src/addon/shop/views/marketing/manjian/detail.vue b/admin/src/addon/shop/views/marketing/manjian/detail.vue
index e36dfeeb..3f8e4e57 100644
--- a/admin/src/addon/shop/views/marketing/manjian/detail.vue
+++ b/admin/src/addon/shop/views/marketing/manjian/detail.vue
@@ -1,297 +1,207 @@
 <template>
-  <el-drawer
-    v-model="showDialog"
-    :title="t('detailTitle')"
-    direction="rtl"
-    :before-close="handleClose"
-    class="member-detail-drawer"
-  >
-    <div class="main-container" v-loading="loading">
-      <el-tabs v-model="activeName" class="pb-[10px]" @tab-change="handleClick">
-        <el-tab-pane :label="t('basicInfo')" name="basicInfo" />
-        <el-tab-pane :label="t('activeMember')" name="memberList" />
-      </el-tabs>
-      <div v-if="activeName == 'basicInfo'">
-        <el-card class="mb-[15px]">
-          <h3 class="panel-title">{{ t('basicInfo') }}</h3>
-          <el-form
-            class="mt-[15px]"
-            :model="formData"
-            label-width="120px"
-            ref="formRef"
-            label-position="left"
-            v-if="Object.keys(formData).length"
-          >
-            <div class="relative" shadow="never" v-if="formData">
-              <el-row>
-                <el-col :span="8">
-                  <el-form-item :label="t('name')">
-                    <div class="input-width">
-                      <span>{{ formData.manjian_name }}</span>
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item :label="t('status')">
-                    <div class="input-width">
-                      <span>{{ formData.status_name }}</span>
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item :label="t('totalGoodsNum')">
-                    <div class="input-width">
-                      <span>{{ formData.total_goods_num }}</span>
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item :label="t('totalCouponNum')">
-                    <div class="input-width">
-                      <span>{{ formData.total_coupon_num }}</span>
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item :label="t('totalBalance')">
-                    <div class="input-width">
-                      <span>{{ formData.total_balance }}</span>
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item :label="t('totalPoint')">
-                    <div class="input-width">
-                      <span>{{ formData.total_point }}</span>
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item :label="t('activeOrderMoney')">
-                    <div class="input-width">
-                      <span>{{ formData.total_order_money }}</span>
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item :label="t('activeMemberNum')">
-                    <div class="input-width">
-                      <span>{{ formData.total_member_num }}</span>
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item :label="t('activeOrderNum')">
-                    <div class="input-width">
-                      <span>{{ formData.total_order_num }}</span>
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item :label="t('startTime')">
-                    <div class="input-width">
-                      <span>{{ formData.start_time }}</span>
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item :label="t('endTime')">
-                    <div class="input-width">
-                      <span>{{ formData.end_time }}</span>
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item :label="t('createTime')">
-                    <div class="input-width">
-                      <span>{{ formData.create_time }}</span>
+    <el-drawer v-model="showDialog" :title="t('detailTitle')" direction="rtl" :before-close="handleClose" class="member-detail-drawer">
+        <div class="main-container" v-loading="loading">
+            <el-tabs v-model="activeName" class="pb-[10px]" @tab-change="handleClick">
+                <el-tab-pane :label="t('basicInfo')" name="basicInfo" />
+                <el-tab-pane :label="t('activeMember')" name="memberList" />
+            </el-tabs>
+            <div v-if="activeName == 'basicInfo'">
+                <el-card class="mb-[15px]" >
+                    <h3 class="panel-title">{{ t('basicInfo') }}</h3>
+                    <el-form class="mt-[15px]" :model="formData" label-width="120px" ref="formRef" label-position="left" v-if="Object.keys(formData).length">
+                    <div class="relative" shadow="never" v-if="formData">
+                        <el-row>
+                            <el-col :span="8">
+                                <el-form-item :label="t('name')">
+                                    <div class="input-width">
+                                        <span>{{formData.manjian_name}}</span>
+                                    </div>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item :label="t('status')">
+                                    <div class="input-width">
+                                        <span>{{formData.status_name}}</span>
+                                    </div>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item :label="t('totalGoodsNum')">
+                                    <div class="input-width">
+                                        <span>{{formData.total_goods_num}}</span>
+                                    </div>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item :label="t('totalCouponNum')">
+                                    <div class="input-width">
+                                        <span>{{formData.total_coupon_num}}</span>
+                                    </div>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item :label="t('totalBalance')">
+                                    <div class="input-width">
+                                        <span>{{formData.total_balance}}</span>
+                                    </div>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item :label="t('totalPoint')">
+                                    <div class="input-width">
+                                        <span>{{formData.total_point}}</span>
+                                    </div>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item :label="t('activeOrderMoney')">
+                                    <div class="input-width">
+                                        <span>{{formData.total_order_money}}</span>
+                                    </div>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item :label="t('activeMemberNum')">
+                                    <div class="input-width">
+                                        <span>{{formData.total_member_num}}</span>
+                                    </div>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item :label="t('activeOrderNum')">
+                                    <div class="input-width">
+                                        <span>{{formData.total_order_num}}</span>
+                                    </div>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item :label="t('startTime')">
+                                    <div class="input-width">
+                                        <span>{{formData.start_time}}</span>
+                                    </div>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item :label="t('endTime')">
+                                    <div class="input-width">
+                                        <span>{{formData.end_time}}</span>
+                                    </div>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item :label="t('createTime')">
+                                    <div class="input-width">
+                                        <span>{{formData.create_time}}</span>
+                                    </div>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+
                     </div>
-                  </el-form-item>
-                </el-col>
-              </el-row>
+                </el-form>
+                </el-card>
+                <el-card class="mt-4">
+                    <h3 class="panel-title">{{ t('activeDetail') }}</h3>
+                    <el-table :data="formData.rule_json" size="large">
+                        <el-table-column :label="t('discountThreshold')" prop="limit">
+                            <template #default="{ row }">
+                                <span v-if="row.limit">满{{ row.limit }}{{ formData.condition_type == 'over_n_yuan' ? '元' : '件' }}</span>
+                                <span v-else>-</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column :label="t('discountMoney')" prop="discount_money">
+                            <template #default="{ row }">
+                                <span v-if="row.discount_money">{{ row.discount_money }}{{row.discount_type==1 ? '元' : '折'}}</span>
+                                <span v-else>-</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column :label="t('givePoint')" prop="point">
+                            <template #default="{ row }">
+                                <span v-if="row.is_give_point">{{ row.point }}</span>
+                                <span v-else>-</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column :label="t('giveBalance')" prop="balance">
+                            <template #default="{ row }">
+                                <span v-if="row.is_give_balance">{{ row.balance }}</span>
+                                <span v-else>-</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column :label="t('freeShipping')" prop="is_free_shipping">
+                            <template #default="{row}">
+                                <span v-if="row.is_free_shipping">{{ t('freeShipping')}}</span>
+                                <span v-else>-</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column :label="t('giveCoupon')" prop="coupon" min-width="150">
+                            <template #default="{ row }">
+                                <div v-if="row.coupon && row.coupon.length && row.is_give_coupon">
+                                    <div v-for="(coupon, index) in row.coupon" :key="index" class="flex items-center">
+                                        <div class="goods-name">{{ coupon.title }} </div>
+                                        <div>* {{ coupon.num }}</div>
+                                    </div>
+                                </div>
+                                <div v-else>-</div>
+                            </template>
+                        </el-table-column>
+                        <el-table-column :label="t('giveGoods')" prop="goods" min-width="200">
+                            <template #default="{ row }">
+                                <div v-if="row.goods && row.goods.length &&row.is_give_goods">
+                                    <div v-for="(goods, index) in row.goods" :key="index" class="flex items-center">
+                                        <div class="goods-name">{{ goods.goods_name }} </div>
+                                        <div>* {{ goods.num }}</div>
+                                    </div>
+                                </div>
+                                <div v-else>-</div>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </el-card>
+
             </div>
-          </el-form>
-        </el-card>
-        <el-card class="mt-4">
-          <h3 class="panel-title">{{ t('activeDetail') }}</h3>
-          <el-table :data="formData.rule_json" size="large">
-            <el-table-column :label="t('discountThreshold')" prop="limit">
-              <template #default="{ row }">
-                <span v-if="row.limit"
-                  >满{{ row.limit
-                  }}{{
-                    formData.condition_type == 'over_n_yuan' ? '元' : '件'
-                  }}</span
-                >
-                <span v-else>-</span>
-              </template>
-            </el-table-column>
-            <el-table-column :label="t('discountMoney')" prop="discount_money">
-              <template #default="{ row }">
-                <span v-if="row.discount_money"
-                  >{{ row.discount_money
-                  }}{{ row.discount_type == 1 ? '元' : '折' }}</span
-                >
-                <span v-else>-</span>
-              </template>
-            </el-table-column>
-            <el-table-column :label="t('givePoint')" prop="point">
-              <template #default="{ row }">
-                <span v-if="row.is_give_point">{{ row.point }}</span>
-                <span v-else>-</span>
-              </template>
-            </el-table-column>
-            <el-table-column :label="t('giveBalance')" prop="balance">
-              <template #default="{ row }">
-                <span v-if="row.is_give_balance">{{ row.balance }}</span>
-                <span v-else>-</span>
-              </template>
-            </el-table-column>
-            <el-table-column :label="t('freeShipping')" prop="is_free_shipping">
-              <template #default="{ row }">
-                <span v-if="row.is_free_shipping">{{ t('freeShipping') }}</span>
-                <span v-else>-</span>
-              </template>
-            </el-table-column>
-            <el-table-column
-              :label="t('giveCoupon')"
-              prop="coupon"
-              min-width="150"
-            >
-              <template #default="{ row }">
-                <div
-                  v-if="row.coupon && row.coupon.length && row.is_give_coupon"
-                >
-                  <div
-                    v-for="(coupon, index) in row.coupon"
-                    :key="index"
-                    class="flex items-center"
-                  >
-                    <div class="goods-name">{{ coupon.title }}</div>
-                    <div>* {{ coupon.num }}</div>
-                  </div>
-                </div>
-                <div v-else>-</div>
-              </template>
-            </el-table-column>
-            <el-table-column
-              :label="t('giveGoods')"
-              prop="goods"
-              min-width="200"
-            >
-              <template #default="{ row }">
-                <div v-if="row.goods && row.goods.length && row.is_give_goods">
-                  <div
-                    v-for="(goods, index) in row.goods"
-                    :key="index"
-                    class="flex items-center"
-                  >
-                    <div class="goods-name">{{ goods.goods_name }}</div>
-                    <div>* {{ goods.num }}</div>
-                  </div>
-                </div>
-                <div v-else>-</div>
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-card>
-      </div>
-      <div v-if="activeName == 'memberList'">
-        <el-table
-          :data="memberParams.data"
-          size="large"
-          v-loading="memberParams.loading"
-        >
-          <template #empty>
-            <span>{{ !memberParams.loading ? t('emptyData') : '' }}</span>
-          </template>
-          <el-table-column
-            prop="goods_id"
-            :label="t('memberInfo')"
-            min-width="200"
-          >
-            <template #default="{ row }">
-              <div
-                class="flex items-center cursor-pointer"
-                @click="detailEvent(row.member_id)"
-              >
-                <div
-                  class="min-w-[50px] h-[50px] flex items-center justify-center"
-                >
-                  <el-image
-                    v-if="row.headimg"
-                    class="w-[50px] h-[50px]"
-                    :src="img(row.headimg)"
-                    fit="contain"
-                  >
-                    <template #error>
-                      <div class="image-slot">
-                        <img
-                          class="w-[50px] h-[50px] rounded-full"
-                          src="@/app/assets/images/member_head.png"
-                          alt=""
-                        />
-                      </div>
+            <div v-if="activeName == 'memberList'">
+                <el-table :data="memberParams.data" size="large" v-loading="memberParams.loading">
+                    <template #empty>
+                        <span>{{ !memberParams.loading ? t('emptyData') : '' }}</span>
                     </template>
-                  </el-image>
-                  <img
-                    class="w-[50px] h-[50px] rounded-full"
-                    v-else
-                    src="@/app/assets/images/member_head.png"
-                    alt=""
-                  />
+                    <el-table-column prop="goods_id" :label="t('memberInfo')" min-width="200">
+                        <template #default="{ row }">
+                            <div class="flex items-center cursor-pointer" @click="detailEvent(row.member_id)">
+                                <div class="min-w-[50px] h-[50px] flex items-center justify-center">
+                                    <el-image v-if="row.headimg" class="w-[50px] h-[50px]" :src="img(row.headimg)" fit="contain">
+                                        <template #error>
+                                            <div class="image-slot">
+                                                <img class="w-[50px] h-[50px] rounded-full" src="@/app/assets/images/member_head.png" alt="">
+                                            </div>
+                                        </template>
+                                    </el-image>
+                                    <img class="w-[50px] h-[50px] rounded-full" v-else src="@/app/assets/images/member_head.png" alt="">
+                                </div>
+                                <div class="ml-2">
+                                    <span :title="(row.nickname || row.username)" class="multi-hidden">{{row.nickname || row.username}}</span>
+                                    <span class="text-primary text-[12px]">{{row.mobile || ''}}</span>
+                                </div>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="total_order_money" :label="t('consumptionMoney')" min-width="100" />
+                    <el-table-column prop="total_num" :label="t('participationNum')" min-width="100" />
+                    <el-table-column prop="finally_order_time" :label="t('orderTime')" min-width="100" />
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="memberParams.page" v-model:page-size="memberParams.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="memberParams.total"
+                        @size-change="getManjianMemberPageListFn()" @current-change="getManjianMemberPageListFn" />
                 </div>
-                <div class="ml-2">
-                  <span
-                    :title="row.nickname || row.username"
-                    class="multi-hidden"
-                    >{{ row.nickname || row.username }}</span
-                  >
-                  <span class="text-primary text-[12px]">{{
-                    row.mobile || ''
-                  }}</span>
-                </div>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="total_order_money"
-            :label="t('consumptionMoney')"
-            min-width="100"
-          />
-          <el-table-column
-            prop="total_num"
-            :label="t('participationNum')"
-            min-width="100"
-          />
-          <el-table-column
-            prop="finally_order_time"
-            :label="t('orderTime')"
-            min-width="100"
-          />
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="memberParams.page"
-            v-model:page-size="memberParams.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="memberParams.total"
-            @size-change="getManjianMemberPageListFn()"
-            @current-change="getManjianMemberPageListFn"
-          />
+            </div>
         </div>
-      </div>
-    </div>
-  </el-drawer>
+    </el-drawer>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
 import { t } from '@/lang'
-import {
-  getManjianInfo,
-  getManjianMemberPageList,
-} from '@/addon/shop/api/marketing'
+import {getManjianInfo, getManjianMemberPageList} from "@/addon/shop/api/marketing";
 import { useRouter, useRoute } from 'vue-router'
 import { img } from '@/utils/common'
 
@@ -301,79 +211,77 @@ const showDialog = ref(false)
 const loading = ref(false)
 let id = ''
 const activeName = ref('basicInfo')
-const formData: Record<string, any> = ref({})
+const formData:Record<string, any> = ref({})
 
-const handleClick = (data: string) => {
-  activeName.value = data
+const handleClick = (data:string) => {
+    activeName.value = data
 }
 
 const handleClose = (done: () => void) => {
-  activeName.value = 'basicInfo'
-  showDialog.value = false
+    activeName.value = 'basicInfo';
+    showDialog.value = false;
 }
 
-const getManjianInfoFn = (id: number) => {
-  loading.value = true
-  const data = {
-    manjian_id: id,
-  }
-  getManjianInfo(data).then((res: any) => {
-    formData.value = Object.assign(formData.value, res.data.manjian_info)
-    loading.value = false
-  })
+const getManjianInfoFn = (id:number)=>{
+    loading.value = true
+    const data = {
+        manjian_id: id
+    }
+    getManjianInfo(data).then((res:any)=>{
+        formData.value = Object.assign(formData.value,res.data.manjian_info)
+        loading.value = false
+    })
 }
 
 //活动会员
-const memberParams = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: false,
-  data: [],
-  searchParam: {
-    id: id,
-  },
+const memberParams =  reactive({
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: false,
+    data: [],
+    searchParam: {
+        id: id
+    }
 })
-const getManjianMemberPageListFn = (page: number = 1) => {
-  memberParams.loading = true
-  memberParams.page = page
-  getManjianMemberPageList({
-    page: memberParams.page,
-    limit: memberParams.limit,
-    ...memberParams.searchParam,
-  })
-    .then((res: any) => {
-      memberParams.loading = false
-      memberParams.data = res.data.data
-      memberParams.total = res.data.total
-    })
-    .catch(() => {
-      memberParams.loading = false
+const getManjianMemberPageListFn= (page: number = 1)=>{
+    memberParams.loading = true
+    memberParams.page = page
+    getManjianMemberPageList({
+        page: memberParams.page,
+        limit: memberParams.limit,
+        ...memberParams.searchParam
+    }).then((res:any)=>{
+        memberParams.loading = false
+        memberParams.data = res.data.data
+        memberParams.total = res.data.total
+    }).catch(() => {
+        memberParams.loading = false
     })
 }
 
 //查看会员详情
-const detailEvent = (member_id: number) => {
-  let routeData = router.resolve(`/member/detail?id=${member_id}`)
-  window.open(routeData.href, ' blank')
+const detailEvent = (member_id:number)=> {
+    let routeData = router.resolve(`/member/detail?id=${member_id}`)
+    window.open(routeData.href, ' blank');
 }
 
 const setFormData = async (row: any = null) => {
-  id = row.id
-  memberParams.searchParam.id = row.id
+    id = row.id;
+    memberParams.searchParam.id = row.id;
 
-  getManjianMemberPageListFn()
-  getManjianInfoFn(Number(id))
+    getManjianMemberPageListFn()
+    getManjianInfoFn(Number(id))
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 <style lang="scss">
-.member-detail-drawer {
-  width: 1300px !important;
+.member-detail-drawer{
+    width: 1300px !important;
 }
 
 .goods-name {
diff --git a/admin/src/addon/shop/views/marketing/manjian/edit.vue b/admin/src/addon/shop/views/marketing/manjian/edit.vue
index 11390d1e..013be969 100644
--- a/admin/src/addon/shop/views/marketing/manjian/edit.vue
+++ b/admin/src/addon/shop/views/marketing/manjian/edit.vue
@@ -1,1428 +1,867 @@
 <template>
-  <div class="main-container">
-    <el-card class="card !border-none" shadow="never">
-      <el-page-header
-        :content="id ? t('editFullDiscountBonus') : t('addFullDiscountBonus')"
-        :icon="ArrowLeft"
-        @back="back()"
-      />
-    </el-card>
-
-    <!-- 表单 -->
-    <el-card
-      class="box-card mt-[15px] !border-none"
-      shadow="never"
-      v-loading="loading"
-    >
-      <el-form
-        :model="formData"
-        label-width="120px"
-        ref="formRef"
-        :rules="formRules"
-        scroll-to-error
-        class="page-form"
-      >
-        <!-- 活动名称： -->
-        <el-form-item :label="t('activeName')" prop="manjian_name">
-          <div>
-            <el-input
-              v-model.trim="formData.manjian_name"
-              clearable
-              :placeholder="t('namePlaceholder')"
-              class="input-width"
-              :maxlength="20"
-              show-word-limit
-            />
-          </div>
-        </el-form-item>
-        <!-- 活动时间 -->
-        <el-form-item :label="t('activityTime')" prop="manjian_time">
-          <div class="w-[180px]">
-            <el-date-picker
-              v-model="formData.manjian_time"
-              type="datetimerange"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-            />
-          </div>
-        </el-form-item>
-        <!-- 条件类型 -->
-        <el-form-item
-          :label="t('conditionType')"
-          prop="condition_type"
-          required
-        >
-          <el-radio-group
-            v-model="formData.condition_type"
-            :disabled="disableSubmit"
-          >
-            <el-radio label="over_n_yuan">{{ t('overNyuan') }}</el-radio>
-            <el-radio label="over_n_piece">{{ t('overNgoods') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <!-- 优惠规格 -->
-        <el-form-item :label="t('ruleType')" prop="rule_type" required>
-          <el-radio-group
-            v-model="formData.rule_type"
-            :disabled="disableSubmit"
-          >
-            <el-radio label="ladder">{{ t('ladder') }}</el-radio>
-            <el-radio label="cycle">{{ t('cycle') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <div
-          v-if="formData.rule_type === 'ladder'"
-          class="ml-[120px] mb-[10px] mt-[-10px] text-[12px] text-[#999] leading-[20px]"
-        >
-          {{ t('ruleTypeTips') }}
-        </div>
-        <div
-          v-if="formData.rule_type === 'cycle'"
-          class="ml-[120px] mb-[10px] mt-[-10px] text-[12px] text-[#999] leading-[20px]"
-        >
-          {{ t('ruleTypeTipsTwo') }}
-        </div>
-
-        <!-- 优惠设置 -->
-        <el-form-item :label="t('ruleJson')" prop="rule_json" class="" required>
-          <!-- 活动层级 -->
-          <div class="el-form-item__content">
-            <div
-              v-for="(level, index) in formData.rule_type === 'cycle'
-                ? [formData.rule_json[0]]
-                : formData.rule_json"
-              :key="index"
-              class="activity-level"
-            >
-              <div class="level-header">
-                <div class="font-bold text-[#333]">
-                  {{ t('activityLevel') }}{{ index + 1 }}
-                </div>
-                <span
-                  class="cursor-pointer text-primary mr-[10px]"
-                  v-if="
-                    formData.rule_json.length > 1 &&
-                    index !== 0 &&
-                    !disableSubmit
-                  "
-                  @click="removeSetting(index)"
-                  >{{ t('delete') }}</span
-                >
-              </div>
-              <!-- 优惠门槛 -->
-              <div class="level-section flex">
-                <el-form-item
-                  class="limit-input"
-                  :label="t('discountThreshold')"
-                  :prop="`rule_json.${index}.limit`"
-                  :rules="[
-                    {
-                      required: true,
-                      trigger: 'blur',
-                      validator: (rule: any, value: any, callback: any) => {
-                        if (value === null || value === '') {
-                          callback(t('limitPlaceholder'))
-                        } else if (
-                          isNaN(value) ||
-                          (!regExp.digit.test(value) &&
-                            formData.condition_type == 'over_n_yuan')
-                        ) {
-                          callback(t('limitTips'))
-                        } else if (
-                          isNaN(value) ||
-                          (!regExp.number.test(value) &&
-                            formData.condition_type == 'over_n_piece')
-                        ) {
-                          callback(t('limitTips'))
-                        } else if (value <= 0) {
-                          callback(t('valueMustBeGreaterThanZero'))
-                        } else {
-                          const previousLimit =
-                            formData.rule_json[index - 1]?.limit
-                          if (
-                            previousLimit !== undefined &&
-                            value <= Number(previousLimit)
-                          ) {
-                            callback(t('limitTipsThree'))
-                          } else {
-                            const limits = formData.rule_json.map(
-                              (level, idx) => idx !== index && level.limit
-                            )
-                            if (limits.includes(value)) {
-                              callback(t('limitTipsTwo'))
-                            } else {
-                              callback()
-                            }
-                          }
-                        }
-                      },
-                    },
-                  ]"
-                >
-                  <div class="flex items-center ml-[10px]">
-                    <span class="mr-[10px]">满</span>
-                    <el-input
-                      clearable
-                      class="input-width-short"
-                      maxlength="8"
-                      v-model="level.limit"
-                      :placeholder="
-                        formData.condition_type === 'over_n_yuan' ? '0.00' : '0'
-                      "
-                      :disabled="disableSubmit"
-                    />
-                    <span class="ml-[10px]">{{
-                      formData.condition_type === 'over_n_yuan' ? '元' : '件'
-                    }}</span>
-                  </div>
+    <div class="main-container">
+        <el-card class="card !border-none" shadow="never">
+            <el-page-header :content="id ? t('editFullDiscountBonus') : t('addFullDiscountBonus')" :icon="ArrowLeft" @back="back()" />
+        </el-card>
+
+        <!-- 表单 -->
+        <el-card class="box-card mt-[15px] !border-none" shadow="never" v-loading="loading">
+            <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" scroll-to-error class="page-form">
+                <!-- 活动名称： -->
+                <el-form-item :label="t('activeName')" prop="manjian_name">
+                    <div>
+                        <el-input v-model.trim="formData.manjian_name" clearable :placeholder="t('namePlaceholder')" class="input-width" :maxlength="20" show-word-limit />
+                    </div>
                 </el-form-item>
-              </div>
-
-              <!-- 优惠内容 -->
-              <div class="level-section">
-                <el-form-item
-                  class="limit-input"
-                  :label="t('discountContent')"
-                  required
-                >
-                  <div class="vertical-checkbox-group">
-                    <!-- 优惠内容：订单金额优惠 -->
-                    <div class="condition-item">
-                      <el-checkbox
-                        v-model="level.is_discount"
-                        :disabled="disableSubmit"
-                        label="is_discount"
-                        >{{ t('discountMoney') }}</el-checkbox
-                      >
-                      <el-form-item class="limit-input">
-                        <div class="dynamic-content" v-if="level.is_discount">
-                          <el-radio-group
-                            v-model="level.discount_type"
-                            :disabled="disableSubmit"
-                            v-if="formData.rule_type == 'ladder'"
-                          >
-                            <el-radio :label="1">{{ t('reduce') }}</el-radio>
-                            <el-radio :label="2">{{
-                              t('discountRate')
-                            }}</el-radio>
-                          </el-radio-group>
-                          <el-form-item
-                            :prop="`rule_json.${index}.discount_money`"
-                            :rules="[
-                              {
+                <!-- 活动时间 -->
+                <el-form-item :label="t('activityTime')" prop="manjian_time">
+                    <div class="w-[180px]">
+                        <el-date-picker v-model="formData.manjian_time" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"/>
+                    </div>
+                </el-form-item>
+                <!-- 条件类型 -->
+                <el-form-item :label="t('conditionType')" prop="condition_type" required>
+                    <el-radio-group v-model="formData.condition_type" :disabled="disableSubmit">
+                        <el-radio label="over_n_yuan">{{ t('overNyuan') }}</el-radio>
+                        <el-radio label="over_n_piece">{{ t('overNgoods') }}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <!-- 优惠规格 -->
+                <el-form-item :label="t('ruleType')" prop="rule_type" required>
+                    <el-radio-group v-model="formData.rule_type" :disabled="disableSubmit">
+                        <el-radio label="ladder">{{t('ladder')}}</el-radio>
+                        <el-radio label="cycle">{{t('cycle')}}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <div v-if="formData.rule_type === 'ladder'" class="ml-[120px] mb-[10px] mt-[-10px] text-[12px] text-[#999] leading-[20px]">{{ t('ruleTypeTips') }}</div>
+                <div v-if="formData.rule_type === 'cycle'" class="ml-[120px] mb-[10px] mt-[-10px] text-[12px] text-[#999] leading-[20px]">{{ t('ruleTypeTipsTwo') }}</div>
+
+                <!-- 优惠设置 -->
+                <el-form-item :label="t('ruleJson')" prop="rule_json" class="" required>
+                <!-- 活动层级 -->
+                <div class="el-form-item__content">
+                    <div v-for="(level, index) in (formData.rule_type === 'cycle' ? [formData.rule_json[0]] : formData.rule_json)"  :key="index" class="activity-level">
+                        <div class="level-header">
+                            <div class="font-bold text-[#333]">{{t('activityLevel')}}{{ index + 1 }}</div>
+                            <span class="cursor-pointer text-primary mr-[10px]" v-if="formData.rule_json.length > 1 && index !== 0 &&!disableSubmit" @click="removeSetting(index)">{{ t('delete') }}</span>
+                        </div>
+                        <!-- 优惠门槛 -->
+                        <div class="level-section flex">
+                            <el-form-item class="limit-input" :label="t('discountThreshold')" :prop="`rule_json.${index}.limit`" :rules="[{
                                 required: true,
                                 trigger: 'blur',
-                                validator: (
-                                  rule: any,
-                                  value: any,
-                                  callback: any
-                                ) => {
-                                  if (value === null || value === '') {
-                                    callback(t('discountsPlaceholder'))
-                                  } else if (
-                                    isNaN(value) ||
-                                    !regExp.digit.test(value)
-                                  ) {
-                                    callback(t('limitTips'))
-                                  } else if (value <= 0) {
-                                    callback(t('discountMustBeGreaterThanZero'))
-                                  } else if (
-                                    level.discount_type === 1 &&
-                                    formData.condition_type == 'over_n_yuan' &&
-                                    value > Number(level.limit)
-                                  ) {
-                                    callback(t('discountLimit'))
-                                  } else if (level.discount_type === 2) {
-                                    if (value > 9.9 || value < 0.1) {
-                                      callback(
-                                        t('discountMustBeGreaterThanNine')
-                                      )
-                                    } else {
-                                      callback()
-                                    }
-                                  } else {
-                                    callback()
-                                  }
-                                },
-                              },
-                            ]"
-                          >
-                            <div class="flex items-center">
-                              <span class="mr-[10px]">{{
-                                level.discount_type === 1 ? '减' : '打'
-                              }}</span>
-                              <el-input
-                                :disabled="disableSubmit"
-                                v-if="level.discount_type === 1"
-                                clearable
-                                class="input-width-short"
-                                maxlength="8"
-                                v-model="level.discount_money"
-                                placeholder="0.00"
-                              />
-                              <el-input
-                                :disabled="disableSubmit"
-                                v-else
-                                v-model="level.discount_money"
-                                clearable
-                                class="input-width-short"
-                                maxlength="8"
-                                :max="9.9"
-                                placeholder="0.00"
-                              />
-                              <span class="ml-[10px]">{{
-                                level.discount_type === 1 ? '元' : '折'
-                              }}</span>
+                                validator: (rule: any, value: any, callback: any) => {
+                                            if (value === null || value === '') {
+                                                callback(t('limitPlaceholder'))
+                                            }else if (isNaN(value) || !regExp.digit.test(value) && formData.condition_type=='over_n_yuan') {
+                                                callback(t('limitTips'))
+                                            }else if (isNaN(value) || !regExp.number.test(value) && formData.condition_type=='over_n_piece') {
+                                                callback(t('limitTips'))
+                                            }else if (value <= 0) {
+                                                callback(t('valueMustBeGreaterThanZero'))
+                                            } else {
+                                                const previousLimit = formData.rule_json[index - 1]?.limit;
+                                                if (previousLimit !== undefined && value <=Number(previousLimit)) {
+                                                callback(t('limitTipsThree'));
+                                                } else {
+                                                const limits = formData.rule_json.map((level, idx) => idx !== index && level.limit);
+                                                if (limits.includes(value)) {
+                                                    callback(t('limitTipsTwo'));
+                                                } else {
+                                                    callback();
+                                                }
+                                                }
+                                            }
+                                            }
+                            }]">
+                            <div class="flex items-center ml-[10px]">
+                                <span class="mr-[10px]">满</span>
+                                    <el-input  clearable class="input-width-short" maxlength="8" v-model="level.limit"  :placeholder="formData.condition_type === 'over_n_yuan' ? '0.00' : '0'" :disabled="disableSubmit" />
+                                <span class="ml-[10px]">{{ formData.condition_type === 'over_n_yuan' ? '元' : '件' }}</span>
                             </div>
-                          </el-form-item>
-                        </div>
-                      </el-form-item>
-                    </div>
-
-                    <!-- 优惠内容：包邮 -->
-                    <div class="condition-item">
-                      <el-checkbox
-                        v-model="level.is_free_shipping"
-                        :disabled="disableSubmit"
-                        label="is_free_shipping"
-                        >{{ t('freeShipping') }}</el-checkbox
-                      >
-                      <div class="mt-[-10px] text-[#999] text-[12px]">
-                        {{ t('freeTips') }}
-                      </div>
-                    </div>
+                        </el-form-item>
 
-                    <!-- 优惠内容：送积分 -->
-                    <div class="condition-item">
-                      <el-checkbox
-                        :disabled="disableSubmit"
-                        v-model="level.is_give_point"
-                        label="is_give_point"
-                        >{{ t('givePoint') }}</el-checkbox
-                      >
-                      <el-form-item
-                        v-if="level.is_give_point"
-                        class="limit-input"
-                        :prop="`rule_json.${index}.point`"
-                        :rules="[
-                          {
-                            required: true,
-                            trigger: 'blur',
-                            validator: (
-                              rule: any,
-                              value: any,
-                              callback: any
-                            ) => {
-                              if (value === null || value === '') {
-                                callback(t('pointPlaceholder'))
-                              } else if (
-                                isNaN(value) ||
-                                !regExp.number.test(value)
-                              ) {
-                                callback(t('limitTips'))
-                              } else if (value <= 0) {
-                                callback(t('pointMustBeGreaterThanZero'))
-                              } else {
-                                callback()
-                              }
-                            },
-                          },
-                        ]"
-                      >
-                        <div class="dynamic-content flex items-center">
-                          <span class="mr-[10px]">送</span>
-                          <el-input
-                            :disabled="disableSubmit"
-                            clearable
-                            class="input-width-short"
-                            maxlength="8"
-                            v-model="level.point"
-                            placeholder="0"
-                          />
-                          <span class="ml-[10px]">积分</span>
                         </div>
-                      </el-form-item>
-                    </div>
-                    <!-- 优惠内容：送余额 -->
-                    <div class="condition-item">
-                      <el-checkbox
-                        :disabled="disableSubmit"
-                        v-model="level.is_give_balance"
-                        label="is_give_balance"
-                        >{{ t('giveBalance') }}</el-checkbox
-                      >
-                      <el-form-item
-                        v-if="level.is_give_balance"
-                        class="limit-input"
-                        :prop="`rule_json.${index}.balance`"
-                        :rules="[
-                          {
-                            required: true,
-                            trigger: 'blur',
-                            validator: (
-                              rule: any,
-                              value: any,
-                              callback: any
-                            ) => {
-                              if (value === null || value === '') {
-                                callback(t('balancePlaceholder'))
-                              } else if (
-                                isNaN(value) ||
-                                !regExp.digit.test(value)
-                              ) {
-                                callback(t('limitTips'))
-                              } else if (value <= 0) {
-                                callback(t('balanceMustBeGreaterThanZero'))
-                              } else {
-                                callback()
-                              }
-                            },
-                          },
-                        ]"
-                      >
-                        <div class="dynamic-content flex items-center">
-                          <span class="mr-[10px]">送</span>
-                          <el-input
-                            :disabled="disableSubmit"
-                            clearable
-                            class="input-width-short"
-                            maxlength="8"
-                            v-model="level.balance"
-                            placeholder="0.00"
-                          />
-                          <span class="ml-[10px]">余额</span>
-                        </div>
-                      </el-form-item>
-                    </div>
-                    <!-- 优惠内容：送优惠券 -->
-                    <div class="condition-item">
-                      <el-checkbox
-                        label="is_give_coupon"
-                        :disabled="disableSubmit"
-                        v-model="level.is_give_coupon"
-                        >{{ t('giveCoupon') }}</el-checkbox
-                      >
-                      <div class="mt-[-10px] text-[#999] text-[12px]">
-                        {{ t('giveCouponTips') }}
-                      </div>
-                      <el-form-item
-                        :prop="`rule_json.${index}.coupon`"
-                        v-if="level.is_give_coupon && !disableSubmit"
-                        class="dynamic-content"
-                        :rules="[
-                          {
-                            required: true,
-                            message: t('couponPlaceholder'),
-                            trigger: 'blur',
-                          },
-                        ]"
-                      >
-                        <coupon-select-popup
-                          ref="couponSelectPopupRef"
-                          @couponSelect="couponSelect($event, index)"
-                          v-model="level.couponIds"
-                          :min="1"
-                          :max="10"
-                          :is-gift="1"
-                        />
-                      </el-form-item>
-                      <el-form-item
-                        class="mt-[15px]"
-                        v-if="
-                          level.coupon &&
-                          level.coupon.length &&
-                          level.is_give_coupon
-                        "
-                      >
-                        <div class="w-full sku_list">
-                          <el-table
-                            :data="level.coupon"
-                            size="large"
-                            max-height="400"
-                            :row-style="{ height: '80px' }"
-                          >
-                            <el-table-column
-                              prop="title"
-                              :label="t('name')"
-                              min-width="120"
-                            >
-                              <template #default="{ row }">
-                                <div>{{ row.title }}</div>
-                              </template>
-                            </el-table-column>
-                            <el-table-column
-                              prop="type_name"
-                              :label="t('type')"
-                              min-width="120"
-                            >
-                              <template #default="{ row }">
-                                <div>{{ row.type_name }}</div>
-                              </template>
-                            </el-table-column>
-                            <el-table-column
-                              prop="price"
-                              :label="t('couponPrice')"
-                              min-width="120"
-                            >
-                              <template #default="{ row }">
-                                <div>￥{{ row.price }}</div>
-                              </template>
-                            </el-table-column>
-                            <el-table-column
-                              prop="num"
-                              :label="t('giveNum')"
-                              min-width="140"
-                            >
-                              <template #default="{ row, $index }">
-                                <el-form-item
-                                  :prop="
-                                    'rule_json[' +
-                                    index +
-                                    '].coupon[' +
-                                    $index +
-                                    '].num'
-                                  "
-                                  :rules="[
-                                    {
-                                      required: true,
-                                      trigger: 'blur',
-                                      validator: (
-                                        rule: any,
-                                        value: any,
-                                        callback: any
-                                      ) => {
-                                        if (value === null || value === '') {
-                                          callback(t('giveNumPlaceholder'))
-                                        } else if (
-                                          isNaN(value) ||
-                                          !regExp.number.test(value)
-                                        ) {
-                                          callback(t('limitTips'))
-                                        } else if (value <= 0) {
-                                          callback(
-                                            t('giveNumMustBeGreaterThanZero')
-                                          )
-                                        } else {
-                                          callback()
-                                        }
-                                      },
-                                    },
-                                  ]"
-                                >
-                                  <el-input
-                                    :disabled="disableSubmit"
-                                    v-model.number="row.num"
-                                    class="w-[70px]"
-                                    clearable
-                                    maxlength="5"
-                                  />
-                                </el-form-item>
-                              </template>
-                            </el-table-column>
-                            <el-table-column
-                              :label="t('operation')"
-                              align="right"
-                              min-width="160"
-                            >
-                              <template #default="{ row, $index }">
-                                <el-button
-                                  type="primary"
-                                  link
-                                  @click="deleteCouponEvents(row, index)"
-                                  :disabled="disableSubmit"
-                                  >{{ t('delete') }}</el-button
-                                >
-                              </template>
-                            </el-table-column>
-                          </el-table>
+
+                        <!-- 优惠内容 -->
+                        <div class="level-section">
+                            <el-form-item class="limit-input" :label="t('discountContent')" required>
+                                <div  class="vertical-checkbox-group">
+                                    <!-- 优惠内容：订单金额优惠 -->
+                                    <div class="condition-item">
+                                        <el-checkbox  v-model="level.is_discount" :disabled="disableSubmit" label="is_discount">{{t('discountMoney')}}</el-checkbox>
+                                        <el-form-item class="limit-input">
+                                            <div class="dynamic-content" v-if="level.is_discount">
+                                                <el-radio-group  v-model="level.discount_type" :disabled="disableSubmit" v-if="formData.rule_type=='ladder'">
+                                                    <el-radio :label="1">{{ t('reduce') }}</el-radio>
+                                                    <el-radio :label="2">{{ t('discountRate') }}</el-radio>
+                                                </el-radio-group>
+                                                <el-form-item :prop="`rule_json.${index}.discount_money`" :rules="[{
+                                                    required: true,
+                                                    trigger: 'blur',
+                                                    validator: (rule: any, value: any, callback: any) => {
+                                                                if (value === null || value === '') {
+                                                                    callback(t('discountsPlaceholder'))
+                                                                }else if (isNaN(value) || !regExp.digit.test(value)) {
+                                                                    callback(t('limitTips'))
+                                                                }else if (value <= 0) {
+                                                                    callback(t('discountMustBeGreaterThanZero'))
+                                                                }else if (level.discount_type === 1 && formData.condition_type=='over_n_yuan' && value > Number(level.limit)) {
+                                                                    callback(t('discountLimit'))
+                                                                }else if (level.discount_type === 2) {
+                                                                    if(value >9.9 || value < 0.1 ){
+                                                                        callback(t('discountMustBeGreaterThanNine'))
+                                                                    }else {
+                                                                        callback()
+                                                                    }
+                                                                }  else {
+                                                                    callback();
+                                                                }
+                                                            }
+                                                }]" >
+                                                    <div class="flex items-center">
+                                                        <span class="mr-[10px]">{{ level.discount_type === 1 ? '减' : '打' }}</span>
+                                                            <el-input :disabled="disableSubmit" v-if="level.discount_type === 1"   clearable class="input-width-short" maxlength="8" v-model="level.discount_money"  placeholder="0.00" />
+                                                            <el-input :disabled="disableSubmit" v-else  v-model="level.discount_money"   clearable class="input-width-short" maxlength="8" :max="9.9"  placeholder="0.00" />
+                                                        <span class="ml-[10px]">{{ level.discount_type === 1 ? '元' : '折' }}</span>
+                                                    </div>
+                                                </el-form-item>
+                                            </div>
+                                        </el-form-item>
+                                    </div>
+
+                                    <!-- 优惠内容：包邮 -->
+                                    <div class="condition-item">
+                                        <el-checkbox v-model="level.is_free_shipping" :disabled="disableSubmit" label="is_free_shipping">{{t('freeShipping')}}</el-checkbox>
+                                        <div class="mt-[-10px] text-[#999] text-[12px]">{{t('freeTips')}}</div>
+                                    </div>
+
+                                    <!-- 优惠内容：送积分 -->
+                                    <div class="condition-item">
+                                        <el-checkbox :disabled="disableSubmit"  v-model="level.is_give_point" label="is_give_point">{{t('givePoint')}}</el-checkbox>
+                                        <el-form-item v-if="level.is_give_point" class="limit-input" :prop="`rule_json.${index}.point`" :rules="[{
+                                            required: true,
+                                            trigger: 'blur',
+                                            validator: (rule: any, value: any, callback: any) => {
+                                                        if (value === null || value === '') {
+                                                            callback(t('pointPlaceholder'))
+                                                        }else if (isNaN(value) || !regExp.number.test(value)) {
+                                                            callback(t('limitTips'))
+                                                        }else if (value <= 0) {
+                                                            callback(t('pointMustBeGreaterThanZero'))
+                                                        } else {
+                                                            callback();
+                                                        }
+                                                    }
+                                        }]">
+                                            <div  class="dynamic-content flex items-center">
+                                                <span class="mr-[10px]">送</span>
+                                                <el-input :disabled="disableSubmit"  clearable class="input-width-short" maxlength="8" v-model="level.point"  placeholder="0" />
+                                                <span class="ml-[10px]">积分</span>
+                                            </div>
+                                        </el-form-item>
+                                    </div>
+                                    <!-- 优惠内容：送余额 -->
+                                    <div class="condition-item">
+                                        <el-checkbox :disabled="disableSubmit" v-model="level.is_give_balance" label="is_give_balance">{{t('giveBalance')}}</el-checkbox>
+                                        <el-form-item v-if="level.is_give_balance" class="limit-input" :prop="`rule_json.${index}.balance`" :rules="[{
+                                            required: true,
+                                            trigger: 'blur',
+                                            validator: (rule: any, value: any, callback: any) => {
+                                                        if (value === null || value === '') {
+                                                            callback(t('balancePlaceholder'))
+                                                        }else if (isNaN(value) || !regExp.digit.test(value)) {
+                                                            callback(t('limitTips'))
+                                                        }else if (value <= 0) {
+                                                            callback(t('balanceMustBeGreaterThanZero'))
+                                                        } else {
+                                                            callback();
+                                                        }
+                                                    }
+                                        }]">
+                                            <div class="dynamic-content flex items-center">
+                                                <span class="mr-[10px]">送</span>
+                                                <el-input :disabled="disableSubmit" clearable class="input-width-short" maxlength="8"  v-model="level.balance"  placeholder="0.00" />
+                                                <span class="ml-[10px]">余额</span>
+                                            </div>
+                                        </el-form-item>
+                                    </div>
+                                    <!-- 优惠内容：送优惠券 -->
+                                    <div class="condition-item">
+                                        <el-checkbox label="is_give_coupon" :disabled="disableSubmit" v-model="level.is_give_coupon">{{t('giveCoupon')}}</el-checkbox>
+                                        <div class="mt-[-10px] text-[#999] text-[12px]">{{ t('giveCouponTips') }}</div>
+                                        <el-form-item :prop="`rule_json.${index}.coupon`" v-if="level.is_give_coupon &&!disableSubmit" class="dynamic-content" :rules="[{ required: true, message: t('couponPlaceholder'), trigger: 'blur' }]">
+                                            <coupon-select-popup ref="couponSelectPopupRef" @couponSelect="couponSelect($event, index)" v-model="level.couponIds" :min="1" :max="10" :is-gift="1" />
+                                        </el-form-item>
+                                        <el-form-item class="mt-[15px]" v-if="level.coupon && level.coupon.length && level.is_give_coupon">
+                                            <div class="w-full sku_list">
+                                                <el-table :data="level.coupon" size="large" max-height="400" :row-style="{ height: '80px' }">
+                                                    <el-table-column prop="title" :label="t('name')" min-width="120" >
+                                                        <template #default="{ row }">
+                                                            <div>{{ row.title }}</div>
+                                                        </template>
+                                                    </el-table-column>
+                                                    <el-table-column prop="type_name" :label="t('type')" min-width="120">
+                                                        <template #default="{ row }">
+                                                            <div>{{ row.type_name }}</div>
+                                                        </template>
+                                                    </el-table-column>
+                                                    <el-table-column prop="price" :label="t('couponPrice')" min-width="120">
+                                                        <template #default="{ row }">
+                                                            <div>￥{{ row.price }}</div>
+                                                        </template>
+                                                    </el-table-column>
+                                                    <el-table-column prop="num" :label="t('giveNum')" min-width="140">
+                                                        <template #default="{ row, $index }">
+                                                            <el-form-item
+                                                            :prop="'rule_json[' + index + '].coupon[' + $index + '].num'"
+                                                            :rules="[{ required: true, trigger: 'blur', validator: (rule: any, value: any, callback: any) => {
+                                                                    if (value === null || value === '') {
+                                                                        callback(t('giveNumPlaceholder'))
+                                                                    }else if (isNaN(value) || !regExp.number.test(value)) {
+                                                                        callback(t('limitTips'))
+                                                                    }else if (value <= 0) {
+                                                                        callback(t('giveNumMustBeGreaterThanZero'))
+                                                                    }else {
+                                                                        callback();
+                                                                    }
+                                                                } }]">
+                                                                <el-input :disabled="disableSubmit" v-model.number ="row.num" class="w-[70px]" clearable maxlength="5"  />
+                                                            </el-form-item>
+                                                        </template>
+                                                    </el-table-column>
+                                                    <el-table-column :label="t('operation')" align="right" min-width="160">
+                                                        <template #default="{ row, $index }">
+                                                            <el-button type="primary" link @click="deleteCouponEvents(row, index)" :disabled="disableSubmit">{{ t("delete") }}</el-button>
+                                                        </template>
+                                                    </el-table-column>
+                                                </el-table>
+                                            </div>
+                                        </el-form-item>
+                                    </div>
+
+                                    <!-- 优惠内容：送赠品 -->
+                                    <div class="condition-item">
+                                        <el-checkbox :disabled="disableSubmit" label="is_give_goods" v-model="level.is_give_goods">{{ t("giveGoods") }}</el-checkbox>
+                                        <div class="mt-[-10px] text-[#999] text-[12px]">{{ t('giveGoodsTips') }}</div>
+                                        <el-form-item :prop="`rule_json.${index}.goods`" v-if="level.is_give_goods &&!disableSubmit" class="dynamic-content" :rules="[{ required: true, message: t('goodsJsonEmpty'), trigger: 'blur' }]">
+                                            <goods-select-popup ref="goodsSelectPopupRef" v-model="level.goods_ids" mode="sku" @goodsSelect="goodsSelects($event, index)" :min="1" :max="10" :is-gift="1" />
+                                        </el-form-item>
+                                        <el-form-item class="mt-[15px]" v-if="level.goods && level.goods.length && level.is_give_goods ">
+                                            <div class="w-full sku_list">
+                                                <el-table :data="level.goods" size="large" max-height="400">
+                                                    <el-table-column prop="goods_id" :label="t('goodsSelectPopupGoodsInfo')" min-width="300">
+                                                        <template #default="{ row }">
+                                                            <div class="flex items-center cursor-pointer">
+                                                                <div class="min-w-[60px] h-[60px] flex items-center justify-center">
+                                                                    <el-image v-if="row.sku_image" class="w-[60px] h-[60px]" :src="img(row.sku_image)" fit="contain">
+                                                                    <template #error>
+                                                                        <div class="image-slot">
+                                                                        <img class="w-[60px] h-[60px]" src="@/addon/shop/assets/goods_default.png" />
+                                                                        </div>
+                                                                    </template>
+                                                                    </el-image>
+                                                                    <img v-else class="w-[70px] h-[60px]" src="@/addon/shop/assets/goods_default.png" fit="contain" />
+                                                                </div>
+                                                                <div class="ml-2">
+                                                                    <span :title="row.sku_name" class="multi-hidden">{{row.sku_name ? row.goods_name + " " + row.sku_name: row.goods_name}}</span>
+                                                                    <span class="text-primary text-[12px]">{{row.goods_type_name}}</span>
+                                                                </div>
+                                                            </div>
+                                                        </template>
+                                                    </el-table-column>
+
+                                                    <el-table-column prop="price" :label="t('goodsSelectPopupPrice')" min-width="120">
+                                                        <template #default="{ row }">
+                                                            <div>￥{{ row.price }}</div>
+                                                        </template>
+                                                    </el-table-column>
+                                                    <el-table-column prop="stock" :label="t('stock')" min-width="120">
+                                                        <template #default="{ row }">
+                                                            <div>{{ row.stock }}</div>
+                                                        </template>
+                                                    </el-table-column>
+                                                    <el-table-column prop="num" :label="t('giveNum')" min-width="180">
+                                                        <template #default="{ row, $index }">
+                                                            <el-form-item
+                                                            :prop="'rule_json[' + index + '].goods[' + $index + '].num'"
+                                                            :rules="[{ required: true, trigger: 'blur', validator: (rule: any, value: any, callback: any) => {
+                                                                    if (value === null || value === '') {
+                                                                        callback(t('giveNumPlaceholder'))
+                                                                    }else if (isNaN(value) || !regExp.number.test(value)) {
+                                                                        callback(t('limitTips'))
+                                                                    }else if (value <= 0) {
+                                                                        callback(t('giveNumMustBeGreaterThanZero'))
+                                                                    }else if (value > row.stock) {
+                                                                        callback(t('giveNumMustBeGreaterThanStock'))
+                                                                    }else {
+                                                                        callback();
+                                                                    }
+                                                                } }]">
+                                                                <el-input :disabled="disableSubmit" v-model.number ="row.num" class="w-[70px]" clearable />
+                                                            </el-form-item>
+                                                        </template>
+                                                    </el-table-column>
+                                                    <el-table-column :label="t('operation')" align="right" min-width="160">
+                                                        <template #default="{ row, $index }">
+                                                            <el-button type="primary" link @click="deleteGoodsEvents(row, index)" :disabled="disableSubmit">{{ t("delete") }}</el-button>
+                                                        </template>
+                                                    </el-table-column>
+                                                </el-table>
+                                            </div>
+
+                                        </el-form-item>
+                                    </div>
+                                </div>
+                            </el-form-item>
                         </div>
-                      </el-form-item>
                     </div>
-
-                    <!-- 优惠内容：送赠品 -->
-                    <div class="condition-item">
-                      <el-checkbox
-                        :disabled="disableSubmit"
-                        label="is_give_goods"
-                        v-model="level.is_give_goods"
-                        >{{ t('giveGoods') }}</el-checkbox
-                      >
-                      <div class="mt-[-10px] text-[#999] text-[12px]">
-                        {{ t('giveGoodsTips') }}
-                      </div>
-                      <el-form-item
-                        :prop="`rule_json.${index}.goods`"
-                        v-if="level.is_give_goods && !disableSubmit"
-                        class="dynamic-content"
-                        :rules="[
-                          {
-                            required: true,
-                            message: t('goodsJsonEmpty'),
-                            trigger: 'blur',
-                          },
-                        ]"
-                      >
-                        <goods-select-popup
-                          ref="goodsSelectPopupRef"
-                          v-model="level.goods_ids"
-                          mode="sku"
-                          @goodsSelect="goodsSelects($event, index)"
-                          :min="1"
-                          :max="10"
-                          :is-gift="1"
-                        />
-                      </el-form-item>
-                      <el-form-item
-                        class="mt-[15px]"
-                        v-if="
-                          level.goods &&
-                          level.goods.length &&
-                          level.is_give_goods
-                        "
-                      >
-                        <div class="w-full sku_list">
-                          <el-table
-                            :data="level.goods"
-                            size="large"
-                            max-height="400"
-                          >
-                            <el-table-column
-                              prop="goods_id"
-                              :label="t('goodsSelectPopupGoodsInfo')"
-                              min-width="300"
-                            >
-                              <template #default="{ row }">
-                                <div class="flex items-center cursor-pointer">
-                                  <div
-                                    class="min-w-[60px] h-[60px] flex items-center justify-center"
-                                  >
-                                    <el-image
-                                      v-if="row.sku_image"
-                                      class="w-[60px] h-[60px]"
-                                      :src="img(row.sku_image)"
-                                      fit="contain"
-                                    >
-                                      <template #error>
-                                        <div class="image-slot">
-                                          <img
-                                            class="w-[60px] h-[60px]"
-                                            src="@/addon/shop/assets/goods_default.png"
-                                          />
-                                        </div>
-                                      </template>
+                    <!-- 添加活动层级 -->
+                    <el-button :disabled="disableSubmit" v-if="formData.rule_type=='ladder' && formData.rule_json.length < 5"  type="primary" plain @click="addSetting" class="mt-[20px]">{{ t('addActivityLevel') }}</el-button>
+                </div>
+                </el-form-item>
+                <!-- 活动对象 -->
+                <el-form-item :label="t('joinMemberType')" prop="join_member_type" required>
+                    <el-radio-group v-model="formData.join_member_type">
+                        <el-radio label="all_member">{{t('allMember')}}</el-radio>
+                        <el-radio label="selected_member_level">{{t('selectedMemberLevel')}}</el-radio>
+                        <el-radio label="selected_member_label">{{t('selectedMemberLabel')}}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <!-- 会员标签 -->
+                <el-form-item :label="t('memberLabel')" prop="label_ids" v-if="formData.join_member_type=='selected_member_label'" :rules="[{ required: true, message: t('labelTips'), trigger: 'blur' }]">
+                    <el-select v-model="formData.label_ids" clearable multiple :placeholder="t('memberLabelPlaceholder')" class="input-width">
+                        <el-option :label="item['label_name']" :value="item['label_id']" v-for="(item, index) in labelSelectData" :key="index" />
+                    </el-select>
+                </el-form-item>
+                <!-- 会员等级 -->
+                <el-form-item :label="t('memberLevel')" prop="level_ids" v-if="formData.join_member_type=='selected_member_level'" :rules="[{ required: true, message: t('levelTips'), trigger: 'blur' }]">
+                    <el-select v-model="formData.level_ids" clearable multiple :placeholder="t('memberLevelPlaceholder')" class="input-width">
+                        <el-option :label="item['level_name']" :value="item['level_id']" v-for="(item, index) in levelSelectData" :key="index" />
+                    </el-select>
+                </el-form-item>
+                <!-- 参与商品 -->
+                <el-form-item :label="t('goodsType')" prop="goods_type" required>
+                    <el-radio-group v-model="formData.goods_type" :disabled="disableSubmit">
+                        <el-radio label="all_goods">{{ t('allGoods') }}</el-radio>
+                        <el-radio label="selected_goods">{{ t('selectedGoods') }}</el-radio>
+                        <el-radio label="selected_goods_not">{{ t('selectedGoodsNot') }}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <!-- 选择商品 -->
+                <el-form-item :label="t('selectGoods')" prop="goods_data" v-if="formData.goods_type != 'all_goods' ">
+                    <goods-select-popup ref="goodsSelectPopupRef" v-model="formData.goods_ids" mode="sku" @goodsSelect="goodsSelect" :min="1" :max="99" />
+                </el-form-item>
+                <el-form-item class="mt-[15px]" v-if="formData.goods_data && formData.goods_data.length && formData.goods_type != 'all_goods'">
+                    <el-table :data="formData.goods_data" size="large" max-height="400" >
+                        <el-table-column prop="goods_id" :label="t('goodsSelectPopupGoodsInfo')" min-width="300">
+                        <template #default="{ row }">
+                            <div class="flex items-center cursor-pointer">
+                                <div class="min-w-[60px] h-[60px] flex items-center justify-center">
+                                    <el-image v-if="row.sku_image" class="w-[60px] h-[60px]" :src="img(row.sku_image)" fit="contain">
+                                        <template #error>
+                                            <div class="image-slot">
+                                                <img class="w-[60px] h-[60px]" src="@/addon/shop/assets/goods_default.png" />
+                                            </div>
+                                        </template>
                                     </el-image>
-                                    <img
-                                      v-else
-                                      class="w-[70px] h-[60px]"
-                                      src="@/addon/shop/assets/goods_default.png"
-                                      fit="contain"
-                                    />
-                                  </div>
-                                  <div class="ml-2">
-                                    <span
-                                      :title="row.sku_name"
-                                      class="multi-hidden"
-                                      >{{
-                                        row.sku_name
-                                          ? row.goods_name + ' ' + row.sku_name
-                                          : row.goods_name
-                                      }}</span
-                                    >
-                                    <span class="text-primary text-[12px]">{{
-                                      row.goods_type_name
-                                    }}</span>
-                                  </div>
+                                    <img v-else class="w-[70px] h-[60px]" src="@/addon/shop/assets/goods_default.png" fit="contain" />
+                                </div>
+                                <div class="ml-2">
+                                    <span :title="row.sku_name" class="multi-hidden">{{row.sku_name ? row.goods_name + " " + row.sku_name: row.goods_name}}</span>
+                                    <span class="text-primary text-[12px]">{{row.goods_type_name}}</span>
                                 </div>
-                              </template>
-                            </el-table-column>
+                                 <!-- 错误信息提示 -->
+                                <div v-if="row.error_msg" class="text-red-500 text-sm ml-[10px] mt-5">{{ row.error_msg }}</div>
+                                  <!-- 下架信息提示 -->
+                                <div v-if="row.status==0" class="text-red-500 text-sm ml-[10px] mt-5">{{ t('goodsOffTips') }}</div>
 
-                            <el-table-column
-                              prop="price"
-                              :label="t('goodsSelectPopupPrice')"
-                              min-width="120"
-                            >
-                              <template #default="{ row }">
-                                <div>￥{{ row.price }}</div>
-                              </template>
-                            </el-table-column>
-                            <el-table-column
-                              prop="stock"
-                              :label="t('stock')"
-                              min-width="120"
-                            >
-                              <template #default="{ row }">
-                                <div>{{ row.stock }}</div>
-                              </template>
-                            </el-table-column>
-                            <el-table-column
-                              prop="num"
-                              :label="t('giveNum')"
-                              min-width="180"
-                            >
-                              <template #default="{ row, $index }">
-                                <el-form-item
-                                  :prop="
-                                    'rule_json[' +
-                                    index +
-                                    '].goods[' +
-                                    $index +
-                                    '].num'
-                                  "
-                                  :rules="[
-                                    {
-                                      required: true,
-                                      trigger: 'blur',
-                                      validator: (
-                                        rule: any,
-                                        value: any,
-                                        callback: any
-                                      ) => {
-                                        if (value === null || value === '') {
-                                          callback(t('giveNumPlaceholder'))
-                                        } else if (
-                                          isNaN(value) ||
-                                          !regExp.number.test(value)
-                                        ) {
-                                          callback(t('limitTips'))
-                                        } else if (value <= 0) {
-                                          callback(
-                                            t('giveNumMustBeGreaterThanZero')
-                                          )
-                                        } else if (value > row.stock) {
-                                          callback(
-                                            t('giveNumMustBeGreaterThanStock')
-                                          )
-                                        } else {
-                                          callback()
-                                        }
-                                      },
-                                    },
-                                  ]"
-                                >
-                                  <el-input
-                                    :disabled="disableSubmit"
-                                    v-model.number="row.num"
-                                    class="w-[70px]"
-                                    clearable
-                                  />
-                                </el-form-item>
-                              </template>
-                            </el-table-column>
-                            <el-table-column
-                              :label="t('operation')"
-                              align="right"
-                              min-width="160"
-                            >
-                              <template #default="{ row, $index }">
-                                <el-button
-                                  type="primary"
-                                  link
-                                  @click="deleteGoodsEvents(row, index)"
-                                  :disabled="disableSubmit"
-                                  >{{ t('delete') }}</el-button
-                                >
-                              </template>
-                            </el-table-column>
-                          </el-table>
-                        </div>
-                      </el-form-item>
-                    </div>
-                  </div>
+                            </div>
+                        </template>
+                        </el-table-column>
+
+                        <el-table-column prop="price" :label="t('goodsSelectPopupPrice')" min-width="120">
+                        <template #default="{ row }">
+                            <div>￥{{ row.price }}</div>
+                        </template>
+                        </el-table-column>
+                        <el-table-column :label="t('operation')" align="right" min-width="160">
+                            <template #default="{ row, $index }">
+                                <el-button type="primary" link @click="deleteGoodsEvent(row, $index)">{{ t("delete") }}</el-button>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </el-form-item>
+                <!-- 备注 -->
+                <el-form-item :label="t('remark')" prop="remark">
+                    <el-input v-model="formData.remark" :placeholder="t('rankRemarkPlaceholder')" type="textarea" maxlength="500" show-word-limit rows="5" class="!w-[400px]" clearable />
                 </el-form-item>
-              </div>
-            </div>
-            <!-- 添加活动层级 -->
-            <el-button
-              :disabled="disableSubmit"
-              v-if="
-                formData.rule_type == 'ladder' && formData.rule_json.length < 5
-              "
-              type="primary"
-              plain
-              @click="addSetting"
-              class="mt-[20px]"
-              >{{ t('addActivityLevel') }}</el-button
-            >
-          </div>
-        </el-form-item>
-        <!-- 活动对象 -->
-        <el-form-item
-          :label="t('joinMemberType')"
-          prop="join_member_type"
-          required
-        >
-          <el-radio-group v-model="formData.join_member_type">
-            <el-radio label="all_member">{{ t('allMember') }}</el-radio>
-            <el-radio label="selected_member_level">{{
-              t('selectedMemberLevel')
-            }}</el-radio>
-            <el-radio label="selected_member_label">{{
-              t('selectedMemberLabel')
-            }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <!-- 会员标签 -->
-        <el-form-item
-          :label="t('memberLabel')"
-          prop="label_ids"
-          v-if="formData.join_member_type == 'selected_member_label'"
-          :rules="[
-            { required: true, message: t('labelTips'), trigger: 'blur' },
-          ]"
-        >
-          <el-select
-            v-model="formData.label_ids"
-            clearable
-            multiple
-            :placeholder="t('memberLabelPlaceholder')"
-            class="input-width"
-          >
-            <el-option
-              :label="item['label_name']"
-              :value="item['label_id']"
-              v-for="(item, index) in labelSelectData"
-              :key="index"
-            />
-          </el-select>
-        </el-form-item>
-        <!-- 会员等级 -->
-        <el-form-item
-          :label="t('memberLevel')"
-          prop="level_ids"
-          v-if="formData.join_member_type == 'selected_member_level'"
-          :rules="[
-            { required: true, message: t('levelTips'), trigger: 'blur' },
-          ]"
-        >
-          <el-select
-            v-model="formData.level_ids"
-            clearable
-            multiple
-            :placeholder="t('memberLevelPlaceholder')"
-            class="input-width"
-          >
-            <el-option
-              :label="item['level_name']"
-              :value="item['level_id']"
-              v-for="(item, index) in levelSelectData"
-              :key="index"
-            />
-          </el-select>
-        </el-form-item>
-        <!-- 参与商品 -->
-        <el-form-item :label="t('goodsType')" prop="goods_type" required>
-          <el-radio-group
-            v-model="formData.goods_type"
-            :disabled="disableSubmit"
-          >
-            <el-radio label="all_goods">{{ t('allGoods') }}</el-radio>
-            <el-radio label="selected_goods">{{ t('selectedGoods') }}</el-radio>
-            <el-radio label="selected_goods_not">{{
-              t('selectedGoodsNot')
-            }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <!-- 选择商品 -->
-        <el-form-item
-          :label="t('selectGoods')"
-          prop="goods_data"
-          v-if="formData.goods_type != 'all_goods'"
-        >
-          <goods-select-popup
-            ref="goodsSelectPopupRef"
-            v-model="formData.goods_ids"
-            mode="sku"
-            @goodsSelect="goodsSelect"
-            :min="1"
-            :max="99"
-          />
-        </el-form-item>
-        <el-form-item
-          class="mt-[15px]"
-          v-if="
-            formData.goods_data &&
-            formData.goods_data.length &&
-            formData.goods_type != 'all_goods'
-          "
-        >
-          <el-table :data="formData.goods_data" size="large" max-height="400">
-            <el-table-column
-              prop="goods_id"
-              :label="t('goodsSelectPopupGoodsInfo')"
-              min-width="300"
-            >
-              <template #default="{ row }">
-                <div class="flex items-center cursor-pointer">
-                  <div
-                    class="min-w-[60px] h-[60px] flex items-center justify-center"
-                  >
-                    <el-image
-                      v-if="row.sku_image"
-                      class="w-[60px] h-[60px]"
-                      :src="img(row.sku_image)"
-                      fit="contain"
-                    >
-                      <template #error>
-                        <div class="image-slot">
-                          <img
-                            class="w-[60px] h-[60px]"
-                            src="@/addon/shop/assets/goods_default.png"
-                          />
-                        </div>
-                      </template>
-                    </el-image>
-                    <img
-                      v-else
-                      class="w-[70px] h-[60px]"
-                      src="@/addon/shop/assets/goods_default.png"
-                      fit="contain"
-                    />
-                  </div>
-                  <div class="ml-2">
-                    <span :title="row.sku_name" class="multi-hidden">{{
-                      row.sku_name
-                        ? row.goods_name + ' ' + row.sku_name
-                        : row.goods_name
-                    }}</span>
-                    <span class="text-primary text-[12px]">{{
-                      row.goods_type_name
-                    }}</span>
-                  </div>
-                  <!-- 错误信息提示 -->
-                  <div
-                    v-if="row.error_msg"
-                    class="text-red-500 text-sm ml-[10px] mt-5"
-                  >
-                    {{ row.error_msg }}
-                  </div>
-                  <!-- 下架信息提示 -->
-                  <div
-                    v-if="row.status == 0"
-                    class="text-red-500 text-sm ml-[10px] mt-5"
-                  >
-                    {{ t('goodsOffTips') }}
-                  </div>
-                </div>
-              </template>
-            </el-table-column>
 
-            <el-table-column
-              prop="price"
-              :label="t('goodsSelectPopupPrice')"
-              min-width="120"
-            >
-              <template #default="{ row }">
-                <div>￥{{ row.price }}</div>
-              </template>
-            </el-table-column>
-            <el-table-column
-              :label="t('operation')"
-              align="right"
-              min-width="160"
-            >
-              <template #default="{ row, $index }">
-                <el-button
-                  type="primary"
-                  link
-                  @click="deleteGoodsEvent(row, $index)"
-                  >{{ t('delete') }}</el-button
-                >
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-form-item>
-        <!-- 备注 -->
-        <el-form-item :label="t('remark')" prop="remark">
-          <el-input
-            v-model="formData.remark"
-            :placeholder="t('rankRemarkPlaceholder')"
-            type="textarea"
-            maxlength="500"
-            show-word-limit
-            rows="5"
-            class="!w-[400px]"
-            clearable
-          />
-        </el-form-item>
-      </el-form>
-    </el-card>
+            </el-form>
+        </el-card>
 
-    <!-- 提交按钮 -->
-    <div class="fixed-footer-wrap">
-      <div class="fixed-footer">
-        <el-button type="primary" @click="onSave()">{{ t('save') }}</el-button>
-        <el-button @click="back()">{{ t('cancel') }}</el-button>
-      </div>
+        <!-- 提交按钮 -->
+        <div class="fixed-footer-wrap">
+            <div class="fixed-footer">
+                <el-button type="primary" @click="onSave()">{{ t('save') }}</el-button>
+                <el-button @click="back()">{{ t('cancel') }}</el-button>
+            </div>
+        </div>
     </div>
-  </div>
 </template>
 <script lang="ts" setup>
-import { ref, computed, reactive } from 'vue'
-import { t } from '@/lang'
-import { useRoute, useRouter } from 'vue-router'
-import {
-  editManjian,
-  addManjian,
-  getManjianInfo,
-  goodsCheck,
-} from '@/addon/shop/api/marketing'
-import { FormInstance, ElMessage } from 'element-plus'
+import {ref, computed, reactive} from 'vue'
+import {t} from '@/lang'
+import {useRoute, useRouter} from 'vue-router'
+import {editManjian,addManjian,getManjianInfo,goodsCheck} from "@/addon/shop/api/marketing";
+import {FormInstance, ElMessage} from 'element-plus'
 import { ArrowLeft } from '@element-plus/icons-vue'
-import { getMemberLabelAll, getMemberLevelAll } from '@/app/api/member'
+import {getMemberLabelAll,getMemberLevelAll } from '@/app/api/member'
 import goodsSelectPopup from '@/addon/shop/views/goods/components/goods-select-popup.vue'
 import couponSelectPopup from '@/addon/shop/views/goods/components/coupon-select-popup.vue'
-import { deepClone, img } from '@/utils/common'
+import {deepClone, img} from '@/utils/common'
 
 const router = useRouter()
 const route = useRoute()
 const pageName = route.meta.title
-const id = route.query.id
+const id = route.query.id;
 const start_time = new Date()
-const end_time = new Date(new Date().setMinutes(new Date().getMinutes() + 10))
+const end_time = new Date(new Date().setMinutes(new Date().getMinutes() + 10));
 const loading = ref(false)
 const goodsSelectPopupRef: any = ref(null)
 const initialFormData = reactive({
-  manjian_name: '', // 名称
-  start_time: '',
-  goods_type: 'all_goods',
-  condition_type: 'over_n_yuan',
-  rule_type: 'ladder',
-  join_member_type: 'all_member',
-  end_time: '',
-  goods_data: [],
-  goods_ids: [],
-  rule_json: [
-    {
-      limit: '', // 优惠门槛
-      is_discount: false, // 是否订单金额优惠
-      is_free_shipping: false, // 是否包邮
-      is_give_point: false, // 是否送积分
-      is_give_coupon: false, // 是否送优惠券
-      is_give_goods: false, // 是否送赠品
-      is_give_balance: false, // 是否送余额
-      discount_type: 1,
-      discount_money: '', // 优惠金额
-      point: '', // 积分
-      balance: '', // 余额
-      goods_ids: [],
-      goods: [],
-      couponIds: [],
-      coupon: [],
-    },
-  ],
-  manjian_time: [start_time, end_time],
+    manjian_name: '', // 名称
+    start_time: '',
+    goods_type: 'all_goods',
+    condition_type: 'over_n_yuan',
+    rule_type: 'ladder',
+    join_member_type: 'all_member',
+    end_time: '',
+    goods_data: [],
+    goods_ids: [],
+    rule_json: [
+        {
+            limit: "", // 优惠门槛
+            is_discount: false,          // 是否订单金额优惠
+            is_free_shipping: false,     // 是否包邮
+            is_give_point: false,        // 是否送积分
+            is_give_coupon: false,       // 是否送优惠券
+            is_give_goods: false,        // 是否送赠品
+            is_give_balance: false,        // 是否送余额
+            discount_type: 1,
+            discount_money: '', // 优惠金额
+            point: "", // 积分
+            balance: "", // 余额
+            goods_ids: [],
+            goods: [],
+            couponIds: [],
+            coupon: [],
+        },
+    ],
+    manjian_time: [start_time, end_time]
 })
 
-const formData: Record<string, any> = reactive({ ...initialFormData })
+const formData: Record<string, any> = reactive({...initialFormData})
 const formRef = ref<FormInstance>()
 const formRules = computed(() => {
-  const rules = {
-    manjian_name: [
-      { required: true, message: t('namePlaceholder'), trigger: 'blur' },
-    ],
-    manjian_time: [
-      { required: true, validator: receiveTime, trigger: 'change' },
-    ],
-    goods_data: [
-      {
-        required: true,
-        trigger: 'blur',
-        validator: (rule: any, value: any, callback: any) => {
-          if (formData.goods_type != 'all_goods') {
-            if (formData.goods_data.length == 0) {
-              callback(new Error(t('goodsJsonEmpty')))
-            } else {
-              callback()
+    const rules = {
+        manjian_name: [
+            { required: true, message: t('namePlaceholder'), trigger: 'blur' },
+        ],
+        manjian_time: [
+            {required: true, validator: receiveTime, trigger: 'change'}
+        ],
+        goods_data: [
+            {
+                required: true,
+                trigger: 'blur',
+                validator: (rule: any, value: any, callback: any) => {
+                    if (formData.goods_type != 'all_goods') {
+                        if (formData.goods_data.length == 0) {
+                            callback(new Error(t('goodsJsonEmpty')))
+                        } else {
+                            callback()
+                        }
+                    }
+                }
             }
-          }
-        },
-      },
-    ],
-  }
+        ],
+    };
 
-  return rules
-})
+    return rules;
+});
 
 const receiveTime = (rule: any, value: any, callback: any) => {
-  if (
-    !formData.manjian_time ||
-    (formData.manjian_time &&
-      !formData.manjian_time[0] &&
-      !formData.manjian_time[1])
-  ) {
-    callback(new Error(t('selectActivityTime')))
-  } else if (!formData.manjian_time[0]) {
-    callback(new Error(t('selectActivityStartTime')))
-  } else if (!formData.manjian_time[1]) {
-    callback(new Error(t('selectActivityEndTime')))
-  } else if (formData.manjian_time[1] <= formData.manjian_time[0]) {
-    callback(new Error(t('selectActivityTimeTips')))
-  }
+    if (!formData.manjian_time || (formData.manjian_time && !formData.manjian_time[0] && !formData.manjian_time[1])) {
+        callback(new Error(t('selectActivityTime')))
+    } else if (!formData.manjian_time[0]) {
+        callback(new Error(t('selectActivityStartTime')))
+    } else if (!formData.manjian_time[1]) {
+        callback(new Error(t('selectActivityEndTime')))
+    } else if (formData.manjian_time[1] <= formData.manjian_time[0]) {
+        callback(new Error(t('selectActivityTimeTips')))
+    }
 
-  callback()
+    callback()
 }
 
 // 添加优惠设置
 const addSetting = () => {
-  if (formData.rule_json.length >= 5) {
-    ElMessage.error(t('addLevelLimit'))
-    return
-  }
-  formData.rule_json.push({
-    limit: '', // 优惠门槛
-    is_discount: false, // 是否订单金额优惠
-    is_free_shipping: false, // 是否包邮
-    is_give_point: false, // 是否送积分
-    is_give_coupon: false, // 是否送优惠券
-    is_give_goods: false, // 是否送赠品
-    is_give_balance: false, // 是否送余额
-    discount_type: 1,
-    discount_money: '', // 优惠金额
-    point: '', // 积分
-    balance: '', // 余额
-    goods_ids: [],
-    goods: [],
-    couponIds: [],
-    coupon: [],
-  })
-}
+    if (formData.rule_json.length >= 5) {
+    ElMessage.error(t("addLevelLimit"));
+    return;
+    }
+    formData.rule_json.push({
+        limit: "", // 优惠门槛
+        is_discount: false,          // 是否订单金额优惠
+        is_free_shipping: false,     // 是否包邮
+        is_give_point: false,        // 是否送积分
+        is_give_coupon: false,       // 是否送优惠券
+        is_give_goods: false,        // 是否送赠品
+        is_give_balance: false,        // 是否送余额
+        discount_type:1,
+        discount_money: '', // 优惠金额
+        point: "", // 积分
+        balance: "", // 余额
+        goods_ids: [],
+        goods: [],
+        couponIds: [],
+        coupon: [],
+    });
+};
 
 // 正则表达式
 const regExp: any = {
-  required: /[\S]+/,
-  number: /^\d{0,10}$/,
-  digit: /^\d{0,10}(.?\d{0,2})$/,
-  special: /^\d{0,10}(.?\d{0,3})$/,
+    required: /[\S]+/,
+    number: /^\d{0,10}$/,
+    digit: /^\d{0,10}(.?\d{0,2})$/,
+    special: /^\d{0,10}(.?\d{0,3})$/
 }
 
 // 删除优惠设置
 const removeSetting = (index: number) => {
-  formData.rule_json.splice(index, 1)
-}
+    formData.rule_json.splice(index, 1);
+};
 const levelSelectData = ref([])
 const labelSelectData = ref([])
 const disableSubmit = ref(false)
 const getInfo = () => {
-  // 获取全部标签
-  getMemberLabelAll().then(({ data }) => {
-    labelSelectData.value = data
-  })
 
-  getMemberLevelAll().then(({ data }) => {
-    levelSelectData.value = data
-  })
+    // 获取全部标签
+    getMemberLabelAll().then(({ data }) => {
+        labelSelectData.value = data
+    })
 
-  if (id) {
-    disableSubmit.value = true
-    loading.value = true
-    const data = {
-      manjian_id: id,
-    }
-    getManjianInfo(data).then((res) => {
-      const data = res.data.manjian_info
-      formData.goods_data = res.data.manjian_goods
-      formData.goods_ids.splice(0, formData.goods_ids.length)
-      formData.goods_data.forEach((item: any) => {
-        formData.goods_ids.push(item.sku_id)
-      })
-      Object.assign(formData, data)
-      formData.manjian_time = [data.start_time, data.end_time]
-      loading.value = false
+    getMemberLevelAll().then(({ data }) => {
+        levelSelectData.value = data
     })
-  }
+
+    if(id){
+        disableSubmit.value = true
+        loading.value = true
+        const data = {
+            manjian_id: id
+        }
+        getManjianInfo(data).then((res)=>{
+            const data = res.data.manjian_info;
+            formData.goods_data =res.data.manjian_goods;
+            formData.goods_ids.splice(0, formData.goods_ids.length);
+            formData.goods_data.forEach((item: any) => {
+                formData.goods_ids.push( item.sku_id)
+             })
+            Object.assign(formData, data);
+            formData.manjian_time = [data.start_time, data.end_time]
+            loading.value = false;
+        })
+    }
+
 }
 
 getInfo()
 
 // 删除商品
 const deleteGoodsEvent = (row: any, index: any) => {
-  formData.goods_data.splice(index, 1)
-  formData.goods_ids.splice(formData.goods_ids.indexOf(row.sku_id), 1)
-}
+    formData.goods_data.splice(index, 1);
+    formData.goods_ids.splice(formData.goods_ids.indexOf(row.sku_id), 1);
+};
 // 删除赠品
 const deleteGoodsEvents = (row: any, levelIndex: number) => {
-  const rule = formData.rule_json[levelIndex]
-  const goodsIndex = rule.goods.findIndex((el: any) => el.sku_id === row.sku_id)
-  if (goodsIndex !== -1) {
-    rule.goods.splice(goodsIndex, 1)
-  }
+    const rule = formData.rule_json[levelIndex];
+    const goodsIndex = rule.goods.findIndex((el: any) => el.sku_id === row.sku_id);
+    if (goodsIndex !== -1) {
+        rule.goods.splice(goodsIndex, 1);
+    }
 
-  const goodsIdIndex = rule.goods_ids.indexOf(row.sku_id)
-  if (goodsIdIndex !== -1) {
-    rule.goods_ids.splice(goodsIdIndex, 1)
-  }
-}
+    const goodsIdIndex = rule.goods_ids.indexOf(row.sku_id);
+    if (goodsIdIndex !== -1) {
+        rule.goods_ids.splice(goodsIdIndex, 1);
+    }
+};
 // 删除优惠券
 const deleteCouponEvents = (row: any, levelIndex: number) => {
-  const rule = formData.rule_json[levelIndex]
-  const couponsIndex = rule.coupon.findIndex(
-    (el: any) => el.coupon_id === row.coupon_id
-  )
-  if (couponsIndex !== -1) {
-    rule.coupon.splice(couponsIndex, 1)
-  }
+    const rule = formData.rule_json[levelIndex];
+    const couponsIndex = rule.coupon.findIndex((el: any) => el.coupon_id === row.coupon_id);
+    if (couponsIndex !== -1) {
+        rule.coupon.splice(couponsIndex, 1);
+    }
 
-  const couponsIdIndex = rule.couponIds.indexOf(row.coupon_id)
-  if (couponsIndex !== -1) {
-    rule.couponIds.splice(couponsIdIndex, 1)
-  }
-}
+    const couponsIdIndex = rule.couponIds.indexOf(row.coupon_id);
+    if (couponsIndex !== -1) {
+        rule.couponIds.splice(couponsIdIndex, 1);
+    }
+};
 
 //选择商品
 const goodsSelect = (value: any) => {
-  let arr = []
-  for (let key in value) {
-    let goods_sku: any = value[key]
-    let sku: any = {
-      goods_id: goods_sku.goods_id,
-      sku_id: goods_sku.sku_id,
-      goods_type_name: goods_sku.goods_type_name,
-      price: goods_sku.price,
-      sku_image: goods_sku.sku_image,
-      goods_name: goods_sku.goods_name,
-      sku_name: goods_sku.sku_name,
-      stock: goods_sku.stock,
-    }
+    let arr = [];
+    for (let key in value) {
+        let goods_sku: any = value[key];
+        let sku: any = {
+            goods_id: goods_sku.goods_id,
+            sku_id: goods_sku.sku_id,
+            goods_type_name: goods_sku.goods_type_name,
+            price: goods_sku.price,
+            sku_image: goods_sku.sku_image,
+            goods_name: goods_sku.goods_name,
+            sku_name: goods_sku.sku_name,
+            stock: goods_sku.stock,
+        };
+
+        if (formData.goods_data.length) {
+            formData.goods_data.forEach((el: any) => {
+                if (el.sku_id == sku.sku_id) {
+                    sku = Object.assign(sku, el)
+                }
+            })
 
-    if (formData.goods_data.length) {
-      formData.goods_data.forEach((el: any) => {
-        if (el.sku_id == sku.sku_id) {
-          sku = Object.assign(sku, el)
         }
-      })
+        arr.push(deepClone(sku))
     }
-    arr.push(deepClone(sku))
-  }
 
-  formData.goods_data = arr
+    formData.goods_data = arr;
 
-  let data = {
-    manjian_id: id ? Number(id) : '',
-    goods_ids: formData.goods_data.map((el: any) => el.goods_id),
-    goods_type: formData.goods_type,
-    start_time: formData.manjian_time[0]
-      ? formData.manjian_time[0]
-      : start_time,
-    end_time: formData.manjian_time[1] ? formData.manjian_time[1] : end_time,
-  }
-  goodsCheck(data).then((res: any) => {
-    if (res.data.code == -1) {
-      ElMessage({
-        message: t('goodOnlyOne'),
-        type: 'error',
-      })
+    let data = {
+        manjian_id: id ? Number(id) : "",
+        goods_ids: formData.goods_data.map((el: any) => el.goods_id),
+        goods_type: formData.goods_type,
+        start_time: formData.manjian_time[0] ? formData.manjian_time[0] : start_time,
+        end_time: formData.manjian_time[1] ? formData.manjian_time[1] : end_time
     }
-    const errorList = res.data.data
-    formData.goods_data.forEach((item: any) => {
-      const error = errorList.find((err) => err.goods_id === item.goods_id)
-      if (error) {
-        item.error_msg = error.error_msg
-      }
+    goodsCheck(data).then((res: any) => {
+        if (res.data.code == -1) {
+            ElMessage({
+                message: t("goodOnlyOne"),
+                type: "error",
+            });
+        }
+        const errorList = res.data.data;
+        formData.goods_data.forEach((item: any) => {
+            const error = errorList.find((err) => err.goods_id === item.goods_id);
+            if (error) {
+                item.error_msg = error.error_msg;
+            }
+        })
+
     })
-  })
-}
+};
 
 //选择赠品
 const goodsSelects = (value: any, levelIndex: number) => {
-  const rule = formData.rule_json[levelIndex]
-  let arr = []
-  for (let key in value) {
-    let goods_sku: any = value[key]
-    let sku: any = {
-      goods_id: goods_sku.goods_id,
-      sku_id: goods_sku.sku_id,
-      goods_type_name: goods_sku.goods_type_name,
-      price: goods_sku.price,
-      sku_image: goods_sku.sku_image,
-      goods_name: goods_sku.goods_name,
-      sku_name: goods_sku.sku_name,
-      stock: goods_sku.stock,
-      num: 1,
-    }
-    if (rule.goods.length) {
-      rule.goods.forEach((el: any) => {
-        if (el.sku_id == sku.sku_id) {
-          sku = Object.assign(sku, el)
+    const rule = formData.rule_json[levelIndex];
+    let arr = [];
+    for (let key in value) {
+        let goods_sku: any = value[key];
+        let sku: any = {
+            goods_id: goods_sku.goods_id,
+            sku_id: goods_sku.sku_id,
+            goods_type_name: goods_sku.goods_type_name,
+            price: goods_sku.price,
+            sku_image: goods_sku.sku_image,
+            goods_name: goods_sku.goods_name,
+            sku_name: goods_sku.sku_name,
+            stock: goods_sku.stock,
+            num: 1
+        };
+        if (rule.goods.length) {
+            rule.goods.forEach((el: any) => {
+                if (el.sku_id == sku.sku_id) {
+                    sku = Object.assign(sku, el)
+                }
+            })
+
         }
-      })
+        arr.push(deepClone(sku))
     }
-    arr.push(deepClone(sku))
-  }
 
-  rule.goods = arr
-}
+    rule.goods = arr;
+};
 
 // 选择优惠券
 const couponSelect = (selectedCoupons: any, levelIndex: number) => {
-  const rule = formData.rule_json[levelIndex]
-  let arr = []
-  for (let key in selectedCoupons) {
-    let coupons: any = selectedCoupons[key]
-    let coupon: any = {
-      price: coupons.price,
-      title: coupons.title,
-      type_name: coupons.type_name,
-      coupon_id: coupons.id,
-      num: 1,
-    }
-
-    if (rule.coupon.length) {
-      rule.coupon.forEach((el: any) => {
-        if (el.coupon_id == coupon.coupon_id) {
-          coupon = Object.assign(coupon, el)
+    const rule = formData.rule_json[levelIndex];
+    let arr = [];
+    for (let key in selectedCoupons) {
+        let coupons: any = selectedCoupons[key];
+        let coupon: any = {
+            price: coupons.price,
+            title: coupons.title,
+            type_name: coupons.type_name,
+            coupon_id: coupons.id,
+            num:1
+        };
+
+        if (rule.coupon.length) {
+            rule.coupon.forEach((el: any) => {
+            if (el.coupon_id == coupon.coupon_id) {
+                coupon = Object.assign(coupon, el)
+            }
+        })
         }
-      })
+        arr.push(deepClone(coupon))
     }
-    arr.push(deepClone(coupon))
-  }
-  rule.coupon = arr
+    rule.coupon = arr;
+
 }
 
 const onSave = async () => {
-  // 防止失败丢失
-  const originalRuleJson = JSON.parse(JSON.stringify(formData.rule_json))
-  const originalGoodsData = JSON.parse(JSON.stringify(formData.goods_data))
-
-  // 校验每个层级的优惠内容
-  const hasInvalidRule = formData.rule_json.some(
-    (level: any, index: number) => {
-      const noDiscount =
-        !level.is_discount &&
-        !level.is_free_shipping &&
-        !level.is_give_point &&
-        !level.is_give_coupon &&
-        !level.is_give_goods &&
-        !level.is_give_balance
-
-      if (noDiscount) {
-        ElMessage.error(t(`第 ${index + 1} 层级的优惠内容至少选择一项`))
-        return true
-      }
-      return false
-    }
-  )
-  if (hasInvalidRule) {
-    return
-  }
-  await formRef.value?.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      formData.start_time = formData.manjian_time[0]
-      formData.end_time = formData.manjian_time[1]
-      formData.rule_json.forEach((rule: any) => {
-        if (rule.goods) {
-          rule.goods = rule.goods.map((item: any) => {
-            return {
-              ...item,
-              num: item.num,
-            }
-          })
-        }
-        if (rule.coupon) {
-          rule.coupon = rule.coupon.map((item: any) => {
-            return {
-              ...item,
-              num: item.num,
-            }
-          })
+    // 防止失败丢失
+    const originalRuleJson = JSON.parse(JSON.stringify(formData.rule_json));
+    const originalGoodsData = JSON.parse(JSON.stringify(formData.goods_data));
+
+    // 校验每个层级的优惠内容
+    const hasInvalidRule = formData.rule_json.some((level: any, index: number) => {
+        const noDiscount =
+            !level.is_discount &&
+            !level.is_free_shipping &&
+            !level.is_give_point &&
+            !level.is_give_coupon &&
+            !level.is_give_goods &&
+            !level.is_give_balance;
+
+        if (noDiscount) {
+            ElMessage.error(t(`第 ${ index + 1 } 层级的优惠内容至少选择一项`));
+            return true;
         }
-      })
-      if (id) {
-        formData.id = id
-        editManjian(formData)
-          .then((res) => {
-            if (res.data.code == 1) {
-              loading.value = false
-              back()
-              ElMessage({
-                message: t('updateSuccess'),
-                type: 'success',
-              })
-            } else {
-              loading.value = false
-              ElMessage({
-                message: t('goodOnlyOne'),
-                type: 'error',
-              })
-            }
-          })
-          .catch(() => {
-            formData.rule_json = originalRuleJson
-            formData.goods_data = originalGoodsData
-            loading.value = false
-          })
-      } else {
-        addManjian(formData)
-          .then((res) => {
-            if (res.data.code == 1) {
-              loading.value = false
-              back()
-              ElMessage({
-                message: t('addSuccess'),
-                type: 'success',
-              })
+        return false;
+    });
+    if (hasInvalidRule) {
+        return;
+    }
+    await formRef.value?.validate(async(valid) => {
+        if (valid) {
+            loading.value = true
+            formData.start_time = formData.manjian_time[0];
+            formData.end_time = formData.manjian_time[1];
+            formData.rule_json.forEach((rule: any) => {
+                if (rule.goods) {
+                    rule.goods = rule.goods.map((item: any) => {
+                        return {
+                            ...item,
+                            num: item.num,
+                        };
+                    });
+                }
+                if (rule.coupon) {
+                    rule.coupon = rule.coupon.map((item: any) => {
+                        return {
+                            ...item,
+                            num: item.num,
+                        };
+                    });
+                }
+            });
+            if (id) {
+                formData.id = id;
+                editManjian(formData).then((res) => {
+                    if (res.data.code == 1) {
+                        loading.value = false;
+                        back()
+                        ElMessage({
+                            message: t("updateSuccess"),
+                            type: "success",
+                        });
+                    } else {
+                        loading.value = false;
+                        ElMessage({
+                            message: t("goodOnlyOne"),
+                            type: "error",
+                        });
+                    }
+                }).catch(() => {
+                    formData.rule_json = originalRuleJson;
+                    formData.goods_data = originalGoodsData;
+                    loading.value = false;
+                });
             } else {
-              loading.value = false
-              ElMessage({
-                message: t('goodOnlyOne'),
-                type: 'error',
-              })
+                addManjian(formData).then((res) => {
+                    if (res.data.code == 1) {
+                        loading.value = false;
+                        back()
+                        ElMessage({
+                            message: t("addSuccess"),
+                            type: "success",
+                        });
+                    } else {
+                        loading.value = false;
+                        ElMessage({
+                            message: t("goodOnlyOne"),
+                            type: "error",
+                        });
+                    }
+                }).catch(() => {
+                    formData.rule_json = originalRuleJson;
+                    formData.goods_data = originalGoodsData;
+                    loading.value = false;
+                });
             }
-          })
-          .catch(() => {
-            formData.rule_json = originalRuleJson
-            formData.goods_data = originalGoodsData
-            loading.value = false
-          })
-      }
-    } else {
-      var iserror = document.getElementsByClassName('is-error')[0]
-      iserror.scrollIntoView()
-    }
-  })
-}
+        }else{
+            var iserror = document.getElementsByClassName('is-error')[0]
+            iserror.scrollIntoView()
+        }
+    });
+};
 
 const back = () => {
-  router.push('/shop/marketing/manjian/list')
+    router.push('/shop/marketing/manjian/list')
 }
+
 </script>
 
 <style lang="scss" scoped>
-.activity-level {
-  width: 100%;
+.activity-level{
+    width: 100%;
 }
-.input-width-short {
+.input-width-short{
   width: 120px;
 }
-.level-header {
-  background-color: #f5f5f5;
-  display: flex;
-  padding-left: 10px;
-  justify-content: space-between;
+.level-header{
+    background-color: #f5f5f5;
+    display: flex;
+    padding-left: 10px;
+    justify-content: space-between;
 }
-.level-section {
-  margin-bottom: 10px;
-  margin-top: 10px;
+.level-section{
+    margin-bottom: 10px;
+    margin-top: 10px;
 }
 .vertical-checkbox-group {
-  margin-left: 10px;
+    margin-left: 10px;
 }
-.condition-item:first-child {
-  margin-top: 3px;
+.condition-item:first-child{
+    margin-top: 3px;
 }
-.condition-item {
-  margin-top: 8px;
+.condition-item{
+    margin-top: 8px;
 }
-.dynamic-content {
-  margin: 5px 20px;
+.dynamic-content{
+    margin: 5px 20px;
 }
 .sku_list :deep(.cell) {
-  // min-height: 35px !important;
-  overflow: initial !important;
+    // min-height: 35px !important;
+    overflow: initial !important;
 }
-.sku_list :deep(.el-form-item__error) {
-  padding-top: 6px;
-  left: 2px;
+.sku_list :deep(.el-form-item__error ) {
+    padding-top: 6px;
+    left: 2px;
 }
 </style>
diff --git a/admin/src/addon/shop/views/marketing/manjian/list.vue b/admin/src/addon/shop/views/marketing/manjian/list.vue
index f9fe7ca8..ae63d5e6 100644
--- a/admin/src/addon/shop/views/marketing/manjian/list.vue
+++ b/admin/src/addon/shop/views/marketing/manjian/list.vue
@@ -1,415 +1,294 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-        <el-button type="primary" @click="handleChange">{{
-          t('addFullDiscountBonus')
-        }}</el-button>
-      </div>
+    <div class="main-container">
+      <el-card class="box-card !border-none" shadow="never">
+        <div class="flex justify-between items-center">
+            <span class="text-page-title">{{ pageName }}</span>
+            <el-button type="primary" @click="handleChange">{{ t("addFullDiscountBonus") }}</el-button>
+        </div>
 
-      <!-- 搜索 -->
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="tableData.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('name')" prop="manjian_name">
-            <el-input
-              v-model.trim="tableData.searchParam.manjian_name"
-              :placeholder="t('namePlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-form-item :label="t('activityTime')" prop="create_time">
-              <el-date-picker
-                v-model="tableData.searchParam.create_time"
-                type="datetimerange"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                :start-placeholder="t('startDate')"
-                :end-placeholder="t('endDate')"
-              />
-            </el-form-item>
-            <el-button type="primary" @click="loadManjianList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
+        <!-- 搜索 -->
+        <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+            <el-form :inline="true" :model="tableData.searchParam" ref="searchFormRef">
+                <el-form-item :label="t('name')" prop="manjian_name">
+                    <el-input v-model.trim="tableData.searchParam.manjian_name" :placeholder="t('namePlaceholder')" />
+                </el-form-item>
+                <el-form-item>
+                <el-form-item :label="t('activityTime')" prop="create_time">
+				    <el-date-picker v-model="tableData.searchParam.create_time" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+			    </el-form-item>
+                <el-button type="primary" @click="loadManjianList()">{{ t("search") }}</el-button>
+                <el-button @click="resetForm(searchFormRef)">{{ t("reset") }}</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
 
-      <!-- 列表 -->
-      <div>
-        <el-tabs
-          v-model="tableData.searchParam.status"
-          class="goods-tabs"
-          @tab-click="tabHandleClick"
-        >
-          <el-tab-pane :label="t('all')" name=""></el-tab-pane>
-          <el-tab-pane
-            v-for="(label, value) in statusList"
-            :key="value"
-            :label="label"
-            :name="value"
-          ></el-tab-pane>
-        </el-tabs>
-        <div class="mb-[10px] flex items-center" v-if="status">
-          <el-checkbox
-            v-model="toggleCheckbox"
-            size="large"
-            class="px-[14px]"
-            @change="toggleChange"
-            :indeterminate="isIndeterminate"
-          />
-          <el-button
-            @click="batchDeleteManjianFn"
-            v-if="status == 0 || status == 2 || status == -1"
-            size="small"
-            >{{ t('batchDelete') }}</el-button
-          >
-          <el-button
-            @click="batchCloseManjianFn"
-            v-if="status == 1"
-            size="small"
-            >{{ t('batchClose') }}</el-button
-          >
-        </div>
-        <el-table
-          :data="tableData.data"
-          size="large"
-          v-loading="tableData.loading"
-          ref="goodBankListTableRef"
-          @selection-change="handleSelectionChange"
-        >
-          <template #empty>
-            <span>{{ !tableData.loading ? t('emptyData') : '' }}</span>
-          </template>
-          <el-table-column type="selection" width="55" />
-          <el-table-column
-            prop="manjian_name"
-            :label="t('name')"
-            min-width="130"
-          />
-          <el-table-column
-            prop="status_name"
-            :label="t('status')"
-            min-width="130"
-          />
-          <el-table-column
-            prop="total_order_num"
-            :label="t('activeOrderNum')"
-            min-width="130"
-          />
-          <el-table-column
-            prop="total_order_money"
-            :label="t('activeOrderMoney')"
-            min-width="130"
-          />
-          <el-table-column
-            prop="total_member_num"
-            :label="t('activeMemberNum')"
-            min-width="130"
-          />
-          <el-table-column :label="t('activityTime')" min-width="150">
-            <template #default="{ row }">
-              <div>
-                <p>开始：{{ row.start_time }}</p>
-                <p>结束：{{ row.end_time }}</p>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            :label="t('operation')"
-            fixed="right"
-            align="right"
-            min-width="120"
-          >
-            <template #default="{ row }">
-              <el-button
-                v-if="row.status != '-1' || row.status != '2'"
-                type="primary"
-                link
-                @click="editEvent(row)"
-                >{{ t('edit') }}</el-button
-              >
-              <el-button
-                type="primary"
-                link
-                @click="detailEvent(row.manjian_id)"
-                >{{ t('detail') }}</el-button
-              >
-              <el-button
-                v-if="row.status == '1'"
-                type="primary"
-                link
-                @click="closeEvent(row.manjian_id)"
-                >{{ t('close') }}</el-button
-              >
-              <el-button
-                v-if="row.status != '1'"
-                type="primary"
-                link
-                @click="deleteEvent(row.manjian_id)"
-                >{{ t('delete') }}</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="tableData.page"
-            v-model:page-size="tableData.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="tableData.total"
-            @size-change="loadManjianList()"
-            @current-change="loadManjianList"
-          />
+        <!-- 列表 -->
+        <div>
+            <el-tabs v-model="tableData.searchParam.status" class="goods-tabs" @tab-click="tabHandleClick">
+                <el-tab-pane :label="t('all')" name=""></el-tab-pane>
+                <el-tab-pane v-for="(label, value) in statusList" :key="value" :label="label" :name="value"></el-tab-pane>
+            </el-tabs>
+            <div class="mb-[10px] flex items-center" v-if="status">
+                <el-checkbox v-model="toggleCheckbox" size="large" class="px-[14px]" @change="toggleChange" :indeterminate="isIndeterminate" />
+                <el-button @click="batchDeleteManjianFn" v-if="status ==0||status ==2 ||status ==-1" size="small">{{t("batchDelete")}}</el-button>
+                <el-button @click="batchCloseManjianFn"  v-if="status==1" size="small">{{t("batchClose")}}</el-button>
+            </div>
+            <el-table :data="tableData.data" size="large" v-loading="tableData.loading" ref="goodBankListTableRef" @selection-change="handleSelectionChange">
+                <template #empty>
+                    <span>{{ !tableData.loading ? t("emptyData") : "" }}</span>
+                </template>
+                <el-table-column type="selection" width="55" />
+                <el-table-column prop="manjian_name" :label="t('name')" min-width="130" />
+                <el-table-column prop="status_name" :label="t('status')" min-width="130" />
+                <el-table-column prop="total_order_num" :label="t('activeOrderNum')" min-width="130" />
+                <el-table-column prop="total_order_money" :label="t('activeOrderMoney')" min-width="130" />
+                <el-table-column prop="total_member_num" :label="t('activeMemberNum')" min-width="130" />
+                <el-table-column :label="t('activityTime')"  min-width="150">
+                    <template #default="{ row }">
+                        <div>
+                            <p>开始：{{ row.start_time }}</p>
+                            <p>结束：{{ row.end_time }}</p>
+                        </div>
+                    </template>
+                </el-table-column>
+                <el-table-column :label="t('operation')" fixed="right" align="right" min-width="120">
+                    <template #default="{ row }">
+                        <el-button v-if="row.status!='-1'|| row.status!='2'" type="primary" link @click="editEvent(row)">{{t("edit")}}</el-button>
+                        <el-button type="primary" link @click="detailEvent(row.manjian_id)">{{ t('detail') }}</el-button>
+                        <el-button v-if="row.status=='1'" type="primary" link @click="closeEvent(row.manjian_id)">{{ t('close') }}</el-button>
+                        <el-button v-if="row.status!='1'" type="primary" link @click="deleteEvent(row.manjian_id)">{{ t("delete") }}</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <div class="mt-[16px] flex justify-end">
+                <el-pagination v-model:current-page="tableData.page" v-model:page-size="tableData.limit" layout="total, sizes, prev, pager, next, jumper" :total="tableData.total" @size-change="loadManjianList()" @current-change="loadManjianList" />
+            </div>
         </div>
-      </div>
-    </el-card>
-    <manjian-detail ref="manjianDetailDialog"></manjian-detail>
-  </div>
-</template>
+      </el-card>
+      <manjian-detail ref="manjianDetailDialog"></manjian-detail>
+    </div>
+  </template>
 <script lang="ts" setup>
 // 添加满减送活动
-import { ref, reactive } from 'vue'
-import { t } from '@/lang'
-import { useRoute, useRouter } from 'vue-router'
-import {
-  closeManjian,
-  deleteManjian,
-  getManjianList,
-  getManjianStatusList,
-  batchCloseMajian,
-  batchDeleteManjian,
-} from '@/addon/shop/api/marketing'
-import { FormInstance, ElMessageBox, ElMessage } from 'element-plus'
+import { ref, reactive } from "vue";
+import {t} from "@/lang";
+import { useRoute, useRouter } from "vue-router";
+import {closeManjian, deleteManjian,getManjianList,getManjianStatusList,batchCloseMajian,batchDeleteManjian} from "@/addon/shop/api/marketing";
+import { FormInstance, ElMessageBox,ElMessage } from "element-plus";
 import manjianDetail from '@/addon/shop/views/marketing/manjian/detail.vue'
-import { setTablePageStorage, getTablePageStorage } from '@/utils/common'
+import { setTablePageStorage,getTablePageStorage } from "@/utils/common";
 
-const router = useRouter()
-const route = useRoute()
-const pageName = route.meta.title
-const repeat = ref(false)
-const searchFormRef = ref<FormInstance>()
+const router = useRouter();
+const route = useRoute();
+const pageName = route.meta.title;
+const repeat = ref(false);
+const searchFormRef = ref<FormInstance>();
 // 表单内容
 const tableData = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: false,
-  data: [],
-  searchParam: {
-    create_time: [],
-    manjian_name: '',
-    status: route.query.status || '',
-  },
-})
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: false,
+    data: [],
+    searchParam: {
+        create_time: [],
+        manjian_name: "",
+        status: route.query.status || '',
+    },
+});
 const status = ref()
 
 // 当前选中tab页面
 const tabHandleClick = (tab: any, event: Event) => {
-  tableData.searchParam.status = tab.props.name
-  status.value = tab.props.name
-  loadManjianList()
+    tableData.searchParam.status = tab.props.name
+    status.value = tab.props.name
+    loadManjianList()
 }
 
 // 获取列表
 const loadManjianList = (page: number = 1) => {
-  tableData.loading = true
-  tableData.page = page
+   tableData.loading = true;
+   tableData.page = page;
 
-  getManjianList({
-    page: tableData.page,
-    limit: tableData.limit,
-    ...tableData.searchParam,
-  })
-    .then((res) => {
-      tableData.loading = false
-      tableData.data = res.data.data
-      tableData.total = res.data.total
-      setTablePageStorage(
-        tableData.page,
-        tableData.limit,
-        tableData.searchParam
-      )
-    })
-    .catch(() => {
-      tableData.loading = false
-    })
-}
+    getManjianList({
+        page: tableData.page,
+        limit: tableData.limit,
+        ...tableData.searchParam,
+    }).then((res) => {
+        tableData.loading = false;
+        tableData.data = res.data.data;
+        tableData.total = res.data.total;
+        setTablePageStorage(tableData.page, tableData.limit, tableData.searchParam);
+    }).catch(() => {
+        tableData.loading = false;
+    });
+};
 
-loadManjianList(getTablePageStorage(tableData.searchParam).page)
+loadManjianList(getTablePageStorage(tableData.searchParam).page);
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadManjianList()
-}
+    if (!formEl) return;
+    formEl.resetFields();
+    loadManjianList();
+};
 
 const handleChange = () => {
-  router.push('/shop/marketing/manjian/edit')
+    router.push('/shop/marketing/manjian/edit')
 }
 
 const statusList = ref<{ [key: string]: string }>({})
 const getManjianStatusListFn = () => {
-  getManjianStatusList().then((res) => {
-    statusList.value = res.data
-  })
+    getManjianStatusList().then((res) => {
+        statusList.value= res.data;
+    })
 }
 
 getManjianStatusListFn()
 //编辑满减送活动
 const editEvent = (data: any) => {
-  router.push('/shop/marketing/manjian/edit?id=' + data.manjian_id)
+    router.push('/shop/marketing/manjian/edit?id='+data.manjian_id)
 }
 
 //详情
 const manjianDetailDialog: Record<string, any> | null = ref(null)
-const detailEvent = (id: number) => {
-  let data = { id: id }
-  manjianDetailDialog.value.setFormData(data)
-  manjianDetailDialog.value.showDialog = true
+const detailEvent=(id:number)=>{
+    let data = {id: id};
+    manjianDetailDialog.value.setFormData(data);
+    manjianDetailDialog.value.showDialog = true;
 }
 // 批量复选框
-const toggleCheckbox = ref()
+const toggleCheckbox = ref();
 
 // 复选框中间状态
-const isIndeterminate = ref(false)
+const isIndeterminate = ref(false);
 
 // 监听批量复选框事件
 const toggleChange = (value: any) => {
-  isIndeterminate.value = false
-  goodBankListTableRef.value.toggleAllSelection()
-}
+    isIndeterminate.value = false;
+    goodBankListTableRef.value.toggleAllSelection();
+};
 
-const goodBankListTableRef = ref()
+const goodBankListTableRef = ref();
 
 // 选中数据
-const multipleSelection: any = ref([])
+const multipleSelection: any = ref([]);
 
 // 监听表格单行选中
 const handleSelectionChange = (val: []) => {
-  multipleSelection.value = val
+    multipleSelection.value = val;
 
-  toggleCheckbox.value = false
-  if (
-    multipleSelection.value.length > 0 &&
-    multipleSelection.value.length < tableData.data.length
-  ) {
-    isIndeterminate.value = true
-  } else {
-    isIndeterminate.value = false
-  }
+    toggleCheckbox.value = false;
+    if (
+        multipleSelection.value.length > 0 &&
+        multipleSelection.value.length < tableData.data.length
+    ) {
+        isIndeterminate.value = true;
+    } else {
+        isIndeterminate.value = false;
+    }
 
-  if (multipleSelection.value.length == tableData.data.length) {
-    toggleCheckbox.value = true
-  }
-}
+    if (multipleSelection.value.length == tableData.data.length) {
+        toggleCheckbox.value = true;
+    }
+};
 
 //关闭
-const closeEvent = (id: number) => {
-  ElMessageBox.confirm(t('closeTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    closeManjian(id)
-      .then(() => {
-        loadManjianList()
-      })
-      .catch(() => {})
-  })
+const closeEvent = (id:number)=>{
+    ElMessageBox.confirm(t('closeTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        closeManjian(id).then(() => {
+            loadManjianList()
+        }).catch(() => {
+        })
+    })
 }
 
 // 删除
-const deleteEvent = (id: number) => {
-  ElMessageBox.confirm(t('deleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    deleteManjian(id)
-      .then(() => {
-        loadManjianList()
-      })
-      .catch(() => {})
-  })
+const deleteEvent = (id:number) => {
+    ElMessageBox.confirm(t('deleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        deleteManjian(id).then(() => {
+            loadManjianList()
+        }).catch(() => {
+        })
+    })
 }
 
 // 批量删除
 const batchDeleteManjianFn = () => {
-  if (multipleSelection.value.length == 0) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('batchEmptySelectedActiveDeleteTips')}`,
-    })
-    return
-  }
+    if (multipleSelection.value.length == 0) {
+        ElMessage({
+            type: "warning",
+            message: `${ t("batchEmptySelectedActiveDeleteTips") }`,
+        });
+        return;
+    }
 
-  ElMessageBox.confirm(t('batchGoodsDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    if (repeat.value) return
-    repeat.value = true
+    ElMessageBox.confirm(t("batchGoodsDeleteTips"), t("warning"), {
+        confirmButtonText: t("confirm"),
+        cancelButtonText: t("cancel"),
+        type: "warning",
+    }).then(() => {
+        if (repeat.value) return;
+        repeat.value = true;
 
-    const manjian_id: any = []
-    multipleSelection.value.forEach((item: any) => {
-      manjian_id.push(item.manjian_id)
-    })
+        const manjian_id: any = [];
+        multipleSelection.value.forEach((item: any) => {
+            manjian_id.push(item.manjian_id);
+        });
 
-    batchDeleteManjian({ manjian_id })
-      .then(() => {
-        loadManjianList()
-        repeat.value = false
-      })
-      .catch(() => {
-        repeat.value = false
-      })
-  })
-}
+        batchDeleteManjian({ manjian_id }).then(() => {
+            loadManjianList();
+            repeat.value = false;
+        }).catch(() => {
+            repeat.value = false;
+        });
+    });
+};
 
 // 批量关闭
 const batchCloseManjianFn = () => {
-  if (multipleSelection.value.length == 0) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('batchEmptySelectedActiveCloseTips')}`,
-    })
-    return
-  }
+    if (multipleSelection.value.length == 0) {
+        ElMessage({
+            type: "warning",
+            message: `${ t("batchEmptySelectedActiveCloseTips") }`,
+        });
+        return;
+    }
 
-  ElMessageBox.confirm(t('batchGoodsCloseTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    if (repeat.value) return
-    repeat.value = true
+    ElMessageBox.confirm(t("batchGoodsCloseTips"), t("warning"), {
+        confirmButtonText: t("confirm"),
+        cancelButtonText: t("cancel"),
+        type: "warning",
+    }).then(() => {
+        if (repeat.value) return;
+        repeat.value = true;
 
-    const manjian_id: any = []
-    multipleSelection.value.forEach((item: any) => {
-      manjian_id.push(item.manjian_id)
-    })
+        const manjian_id: any = [];
+        multipleSelection.value.forEach((item: any) => {
+            manjian_id.push(item.manjian_id);
+        });
+
+        batchCloseMajian({ manjian_id }).then(() => {
+            loadManjianList();
+        repeat.value = false;
+        }).catch(() => {
+        repeat.value = false;
+        });
+    });
+};
 
-    batchCloseMajian({ manjian_id })
-      .then(() => {
-        loadManjianList()
-        repeat.value = false
-      })
-      .catch(() => {
-        repeat.value = false
-      })
-  })
-}
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
diff --git a/admin/src/addon/shop/views/marketing/newcomer/config.vue b/admin/src/addon/shop/views/marketing/newcomer/config.vue
index f9fb587b..9047afee 100644
--- a/admin/src/addon/shop/views/marketing/newcomer/config.vue
+++ b/admin/src/addon/shop/views/marketing/newcomer/config.vue
@@ -1,169 +1,86 @@
 <template>
   <div v-loading="loading">
-    <el-card class="box-card !border-none main-container" shadow="never">
-      <div class="flex justify-between items-center mb-[10px]">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
-      <!-- <el-tabs v-model="activeName">
+        <el-card class="box-card !border-none main-container" shadow="never">
+            <div class="flex justify-between items-center mb-[10px]">
+                <span class="text-page-title">{{ pageName }}</span>
+            </div>
+            <!-- <el-tabs v-model="activeName">
                 <el-tab-pane :label="t('basicInfoTab')" name="basic"> -->
-      <el-alert type="warning" :closable="false" class="!mb-[0px]">
-        <template #default>
-          <p class="mb-[5px]">
-            *
-            新人专享活动旨在通过专属优惠提升新老客户的转化率。达到参与门槛的用户可以享受特定商品的限时新人价优惠。
-          </p>
-          <p class="mb-[5px]">
-            * 每位用户限购1件新人专享商品，超出1件的部分将按正常价购买。
-          </p>
-          <p class="mb-[5px]">
-            * 订单支付成功后，将视为用户已参与过新人专享活动。
-          </p>
-          <p class="mb-[5px]">
-            *
-            若订单中的单个商品发生退款，用户将无法重新参与新人专享活动，只有当整个订单全部退货后，用户方可重新参与该活动。
-          </p>
-        </template>
-      </el-alert>
-      <el-form
-        :model="formData"
-        label-width="120px"
-        ref="formRef"
-        :rules="formRules"
-        class="page-form"
-      >
-        <el-card class="box-card !border-none" shadow="never">
-          <h3 class="panel-title !text-sm pl-[15px]">
-            {{ t('basicInfoTab') }}
-          </h3>
-          <el-form-item :label="t('activeStatus')">
-            <el-switch
-              v-model="formData.active_status"
-              active-value="active"
-              inactive-value="close"
-            />
-          </el-form-item>
-          <template v-if="formData.active_status === 'active'">
-            <el-form-item :label="t('participationWay')">
-              <el-radio-group v-model="formData.participation_way">
-                <el-radio label="never_order">{{ t('neverOrder') }}</el-radio>
-                <el-radio label="assign_time_order">{{
-                  t('assignTimeOrder')
-                }}</el-radio>
-                <el-radio label="assign_time_register">{{
-                  t('assignTimeRegister')
-                }}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-            <el-form-item
-              prop="appoint_time"
-              v-if="formData.participation_way != 'never_order'"
-            >
-              <div class="date-picker mr-[5px]">
-                <el-date-picker
-                  class="!w-[200px]"
-                  v-model="formData.appoint_time"
-                  value-format="YYYY-MM-DD HH:mm:ss"
-                  type="datetime"
-                />
-              </div>
-              <span v-if="formData.participation_way === 'assign_time_order'"
-                >之前未下过单的会员</span
-              >
-              <span v-else>之后注册的会员</span>
-            </el-form-item>
+                    <el-alert type="warning" :closable="false" class="!mb-[0px]">
+						<template #default>
+							<p class="mb-[5px]">* 新人专享活动旨在通过专属优惠提升新老客户的转化率。达到参与门槛的用户可以享受特定商品的限时新人价优惠。</p>
+							<p class="mb-[5px]">* 每位用户限购1件新人专享商品，超出1件的部分将按正常价购买。</p>
+							<p class="mb-[5px]">* 订单支付成功后，将视为用户已参与过新人专享活动。</p>
+							<p class="mb-[5px]">* 若订单中的单个商品发生退款，用户将无法重新参与新人专享活动，只有当整个订单全部退货后，用户方可重新参与该活动。</p>
+						</template>
+					</el-alert>
+                    <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form">
+                        <el-card class="box-card !border-none" shadow="never">
+                            <h3 class="panel-title !text-sm pl-[15px]">{{ t('basicInfoTab') }}</h3>
+                            <el-form-item :label="t('activeStatus')">
+                                <el-switch v-model="formData.active_status" active-value="active" inactive-value="close" />
+                            </el-form-item>
+                            <template v-if="formData.active_status==='active'">
+                                <el-form-item :label="t('participationWay')">
+                                    <el-radio-group v-model="formData.participation_way">
+                                        <el-radio label="never_order">{{ t('neverOrder') }}</el-radio>
+                                        <el-radio label="assign_time_order">{{ t('assignTimeOrder') }}</el-radio>
+                                        <el-radio label="assign_time_register">{{ t('assignTimeRegister') }}</el-radio>
+                                    </el-radio-group>
+                                </el-form-item>
+                                <el-form-item prop="appoint_time" v-if="formData.participation_way != 'never_order'">
+                                    <div class="date-picker mr-[5px]">
+                                        <el-date-picker class="!w-[200px]" v-model="formData.appoint_time" value-format="YYYY-MM-DD HH:mm:ss" type="datetime"/>
+                                    </div>
+                                    <span v-if="formData.participation_way === 'assign_time_order'">之前未下过单的会员</span>
+                                    <span v-else>之后注册的会员</span>
+                                </el-form-item>
 
-            <el-form-item :label="t('validityType')">
-              <el-radio-group v-model="formData.validity_type">
-                <el-radio label="day">{{ t('validityDay') }}</el-radio>
-                <el-radio label="date">{{ t('validityTime') }}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-            <el-form-item
-              prop="validity_day"
-              v-if="formData.validity_type === 'day'"
-            >
-              <span>{{ t('validityDayTipsLeft') }}</span>
-              <div class="flex items-center mx-[5px]">
-                <el-input
-                  v-model.trim="formData.validity_day"
-                  @keyup="filterNumber($event)"
-                  @blur="
-                    () => {
-                      if (formData.validity_day > 0)
-                        formData.validity_day = parseInt(formData.validity_day)
-                    }
-                  "
-                  clearable
-                  class="input-width-short"
-                  maxlength="3"
-                />
-              </div>
-              <span>{{ t('validityDayTipsRight') }}</span>
-              <div class="form-tip">{{ t('validityTimeTipsTwo') }}</div>
-            </el-form-item>
-            <el-form-item
-              prop="validity_time"
-              v-if="formData.validity_type === 'date'"
-            >
-              <span>{{ t('validityTimeTips') }}</span>
-              <div class="flex items-center px-[5px] w-[200px] date-picker">
-                <el-date-picker
-                  v-model="formData.validity_time"
-                  value-format="YYYY-MM-DD HH:mm:ss"
-                  type="datetime"
-                />
-              </div>
-              <div class="form-tip">{{ t('validityTimeTipsTwo') }}</div>
-            </el-form-item>
-            <el-form-item :label="t('activeDesc')">
-              <div class="flex">
-                <el-input
-                  v-model="formData.active_desc"
-                  :placeholder="t('activeDescPlaceholder')"
-                  type="textarea"
-                  maxlength="500"
-                  show-word-limit
-                  rows="5"
-                  class="!w-[400px]"
-                  clearable
-                />
-                <el-button
-                  class="ml-[20px]"
-                  type="primary"
-                  @click="defaultActiveDescEvent()"
-                  plain
-                  >{{ t('useDefaultActiveDesc') }}</el-button
-                >
-              </div>
-            </el-form-item>
-          </template>
-        </el-card>
-        <el-card
-          v-if="formData.active_status === 'active'"
-          class="box-card !border-none"
-          shadow="never"
-        >
-          <h3 class="panel-title !text-sm pl-[15px]">{{ t('bannerList') }}</h3>
-          <div v-for="(item, index) in formData.banner_list" :key="index">
-            <el-form-item
-              :label="t('image')"
-              :prop="`banner_list.${index}.imageUrl`"
-              :rules="[
-                {
-                  required: true,
-                  trigger: 'change',
-                  validator: (rule: any, value: any, callback: any) => {
-                    if (!value) {
-                      callback(t('imagePlaceholder'))
-                    }
-                    callback()
-                  },
-                },
-              ]"
-            >
-              <upload-image v-model="item.imageUrl" :limit="1" />
-            </el-form-item>
-            <!-- :prop="`banner_list.${index}.toLink.name`"  :rules="[{
+                                <el-form-item :label="t('validityType')">
+                                    <el-radio-group v-model="formData.validity_type">
+                                        <el-radio label="day">{{ t('validityDay') }}</el-radio>
+                                        <el-radio label="date">{{ t('validityTime') }}</el-radio>
+                                    </el-radio-group>
+                                </el-form-item>
+                                <el-form-item prop="validity_day" v-if="formData.validity_type==='day'">
+                                    <span>{{ t('validityDayTipsLeft') }}</span>
+                                    <div class="flex items-center mx-[5px]">
+                                        <el-input v-model.trim="formData.validity_day" @keyup="filterNumber($event)" @blur="()=>{if(formData.validity_day>0) formData.validity_day = parseInt(formData.validity_day)}" clearable class="input-width-short" maxlength="3" />
+                                    </div>
+                                    <span>{{ t('validityDayTipsRight') }}</span>
+                                    <div class="form-tip">{{ t('validityTimeTipsTwo') }}</div>
+                                </el-form-item>
+                                <el-form-item prop="validity_time" v-if="formData.validity_type==='date'">
+                                    <span>{{ t('validityTimeTips') }}</span>
+                                    <div class="flex items-center px-[5px] w-[200px] date-picker">
+                                        <el-date-picker v-model="formData.validity_time" value-format="YYYY-MM-DD HH:mm:ss" type="datetime" />
+                                    </div>
+                                    <div class="form-tip">{{ t('validityTimeTipsTwo') }}</div>
+                                </el-form-item>
+                                <el-form-item :label="t('activeDesc')">
+                                <div class="flex">
+                                    <el-input v-model="formData.active_desc" :placeholder="t('activeDescPlaceholder')" type="textarea" maxlength="500" show-word-limit rows="5" class="!w-[400px]" clearable />
+                                    <el-button class="ml-[20px]" type="primary" @click="defaultActiveDescEvent()" plain>{{ t('useDefaultActiveDesc') }}</el-button>
+                                </div>
+                            </el-form-item>
+                            </template>
+                        </el-card>
+                        <el-card v-if="formData.active_status==='active'" class="box-card !border-none" shadow="never">
+                            <h3 class="panel-title !text-sm pl-[15px]">{{ t('bannerList') }}</h3>
+                            <div v-for="(item,index) in formData.banner_list" :key="index">
+                                <el-form-item :label="t('image')" :prop="`banner_list.${index}.imageUrl`"  :rules="[{
+                                    required: true,
+                                    trigger: 'change',
+                                    validator: (rule: any, value: any, callback: any) => {
+                                        if (!value) {
+                                            callback(t('imagePlaceholder'))
+                                        }
+                                        callback()
+                                    }
+                                }]">
+                                    <upload-image v-model="item.imageUrl"  :limit="1"/>
+                                </el-form-item>
+                                <!-- :prop="`banner_list.${index}.toLink.name`"  :rules="[{
                                     required: true,
                                     trigger: 'change',
                                     validator: (rule: any, value: any, callback: any) => {
@@ -173,353 +90,246 @@
                                         callback()
                                     }
                                 }]" -->
-            <el-form-item :label="t('toLink')">
-              <diy-link v-model="item.toLink" />
-            </el-form-item>
-            <!-- <span v-if="formData.banner_list.length>1" class="cursor-pointer absolute top-[-8px] right-[-8px] delete" @click="deleteConfigList(index)"><el-icon color="#bbbbbb" size="20px"><CircleCloseFilled /></el-icon></span> -->
-          </div>
-        </el-card>
-        <el-card
-          v-if="formData.active_status === 'active'"
-          class="box-card !border-none"
-          shadow="never"
-        >
-          <h3 class="panel-title !text-sm pl-[15px]">
-            {{ t('activityGoods') }}
-          </h3>
-          <el-form-item :label="t('selectGoods')" prop="goodsSkuIds">
-            <goods-select-popup
-              ref="goodsSelectPopupRef"
-              v-model="formData.goodsSkuIds"
-              @goodsSelect="goodsSelect"
-              mode="sku"
-              :min="1"
-              :max="99"
-            />
-          </el-form-item>
-          <el-form-item
-            v-if="formData.goodsSkuList && formData.goodsSkuList.length"
-          >
-            <div>
-              <el-table
-                class="sku_list !w-[1400px]"
-                ref="goods_listTableRef"
-                :data="formData.goodsSkuList"
-                size="large"
-                max-height="480"
-                @selection-change="handleSelectionChange"
-              >
-                <el-table-column type="selection" width="55" />
-                <el-table-column
-                  :label="t('goodsSelectPopupGoodsInfo')"
-                  min-width="300"
-                >
-                  <template #default="{ row }">
-                    <div class="flex items-center cursor-pointer">
-                      <div
-                        class="min-w-[60px] h-[60px] flex items-center justify-center"
-                      >
-                        <el-image
-                          v-if="row.sku_image"
-                          class="w-[60px] h-[60px]"
-                          :src="img(row.sku_image)"
-                          fit="contain"
-                        >
-                          <template #error>
-                            <div class="image-slot">
-                              <img
-                                class="w-[60px] h-[60px]"
-                                src="@/addon/shop/assets/goods_default.png"
-                              />
+                                <el-form-item :label="t('toLink')" >
+                                    <diy-link v-model="item.toLink"/>
+                                </el-form-item>
+                                <!-- <span v-if="formData.banner_list.length>1" class="cursor-pointer absolute top-[-8px] right-[-8px] delete" @click="deleteConfigList(index)"><el-icon color="#bbbbbb" size="20px"><CircleCloseFilled /></el-icon></span> -->
                             </div>
-                          </template>
-                        </el-image>
-                        <img
-                          v-else
-                          class="w-[70px] h-[60px]"
-                          src="@/addon/shop/assets/goods_default.png"
-                          fit="contain"
-                        />
-                      </div>
-                      <div class="ml-2">
-                        <span :title="row.sku_name" class="multi-hidden">{{
-                          row.goods_name
-                        }}</span>
-                        <div class="flex items-center">
-                          <span class="text-primary text-[12px]">{{
-                            row.sku_name
-                          }}</span>
-                          <span
-                            class="mx-[8px] text-[#999] text-[12px]"
-                            v-if="row.sku_name"
-                            >|</span
-                          >
-                          <span class="text-primary text-[12px]">{{
-                            row.goods_type_name
-                          }}</span>
-                        </div>
-                      </div>
-                    </div>
-                  </template>
-                </el-table-column>
-                <el-table-column :label="t('oldPrice')" min-width="120">
-                  <template #default="{ row }">
-                    <div>￥{{ row.price }}</div>
-                  </template>
-                </el-table-column>
-                <el-table-column :label="t('newcomerPrice')" min-width="120">
-                  <template #default="{ row, $index }">
-                    <el-form-item
-                      :prop="'goodsSkuList.' + $index + '.newcomer_price'"
-                      :rules="[
-                        {
-                          trigger: 'blur',
-                          validator: (rule: any, value: any, callback: any) => {
-                            if (!value) {
-                              callback(t('newcomerPricePlaceholder'))
-                            } else if (
-                              isNaN(value) ||
-                              !regExp.digit.test(value)
-                            ) {
-                              callback(t('newcomerPriceTips'))
-                            } else if (parseFloat(value) < 0) {
-                              callback(t('newcomerPriceTipsOne'))
-                            }
-                            if (parseFloat(value) > parseFloat(row.price)) {
-                              callback(t('newcomerPriceTipsTwo'))
-                            } else {
-                              callback()
-                            }
-                          },
-                        },
-                      ]"
-                      class="sku-form-item-wrap"
-                    >
-                      <el-input
-                        v-model.trim="row.newcomer_price"
-                        clearable
-                        placeholder="0"
-                        maxlength="8"
-                      />
-                    </el-form-item>
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  prop="stock"
-                  :label="t('goodsSelectPopupStock')"
-                  min-width="120"
-                  align="right"
-                />
-                <el-table-column
-                  :label="t('operation')"
-                  align="right"
-                  min-width="160"
-                >
-                  <template #default="{ row, $index }">
-                    <el-button
-                      type="primary"
-                      link
-                      @click="deleteGoodsEvent(row, $index)"
-                      >{{ t('delete') }}</el-button
-                    >
-                  </template>
-                </el-table-column>
-              </el-table>
-              <div class="flex items-center mb-[15px] mt-[10px] pl-[14px]">
-                <el-checkbox
-                  v-model="toggleCheckbox"
-                  size="large"
-                  class="!mr-[15px]"
-                  @change="toggleChange"
-                  :indeterminate="isIndeterminate"
-                >
-                  <span>已选 {{ multipleSelection.length }} 项</span>
-                </el-checkbox>
+                        </el-card>
+                        <el-card v-if="formData.active_status==='active'" class="box-card !border-none" shadow="never">
+                            <h3 class="panel-title !text-sm pl-[15px]">{{ t('activityGoods') }}</h3>
+                            <el-form-item :label="t('selectGoods')" prop="goodsSkuIds">
+                                <goods-select-popup ref="goodsSelectPopupRef" v-model="formData.goodsSkuIds" @goodsSelect="goodsSelect" mode="sku" :min="1" :max="99" />
+                            </el-form-item>
+                            <el-form-item v-if="formData.goodsSkuList && formData.goodsSkuList.length">
+                                <div>
+                                    <el-table class="sku_list !w-[1400px]"  ref="goods_listTableRef" :data="formData.goodsSkuList" size="large" max-height="480" @selection-change="handleSelectionChange">
+                                        <el-table-column type="selection" width="55" />
+                                        <el-table-column :label="t('goodsSelectPopupGoodsInfo')" min-width="300">
+                                            <template #default="{ row }">
+                                                <div class="flex items-center cursor-pointer">
+                                                    <div class="min-w-[60px] h-[60px] flex items-center justify-center">
+                                                        <el-image v-if="row.sku_image" class="w-[60px] h-[60px]" :src="img(row.sku_image)" fit="contain">
+                                                            <template #error>
+                                                                <div class="image-slot">
+                                                                    <img class="w-[60px] h-[60px]" src="@/addon/shop/assets/goods_default.png" />
+                                                                </div>
+                                                            </template>
+                                                        </el-image>
+                                                        <img v-else class="w-[70px] h-[60px]" src="@/addon/shop/assets/goods_default.png" fit="contain" />
+                                                    </div>
+                                                    <div class="ml-2">
+                                                        <span :title="row.sku_name" class="multi-hidden">{{ row.goods_name }}</span>
+                                                        <div class="flex items-center">
+                                                            <span class="text-primary text-[12px]">{{row.sku_name}}</span>
+                                                            <span class="mx-[8px] text-[#999] text-[12px]" v-if="row.sku_name">|</span>
+                                                            <span class="text-primary text-[12px]">{{ row.goods_type_name }}</span>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </template>
+                                        </el-table-column>
+                                        <el-table-column :label="t('oldPrice')" min-width="120">
+                                            <template #default="{ row }">
+                                                <div>￥{{ row.price }}</div>
+                                            </template>
+                                        </el-table-column>
+                                        <el-table-column :label="t('newcomerPrice')" min-width="120">
+                                            <template #default="{ row,$index }">
+                                                <el-form-item :prop="'goodsSkuList.'+ $index + '.newcomer_price'" :rules="[{
+                                                        trigger: 'blur',
+                                                        validator: (rule: any, value: any, callback: any) => {
+                                                            if(!value){
+                                                                callback(t('newcomerPricePlaceholder'))
+                                                            }else if (isNaN(value) || !regExp.digit.test(value)) {
+                                                                callback(t('newcomerPriceTips'))
+                                                            } else if (parseFloat(value) <0) {
+                                                                callback(t('newcomerPriceTipsOne'))
+                                                            }if (parseFloat(value) > parseFloat(row.price)) {
+                                                                callback(t('newcomerPriceTipsTwo'))
+                                                            }else{
+                                                                callback();
+                                                            }
+                                                        }
+                                                        }]" class="sku-form-item-wrap">
+                                                    <el-input v-model.trim="row.newcomer_price" clearable placeholder="0" maxlength="8" />
+                                                </el-form-item>
+                                            </template>
+                                        </el-table-column>
+                                        <el-table-column prop="stock" :label="t('goodsSelectPopupStock')" min-width="120" align="right" />
+                                        <el-table-column :label="t('operation')"  align="right" min-width="160">
+                                            <template #default="{ row,$index }">
+                                                <el-button type="primary" link @click="deleteGoodsEvent(row,$index)">{{ t('delete') }}</el-button>
+                                            </template>
+                                        </el-table-column>
+                                    </el-table>
+                                    <div class="flex items-center mb-[15px] mt-[10px] pl-[14px]">
+                                        <el-checkbox v-model="toggleCheckbox" size="large" class="!mr-[15px]" @change="toggleChange" :indeterminate="isIndeterminate">
+                                            <span>已选 {{ multipleSelection.length }} 项</span>
+                                        </el-checkbox>
 
-                <label>{{ t('batchOperation') }}</label>
-                <el-input
-                  v-model.trim="newcomer_price"
-                  clearable
-                  class="!w-[130px] ml-[10px]"
-                  :placeholder="t('newcomerPricePlaceholder')"
-                  maxlength="8"
-                />
-                <el-button
-                  class="ml-[10px]"
-                  type="primary"
-                  @click="saveBatch"
-                  >{{ t('confirm') }}</el-button
-                >
-              </div>
-            </div>
-          </el-form-item>
-          <!--                            <el-form-item :label="t('limitNum')" prop="limit_num" v-if="formData.goodsSkuList && formData.goodsSkuList.length">-->
-          <!--                                <div>-->
-          <!--                                    <div class="flex items-center">-->
-          <!--                                        <el-input v-model.trim="formData.limit_num" @keyup="filterNumber($event)" @blur="()=>{if(formData.limit_num>0) formData.limit_num = parseInt(formData.limit_num)}" clearable class="!w-[200px]" maxlength="3" />-->
-          <!--                                    </div>-->
-          <!--                                </div>-->
-          <!--                            </el-form-item>-->
-        </el-card>
-        <!-- </el-form>
+                                        <label>{{ t('batchOperation') }}</label>
+                                        <el-input v-model.trim="newcomer_price" clearable class="!w-[130px] ml-[10px]" :placeholder="t('newcomerPricePlaceholder')" maxlength="8" />
+                                        <el-button class="ml-[10px]" type="primary" @click="saveBatch">{{ t('confirm') }}</el-button>
+                                    </div>
+                                </div>
+                            </el-form-item>
+<!--                            <el-form-item :label="t('limitNum')" prop="limit_num" v-if="formData.goodsSkuList && formData.goodsSkuList.length">-->
+<!--                                <div>-->
+<!--                                    <div class="flex items-center">-->
+<!--                                        <el-input v-model.trim="formData.limit_num" @keyup="filterNumber($event)" @blur="()=>{if(formData.limit_num>0) formData.limit_num = parseInt(formData.limit_num)}" clearable class="!w-[200px]" maxlength="3" />-->
+<!--                                    </div>-->
+<!--                                </div>-->
+<!--                            </el-form-item>-->
+                        </el-card>
+                    <!-- </el-form>
                 </el-tab-pane>
                 <el-tab-pane :label="t('bannerList')" name="banner"> -->
-        <!-- <el-form class="page-form" :model="formData" label-width="120px" ref="bannerFormRef"> -->
+                    <!-- <el-form class="page-form" :model="formData" label-width="120px" ref="bannerFormRef"> -->
 
-        <!-- <div class="flex w-full justify-center">
+                        <!-- <div class="flex w-full justify-center">
                             <el-button class="w-[400px]" @click="addConfigList">{{ t('addConfigList') }}</el-button>
                         </div> -->
-      </el-form>
-      <!-- </el-tab-pane>
+                    </el-form>
+                <!-- </el-tab-pane>
             </el-tabs> -->
-    </el-card>
-    <!-- 提交按钮 -->
-    <div class="fixed-footer-wrap">
-      <div class="fixed-footer h-[48px]">
-        <el-button type="primary" @click="onSave">{{ t('save') }}</el-button>
-      </div>
+        </el-card>
+        <!-- 提交按钮 -->
+        <div class="fixed-footer-wrap">
+            <div class="fixed-footer h-[48px]">
+                <el-button type="primary" @click="onSave">{{ t('save') }}</el-button>
+            </div>
+        </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
-import { ref, computed } from 'vue'
+import { ref,computed } from 'vue'
 import { t } from '@/lang'
 import { useRoute } from 'vue-router'
-import { FormInstance, ElMessage } from 'element-plus'
-import { filterNumber, img, deepClone } from '@/utils/common'
-import {
-  getActiveNewcomerConfig,
-  editActiveNewcomerConfig,
-} from '@/addon/shop/api/marketing'
+import {FormInstance, ElMessage} from 'element-plus'
+import { filterNumber,img, deepClone } from '@/utils/common'
+import { getActiveNewcomerConfig,editActiveNewcomerConfig } from "@/addon/shop/api/marketing";
 import goodsSelectPopup from '@/addon/shop/views/goods/components/goods-select-popup.vue'
 
 const route = useRoute()
 const pageName = route.meta.title
 const loading = ref(true)
 const formData = ref({
-  active_status: 'active',
-  banner_list: [{ imageUrl: '', toLink: { name: '' } }],
-  validity_type: 'day',
-  validity_day: 7,
-  validity_time: '',
-  participation_way: 'never_order',
-  appoint_time: '',
-  goodsSkuIds: <Array<any>>[],
-  goodsSkuList: <Array<any>>[],
-  goods_data: <any>'',
-  limit_num: 1,
-  active_desc: '',
+    active_status:'active',
+    banner_list:[
+        {imageUrl: '', toLink: {name: ''}},
+    ],
+    validity_type:'day',
+    validity_day:7,
+    validity_time:'',
+    participation_way:'never_order',
+    appoint_time:'',
+    goodsSkuIds:<Array<any>>[],
+    goodsSkuList:<Array<any>>[],
+    goods_data:<any>'',
+    limit_num:1,
+    active_desc:''
 })
 // 表单验证规则
 // 正则表达式
 const regExp = {
-  required: /[\S]+/,
-  number: /^\d{0,10}$/,
-  digit: /^\d{0,10}(.?\d{0,2})$/,
-  special: /^\d{0,10}(.?\d{0,3})$/,
+    required: /[\S]+/,
+    number: /^\d{0,10}$/,
+    digit: /^\d{0,10}(.?\d{0,2})$/,
+    special: /^\d{0,10}(.?\d{0,3})$/
 }
 
 const formRules = computed(() => {
-  return {
-    appoint_time: [
-      {
-        required: true,
-        message: t('appointTimePlaceholder'),
-        trigger: 'change',
-      },
-    ],
-    validity_day: [
-      {
-        required: true,
-        validator: (rule: any, value: any, callback: any) => {
-          if (!value) {
-            callback(t('validityDayPlaceholder'))
-          } else if (parseInt(value) <= 0) {
-            callback(t('validityDayTips'))
-          } else {
-            callback()
-          }
-        },
-        trigger: 'blur',
-      },
-    ],
-    validity_time: [
-      {
-        required: true,
-        validator: (rule: any, value: any, callback: any) => {
-          if (!value) {
-            callback(t('validityTimePlaceholder'))
-          } else if (formData.value.participation_way != 'never_order') {
-            if (!formData.value.appoint_time) {
-              callback(t('validityTimePlaceholderTwo'))
-            } else if (
-              new Date(value).getTime() <=
-              new Date(formData.value.appoint_time).getTime()
-            ) {
-              callback(t('validityTimePlaceholderThree'))
-            } else {
-              callback()
-            }
-          } else {
-            callback()
-          }
-        },
-        trigger: 'change',
-      },
-    ],
-    goodsSkuIds: [
-      { required: true, message: t('goodsSkuIdsPlaceholder'), trigger: 'blur' },
-    ],
-    active_desc: [
-      { required: true, message: t('activeDescPlaceholder'), trigger: 'blur' },
-    ],
-    // limit_num:[
-    //     { required: true,  validator: (rule: any, value: any, callback: any) => {
-    //         if (!value) {
-    //             callback(t('limitNumPlaceholder'))
-    //         }else if(parseInt(value)<=0){
-    //             callback(t('limitNumTips'))
-    //         }else if(parseInt(value)>formData.value.goodsSkuIds.length) {
-    //             callback(t('limitNumTipsThree'))
-    //         }else{
-    //             callback()
-    //         }
-    //
-    //     }, trigger: 'blur' }
-    // ]
-  }
+    return {
+        appoint_time: [
+            { required: true, message: t('appointTimePlaceholder'), trigger: 'change' }
+        ],
+        validity_day: [
+            { required: true, validator: (rule: any, value: any, callback: any) => {
+                if (!value) {
+                    callback(t('validityDayPlaceholder'))
+                }else if(parseInt(value)<=0){
+                    callback(t('validityDayTips'))
+                }else {
+                    callback()
+                }
+
+            }, trigger: 'blur' }
+        ],
+        validity_time: [
+            { required: true,validator: (rule: any, value: any, callback: any) => {
+                if (!value) {
+                    callback(t('validityTimePlaceholder'))
+                }else if(formData.value.participation_way != 'never_order'){
+                    if(!formData.value.appoint_time){
+                        callback(t('validityTimePlaceholderTwo'))
+                    }else if(new Date(value).getTime()<=new Date(formData.value.appoint_time).getTime()){
+                        callback(t('validityTimePlaceholderThree'))
+                    }else{
+                        callback()
+                    }
+                }else {
+                    callback()
+                }
+
+            }, trigger: 'change' }
+        ],
+        goodsSkuIds: [
+            { required: true, message: t('goodsSkuIdsPlaceholder'), trigger: 'blur' }
+        ],
+        active_desc: [
+            { required: true, message: t('activeDescPlaceholder'), trigger: 'blur' }
+        ],
+        // limit_num:[
+        //     { required: true,  validator: (rule: any, value: any, callback: any) => {
+        //         if (!value) {
+        //             callback(t('limitNumPlaceholder'))
+        //         }else if(parseInt(value)<=0){
+        //             callback(t('limitNumTips'))
+        //         }else if(parseInt(value)>formData.value.goodsSkuIds.length) {
+        //             callback(t('limitNumTipsThree'))
+        //         }else{
+        //             callback()
+        //         }
+        //
+        //     }, trigger: 'blur' }
+        // ]
+    }
 })
 
 const formRef = ref<FormInstance>()
 const bannerFormRef = ref<FormInstance>()
 // 商品选择回调
 const goodsSelect = (value: any) => {
-  //    formData.value.goodsSkuList.splice(0,formData.value.goodsSkuList.length);
-  let arr = []
-  for (let key in value) {
-    let goods_sku: any = value[key]
-    let sku: any = {
-      goods_id: goods_sku.goods_id,
-      sku_id: goods_sku.sku_id,
-      goods_type_name: goods_sku.goods_type_name,
-      price: goods_sku.price,
-      sku_image: goods_sku.sku_image,
-      goods_name: goods_sku.goods_name,
-      sku_name: goods_sku.sku_name,
-      stock: goods_sku.stock,
-      newcomer_price: '', // 金额
-    }
-    if (formData.value.goodsSkuList.length) {
-      formData.value.goodsSkuList.forEach((el: any) => {
-        if (el.sku_id == sku.sku_id) {
-          sku = Object.assign(sku, el)
+
+//    formData.value.goodsSkuList.splice(0,formData.value.goodsSkuList.length);
+    let arr = []
+    for (let key in value) {
+        let goods_sku: any = value[key];
+        let sku: any = {
+            goods_id: goods_sku.goods_id,
+            sku_id: goods_sku.sku_id,
+            goods_type_name: goods_sku.goods_type_name,
+            price: goods_sku.price,
+            sku_image: goods_sku.sku_image,
+            goods_name: goods_sku.goods_name,
+            sku_name: goods_sku.sku_name,
+            stock: goods_sku.stock,
+            newcomer_price: "", // 金额
+        };
+        if (formData.value.goodsSkuList.length) {
+            formData.value.goodsSkuList.forEach((el: any) => {
+                if (el.sku_id == sku.sku_id) {
+                    sku = Object.assign(sku, el)
+                }
+            })
+
         }
-      })
+        arr.push(deepClone(sku))
     }
-    arr.push(deepClone(sku))
-  }
-  formData.value.goodsSkuList = arr
+    formData.value.goodsSkuList = arr;
+
 }
 
 // 批量复选框
@@ -530,8 +340,8 @@ const isIndeterminate = ref(false)
 
 // 监听批量复选框事件
 const toggleChange = (value: any) => {
-  isIndeterminate.value = false
-  goods_listTableRef.value.toggleAllSelection()
+    isIndeterminate.value = false
+    goods_listTableRef.value.toggleAllSelection()
 }
 const goods_listTableRef = ref()
 
@@ -540,84 +350,73 @@ const multipleSelection: any = ref([])
 
 // 监听表格单行选中
 const handleSelectionChange = (val: []) => {
-  multipleSelection.value = val
+    multipleSelection.value = val
 
-  toggleCheckbox.value = false
-  if (
-    multipleSelection.value.length > 0 &&
-    multipleSelection.value.length < formData.value.goodsSkuList.length
-  ) {
-    isIndeterminate.value = true
-  } else {
-    isIndeterminate.value = false
-  }
+    toggleCheckbox.value = false
+    if (multipleSelection.value.length > 0 && multipleSelection.value.length < formData.value.goodsSkuList.length) {
+        isIndeterminate.value = true
+    } else {
+        isIndeterminate.value = false
+    }
 
-  if (multipleSelection.value.length == formData.value.goodsSkuList.length) {
-    toggleCheckbox.value = true
-  }
+    if (multipleSelection.value.length == formData.value.goodsSkuList.length) {
+        toggleCheckbox.value = true
+    }
 }
 const newcomer_price = ref(null)
 const saveBatch = () => {
-  if (!multipleSelection.value.length) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('batchEmptySelectedGoodsTips')}`,
-    })
-    return
-  }
-  if (!newcomer_price.value) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('newcomerPricePlaceholder')}`,
-    })
-  } else if (
-    isNaN(newcomer_price.value) ||
-    !regExp.digit.test(newcomer_price.value)
-  ) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('newcomerPriceTips')}`,
-    })
-    return
-  } else if (parseFloat(newcomer_price.value) < 0) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('newcomerPriceTipsOne')}`,
-    })
-    return
-  }
-  formData.value.goodsSkuList.forEach((item: any) => {
-    if (multipleSelection.value.some((el: any) => el.sku_id == item.sku_id)) {
-      item.newcomer_price = newcomer_price.value
+    if (!multipleSelection.value.length) {
+        ElMessage({
+            type: 'warning',
+            message: `${t('batchEmptySelectedGoodsTips')}`
+        })
+        return
     }
-  })
+    if(!newcomer_price.value){
+        ElMessage({
+            type: 'warning',
+            message: `${t('newcomerPricePlaceholder')}`
+        })
+    }else if (isNaN(newcomer_price.value) || !regExp.digit.test(newcomer_price.value)) {
+        ElMessage({
+            type: 'warning',
+            message: `${t('newcomerPriceTips')}`
+        })
+        return
+    } else if (parseFloat(newcomer_price.value) <0) {
+        ElMessage({
+            type: 'warning',
+            message: `${t('newcomerPriceTipsOne')}`
+        })
+        return
+    }
+    formData.value.goodsSkuList.forEach((item: any) => {
+        if(multipleSelection.value.some((el: any) => el.sku_id == item.sku_id)){
+            item.newcomer_price = newcomer_price.value
+        }
+    })
 }
 // 删除商品
 const deleteGoodsEvent = (row: any, index: any) => {
-  formData.value.goodsSkuList.splice(index, 1)
-  formData.value.goodsSkuIds.splice(
-    formData.value.goodsSkuIds.indexOf(row.sku_id),
-    1
-  )
+    formData.value.goodsSkuList.splice(index, 1);
+    formData.value.goodsSkuIds.splice(formData.value.goodsSkuIds.indexOf(row.sku_id), 1);
 }
 const getActiveNewcomerConfigFn = () => {
-  getActiveNewcomerConfig()
-    .then((res: any) => {
-      Object.keys(formData.value).forEach((key) => {
-        if (res.data[key]) formData.value[key] = res.data[key]
-      })
-      formData.value.goodsSkuIds = []
-      if (formData.value.banner_list.length == 0)
-        formData.value.banner_list.push({ imageUrl: '', toLink: { name: '' } })
-      formData.value.goodsSkuList = res.data.active_goods.map((item: any) => {
-        formData.value.goodsSkuIds.push(item.sku_id)
-        item.newcomer_price = item.active_goods_value.newcomer_price
-        return item
-      })
-      loading.value = false
-    })
-    .catch(() => {
-      loading.value = false
+    getActiveNewcomerConfig().then((res: any) => {
+        Object.keys(formData.value).forEach((key) => {
+            if(res.data[key]) formData.value[key] = res.data[key]
+        })
+        formData.value.goodsSkuIds = []
+        if(formData.value.banner_list.length == 0) formData.value.banner_list.push({imageUrl: '', toLink: {name: ''}})
+        formData.value.goodsSkuList = res.data.active_goods.map((item: any) => {
+            formData.value.goodsSkuIds.push(item.sku_id)
+            item.newcomer_price = item.active_goods_value.newcomer_price
+            return item
+        });
+        loading.value = false;
+
+    }).catch(() => {
+        loading.value = false
     })
 }
 
@@ -625,37 +424,34 @@ getActiveNewcomerConfigFn()
 /**** 提交 ****/
 const preventDuplication = ref(false)
 const onSave = async () => {
-  if (preventDuplication.value) return
-  await formRef.value?.validate(async (valid) => {
-    if (valid) {
-      preventDuplication.value = true
-      formData.value.goods_data = JSON.stringify(
-        formData.value.goodsSkuList.map((item: any) => {
-          return {
-            goods_id: item.goods_id,
-            sku_id: item.sku_id,
-            price: item.price,
-            newcomer_price: item.newcomer_price,
-          }
-        })
-      )
-      editActiveNewcomerConfig(formData.value)
-        .then(() => {
-          newcomer_price.value = null
-          getActiveNewcomerConfigFn()
-          preventDuplication.value = false
-        })
-        .catch(() => {
-          preventDuplication.value = false
-        })
-    }
-  })
+    if (preventDuplication.value) return
+    await formRef.value?.validate(async (valid) => {
+        if (valid) {
+            preventDuplication.value = true
+            formData.value.goods_data = JSON.stringify(formData.value.goodsSkuList.map((item: any) => {
+                return {
+                    goods_id: item.goods_id,
+                    sku_id: item.sku_id,
+                    price: item.price,
+                    newcomer_price: item.newcomer_price,
+                }
+            }))
+            editActiveNewcomerConfig(formData.value).then(() => {
+                newcomer_price.value = null
+                getActiveNewcomerConfigFn()
+                preventDuplication.value = false
+            }).catch(() => {
+                preventDuplication.value = false
+            })
+        }
+    })
+
 }
 /**
  * 使用默认说明
  */
-const defaultActiveDescEvent = () => {
-  formData.value.active_desc = `1、新人价是面向${formData.value.participation_way === 'never_order' ? t('neverOrder') : formData.value.participation_way === 'assign_time_order' ? t('assignTimeOrder') : t('assignTimeRegister')}提供的一种专属优惠价格，同一账号仅限享受一次优惠；\n2、仅限${formData.value.participation_way === 'never_order' ? t('neverOrder') : formData.value.participation_way === 'assign_time_order' ? formData.value.appoint_time + '之前未下过单的会员' : formData.value.appoint_time + '之后注册的会员'}可参与；\n3、活动有效期：${formData.value.validity_type == 'day' ? '参与活动后' + formData.value.validity_day + '天内' : formData.value.validity_time + '后截止'}。`
+ const defaultActiveDescEvent = () => {
+    formData.value.active_desc = `1、新人价是面向${formData.value.participation_way==='never_order'?t('neverOrder'):formData.value.participation_way==='assign_time_order'?t('assignTimeOrder'):t('assignTimeRegister')}提供的一种专属优惠价格，同一账号仅限享受一次优惠；\n2、仅限${formData.value.participation_way==='never_order'?t('neverOrder'):formData.value.participation_way==='assign_time_order'?formData.value.appoint_time+'之前未下过单的会员':formData.value.appoint_time+'之后注册的会员'}可参与；\n3、活动有效期：${formData.value.validity_type=='day'?'参与活动后'+formData.value.validity_day+'天内':formData.value.validity_time+'后截止'}。`;
 }
 // const deleteConfigList = (index:number)=>{
 //     formData.value.banner_list.splice(index,1)
@@ -668,16 +464,16 @@ const defaultActiveDescEvent = () => {
 
 <style lang="scss" scoped>
 .main-container {
-  min-height: calc(100vh - 64px - 48px - 30px);
+    min-height: calc(100vh - 64px - 48px - 30px);
 }
 .sku_list :deep(.cell) {
-  // min-height: 60px !important;
-  overflow: initial !important;
+    // min-height: 60px !important;
+    overflow: initial !important;
 }
-.input-width-short {
+.input-width-short{
   width: 100px;
 }
-.date-picker :deep(.el-input__wrapper) {
-  width: 200px !important;
+.date-picker :deep(.el-input__wrapper){
+    width: 200px !important;
 }
 </style>
diff --git a/admin/src/addon/shop/views/marketing/newcomer/order_list.vue b/admin/src/addon/shop/views/marketing/newcomer/order_list.vue
index 6eaedf24..84a6cc15 100644
--- a/admin/src/addon/shop/views/marketing/newcomer/order_list.vue
+++ b/admin/src/addon/shop/views/marketing/newcomer/order_list.vue
@@ -1,280 +1,157 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
 
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="orderTable.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('orderInfo')" prop="search_name">
-            <el-select
-              v-model="orderTable.searchParam.search_type"
-              clearable
-              class="input-item"
-            >
-              <el-option :label="t('orderNo')" value="order_no"></el-option>
-              <el-option
-                :label="t('outTradeNo')"
-                value="out_trade_no"
-              ></el-option>
-            </el-select>
-            <el-input
-              class="input-item ml-3"
-              v-model.trim="orderTable.searchParam.search_name"
-            />
-          </el-form-item>
-          <el-form-item :label="t('payType')" prop="pay_type">
-            <el-select
-              v-model="orderTable.searchParam.pay_type"
-              clearable
-              class="input-item"
-            >
-              <el-option
-                v-for="(item, index) in payTypeData"
-                :key="index"
-                :label="item.name"
-                :value="item.key"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="t('fromType')" prop="order_from">
-            <el-select
-              v-model="orderTable.searchParam.order_from"
-              clearable
-              class="input-item"
-            >
-              <el-option
-                v-for="(item, index) in orderFromData"
-                :key="index"
-                :label="item"
-                :value="index"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="t('createTime')" prop="create_time">
-            <el-date-picker
-              v-model="orderTable.searchParam.create_time"
-              type="datetimerange"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              :start-placeholder="t('startDate')"
-              :end-placeholder="t('endDate')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('payTime')" prop="pay_time">
-            <el-date-picker
-              v-model="orderTable.searchParam.pay_time"
-              type="datetimerange"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              :start-placeholder="t('startDate')"
-              :end-placeholder="t('endDate')"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="loadOrderList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+            </div>
 
-      <el-tabs v-model="activeName" class="demo-tabs" @tab-change="handleClick">
-        <el-tab-pane :label="t('all')" name=""></el-tab-pane>
-        <el-tab-pane :label="t('toBeShipped')" name="2"></el-tab-pane>
-        <el-tab-pane :label="t('shipped')" name="3"></el-tab-pane>
-        <el-tab-pane :label="t('completed')" name="5"></el-tab-pane>
-        <el-tab-pane :label="t('closed')" name="-1"></el-tab-pane>
-      </el-tabs>
-      <div>
-        <el-table :data="orderTable.data" size="large" class="table-top">
-          <el-table-column :label="t('orderGoods')" min-width="200" />
-          <el-table-column :label="t('goodsPriceNumber')" min-width="150" />
-          <el-table-column :label="t('orderMoney')" min-width="150" />
-          <el-table-column :label="t('orderStatus')" min-width="100" />
-          <el-table-column
-            :label="t('operation')"
-            fixed="right"
-            align="right"
-            min-width="100"
-          />
-        </el-table>
-      </div>
-      <div class="table-body min-h-[150px]" v-loading="orderTable.loading">
-        <div v-if="!orderTable.loading">
-          <template v-if="orderTable.data.length">
-            <div v-for="(item, index) in orderTable.data" :key="index">
-              <div
-                class="flex items-center justify-between bg-[#f7f8fa] mt-[10px] border-[#e4e7ed] border-solid border-b-[1px] px-3 h-[35px] text-[12px] text-[#666]"
-              >
-                <div>
-                  <span>{{ t('orderNo') }}：{{ (item as any).order_no }}</span>
-                  <span class="ml-5"
-                    >{{ t('createTime') }}：{{
-                      (item as any).create_time
-                    }}</span
-                  >
-                  <!-- <span class="ml-5">{{ t('orderFrom') }}：{{ (item as any).order_form_name }}</span> -->
-                  <span class="ml-5" v-if="item.pay"
-                    >{{ t('payType') }}：{{ (item as any).pay.type_name }}</span
-                  >
-                </div>
-              </div>
-              <el-table
-                :data="item.order_goods"
-                size="large"
-                :show-header="false"
-                :span-method="arraySpanMethod"
-              >
-                <template #empty>
-                  <span>{{ !orderTable.loading ? t('emptyData') : '' }}</span>
-                </template>
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="orderTable.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('orderInfo')" prop='search_name'>
+                        <el-select v-model="orderTable.searchParam.search_type" clearable class="input-item">
+                            <el-option :label="t('orderNo')" value="order_no"></el-option>
+                            <el-option :label="t('outTradeNo')" value="out_trade_no"></el-option>
+                        </el-select>
+                        <el-input class="input-item ml-3" v-model.trim="orderTable.searchParam.search_name" />
+                    </el-form-item>
+                    <el-form-item :label="t('payType')" prop='pay_type'>
+                        <el-select v-model="orderTable.searchParam.pay_type" clearable class="input-item">
+                            <el-option v-for="(item, index) in payTypeData" :key="index" :label="item.name" :value="item.key"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item :label="t('fromType')" prop='order_from'>
+                        <el-select v-model="orderTable.searchParam.order_from" clearable class="input-item">
+                            <el-option v-for="(item, index) in orderFromData" :key="index" :label="item" :value="index"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item :label="t('createTime')" prop="create_time">
+                        <el-date-picker v-model="orderTable.searchParam.create_time" type="datetimerange"
+                            value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')"
+                            :end-placeholder="t('endDate')" />
+                    </el-form-item>
+                    <el-form-item :label="t('payTime')" prop="pay_time">
+                        <el-date-picker v-model="orderTable.searchParam.pay_time" type="datetimerange"
+                            value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')"
+                            :end-placeholder="t('endDate')" />
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="loadOrderList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+
+            <el-tabs v-model="activeName" class="demo-tabs" @tab-change="handleClick">
+                <el-tab-pane :label="t('all')" name=""></el-tab-pane>
+                <el-tab-pane :label="t('toBeShipped')" name="2"></el-tab-pane>
+                <el-tab-pane :label="t('shipped')" name="3"></el-tab-pane>
+                <el-tab-pane :label="t('completed')" name="5"></el-tab-pane>
+                <el-tab-pane :label="t('closed')" name="-1"></el-tab-pane>
+            </el-tabs>
+            <div>
+				<el-table :data="orderTable.data" size="large" class="table-top">
+					<el-table-column :label="t('orderGoods')" min-width="200" />
+					<el-table-column :label="t('goodsPriceNumber')" min-width="150" />
+					<el-table-column :label="t('orderMoney')" min-width="150" />
+					<el-table-column :label="t('orderStatus')" min-width="100" />
+					<el-table-column :label="t('operation')" fixed="right" align="right" min-width="100" />
+				</el-table>
+            </div>
+            <div class="table-body min-h-[150px]" v-loading="orderTable.loading">
+                <div v-if="!orderTable.loading">
+                    <template v-if="orderTable.data.length">
+                        <div v-for="(item, index) in orderTable.data" :key="index">
+                            <div class="flex items-center justify-between bg-[#f7f8fa] mt-[10px] border-[#e4e7ed] border-solid border-b-[1px] px-3 h-[35px] text-[12px] text-[#666]">
+                                <div>
+                                    <span>{{ t('orderNo') }}：{{ (item as any).order_no }}</span>
+                                    <span class="ml-5">{{ t('createTime') }}：{{ (item as any).create_time }}</span>
+                                    <!-- <span class="ml-5">{{ t('orderFrom') }}：{{ (item as any).order_form_name }}</span> -->
+                                    <span class="ml-5" v-if="item.pay">{{ t('payType') }}：{{ (item as any).pay.type_name }}</span>
+                                </div>
+                            </div>
+                            <el-table :data="item.order_goods" size="large" :show-header="false" :span-method="arraySpanMethod">
+                                <template #empty>
+                                    <span>{{ !orderTable.loading ? t('emptyData') : '' }}</span>
+                                </template>
 
-                <!-- <el-table-column :label="t('orderNo')" min-width="250">
+                                <!-- <el-table-column :label="t('orderNo')" min-width="250">
                                     <template #default="{ row }">
                                         <span class="text-[14px]">{{ row.order_no }}</span>
                                     </template>
                                 </el-table-column> -->
-                <el-table-column min-width="200">
-                  <template #default="{ row }">
-                    <div class="flex cursor-pointer">
-                      <div class="flex items-center min-w-[50px] mr-[10px]">
-                        <img
-                          class="w-[50px] h-[50px]"
-                          v-if="row.goods_image_thumb_small"
-                          :src="img(row.goods_image_thumb_small)"
-                          alt=""
-                        />
-                        <img
-                          class="w-[50px] h-[50px]"
-                          v-else
-                          src="@/addon/shop/assets/goods_default.png"
-                          alt=""
-                        />
-                      </div>
-                      <div class="flex flex-col">
-                        <p class="multi-hidden text-[14px]">
-                          {{ row.goods_name }}
-                        </p>
-                        <span class="text-[12px] text-[#999]">{{
-                          row.sku_name
-                        }}</span>
-                      </div>
-                    </div>
-                  </template>
-                </el-table-column>
-                <el-table-column min-width="150">
-                  <template #header>
-                    <div style="display: inline-flex; align-items: center">
-                      <span class="mr-[5px]">{{ t('goodsPriceNumber') }}</span>
-                      <el-tooltip
-                        class="box-item"
-                        effect="light"
-                        placement="top"
-                      >
-                        <template #content>{{
-                          t('goodsPriceNumberTips')
-                        }}</template>
-                        <el-icon color="#666">
-                          <QuestionFilled />
-                        </el-icon>
-                      </el-tooltip>
-                    </div>
-                  </template>
-                  <template #default="{ row }">
-                    <div class="flex flex-col">
-                      <span class="text-[13px]">￥{{ row.price }}</span>
-                      <span
-                        v-if="row.extend && row.extend.newcomer_price"
-                        class="text-[13px] mt-[5px]"
-                      >
-                        <span
-                          v-if="
-                            parseFloat(row.extend.newcomer_price) && row.num > 1
-                          "
-                          >{{ row.num }}{{ t('piece')
-                          }}<span class="text-[#999]"
-                            >（第1{{ t('piece') }}，￥{{
-                              parseFloat(row.extend.newcomer_price).toFixed(2)
-                            }}/{{ t('piece') }}；第{{
-                              row.num > 2 ? '2~' + row.num : '2'
-                            }}{{ t('piece') }}，￥{{
-                              parseFloat(row.price).toFixed(2)
-                            }}/{{ t('piece') }}）</span
-                          ></span
-                        >
-                        <span v-else>{{ row.num }}{{ t('piece') }}</span>
-                      </span>
-                      <span v-else class="text-[13px] mt-[5px]"
-                        >{{ row.num }}{{ t('piece') }}</span
-                      >
-                    </div>
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  :label="t('orderMoney')"
-                  min-width="150"
-                  class-name="border-0 border-l-[1px] border-solid border-[var(--el-table-border-color)]"
-                >
-                  <template #default="{ row }">
-                    <span class="text-[14px]">￥{{ item.order_money }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column :label="t('orderStatus')" min-width="100">
-                  <template #default="{ row }">
-                    <span class="text-[14px]">{{ item.status_name.name }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  :label="t('operation')"
-                  fixed="right"
-                  align="right"
-                  min-width="100"
-                >
-                  <template #default="{ row }">
-                    <el-button type="primary" link @click="detailEvent(item)">{{
-                      t('info')
-                    }}</el-button>
-                  </template>
-                </el-table-column>
-              </el-table>
+                                <el-table-column min-width="200">
+                                    <template #default="{ row }">
+                                        <div class="flex cursor-pointer">
+                                            <div class="flex items-center min-w-[50px] mr-[10px]">
+                                                <img class="w-[50px] h-[50px]" v-if="row.goods_image_thumb_small" :src="img(row.goods_image_thumb_small)" alt="">
+                                                <img class="w-[50px] h-[50px]" v-else src="@/addon/shop/assets/goods_default.png" alt="">
+                                            </div>
+                                            <div class="flex flex-col">
+                                                <p class="multi-hidden text-[14px]">{{ row.goods_name }}</p>
+                                                <span class="text-[12px] text-[#999]">{{ row.sku_name }}</span>
+                                            </div>
+                                        </div>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column min-width="150">
+                                    <template #header>
+                                        <div style="display: inline-flex; align-items: center">
+                                            <span class="mr-[5px]">{{ t('goodsPriceNumber') }}</span>
+                                            <el-tooltip class="box-item" effect="light" placement="top">
+                                                <template #content>{{t('goodsPriceNumberTips')}}</template>
+                                                <el-icon color="#666">
+                                                    <QuestionFilled />
+                                                </el-icon>
+                                            </el-tooltip>
+                                        </div>
+                                    </template>
+                                    <template #default="{ row }">
+                                        <div class="flex flex-col">
+                                            <span class="text-[13px]">￥{{ row.price }}</span>
+                                            <span v-if="row.extend && row.extend.newcomer_price" class="text-[13px] mt-[5px]">
+                                                <span v-if="parseFloat(row.extend.newcomer_price) && row.num > 1">{{ row.num }}{{ t('piece') }}<span class="text-[#999]">（第1{{ t('piece') }}，￥{{parseFloat(row.extend.newcomer_price).toFixed(2)}}/{{ t('piece') }}；第{{row.num>2?'2~'+row.num:'2'}}{{ t('piece') }}，￥{{parseFloat(row.price).toFixed(2)}}/{{ t('piece') }}）</span></span>
+                                                <span v-else>{{ row.num }}{{ t('piece') }}</span>
+                                            </span>
+                                            <span v-else class="text-[13px] mt-[5px]">{{ row.num }}{{ t('piece') }}</span>
+                                        </div>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column :label="t('orderMoney')" min-width="150" class-name="border-0 border-l-[1px] border-solid border-[var(--el-table-border-color)]">
+                                    <template #default="{ row }">
+                                        <span class="text-[14px]">￥{{ item.order_money }}</span>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column :label="t('orderStatus')" min-width="100">
+                                    <template #default="{ row }">
+                                        <span class="text-[14px]">{{ item.status_name.name }}</span>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column :label="t('operation')" fixed="right" align="right" min-width="100">
+                                    <template #default="{ row }">
+                                        <el-button type="primary" link @click="detailEvent(item)">{{ t('info') }}</el-button>
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                        </div>
+                    </template>
+                </div>
+            </div>
+            <div class="mt-[16px] flex justify-end">
+                <el-pagination v-model:current-page="orderTable.page" v-model:page-size="orderTable.limit"
+                    layout="total, sizes, prev, pager, next, jumper" :total="orderTable.total"
+                    @size-change="loadOrderList()" @current-change="loadOrderList" />
             </div>
-          </template>
-        </div>
-      </div>
-      <div class="mt-[16px] flex justify-end">
-        <el-pagination
-          v-model:current-page="orderTable.page"
-          v-model:page-size="orderTable.limit"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="orderTable.total"
-          @size-change="loadOrderList()"
-          @current-change="loadOrderList"
-        />
-      </div>
-    </el-card>
-  </div>
+
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
 import { t } from '@/lang'
-import {
-  getOrderList,
-  getOrderStatus,
-  getOrderPayType,
-  getOrderFrom,
-} from '@/addon/shop/api/order'
-import { img, setTablePageStorage, getTablePageStorage } from '@/utils/common'
+import { getOrderList, getOrderStatus, getOrderPayType, getOrderFrom } from '@/addon/shop/api/order'
+import { img,setTablePageStorage,getTablePageStorage } from '@/utils/common'
 import { FormInstance } from 'element-plus'
 import { useRouter, useRoute } from 'vue-router'
 
@@ -287,37 +164,37 @@ const statusData = ref([])
 const payTypeData = ref<any[]>([])
 const orderFromData = ref([])
 const setFormData = async () => {
-  statusData.value = await (await getOrderStatus()).data
-  payTypeData.value = await (await getOrderPayType()).data
-  orderFromData.value = await (await getOrderFrom()).data
+    statusData.value = await (await getOrderStatus()).data
+    payTypeData.value = await (await getOrderPayType()).data
+    orderFromData.value = await (await getOrderFrom()).data
 }
 
 setFormData()
 
 interface OrderTable {
-  page: number
-  limit: number
-  total: number
-  loading: boolean
-  data: any[]
-  searchParam: any
+    page: number
+    limit: number
+    total: number
+    loading: boolean
+    data: any[]
+    searchParam: any,
 }
 const orderTable = reactive<OrderTable>({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    search_type: 'order_no',
-    search_name: '',
-    pay_type: '',
-    order_from: '',
-    status: '',
-    create_time: [],
-    pay_time: [],
-    activity_type: 'newcomer_discount',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        search_type: 'order_no',
+        search_name: '',
+        pay_type: '',
+        order_from: '',
+        status: '',
+        create_time: [],
+        pay_time: [],
+        activity_type:'newcomer_discount'
+    }
 })
 
 const searchFormRef = ref<FormInstance>()
@@ -326,92 +203,91 @@ const searchFormRef = ref<FormInstance>()
  * 获取订单列表
  */
 const loadOrderList = (page: number = 1) => {
-  orderTable.loading = true
-  orderTable.page = page
+    orderTable.loading = true
+    orderTable.page = page
 
-  getOrderList({
-    page: orderTable.page,
-    limit: orderTable.limit,
-    ...orderTable.searchParam,
-  })
-    .then((res) => {
-      orderTable.loading = false
-      orderTable.data = res.data.data.map((el: any) => {
-        el.order_goods.forEach((v: any) => {
-          v.rowNum = el.order_goods.length
+    getOrderList({
+        page: orderTable.page,
+        limit: orderTable.limit,
+        ...orderTable.searchParam
+    }).then(res => {
+        orderTable.loading = false
+        orderTable.data = res.data.data.map((el: any) => {
+            el.order_goods.forEach((v: any) => {
+                v.rowNum = el.order_goods.length
+            })
+            return el
         })
-        return el
-      })
-      orderTable.total = res.data.total
-      setTablePageStorage(
-        orderTable.page,
-        orderTable.limit,
-        orderTable.searchParam
-      )
-    })
-    .catch(() => {
-      orderTable.loading = false
+        orderTable.total = res.data.total
+        setTablePageStorage(orderTable.page, orderTable.limit, orderTable.searchParam);
+    }).catch(() => {
+        orderTable.loading = false
     })
 }
-loadOrderList(getTablePageStorage(orderTable.searchParam).page)
+loadOrderList(getTablePageStorage(orderTable.searchParam).page);
 // 合并表格行
-const arraySpanMethod = ({ row, column, rowIndex, columnIndex }: any) => {
-  if (rowIndex === 0) {
-    if (columnIndex > 1) {
-      return [row.rowNum, 1]
+const arraySpanMethod = ({
+    row,
+    column,
+    rowIndex,
+    columnIndex
+}:any) => {
+    if (rowIndex === 0) {
+        if (columnIndex > 1) {
+            return [row.rowNum, 1]
+        } else {
+            return [1, 1]
+        }
     } else {
-      return [1, 1]
+        if (columnIndex > 1) {
+            return [0, 0]
+        } else {
+            return [1, 1]
+        }
     }
-  } else {
-    if (columnIndex > 1) {
-      return [0, 0]
-    } else {
-      return [1, 1]
-    }
-  }
 }
 const handleClick = (event: any) => {
-  orderTable.searchParam.status = event
-  loadOrderList()
+    orderTable.searchParam.status = event
+    loadOrderList()
 }
 
 // 订单详情
 const detailEvent = (data: any) => {
-  const url = router.resolve({
-    path: '/shop/order/detail',
-    query: {
-      order_id: data.order_id,
-    },
-  })
-  window.open(url.href)
+    const url = router.resolve({
+        path: '/shop/order/detail',
+        query: {
+            order_id: data.order_id
+        }
+    })
+    window.open(url.href)
 }
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadOrderList()
+    if (!formEl) return
+    formEl.resetFields()
+    loadOrderList()
 }
 </script>
 
 <style lang="scss" scoped>
-.table-top :deep(.el-table__body-wrapper) {
-  display: none;
+    .table-top :deep(.el-table__body-wrapper) {
+	display: none;
 }
 
 :deep(.el-table) {
-  --el-table-row-hover-bg-color: var(--el-transfer-border-color);
+	--el-table-row-hover-bg-color: var(--el-transfer-border-color);
 }
 
 /* 多行超出隐藏 */
 .multi-hidden {
-  word-break: break-all;
-  text-overflow: ellipsis;
-  overflow: hidden;
-  display: -webkit-box;
-  -webkit-line-clamp: 2;
-  -webkit-box-orient: vertical;
+	word-break: break-all;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	display: -webkit-box;
+	-webkit-line-clamp: 2;
+	-webkit-box-orient: vertical;
 }
 .input-item {
-  width: 150px !important;
+    width: 150px !important;
 }
 </style>
diff --git a/admin/src/addon/shop/views/member/components/benefits-free-shipping.vue b/admin/src/addon/shop/views/member/components/benefits-free-shipping.vue
index e13e3293..e4b80c2a 100644
--- a/admin/src/addon/shop/views/member/components/benefits-free-shipping.vue
+++ b/admin/src/addon/shop/views/member/components/benefits-free-shipping.vue
@@ -1,20 +1,13 @@
 <template>
-  <el-form ref="formRef" :model="formData" :rules="formRules">
-    <el-form-item label="" prop="money" class="!mb-0">
-      <div class="flex items-center">
-        <el-checkbox
-          v-model="formData.is_use"
-          :true-label="1"
-          :false-label="0"
-          label=""
-          size="large"
-          class="!mr-0"
-        />
-        <span class="ml-[10px] el-form-item__label">包邮</span>
-      </div>
-    </el-form-item>
-    <div class="text-sm text-gray-400 mb-[5px]">该包邮仅针对物流配送</div>
-  </el-form>
+    <el-form ref="formRef" :model="formData" :rules="formRules">
+        <el-form-item label="" prop="money" class="!mb-0">
+            <div class="flex items-center">
+                <el-checkbox v-model="formData.is_use" :true-label="1" :false-label="0" label="" size="large" class="!mr-0"/>
+                <span class="ml-[10px] el-form-item__label">包邮</span>
+            </div>
+        </el-form-item>
+        <div class="text-sm text-gray-400 mb-[5px]">该包邮仅针对物流配送</div>
+    </el-form>
 </template>
 
 <script lang="ts" setup>
@@ -22,56 +15,49 @@ import { computed, reactive, ref, watch } from 'vue'
 import { FormRules } from 'element-plus'
 
 const props = defineProps({
-  modelValue: {
-    type: Object,
-    default: () => {
-      return {}
-    },
-  },
+    modelValue: {
+        type: Object,
+        default: () => {
+            return {}
+        }
+    }
 })
 const emits = defineEmits(['update:modelValue'])
 
 const formData = ref({
-  is_use: 0,
+    is_use: 0
 })
 const formRef = ref(null)
 
 const formRules = reactive<FormRules>({})
 
 const value = computed({
-  get() {
-    return props.modelValue
-  },
-  set(value) {
-    emits('update:modelValue', value)
-  },
+    get () {
+        return props.modelValue
+    },
+    set (value) {
+        emits('update:modelValue', value)
+    }
 })
 
-watch(
-  () => value.value,
-  (nval, oval) => {
+watch(() => value.value, (nval, oval) => {
     if ((!oval || !Object.keys(oval).length) && Object.keys(nval).length) {
-      formData.value = value.value
+        formData.value = value.value
     }
-  },
-  { immediate: true }
-)
+}, { immediate: true })
 
-watch(
-  () => formData.value,
-  () => {
+watch(() => formData.value, () => {
     value.value = formData.value
-  },
-  { deep: true }
-)
+}, { deep: true })
 
 const verify = async () => {
-  return true
+    return true
 }
 
 defineExpose({
-  verify,
+    verify
 })
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
diff --git a/admin/src/addon/shop/views/member/components/gift-coupon.vue b/admin/src/addon/shop/views/member/components/gift-coupon.vue
index 8b80f97b..4a2ecd59 100644
--- a/admin/src/addon/shop/views/member/components/gift-coupon.vue
+++ b/admin/src/addon/shop/views/member/components/gift-coupon.vue
@@ -1,89 +1,64 @@
 <template>
-  <el-form ref="formRef" :model="formData" :rules="formRules">
-    <el-form-item label="" class="!mb-0">
-      <div class="flex items-center">
-        <el-checkbox
-          v-model="formData.is_use"
-          label=""
-          :true-label="1"
-          :false-label="0"
-          size="large"
-          class="!mr-0"
-        />
-        <span class="ml-[10px] el-form-item__label">送优惠券</span>
-      </div>
-    </el-form-item>
-    <el-form-item label="" prop="coupon_id" v-show="formData.is_use">
-      <div class="flex-1 max-w-[1000px]">
-        <div>
-          <coupon-select-popup
-            v-model="formData.coupon_id"
-            ref="selectCouponRef"
-          >
-            <el-button type="primary" link>选择优惠券</el-button>
-          </coupon-select-popup>
-        </div>
-        <div v-if="couponList.length" class="mt-[10px] w-[100%]">
-          <el-table
-            :data="couponList"
-            size="default"
-            ref="couponListTableRef"
-            max-height="400"
-          >
-            <el-table-column prop="title" label="名称" min-width="130" />
-            <el-table-column prop="type_name" label="类型" min-width="130" />
-            <el-table-column prop="price" label="面值" min-width="130">
-              <template #default="{ row }">
-                <span>¥{{ row.price }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="使用门槛" min-width="130">
-              <template #default="{ row }">
-                <span v-if="row.min_condition_money == '0.00'">无门槛</span>
-                <span v-else>满{{ row.min_condition_money }}元可用</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="有效期" min-width="210">
-              <template #default="{ row }">
-                <template v-if="row.receive_type == 1">
-                  <span v-if="row.valid_type == 1">
-                    领取之日起{{ row.length || '' }} 天内有效</span
-                  >
-                  <span v-else>
-                    使用截止时间至{{ row.valid_end_time || '' }}
-                  </span>
-                </template>
-                <span v-else>--</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="赠券数" min-width="130">
-              <template #default="{ row }">
-                <el-input-number
-                  v-model="formData.coupon_list['id_' + row.id]"
-                  :min="1"
-                  :precision="0"
-                  :max="row.limit_count"
-                  controls-position="right"
-                  class="!w-[100px]"
-                />
-              </template>
-            </el-table-column>
-            <el-table-column
-              :label="t('operation')"
-              align="right"
-              fixed="right"
-            >
-              <template #default="{ row }">
-                <el-button type="primary" link @click="deleteCoupon(row)">{{
-                  t('delete')
-                }}</el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-      </div>
-    </el-form-item>
-  </el-form>
+    <el-form ref="formRef" :model="formData" :rules="formRules">
+        <el-form-item label="" class="!mb-0">
+            <div class="flex items-center">
+                <el-checkbox v-model="formData.is_use" label="" :true-label="1" :false-label="0" size="large" class="!mr-0"/>
+                <span class="ml-[10px] el-form-item__label">送优惠券</span>
+            </div>
+        </el-form-item>
+        <el-form-item label="" prop="coupon_id" v-show="formData.is_use">
+            <div class="flex-1 max-w-[1000px]">
+                <div>
+                    <coupon-select-popup v-model="formData.coupon_id" ref="selectCouponRef">
+                        <el-button type="primary" link>选择优惠券</el-button>
+                    </coupon-select-popup>
+                </div>
+                <div v-if="couponList.length" class="mt-[10px] w-[100%]">
+                    <el-table :data="couponList" size="default" ref="couponListTableRef" max-height="400">
+                        <el-table-column prop="title" label="名称" min-width="130" />
+                        <el-table-column prop="type_name" label="类型" min-width="130" />
+                        <el-table-column prop="price" label="面值" min-width="130" >
+                            <template #default="{ row }">
+                                <span >¥{{row.price}}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="使用门槛" min-width="130" >
+                            <template #default="{ row }">
+                                <span v-if="row.min_condition_money == '0.00'">无门槛</span>
+                                <span v-else >满{{ row.min_condition_money }}元可用</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="有效期" min-width="210">
+                            <template #default="{ row }">
+                                <template v-if="row.receive_type == 1">
+                                    <span v-if="row.valid_type == 1">  领取之日起{{ row.length || '' }} 天内有效</span>
+                                    <span v-else> 使用截止时间至{{ row.valid_end_time || ''}} </span>
+                                </template>
+                                <span v-else>--</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="赠券数" min-width="130">
+                            <template #default="{ row }">
+                                <el-input-number
+                                    v-model="formData.coupon_list['id_' + row.id]"
+                                    :min="1"
+                                    :precision="0"
+                                    :max="row.limit_count"
+                                    controls-position="right"
+                                    class="!w-[100px]"
+                                />
+                            </template>
+                        </el-table-column>
+                        <el-table-column :label="t('operation')" align="right" fixed="right">
+                            <template #default="{ row }">
+                                <el-button type="primary" link @click="deleteCoupon(row)">{{ t('delete') }}</el-button>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </div>
+            </div>
+        </el-form-item>
+    </el-form>
 </template>
 
 <script lang="ts" setup>
@@ -94,108 +69,95 @@ import { t } from '@/lang'
 import { FormRules } from 'element-plus'
 
 const props = defineProps({
-  modelValue: {
-    type: Object,
-    default: () => {
-      return {}
-    },
-  },
+    modelValue: {
+        type: Object,
+        default: () => {
+            return {}
+        }
+    }
 })
 const selectCouponRef = ref(null)
 const emits = defineEmits(['update:modelValue'])
 const formData = ref({
-  is_use: 0,
-  coupon_id: [],
-  coupon_list: {},
+    is_use: 0,
+    coupon_id: [],
+    coupon_list: {}
 })
 const formRef = ref(null)
 
 const formRules = reactive<FormRules>({
-  coupon_id: [
-    {
-      validator: (rule: any, value: any, callback: any) => {
-        if (formData.value.is_use) {
-          if (!formData.value.coupon_id.length) {
-            callback('请输入选择优惠券')
-          }
-          formData.value.coupon_id.forEach((id) => {
-            if (!formData.value.coupon_list['id_' + id]) {
-              callback('请输入赠券数量')
+    coupon_id: [
+        {
+            validator: (rule: any, value: any, callback: any) => {
+                if (formData.value.is_use) {
+                    if (!formData.value.coupon_id.length) {
+                        callback('请输入选择优惠券')
+                    }
+                    formData.value.coupon_id.forEach(id => {
+                        if (!formData.value.coupon_list['id_' + id]) {
+                            callback('请输入赠券数量')
+                        }
+                    })
+                    callback()
+                } else {
+                    callback()
+                }
             }
-          })
-          callback()
-        } else {
-          callback()
         }
-      },
-    },
-  ],
+    ]
 })
 const value = computed({
-  get() {
-    return props.modelValue
-  },
-  set(value) {
-    emits('update:modelValue', value)
-  },
+    get () {
+        return props.modelValue
+    },
+    set (value) {
+        emits('update:modelValue', value)
+    }
 })
 const couponList = ref([])
 
-watch(
-  () => value.value,
-  (nval, oval) => {
+watch(() => value.value, (nval, oval) => {
     if ((!oval || !Object.keys(oval).length) && Object.keys(nval).length) {
-      formData.value = value.value
+        formData.value = value.value
     }
-  },
-  { immediate: true }
-)
+}, { immediate: true })
 
-watch(
-  () => formData.value,
-  () => {
+watch(() => formData.value, () => {
     value.value = formData.value
-  },
-  { deep: true }
-)
+}, { deep: true })
 
-watch(
-  () => formData.value.coupon_id,
-  () => {
+watch(() => formData.value.coupon_id, () => {
     if (formData.value.coupon_id.length) {
-      getSelectedCouponList({
-        coupon_id: formData.value.coupon_id.toString(),
-      }).then(({ data }) => {
-        couponList.value = data
-      })
+        getSelectedCouponList({ coupon_id: formData.value.coupon_id.toString() }).then(({ data }) => {
+            couponList.value = data
+        })
     } else {
-      formData.value.coupon_list = {}
-      couponList.value = []
+        formData.value.coupon_list = {}
+        couponList.value = []
     }
-  },
-  { deep: true, immediate: true }
-)
+}, { deep: true, immediate: true })
 
 const verify = async () => {
-  let verify = true
-  await formRef.value?.validate((valid) => {
-    verify = valid
-  })
-  return verify
+    let verify = true
+    await formRef.value?.validate((valid) => {
+        verify = valid
+    })
+    return verify
 }
 
 const showCouponDialog = () => {
-  selectCouponRef.value.showDialog()
+    selectCouponRef.value.showDialog()
 }
 
 const deleteCoupon = (row: any) => {
-  delete formData.value.coupon_list['id_' + row.id]
-  formData.value.coupon_id.splice(formData.value.coupon_id.indexOf(row.id), 1)
+    delete formData.value.coupon_list['id_' + row.id]
+    formData.value.coupon_id.splice(formData.value.coupon_id.indexOf(row.id), 1)
 }
 
 defineExpose({
-  verify,
+    verify
 })
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
diff --git a/admin/src/addon/shop/views/member/components/growth-rule-buygoods.vue b/admin/src/addon/shop/views/member/components/growth-rule-buygoods.vue
index f9a3c2c0..176e02f2 100644
--- a/admin/src/addon/shop/views/member/components/growth-rule-buygoods.vue
+++ b/admin/src/addon/shop/views/member/components/growth-rule-buygoods.vue
@@ -1,29 +1,25 @@
 <template>
-  <el-form ref="formRef" :model="formData" :rules="formRules">
-    <el-form-item label="" prop="money">
-      <div>
-        <div>
-          <span class="el-form-item__label">购买商品</span>
-          <el-switch
-            v-model="formData.is_use"
-            :active-value="1"
-            :inactive-value="0"
-          />
-        </div>
-        <div class="flex mt-[10px]" v-show="formData.is_use">
-          <span class="el-form-item__label">每消费</span>
-          <div class="w-[70px]">
-            <el-input v-model.trim="formData.money" clearable />
-          </div>
-          <span class="ml-[10px] el-form-item__label">元，获得</span>
-          <div class="w-[70px]">
-            <el-input v-model.number.trim="formData.growth" clearable />
-          </div>
-          <span class="ml-[10px] el-form-item__label">成长值</span>
-        </div>
-      </div>
-    </el-form-item>
-  </el-form>
+    <el-form ref="formRef" :model="formData" :rules="formRules">
+        <el-form-item label="" prop="money">
+            <div>
+                <div>
+                    <span class="el-form-item__label">购买商品</span>
+                    <el-switch v-model="formData.is_use" :active-value="1" :inactive-value="0"/>
+                </div>
+                <div class="flex mt-[10px]" v-show="formData.is_use">
+                    <span class="el-form-item__label">每消费</span>
+                    <div class="w-[70px]">
+                        <el-input v-model.trim="formData.money" clearable />
+                    </div>
+                    <span class="ml-[10px] el-form-item__label">元，获得</span>
+                    <div class="w-[70px]">
+                        <el-input v-model.number.trim="formData.growth" clearable />
+                    </div>
+                    <span class="ml-[10px] el-form-item__label">成长值</span>
+                </div>
+            </div>
+        </el-form-item>
+    </el-form>
 </template>
 
 <script lang="ts" setup>
@@ -32,93 +28,86 @@ import { FormRules } from 'element-plus'
 import Test from '@/utils/test'
 
 const props = defineProps({
-  modelValue: {
-    type: Object,
-    default: () => {
-      return {}
-    },
-  },
+    modelValue: {
+        type: Object,
+        default: () => {
+            return {}
+        }
+    }
 })
 const emits = defineEmits(['update:modelValue'])
 
 const formData = ref({
-  is_use: 0,
-  money: '',
-  growth: '',
+    is_use: 0,
+    money: '',
+    growth: ''
 })
 
 const formRef = ref(null)
 
 const formRules = reactive<FormRules>({
-  money: [
-    {
-      validator: (rule: any, value: any, callback: Function) => {
-        if (formData.value.is_use) {
-          if (Test.empty(formData.value.money)) {
-            callback('请输入消费金额')
-          }
-          if (!Test.amount(formData.value.money)) {
-            callback('消费金额格式错误')
-          }
-          if (formData.value.money <= 0) {
-            callback('消费金额不能小于等于0')
-          }
-          if (Test.empty(formData.value.growth)) {
-            callback('请输入发放成长值数量')
-          }
-          if (!Test.digits(formData.value.growth)) {
-            callback('成长值数量格式错误')
-          }
-          if (formData.value.growth <= 0) {
-            callback('成长值数量不能小于等于0')
-          }
-          callback()
-        } else {
-          callback()
+    money: [
+        {
+            validator: (rule: any, value: any, callback: Function) => {
+                if (formData.value.is_use) {
+                    if (Test.empty(formData.value.money)) {
+                        callback('请输入消费金额')
+                    }
+                    if (!Test.amount(formData.value.money)) {
+                        callback('消费金额格式错误')
+                    }
+                    if (formData.value.money <= 0) {
+                        callback('消费金额不能小于等于0')
+                    }
+                    if (Test.empty(formData.value.growth)) {
+                        callback('请输入发放成长值数量')
+                    }
+                    if (!Test.digits(formData.value.growth)) {
+                        callback('成长值数量格式错误')
+                    }
+                    if (formData.value.growth <= 0) {
+                        callback('成长值数量不能小于等于0')
+                    }
+                    callback()
+                } else {
+                    callback()
+                }
+            }
         }
-      },
-    },
-  ],
+    ]
 })
 
 const value = computed({
-  get() {
-    return props.modelValue
-  },
-  set(value) {
-    emits('update:modelValue', value)
-  },
+    get () {
+        return props.modelValue
+    },
+    set (value) {
+        emits('update:modelValue', value)
+    }
 })
 
-watch(
-  () => value.value,
-  (nval, oval) => {
+watch(() => value.value, (nval, oval) => {
     if ((!oval || !Object.keys(oval).length) && Object.keys(nval).length) {
-      formData.value = value.value
+        formData.value = value.value
     }
-  },
-  { immediate: true }
-)
+}, { immediate: true })
 
-watch(
-  () => formData.value,
-  () => {
+watch(() => formData.value, () => {
     value.value = formData.value
-  },
-  { deep: true }
-)
+}, { deep: true })
 
 const verify = async () => {
-  let verify = true
-  await formRef.value?.validate((valid) => {
-    verify = valid
-  })
-  return verify
+    let verify = true
+    await formRef.value?.validate((valid) => {
+        verify = valid
+    })
+    return verify
 }
 
 defineExpose({
-  verify,
+    verify
 })
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
diff --git a/admin/src/addon/shop/views/member/components/growth-rule-buyorder.vue b/admin/src/addon/shop/views/member/components/growth-rule-buyorder.vue
index ddb72263..846827ac 100644
--- a/admin/src/addon/shop/views/member/components/growth-rule-buyorder.vue
+++ b/admin/src/addon/shop/views/member/components/growth-rule-buyorder.vue
@@ -1,25 +1,21 @@
 <template>
-  <el-form ref="formRef" :model="formData" :rules="formRules">
-    <el-form-item label="" prop="growth">
-      <div>
-        <div>
-          <span class="el-form-item__label">完成下单</span>
-          <el-switch
-            v-model="formData.is_use"
-            :active-value="1"
-            :inactive-value="0"
-          />
-        </div>
-        <div class="flex mt-[10px]" v-show="formData.is_use">
-          <span class="el-form-item__label">每完成一单可获得</span>
-          <div class="w-[70px]">
-            <el-input v-model.number.trim="formData.growth" clearable />
-          </div>
-          <span class="ml-[10px] el-form-item__label">成长值</span>
-        </div>
-      </div>
-    </el-form-item>
-  </el-form>
+    <el-form ref="formRef" :model="formData" :rules="formRules">
+        <el-form-item label="" prop="growth">
+            <div>
+                <div>
+                    <span class="el-form-item__label">完成下单</span>
+                    <el-switch v-model="formData.is_use" :active-value="1" :inactive-value="0"/>
+                </div>
+                <div class="flex mt-[10px]" v-show="formData.is_use">
+                    <span class="el-form-item__label">每完成一单可获得</span>
+                    <div class="w-[70px]">
+                        <el-input v-model.number.trim="formData.growth" clearable />
+                    </div>
+                    <span class="ml-[10px] el-form-item__label">成长值</span>
+                </div>
+            </div>
+        </el-form-item>
+    </el-form>
 </template>
 
 <script lang="ts" setup>
@@ -28,83 +24,76 @@ import { FormRules } from 'element-plus'
 import Test from '@/utils/test'
 
 const props = defineProps({
-  modelValue: {
-    type: Object,
-    default: () => {
-      return {}
-    },
-  },
+    modelValue: {
+        type: Object,
+        default: () => {
+            return {}
+        }
+    }
 })
 const emits = defineEmits(['update:modelValue'])
 
 const formData = ref({
-  is_use: 0,
-  growth: '',
+    is_use: 0,
+    growth: ''
 })
 
 const formRef = ref(null)
 
 const formRules = reactive<FormRules>({
-  growth: [
-    {
-      validator: (rule: any, value: any, callback: Function) => {
-        if (formData.value.is_use) {
-          if (Test.empty(formData.value.growth)) {
-            callback('请输入发放成长值数量')
-          }
-          if (!Test.digits(formData.value.growth)) {
-            callback('成长值数量格式错误')
-          }
-          if (formData.value.growth <= 0) {
-            callback('成长值数量不能小于等于0')
-          }
-          callback()
-        } else {
-          callback()
+    growth: [
+        {
+            validator: (rule: any, value: any, callback: Function) => {
+                if (formData.value.is_use) {
+                    if (Test.empty(formData.value.growth)) {
+                        callback('请输入发放成长值数量')
+                    }
+                    if (!Test.digits(formData.value.growth)) {
+                        callback('成长值数量格式错误')
+                    }
+                    if (formData.value.growth <= 0) {
+                        callback('成长值数量不能小于等于0')
+                    }
+                    callback()
+                } else {
+                    callback()
+                }
+            }
         }
-      },
-    },
-  ],
+    ]
 })
 
 const value = computed({
-  get() {
-    return props.modelValue
-  },
-  set(value) {
-    emits('update:modelValue', value)
-  },
+    get () {
+        return props.modelValue
+    },
+    set (value) {
+        emits('update:modelValue', value)
+    }
 })
 
-watch(
-  () => value.value,
-  (nval, oval) => {
+watch(() => value.value, (nval, oval) => {
     if ((!oval || !Object.keys(oval).length) && Object.keys(nval).length) {
-      formData.value = value.value
+        formData.value = value.value
     }
-  },
-  { immediate: true }
-)
+}, { immediate: true })
 
-watch(
-  () => formData.value,
-  () => {
+watch(() => formData.value, () => {
     value.value = formData.value
-  },
-  { deep: true }
-)
+}, { deep: true })
 
 const verify = async () => {
-  let verify = true
-  await formRef.value?.validate((valid) => {
-    verify = valid
-  })
-  return verify
+    let verify = true
+    await formRef.value?.validate((valid) => {
+        verify = valid
+    })
+    return verify
 }
 
 defineExpose({
-  verify,
+    verify
 })
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
diff --git a/admin/src/addon/shop/views/member/components/point-rule-buygoods.vue b/admin/src/addon/shop/views/member/components/point-rule-buygoods.vue
index 4384b61b..fe7ba625 100644
--- a/admin/src/addon/shop/views/member/components/point-rule-buygoods.vue
+++ b/admin/src/addon/shop/views/member/components/point-rule-buygoods.vue
@@ -1,33 +1,25 @@
 <template>
-  <el-form ref="formRef" :model="formData" :rules="formRules">
-    <el-form-item label="" prop="money">
-      <div>
-        <div>
-          <span class="el-form-item__label">购买商品</span>
-          <el-switch
-            v-model="formData.is_use"
-            :active-value="1"
-            :inactive-value="0"
-          />
-        </div>
-        <div class="flex mt-[10px]" v-show="formData.is_use">
-          <span class="el-form-item__label">每消费</span>
-          <div class="w-[100px]">
-            <el-input v-model.trim="formData.money" clearable maxlength="8" />
-          </div>
-          <span class="ml-[10px] el-form-item__label">元，获得</span>
-          <div class="w-[100px]">
-            <el-input
-              v-model.number.trim="formData.point"
-              clearable
-              maxlength="8"
-            />
-          </div>
-          <span class="ml-[10px] el-form-item__label">积分</span>
-        </div>
-      </div>
-    </el-form-item>
-  </el-form>
+    <el-form ref="formRef" :model="formData" :rules="formRules">
+        <el-form-item label="" prop="money">
+            <div>
+                <div>
+                    <span class="el-form-item__label">购买商品</span>
+                    <el-switch v-model="formData.is_use" :active-value="1" :inactive-value="0"/>
+                </div>
+                <div class="flex mt-[10px]" v-show="formData.is_use">
+                    <span class="el-form-item__label">每消费</span>
+                    <div class="w-[100px]">
+                        <el-input v-model.trim="formData.money" clearable maxlength="8" />
+                    </div>
+                    <span class="ml-[10px] el-form-item__label">元，获得</span>
+                    <div class="w-[100px]">
+                        <el-input v-model.number.trim="formData.point" clearable maxlength="8" />
+                    </div>
+                    <span class="ml-[10px] el-form-item__label">积分</span>
+                </div>
+            </div>
+        </el-form-item>
+    </el-form>
 </template>
 
 <script lang="ts" setup>
@@ -36,93 +28,86 @@ import { FormRules } from 'element-plus'
 import Test from '@/utils/test'
 
 const props = defineProps({
-  modelValue: {
-    type: Object,
-    default: () => {
-      return {}
-    },
-  },
+    modelValue: {
+        type: Object,
+        default: () => {
+            return {}
+        }
+    }
 })
 const emits = defineEmits(['update:modelValue'])
 
 const formData = ref({
-  is_use: 0,
-  money: '',
-  point: '',
+    is_use: 0,
+    money: '',
+    point: ''
 })
 
 const formRef = ref(null)
 
 const formRules = reactive<FormRules>({
-  money: [
-    {
-      validator: (rule: any, value: any, callback: Function) => {
-        if (formData.value.is_use) {
-          if (Test.empty(formData.value.money)) {
-            callback('请输入消费金额')
-          }
-          if (!Test.amount(formData.value.money)) {
-            callback('消费金额格式错误')
-          }
-          if (formData.value.money <= 0) {
-            callback('消费金额不能小于等于0')
-          }
-          if (Test.empty(formData.value.point)) {
-            callback('请输入发放积分数量')
-          }
-          if (!Test.digits(formData.value.point)) {
-            callback('积分数量格式错误')
-          }
-          if (formData.value.point <= 0) {
-            callback('积分数量不能小于等于0')
-          }
-          callback()
-        } else {
-          callback()
+    money: [
+        {
+            validator: (rule: any, value: any, callback: Function) => {
+                if (formData.value.is_use) {
+                    if (Test.empty(formData.value.money)) {
+                        callback('请输入消费金额')
+                    }
+                    if (!Test.amount(formData.value.money)) {
+                        callback('消费金额格式错误')
+                    }
+                    if (formData.value.money <= 0) {
+                        callback('消费金额不能小于等于0')
+                    }
+                    if (Test.empty(formData.value.point)) {
+                        callback('请输入发放积分数量')
+                    }
+                    if (!Test.digits(formData.value.point)) {
+                        callback('积分数量格式错误')
+                    }
+                    if (formData.value.point <= 0) {
+                        callback('积分数量不能小于等于0')
+                    }
+                    callback()
+                } else {
+                    callback()
+                }
+            }
         }
-      },
-    },
-  ],
+    ]
 })
 
 const value = computed({
-  get() {
-    return props.modelValue
-  },
-  set(value) {
-    emits('update:modelValue', value)
-  },
+    get () {
+        return props.modelValue
+    },
+    set (value) {
+        emits('update:modelValue', value)
+    }
 })
 
-watch(
-  () => value.value,
-  (nval, oval) => {
+watch(() => value.value, (nval, oval) => {
     if ((!oval || !Object.keys(oval).length) && Object.keys(nval).length) {
-      formData.value = value.value
+        formData.value = value.value
     }
-  },
-  { immediate: true }
-)
+}, { immediate: true })
 
-watch(
-  () => formData.value,
-  () => {
+watch(() => formData.value, () => {
     value.value = formData.value
-  },
-  { deep: true }
-)
+}, { deep: true })
 
 const verify = async () => {
-  let verify = true
-  await formRef.value?.validate((valid) => {
-    verify = valid
-  })
-  return verify
+    let verify = true
+    await formRef.value?.validate((valid) => {
+        verify = valid
+    })
+    return verify
 }
 
 defineExpose({
-  verify,
+    verify
 })
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
diff --git a/admin/src/addon/shop/views/member/components/point-rule-orderdeduction.vue b/admin/src/addon/shop/views/member/components/point-rule-orderdeduction.vue
index 3e291c10..c599a6f4 100644
--- a/admin/src/addon/shop/views/member/components/point-rule-orderdeduction.vue
+++ b/admin/src/addon/shop/views/member/components/point-rule-orderdeduction.vue
@@ -1,31 +1,25 @@
 <template>
-  <el-form ref="formRef" :model="formData" :rules="formRules">
-    <el-form-item label="" prop="money">
-      <div>
-        <div>
-          <el-checkbox
-            v-model="formData.is_use"
-            :true-label="1"
-            :false-label="0"
-            label=""
-            size="large"
-          />
-          <span class="ml-[10px] el-form-item__label">积分抵现</span>
-        </div>
-        <div class="flex" v-show="formData.is_use">
-          <span class="el-form-item__label">每</span>
-          <div class="w-[70px]">
-            <el-input v-model.number.trim="formData.point" clearable />
-          </div>
-          <span class="ml-[10px] el-form-item__label">积分，可抵扣</span>
-          <div class="w-[70px]">
-            <el-input v-model.trim="formData.money" clearable />
-          </div>
-          <span class="ml-[10px] el-form-item__label">元</span>
-        </div>
-      </div>
-    </el-form-item>
-  </el-form>
+    <el-form ref="formRef" :model="formData" :rules="formRules">
+        <el-form-item label="" prop="money">
+            <div>
+                <div>
+                    <el-checkbox v-model="formData.is_use" :true-label="1" :false-label="0" label="" size="large" />
+                    <span class="ml-[10px] el-form-item__label">积分抵现</span>
+                </div>
+                <div class="flex" v-show="formData.is_use">
+                    <span class="el-form-item__label">每</span>
+                    <div class="w-[70px]">
+                        <el-input v-model.number.trim="formData.point" clearable />
+                    </div>
+                    <span class="ml-[10px] el-form-item__label">积分，可抵扣</span>
+                    <div class="w-[70px]">
+                        <el-input v-model.trim="formData.money" clearable />
+                    </div>
+                    <span class="ml-[10px] el-form-item__label">元</span>
+                </div>
+            </div>
+        </el-form-item>
+    </el-form>
 </template>
 
 <script lang="ts" setup>
@@ -34,93 +28,86 @@ import { FormRules } from 'element-plus'
 import Test from '@/utils/test'
 
 const props = defineProps({
-  modelValue: {
-    type: Object,
-    default: () => {
-      return {}
-    },
-  },
+    modelValue: {
+        type: Object,
+        default: () => {
+            return {}
+        }
+    }
 })
 const emits = defineEmits(['update:modelValue'])
 
 const formData = ref({
-  is_use: 0,
-  money: '',
-  point: '',
+    is_use: 0,
+    money: '',
+    point: ''
 })
 
 const formRef = ref(null)
 
 const formRules = reactive<FormRules>({
-  money: [
-    {
-      validator: (rule: any, value: any, callback: Function) => {
-        if (formData.value.is_use) {
-          if (Test.empty(formData.value.point)) {
-            callback('请输入积分数量')
-          }
-          if (!Test.digits(formData.value.point)) {
-            callback('积分数量格式错误')
-          }
-          if (formData.value.point <= 0) {
-            callback('积分数量不能小于等于0')
-          }
-          if (Test.empty(formData.value.money)) {
-            callback('请输入可抵扣金额')
-          }
-          if (!Test.amount(formData.value.money)) {
-            callback('抵扣金额格式错误')
-          }
-          if (formData.value.money <= 0) {
-            callback('抵扣金额不能小于等于0')
-          }
-          callback()
-        } else {
-          callback()
+    money: [
+        {
+            validator: (rule: any, value: any, callback: Function) => {
+                if (formData.value.is_use) {
+                    if (Test.empty(formData.value.point)) {
+                        callback('请输入积分数量')
+                    }
+                    if (!Test.digits(formData.value.point)) {
+                        callback('积分数量格式错误')
+                    }
+                    if (formData.value.point <= 0) {
+                        callback('积分数量不能小于等于0')
+                    }
+                    if (Test.empty(formData.value.money)) {
+                        callback('请输入可抵扣金额')
+                    }
+                    if (!Test.amount(formData.value.money)) {
+                        callback('抵扣金额格式错误')
+                    }
+                    if (formData.value.money <= 0) {
+                        callback('抵扣金额不能小于等于0')
+                    }
+                    callback()
+                } else {
+                    callback()
+                }
+            }
         }
-      },
-    },
-  ],
+    ]
 })
 
 const value = computed({
-  get() {
-    return props.modelValue
-  },
-  set(value) {
-    emits('update:modelValue', value)
-  },
+    get () {
+        return props.modelValue
+    },
+    set (value) {
+        emits('update:modelValue', value)
+    }
 })
 
-watch(
-  () => value.value,
-  (nval, oval) => {
+watch(() => value.value, (nval, oval) => {
     if ((!oval || !Object.keys(oval).length) && Object.keys(nval).length) {
-      formData.value = value.value
+        formData.value = value.value
     }
-  },
-  { immediate: true }
-)
+}, { immediate: true })
 
-watch(
-  () => formData.value,
-  () => {
+watch(() => formData.value, () => {
     value.value = formData.value
-  },
-  { deep: true }
-)
+}, { deep: true })
 
 const verify = async () => {
-  let verify = true
-  await formRef.value?.validate((valid) => {
-    verify = valid
-  })
-  return verify
+    let verify = true
+    await formRef.value?.validate((valid) => {
+        verify = valid
+    })
+    return verify
 }
 
 defineExpose({
-  verify,
+    verify
 })
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
diff --git a/admin/src/addon/shop/views/member/components/recharge-detail-coupon.vue b/admin/src/addon/shop/views/member/components/recharge-detail-coupon.vue
index c4d40a93..f0afa0b3 100644
--- a/admin/src/addon/shop/views/member/components/recharge-detail-coupon.vue
+++ b/admin/src/addon/shop/views/member/components/recharge-detail-coupon.vue
@@ -1,183 +1,163 @@
 <template>
-  <el-form
-    ref="formRef"
-    label-width="120px"
-    :model="formData"
-    :rules="formRules"
-    label-position="left"
-  >
-    <el-form-item class="mt-[15px]" :label="t('coupon')">
-      <div class="coupon_list">
-        <el-table :data="formData.value" size="large" max-height="600">
-          <el-table-column prop="title" :label="t('name')" min-width="120">
-            <template #default="{ row }">
-              <div>{{ row.title }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="type_name" :label="t('type')" min-width="120">
-            <template #default="{ row }">
-              <div>{{ row.type_name }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="price"
-            :label="t('couponPrice')"
-            min-width="120"
-          >
-            <template #default="{ row }">
-              <div>￥{{ row.price }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('useThreshold')" min-width="130">
-            <template #default="{ row }">
-              <span v-if="row.min_condition_money == '0.00'">无门槛</span>
-              <span v-else>满{{ row.min_condition_money }}元可用</span>
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('termOfValidity')" min-width="210">
-            <template #default="{ row }">
-              <span v-if="row.valid_type == 1">
-                领取之日起{{ row.length || '' }} 天内有效</span
-              >
-              <span v-else> 使用截止时间至{{ row.valid_end_time || '' }} </span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="num" :label="t('num')" min-width="120">
-            <template #default="{ row }">
-              <div>{{ row.num }}</div>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </el-form-item>
-  </el-form>
+    <el-form ref="formRef" label-width="120px" :model="formData" :rules="formRules" label-position="left">
+        <el-form-item class="mt-[15px]" :label="t('coupon')" >
+            <div class="coupon_list">
+                <el-table :data="formData.value " size="large" max-height="600" >
+                    <el-table-column prop="title" :label="t('name')" min-width="120">
+                        <template #default="{ row }">
+                            <div>{{ row.title }}</div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="type_name" :label="t('type')" min-width="120">
+                        <template #default="{ row }">
+                            <div>{{ row.type_name }}</div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="price" :label="t('couponPrice')" min-width="120">
+                        <template #default="{ row }">
+                            <div>￥{{ row.price }}</div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column  :label="t('useThreshold')" min-width="130" >
+                        <template #default="{ row }">
+                            <span v-if="row.min_condition_money == '0.00'">无门槛</span>
+                            <span v-else >满{{ row.min_condition_money }}元可用</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column  :label="t('termOfValidity')" min-width="210">
+                        <template #default="{ row }">
+                            <span v-if="row.valid_type == 1">  领取之日起{{ row.length || '' }} 天内有效</span>
+                            <span v-else> 使用截止时间至{{ row.valid_end_time || ''}} </span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="num" :label="t('num')" min-width="120">
+                        <template #default="{ row }">
+                            <div>{{ row.num }}</div>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+
+        </el-form-item>
+    </el-form>
 </template>
 
 <script lang="ts" setup>
 import { computed, reactive, ref, watch } from 'vue'
 import couponSelectPopup from '@/addon/shop/views/goods/components/coupon-select-popup.vue'
 import { FormRules } from 'element-plus'
-import { deepClone } from '@/utils/common'
+import {deepClone } from '@/utils/common'
 import Test from '@/utils/test'
-import { t } from '@/lang'
+import { t } from "@/lang";
 
 const props = defineProps({
-  modelValue: {
-    type: Object,
-    default: () => {
-      return {}
-    },
-  },
+    modelValue: {
+        type: Object,
+        default: () => {
+            return {}
+        }
+    }
 })
 const emits = defineEmits(['update:modelValue'])
 
 const formData = ref({
-  coupon_id: [],
-  value: [],
+    coupon_id: [],
+    value: [],
 })
 
 const formRef = ref(null)
 // 正则表达式
 const regExp: any = {
-  required: /[\S]+/,
-  number: /^\d{0,10}$/,
-  digit: /^\d{0,10}(.?\d{0,2})$/,
-  special: /^\d{0,10}(.?\d{0,3})$/,
+    required: /[\S]+/,
+    number: /^\d{0,10}$/,
+    digit: /^\d{0,10}(.?\d{0,2})$/,
+    special: /^\d{0,10}(.?\d{0,3})$/
 }
 
-const formRules = reactive<FormRules>({})
+const formRules = reactive<FormRules>({
+})
 
 // 选择优惠券
 const couponSelect = (selectedCoupons: any, levelIndex: number) => {
-  let arr = []
-  for (let key in selectedCoupons) {
-    let coupons: any = selectedCoupons[key]
-    let coupon: any = {
-      price: coupons.price,
-      title: coupons.title,
-      type_name: coupons.type_name,
-      coupon_id: coupons.id,
-      min_condition_money: coupons.min_condition_money,
-      valid_type: coupons.valid_type,
-      valid_end_time: coupons.valid_end_time,
-      length: coupons.length,
-      num: 1,
-    }
+    let arr = [];
+    for (let key in selectedCoupons) {
+        let coupons: any = selectedCoupons[key];
+        let coupon: any = {
+            price: coupons.price,
+            title: coupons.title,
+            type_name: coupons.type_name,
+            coupon_id: coupons.id,
+            min_condition_money: coupons.min_condition_money,
+            valid_type: coupons.valid_type,
+            valid_end_time: coupons.valid_end_time,
+            length: coupons.length,
+            num:1
+        };
 
-    if (formData.value.value.length) {
-      formData.value.value.forEach((el: any) => {
-        if (el.coupon_id == coupon.coupon_id) {
-          coupon = Object.assign(coupon, el)
+        if (formData.value.value.length) {
+            formData.value.value.forEach((el: any) => {
+            if (el.coupon_id == coupon.coupon_id) {
+                coupon = Object.assign(coupon, el)
+            }
+        })
         }
-      })
+        arr.push(deepClone(coupon))
     }
-    arr.push(deepClone(coupon))
-  }
-  formData.value.value = arr
+    formData.value.value = arr;
 }
 
 // 删除优惠券
 const deleteCouponEvents = (row: any, levelIndex: number) => {
-  const couponsIndex = formData.value.value.findIndex(
-    (el: any) => el.coupon_id === row.coupon_id
-  )
-  if (couponsIndex !== -1) {
-    formData.value.value.splice(couponsIndex, 1)
-  }
-
-  const couponsIdIndex = formData.value.coupon_id.indexOf(row.coupon_id)
-  if (couponsIndex !== -1) {
-    formData.value.coupon_id.splice(couponsIdIndex, 1)
-  }
-}
+    const couponsIndex = formData.value.value.findIndex((el: any) => el.coupon_id === row.coupon_id);
+    if (couponsIndex !== -1) {
+        formData.value.value.splice(couponsIndex, 1);
+    }
+
+    const couponsIdIndex = formData.value.coupon_id.indexOf(row.coupon_id);
+    if (couponsIndex !== -1) {
+        formData.value.coupon_id.splice(couponsIdIndex, 1);
+    }
+};
 
 const value = computed({
-  get() {
-    return props.modelValue
-  },
-  set(value) {
-    emits('update:modelValue', value)
-  },
+    get () {
+        return props.modelValue
+    },
+    set (value) {
+        emits('update:modelValue', value)
+    }
 })
 
-watch(
-  () => value.value,
-  (nval, oval) => {
+watch(() => value.value, (nval, oval) => {
     if ((!oval || !Object.keys(oval).length) && Object.keys(nval).length) {
-      formData.value = value.value
+        formData.value = value.value
     }
-  },
-  { immediate: true }
-)
+}, { immediate: true })
 
-watch(
-  () => formData.value,
-  () => {
+watch(() => formData.value, () => {
     value.value = formData.value
-  },
-  { deep: true }
-)
+}, { deep: true })
 
 const verify = async () => {
-  let verify = true
-  await formRef.value?.validate((valid) => {
-    verify = valid
-  })
-  return verify
+    let verify = true
+    await formRef.value?.validate((valid) => {
+        verify = valid
+    })
+    return verify
 }
 
 defineExpose({
-  verify,
+    verify
 })
 </script>
 
 <style lang="scss" scoped>
 .coupon_list :deep(.cell) {
-  // min-height: 35px !important;
-  overflow: initial !important;
+    // min-height: 35px !important;
+    overflow: initial !important;
 }
-.coupon_list :deep(.el-form-item__error) {
-  padding-top: 6px;
-  left: 2px;
+.coupon_list :deep(.el-form-item__error ) {
+    padding-top: 6px;
+    left: 2px;
 }
 </style>
diff --git a/admin/src/addon/shop/views/member/components/recharge-gift-coupon.vue b/admin/src/addon/shop/views/member/components/recharge-gift-coupon.vue
index 8899d71b..dde8fb0a 100644
--- a/admin/src/addon/shop/views/member/components/recharge-gift-coupon.vue
+++ b/admin/src/addon/shop/views/member/components/recharge-gift-coupon.vue
@@ -1,244 +1,188 @@
 <template>
-  <el-form
-    ref="formRef"
-    label-width="120px"
-    :model="formData"
-    :rules="formRules"
-  >
-    <el-form-item :label="t('coupon')" prop="coupon">
-      <coupon-select-popup
-        ref="couponSelectPopupRef"
-        @couponSelect="couponSelect($event, index)"
-        v-model="formData.coupon_id"
-        :min="1"
-        :max="99"
-      />
-    </el-form-item>
-    <div class="mt-[-10px] mb-[10px] text-[#999] ml-[120px] text-[12px]">
-      {{ t('giveCouponTips') }}
-    </div>
-    <el-form-item
-      class="mt-[15px]"
-      v-if="formData.value && formData.value.length"
-    >
-      <div class="coupon_list">
-        <el-table
-          :data="formData.value"
-          size="large"
-          max-height="400"
-          :row-style="{ height: '80px' }"
-        >
-          <el-table-column prop="title" :label="t('name')" min-width="120">
-            <template #default="{ row }">
-              <div>{{ row.title }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="type_name" :label="t('type')" min-width="120">
-            <template #default="{ row }">
-              <div>{{ row.type_name }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="price"
-            :label="t('couponPrice')"
-            min-width="120"
-          >
-            <template #default="{ row }">
-              <div>￥{{ row.price }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('useThreshold')" min-width="130">
-            <template #default="{ row }">
-              <span v-if="row.min_condition_money == '0.00'">无门槛</span>
-              <span v-else>满{{ row.min_condition_money }}元可用</span>
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('termOfValidity')" min-width="210">
-            <template #default="{ row }">
-              <span v-if="row.valid_type == 1">
-                领取之日起{{ row.length || '' }} 天内有效</span
-              >
-              <span v-else> 使用截止时间至{{ row.valid_end_time || '' }} </span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="num" :label="t('giveNum')" min-width="180">
-            <template #default="{ row, $index }">
-              <el-form-item
-                :prop="`value.${$index}.num`"
-                :rules="[
-                  {
-                    required: true,
-                    trigger: 'blur',
-                    validator: (rule: any, value: any, callback: any) => {
-                      if (value === null || value === '') {
-                        callback(t('giveNumPlaceholder'))
-                      } else if (isNaN(value) || !regExp.number.test(value)) {
-                        callback(t('limitTips'))
-                      } else if (value <= 0) {
-                        callback(t('giveNumMustBeGreaterThanZero'))
-                      } else {
-                        callback()
-                      }
-                    },
-                  },
-                ]"
-              >
-                <el-input
-                  v-model.number="row.num"
-                  class="w-[70px]"
-                  maxlength="6"
-                  clearable
-                >
-                  <template #append>张</template>
-                </el-input>
-              </el-form-item>
-            </template>
-          </el-table-column>
-          <el-table-column
-            :label="t('operation')"
-            align="right"
-            min-width="160"
-          >
-            <template #default="{ row, $index }">
-              <el-button
-                type="primary"
-                link
-                @click="deleteCouponEvents(row, index)"
-                >{{ t('delete') }}</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </el-form-item>
-  </el-form>
+    <el-form ref="formRef" label-width="120px" :model="formData" :rules="formRules">
+        <el-form-item :label="t('coupon')" prop="coupon">
+            <coupon-select-popup ref="couponSelectPopupRef" @couponSelect="couponSelect($event, index)" v-model="formData.coupon_id" :min="1" :max="99" />
+        </el-form-item>
+        <div class="mt-[-10px] mb-[10px] text-[#999] ml-[120px] text-[12px]">{{ t('giveCouponTips') }}</div>
+        <el-form-item class="mt-[15px]" v-if="formData.value && formData.value.length">
+            <div class="coupon_list">
+                <el-table :data="formData.value" size="large" max-height="400" :row-style="{height: '80px'}">
+                <el-table-column prop="title" :label="t('name')" min-width="120">
+                    <template #default="{ row }">
+                        <div>{{ row.title }}</div>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="type_name" :label="t('type')" min-width="120">
+                    <template #default="{ row }">
+                        <div>{{ row.type_name }}</div>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="price" :label="t('couponPrice')" min-width="120">
+                    <template #default="{ row }">
+                        <div>￥{{ row.price }}</div>
+                    </template>
+                </el-table-column>
+                <el-table-column  :label="t('useThreshold')" min-width="130" >
+                    <template #default="{ row }">
+                        <span v-if="row.min_condition_money == '0.00'">无门槛</span>
+                        <span v-else >满{{ row.min_condition_money }}元可用</span>
+                    </template>
+                </el-table-column>
+                <el-table-column  :label="t('termOfValidity')" min-width="210">
+                    <template #default="{ row }">
+                        <span v-if="row.valid_type == 1">  领取之日起{{ row.length || '' }} 天内有效</span>
+                        <span v-else> 使用截止时间至{{ row.valid_end_time || ''}} </span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="num" :label="t('giveNum')" min-width="180">
+                    <template #default="{ row, $index }">
+                        <el-form-item
+                        :prop="`value.${$index}.num`"
+                        :rules="[{ required: true, trigger: 'blur', validator: (rule: any, value: any, callback: any) => {
+                                if (value === null || value === '') {
+                                    callback(t('giveNumPlaceholder'))
+                                }else if (isNaN(value) || !regExp.number.test(value)) {
+                                    callback(t('limitTips'))
+                                }else if (value <= 0) {
+                                    callback(t('giveNumMustBeGreaterThanZero'))
+                                }else {
+                                    callback();
+                                }
+                            } }]">
+                            <el-input v-model.number ="row.num" class="w-[70px]" maxlength="6" clearable>
+                                <template #append>张</template>
+                            </el-input>
+                        </el-form-item>
+                    </template>
+                </el-table-column>
+                <el-table-column :label="t('operation')" align="right" min-width="160">
+                    <template #default="{ row, $index }">
+                        <el-button type="primary" link @click="deleteCouponEvents(row, index)">{{ t("delete") }}</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            </div>
+
+        </el-form-item>
+    </el-form>
 </template>
 
 <script lang="ts" setup>
 import { computed, reactive, ref, watch } from 'vue'
 import couponSelectPopup from '@/addon/shop/views/goods/components/coupon-select-popup.vue'
 import { FormRules } from 'element-plus'
-import { deepClone } from '@/utils/common'
+import {deepClone } from '@/utils/common'
 import Test from '@/utils/test'
-import { t } from '@/lang'
+import { t } from "@/lang";
 
 const props = defineProps({
-  modelValue: {
-    type: Object,
-    default: () => {
-      return {}
-    },
-  },
+    modelValue: {
+        type: Object,
+        default: () => {
+            return {}
+        }
+    }
 })
 const emits = defineEmits(['update:modelValue'])
 
 const formData = ref({
-  coupon_id: [],
-  value: [],
+    coupon_id: [],
+    value: [],
 })
 
 const formRef = ref(null)
 // 正则表达式
 const regExp: any = {
-  required: /[\S]+/,
-  number: /^\d{0,10}$/,
-  digit: /^\d{0,10}(.?\d{0,2})$/,
-  special: /^\d{0,10}(.?\d{0,3})$/,
+    required: /[\S]+/,
+    number: /^\d{0,10}$/,
+    digit: /^\d{0,10}(.?\d{0,2})$/,
+    special: /^\d{0,10}(.?\d{0,3})$/
 }
 
-const formRules = reactive<FormRules>({})
+const formRules = reactive<FormRules>({
+})
 
 // 选择优惠券
 const couponSelect = (selectedCoupons: any, levelIndex: number) => {
-  let arr = []
-  for (let key in selectedCoupons) {
-    let coupons: any = selectedCoupons[key]
-    let coupon: any = {
-      price: coupons.price,
-      title: coupons.title,
-      type_name: coupons.type_name,
-      coupon_id: coupons.id,
-      min_condition_money: coupons.min_condition_money,
-      valid_type: coupons.valid_type,
-      valid_end_time: coupons.valid_end_time,
-      length: coupons.length,
-      num: 1,
-    }
+    let arr = [];
+    for (let key in selectedCoupons) {
+        let coupons: any = selectedCoupons[key];
+        let coupon: any = {
+            price: coupons.price,
+            title: coupons.title,
+            type_name: coupons.type_name,
+            coupon_id: coupons.id,
+            min_condition_money: coupons.min_condition_money,
+            valid_type: coupons.valid_type,
+            valid_end_time: coupons.valid_end_time,
+            length: coupons.length,
+            num:1
+        };
 
-    if (formData.value.value.length) {
-      formData.value.value.forEach((el: any) => {
-        if (el.coupon_id == coupon.coupon_id) {
-          coupon = Object.assign(coupon, el)
+        if (formData.value.value.length) {
+            formData.value.value.forEach((el: any) => {
+            if (el.coupon_id == coupon.coupon_id) {
+                coupon = Object.assign(coupon, el)
+            }
+        })
         }
-      })
+        arr.push(deepClone(coupon))
     }
-    arr.push(deepClone(coupon))
-  }
-  formData.value.value = arr
+    formData.value.value = arr;
 }
 
 // 删除优惠券
 const deleteCouponEvents = (row: any, levelIndex: number) => {
-  const couponsIndex = formData.value.value.findIndex(
-    (el: any) => el.coupon_id === row.coupon_id
-  )
-  if (couponsIndex !== -1) {
-    formData.value.value.splice(couponsIndex, 1)
-  }
-
-  const couponsIdIndex = formData.value.coupon_id.indexOf(row.coupon_id)
-  if (couponsIndex !== -1) {
-    formData.value.coupon_id.splice(couponsIdIndex, 1)
-  }
-}
+    const couponsIndex = formData.value.value.findIndex((el: any) => el.coupon_id === row.coupon_id);
+    if (couponsIndex !== -1) {
+        formData.value.value.splice(couponsIndex, 1);
+    }
+
+    const couponsIdIndex = formData.value.coupon_id.indexOf(row.coupon_id);
+    if (couponsIndex !== -1) {
+        formData.value.coupon_id.splice(couponsIdIndex, 1);
+    }
+};
 
 const value = computed({
-  get() {
-    return props.modelValue
-  },
-  set(value) {
-    emits('update:modelValue', value)
-  },
+    get () {
+        return props.modelValue
+    },
+    set (value) {
+        emits('update:modelValue', value)
+    }
 })
 
-watch(
-  () => value.value,
-  (nval, oval) => {
+watch(() => value.value, (nval, oval) => {
     if ((!oval || !Object.keys(oval).length) && Object.keys(nval).length) {
-      formData.value = value.value
+        formData.value = value.value
     }
-  },
-  { immediate: true }
-)
+}, { immediate: true })
 
-watch(
-  () => formData.value,
-  () => {
+watch(() => formData.value, () => {
     value.value = formData.value
-  },
-  { deep: true }
-)
+}, { deep: true })
 
 const verify = async () => {
-  let verify = true
-  await formRef.value?.validate((valid) => {
-    verify = valid
-  })
-  return verify
+    let verify = true
+    await formRef.value?.validate((valid) => {
+        verify = valid
+    })
+    return verify
 }
 
 defineExpose({
-  verify,
+    verify
 })
 </script>
 
 <style lang="scss" scoped>
 .coupon_list :deep(.cell) {
-  // min-height: 35px !important;
-  overflow: initial !important;
+    // min-height: 35px !important;
+    overflow: initial !important;
 }
-.coupon_list :deep(.el-form-item__error) {
-  padding-top: 6px;
-  left: 2px;
+.coupon_list :deep(.el-form-item__error ) {
+    padding-top: 6px;
+    left: 2px;
 }
 </style>
diff --git a/admin/src/addon/shop/views/order/batch_delivery.vue b/admin/src/addon/shop/views/order/batch_delivery.vue
index c76e169e..73ebfd62 100644
--- a/admin/src/addon/shop/views/order/batch_delivery.vue
+++ b/admin/src/addon/shop/views/order/batch_delivery.vue
@@ -1,221 +1,104 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="importFileTableData.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('createTime')" prop="create_time">
-            <el-date-picker
-              v-model="importFileTableData.searchParam.create_time"
-              type="datetimerange"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              :start-placeholder="t('startTime')"
-              :end-placeholder="t('endTime')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('operationType')" prop="type">
-            <el-select
-              v-model="importFileTableData.searchParam.type"
-              clearable
-              class="input-item"
-            >
-              <el-option
-                v-for="(v, k) in deliveryType"
-                :key="k"
-                :label="v"
-                :value="k"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="t('state')" prop="status">
-            <el-select
-              v-model="importFileTableData.searchParam.status"
-              clearable
-              class="input-item"
-            >
-              <el-option
-                v-for="(v, k) in deliveryState"
-                :key="k"
-                :label="v"
-                :value="k"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="t('operator')" prop="pay_type">
-            <el-select
-              v-model="importFileTableData.searchParam.main_id"
-              clearable
-              class="input-width"
-              filterable
-            >
-              <el-option
-                v-for="item in allUserList"
-                :key="item.uid"
-                :label="item.username"
-                :value="item.uid"
-              >
-                <div class="flex items-center">
-                  <el-avatar
-                    :src="img(item.head_img)"
-                    size="small"
-                    class="mr-[10px]"
-                    v-if="item.head_img"
-                  />
-                  <img
-                    src="@/app/assets/images/member_head.png"
-                    alt=""
-                    class="mr-[10px] w-[24px]"
-                    v-else
-                  />
-                  {{ item.username }}
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+            </div>
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="importFileTableData.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('createTime')" prop="create_time">
+                        <el-date-picker v-model="importFileTableData.searchParam.create_time" type="datetimerange"
+                            value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startTime')"
+                            :end-placeholder="t('endTime')" />
+                    </el-form-item>
+                    <el-form-item :label="t('operationType')" prop='type'>
+						<el-select v-model="importFileTableData.searchParam.type" clearable class="input-item">
+							<el-option v-for="(v,k) in deliveryType" :key="k" :label="v" :value="k"></el-option>
+						</el-select>
+					</el-form-item>
+                    <el-form-item :label="t('state')" prop='status'>
+						<el-select v-model="importFileTableData.searchParam.status" clearable class="input-item">
+                            <el-option v-for="(v,k) in deliveryState" :key="k" :label="v" :value="k"></el-option>
+						</el-select>
+					</el-form-item>
+                    <el-form-item :label="t('operator')" prop='pay_type'>
+                        <el-select v-model="importFileTableData.searchParam.main_id" clearable class="input-width" filterable>
+                            <el-option v-for="item in allUserList" :key="item.uid" :label="item.username" :value="item.uid">
+                                <div class="flex items-center">
+                                    <el-avatar :src="img(item.head_img)" size="small" class="mr-[10px]" v-if="item.head_img" />
+                                    <img src="@/app/assets/images/member_head.png" alt="" class="mr-[10px] w-[24px]" v-else>
+                                    {{ item.username }}
+                                </div>
+                            </el-option>
+                        </el-select>
+					</el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="loadInvoiceList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                        <el-button type="primary" @click="importEvent">{{ t('importData') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+            <!-- 表格数据 -->
+            <div>
+                <el-table :data="importFileTableData.data" size="large" v-loading="importFileTableData.loading">
+                    <template #empty>
+                        <span>{{ !importFileTableData.loading ? t('emptyData') : '' }}</span>
+                    </template>
+                    <el-table-column prop="type_name" :label="t('operationType')" min-width="100" />
+                    <el-table-column :label="t('operator')" min-width="100" >
+                        <template #default="{ row }">
+                            <div class="flex items-center">
+                                <span>{{ row?.user?.username }}</span>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="total_num" :label="t('totalNum')" min-width="120" />
+                    <el-table-column prop="success_num" :label="t('succeedNum')" min-width="120" />
+                    <el-table-column prop="fail_num" :label="t('failuresNum')" min-width="120" />
+                    <el-table-column prop="status_name" :label="t('state')" min-width="100" />
+                    <el-table-column :label="t('operationTime')" min-width="150">
+                        <template #default="{ row }">
+                            {{ row.create_time || '' }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('operation')" fixed="right" align="right" min-width="180">
+                        <template #default="{ row }">
+                            <el-button type="primary" link @click="examineDownloadFn(row.output)" v-if="row.status == 2 && row.output">{{ t('downloadRecord') }}</el-button>
+                            <el-button type="primary" link @click="examineDownloadFn(row.fail_output)" v-if="row.status == 2 && row.fail_output">{{ t('causeFailure') }}</el-button>
+                            <el-button type="primary" link @click="checkCauseFn(row)" v-if="row.status == 3">{{ t('checkCause') }}</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="importFileTableData.page"
+                        v-model:page-size="importFileTableData.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="importFileTableData.total"
+                        @size-change="loadInvoiceList()" @current-change="loadInvoiceList" />
                 </div>
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="loadInvoiceList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-            <el-button type="primary" @click="importEvent">{{
-              t('importData')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
-      <!-- 表格数据 -->
-      <div>
-        <el-table
-          :data="importFileTableData.data"
-          size="large"
-          v-loading="importFileTableData.loading"
-        >
-          <template #empty>
-            <span>{{
-              !importFileTableData.loading ? t('emptyData') : ''
-            }}</span>
-          </template>
-          <el-table-column
-            prop="type_name"
-            :label="t('operationType')"
-            min-width="100"
-          />
-          <el-table-column :label="t('operator')" min-width="100">
-            <template #default="{ row }">
-              <div class="flex items-center">
-                <span>{{ row?.user?.username }}</span>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="total_num"
-            :label="t('totalNum')"
-            min-width="120"
-          />
-          <el-table-column
-            prop="success_num"
-            :label="t('succeedNum')"
-            min-width="120"
-          />
-          <el-table-column
-            prop="fail_num"
-            :label="t('failuresNum')"
-            min-width="120"
-          />
-          <el-table-column
-            prop="status_name"
-            :label="t('state')"
-            min-width="100"
-          />
-          <el-table-column :label="t('operationTime')" min-width="150">
-            <template #default="{ row }">
-              {{ row.create_time || '' }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            :label="t('operation')"
-            fixed="right"
-            align="right"
-            min-width="180"
-          >
-            <template #default="{ row }">
-              <el-button
-                type="primary"
-                link
-                @click="examineDownloadFn(row.output)"
-                v-if="row.status == 2 && row.output"
-                >{{ t('downloadRecord') }}</el-button
-              >
-              <el-button
-                type="primary"
-                link
-                @click="examineDownloadFn(row.fail_output)"
-                v-if="row.status == 2 && row.fail_output"
-                >{{ t('causeFailure') }}</el-button
-              >
-              <el-button
-                type="primary"
-                link
-                @click="checkCauseFn(row)"
-                v-if="row.status == 3"
-                >{{ t('checkCause') }}</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="importFileTableData.page"
-            v-model:page-size="importFileTableData.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="importFileTableData.total"
-            @size-change="loadInvoiceList()"
-            @current-change="loadInvoiceList"
-          />
-        </div>
-        <import-data ref="importDataDialog" @complete="loadInvoiceList()" />
+                <import-data ref="importDataDialog" @complete="loadInvoiceList()" />
 
-        <!-- 失败原因弹窗 -->
-        <el-dialog
-          v-model="causeFailureDialog"
-          :title="t('checkCause1')"
-          width="420px"
-        >
-          <div class="break-all -mt-[20px]">
-            {{ causeFailureContent }}
-          </div>
-          <template #footer>
-            <span class="dialog-footer">
-              <el-button @click="causeFailureDialog = false">{{
-                t('confirm')
-              }}</el-button>
-            </span>
-          </template>
-        </el-dialog>
-      </div>
-    </el-card>
-  </div>
+                <!-- 失败原因弹窗 -->
+                <el-dialog v-model="causeFailureDialog" :title="t('checkCause1')" width="420px">
+                    <div class="break-all -mt-[20px]">
+                        {{causeFailureContent}}
+                    </div>
+                    <template #footer>
+                        <span class="dialog-footer">
+                            <el-button @click="causeFailureDialog = false">{{ t('confirm') }}</el-button>
+                        </span>
+                    </template>
+                </el-dialog>
+            </div>
+        </el-card>
+
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
 import { t } from '@/lang'
-import {
-  getOrderBatchDeliveryList,
-  getOrderBatchDeliveryType,
-  getOrderBatchDeliveryState,
-} from '@/addon/shop/api/order'
+import { getOrderBatchDeliveryList, getOrderBatchDeliveryType, getOrderBatchDeliveryState } from '@/addon/shop/api/order'
 import { FormInstance } from 'element-plus'
 import { getAllUserList } from '@/app/api/user'
 import importData from '@/addon/shop/views/order/components/import-data.vue'
@@ -229,60 +112,58 @@ const deliveryType = ref([])
 const deliveryState = ref([])
 const allUserList = ref<any[]>([])
 const setFormData = async () => {
-  deliveryType.value = await (await getOrderBatchDeliveryType()).data
-  deliveryState.value = await (await getOrderBatchDeliveryState()).data
-  allUserList.value = await (await getAllUserList({})).data
+    deliveryType.value = await (await getOrderBatchDeliveryType()).data
+    deliveryState.value = await (await getOrderBatchDeliveryState()).data
+    allUserList.value = await (await getAllUserList({})).data
 }
 setFormData()
 
 const importFileTableData = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    create_time: '',
-    main_id: '',
-    type: '',
-    status: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        create_time: '',
+        main_id: '',
+        type: '',
+        status: ''
+    }
 })
 
 const searchFormRef = ref<FormInstance>()
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  importFileTableData.searchParam.main_id = ''
-  loadInvoiceList()
+    if (!formEl) return
+    formEl.resetFields()
+    importFileTableData.searchParam.main_id = ''
+    loadInvoiceList()
 }
 
 /**
  * 获取批发列表数据
  */
 const loadInvoiceList = (page: number = 1) => {
-  importFileTableData.loading = true
-  importFileTableData.page = page
-  getOrderBatchDeliveryList({
-    page: importFileTableData.page,
-    limit: importFileTableData.limit,
-    ...importFileTableData.searchParam,
-  })
-    .then((res) => {
-      importFileTableData.loading = false
-      importFileTableData.data = res.data.data
-      importFileTableData.total = res.data.total
-    })
-    .catch(() => {
-      importFileTableData.loading = false
+    importFileTableData.loading = true
+    importFileTableData.page = page
+    getOrderBatchDeliveryList({
+        page: importFileTableData.page,
+        limit: importFileTableData.limit,
+        ...importFileTableData.searchParam
+    }).then(res => {
+        importFileTableData.loading = false
+        importFileTableData.data = res.data.data
+        importFileTableData.total = res.data.total
+    }).catch(() => {
+        importFileTableData.loading = false
     })
 }
 loadInvoiceList()
 
 // 下载
-const examineDownloadFn = (path: any) => {
-  const url = `${import.meta.env.VITE_IMG_DOMAIN || location.origin}/${path}`
-  window.open(url)
+const examineDownloadFn = (path:any) => {
+    const url = `${import.meta.env.VITE_IMG_DOMAIN || location.origin}/${path}`
+    window.open(url)
 }
 
 /**
@@ -291,15 +172,15 @@ const examineDownloadFn = (path: any) => {
  */
 const importDataDialog: Record<string, any> | null = ref(null)
 const importEvent = (data: any) => {
-  importDataDialog.value.open()
+    importDataDialog.value.open()
 }
 
 const causeFailureDialog = ref(false)
 const causeFailureContent = ref('') // 失败原因内容
 // 查看失败原因
 const checkCauseFn = (data: any) => {
-  causeFailureContent.value = data.fail_remark
-  causeFailureDialog.value = true
+    causeFailureContent.value = data.fail_remark
+    causeFailureDialog.value = true
 }
 </script>
 
diff --git a/admin/src/addon/shop/views/order/components/adjust-money.vue b/admin/src/addon/shop/views/order/components/adjust-money.vue
index 58b259b7..669e3d34 100644
--- a/admin/src/addon/shop/views/order/components/adjust-money.vue
+++ b/admin/src/addon/shop/views/order/components/adjust-money.vue
@@ -1,135 +1,64 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="t('adjustMoneyDialogTitle')"
-    width="1000px"
-    class="diy-dialog-wrap"
-    :destroy-on-close="true"
-  >
-    <div class="max-h-[600px] overflow-y-auto">
-      <h3 class="panel-title ml-[10px]">{{ t('adjustMoneyTips') }}</h3>
-      <el-form
-        label-width="50px"
-        ref="formRef"
-        class="page-form"
-        v-if="goodsTypeArr.indexOf('real') != -1"
-      >
-        <el-form-item
-          :label="t('adjustMoneyDeliveryMoney')"
-          prop="express_number"
-        >
-          <el-input
-            v-model.trim="deliveryMoney"
-            clearable
-            placeholder="0.00"
-            class="!w-[200px]"
-            maxlength="8"
-            @keyup="deliveryChange($event)"
-          >
-            <template #append>{{ t('adjustMoneyUnit') }}</template>
-          </el-input>
-        </el-form-item>
-      </el-form>
-      <div class="mb-[20px]">
-        <el-table :data="orderData.order_goods" size="large">
-          <el-table-column
-            :label="t('adjustMoneyGoodsInfo')"
-            align="left"
-            width="200"
-          >
-            <template #default="{ row }">
-              <p class="multi-hidden text-[14px]">{{ row.goods_name }}</p>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="price"
-            :label="t('adjustMoneyPrice')"
-            min-width="50"
-            align="left"
-          />
-          <el-table-column
-            prop="num"
-            :label="t('adjustMoneyNum')"
-            min-width="50"
-            align="right"
-          />
-          <el-table-column
-            prop="goods_money"
-            :label="t('adjustMoneySubTotal')"
-            min-width="50"
-            align="right"
-          />
-          <el-table-column
-            prop="discount_money"
-            :label="t('adjustMoneyDiscountMoney')"
-            min-width="50"
-            align="right"
-          />
-          <el-table-column
-            prop="goods_name"
-            :label="t('adjustMoneyLabel')"
-            min-width="100"
-          >
-            <template v-slot:header>
-              <div>
-                <span>{{ t('adjustMoneyLabel') }}</span>
-                <el-tooltip
-                  effect="dark"
-                  content="负数表示下调金额，正数表示上调金额"
-                  placement="top"
-                >
-                  <text
-                    class="nc-iconfont nc-icon-bangzhuV6xx ml-[5px] text-[12px]"
-                  ></text>
-                </el-tooltip>
-              </div>
-            </template>
-            <template #default="{ row, $index }">
-              <el-input
-                v-model.trim="row.adjust_money"
-                clearable
-                placeholder="0.00"
-                maxlength="6"
-                @change="adjustChange($event, $index, row)"
-              >
-                <template #append>{{ t('adjustMoneyUnit') }}</template>
-              </el-input>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="total"
-            :label="t('adjustMoneyTotal')"
-            min-width="70"
-            align="right"
-          >
-          </el-table-column>
-        </el-table>
-      </div>
-
-      <h3 class="panel-title ml-[10px]">
-        <span class="text-primary">实际商品金额</span>
-        <span> = 商品总额 - 优惠金额 + 调价</span>
-      </h3>
-      <h3 class="panel-title ml-[10px]">
-        <span class="text-primary">订单总额</span>
-        <span v-if="goodsTypeArr.indexOf('real') != -1">
-          = 实际商品金额 + 运费</span
-        >
-        <span v-else> = 实际商品金额</span>
-      </h3>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+    <el-dialog v-model="showDialog" :title="t('adjustMoneyDialogTitle')" width="1000px" class="diy-dialog-wrap" :destroy-on-close="true">
+        <div class="max-h-[600px] overflow-y-auto">
+			<h3 class="panel-title ml-[10px]">{{ t('adjustMoneyTips') }}</h3>
+            <el-form label-width="50px" ref="formRef" class="page-form" v-if="goodsTypeArr.indexOf('real') != -1">
+                <el-form-item :label="t('adjustMoneyDeliveryMoney')" prop="express_number">
+                    <el-input v-model.trim="deliveryMoney" clearable placeholder="0.00" class="!w-[200px]" maxlength="8" @keyup="deliveryChange($event)">
+                        <template #append>{{ t('adjustMoneyUnit') }}</template>
+                     </el-input>
+                </el-form-item>
+            </el-form>
+			<div class="mb-[20px]">
+				<el-table :data="orderData.order_goods" size="large">
+					<el-table-column :label="t('adjustMoneyGoodsInfo')" align="left" width="200">
+						<template #default="{ row }">
+							<p class="multi-hidden text-[14px]">{{ row.goods_name }}</p>
+						</template>
+					</el-table-column>
+					<el-table-column prop="price" :label="t('adjustMoneyPrice')" min-width="50" align="left" />
+					<el-table-column prop="num" :label="t('adjustMoneyNum')" min-width="50" align="right"/>
+					<el-table-column prop="goods_money" :label="t('adjustMoneySubTotal')" min-width="50" align="right"/>
+					<el-table-column prop="discount_money" :label="t('adjustMoneyDiscountMoney')" min-width="50" align="right"/>
+					<el-table-column prop="goods_name" :label="t('adjustMoneyLabel')" min-width="100">
+                        <template v-slot:header>
+                            <div>
+                                <span>{{ t('adjustMoneyLabel') }}</span>
+                                <el-tooltip effect="dark" content="负数表示下调金额，正数表示上调金额" placement="top">
+                                    <text class="nc-iconfont nc-icon-bangzhuV6xx ml-[5px] text-[12px]"></text>
+                                </el-tooltip>
+                            </div>
+                        </template>
+						<template #default="{ row, $index }">
+							<el-input v-model.trim="row.adjust_money" clearable placeholder="0.00" maxlength="6" @change="adjustChange($event,$index,row)">
+								<template #append>{{ t('adjustMoneyUnit') }}</template>
+							</el-input>
+						</template>
+					</el-table-column>
+					<el-table-column prop="total" :label="t('adjustMoneyTotal')" min-width="70" align="right">
+
+                    </el-table-column>
+				</el-table>
+			</div>
+
+            <h3 class="panel-title ml-[10px]">
+                <span class="text-primary">实际商品金额</span>
+                <span> = 商品总额 - 优惠金额 + 调价</span>
+            </h3>
+            <h3 class="panel-title ml-[10px]">
+             <span class="text-primary">订单总额</span>
+                <span v-if="goodsTypeArr.indexOf('real') != -1"> = 实际商品金额 + 运费</span>
+                <span v-else> = 实际商品金额</span>
+             </h3>
+
+		</div>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -142,93 +71,89 @@ import { cloneDeep } from 'lodash-es'
 const showDialog = ref(false)
 const loading = ref(false)
 
-const orderData: any = reactive({})
-const deliveryMoney: any = ref(0)
+const orderData:any = reactive({})
+const deliveryMoney:any = ref(0)
 const goodsTypeArr = ref<any>([]) // 商品类型
-const deliveryChange = (e: any) => {
-  filterDigit(e)
-  deliveryMoney.value = e.target.value
+const deliveryChange = (e:any) => {
+    filterDigit(e)
+    deliveryMoney.value = e.target.value
 }
 const setFormData = (data: any) => {
-  for (let key in orderData) {
-    delete orderData[key]
-  }
-  Object.assign(orderData, cloneDeep(data))
-  orderData.order_goods = orderData.order_goods.filter((item: any) => {
-    return item.is_gift != 1
-  })
-  goodsTypeArr.value = []
-  orderData.order_goods.forEach((item: any) => {
-    item.adjust_money = '' // 调价
-    item.total = (
-      parseFloat(item.goods_money) - parseFloat(item.discount_money)
-    ).toFixed(2) // 总计
-    goodsTypeArr.value.push(item.goods_type)
-  })
-  deliveryMoney.value = orderData.delivery_money
+    for (let key in orderData) {
+        delete orderData[key]
+    }
+    Object.assign(orderData, cloneDeep(data))
+    orderData.order_goods = orderData.order_goods.filter((item:any) => {
+        return item.is_gift != 1
+    })
+    goodsTypeArr.value = []
+    orderData.order_goods.forEach((item:any) => {
+        item.adjust_money = '' // 调价
+        item.total = (parseFloat(item.goods_money) - parseFloat(item.discount_money)).toFixed(2) // 总计
+        goodsTypeArr.value.push(item.goods_type)
+    })
+    deliveryMoney.value = orderData.delivery_money
 }
 
 // 监听调价计算总计
-const adjustChange = (value: any, index: any, item: any) => {
-  let money = parseFloat(item.goods_money) - parseFloat(item.discount_money)
-  if (value.length == 0 || isNaN(value)) {
-    value = 0
-    orderData.order_goods[index].adjust_money = ''
-  } else {
-    value = parseFloat(value)
-  }
-
-  if (parseFloat(value) + money < 0) {
-    value = money
-    orderData.order_goods[index].adjust_money = -value
-    money = 0
-  } else {
-    money += value
-  }
-
-  money = Math.round(money * 100) / 100
-
-  orderData.order_goods[index].total = money.toFixed(2)
+const adjustChange = (value:any, index:any, item:any) => {
+    let money = parseFloat(item.goods_money) - parseFloat(item.discount_money)
+    if (value.length == 0 || isNaN(value)) {
+        value = 0
+        orderData.order_goods[index].adjust_money = ''
+    } else {
+        value = parseFloat(value)
+    }
+
+    if (parseFloat(value) + money < 0) {
+        value = money
+        orderData.order_goods[index].adjust_money = -value
+        money = 0
+    } else {
+        money += value
+    }
+
+    money = Math.round(money * 100) / 100
+
+    orderData.order_goods[index].total = money.toFixed(2)
 }
 
 const emit = defineEmits(['complete'])
 
 const isRepeat = ref(false)
 const confirm = () => {
-  loading.value = true
+    loading.value = true
 
-  if (isRepeat.value) return
-  isRepeat.value = true
+    if (isRepeat.value) return
+    isRepeat.value = true
 
-  let order_goods_data: any = {}
-  orderData.order_goods.forEach((item: any) => {
-    if (item.adjust_money) {
-      order_goods_data[item.order_goods_id] = {
-        money: item.adjust_money,
-      }
-    }
-  })
-  orderEditPrice({
-    order_id: orderData.order_id,
-    delivery_money: parseFloat(deliveryMoney.value),
-    order_goods_data,
-  })
-    .then((res: any) => {
-      isRepeat.value = false
-      loading.value = false
-      showDialog.value = false
-      emit('complete')
+    let order_goods_data:any = {}
+    orderData.order_goods.forEach((item:any) => {
+        if (item.adjust_money) {
+            order_goods_data[item.order_goods_id] = {
+                money: item.adjust_money
+            }
+        }
     })
-    .catch(() => {
-      isRepeat.value = false
-      loading.value = false
+    orderEditPrice({
+        order_id: orderData.order_id,
+        delivery_money: parseFloat(deliveryMoney.value),
+        order_goods_data
+    }).then((res: any) => {
+        isRepeat.value = false
+        loading.value = false
+        showDialog.value = false
+        emit('complete')
+    }).catch(() => {
+        isRepeat.value = false
+        loading.value = false
     })
 }
 
 // 提示信息
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
@@ -236,11 +161,11 @@ defineExpose({
 <style lang="scss">
 /* 多行超出隐藏 */
 .multi-hidden {
-  word-break: break-all;
-  text-overflow: ellipsis;
-  overflow: hidden;
-  display: -webkit-box;
-  -webkit-line-clamp: 2;
-  -webkit-box-orient: vertical;
+	word-break: break-all;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	display: -webkit-box;
+	-webkit-line-clamp: 2;
+	-webkit-box-orient: vertical;
 }
 </style>
diff --git a/admin/src/addon/shop/views/order/components/delivery-action.vue b/admin/src/addon/shop/views/order/components/delivery-action.vue
index bfb528b2..24e07624 100644
--- a/admin/src/addon/shop/views/order/components/delivery-action.vue
+++ b/admin/src/addon/shop/views/order/components/delivery-action.vue
@@ -1,170 +1,70 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="t('delivery')"
-    width="700px"
-    class="diy-dialog-wrap"
-    :destroy-on-close="true"
-  >
-    <div v-loading="loading">
-      <el-alert
-        type="warning"
-        :closable="false"
-        class="!mb-[10px]"
-        v-if="isTradeManaged"
-      >
-        <template #default>
-          <p>
-            您已开通微信小程序发货信息管理服务，平台会将发货信息以消息的形式推送给购买的微信用户。
-          </p>
-          <p>注意：每个订单只能更新一次发货信息，请谨慎操作！</p>
-        </template>
-      </el-alert>
-      <el-form
-        :model="formData"
-        label-width="100px"
-        ref="formRef"
-        :rules="formRules"
-        class="page-form mb-[30px]"
-      >
-        <el-form-item :label="t('deliveryType')" prop="delivery_type">
-          <el-radio-group
-            v-model="formData.delivery_type"
-            @change="deliveryChange"
-          >
-            <el-radio
-              :label="index"
-              v-for="(item, index) in deliveryType"
-              :key="index"
-              >{{ item }}</el-radio
-            >
-          </el-radio-group>
-        </el-form-item>
-        <template v-if="formData.delivery_type == 'express'">
-          <el-form-item :label="t('deliveryWay')">
-            <el-radio-group v-model="formData.delivery_way">
-              <el-radio label="manual_write">{{
-                t('manualWriteWay')
-              }}</el-radio>
-              <el-radio label="electronic_sheet">{{
-                t('electronicSheetWay')
-              }}</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item :label="t('company')" prop="express_company_id">
-            <el-select
-              v-model="formData.express_company_id"
-              :placeholder="t('companyPlaceholder')"
-              class="input-width"
-              @change="companyChange"
-            >
-              <el-option
-                v-for="item in companyData"
-                :key="item.index"
-                :label="item.company_name"
-                :value="item.company_id"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item
-            :label="t('expressNumber')"
-            v-if="formData.delivery_way == 'manual_write'"
-            prop="express_number"
-          >
-            <el-input
-              v-model.trim="formData.express_number"
-              clearable
-              :placeholder="t('expressNumberPlaceholder')"
-              class="input-width"
-              maxlength="30"
-            />
-          </el-form-item>
-          <el-form-item
-            :label="t('electronicSheetTemplate')"
-            v-if="formData.delivery_way == 'electronic_sheet'"
-            prop="electronic_sheet_id"
-          >
-            <el-select
-              v-model="formData.electronic_sheet_id"
-              :placeholder="t('electronicSheetTemplatePlaceholder')"
-              clearable
-              class="input-width"
-            >
-              <el-option
-                v-for="item in electronicSheetData"
-                :key="item.id"
-                :label="item.template_name"
-                :value="item.id"
-              />
-            </el-select>
-          </el-form-item>
+    <el-dialog v-model="showDialog" :title="t('delivery')" width="700px" class="diy-dialog-wrap" :destroy-on-close="true">
+        <div v-loading="loading">
+
+            <el-alert type="warning" :closable="false" class="!mb-[10px]" v-if="isTradeManaged">
+                <template #default>
+                    <p>您已开通微信小程序发货信息管理服务，平台会将发货信息以消息的形式推送给购买的微信用户。</p>
+                    <p>注意：每个订单只能更新一次发货信息，请谨慎操作！</p>
+                </template>
+            </el-alert>
+            <el-form :model="formData" label-width="100px" ref="formRef" :rules="formRules" class="page-form mb-[30px]">
+                <el-form-item :label="t('deliveryType')" prop="delivery_type">
+                    <el-radio-group v-model="formData.delivery_type" @change="deliveryChange">
+                        <el-radio :label="index" v-for="(item, index) in deliveryType" :key="index">{{ item }}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <template v-if="formData.delivery_type == 'express'">
+                    <el-form-item :label="t('deliveryWay')">
+                        <el-radio-group v-model="formData.delivery_way">
+                            <el-radio label="manual_write">{{ t('manualWriteWay') }}</el-radio>
+                            <el-radio label="electronic_sheet">{{ t('electronicSheetWay') }}</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+                    <el-form-item :label="t('company')" prop="express_company_id">
+                        <el-select v-model="formData.express_company_id" :placeholder="t('companyPlaceholder')" class="input-width" @change="companyChange">
+                            <el-option v-for="(item) in companyData" :key="item.index" :label="item.company_name" :value="item.company_id" />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item :label="t('expressNumber')" v-if="formData.delivery_way == 'manual_write'" prop="express_number">
+                        <el-input v-model.trim="formData.express_number" clearable :placeholder="t('expressNumberPlaceholder')" class="input-width" maxlength="30" />
+                    </el-form-item>
+                    <el-form-item :label="t('electronicSheetTemplate')" v-if="formData.delivery_way == 'electronic_sheet'" prop="electronic_sheet_id">
+                        <el-select v-model="formData.electronic_sheet_id" :placeholder="t('electronicSheetTemplatePlaceholder')" clearable class="input-width">
+                            <el-option v-for="(item) in electronicSheetData" :key="item.id" :label="item.template_name" :value="item.id" />
+                        </el-select>
+                    </el-form-item>
+                </template>
+            </el-form>
+            <el-table :data="goodsDataArr" size="large" @selection-change="handleSelectionChange" max-height="400px">
+                <el-table-column type="selection" width="55" :selectable="selectable" />
+                <el-table-column prop="goods_name" :label="t('goodsName')" min-width="200" >
+                    <template #default="{ row }">
+                        <div class="flex cursor-pointer">
+                            <div class="flex items-center min-w-[50px] mr-[10px]">
+                                <img class="w-[50px] h-[50px]" v-if="row.goods_image" :src="img(row.goods_image)" alt="">
+                                 <img class="w-[50px] h-[50px]" v-else src="" alt="">
+                            </div>
+                            <div class="flex  flex-col items-start">
+                                <span class="multi-hidden text-[14px]">{{row.goods_name}}</span>
+                                <span class="text-[#999] text-[12px]" v-if="row.sku_name">{{row.sku_name}}</span>
+                                <span class="px-[4px]  text-[12px] text-[#fff] rounded-[4px] bg-primary leading-[18px]" v-if="row.is_gift == 1">赠品</span>
+                            </div>
+                        </div>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="num" :label="t('num')" min-width="80" />
+                <el-table-column prop="status_name" :label="t('refundStatusName')" min-width="80" />
+                <el-table-column prop="delivery_status_name" :label="t('deliveryStatusName')" min-width="80" align="right" />
+            </el-table>
+        </div>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+            </span>
         </template>
-      </el-form>
-      <el-table
-        :data="goodsDataArr"
-        size="large"
-        @selection-change="handleSelectionChange"
-        max-height="400px"
-      >
-        <el-table-column type="selection" width="55" :selectable="selectable" />
-        <el-table-column
-          prop="goods_name"
-          :label="t('goodsName')"
-          min-width="200"
-        >
-          <template #default="{ row }">
-            <div class="flex cursor-pointer">
-              <div class="flex items-center min-w-[50px] mr-[10px]">
-                <img
-                  class="w-[50px] h-[50px]"
-                  v-if="row.goods_image"
-                  :src="img(row.goods_image)"
-                  alt=""
-                />
-                <img class="w-[50px] h-[50px]" v-else src="" alt="" />
-              </div>
-              <div class="flex flex-col items-start">
-                <span class="multi-hidden text-[14px]">{{
-                  row.goods_name
-                }}</span>
-                <span class="text-[#999] text-[12px]" v-if="row.sku_name">{{
-                  row.sku_name
-                }}</span>
-                <span
-                  class="px-[4px] text-[12px] text-[#fff] rounded-[4px] bg-primary leading-[18px]"
-                  v-if="row.is_gift == 1"
-                  >赠品</span
-                >
-              </div>
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="num" :label="t('num')" min-width="80" />
-        <el-table-column
-          prop="status_name"
-          :label="t('refundStatusName')"
-          min-width="80"
-        />
-        <el-table-column
-          prop="delivery_status_name"
-          :label="t('deliveryStatusName')"
-          min-width="80"
-          align="right"
-        />
-      </el-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -177,18 +77,18 @@ import { getOrderDeliveryType, orderDelivery } from '@/addon/shop/api/order'
 import { getIsTradeManaged } from '@/app/api/weapp'
 import { cloneDeep } from 'lodash-es'
 import {
-  getElectronicSheetConfig,
-  getElectronicSheetList,
-  printElectronicSheet,
+    getElectronicSheetConfig,
+    getElectronicSheetList,
+    printElectronicSheet
 } from '@/addon/shop/api/electronic_sheet'
-import { loadCLodop, getLodop } from '@/utils/lodop'
+import { loadCLodop,getLodop } from '@/utils/lodop'
 
 const showDialog = ref(false)
 const loading = ref(false)
-interface companyDataType {
-  company_id: number
-  company_name: string
-  index: number
+interface companyDataType{
+    company_id: number,
+    company_name: string,
+    index: number
 }
 const companyData = ref<companyDataType[]>([])
 const isHasVirtual = ref(false)
@@ -196,37 +96,37 @@ const deliveryType = ref([])
 const isTradeManaged = ref(false)
 
 getCompanyList({}).then((data) => {
-  companyData.value = data.data
+    companyData.value = data.data
 })
 
-getIsTradeManaged().then((res) => {
-  isTradeManaged.value = res.data.is_trade_managed
+getIsTradeManaged().then(res => {
+    isTradeManaged.value = res.data.is_trade_managed
 })
 
-getElectronicSheetConfig().then((res: any) => {
-  if (res.data) {
-    loadCLodop(res.data)
-  }
+getElectronicSheetConfig().then((res:any) => {
+    if (res.data) {
+        loadCLodop(res.data)
+    }
 })
 
 const electronicSheetAll: any = ref([])
 const electronicSheetData: any = ref([])
 getElectronicSheetList({
-  status: 1,
+    status: 1
 }).then((res: any) => {
-  if (res.data) {
-    electronicSheetAll.value = res.data
-  }
+    if (res.data) {
+        electronicSheetAll.value = res.data
+    }
 })
 
 const companyChange = (value: any) => {
-  electronicSheetData.value = []
-  formData.electronic_sheet_id = ''
-  electronicSheetAll.value.forEach((item: any) => {
-    if (item.express_company_id == value) {
-      electronicSheetData.value.push(cloneDeep(item))
-    }
-  })
+    electronicSheetData.value = []
+    formData.electronic_sheet_id = ''
+    electronicSheetAll.value.forEach((item: any) => {
+        if (item.express_company_id == value) {
+            electronicSheetData.value.push(cloneDeep(item))
+        }
+    })
 }
 
 /**
@@ -234,13 +134,13 @@ const companyChange = (value: any) => {
  */
 const goodsData = ref([])
 const initialFormData = {
-  order_id: 0,
-  delivery_type: '',
-  delivery_way: 'manual_write',
-  express_company_id: '',
-  express_number: '',
-  electronic_sheet_id: '',
-  order_goods_ids: [],
+    order_id: 0,
+    delivery_type: '',
+    delivery_way: 'manual_write',
+    express_company_id: '',
+    express_number: '',
+    electronic_sheet_id: '',
+    order_goods_ids: []
 }
 
 const formData: Record<string, any> = reactive({ ...initialFormData })
@@ -249,96 +149,79 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    delivery_type: [
-      {
-        required: true,
-        message: t('deliveryTypePlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    express_company_id: [
-      { required: true, validator: companyPass, trigger: 'blur' },
-    ],
-    express_number: [
-      { required: true, validator: expressNumberPass, trigger: 'blur' },
-    ],
-    electronic_sheet_id: [
-      { required: true, validator: electronicSheetIdPass, trigger: 'blur' },
-    ],
-  }
+    return {
+        delivery_type: [
+            { required: true, message: t('deliveryTypePlaceholder'), trigger: 'blur' }
+        ],
+        express_company_id: [
+            { required: true, validator: companyPass, trigger: 'blur' }
+        ],
+        express_number: [
+            { required: true, validator: expressNumberPass, trigger: 'blur' }
+        ],
+        electronic_sheet_id: [
+            { required: true, validator: electronicSheetIdPass, trigger: 'blur' }
+        ]
+    }
 })
 
 const companyPass = (rule: any, value: any, callback: any) => {
-  if (formData.delivery_type == 'express' && value === '') {
-    callback(new Error(t('companyPlaceholder')))
-  } else {
-    callback()
-  }
+    if (formData.delivery_type == 'express' && value === '') {
+        callback(new Error(t('companyPlaceholder')))
+    } else {
+        callback()
+    }
 }
 
 const expressNumberPass = (rule: any, value: any, callback: any) => {
-  if (
-    formData.delivery_type == 'express' &&
-    formData.delivery_way == 'manual_write' &&
-    value === ''
-  ) {
-    callback(new Error(t('expressNumberPlaceholder')))
-  } else {
-    callback()
-  }
+    if (formData.delivery_type == 'express' && formData.delivery_way == 'manual_write' && value === '') {
+        callback(new Error(t('expressNumberPlaceholder')))
+    } else {
+        callback()
+    }
 }
 
 const electronicSheetIdPass = (rule: any, value: any, callback: any) => {
-  if (
-    formData.delivery_type == 'express' &&
-    formData.delivery_way == 'electronic_sheet' &&
-    value === ''
-  ) {
-    callback(new Error(t('electronicSheetTemplatePlaceholder')))
-  } else {
-    callback()
-  }
+    if (formData.delivery_type == 'express' && formData.delivery_way == 'electronic_sheet' && value === '') {
+        callback(new Error(t('electronicSheetTemplatePlaceholder')))
+    } else {
+        callback()
+    }
 }
 
-const selectable = (row: any, index: number) => {
-  if (
-    row.status == 2 ||
-    row.delivery_status == 'delivery_finish' ||
-    row.status == 3 ||
-    row.is_gift == 1
-  ) {
-    return false
-  }
-  return true
+const selectable = (row:any, index:number) => {
+    if (row.status == 2 || row.delivery_status == 'delivery_finish' || row.status == 3 || row.is_gift == 1) {
+        return false
+    }
+    return true
 }
-interface goodsDataType {
-  goods_type: string
+interface goodsDataType{
+    goods_type:string
 }
 const goodsDataArr = ref<goodsDataType[]>([])
 const deliveryChange = () => {
-  const arr: any = []
-  if (formData.delivery_type && formData.delivery_type == 'virtual') {
-    goodsData.value.forEach((item: any, index) => {
-      if (item.goods_type == 'virtual') {
-        arr.push(item)
-      }
-    })
-  } else if (formData.delivery_type && formData.delivery_type != 'virtual') {
-    goodsData.value.forEach((item: any, index) => {
-      if (item.goods_type != 'virtual') {
-        arr.push(item)
-      }
-    })
-  }
-  goodsDataArr.value = cloneDeep(arr)
+    const arr: any = []
+    if (formData.delivery_type && formData.delivery_type == 'virtual') {
+        goodsData.value.forEach((item: any, index) => {
+            if (item.goods_type == 'virtual') {
+                arr.push(item)
+            }
+        })
+    } else if (formData.delivery_type && formData.delivery_type != 'virtual') {
+        goodsData.value.forEach((item: any, index) => {
+            if (item.goods_type != 'virtual') {
+                arr.push(item)
+            }
+        })
+    }
+    goodsDataArr.value = cloneDeep(arr)
 }
 
-const handleSelectionChange = (val: any) => {
-  formData.order_goods_ids = cloneDeep([])
-  for (const v in val) {
-    formData.order_goods_ids.push(val[v].order_goods_id)
-  }
+const handleSelectionChange = (val:any) => {
+    formData.order_goods_ids = cloneDeep([])
+    for (const v in val) {
+        formData.order_goods_ids.push(val[v].order_goods_id)
+    }
 }
 
 const emit = defineEmits(['complete'])
@@ -348,124 +231,119 @@ const emit = defineEmits(['complete'])
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  if (formData.order_goods_ids.length <= 0) {
-    ElMessage({
-      message: t('orderGoodsPlaceholder'),
-      type: 'warning',
-    })
-    return
-  }
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      const data = formData
-      orderDelivery(data)
-        .then((res) => {
-          if (
-            formData.delivery_type == 'express' &&
-            formData.delivery_way == 'electronic_sheet'
-          ) {
-            // 打印电子面单
-            printElectronicSheetFn()
-          }
-          loading.value = false
-          showDialog.value = false
-          emit('complete')
-          initFormData()
-        })
-        .catch(() => {
-          loading.value = false
+    if (loading.value || !formEl) return
+    if (formData.order_goods_ids.length <= 0) {
+        ElMessage({
+            message: t('orderGoodsPlaceholder'),
+            type: 'warning'
         })
+        return
     }
-  })
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+            const data = formData
+            orderDelivery(data).then(res => {
+                if (formData.delivery_type == 'express' && formData.delivery_way == 'electronic_sheet') {
+                    // 打印电子面单
+                    printElectronicSheetFn()
+                }
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+                initFormData()
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
 }
 
 const setFormData = async (row: any = null) => {
-  loading.value = true
-  if (row) {
-    formData.order_id = row.order_id
-    formData.delivery_type = ''
-    formData.delivery_way = 'manual_write'
-    goodsData.value = row.order_goods
-    goodsDataArr.value = row.order_goods
-    isHasVirtual.value = false
-    await getOrderDeliveryType({
-      delivery_type: row.delivery_type,
-    }).then((data) => {
-      deliveryType.value = data.data
-      for (const v in data.data) {
-        formData.delivery_type = v
-        break
-      }
-      deliveryChange()
-    })
+    loading.value = true
+    if (row) {
+        formData.order_id = row.order_id
+        formData.delivery_type = ''
+        formData.delivery_way = 'manual_write'
+        goodsData.value = row.order_goods
+        goodsDataArr.value = row.order_goods
+        isHasVirtual.value = false
+        await getOrderDeliveryType({
+            delivery_type: row.delivery_type
+        }).then((data) => {
+            deliveryType.value = data.data
+            for (const v in data.data) {
+                formData.delivery_type = v
+                break
+            }
+            deliveryChange()
+        })
 
-    for (let i = 0; i < row.order_goods.length; i++) {
-      if (row.order_goods[i].goods_type == 'virtual') {
-        isHasVirtual.value = true
-        break
-      }
-    }
-    if (isHasVirtual.value) {
-      Object.assign(deliveryType.value, { virtual: t('virtualDelivery') })
+        for (let i = 0; i < row.order_goods.length; i++) {
+            if (row.order_goods[i].goods_type == 'virtual') {
+                isHasVirtual.value = true
+                break
+            }
+        }
+        if (isHasVirtual.value) {
+            Object.assign(deliveryType.value, { virtual: t('virtualDelivery') })
+        }
     }
-  }
-  loading.value = false
+    loading.value = false
 }
 
 const initFormData = () => {
-  formData.order_id = 0
-  formData.delivery_type = ''
-  formData.express_company_id = ''
-  formData.electronic_sheet_id = ''
-  formData.express_number = ''
-  formData.order_goods_ids = []
+    formData.order_id = 0
+    formData.delivery_type = ''
+    formData.express_company_id = ''
+    formData.electronic_sheet_id = ''
+    formData.express_number = ''
+    formData.order_goods_ids = []
 }
 
 const printElectronicSheetFn = () => {
-  const LODOP = getLodop()
-  if (!LODOP) return
+    const LODOP = getLodop()
+    if (!LODOP) return
 
-  printElectronicSheet({
-    print_type: 'multiple',
-    order_id: formData.order_id,
-    electronic_sheet_id: formData.electronic_sheet_id,
-    order_goods_ids: formData.order_goods_ids,
-  }).then((res: any) => {
-    if (res.data) {
-      const data = res.data
-      let haveSuccessData = false
-      LODOP.PRINT_INIT('打印电子面单') // 只能初始化一次
+    printElectronicSheet({
+        print_type: 'multiple',
+        order_id: formData.order_id,
+        electronic_sheet_id: formData.electronic_sheet_id,
+        order_goods_ids: formData.order_goods_ids
+    }).then((res: any) => {
+        if (res.data) {
+            const data = res.data
+            let haveSuccessData = false
+            LODOP.PRINT_INIT('打印电子面单') // 只能初始化一次
 
-      // 单订单打印
-      for (let i = 0; i < data.length; i++) {
-        if (data[i].success) {
-          // 调用打印机，开始打印
-          const html = data[i].print_template
-          LODOP.ADD_PRINT_HTM(0, 0, '100%', '100%', html)
-          LODOP.NewPage() // 批量打印，分页
-          haveSuccessData = true
-        }
-      }
+            // 单订单打印
+            for (let i = 0; i < data.length; i++) {
+                if (data[i].success) {
+                    // 调用打印机，开始打印
+                    const html = data[i].print_template
+                    LODOP.ADD_PRINT_HTM(0, 0, '100%', '100%', html)
+                    LODOP.NewPage() // 批量打印，分页
+                    haveSuccessData = true
+                }
+            }
 
-      if (haveSuccessData) {
-        LODOP.PREVIEW() // 预览
-      }
-    }
-  })
+            if (haveSuccessData) {
+                LODOP.PREVIEW() // 预览
+            }
+        }
+    })
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
 <style lang="scss" scoped></style>
 <style lang="scss">
 .diy-dialog-wrap .el-form-item__label {
-  height: auto !important;
+    height: auto !important;
 }
 </style>
diff --git a/admin/src/addon/shop/views/order/components/delivery-package.vue b/admin/src/addon/shop/views/order/components/delivery-package.vue
index 18c79131..59790952 100644
--- a/admin/src/addon/shop/views/order/components/delivery-package.vue
+++ b/admin/src/addon/shop/views/order/components/delivery-package.vue
@@ -1,91 +1,62 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="t('packageInfo')"
-    width="700px"
-    class="diy-dialog-wrap"
-    :destroy-on-close="true"
-  >
-    <div v-loading="loading" class="max-h-[600px] overflow-y-auto">
-      <h3 class="panel-title">{{ t('deliveryInfo') }}</h3>
-      <div class="pl-[20px] mb-[20px] text-[14px] flex justify-between">
-        <div>
-          <span>{{ t('devliveryTime') }}：</span
-          ><span>{{ packageData.create_time }}</span>
-        </div>
-      </div>
-      <div class="pl-[20px] mb-[20px] text-[14px] flex">
-        <div v-if="packageData.company">
-          <span>{{ t('companyName') }}：</span
-          ><span>{{ packageData.company.company_name }}</span>
-        </div>
-        <div v-if="packageData.express_number">
-          <span class="ml-[60px]">{{ t('logisticNo') }}：</span
-          ><span>{{ packageData.express_number }}</span>
-        </div>
-      </div>
-      <h3 class="panel-title">{{ t('goodsInfo') }}</h3>
-      <div class="pl-[20px] mb-[20px]">
-        <el-table :data="packageData.order_goods" size="large">
-          <el-table-column :label="t('goodsName')" align="left" width="300">
-            <template #default="{ row }">
-              <div class="flex">
-                <div class="flex items-center w-[50px] h-[50px] mr-[10px]">
-                  <img
-                    class="w-[50px] h-[50px]"
-                    :src="img(row.goods_image_thumb_small)"
-                  />
-                </div>
-                <div class="flex flex-col flex-1">
-                  <p class="multi-hidden text-[14px]">{{ row.goods_name }}</p>
-                  <span class="text-[12px] text-[#999]">{{
-                    row.sku_name
-                  }}</span>
-                </div>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="price"
-            :label="t('price')"
-            min-width="50"
-            align="left"
-          />
-          <el-table-column
-            prop="num"
-            :label="t('num')"
-            min-width="50"
-            align="right"
-          />
-        </el-table>
-      </div>
-      <h3 class="panel-title">{{ t('logisticInfo') }}</h3>
-      <template v-if="packageData.sub_delivery_type != 'none_express'">
-        <div class="pl-[20px]" v-if="packageData.traces">
-          <template v-if="packageData.traces.list">
-            <div
-              class="flex justify-between mb-[15px]"
-              v-for="(item, index) in packageData.traces.list"
-              :key="index"
-            >
-              <span class="block w-[150px]">{{ item.datetime }}</span
-              ><span class="block w-[500px]">{{ item.remark }}</span>
-            </div>
-          </template>
-          <div>{{ packageData.traces.reason }}</div>
-        </div>
-        <div class="pl-[20px]" v-else>
-          <div>{{ t('notLogistics') }}</div>
-        </div>
-      </template>
-      <span class="pl-[20px]" v-else>{{ t('noLogisticsRequired') }}</span>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-      </span>
-    </template>
-  </el-dialog>
+    <el-dialog v-model="showDialog" :title="t('packageInfo')" width="700px" class="diy-dialog-wrap" :destroy-on-close="true">
+        <div v-loading="loading" class="max-h-[600px] overflow-y-auto">
+			<h3 class="panel-title">{{ t('deliveryInfo') }}</h3>
+			<div class="pl-[20px] mb-[20px] text-[14px] flex justify-between">
+				<div>
+					<span>{{ t('devliveryTime') }}：</span><span >{{ packageData.create_time }}</span>
+				</div>
+			</div>
+			<div class="pl-[20px] mb-[20px] text-[14px] flex">
+				<div v-if="packageData.company">
+					<span>{{ t('companyName') }}：</span><span>{{ packageData.company.company_name }}</span>
+				</div>
+				<div v-if="packageData.express_number">
+					<span class="ml-[60px]">{{ t('logisticNo') }}：</span><span>{{ packageData.express_number }}</span>
+				</div>
+			</div>
+			<h3 class="panel-title">{{ t('goodsInfo') }}</h3>
+			<div class="pl-[20px] mb-[20px]">
+				<el-table :data="packageData.order_goods" size="large">
+					<el-table-column :label="t('goodsName')" align="left" width="300">
+						<template #default="{ row }">
+							<div class="flex">
+								<div class="flex items-center w-[50px] h-[50px] mr-[10px]">
+									<img class="w-[50px] h-[50px]" :src="img(row.goods_image_thumb_small)" />
+								</div>
+								<div class="flex flex-col flex-1">
+									<p class="multi-hidden text-[14px]">{{ row.goods_name }}</p>
+									<span class="text-[12px] text-[#999]">{{ row.sku_name }}</span>
+								</div>
+							</div>
+						</template>
+					</el-table-column>
+					<el-table-column prop="price" :label="t('price')" min-width="50" align="left" />
+					<el-table-column prop="num" :label="t('num')" min-width="50" align="right"/>
+				</el-table>
+			</div>
+			<h3 class="panel-title">{{ t('logisticInfo') }}</h3>
+			<template v-if="packageData.sub_delivery_type != 'none_express'">
+				<div class="pl-[20px]" v-if="packageData.traces">
+					<template v-if="packageData.traces.list">
+						<div class="flex justify-between mb-[15px]" v-for="(item, index) in packageData.traces.list" :key="index">
+							<span class="block w-[150px]">{{ item.datetime }}</span><span class="block w-[500px]">{{ item.remark }}</span>
+						</div>
+					</template>
+					<div>{{ packageData.traces.reason}}</div>
+				</div>
+				<div class="pl-[20px]" v-else>
+					<div>{{ t('notLogistics') }}</div>
+				</div>
+			</template>
+			<span class="pl-[20px]" v-else>{{ t('noLogisticsRequired') }}</span>
+		</div>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -97,62 +68,62 @@ import { img } from '@/utils/common'
 const showDialog = ref(false)
 const loading = ref(false)
 interface PackageDataType {
-  create_time: string
-  express_number: string
-  company: {
-    company_name: string
-  }
-  order_goods: {
-    goods_name: string
-    goods_image_thumb_small: string
-    sku_name: string
-    price: number
-    num: number
-  }[]
-  traces: {
-    list: {
-      datetime: string
-      remark: string
+    create_time: string
+    express_number: string
+    company: {
+        company_name: string
+    }
+    order_goods: {
+        goods_name: string
+        goods_image_thumb_small: string
+        sku_name: string
+        price: number
+        num: number
     }[]
-    reason: string
-  }
+    traces: {
+        list: {
+            datetime: string
+			remark: string
+        }[]
+		reason: string
+	}
 }
-const packageData = ref<PackageDataType | any>('')
+const packageData = ref<PackageDataType|any>('')
 
 const setFormData = async (id: number, mobile: number) => {
-  loading.value = true
-  if (id) {
-    deliveryPackage({
-      id,
-      mobile,
-    }).then((data) => {
-      packageData.value = data.data
-      loading.value = false
-    })
-  }
+    loading.value = true
+    if (id) {
+        deliveryPackage({
+            id,
+            mobile
+        }).then((data) => {
+            packageData.value = data.data
+            loading.value = false
+        })
+    }
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
 <style lang="scss" scoped></style>
 <style lang="scss">
 .diy-dialog-wrap .el-form-item__label {
-  height: auto !important;
+    height: auto !important;
 }
-.notes-form .el-dialog__body .el-form-item {
-  margin-bottom: 0px !important;
+.notes-form .el-dialog__body .el-form-item{
+	margin-bottom: 0px !important;
 }
 /* 多行超出隐藏 */
 .multi-hidden {
-  word-break: break-all;
-  text-overflow: ellipsis;
-  overflow: hidden;
-  display: -webkit-box;
-  -webkit-line-clamp: 2;
-  -webkit-box-orient: vertical;
+	word-break: break-all;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	display: -webkit-box;
+	-webkit-line-clamp: 2;
+	-webkit-box-orient: vertical;
 }
 </style>
diff --git a/admin/src/addon/shop/views/order/components/electronic-sheet-print.vue b/admin/src/addon/shop/views/order/components/electronic-sheet-print.vue
index b0e0a114..00ec4826 100644
--- a/admin/src/addon/shop/views/order/components/electronic-sheet-print.vue
+++ b/admin/src/addon/shop/views/order/components/electronic-sheet-print.vue
@@ -1,258 +1,155 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="t('electronicSheetPrintTitle')"
-    :width="printDialogWidth"
-    class="diy-dialog-wrap"
-    :destroy-on-close="true"
-    :close-on-click-modal="false"
-  >
-    <el-alert type="warning" :closable="false" class="!mb-[10px]">
-      <template #default>
-        <p>注意事项：</p>
-        <p>* 配送方式为物流配送的订单支持打印电子面单</p>
-        <p>* 无需物流、虚拟发货不支持打印电子面单</p>
-        <p>* 请对应物流公司选择面单模板</p>
-        <p>* 批量打印时，只能选择一种面单模板</p>
-        <p>
-          * 单个打印时，如果有多个包裹，会展示商品信息，支持多包裹打印电子面单
-        </p>
-        <p>* 多包裹打印时，请不要重复选择面单模板</p>
-      </template>
-    </el-alert>
+    <el-dialog v-model="showDialog" :title="t('electronicSheetPrintTitle')" :width="printDialogWidth" class="diy-dialog-wrap" :destroy-on-close="true" :close-on-click-modal="false">
 
-    <el-form
-      :model="formData"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form es-form"
-      v-loading="loading"
-    >
-      <!-- 单个订单打印，更加详细，展示包裹 -->
-      <template v-if="formData.print_type == 'single'">
-        <template v-if="packageList.length">
-          <el-tabs v-model="currentPackageIndex" @tab-change="handleClick">
-            <el-tab-pane
-              v-for="(item, index) in packageList"
-              :label="'包裹' + (index + 1)"
-              :name="index"
-            />
-          </el-tabs>
-
-          <el-form-item :label="t('electronicSheetTemplate')">
-            <el-select
-              v-model="formData.list[currentPackageIndex].electronic_sheet_id"
-              :placeholder="t('electronicSheetTemplatePlaceholder')"
-              clearable
-              class="input-width"
-            >
-              <el-option
-                v-for="item in electronicSheetData"
-                :key="item.id"
-                :label="item.template_name"
-                :value="item.id"
-              />
-            </el-select>
-          </el-form-item>
-
-          <el-form-item :label="t('company')">
-            <div class="truncate">
-              {{ packageList[currentPackageIndex].company.company_name }}
-            </div>
-          </el-form-item>
-
-          <el-form-item :label="t('expressNumber')">
-            <div class="truncate">
-              {{ packageList[currentPackageIndex].express_number }}
-            </div>
-          </el-form-item>
-
-          <el-table
-            :data="packageList[currentPackageIndex].order_goods"
-            size="large"
-          >
-            <el-table-column :label="t('goodsName')" align="left" width="300">
-              <template #default="{ row }">
-                <div class="flex">
-                  <div class="flex items-center w-[50px] h-[50px] mr-[10px]">
-                    <img
-                      class="w-[50px] h-[50px]"
-                      :src="img(row.goods_image_thumb_small)"
-                    />
-                  </div>
-                  <div class="flex flex-col flex-1">
-                    <p class="multi-hidden text-[14px]">{{ row.goods_name }}</p>
-                    <span class="text-[12px] text-[#999]">{{
-                      row.sku_name
-                    }}</span>
-                  </div>
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="price"
-              :label="t('price')"
-              min-width="50"
-              align="left"
-            />
-            <el-table-column
-              prop="num"
-              :label="t('num')"
-              min-width="50"
-              align="right"
-            />
-          </el-table>
+    <el-alert type="warning" :closable="false" class="!mb-[10px]">
+        <template #default>
+            <p>注意事项：</p>
+            <p>* 配送方式为物流配送的订单支持打印电子面单</p>
+            <p>* 无需物流、虚拟发货不支持打印电子面单</p>
+            <p>* 请对应物流公司选择面单模板</p>
+            <p>* 批量打印时，只能选择一种面单模板</p>
+            <p>* 单个打印时，如果有多个包裹，会展示商品信息，支持多包裹打印电子面单</p>
+            <p>* 多包裹打印时，请不要重复选择面单模板</p>
         </template>
+    </el-alert>
 
-        <template
-          v-if="
-            singlePrintData['delivery_id_' + currentPackageId] &&
-            singlePrintData['delivery_id_' + currentPackageId].length
-          "
-        >
-          <h3 class="my-[15px]">{{ t('electronicSheetPrintResult') }}</h3>
-
-          <el-table
-            :data="singlePrintData['delivery_id_' + currentPackageId]"
-            size="large"
-            class="table-top"
-          >
-            <el-table-column :label="t('deliveryPackageNo')" min-width="80">
-              <template #default="{ row }">
-                <div>{{ row.delivery_id }}</div>
-              </template>
-            </el-table-column>
-            <el-table-column :label="t('printStatus')" min-width="80">
-              <template #default="{ row }">
-                <el-tag
-                  class="cursor-pointer"
-                  :type="row.success ? 'success' : 'danger'"
-                  >{{ row.success ? '成功' : '失败' }}</el-tag
-                >
-              </template>
-            </el-table-column>
-            <el-table-column :label="t('printResultCode')" min-width="80">
-              <template #default="{ row }">
-                <div>{{ row.result_code }}</div>
-              </template>
-            </el-table-column>
-            <el-table-column :label="t('printRemark')" min-width="200">
-              <template #default="{ row }">
-                <div>{{ row.reason }}</div>
-              </template>
-            </el-table-column>
-            <el-table-column
-              :label="t('operation')"
-              fixed="right"
-              align="right"
-              min-width="80"
-            >
-              <template #default="{ row }">
-                <el-button
-                  type="primary"
-                  link
-                  @click="printEvent(row)"
-                  v-if="row.success"
-                  >{{ t('electronicSheetPrintOperation') }}</el-button
-                >
-              </template>
-            </el-table-column>
-          </el-table>
-        </template>
-      </template>
-
-      <!-- 多个订单打印 -->
-      <template v-if="formData.print_type == 'multiple'">
-        <el-form-item
-          :label="t('electronicSheetTemplate')"
-          prop="electronic_sheet_id"
-        >
-          <el-select
-            v-model="formData.electronic_sheet_id"
-            :placeholder="t('electronicSheetTemplatePlaceholder')"
-            clearable
-            class="input-width"
-          >
-            <el-option
-              v-for="item in electronicSheetData"
-              :key="item.id"
-              :label="item.template_name"
-              :value="item.id"
-            />
-          </el-select>
-        </el-form-item>
-
-        <el-table
-          :data="multiplePrintData"
-          size="large"
-          class="table-top"
-          v-if="multiplePrintData.length > 1"
-        >
-          <el-table-column
-            prop="order_no"
-            :label="t('orderNo')"
-            min-width="150"
-          />
-          <el-table-column :label="t('printStatus')" min-width="80">
-            <template #default="{ row }">
-              <el-tag
-                class="cursor-pointer"
-                :type="row.success ? 'success' : 'danger'"
-                >{{ row.success ? '成功' : '失败' }}</el-tag
-              >
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('printResultCode')" min-width="80">
-            <template #default="{ row }">
-              <div>{{ row.result_code }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('printRemark')" min-width="160">
-            <template #default="{ row }">
-              <div>{{ row.reason }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            :label="t('operation')"
-            fixed="right"
-            align="right"
-            min-width="80"
-          >
-            <template #default="{ row }">
-              <el-button
-                type="primary"
-                link
-                @click="printEvent(row)"
-                v-if="row.success"
-                >{{ t('electronicSheetPrintOperation') }}</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-      </template>
-    </el-form>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button type="primary" :loading="repeat" @click="confirm(formRef)">{{
-          t('confirm')
-        }}</el-button>
-      </span>
-    </template>
-  </el-dialog>
+        <el-form :model="formData" ref="formRef" :rules="formRules" class="page-form es-form" v-loading="loading">
+
+            <!-- 单个订单打印，更加详细，展示包裹 -->
+            <template v-if="formData.print_type == 'single'">
+
+                <template v-if="packageList.length">
+
+                    <el-tabs v-model="currentPackageIndex" @tab-change="handleClick">
+                        <el-tab-pane v-for="(item,index) in packageList" :label="'包裹' + (index + 1)" :name="index" />
+                    </el-tabs>
+
+                    <el-form-item :label="t('electronicSheetTemplate')">
+                        <el-select v-model="formData.list[currentPackageIndex].electronic_sheet_id" :placeholder="t('electronicSheetTemplatePlaceholder')" clearable class="input-width">
+                            <el-option v-for="(item) in electronicSheetData" :key="item.id" :label="item.template_name" :value="item.id" />
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item :label="t('company')">
+					    <div class="truncate">{{ packageList[currentPackageIndex].company.company_name }}</div>
+				    </el-form-item>
+
+				    <el-form-item :label="t('expressNumber')">
+					    <div class="truncate">{{ packageList[currentPackageIndex].express_number }}</div>
+				    </el-form-item>
+
+				    <el-table :data="packageList[currentPackageIndex].order_goods" size="large">
+					    <el-table-column :label="t('goodsName')" align="left" width="300">
+						    <template #default="{ row }">
+							    <div class="flex">
+								    <div class="flex items-center w-[50px] h-[50px] mr-[10px]">
+									    <img class="w-[50px] h-[50px]" :src="img(row.goods_image_thumb_small)" />
+								    </div>
+								    <div class="flex flex-col flex-1">
+									    <p class="multi-hidden text-[14px]">{{ row.goods_name }}</p>
+									    <span class="text-[12px] text-[#999]">{{ row.sku_name }}</span>
+								    </div>
+							    </div>
+						    </template>
+					    </el-table-column>
+					    <el-table-column prop="price" :label="t('price')" min-width="50" align="left" />
+					    <el-table-column prop="num" :label="t('num')" min-width="50" align="right"/>
+				    </el-table>
+
+			    </template>
+
+			    <template v-if="singlePrintData['delivery_id_' + currentPackageId] && singlePrintData['delivery_id_' + currentPackageId].length">
+
+				    <h3 class="my-[15px]">{{ t('electronicSheetPrintResult') }}</h3>
+
+				    <el-table :data="singlePrintData['delivery_id_' + currentPackageId]" size="large" class="table-top">
+					    <el-table-column :label="t('deliveryPackageNo')" min-width="80">
+						    <template #default="{ row }">
+							    <div>{{ row.delivery_id }}</div>
+						    </template>
+					    </el-table-column>
+					    <el-table-column :label="t('printStatus')" min-width="80">
+						    <template #default="{ row }">
+							    <el-tag class="cursor-pointer" :type="row.success ? 'success' : 'danger'">{{ row.success ? '成功' : '失败' }}</el-tag>
+						    </template>
+					    </el-table-column>
+					    <el-table-column :label="t('printResultCode')" min-width="80">
+						    <template #default="{ row }">
+							    <div>{{ row.result_code }}</div>
+						    </template>
+					    </el-table-column>
+					    <el-table-column :label="t('printRemark')" min-width="200">
+						    <template #default="{ row }">
+							    <div>{{ row.reason }}</div>
+						    </template>
+					    </el-table-column>
+					    <el-table-column :label="t('operation')" fixed="right" align="right" min-width="80">
+						    <template #default="{ row }">
+							    <el-button type="primary" link @click="printEvent(row)" v-if="row.success">{{ t('electronicSheetPrintOperation') }}</el-button>
+						    </template>
+					    </el-table-column>
+
+				    </el-table>
+			    </template>
+
+		    </template>
+
+		    <!-- 多个订单打印 -->
+		    <template v-if="formData.print_type == 'multiple'">
+
+			    <el-form-item :label="t('electronicSheetTemplate')" prop="electronic_sheet_id">
+				    <el-select v-model="formData.electronic_sheet_id" :placeholder="t('electronicSheetTemplatePlaceholder')" clearable class="input-width">
+					    <el-option v-for="(item) in electronicSheetData" :key="item.id" :label="item.template_name" :value="item.id" />
+				    </el-select>
+			    </el-form-item>
+
+			    <el-table :data="multiplePrintData" size="large" class="table-top" v-if="multiplePrintData.length > 1">
+				    <el-table-column prop="order_no" :label="t('orderNo')" min-width="150" />
+				    <el-table-column :label="t('printStatus')" min-width="80">
+					    <template #default="{ row }">
+						    <el-tag class="cursor-pointer" :type="row.success ? 'success' : 'danger'">{{ row.success ? '成功' : '失败' }}</el-tag>
+					    </template>
+				    </el-table-column>
+				    <el-table-column :label="t('printResultCode')" min-width="80">
+					    <template #default="{ row }">
+						    <div>{{ row.result_code }}</div>
+					    </template>
+				    </el-table-column>
+				    <el-table-column :label="t('printRemark')" min-width="160">
+					    <template #default="{ row }">
+						    <div>{{ row.reason }}</div>
+					    </template>
+				    </el-table-column>
+				    <el-table-column :label="t('operation')" fixed="right" align="right" min-width="80">
+					    <template #default="{ row }">
+						    <el-button type="primary" link @click="printEvent(row)" v-if="row.success">{{ t('electronicSheetPrintOperation') }}</el-button>
+					    </template>
+				    </el-table-column>
+
+			    </el-table>
+		    </template>
+        </el-form>
+
+	    <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="repeat" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+            </span>
+	    </template>
+
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
 import { ref, reactive, computed } from 'vue'
 import { t } from '@/lang'
 import {
-  getElectronicSheetConfig,
-  getElectronicSheetList,
-  printElectronicSheet,
+    getElectronicSheetConfig,
+    getElectronicSheetList,
+    printElectronicSheet
 } from '@/addon/shop/api/electronic_sheet'
 import { deliveryPackageList } from '@/addon/shop/api/order'
-import { loadCLodop, getLodop } from '@/utils/lodop'
+import { loadCLodop,getLodop } from '@/utils/lodop'
 import { img } from '@/utils/common'
 import { ElMessage, FormInstance } from 'element-plus'
 
@@ -260,29 +157,29 @@ const showDialog = ref(false)
 const loading = ref(false)
 const repeat = ref(false)
 
-getElectronicSheetConfig().then((res: any) => {
-  if (res.data) {
-    loadCLodop(res.data)
-  }
+getElectronicSheetConfig().then((res:any)=>{
+    if(res.data) {
+        loadCLodop(res.data)
+    }
 })
 
 const electronicSheetData = ref([])
 getElectronicSheetList({
-  status: 1,
+    status: 1,
 }).then((res: any) => {
-  if (res.data) {
-    electronicSheetData.value = res.data
-  }
+    if (res.data) {
+        electronicSheetData.value = res.data;
+    }
 })
 
 /**
  * 表单数据
  */
 const initialFormData = {
-  print_type: 'multiple',
-  order_id: 0,
-  electronic_sheet_id: '',
-  list: [],
+    print_type: 'multiple',
+    order_id: 0,
+    electronic_sheet_id: '',
+    list: []
 }
 
 const formData: Record<string, any> = reactive({ ...initialFormData })
@@ -290,260 +187,250 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    electronic_sheet_id: [
-      {
-        required: true,
-        message: t('electronicSheetTemplatePlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-  }
+    return {
+        electronic_sheet_id: [
+            { required: true, message: t('electronicSheetTemplatePlaceholder'), trigger: 'blur' }
+        ]
+    }
 })
 
 const emit = defineEmits(['complete'])
 
-const printDialogWidth: any = ref('460px')
+const printDialogWidth:any = ref('460px')
 
-const packageList: any = ref([]) // 包裹列表
-const currentPackageIndex: any = ref(0) // 当前选中包裹下标
-const currentPackageId: any = ref(0) // 当前选中包裹id
+const packageList:any = ref([]) // 包裹列表
+const currentPackageIndex:any = ref(0) // 当前选中包裹下标
+const currentPackageId:any = ref(0) // 当前选中包裹id
 
-const multiplePrintData: any = ref([]) // 多订单打印数据
-const singlePrintData: any = ref({}) //  单订单打印数据
+const multiplePrintData:any = ref([]) // 多订单打印数据
+const singlePrintData:any = ref({}) //  单订单打印数据
 
-const handleClick = (index: any) => {
-  currentPackageIndex.value = parseInt(index)
-  currentPackageId.value = formData.list[index].delivery_id
+const handleClick = (index:any)=>{
+    currentPackageIndex.value = parseInt(index);
+    currentPackageId.value = formData.list[index].delivery_id
 }
 
 const setFormData = async (data: any = null) => {
-  loading.value = true
-
-  // 初始化数据
-  Object.assign(formData, initialFormData)
-  multiplePrintData.value = []
-  packageList.value = []
-  singlePrintData.value = {}
-  currentPackageIndex.value = 0
-  currentPackageId.value = 0
-
-  if (!data) return
-
-  formData.order_id = data.order_id
-  formData.print_type = data.print_type
-  formData.list = []
-
-  // 打印单个订单，查询包裹
-  if (data.print_type == 'single') {
-    // 检测是否存在多个包裹的情况
-    let tempDeliveryIdArr: any = []
-    data.order_goods.forEach((item: any) => {
-      if (
-        item.delivery_id &&
-        tempDeliveryIdArr.indexOf(item.delivery_id) == -1
-      ) {
-        tempDeliveryIdArr.push(item.delivery_id)
-      }
-    })
-
-    if (tempDeliveryIdArr.length > 1) {
-      deliveryPackageList({
-        order_id: formData.order_id,
-      }).then((res: any) => {
-        if (res.data) {
-          let data = res.data.filter((item: any) => {
-            if (
-              item.delivery_type == 'express' &&
-              item.sub_delivery_type == 'express'
-            ) {
-              return item
+    loading.value = true;
+
+    // 初始化数据
+    Object.assign(formData, initialFormData);
+    multiplePrintData.value = [];
+    packageList.value = [];
+    singlePrintData.value = {};
+    currentPackageIndex.value = 0;
+    currentPackageId.value = 0;
+
+    if (!data) return;
+
+    formData.order_id = data.order_id;
+    formData.print_type = data.print_type;
+    formData.list = [];
+
+    // 打印单个订单，查询包裹
+    if (data.print_type == 'single') {
+
+        // 检测是否存在多个包裹的情况
+        let tempDeliveryIdArr: any = [];
+        data.order_goods.forEach((item: any) => {
+            if (item.delivery_id && tempDeliveryIdArr.indexOf(item.delivery_id) == -1) {
+                tempDeliveryIdArr.push(item.delivery_id)
             }
-          })
+        });
+
+        if (tempDeliveryIdArr.length > 1) {
+            deliveryPackageList({
+                order_id: formData.order_id
+            }).then((res: any) => {
+                if (res.data) {
+                    let data = res.data.filter((item: any) => {
+                        if (item.delivery_type == 'express' && item.sub_delivery_type == 'express') {
+                            return item;
+                        }
+                    });
+
+                    packageList.value.push(...data);
+                    packageList.value.forEach((item: any) => {
+                        formData.list.push({
+                            delivery_id: item.id,
+                            electronic_sheet_id: '',
+                        })
+                    })
 
-          packageList.value.push(...data)
-          packageList.value.forEach((item: any) => {
-            formData.list.push({
-              delivery_id: item.id,
-              electronic_sheet_id: '',
+                }
+                loading.value = false;
+                printDialogWidth.value = '800px';
             })
-          })
+        } else {
+            // 如果只有一个包裹，则不需要显示详细信息
+            formData.print_type = 'multiple';
+            printDialogWidth.value = '460px';
+            loading.value = false;
         }
-        loading.value = false
-        printDialogWidth.value = '800px'
-      })
+
     } else {
-      // 如果只有一个包裹，则不需要显示详细信息
-      formData.print_type = 'multiple'
-      printDialogWidth.value = '460px'
-      loading.value = false
+        loading.value = false;
+        printDialogWidth.value = '460px';
     }
-  } else {
-    loading.value = false
-    printDialogWidth.value = '460px'
-  }
-}
+};
 
 /**
  * 确认
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-
-  let LODOP = getLodop()
-  if (!LODOP) return
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      // 单订单打印，检测包裹有没有未选择面单模板
-      let isFail = false
-      if (formData.print_type == 'single') {
-        for (let i = 0; i < formData.list.length; i++) {
-          if (formData.list[i].electronic_sheet_id.length == 0) {
-            ElMessage({
-              type: 'warning',
-              message: `请选择[包裹${i + 1}]的面单模板`,
-            })
-            currentPackageIndex.value = i
-            isFail = true
-            break
-          }
-        }
-      }
-
-      if (isFail) return
-
-      if (repeat.value) return
-      repeat.value = true
-
-      printElectronicSheet({
-        print_type: formData.print_type,
-        order_id: formData.order_id,
-        electronic_sheet_id: formData.electronic_sheet_id,
-        list: formData.list,
-      })
-        .then((res: any) => {
-          multiplePrintData.value = []
-          singlePrintData.value = {}
-
-          if (res.data) {
-            let data = res.data
-            let singleFailData: any = {} // 单订单打印
-            let multipleFailData: any = [] // 多订单打印
-            let haveSuccessData = false
-            LODOP.PRINT_INIT('打印电子面单') // 只能初始化一次
+    if (loading.value || !formEl) return;
 
-            if (formData.print_type == 'single') {
-              // 单订单打印
-              for (let i = 0; i < data.length; i++) {
-                if (
-                  !singlePrintData.value['delivery_id_' + data[i].delivery_id]
-                )
-                  singlePrintData.value['delivery_id_' + data[i].delivery_id] =
-                    []
-                if (!singleFailData['delivery_id_' + data[i].delivery_id])
-                  singleFailData['delivery_id_' + data[i].delivery_id] = []
-
-                if (data[i].success) {
-                  // 调用打印机，开始打印
-                  let html = data[i].print_template
-                  LODOP.ADD_PRINT_HTM(0, 0, '100%', '100%', html)
-                  LODOP.NewPage() // 批量打印，分页
-                  haveSuccessData = true
-                  singlePrintData.value[
-                    'delivery_id_' + data[i].delivery_id
-                  ].push(data[i])
-                } else {
-                  singleFailData['delivery_id_' + data[i].delivery_id].push(
-                    data[i]
-                  )
-                }
-              }
+    let LODOP = getLodop();
+    if (!LODOP) return;
 
-              for (let key in singlePrintData.value) {
-                if (singleFailData[key] && singleFailData[key].length) {
-                  singlePrintData.value[key].push(...singleFailData[key])
-                }
-              }
-
-              if (Object.keys(singlePrintData.value).length > 1) {
-                printDialogWidth.value = '800px'
-              } else if (Object.keys(singlePrintData.value).length == 1) {
-                // 若打印单条数据并且只有一个包裹则关闭弹出框
-                showDialog.value = false
-              }
-            } else {
-              // 多订单打印
-              for (let i = 0; i < data.length; i++) {
-                if (data[i].success) {
-                  // 调用打印机，开始打印
-                  let html = data[i].print_template
-                  LODOP.ADD_PRINT_HTM(0, 0, '100%', '100%', html)
-                  LODOP.NewPage() // 批量打印，分页
-                  haveSuccessData = true
-                  multiplePrintData.value.push(data[i])
-                } else {
-                  multipleFailData.push(data[i])
-                }
-              }
+    await formEl.validate(async(valid) => {
+        if (valid) {
 
-              if (multipleFailData.length)
-                multiplePrintData.value.push(...multipleFailData)
-
-              if (multiplePrintData.value.length > 1) {
-                printDialogWidth.value = '800px'
-              } else if (multiplePrintData.value.length == 1) {
-                // 若打印单条数据并且只有一个包裹则关闭弹出框
-                showDialog.value = false
-              }
+            // 单订单打印，检测包裹有没有未选择面单模板
+            let isFail = false;
+            if (formData.print_type == 'single') {
+                for (let i = 0; i < formData.list.length; i++) {
+                    if (formData.list[i].electronic_sheet_id.length == 0) {
+                        ElMessage({
+                            type: 'warning',
+                            message: `请选择[包裹${ i + 1 }]的面单模板`
+                        });
+                        currentPackageIndex.value = i;
+                        isFail = true;
+                        break;
+                    }
+                }
             }
 
-            if (haveSuccessData) {
-              LODOP.PREVIEW() // 预览
-              // LODOP.PRINT();  // 直接打印，会出现试用版提示
-              // LODOP.PRINTA(); // 选择打印机
-            }
+            if (isFail) return;
+
+            if (repeat.value) return;
+            repeat.value = true;
+
+            printElectronicSheet({
+                print_type: formData.print_type,
+                order_id: formData.order_id,
+                electronic_sheet_id: formData.electronic_sheet_id,
+                list: formData.list
+            }).then((res: any) => {
+
+                multiplePrintData.value = [];
+                singlePrintData.value = {};
+
+                if (res.data) {
+
+                    let data = res.data;
+                    let singleFailData: any = {}; // 单订单打印
+                    let multipleFailData: any = []; // 多订单打印
+                    let haveSuccessData = false;
+                    LODOP.PRINT_INIT("打印电子面单"); // 只能初始化一次
+
+                    if (formData.print_type == 'single') {
+
+                        // 单订单打印
+                        for (let i = 0; i < data.length; i++) {
+
+                            if (!singlePrintData.value['delivery_id_' + data[i].delivery_id]) singlePrintData.value['delivery_id_' + data[i].delivery_id] = [];
+                            if (!singleFailData['delivery_id_' + data[i].delivery_id]) singleFailData['delivery_id_' + data[i].delivery_id] = [];
+
+                            if (data[i].success) {
+                                // 调用打印机，开始打印
+                                let html = data[i].print_template;
+                                LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", html);
+                                LODOP.NewPage(); // 批量打印，分页
+                                haveSuccessData = true;
+                                singlePrintData.value['delivery_id_' + data[i].delivery_id].push(data[i]);
+                            } else {
+                                singleFailData['delivery_id_' + data[i].delivery_id].push(data[i]);
+                            }
+                        }
+
+                        for (let key in singlePrintData.value) {
+                            if (singleFailData[key] && singleFailData[key].length) {
+                                singlePrintData.value[key].push(...singleFailData[key])
+                            }
+                        }
+
+                        if (Object.keys(singlePrintData.value).length > 1) {
+                            printDialogWidth.value = '800px'
+                        } else if (Object.keys(singlePrintData.value).length == 1) {
+                            // 若打印单条数据并且只有一个包裹则关闭弹出框
+                            showDialog.value = false
+                        }
+
+                    } else {
+
+                        // 多订单打印
+                        for (let i = 0; i < data.length; i++) {
+                            if (data[i].success) {
+                                // 调用打印机，开始打印
+                                let html = data[i].print_template;
+                                LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", html);
+                                LODOP.NewPage(); // 批量打印，分页
+                                haveSuccessData = true;
+                                multiplePrintData.value.push(data[i]);
+                            } else {
+                                multipleFailData.push(data[i]);
+                            }
+                        }
+
+                        if (multipleFailData.length) multiplePrintData.value.push(...multipleFailData);
+
+                        if (multiplePrintData.value.length > 1) {
+                            printDialogWidth.value = '800px'
+                        } else if (multiplePrintData.value.length == 1) {
+                            // 若打印单条数据并且只有一个包裹则关闭弹出框
+                            showDialog.value = false
+                        }
+                    }
+
+                    if (haveSuccessData) {
+                        LODOP.PREVIEW(); // 预览
+                        // LODOP.PRINT();  // 直接打印，会出现试用版提示
+                        // LODOP.PRINTA(); // 选择打印机
+                    }
+
+                    repeat.value = false
 
-            repeat.value = false
-          }
+                }
 
-          emit('complete')
-        })
-        .catch(() => {
-          repeat.value = false
-        })
-    }
-  })
+                emit('complete')
+            }).catch(() => {
+                repeat.value = false
+            })
+
+        }
+    })
 }
 
-const printEvent = (data: any) => {
-  let LODOP = getLodop()
-  if (!LODOP) return
+const printEvent = (data:any)=> {
+    let LODOP = getLodop();
+    if (!LODOP) return;
 
-  if (repeat.value) return
-  repeat.value = true
+    if (repeat.value) return
+    repeat.value = true
 
-  let html = data.print_template
-  LODOP.PRINT_INIT('打印电子面单')
-  LODOP.ADD_PRINT_HTM(0, 0, '100%', '100%', html)
-  LODOP.PREVIEW() // 预览
+    let html = data.print_template;
+    LODOP.PRINT_INIT("打印电子面单");
+    LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", html);
+    LODOP.PREVIEW(); // 预览
 
-  repeat.value = false
+    repeat.value = false
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
 <style lang="scss" scoped></style>
 <style lang="scss">
 .diy-dialog-wrap .el-form-item__label {
-  height: auto !important;
+    height: auto !important;
 }
-.es-form .el-dialog__body .el-form-item {
-  margin-bottom: 0px !important;
+.es-form .el-dialog__body .el-form-item{
+	margin-bottom: 0px !important;
 }
 </style>
diff --git a/admin/src/addon/shop/views/order/components/form-detail.vue b/admin/src/addon/shop/views/order/components/form-detail.vue
index 20705ad2..a0a1e374 100644
--- a/admin/src/addon/shop/views/order/components/form-detail.vue
+++ b/admin/src/addon/shop/views/order/components/form-detail.vue
@@ -1,52 +1,31 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="t('formDetail')"
-    width="600px"
-    :destroy-on-close="true"
-  >
-    <el-form
-      label-width="100px"
-      ref="formRef"
-      class="page-form"
-      label-position="left"
-      v-loading="loading"
-    >
-      <div
-        class="row-bg px-[30px] mb-[20px]"
-        v-if="tableData[0]?.recordsFieldList"
-      >
-        <div class="">
-          <el-form-item
-            v-for="(field, fieldKey) in tableData[0]?.recordsFieldList || []"
-            :key="fieldKey"
-            :label="field.field_name"
-            min-width="200"
-          >
-            <component
-              :is="tableData[0]?.recordsFieldList[fieldKey].detailComponent"
-              :data="tableData[0]?.recordsFieldList[fieldKey]"
-            />
-          </el-form-item>
-        </div>
-      </div>
-      <div class="text-center" v-else>暂无表单数据</div>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="showDialog = false">{{
-          t('confirm')
-        }}</el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
+    <el-dialog v-model="showDialog" :title="t('formDetail')" width="600px" :destroy-on-close="true">
+        <el-form  label-width="100px" ref="formRef" class="page-form"  label-position="left" v-loading="loading" >
+            <div class="row-bg px-[30px] mb-[20px]" v-if="tableData[0]?.recordsFieldList">
+                <div class="">
+                    <el-form-item v-for="(field, fieldKey) in tableData[0]?.recordsFieldList || []" :key="fieldKey" :label="field.field_name" min-width="200" >
+                        <component :is="tableData[0]?.recordsFieldList[fieldKey].detailComponent" :data="tableData[0]?.recordsFieldList[fieldKey]" />
+                    </el-form-item> 
+                </div>
+            </div>
+            <div class="text-center" v-else>
+                暂无表单数据
+            </div>
+        </el-form>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button type="primary" @click="showDialog = false">{{ t('confirm') }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+  </template>
+  
 
 <script lang="ts" setup>
 import { t } from '@/lang'
 import { ref, defineAsyncComponent, watch } from 'vue'
 import { ElMessage } from 'element-plus'
-import { getFormRecordsInfo } from '@/app/api/diy_form'
+import { getFormRecordsInfo} from '@/app/api/diy_form'
 const loading = ref(true)
 const showDialog = ref(false)
 
@@ -54,29 +33,30 @@ const page = ref('')
 const tableData = ref({})
 const modules: any = import.meta.glob('@/**/*.vue')
 
+
 const show = (data: any) => {
-  loading.value = true
-  getFormRecordsInfo(data).then((res) => {
-    tableData.value = [res.data]
-    const recordsFieldList = res.data.recordsFieldList
-    for (const key in recordsFieldList) {
-      if (modules[recordsFieldList[key].detailComponent]) {
-        recordsFieldList[key].detailComponent = defineAsyncComponent(
-          modules[recordsFieldList[key].detailComponent]
-        )
-      } else {
-        delete recordsFieldList[key]
-      }
-    }
-    loading.value = false
-  })
+    loading.value = true
+    getFormRecordsInfo(data).then(res => {
+        tableData.value = [res.data];
+        const recordsFieldList = res.data.recordsFieldList;
+        for (const key in recordsFieldList) {
+            if (modules[recordsFieldList[key].detailComponent]) {
+                recordsFieldList[key].detailComponent = defineAsyncComponent(modules[recordsFieldList[key].detailComponent]);
+            } else {
+                delete recordsFieldList[key];
+            }
+        }
+        loading.value = false
+        
+    })
 
-  showDialog.value = true
+    showDialog.value = true
 }
 
+
 defineExpose({
-  showDialog,
-  show,
+    showDialog,
+    show
 })
 </script>
 
diff --git a/admin/src/addon/shop/views/order/components/import-data.vue b/admin/src/addon/shop/views/order/components/import-data.vue
index 9d1237bf..1201fafc 100644
--- a/admin/src/addon/shop/views/order/components/import-data.vue
+++ b/admin/src/addon/shop/views/order/components/import-data.vue
@@ -1,53 +1,32 @@
 <template>
-  <el-dialog v-model="importDialog" :title="t('importData')" width="420px">
-    <div>
-      <el-form
-        :model="importData"
-        ref="importDataFormRef"
-        :rules="formRules"
-        label-width="80px"
-        label-position="left"
-      >
-        <el-form-item :label="t('templateType')" prop="type">
-          <el-radio-group v-model="importData.type">
-            <el-radio label="order">{{ t('fullOrderDelivery') }}</el-radio>
-            <el-radio label="order_goods">{{
-              t('openOrderDelivery')
-            }}</el-radio>
-          </el-radio-group>
-          <div
-            @click="examineTemplate"
-            class="form-tip mt-[5px] cursor-pointer !text-[var(--el-color-primary)]"
-            v-show="importData.type == 'order'"
-          >
-            {{ t('orderTemplate') }}
-          </div>
-          <div
-            @click="examineTemplate"
-            class="form-tip mt-[5px] !text-[var(--el-color-primary)] cursor-pointer"
-            v-show="importData.type == 'order_goods'"
-          >
-            {{ t('orderGoodsTemplate') }}
-          </div>
-        </el-form-item>
+    <el-dialog v-model="importDialog" :title="t('importData')" width="420px">
+        <div>
+            <el-form :model="importData" ref="importDataFormRef" :rules="formRules" label-width="80px" label-position="left" >
+                <el-form-item :label="t('templateType')" prop="type">
+                    <el-radio-group v-model="importData.type">
+                        <el-radio label="order">{{t('fullOrderDelivery')}}</el-radio>
+                        <el-radio label="order_goods">{{t('openOrderDelivery')}}</el-radio>
+                    </el-radio-group>
+                    <div @click="examineTemplate" class="form-tip mt-[5px] cursor-pointer !text-[var(--el-color-primary)]" v-show="importData.type == 'order'"> 
+                        {{t('orderTemplate')}}
+                    </div>
+                    <div @click="examineTemplate" class="form-tip mt-[5px] !text-[var(--el-color-primary)] cursor-pointer" v-show="importData.type == 'order_goods'">
+                        {{ t('orderGoodsTemplate') }}
+                    </div>
+                </el-form-item>
 
-        <el-form-item :label="t('uploadFile')" prop="path">
-          <upload-file v-model="importData.path" api="sys/document/excel" />
-        </el-form-item>
-      </el-form>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="importDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="refundDialogLoading"
-          @click="refundDialogConfirm(importDataFormRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+                <el-form-item :label="t('uploadFile')" prop="path">
+                    <upload-file v-model="importData.path" api="sys/document/excel" />
+                </el-form-item>
+            </el-form>
+        </div>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="importDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="refundDialogLoading" @click="refundDialogConfirm(importDataFormRef)">{{ t('confirm') }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -64,61 +43,57 @@ const importDialog = ref(false)
  * 表单数据
  */
 const importData = ref({
-  type: 'order',
-  path: '',
+    type: 'order',
+    path: ''
 })
 
 // 重置数据
-const initDataFn = () => {
-  importData.value.type = 'order'
-  importData.value.path = ''
-  refundDialogLoading.value = false
+const initDataFn = ()=>{
+    importData.value.type = 'order';
+    importData.value.path = '';
+    refundDialogLoading.value = false;
 }
 
 // 打开弹窗
-const open = () => {
-  initDataFn()
-  importDialog.value = true
+const open = ()=>{
+    initDataFn();
+    importDialog.value = true;
 }
 const refundDialogLoading = ref(false)
 
 const emit = defineEmits(['complete'])
 const refundDialogConfirm = async (formEl: FormInstance | undefined) => {
-  if (refundDialogLoading.value || !formEl) return
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      refundDialogLoading.value = true
-      const data = { data: importData.value }
-      addBatchOrderDelivery(data)
-        .then((res) => {
-          emit('complete')
-          importDialog.value = false
-        })
-        .catch(() => {
-          refundDialogLoading.value = false
-        })
-    }
-  })
+    if (refundDialogLoading.value || !formEl) return
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            refundDialogLoading.value = true
+            const data = {'data': importData.value}
+            addBatchOrderDelivery(data).then((res) => {
+                emit('complete');
+                importDialog.value = false;
+            }).catch(() => {
+                refundDialogLoading.value = false
+            })
+        }
+    })
 }
 const importDataFormRef = ref<FormInstance>()
 
-const examineTemplate = () => {
-  let url = `${import.meta.env.VITE_IMG_DOMAIN || location.origin}/addon/shop/batch/batch_delivery_order.xls`
-  if (importData.value.type == 'order_goods') {
-    url = `${import.meta.env.VITE_IMG_DOMAIN || location.origin}/addon/shop/batch/batch_delivery_order_goods.xls`
-  }
-  window.open(url)
+const examineTemplate = ()=>{
+    let url = `${import.meta.env.VITE_IMG_DOMAIN || location.origin}/addon/shop/batch/batch_delivery_order.xls`;
+    if(importData.value.type == 'order_goods'){
+        url = `${import.meta.env.VITE_IMG_DOMAIN || location.origin}/addon/shop/batch/batch_delivery_order_goods.xls`;
+    }
+    window.open(url)
 }
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    path: [
-      { required: true, message: t('uploadFilePlaceholder'), trigger: 'blur' },
-    ],
-  }
+    return {
+        path: [{ required: true, message: t('uploadFilePlaceholder'), trigger: 'blur' }]
+    }
 })
 defineExpose({
-  open,
+    open
 })
 </script>
diff --git a/admin/src/addon/shop/views/order/components/invoice-detail.vue b/admin/src/addon/shop/views/order/components/invoice-detail.vue
index c1e34149..d6123f24 100644
--- a/admin/src/addon/shop/views/order/components/invoice-detail.vue
+++ b/admin/src/addon/shop/views/order/components/invoice-detail.vue
@@ -1,89 +1,42 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="t('detail')"
-    width="800px"
-    :destroy-on-close="true"
-  >
-    <el-scrollbar height="400px" v-loading="loading">
-      <el-descriptions :column="2">
-        <el-descriptions-item :label="t('headerName')" label-align="right">{{
-          logData.header_name || '--'
-        }}</el-descriptions-item>
-        <el-descriptions-item :label="t('headTypeName')" label-align="right">{{
-          logData.header_type_name || '--'
-        }}</el-descriptions-item>
-        <el-descriptions-item :label="t('name')" label-align="right">{{
-          logData.name || '--'
-        }}</el-descriptions-item>
-        <el-descriptions-item :label="t('invoiceNumber')" label-align="right">{{
-          logData.invoice_number || '--'
-        }}</el-descriptions-item>
-        <el-descriptions-item :label="t('typeName')" label-align="right">{{
-          logData.type_name || '--'
-        }}</el-descriptions-item>
-        <el-descriptions-item :label="t('taxNumber')" label-align="right">{{
-          logData.tax_number || '--'
-        }}</el-descriptions-item>
-        <el-descriptions-item :label="t('money')" label-align="right">{{
-          logData.money || '--'
-        }}</el-descriptions-item>
-        <el-descriptions-item :label="t('invoiceTime')" label-align="right">{{
-          logData.invoice_time === 0 ? '--' : logData.invoice_time
-        }}</el-descriptions-item>
-        <el-descriptions-item :label="t('invoiceVoucher')" label-align="right">
-          <span>
-            <img
-              class="w-[50px] max-h-[50px] inline-block"
-              v-if="logData.invoice_voucher"
-              :src="img(logData.invoice_voucher)"
-              alt=""
-              @click="previewImage"
-            />
-          </span>
-        </el-descriptions-item>
-        <el-descriptions-item :label="t('bankTame')" label-align="right">{{
-          logData.bank_name || '--'
-        }}</el-descriptions-item>
-        <el-descriptions-item
-          :label="t('bankCardNumber')"
-          label-align="right"
-          >{{ logData.bank_card_number || '--' }}</el-descriptions-item
-        >
-        <el-descriptions-item :label="t('address')" label-align="right">{{
-          logData.address || '--'
-        }}</el-descriptions-item>
-        <el-descriptions-item :label="t('telephone')" label-align="right">{{
-          logData.telephone || '--'
-        }}</el-descriptions-item>
-        <!-- <el-descriptions-item :label="t('email')" label-align="right">{{ logData.email || '--' }}</el-descriptions-item> -->
-        <!-- <el-descriptions-item :label="t('mobile')" label-align="right">{{ logData.mobile || '--' }}</el-descriptions-item> -->
-        <el-descriptions-item :label="t('createTime')" label-align="right">{{
-          logData.create_time || '--'
-        }}</el-descriptions-item>
-        <el-descriptions-item :label="t('remark')" label-align="right">{{
-          logData.remark || '--'
-        }}</el-descriptions-item>
-      </el-descriptions>
-    </el-scrollbar>
+    <el-dialog v-model="showDialog" :title="t('detail')" width="800px" :destroy-on-close="true">
+        <el-scrollbar height="400px" v-loading="loading">
+            <el-descriptions :column="2">
+                <el-descriptions-item :label="t('headerName')" label-align="right">{{ logData.header_name || '--' }}</el-descriptions-item>
+                <el-descriptions-item :label="t('headTypeName')" label-align="right">{{ logData.header_type_name || '--' }}</el-descriptions-item>
+                <el-descriptions-item :label="t('name')" label-align="right">{{ logData.name || '--' }}</el-descriptions-item>
+                <el-descriptions-item :label="t('invoiceNumber')" label-align="right">{{ logData.invoice_number || '--' }}</el-descriptions-item>
+                <el-descriptions-item :label="t('typeName')" label-align="right">{{ logData.type_name || '--' }}</el-descriptions-item>
+                <el-descriptions-item :label="t('taxNumber')" label-align="right">{{ logData.tax_number || '--'}}</el-descriptions-item>
+                <el-descriptions-item :label="t('money')" label-align="right">{{ logData.money || '--' }}</el-descriptions-item>
+                <el-descriptions-item :label="t('invoiceTime')" label-align="right">{{ logData.invoice_time === 0 ? '--' : logData.invoice_time }}</el-descriptions-item>
+                <el-descriptions-item :label="t('invoiceVoucher')" label-align="right">
+					<span>
+                        <img class="w-[50px] max-h-[50px] inline-block" v-if="logData.invoice_voucher" :src="img(logData.invoice_voucher)" alt="" @click="previewImage" >
+                    </span>
+                </el-descriptions-item>
+                <el-descriptions-item :label="t('bankTame')" label-align="right">{{ logData.bank_name || '--' }}</el-descriptions-item>
+                <el-descriptions-item :label="t('bankCardNumber')" label-align="right">{{ logData.bank_card_number || '--' }}</el-descriptions-item>
+                <el-descriptions-item :label="t('address')" label-align="right">{{ logData.address || '--' }}</el-descriptions-item>
+                <el-descriptions-item :label="t('telephone')" label-align="right">{{ logData.telephone || '--' }}</el-descriptions-item>
+                <!-- <el-descriptions-item :label="t('email')" label-align="right">{{ logData.email || '--' }}</el-descriptions-item> -->
+                <!-- <el-descriptions-item :label="t('mobile')" label-align="right">{{ logData.mobile || '--' }}</el-descriptions-item> -->
+                <el-descriptions-item :label="t('createTime')" label-align="right">{{ logData.create_time || '--' }}</el-descriptions-item>
+                <el-descriptions-item :label="t('remark')" label-align="right">{{ logData.remark || '--' }}</el-descriptions-item>
+            </el-descriptions>
+        </el-scrollbar>
 
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-      </span>
-    </template>
-  </el-dialog>
-  <el-image-viewer
-    :url-list="previewImageList"
-    v-if="imageViewer.show"
-    @close="imageViewer.show = false"
-    :initial-index="imageViewer.index"
-    :zoom-rate="1"
-  />
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+    <el-image-viewer :url-list="previewImageList" v-if="imageViewer.show" @close="imageViewer.show = false" :initial-index="imageViewer.index" :zoom-rate="1" />
 </template>
 
 <script lang="ts" setup>
-import { ref, reactive } from 'vue'
+import { ref,reactive } from 'vue'
 import { t } from '@/lang'
 import { getInvoiceDetail } from '@/addon/shop/api/order'
 import { img } from '@/utils/common'
@@ -91,41 +44,41 @@ import { img } from '@/utils/common'
 const showDialog = ref(false)
 const loading = ref(false)
 interface LogDataType {
-  header_name?: string
-  header_type_name?: string
-  name?: string
-  invoice_number?: string
-  type_name?: string
-  tax_number?: string
-  money?: string
-  invoice_time?: any
-  invoice_voucher?: string
-  bank_name?: string
-  bank_card_number?: string
-  address?: string
-  telephone?: string
-  email?: string
-  mobile?: string
-  create_time?: string
-  remark?: string
+    header_name?: string
+    header_type_name?: string
+    name?: string
+    invoice_number?: string
+    type_name?: string
+    tax_number?: string
+    money?: string
+    invoice_time?: any
+    invoice_voucher?: string
+    bank_name?: string
+    bank_card_number?: string
+    address?: string
+    telephone?: string
+    email?: string
+    mobile?: string
+    create_time?: string
+    remark?: string
 }
 const logData = ref<LogDataType>({})
 const getInvoiceDetailList = async () => {
-  logData.value = await (await getInvoiceDetail(id)).data
-  loading.value = false
-  previewImageList.splice(0, previewImageList.length)
-  if (logData.value.invoice_voucher) {
-    previewImageList.push(img(logData.value.invoice_voucher))
-  }
+    logData.value = await (await getInvoiceDetail(id)).data
+    loading.value = false
+    previewImageList.splice(0, previewImageList.length);
+    if (logData.value.invoice_voucher) {
+        previewImageList.push(img(logData.value.invoice_voucher))
+    }
 }
 
 let id = 0
 const setFormData = async (row: any = null) => {
-  loading.value = true
-  if (row) {
-    id = row.id
-    getInvoiceDetailList()
-  }
+    loading.value = true
+    if (row) {
+        id = row.id
+        getInvoiceDetailList()
+    }
 }
 
 const previewImageList: string[] = reactive([])
@@ -134,16 +87,16 @@ const previewImageList: string[] = reactive([])
  * 查看图片
  */
 const imageViewer = reactive({
-  show: false,
-  index: 0,
+    show: false,
+    index: 0
 })
 const previewImage = () => {
-  imageViewer.show = true
+    imageViewer.show = true
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
diff --git a/admin/src/addon/shop/views/order/components/invoice-dialog.vue b/admin/src/addon/shop/views/order/components/invoice-dialog.vue
index 32a743fc..44347bf8 100644
--- a/admin/src/addon/shop/views/order/components/invoice-dialog.vue
+++ b/admin/src/addon/shop/views/order/components/invoice-dialog.vue
@@ -1,41 +1,25 @@
 <template>
-  <el-dialog v-model="invoiceDialog" :title="t('invoice')" width="420px">
-    <div>
-      <el-form
-        :model="makeInvoice"
-        ref="makeInvoiceFormRef"
-        :rules="formRules"
-        label-width="80px"
-        label-position="right"
-      >
-        <el-form-item :label="t('invoiceNumber')" prop="invoice_number">
-          <el-input v-model.trim="makeInvoice.invoice_number" maxlength="30" />
-        </el-form-item>
-        <el-form-item :label="t('invoiceVoucher')" prop="invoice_voucher">
-          <upload-image v-model="makeInvoice.invoice_voucher" />
-        </el-form-item>
-        <el-form-item :label="t('remark')" prop="remark">
-          <el-input
-            v-model.trim="makeInvoice.remark"
-            type="textarea"
-            maxlength="200"
-            show-word-limit
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="invoiceDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="refundDialogLoading"
-          @click="refundDialogConfirm(makeInvoiceFormRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+    <el-dialog v-model="invoiceDialog" :title="t('invoice')" width="420px">
+        <div>
+            <el-form :model="makeInvoice" ref="makeInvoiceFormRef" :rules="formRules" label-width="80px" label-position="right" >
+                <el-form-item :label="t('invoiceNumber')" prop="invoice_number">
+                    <el-input v-model.trim="makeInvoice.invoice_number" maxlength="30"/>
+                </el-form-item>
+                <el-form-item :label="t('invoiceVoucher')" prop="invoice_voucher">
+                    <upload-image v-model="makeInvoice.invoice_voucher" />
+                </el-form-item>
+                <el-form-item :label="t('remark')" prop="remark">
+                    <el-input v-model.trim="makeInvoice.remark" type="textarea" maxlength="200" show-word-limit />
+                </el-form-item>
+            </el-form>
+        </div>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="invoiceDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="refundDialogLoading" @click="refundDialogConfirm(makeInvoiceFormRef)">{{ t('confirm') }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -50,57 +34,49 @@ const invoiceDialog = ref(false)
  * 表单数据
  */
 const makeInvoice = ref({
-  invoice_number: '',
-  remark: '',
-  invoice_voucher: '',
+    invoice_number: '',
+    remark: '',
+    invoice_voucher: ''
 })
 
 const refundDialogLoading = ref(false)
 let id = 0
 const setInvoiceData = async (row: any = null) => {
-  if (row) {
-    id = row.id
-    makeInvoice.value.invoice_number = row.invoice_number
-    makeInvoice.value.remark = row.remark
-    makeInvoice.value.invoice_voucher = row.invoice_voucher
-  }
+    if (row) {
+        id = row.id
+        makeInvoice.value.invoice_number = row.invoice_number
+        makeInvoice.value.remark = row.remark
+        makeInvoice.value.invoice_voucher = row.invoice_voucher
+    }
 }
 
 const emit = defineEmits(['complete'])
 const refundDialogConfirm = async (formEl: FormInstance | undefined) => {
-  if (refundDialogLoading.value || !formEl) return
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      refundDialogLoading.value = true
-      const data = makeInvoice.value
-      setInvoice(id, data)
-        .then((res) => {
-          emit('complete')
-          invoiceDialog.value = false
-          refundDialogLoading.value = false
-        })
-        .catch(() => {
-          refundDialogLoading.value = false
-        })
-    }
-  })
+    if (refundDialogLoading.value || !formEl) return
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            refundDialogLoading.value = true
+            const data = makeInvoice.value
+            setInvoice(id, data).then((res) => {
+                emit('complete')
+                invoiceDialog.value = false
+                refundDialogLoading.value = false
+            }).catch(() => {
+                refundDialogLoading.value = false
+            })
+        }
+    })
 }
 const makeInvoiceFormRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    invoice_number: [
-      {
-        required: true,
-        message: t('invoiceNumberPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-  }
+    return {
+        invoice_number: [{ required: true, message: t('invoiceNumberPlaceholder'), trigger: 'blur' }]
+    }
 })
 defineExpose({
-  invoiceDialog,
-  setInvoiceData,
+    invoiceDialog,
+    setInvoiceData
 })
 </script>
diff --git a/admin/src/addon/shop/views/order/components/order-detail.vue b/admin/src/addon/shop/views/order/components/order-detail.vue
index ce3823a9..13c9c6bc 100644
--- a/admin/src/addon/shop/views/order/components/order-detail.vue
+++ b/admin/src/addon/shop/views/order/components/order-detail.vue
@@ -1,433 +1,226 @@
 <template>
-  <el-drawer
-    v-model="showDialog"
-    :title="popTitle"
-    direction="rtl"
-    :before-close="handleClose"
-    class="detail-drawer"
-  >
-    <div class="main-container" v-loading="loading">
-      <el-tabs v-model="activeName" class="pb-[10px]" @tab-change="tabChange">
-        <el-tab-pane label="订单信息" name="order" />
-        <el-tab-pane label="订单状态" name="state" />
-        <el-tab-pane label="商品信息" name="goods" />
-        <el-tab-pane
-          v-if="formData && formData.order_log && formData.order_log.length > 0"
-          label="订单日志"
-          name="log"
-        />
-      </el-tabs>
+    <el-drawer v-model="showDialog" :title="popTitle" direction="rtl" :before-close="handleClose" class="detail-drawer">
+        <div class="main-container" v-loading="loading">
+            <el-tabs v-model="activeName" class="pb-[10px]" @tab-change="tabChange">
+                <el-tab-pane label="订单信息" name="order" />
+                <el-tab-pane label="订单状态" name="state" />
+                <el-tab-pane label="商品信息" name="goods" />
+                <el-tab-pane v-if="formData && formData.order_log && formData.order_log.length > 0" label="订单日志" name="log" />
+            </el-tabs>
 
-      <el-form
-        :model="formData"
-        label-width="100px"
-        ref="formRef"
-        class="page-form"
-        v-if="!loading"
-        label-position="left"
-      >
-        <div v-if="activeName == 'order'">
-          <el-row class="row-bg px-[30px] mb-[20px]" :gutter="20">
-            <el-col :span="8">
-              <el-form-item :label="t('orderDetailNo')">
-                <div class="input-width">{{ formData.order_no }}</div>
-              </el-form-item>
-              <el-form-item :label="t('orderDetailForm')">
-                <div class="input-width">{{ formData.order_from_name }}</div>
-              </el-form-item>
-              <el-form-item
-                :label="t('orderDetailoutTradeNo')"
-                v-if="formData && formData.out_trade_no"
-              >
-                <div class="input-width">{{ formData.out_trade_no }}</div>
-              </el-form-item>
-              <el-form-item :label="t('payWay')" v-if="formData.pay">
-                <div class="input-width">{{ formData.pay.type_name }}</div>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item :label="t('deliveryType')">
-                <div class="input-width">{{ formData.delivery_type_name }}</div>
-              </el-form-item>
-              <div
-                v-if="
-                  formData.delivery_type == 'express' ||
-                  formData.delivery_type == 'local_delivery'
-                "
-              >
-                <el-form-item :label="t('orderDetailTakerName')">
-                  <div class="input-width">{{ formData.taker_name }}</div>
-                </el-form-item>
-                <el-form-item :label="t('orderDetailTakerMobile')">
-                  <div class="input-width">{{ formData.taker_mobile }}</div>
-                </el-form-item>
-                <el-form-item :label="t('orderDetailTakerFullAddress')">
-                  <div class="input-width">
-                    {{ formData.taker_full_address }}
-                  </div>
-                </el-form-item>
-              </div>
-              <div v-if="formData.delivery_type == 'store'">
-                <el-form-item :label="t('storeName')">
-                  <div class="input-width">{{ formData.store.store_name }}</div>
-                </el-form-item>
-                <el-form-item :label="t('storeAddress')">
-                  <div class="input-width">
-                    {{ formData.store.full_address }}
-                  </div>
-                </el-form-item>
-                <el-form-item :label="t('storeMobile')">
-                  <div class="input-width">
-                    {{ formData.store.store_mobile }}
-                  </div>
-                </el-form-item>
-                <el-form-item :label="t('tradeTime')">
-                  <div class="input-width">{{ formData.store.trade_time }}</div>
-                </el-form-item>
-              </div>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item :label="t('memberRemark')">
-                <div class="input-width line-feed">
-                  {{ formData.member_remark ?? '--' }}
+            <el-form :model="formData" label-width="100px" ref="formRef" class="page-form" v-if="!loading" label-position="left">
+                <div v-if="activeName == 'order'">
+                    <el-row class="row-bg px-[30px] mb-[20px]" :gutter="20">
+                        <el-col :span="8">
+                            <el-form-item :label="t('orderDetailNo')">
+                                <div class="input-width">{{ formData.order_no }}</div>
+                            </el-form-item>
+                            <el-form-item :label="t('orderDetailForm')">
+                                <div class="input-width">{{ formData.order_from_name }}</div>
+                            </el-form-item>
+                            <el-form-item :label="t('orderDetailoutTradeNo')" v-if="formData && formData.out_trade_no">
+                                <div class="input-width">{{ formData.out_trade_no }}</div>
+                            </el-form-item>
+                            <el-form-item :label="t('payWay')" v-if="formData.pay">
+                                <div class="input-width">{{ formData.pay.type_name }}</div>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item :label="t('deliveryType')">
+                                <div class="input-width">{{ formData.delivery_type_name }}</div>
+                            </el-form-item>
+                            <div v-if="formData.delivery_type == 'express' || formData.delivery_type == 'local_delivery'">
+                                <el-form-item :label="t('orderDetailTakerName')">
+                                    <div class="input-width">{{ formData.taker_name }}</div>
+                                </el-form-item>
+                                <el-form-item :label="t('orderDetailTakerMobile')">
+                                    <div class="input-width">{{ formData.taker_mobile }}</div>
+                                </el-form-item>
+                                <el-form-item :label="t('orderDetailTakerFullAddress')">
+                                    <div class="input-width">{{ formData.taker_full_address }}</div>
+                                </el-form-item>
+                            </div>
+                            <div v-if="formData.delivery_type == 'store'">
+                                <el-form-item :label="t('storeName')">
+                                    <div class="input-width">{{ formData.store.store_name }}</div>
+                                </el-form-item>
+                                <el-form-item :label="t('storeAddress')">
+                                    <div class="input-width">{{ formData.store.full_address }}</div>
+                                </el-form-item>
+                                <el-form-item :label="t('storeMobile')">
+                                    <div class="input-width">{{ formData.store.store_mobile }}</div>
+                                </el-form-item>
+                                <el-form-item :label="t('tradeTime')">
+                                    <div class="input-width">{{ formData.store.trade_time }}</div>
+                                </el-form-item>
+                            </div>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item :label="t('memberRemark')">
+                                <div class="input-width line-feed">{{ formData.member_remark ?? '--' }}</div>
+                            </el-form-item>
+                            <el-form-item :label="t('notes')">
+                                <div class="input-width line-feed">{{ formData.shop_remark ?? '--' }}</div>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
                 </div>
-              </el-form-item>
-              <el-form-item :label="t('notes')">
-                <div class="input-width line-feed">
-                  {{ formData.shop_remark ?? '--' }}
+                <div v-if="activeName == 'state'">
+                    <div class="mb-[20px]">
+                        <p>
+                            <span class="ml-[30px] text-[14px] mr-[20px]">{{ t('orderStatus') }}：</span>
+                            <span class="text-[14px]">{{ formData.status_name.name }}</span>
+                        </p>
+                        <div class="flex mt-[10px]">
+                            <span class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#ff7f5b] bg-[#fff0e5] cursor-pointer" @click="setNotes">{{ t('notes') }}</span>
+                            <span class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#5c96fc] bg-[#ebf3ff] cursor-pointer" @click="delivery" v-if="formData.status == 2">{{ t('delivery') }}</span>
+                            <span class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#5c96fc] bg-[#ebf3ff] cursor-pointer" @click="close" v-if="formData.status == 1">{{ t('close') }}</span>
+                            <span class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#5c96fc] bg-[#ebf3ff] cursor-pointer" @click="orderAdjustMoney" v-if="formData.status == 1">{{ t('editPrice') }}</span>
+                            <span class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#5c96fc] bg-[#ebf3ff] cursor-pointer" @click="finish" v-if="formData.status == 3">{{ t('finish') }}</span>
+                            <span class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#5c96fc] bg-[#ebf3ff] cursor-pointer" @click="openElectronicSheetPrintDialog" v-if="formData.delivery_type == 'express' && formData.status == 3">{{ t('electronicSheetPrintTitle') }}</span>
+                            <span class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#5c96fc] bg-[#ebf3ff] cursor-pointer" @click="printTicketEvent" v-if="formData.delivery_type == 'virtual' && (formData.status == 2 || formData.status == 3 || formData.status == 5)">{{ t('printTicket') }}</span>
+                            <span class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#5c96fc] bg-[#ebf3ff] cursor-pointer" @click="orderEditAddressFn" v-if="formData.status == 1 && formData.delivery_type != 'virtual' && formData.activity_type != 'giftcard'">{{ t('editAddress') }}</span>
+                            <span class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#5c96fc] bg-[#ebf3ff] cursor-pointer" @click="refundEvent" v-if="formData.is_refund_show && formData.status != 1 && formData.status != -1">{{ t('voluntaryRefund') }}</span>
+                            <div class="flex" v-if="formData.order_delivery">
+                                <template v-for="(item, index) in formData.order_delivery" :key="index">
+                                    <span v-if="item.delivery_type == 'express' && item.sub_delivery_type == 'express'"
+                                        class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#ff7f5b] bg-[#fff0e5] cursor-pointer"
+                                        @click="packageEvent(item.id, formData.taker_mobile)">{{ t('package') }}{{ index + 1 }}
+                                    </span>
+                                    <span v-if="item.delivery_type == 'express' && item.sub_delivery_type == 'none_express'"
+                                        class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#ff7f5b] bg-[#fff0e5] cursor-pointer"
+                                        @click="packageEvent(item.id, formData.taker_mobile)">{{ t('noLogisticsRequired') }}
+                                    </span>
+                                </template>
+                            </div>
+                        </div>
+                        <div class="flex ml-[30px] mt-[15px]">
+                            <span class="text-[14px] text-[#ff7f5b]">{{ t('remind') }}：</span>
+                            <div class="ml-[10px]">
+                                <p class="text-[14px] text-[#a4a4a4]">{{ t('remindTips1') }}</p>
+                                <p class="text-[14px] text-[#a4a4a4]">{{ t('remindTips2') }}</p>
+                                <p class="text-[14px] text-[#a4a4a4]">{{ t('remindTips3') }}</p>
+                            </div>
+                        </div>
+                    </div>
                 </div>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </div>
-        <div v-if="activeName == 'state'">
-          <div class="mb-[20px]">
-            <p>
-              <span class="ml-[30px] text-[14px] mr-[20px]"
-                >{{ t('orderStatus') }}：</span
-              >
-              <span class="text-[14px]">{{ formData.status_name.name }}</span>
-            </p>
-            <div class="flex mt-[10px]">
-              <span
-                class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#ff7f5b] bg-[#fff0e5] cursor-pointer"
-                @click="setNotes"
-                >{{ t('notes') }}</span
-              >
-              <span
-                class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#5c96fc] bg-[#ebf3ff] cursor-pointer"
-                @click="delivery"
-                v-if="formData.status == 2"
-                >{{ t('delivery') }}</span
-              >
-              <span
-                class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#5c96fc] bg-[#ebf3ff] cursor-pointer"
-                @click="close"
-                v-if="formData.status == 1"
-                >{{ t('close') }}</span
-              >
-              <span
-                class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#5c96fc] bg-[#ebf3ff] cursor-pointer"
-                @click="orderAdjustMoney"
-                v-if="formData.status == 1"
-                >{{ t('editPrice') }}</span
-              >
-              <span
-                class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#5c96fc] bg-[#ebf3ff] cursor-pointer"
-                @click="finish"
-                v-if="formData.status == 3"
-                >{{ t('finish') }}</span
-              >
-              <span
-                class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#5c96fc] bg-[#ebf3ff] cursor-pointer"
-                @click="openElectronicSheetPrintDialog"
-                v-if="
-                  formData.delivery_type == 'express' && formData.status == 3
-                "
-                >{{ t('electronicSheetPrintTitle') }}</span
-              >
-              <span
-                class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#5c96fc] bg-[#ebf3ff] cursor-pointer"
-                @click="printTicketEvent"
-                v-if="
-                  formData.delivery_type == 'virtual' &&
-                  (formData.status == 2 ||
-                    formData.status == 3 ||
-                    formData.status == 5)
-                "
-                >{{ t('printTicket') }}</span
-              >
-              <span
-                class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#5c96fc] bg-[#ebf3ff] cursor-pointer"
-                @click="orderEditAddressFn"
-                v-if="
-                  formData.status == 1 &&
-                  formData.delivery_type != 'virtual' &&
-                  formData.activity_type != 'giftcard'
-                "
-                >{{ t('editAddress') }}</span
-              >
-              <span
-                class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#5c96fc] bg-[#ebf3ff] cursor-pointer"
-                @click="refundEvent"
-                v-if="
-                  formData.is_refund_show &&
-                  formData.status != 1 &&
-                  formData.status != -1
-                "
-                >{{ t('voluntaryRefund') }}</span
-              >
-              <div class="flex" v-if="formData.order_delivery">
-                <template
-                  v-for="(item, index) in formData.order_delivery"
-                  :key="index"
-                >
-                  <span
-                    v-if="
-                      item.delivery_type == 'express' &&
-                      item.sub_delivery_type == 'express'
-                    "
-                    class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#ff7f5b] bg-[#fff0e5] cursor-pointer"
-                    @click="packageEvent(item.id, formData.taker_mobile)"
-                    >{{ t('package') }}{{ index + 1 }}
-                  </span>
-                  <span
-                    v-if="
-                      item.delivery_type == 'express' &&
-                      item.sub_delivery_type == 'none_express'
-                    "
-                    class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#ff7f5b] bg-[#fff0e5] cursor-pointer"
-                    @click="packageEvent(item.id, formData.taker_mobile)"
-                    >{{ t('noLogisticsRequired') }}
-                  </span>
-                </template>
-              </div>
-            </div>
-            <div class="flex ml-[30px] mt-[15px]">
-              <span class="text-[14px] text-[#ff7f5b]"
-                >{{ t('remind') }}：</span
-              >
-              <div class="ml-[10px]">
-                <p class="text-[14px] text-[#a4a4a4]">{{ t('remindTips1') }}</p>
-                <p class="text-[14px] text-[#a4a4a4]">{{ t('remindTips2') }}</p>
-                <p class="text-[14px] text-[#a4a4a4]">{{ t('remindTips3') }}</p>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div v-if="activeName == 'goods'">
-          <el-table :data="formData.order_goods" size="large">
-            <el-table-column
-              :label="t('orderDetailGoodsName')"
-              align="left"
-              width="300"
-            >
-              <template #default="{ row }">
-                <div class="flex">
-                  <div class="flex items-center shrink-0">
-                    <img
-                      class="w-[50px] h-[50px] mr-[10px]"
-                      :src="img(row.goods_image)"
-                    />
-                  </div>
-                  <div class="flex flex-col items-start">
-                    <p class="multi-hidden text-[14px]">{{ row.goods_name }}</p>
-                    <span class="text-[12px] text-[#999]">{{
-                      row.sku_name
-                    }}</span>
-                    <span
-                      class="px-[4px] text-[12px] text-[#fff] rounded-[4px] bg-primary leading-[18px]"
-                      v-if="row.is_gift == 1"
-                      >赠品</span
-                    >
-                  </div>
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column
-              :label="t('orderDetailPrice')"
-              min-width="50"
-              align="left"
-            >
-              <template #default="{ row }">
-                <div class="flex flex-col">
-                  <span v-if="formData.activity_type == 'exchange'"
-                    >{{ row.extend.point }}{{ t('point') }}
-                    <span v-if="parseFloat(row.price)">+￥{{ row.price }}</span>
-                  </span>
-                  <span v-else class="text-[13px]">￥{{ row.price }}</span>
-                  <span
-                    v-if="row.extend && row.extend.newcomer_price"
-                    class="text-[13px] mt-[5px]"
-                  >
-                    <span
-                      v-if="
-                        parseFloat(row.extend.newcomer_price) && row.num > 1
-                      "
-                      >{{ row.num }}{{ t('piece')
-                      }}<span class="text-[#999]"
-                        >（第1{{ t('piece') }}，￥{{
-                          parseFloat(row.extend.newcomer_price).toFixed(2)
-                        }}/{{ t('piece') }}；第{{
-                          row.num > 2 ? '2~' + row.num : '2'
-                        }}{{ t('piece') }}，￥{{
-                          parseFloat(row.price).toFixed(2)
-                        }}/{{ t('piece') }}）</span
-                      ></span
-                    >
-                    <span v-else>{{ row.num }}{{ t('piece') }}</span>
-                  </span>
-                  <span v-else class="text-[13px] mt-[5px]"
-                    >{{ row.num }}{{ t('piece') }}</span
-                  >
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="num"
-              :label="t('detailNum')"
-              min-width="50"
-              align="right"
-            />
-          </el-table>
-          <div
-            class="py-[12px] px-[16px] border-b border-color flex justify-end"
-          >
-            <div class="w-[310px] flex flex-col text-right">
-              <div class="flex mb-[10px]">
-                <div class="text-base flex-1">
-                  {{ t('orderDetailGoodsMoney') }}
-                </div>
-                <div class="text-base flex-1 pl-[30px]">
-                  <span
-                    v-if="formData.activity_type == 'exchange'"
-                    class="text-[14px]"
-                    >{{ formData.point }}{{ t('point') }}
-                    <span v-if="parseFloat(formData.goods_money)"
-                      >+￥{{ formData.goods_money }}</span
-                    >
-                  </span>
-                  <span v-else class="text-[14px]"
-                    >￥{{ formData.goods_money }}</span
-                  >
-                </div>
-              </div>
-              <div class="flex mb-[10px]" v-if="formData.coupon_money > 0">
-                <div class="text-base flex-1">{{ t('couponMoney') }}</div>
-                <div class="text-base flex-1 pl-[30px]">
-                  {{ formData.coupon_money }}
-                </div>
-              </div>
-              <div
-                class="flex mb-[10px]"
-                v-if="formData.manjian_discount_money > 0"
-              >
-                <div class="text-base flex-1">
-                  {{ t('manjianDiscountMoney') }}
+                <div v-if="activeName == 'goods'">
+                    <el-table :data="formData.order_goods" size="large">
+                        <el-table-column :label="t('orderDetailGoodsName')" align="left" width="300">
+                            <template #default="{ row }">
+                                <div class="flex">
+                                    <div class="flex items-center shrink-0">
+                                        <img class="w-[50px] h-[50px] mr-[10px]" :src="img(row.goods_image)" />
+                                    </div>
+                                    <div class="flex flex-col items-start">
+                                        <p class="multi-hidden text-[14px]">{{ row.goods_name }}</p>
+                                        <span class="text-[12px] text-[#999]">{{ row.sku_name }}</span>
+                                        <span class="px-[4px]  text-[12px] text-[#fff] rounded-[4px] bg-primary leading-[18px]" v-if="row.is_gift == 1">赠品</span>
+                                    </div>
+                                </div>
+                            </template>
+                        </el-table-column>
+                        <el-table-column :label="t('orderDetailPrice')" min-width="50" align="left">
+                            <template #default="{ row }">
+                                <div class="flex flex-col">
+                                    <span v-if="formData.activity_type == 'exchange'">{{ row.extend.point }}{{ t('point') }}
+                                        <span v-if="parseFloat(row.price)">+￥{{ row.price }}</span>
+                                    </span>
+                                    <span v-else class="text-[13px]">￥{{ row.price }}</span>
+                                    <span v-if="row.extend && row.extend.newcomer_price" class="text-[13px] mt-[5px]">
+                                        <span v-if="parseFloat(row.extend.newcomer_price) && row.num > 1">{{ row.num }}{{ t('piece') }}<span class="text-[#999]">（第1{{ t('piece') }}，￥{{parseFloat(row.extend.newcomer_price).toFixed(2)}}/{{ t('piece') }}；第{{row.num>2?'2~'+row.num:'2'}}{{ t('piece') }}，￥{{parseFloat(row.price).toFixed(2)}}/{{ t('piece') }}）</span></span>
+                                        <span v-else>{{ row.num }}{{ t('piece') }}</span>
+                                    </span>
+                                    <span v-else class="text-[13px] mt-[5px]">{{ row.num }}{{ t('piece') }}</span>
+                                </div>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="num" :label="t('detailNum')" min-width="50" align="right" />
+                    </el-table>
+                    <div class="py-[12px] px-[16px] border-b border-color flex justify-end">
+                        <div class="w-[310px] flex flex-col text-right">
+                            <div class="flex mb-[10px]">
+                                <div class="text-base flex-1">{{ t('orderDetailGoodsMoney') }}</div>
+                                <div class="text-base flex-1 pl-[30px]">
+                                    <span v-if="formData.activity_type == 'exchange'" class="text-[14px]">{{ formData.point }}{{ t('point') }}
+                                        <span v-if="parseFloat(formData.goods_money)">+￥{{ formData.goods_money }}</span>
+                                    </span>
+                                    <span v-else class="text-[14px]">￥{{ formData.goods_money }}</span>
+                                </div>
+                            </div>
+                            <div class="flex mb-[10px]" v-if="formData.coupon_money > 0">
+                                <div class="text-base flex-1">{{ t('couponMoney') }}</div>
+                                <div class="text-base flex-1 pl-[30px]">{{ formData.coupon_money }}</div>
+                            </div>
+                            <div class="flex mb-[10px]" v-if="formData.manjian_discount_money > 0">
+                                <div class="text-base flex-1">{{ t('manjianDiscountMoney') }}</div>
+                                <div class="text-base flex-1 pl-[30px]">{{ formData.manjian_discount_money }}</div>
+                            </div>
+                            <div class="flex mb-[10px]">
+                                <div class="text-base flex-1">{{ t('discountMoney') }}</div>
+                                <div class="text-base flex-1 pl-[30px]">{{ formData.discount_money }}</div>
+                            </div>
+                            <div class="flex mb-[10px]">
+                                <div class="text-base flex-1">{{ t('orderDetailDeliveryMoney') }}</div>
+                                <div class="text-base flex-1 pl-[30px]">{{ formData.delivery_money }}</div>
+                            </div>
+                            <div class="flex">
+                                <div class="text-base flex-1">{{ t('detailOrderMoney') }}</div>
+                                <div class="text-base flex-1 pl-[30px] text-[red]">
+                                    <span v-if="formData.activity_type == 'exchange'" class="text-[14px]">{{ formData.point }}{{ t('point') }}
+                                        <span v-if="parseFloat(formData.order_money)">+￥{{ formData.order_money }}</span>
+                                    </span>
+                                    <span v-else class="text-[14px]">￥{{ formData.order_money }}</span>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                 </div>
-                <div class="text-base flex-1 pl-[30px]">
-                  {{ formData.manjian_discount_money }}
-                </div>
-              </div>
-              <div class="flex mb-[10px]">
-                <div class="text-base flex-1">{{ t('discountMoney') }}</div>
-                <div class="text-base flex-1 pl-[30px]">
-                  {{ formData.discount_money }}
-                </div>
-              </div>
-              <div class="flex mb-[10px]">
-                <div class="text-base flex-1">
-                  {{ t('orderDetailDeliveryMoney') }}
-                </div>
-                <div class="text-base flex-1 pl-[30px]">
-                  {{ formData.delivery_money }}
-                </div>
-              </div>
-              <div class="flex">
-                <div class="text-base flex-1">{{ t('detailOrderMoney') }}</div>
-                <div class="text-base flex-1 pl-[30px] text-[red]">
-                  <span
-                    v-if="formData.activity_type == 'exchange'"
-                    class="text-[14px]"
-                    >{{ formData.point }}{{ t('point') }}
-                    <span v-if="parseFloat(formData.order_money)"
-                      >+￥{{ formData.order_money }}</span
-                    >
-                  </span>
-                  <span v-else class="text-[14px]"
-                    >￥{{ formData.order_money }}</span
-                  >
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div v-if="activeName == 'log' && formData.order_log.length > 0">
-          <div class="mb-[100px] px-[20px]" style="min-height: 100px">
-            <div
-              class="flex"
-              v-for="(items, index) in formData.order_log"
-              :key="index"
-            >
-              <div class="mr-[20px] min-w-[71px]">
-                <div
-                  class="leading-[1] w-full text-[14px] w-[100px] flex justify-end"
-                >
-                  {{ items.create_time && items.create_time.split(' ')[0] }}
+                <div v-if="activeName == 'log' && formData.order_log.length > 0">
+                    <div class="mb-[100px] px-[20px]" style="min-height: 100px">
+                        <div class="flex" v-for="(items, index) in formData.order_log" :key="index">
+                            <div class="mr-[20px] min-w-[71px]">
+                                <div class="leading-[1] w-full text-[14px] w-[100px] flex justify-end">
+                                    {{ items.create_time && items.create_time.split(' ')[0] }}
+                                </div>
+                                <div class="leading-[1] w-full text-[14px]  w-[100px] flex justify-end mt-[15px]">
+                                    {{ items.create_time && items.create_time.split(' ')[1] }}
+                                </div>
+                            </div>
+                            <div>
+                                <div class="w-[16px] h-[16px] flex items-center bg-[#D1EBFF] border-[1px] border-[#0091FF] rounded-[999px]">
+                                    <div class="w-[8px] h-[8px] mx-auto bg-[#0091FF] rounded-[999px]"></div>
+                                </div>
+                                <div v-if="index + 1 != formData.order_log.length" class="w-[2px] h-[50px] bg-[#D1EBFF] mx-auto">
+                                </div>
+                            </div>
+                            <div>
+                                <div class="leading-[1] ml-[20px] text-[14px]">
+                                    {{ items.main_type_name }}{{ items.main_name }}
+                                </div>
+                                <div class="leading-[1] ml-[20px] text-[14px] mt-[15px]">
+                                    <span>{{ items.type_name }}</span>
+                                    <span class="ml-[10px]">{{items.content}}</span>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                 </div>
-                <div
-                  class="leading-[1] w-full text-[14px] w-[100px] flex justify-end mt-[15px]"
-                >
-                  {{ items.create_time && items.create_time.split(' ')[1] }}
-                </div>
-              </div>
-              <div>
-                <div
-                  class="w-[16px] h-[16px] flex items-center bg-[#D1EBFF] border-[1px] border-[#0091FF] rounded-[999px]"
-                >
-                  <div
-                    class="w-[8px] h-[8px] mx-auto bg-[#0091FF] rounded-[999px]"
-                  ></div>
-                </div>
-                <div
-                  v-if="index + 1 != formData.order_log.length"
-                  class="w-[2px] h-[50px] bg-[#D1EBFF] mx-auto"
-                ></div>
-              </div>
-              <div>
-                <div class="leading-[1] ml-[20px] text-[14px]">
-                  {{ items.main_type_name }}{{ items.main_name }}
-                </div>
-                <div class="leading-[1] ml-[20px] text-[14px] mt-[15px]">
-                  <span>{{ items.type_name }}</span>
-                  <span class="ml-[10px]">{{ items.content }}</span>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </el-form>
-
-      <el-card
-        class="box-card !border-none relative"
-        shadow="never"
-        v-if="!loading && !formData"
-      >
-        <el-empty :description="t('orderInfoEmpty')" />
-      </el-card>
+            </el-form>
 
-      <adjust-money ref="orderAdjustMoneyActionDialog" @complete="resetFn()" />
-      <delivery-action ref="deliveryActionDialog" @complete="resetFn()" />
-      <order-notes ref="orderNotesDialog" @complete="resetFn()" />
-      <delivery-package ref="packageDialog" />
-      <electronic-sheet-print
-        ref="electronicSheetPrintDialog"
-        @complete="resetFn()"
-      />
-      <order-edit-address ref="orderEditAddressDialog" @complete="resetFn()" />
-      <shop-active-refund ref="shopActiveRefundDialog" @complete="resetFn()" />
-    </div>
-  </el-drawer>
+            <el-card class="box-card !border-none relative" shadow="never" v-if="!loading && !formData">
+				<el-empty :description="t('orderInfoEmpty')" />
+			</el-card>
+            
+            <adjust-money ref="orderAdjustMoneyActionDialog" @complete="resetFn()" />
+            <delivery-action ref="deliveryActionDialog" @complete="resetFn()" />
+            <order-notes ref="orderNotesDialog" @complete="resetFn()" />
+            <delivery-package ref="packageDialog" />
+            <electronic-sheet-print ref="electronicSheetPrintDialog" @complete="resetFn()" />
+            <order-edit-address ref="orderEditAddressDialog" @complete="resetFn()"/>
+            <shop-active-refund ref="shopActiveRefundDialog" @complete="resetFn()" />
+        </div>
+    </el-drawer>
 </template>
 
 <script lang="ts" setup>
@@ -451,19 +244,19 @@ const showDialog = ref(false)
 const loading = ref(false)
 const repeat = ref(false)
 let popTitle: string = '订单详情'
-let orderId = ''
+let orderId = '';
 
 const route = useRoute()
 const router = useRouter()
-const emit = defineEmits(['load', 'close-event'])
+const emit = defineEmits(['load','close-event'])
 
 const nickname_name_input = ref(true)
 const password_input = ref(true)
 const password_copy_input = ref(true)
 
 const handleClose = (done: () => void) => {
-  showDialog.value = false
-  emit('close-event')
+    showDialog.value = false;
+    emit('close-event')
 }
 
 const activeName = ref('order')
@@ -474,43 +267,44 @@ const activeName = ref('order')
 const formData: Record<string, any> | null = ref(null)
 
 const getOrderInfoFn = async () => {
-  loading.value = true
-  if (orderId) {
-    await getOrderDetail(orderId)
-      .then(({ data }) => {
-        formData.value = data
-        let refundOrderNum = 0
-        formData.value.order_goods.forEach((orderItem, orderIndex) => {
-          if (orderItem.is_enable_refund == 1) {
-            refundOrderNum++
-          }
+    loading.value = true
+    if (orderId) {
+        await getOrderDetail(orderId).then(({ data }) => {
+            formData.value = data
+            let refundOrderNum = 0;
+            formData.value.order_goods.forEach((orderItem,orderIndex) => {
+                if(orderItem.is_enable_refund == 1){
+                    refundOrderNum++;
+                }
+            });
+            formData.value.is_refund_show = refundOrderNum > 0 ? true : false;
+            loading.value = false;
+        }).catch(() => {
         })
-        formData.value.is_refund_show = refundOrderNum > 0 ? true : false
+    } else {
         loading.value = false
-      })
-      .catch(() => {})
-  } else {
-    loading.value = false
-  }
+    }
 }
 
+
 const close = () => {
-  ElMessageBox.confirm(t('orderCloseTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    orderClose(orderId).then(() => {
-      setFormData(orderId)
+    ElMessageBox.confirm(t('orderCloseTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }).then(() => {
+        orderClose(orderId).then(() => {
+            setFormData(orderId)
+        })
     })
-  })
 }
 
 // 订单调整价格
 const orderAdjustMoneyActionDialog: Record<string, any> | null = ref(null)
 const orderAdjustMoney = () => {
-  orderAdjustMoneyActionDialog.value.setFormData(formData.value)
-  orderAdjustMoneyActionDialog.value.showDialog = true
+    orderAdjustMoneyActionDialog.value.setFormData(formData.value)
+    orderAdjustMoneyActionDialog.value.showDialog = true
 }
 
 const deliveryActionDialog: Record<string, any> | null = ref(null)
@@ -518,8 +312,8 @@ const deliveryActionDialog: Record<string, any> | null = ref(null)
  * 发货
  */
 const delivery = () => {
-  deliveryActionDialog.value.setFormData(formData.value)
-  deliveryActionDialog.value.showDialog = true
+    deliveryActionDialog.value.setFormData(formData.value)
+    deliveryActionDialog.value.showDialog = true
 }
 
 const orderNotesDialog: Record<string, any> | null = ref(null)
@@ -527,20 +321,21 @@ const orderNotesDialog: Record<string, any> | null = ref(null)
  * 设置备注
  */
 const setNotes = () => {
-  orderNotesDialog.value.setFormData(formData.value)
-  orderNotesDialog.value.showDialog = true
+    orderNotesDialog.value.setFormData(formData.value)
+    orderNotesDialog.value.showDialog = true
 }
 // 订单完成
 const finish = () => {
-  ElMessageBox.confirm(t('orderFinishTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    orderFinish(orderId).then(() => {
-      setFormData(orderId)
+    ElMessageBox.confirm(t('orderFinishTips'), t('warning'), {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        orderFinish(orderId).then(() => {
+            setFormData(orderId)
+        })
     })
-  })
 }
 
 const packageDialog: Record<string, any> | null = ref(null)
@@ -548,87 +343,86 @@ const packageDialog: Record<string, any> | null = ref(null)
  * 发货
  */
 const packageEvent = (id: number, mobile: number) => {
-  packageDialog.value.setFormData(id, mobile)
-  packageDialog.value.showDialog = true
+    packageDialog.value.setFormData(id, mobile)
+    packageDialog.value.showDialog = true
 }
 
 // 打印电子面单
 const electronicSheetPrintDialog: Record<string, any> | null = ref(null)
 
 const openElectronicSheetPrintDialog = () => {
-  let data = {
-    print_type: 'single',
-  }
+    let data = {
+        print_type: 'single'
+    };
 
-  Object.assign(data, cloneDeep(formData.value))
-  electronicSheetPrintDialog.value.setFormData(data)
-  electronicSheetPrintDialog.value.showDialog = true
+    Object.assign(data, cloneDeep(formData.value))
+    electronicSheetPrintDialog.value.setFormData(data)
+    electronicSheetPrintDialog.value.showDialog = true
 }
 
 /**
  * 修改地址
  */
-const orderEditAddressDialog: Record<string, any> | null = ref(null)
-const orderEditAddressFn = async () => {
-  let data = cloneDeep(formData.value)
-  orderEditAddressDialog.value.showDialog = true
-  orderEditAddressDialog.value.setFormData(data)
+const orderEditAddressDialog :Record<string, any> | null = ref(null)
+const orderEditAddressFn = async () =>{
+    let data = cloneDeep(formData.value);
+    orderEditAddressDialog.value.showDialog = true
+    orderEditAddressDialog.value.setFormData(data)
 }
 
 /**
  * 打印小票
  */
 const printTicketEvent = () => {
-  if (!formData.value.order_id) return
+    if (!formData.value.order_id) return;
 
-  if (repeat.value) return
-  repeat.value = true
+    if (repeat.value) return
+    repeat.value = true
 
-  printTicket({
-    type: 'shopGoodsOrder', // 小票模板类型
-    trigger: 'manual', // 触发时机：手动触发
-    // 业务参数，根据自身业务传值
-    business: {
-      order_id: formData.value.order_id,
-    },
-  })
-    .then((res: any) => {
-      repeat.value = false
-    })
-    .catch(() => {
-      repeat.value = false
+    printTicket({
+        type: 'shopGoodsOrder', // 小票模板类型
+        trigger: 'manual', // 触发时机：手动触发
+        // 业务参数，根据自身业务传值
+        business: {
+            order_id: formData.value.order_id
+        }
+    }).then((res: any) => {
+        repeat.value = false
+    }).catch(() => {
+        repeat.value = false
     })
 }
 
+
 /**
  * 商家主动退款
  */
 const shopActiveRefundDialog: Record<string, any> | null = ref(null)
 const refundEvent = () => {
-  shopActiveRefundDialog.value.setFormData(formData.value)
-  shopActiveRefundDialog.value.showDialog = true
+    shopActiveRefundDialog.value.setFormData(formData.value)
+    shopActiveRefundDialog.value.showDialog = true
 }
 
 const setFormData = async (row: any = null) => {
-  orderId = row.id
-  formData.value = null
-  activeName.value = 'order'
-  getOrderInfoFn()
+    orderId = row.id;
+    formData.value = null;
+    activeName.value = 'order';
+    getOrderInfoFn();
 }
 
-const resetFn = () => {
-  showDialog.value = false
-  emit('load')
+const resetFn = ()=>{
+    showDialog.value = false;
+    emit('load');
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
 <style lang="scss">
-.detail-drawer {
-  width: 1300px !important;
+.detail-drawer{
+    width: 1300px !important;
 }
 </style>
diff --git a/admin/src/addon/shop/views/order/components/order-edit-address.vue b/admin/src/addon/shop/views/order/components/order-edit-address.vue
index b7a4c0ee..5700509e 100644
--- a/admin/src/addon/shop/views/order/components/order-edit-address.vue
+++ b/admin/src/addon/shop/views/order/components/order-edit-address.vue
@@ -1,172 +1,62 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="t('editAddress')"
-    width="700px"
-    class="diy-dialog-wrap"
-    :destroy-on-close="true"
-    :before-close="handleClose"
-  >
-    <div v-loading="loading">
-      <el-form
-        :model="formData"
-        label-width="100px"
-        ref="formRef"
-        :rules="formRules"
-        class="page-form mb-[30px]"
-      >
-        <el-form-item :label="t('deliveryType')" prop="delivery_type">
-          <el-radio-group
-            v-model="formData.delivery_type"
-            @change="deliveryChange"
-          >
-            <el-radio
-              :label="item.key"
-              v-for="(item, index) in deliveryType"
-              :key="index"
-              status
-              >{{ item.name }}</el-radio
-            >
-          </el-radio-group>
-        </el-form-item>
-
-        <!-- 物流配送/同城配送 -->
-        <template
-          v-if="
-            changeDeliveryType == 'express' ||
-            changeDeliveryType == 'local_delivery'
-          "
-        >
-          <el-form-item :label="t('contacts')" prop="taker_name">
-            <el-input
-              v-model.trim="formData.taker_name"
-              clearable
-              :placeholder="t('contactsPlaceholder')"
-              class="input-width"
-              maxlength="10"
-            />
-          </el-form-item>
-          <el-form-item :label="t('ContactInformation')" prop="taker_mobile">
-            <el-input
-              v-model.trim="formData.taker_mobile"
-              clearable
-              :placeholder="t('ContactInformationPlaceholder')"
-              class="input-width"
-              maxlength="15"
-            />
-          </el-form-item>
-          <el-form-item :label="t('address')" prop="address_area">
-            <el-select
-              v-model="formData.taker_province"
-              value-key="id"
-              clearable
-              class="w-[150px]"
-              ref="provinceRef"
-              :placeholder="t('province')"
-              @change="addressChange"
-            >
-              <el-option :label="t('province')" :value="0" />
-              <el-option
-                v-for="(item, index) in areaList.province"
-                :key="index"
-                :label="item.name"
-                :value="item.id"
-              />
-            </el-select>
-            <el-select
-              v-model="formData.taker_city"
-              value-key="id"
-              clearable
-              class="w-[150px] ml-3"
-              ref="cityRef"
-              :placeholder="t('city')"
-              @change="addressChange"
-            >
-              <el-option :label="t('city')" :value="0" />
-              <el-option
-                v-for="(item, index) in areaList.city"
-                :key="index"
-                :label="item.name"
-                :value="item.id"
-              />
-            </el-select>
-            <el-select
-              v-model="formData.taker_district"
-              value-key="id"
-              clearable
-              class="w-[150px] mt-[20px]"
-              ref="districtRef"
-              :placeholder="t('area')"
-              @change="addressChange"
-            >
-              <el-option :label="t('area')" :value="0" />
-              <el-option
-                v-for="(item, index) in areaList.district"
-                :key="index"
-                :label="item.name"
-                :value="item.id"
-              />
-            </el-select>
-            <el-input
-              v-model.trim="formData.taker_address"
-              clearable
-              :placeholder="t('detailedAddress')"
-              class="!w-[214px] mt-[20px] ml-3"
-              maxlength="30"
-            />
-          </el-form-item>
+    <el-dialog v-model="showDialog" :title="t('editAddress')" width="700px" class="diy-dialog-wrap" :destroy-on-close="true" :before-close="handleClose">
+        <div v-loading="loading">
+            <el-form :model="formData" label-width="100px" ref="formRef" :rules="formRules" class="page-form mb-[30px]">
+                <el-form-item :label="t('deliveryType')" prop="delivery_type">
+                    <el-radio-group v-model="formData.delivery_type" @change="deliveryChange">
+                        <el-radio :label="item.key" v-for="(item, index) in deliveryType" :key="index"  status>{{ item.name }}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+                <!-- 物流配送/同城配送 -->
+                <template v-if="changeDeliveryType == 'express' || changeDeliveryType =='local_delivery'">
+                    <el-form-item :label="t('contacts')"  prop="taker_name">
+                        <el-input v-model.trim="formData.taker_name" clearable :placeholder="t('contactsPlaceholder')" class="input-width" maxlength="10" />
+                    </el-form-item>
+                    <el-form-item :label="t('ContactInformation')"  prop="taker_mobile">
+                        <el-input v-model.trim="formData.taker_mobile" clearable :placeholder="t('ContactInformationPlaceholder')" class="input-width" maxlength="15" />
+                    </el-form-item>
+                    <el-form-item :label="t('address')" prop="address_area">
+                        <el-select v-model="formData.taker_province" value-key="id" clearable class="w-[150px]"  ref="provinceRef" :placeholder="t('province')" @change="addressChange">
+                            <el-option :label="t('province')"  :value="0"/>
+                            <el-option v-for="(item, index) in areaList.province" :key="index" :label="item.name"  :value="item.id"/>
+                        </el-select>
+                        <el-select v-model="formData.taker_city" value-key="id" clearable class="w-[150px] ml-3" ref="cityRef" :placeholder="t('city')" @change="addressChange">
+                            <el-option :label="t('city')"  :value="0"/>
+                            <el-option v-for="(item, index) in areaList.city " :key="index" :label="item.name"  :value="item.id"/>
+                        </el-select>
+                        <el-select v-model="formData.taker_district" value-key="id" clearable class="w-[150px] mt-[20px]"  ref="districtRef" :placeholder="t('area')" @change="addressChange">
+                            <el-option :label="t('area')" :value="0"/>
+                            <el-option v-for="(item, index) in areaList.district " :key="index" :label="item.name"  :value="item.id" />
+                        </el-select>
+                        <el-input v-model.trim="formData.taker_address" clearable :placeholder="t('detailedAddress')" class="!w-[214px] mt-[20px] ml-3" maxlength="30"/>
+                    </el-form-item>
+
+                </template>
+                <el-form-item >
+                    <!-- 地图display：none会渲染报错 -->
+                    <div class="h-[0px] overflow-hidden" :class="{'!h-auto': changeDeliveryType == 'local_delivery'}">
+                       <div id="container" class="w-[500px] h-[270px] relative" v-loading="mapLoading"></div>
+                    </div>
+                    <div v-if="changeDeliveryType == 'local_delivery' && mapMessage" class="text-[#f52222] text-[12px] line-height-[15px]">{{ mapMessage }}</div>
+
+                </el-form-item>
+                <!-- 门店自提 -->
+                <el-form-item :label="t('selfPickupStores')" v-if="changeDeliveryType == 'store'">
+                    <el-select v-model="formData.take_store_id" value-key="store_id" @change="selectStore" >
+						<el-option v-for="(item, index) in deliveryList " :key="index" :label="item.store_name" :value="item.store_id"/>
+				    </el-select>
+                </el-form-item>
+
+            </el-form>
+        </div>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+            </span>
         </template>
-        <el-form-item>
-          <!-- 地图display：none会渲染报错 -->
-          <div
-            class="h-[0px] overflow-hidden"
-            :class="{ '!h-auto': changeDeliveryType == 'local_delivery' }"
-          >
-            <div
-              id="container"
-              class="w-[500px] h-[270px] relative"
-              v-loading="mapLoading"
-            ></div>
-          </div>
-          <div
-            v-if="changeDeliveryType == 'local_delivery' && mapMessage"
-            class="text-[#f52222] text-[12px] line-height-[15px]"
-          >
-            {{ mapMessage }}
-          </div>
-        </el-form-item>
-        <!-- 门店自提 -->
-        <el-form-item
-          :label="t('selfPickupStores')"
-          v-if="changeDeliveryType == 'store'"
-        >
-          <el-select
-            v-model="formData.take_store_id"
-            value-key="store_id"
-            @change="selectStore"
-          >
-            <el-option
-              v-for="(item, index) in deliveryList"
-              :key="index"
-              :label="item.store_name"
-              :value="item.store_id"
-            />
-          </el-select>
-        </el-form-item>
-      </el-form>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -174,11 +64,7 @@ import { ref, reactive, computed, onMounted, watch, nextTick } from 'vue'
 import { t } from '@/lang'
 import { FormInstance } from 'element-plus'
 import { getCompanyList, getShopDeliveryList } from '@/addon/shop/api/delivery'
-import {
-  getOrderEditAddress,
-  orderEditAddress,
-  getDeliveryList,
-} from '@/addon/shop/api/order'
+import { getOrderEditAddress, orderEditAddress, getDeliveryList } from '@/addon/shop/api/order'
 import { getIsTradeManaged } from '@/app/api/weapp'
 import { createMarker, latLngToAddress, addressToLatLng } from '@/utils/qqmap'
 import { getMap, getAreaListByPid, getAreaByCode } from '@/app/api/sys'
@@ -187,10 +73,10 @@ import { debounce, deepClone } from '@/utils/common'
 const showDialog = ref(false)
 const loading = ref(false)
 
-interface companyDataType {
-  company_id: number
-  company_name: string
-  index: number
+interface companyDataType{
+    company_id: number,
+    company_name: string,
+    index: number
 }
 const companyData = ref<companyDataType[]>([])
 const deliveryType = ref([])
@@ -198,107 +84,102 @@ const isTradeManaged = ref(false)
 const deliveryList = ref([])
 
 getCompanyList({}).then((data) => {
-  companyData.value = data.data
+    companyData.value = data.data
 })
 
-getIsTradeManaged().then((res) => {
-  isTradeManaged.value = res.data.is_trade_managed
+getIsTradeManaged().then(res => {
+    isTradeManaged.value = res.data.is_trade_managed
 })
 
 /**
  * 表单数据
  */
 const initialFormData = {
-  order_id: 0,
-  delivery_type: '',
-  taker_name: '',
-  taker_mobile: '',
-  taker_latitude: '',
-  taker_longitude: '',
-  taker_full_address: '',
-  taker_address: '',
-  taker_province: 0,
-  taker_city: 0,
-  taker_district: 0,
-  is_delivery_address: 0,
-  is_refund_address: 0,
-  is_default_delivery: 0,
-  is_default_refund: 0,
-  take_store_id: '',
+    order_id: 0,
+    delivery_type: '',
+    taker_name: '',
+    taker_mobile: '',
+    taker_latitude: '',
+    taker_longitude: '',
+    taker_full_address: '',
+    taker_address: '',
+    taker_province: 0,
+    taker_city: 0,
+    taker_district: 0,
+    is_delivery_address: 0,
+    is_refund_address: 0,
+    is_default_delivery: 0,
+    is_default_refund: 0,
+    take_store_id: ''
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
 const formRef = ref<FormInstance>()
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    delivery_type: [
-      {
-        required: true,
-        message: t('deliveryTypePlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    taker_name: [{ required: true, validator: companyPass, trigger: 'blur' }],
-    taker_mobile: [
-      { required: true, validator: ContactInformation, trigger: 'blur' },
-    ],
-    address_area: [
-      {
-        required: true,
-        validator: (rule: any, value: any, callback: any) => {
-          if (!formData.taker_province) {
-            callback(new Error(t('provincePlaceholder')))
-          }
-          if (!formData.taker_city) {
-            callback(new Error(t('cityPlaceholder')))
-          }
-          if (areaList.district.length && !formData.taker_district) {
-            callback(new Error(t('districtPlaceholder')))
-          }
-          if (!formData.taker_address) {
-            callback(new Error(t('detailedAddress')))
-          }
-          callback()
-        },
-      },
-    ],
-  }
+    return {
+        delivery_type: [
+            { required: true, message: t('deliveryTypePlaceholder'), trigger: 'blur' }
+        ],
+        taker_name: [
+            { required: true, validator: companyPass, trigger: 'blur' }
+        ],
+        taker_mobile: [
+            { required: true, validator: ContactInformation, trigger: 'blur' }
+        ],
+        address_area: [
+            {
+                required: true,
+                validator: (rule: any, value: any, callback: any) => {
+                    if (!formData.taker_province) {
+                        callback(new Error(t('provincePlaceholder')))
+                    }
+                    if (!formData.taker_city) {
+                        callback(new Error(t('cityPlaceholder')))
+                    }
+                    if (areaList.district.length && !formData.taker_district) {
+                        callback(new Error(t('districtPlaceholder')))
+                    }
+                    if (!formData.taker_address) {
+                        callback(new Error(t('detailedAddress')))
+                    }
+                    callback()
+                }
+            }
+        ]
+    }
 })
 
 const companyPass = (rule: any, value: any, callback: any) => {
-  if (formData.delivery_type == 'express' && value === '') {
-    callback(new Error(t('contactsPlaceholder')))
-  } else {
-    callback()
-  }
+    if (formData.delivery_type == 'express' && value === '') {
+        callback(new Error(t('contactsPlaceholder')))
+    } else {
+        callback()
+    }
 }
 
 const ContactInformation = (rule: any, value: any, callback: any) => {
-  if (
-    formData.delivery_type == 'express' ||
-    formData.delivery_type == 'local_delivery'
-  ) {
-    const reg = /^1[3-9]\d{9}$/
-    if (value === '') {
-      callback(new Error(t('ContactInformationPlaceholder')))
-    } else if (value.length != 11) {
-      callback(new Error('请输入11位手机号'))
-    } else if (!reg.test(value)) {
-      callback(new Error('请输入正确的手机号'))
+    if (formData.delivery_type == 'express' || formData.delivery_type =='local_delivery') {
+        const reg = /^1[3-9]\d{9}$/
+        if (value === '') {
+            callback(new Error(t('ContactInformationPlaceholder')))
+        } else if (value.length != 11) {
+            callback(new Error('请输入11位手机号'))
+        } else if (!reg.test(value)) {
+            callback(new Error('请输入正确的手机号'))
+        }
     }
-  }
-  callback()
+    callback()
 }
 
 const emit = defineEmits(['complete'])
 
-const selectStore = (data: any) => {
-  formData.take_store_id = data
+const selectStore = (data:any) => {
+    formData.take_store_id = data
 }
 
-const addressChange = () => {
-  formData.taker_address = ''
+const addressChange=()=>{
+    formData.taker_address = ''
 }
 
 /**
@@ -306,196 +187,180 @@ const addressChange = () => {
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      // 根据选择的配送方式进行不同的提交方法
-      if (
-        changeDeliveryType.value == 'express' ||
-        changeDeliveryType.value == 'local_delivery'
-      ) {
-        const address = [
-          formData.taker_province
-            ? addressName(areaList.province, formData.taker_province)
-            : '',
-          formData.taker_city
-            ? addressName(areaList.city, formData.taker_city)
-            : '',
-          formData.taker_district
-            ? addressName(areaList.district, formData.taker_district)
-            : '',
-          formData.taker_address,
-        ]
-        formData.taker_full_address = address.join('')
-        formData.delivery_type = changeDeliveryType.value
-
-        orderEditAddress(formData)
-          .then((res) => {
-            loading.value = false
-            showDialog.value = false
-            emit('complete')
-            initData()
-          })
-          .catch(() => {
-            loading.value = false
-          })
-      } else {
-        const params = {
-          order_id: formData.order_id,
-          delivery_type: changeDeliveryType.value,
-          take_store_id: formData.take_store_id,
+    if (loading.value || !formEl) return
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+            // 根据选择的配送方式进行不同的提交方法
+            if (changeDeliveryType.value == 'express' || changeDeliveryType.value == 'local_delivery') {
+                const address = [
+                    formData.taker_province ? addressName(areaList.province, formData.taker_province) : '',
+                    formData.taker_city ? addressName(areaList.city, formData.taker_city) : '',
+                    formData.taker_district ? addressName(areaList.district, formData.taker_district) : '',
+                    formData.taker_address
+                ]
+                formData.taker_full_address = address.join('')
+                formData.delivery_type = changeDeliveryType.value
+
+                orderEditAddress(formData).then(res => {
+                    loading.value = false
+                    showDialog.value = false
+                    emit('complete')
+                    initData()
+                }).catch(() => {
+                    loading.value = false
+                })
+            } else {
+                const params = {
+                    order_id: formData.order_id,
+                    delivery_type: changeDeliveryType.value,
+                    take_store_id: formData.take_store_id
+                }
+                orderEditAddress(params).then(res => {
+                    loading.value = false
+                    showDialog.value = false
+                    emit('complete')
+                }).catch(() => {
+                    loading.value = false
+                })
+            }
         }
-        orderEditAddress(params)
-          .then((res) => {
-            loading.value = false
-            showDialog.value = false
-            emit('complete')
-          })
-          .catch(() => {
-            loading.value = false
-          })
-      }
-    }
-  })
+    })
 }
 
-const getAddressInfoFn = (data: any) => {
-  getOrderEditAddress(data).then((res) => {
-    for (const i in formData) {
-      if (res.data[i]) {
-        formData[i] = res.data[i]
-      }
-    }
+const getAddressInfoFn = (data:any) => {
+    getOrderEditAddress(data).then((res) => {
+        for (const i in formData) {
+            if (res.data[i]) {
+                formData[i] = res.data[i]
+            }
+        }
 
-    deliveryChange(formData.delivery_type)
-    loading.value = false
-  })
+        deliveryChange(formData.delivery_type)
+        loading.value = false
+    })
 }
 
 // 初始化
 const setFormData = async (data: any) => {
-  loading.value = true
-  const params = {
-    order_id: data.order_id,
-    delivery_type: data.delivery_type,
-  }
-  nextTick(() => {
-    initMap()
-    getAddressInfoFn(params)
-  })
+    loading.value = true
+    const params = {
+        order_id: data.order_id,
+        delivery_type: data.delivery_type
+    }
+    nextTick(() => {
+        initMap()
+        getAddressInfoFn(params)
+    })
 }
 
 // 获取配送方式
 const getShopDeliveryListFn = () => {
-  getShopDeliveryList().then((res) => {
-    const data = res.data ? deepClone(res.data) : []
-    deliveryType.value = data.filter((item) => item.status == 1)
-  })
+    getShopDeliveryList().then((res) => {
+        const data = res.data ? deepClone(res.data) : []
+        deliveryType.value = data.filter(item => item.status == 1)
+    })
 }
 // 获取自提点列表
 getShopDeliveryListFn()
 const changeDeliveryType = ref()
 const deliveryChange = (data) => {
-  changeDeliveryType.value = data
-  if (changeDeliveryType.value == 'local_delivery') areaChange()
+    changeDeliveryType.value = data
+    if (changeDeliveryType.value == 'local_delivery') areaChange()
 }
 
 // 门店自提列表
 const deliveryListFn = () => {
-  getDeliveryList().then((res) => {
-    deliveryList.value = res.data
-  })
+    getDeliveryList().then((res) => {
+        deliveryList.value = res.data
+    })
 }
 deliveryListFn()
 
 /**
- * 初始化地图
+* 初始化地图
  */
 let map: any = null
 let marker: any = null
 const mapLoading = ref(true)
 const mapMessage = ref('')
 const initMap = () => {
-  const TMap = (window as any).TMap
-  const LatLng = TMap.LatLng
-  const center = new LatLng(formData.taker_latitude, formData.taker_longitude)
-  map = new TMap.Map('container', {
-    center,
-    zoom: 14,
-  })
-
-  map.on('tilesloaded', () => {
-    mapLoading.value = false
-  })
-
-  marker = createMarker(map)
-
-  map.on('click', (evt: any) => {
-    map.setCenter(evt.latLng)
-    marker.updateGeometries({
-      id: 'center',
-      position: evt.latLng,
+    const TMap = (window as any).TMap
+    const LatLng = TMap.LatLng
+    const center = new LatLng(formData.taker_latitude, formData.taker_longitude)
+    map = new TMap.Map('container', {
+        center,
+        zoom: 14
     })
-    latLngChange(evt.latLng.lat, evt.latLng.lng)
-  })
-  if (changeDeliveryType.value == 'local_delivery') {
-    latLngChange(center.lat, center.lng)
-  }
-}
 
-const latLngChange = (lat: number, lng: number) => {
-  latLngToAddress({ mapKey, lat, lng })
-    .then(({ message, result }) => {
-      if (message == 'query ok' || message == 'Success') {
-        formData.taker_latitude = result.location.lat
-        formData.taker_longitude = result.location.lng
-        formData.taker_address = result.formatted_addresses.recommend
-
-        getAreaByCode(result.ad_info.adcode).then(({ data }) => {
-          storeArea.taker_province = data.province ? data.province.id : 0
-          storeArea.taker_city = data.city ? data.city.id : 0
-          storeArea.taker_district = data.district ? data.district.id : 0
+    map.on('tilesloaded', () => {
+        mapLoading.value = false
+    })
+
+    marker = createMarker(map)
+
+    map.on('click', (evt: any) => {
+        map.setCenter(evt.latLng)
+        marker.updateGeometries({
+            id: 'center',
+            position: evt.latLng
         })
-      } else {
-        mapMessage.value = '地图加载失败：' + message
-        console.log(message, result)
-      }
+        latLngChange(evt.latLng.lat, evt.latLng.lng)
     })
-    .catch((err) => {
-      console.log(err)
+    if(changeDeliveryType.value =='local_delivery'){
+        latLngChange(center.lat, center.lng)
+    }
+}
+
+const latLngChange = (lat: number, lng: number) => {
+    latLngToAddress({ mapKey, lat, lng }).then(({ message, result }) => {
+        
+        if (message == 'query ok' || message == 'Success') {
+            formData.taker_latitude = result.location.lat
+            formData.taker_longitude = result.location.lng
+            formData.taker_address = result.formatted_addresses.recommend
+
+            getAreaByCode(result.ad_info.adcode).then(({ data }) => {
+                storeArea.taker_province = data.province ? data.province.id : 0
+                storeArea.taker_city = data.city ? data.city.id : 0
+                storeArea.taker_district = data.district ? data.district.id : 0
+            })
+        } else {
+            mapMessage.value = '地图加载失败：' + message
+            console.log(message, result)
+        }
+    }).catch(err => {
+        console.log(err)
     })
 }
 
 const storeArea = reactive({
-  taker_province: 0,
-  taker_city: 0,
-  taker_district: 0,
+    taker_province: 0,
+    taker_city: 0,
+    taker_district: 0
 })
 
 let mapKey: string = ''
 
 onMounted(() => {
-  const mapScript = document.createElement('script')
-  getMap().then((res) => {
-    mapKey = res.data.key
-    mapScript.type = 'text/javascript'
-    mapScript.src =
-      'https://map.qq.com/api/gljs?libraries=tools,service&v=1.exp&key=' +
-      res.data.key
-    document.body.appendChild(mapScript)
-  })
+    const mapScript = document.createElement('script')
+    getMap().then(res => {
+        mapKey = res.data.key
+        mapScript.type = 'text/javascript'
+        mapScript.src = 'https://map.qq.com/api/gljs?libraries=tools,service&v=1.exp&key=' + res.data.key
+        document.body.appendChild(mapScript)
+    })
 })
 
-interface areaType {
-  province: any[]
-  city: any[]
-  district: any[]
+interface areaType{
+    province: any[],
+    city: any[],
+    district: any[]
 }
 const areaList = reactive<areaType>({
-  province: [],
-  city: [],
-  district: [],
+    province: [],
+    city: [],
+    district: []
 })
 
 const provinceRef = ref()
@@ -505,204 +370,181 @@ const districtRef = ref()
 /**
  * 获取市
  */
-watch(
-  () => formData.taker_province,
-  (nval) => {
+watch(() => formData.taker_province, (nval) => {
     if (nval) {
-      getAreaListByPid(formData.taker_province).then((res) => {
-        areaList.city = res.data
-        const cityId = formData.taker_city
-        if (cityId) {
-          let isExist = false
-          for (let i = 0; i < res.data.length; i++) {
-            if (cityId == res.data[i].id) {
-              isExist = true
-              break
+        getAreaListByPid(formData.taker_province).then(res => {
+            areaList.city = res.data
+            const cityId = formData.taker_city
+            if (cityId) {
+                let isExist = false
+                for (let i = 0; i < res.data.length; i++) {
+                    if (cityId == res.data[i].id) {
+                        isExist = true
+                        break
+                    }
+                }
+                if (isExist) {
+                    formData.taker_city = cityId
+                    return
+                }
             }
-          }
-          if (isExist) {
-            formData.taker_city = cityId
-            return
-          }
-        }
-        formData.taker_city = 0
+            formData.taker_city = 0
 
-        if (changeDeliveryType.value == 'local_delivery') areaChange()
-      })
+            if (changeDeliveryType.value == 'local_delivery') areaChange()
+        })
     } else {
-      formData.taker_city = 0
+        formData.taker_city = 0
     }
-  }
-)
+})
 
 /**
- * 获取区
+* 获取区
  */
-watch(
-  () => formData.taker_city,
-  (nval) => {
+watch(() => formData.taker_city, (nval) => {
     if (nval) {
-      getAreaListByPid(formData.taker_city).then((res) => {
-        areaList.district = res.data
-
-        const districtId = formData.taker_district
-        if (districtId) {
-          let isExist = false
-          for (let i = 0; i < res.data.length; i++) {
-            if (districtId == res.data[i].id) {
-              isExist = true
-              break
+        getAreaListByPid(formData.taker_city).then(res => {
+            areaList.district = res.data
+
+            const districtId = formData.taker_district
+            if (districtId) {
+                let isExist = false
+                for (let i = 0; i < res.data.length; i++) {
+                    if (districtId == res.data[i].id) {
+                        isExist = true
+                        break
+                    }
+                }
+                if (isExist) {
+                    formData.taker_district = districtId
+                    return
+                }
             }
-          }
-          if (isExist) {
-            formData.taker_district = districtId
-            return
-          }
-        }
-        if (changeDeliveryType.value == 'local_delivery') areaChange()
-        formData.taker_district = 0
-      })
+            if (changeDeliveryType.value == 'local_delivery') areaChange()
+            formData.taker_district = 0
+        })
     } else {
-      formData.taker_district = 0
+        formData.taker_district = 0
     }
-  }
-)
+})
 
-watch(
-  () => formData.taker_district,
-  (nval) => {
+watch(() => formData.taker_district, (nval) => {
     if (nval) {
-      if (changeDeliveryType.value == 'local_delivery') areaChange()
+        if (changeDeliveryType.value == 'local_delivery') areaChange()
     }
-  }
-)
+})
 
 const areaChange = debounce(() => {
-  setTimeout(() => {
-    const address = [
-      formData.taker_province ? provinceRef.value.states.selectedLabel : '',
-      formData.taker_city ? cityRef.value.states.selectedLabel : '',
-      formData.taker_district ? districtRef.value.states.selectedLabel : '',
-      formData.taker_address,
-    ]
-
-    addressToLatLng({ mapKey, address: address.join('') }).then(
-      ({ message, result }) => {
-        if (message == 'Success' || message == 'query ok') {
-          const latLng = new (window as any).TMap.LatLng(
-            result.location.lat,
-            result.location.lng
-          )
-          map.setCenter(latLng)
-          marker.updateGeometries({
-            id: 'center',
-            position: latLng,
-          })
+    setTimeout(() => {
+        const address = [
+            formData.taker_province ? provinceRef.value.states.selectedLabel : '',
+            formData.taker_city ? cityRef.value.states.selectedLabel : '',
+            formData.taker_district ? districtRef.value.states.selectedLabel : '',
+            formData.taker_address
+        ]
 
-          formData.taker_latitude = result.location.lat
-          formData.taker_longitude = result.location.lng
-        } else {
-          console.error(message, result)
-        }
-      }
-    )
-  }, 500)
+        addressToLatLng({ mapKey, address: address.join('') }).then(({ message, result }) => {
+            if (message == 'Success' || message == 'query ok') {
+                const latLng = new (window as any).TMap.LatLng(result.location.lat, result.location.lng)
+                map.setCenter(latLng)
+                marker.updateGeometries({
+                    id: 'center',
+                    position: latLng
+                })
+
+                formData.taker_latitude = result.location.lat
+                formData.taker_longitude = result.location.lng
+            } else {
+                console.error(message, result)
+            }
+        })
+    }, 500)
 }, 500)
 
 /**
  * 地图点选获取市
  */
-watch(
-  () => storeArea.taker_province,
-  (nval) => {
+watch(() => storeArea.taker_province, (nval) => {
     if (nval) {
-      getAreaListByPid(storeArea.taker_province).then((res) => {
-        areaList.city = res.data
-        formData.taker_province = storeArea.taker_province
-        formData.taker_city = storeArea.taker_city
-      })
+        getAreaListByPid(storeArea.taker_province).then(res => {
+            areaList.city = res.data
+            formData.taker_province = storeArea.taker_province
+            formData.taker_city = storeArea.taker_city
+        })
     }
-  }
-)
+})
 
 /**
- * 地图点选获取区
+* 地图点选获取区
  */
-watch(
-  () => storeArea.taker_city,
-  (nval) => {
+watch(() => storeArea.taker_city, (nval) => {
     if (nval) {
-      getAreaListByPid(storeArea.taker_city).then((res) => {
-        areaList.district = res.data
-        formData.taker_city = storeArea.taker_city
-        formData.taker_district = storeArea.taker_district
-      })
+        getAreaListByPid(storeArea.taker_city).then(res => {
+            areaList.district = res.data
+            formData.taker_city = storeArea.taker_city
+            formData.taker_district = storeArea.taker_district
+        })
     }
-  }
-)
+})
 
 /**
  * 地图点选获取区
  */
-watch(
-  () => storeArea.taker_district,
-  (nval) => {
+watch(() => storeArea.taker_district, (nval) => {
     if (nval) {
-      formData.taker_district = storeArea.taker_district
+        formData.taker_district = storeArea.taker_district
     }
-  }
-)
+})
 
 /**
  * 获取省
  */
-getAreaListByPid(0).then((res) => {
-  areaList.province = res.data
+getAreaListByPid(0).then(res => {
+    areaList.province = res.data
 })
 
-const handleClose = (next: any) => {
-  map = null
-  initData()
-  next()
+const handleClose = (next:any) => {
+    map = null
+    initData()
+    next()
 }
 const initData = () => {
-  const data = {
-    order_id: 0,
-    delivery_type: '',
-    taker_name: '',
-    taker_mobile: '',
-    taker_latitude: '',
-    taker_longitude: '',
-    taker_full_address: '',
-    taker_address: '',
-    taker_province: 0,
-    taker_city: 0,
-    taker_district: 0,
-    is_delivery_address: 0,
-    is_refund_address: 0,
-    is_default_delivery: 0,
-    is_default_refund: 0,
-    take_store_id: '',
-  }
-  Object.keys(formData).forEach((key: string) => {
-    if (data[key] != undefined) formData[key] = data[key]
-  })
+    const data = {
+        order_id: 0,
+        delivery_type: '',
+        taker_name: '',
+        taker_mobile: '',
+        taker_latitude: '',
+        taker_longitude: '',
+        taker_full_address: '',
+        taker_address: '',
+        taker_province: 0,
+        taker_city: 0,
+        taker_district: 0,
+        is_delivery_address: 0,
+        is_refund_address: 0,
+        is_default_delivery: 0,
+        is_default_refund: 0,
+        take_store_id: ''
+    }
+    Object.keys(formData).forEach((key: string) => {
+        if (data[key] != undefined) formData[key] = data[key]
+    })
 }
 
-const addressName = (data, id) => {
-  const address = data.find((item) => item.id === id)
-  return address.name
+const addressName = (data,id)=>{
+    const address = data.find(item => item.id === id);
+    return address.name;
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
 <style lang="scss" scoped></style>
 <style lang="scss">
 .diy-dialog-wrap .el-form-item__label {
-  height: auto !important;
+    height: auto !important;
 }
 </style>
diff --git a/admin/src/addon/shop/views/order/components/order-export-select.vue b/admin/src/addon/shop/views/order/components/order-export-select.vue
index 1a464549..c545264d 100644
--- a/admin/src/addon/shop/views/order/components/order-export-select.vue
+++ b/admin/src/addon/shop/views/order/components/order-export-select.vue
@@ -1,39 +1,21 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="popTitle"
-    width="500px"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="150px"
-      ref="formRef"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('exportOrderType')">
-        <el-radio-group v-model="formData.type">
-          <el-radio label="shop_order">{{ t('shopOrder') }}</el-radio>
-          <el-radio label="shop_order_goods">{{
-            t('shopOrderGoods')
-          }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-    </el-form>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+    <el-dialog v-model="showDialog" :title="popTitle" width="500px" :destroy-on-close="true">
+        <el-form :model="formData" label-width="150px" ref="formRef" class="page-form" v-loading="loading">
+            <el-form-item :label="t('exportOrderType')">
+                <el-radio-group v-model="formData.type">
+                    <el-radio label="shop_order">{{ t('shopOrder') }}</el-radio>
+                    <el-radio label="shop_order_goods">{{ t('shopOrderGoods') }}</el-radio>
+                </el-radio-group>
+            </el-form-item>
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -49,7 +31,7 @@ let popTitle: string = ''
  * 表单数据
  */
 const initialFormData = {
-  type: 'shop_order',
+    type: 'shop_order',
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -62,17 +44,17 @@ const emit = defineEmits(['complete'])
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      emit('complete', formData.type)
-      showDialog.value = false
-    }
-  })
+    if (loading.value || !formEl) return
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            emit('complete', formData.type)
+            showDialog.value = false
+        }
+    })
 }
 
 defineExpose({
-  showDialog,
+    showDialog
 })
 </script>
 
diff --git a/admin/src/addon/shop/views/order/components/order-notes.vue b/admin/src/addon/shop/views/order/components/order-notes.vue
index baeaea83..1498dfa7 100644
--- a/admin/src/addon/shop/views/order/components/order-notes.vue
+++ b/admin/src/addon/shop/views/order/components/order-notes.vue
@@ -1,40 +1,17 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="t('notes')"
-    width="460px"
-    class="diy-dialog-wrap"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form notes-form"
-      v-loading="loading"
-    >
-      <el-form-item class="mb-0">
-        <el-input
-          v-model.trim="formData.shop_remark"
-          :rows="5"
-          type="textarea"
-          maxlength="200"
-          show-word-limit
-        />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+    <el-dialog v-model="showDialog" :title="t('notes')" width="460px" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" ref="formRef" :rules="formRules" class="page-form notes-form" v-loading="loading">
+            <el-form-item class="mb-0">
+				<el-input v-model.trim="formData.shop_remark" :rows="5" type="textarea" maxlength="200" show-word-limit />
+            </el-form-item>
+        </el-form>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -50,8 +27,8 @@ const loading = ref(false)
  * 表单数据
  */
 const initialFormData = {
-  order_id: 0,
-  shop_remark: '',
+    order_id: 0,
+    shop_remark: ''
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -59,7 +36,8 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {}
+    return {
+    }
 })
 
 const emit = defineEmits(['complete'])
@@ -69,49 +47,47 @@ const emit = defineEmits(['complete'])
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
+    if (loading.value || !formEl) return
 
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
 
-      const data = formData
+            const data = formData
 
-      setShopRemark(data)
-        .then((res) => {
-          loading.value = false
-          showDialog.value = false
-          emit('complete')
-        })
-        .catch(() => {
-          loading.value = false
-        })
-    }
-  })
+            setShopRemark(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
 }
 
 const setFormData = async (row: any = null) => {
-  Object.assign(formData, initialFormData)
-  loading.value = true
-  if (row) {
-    formData.order_id = row.order_id
-    formData.shop_remark = row.shop_remark
-  }
-  loading.value = false
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if (row) {
+        formData.order_id = row.order_id
+        formData.shop_remark = row.shop_remark
+    }
+    loading.value = false
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
 <style lang="scss" scoped></style>
 <style lang="scss">
 .diy-dialog-wrap .el-form-item__label {
-  height: auto !important;
+    height: auto !important;
 }
-.notes-form .el-dialog__body .el-form-item {
-  margin-bottom: 0px !important;
+.notes-form .el-dialog__body .el-form-item{
+	margin-bottom: 0px !important;
 }
 </style>
diff --git a/admin/src/addon/shop/views/order/components/refund-detail.vue b/admin/src/addon/shop/views/order/components/refund-detail.vue
index 08ecbb31..c60799e9 100644
--- a/admin/src/addon/shop/views/order/components/refund-detail.vue
+++ b/admin/src/addon/shop/views/order/components/refund-detail.vue
@@ -1,548 +1,282 @@
 <template>
-  <el-drawer
-    v-model="showDialog"
-    :title="popTitle"
-    direction="rtl"
-    :before-close="handleClose"
-    class="member-detail-drawer"
-  >
-    <div class="main-container" v-loading="loading">
-      <el-tabs v-model="activeName" class="pb-[10px]" @tab-change="tabChange">
-        <el-tab-pane label="订单信息" name="order" />
-        <el-tab-pane label="售后信息" name="refund" />
-        <el-tab-pane label="商品信息" name="goods" />
-        <el-tab-pane
-          v-if="
-            formData && formData.refund_log && formData.refund_log.length > 0
-          "
-          label="订单日志"
-          name="log"
-        />
-      </el-tabs>
+    <el-drawer v-model="showDialog" :title="popTitle" direction="rtl" :before-close="handleClose" class="member-detail-drawer">
+        <div class="main-container" v-loading="loading">
+            <el-tabs v-model="activeName" class="pb-[10px]" @tab-change="tabChange">
+                <el-tab-pane label="订单信息" name="order" />
+                <el-tab-pane label="售后信息" name="refund" />
+                <el-tab-pane label="商品信息" name="goods" />
+                <el-tab-pane v-if="formData && formData.refund_log && formData.refund_log.length > 0" label="订单日志" name="log" />
+            </el-tabs>
 
-      <el-form
-        :model="formData"
-        label-width="100px"
-        ref="formRef"
-        class="page-form"
-        v-if="!loading"
-        label-position="left"
-      >
-        <div v-if="activeName == 'order'">
-          <el-row class="row-bg px-[30px] mb-[20px]" :gutter="20">
-            <el-col :span="8">
-              <el-form-item :label="t('orderNo')">
-                <div
-                  class="input-width text-primary cursor-pointer"
-                  @click="toOrderDetail(formData.order_id)"
-                >
-                  {{ formData.order_main.order_no }}
+            <el-form :model="formData" label-width="100px" ref="formRef" class="page-form" v-if="!loading" label-position="left">
+                <div v-if="activeName == 'order'">
+                    <el-row class="row-bg px-[30px] mb-[20px]" :gutter="20">
+                        <el-col :span="8">
+                            <el-form-item :label="t('orderNo')">
+                                <div class="input-width text-primary cursor-pointer" @click="toOrderDetail(formData.order_id)">{{ formData.order_main.order_no }}</div>
+                            </el-form-item>
+                            <el-form-item :label="t('orderForm')">
+                                <div class="input-width">{{ formData.order_main.order_from_name }}</div>
+                            </el-form-item>
+                            <el-form-item :label="t('outTradeNo')" v-if="formData.order_main.out_trade_no">
+                                <div class="input-width">{{ formData.order_main.out_trade_no }}</div>
+                            </el-form-item>
+                            <el-form-item :label="t('payType')" v-if="formData.pay_refund">
+                                <div class="input-width">{{ formData.pay_refund.type_name }}</div>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item :label="t('deliveryType')">
+                                <div class="input-width">{{ formData.order_main.delivery_type_name }}</div>
+                            </el-form-item>
+                            <div v-if="formData.order_main.delivery_type == 'express' || formData.order_main.delivery_type == 'local_delivery'">
+                                <el-form-item :label="t('takerName')">
+                                    <div class="input-width">{{ formData.order_main.taker_name }}</div>
+                                </el-form-item>
+                                <el-form-item :label="t('takerMobile')">
+                                    <div class="input-width">{{ formData.order_main.taker_mobile }}</div>
+                                </el-form-item>
+                                <el-form-item :label="t('takerFullAddress')">
+                                    <div class="input-width">{{ formData.order_main.taker_full_address }}</div>
+                                </el-form-item>
+                            </div>
+                            <div v-if="formData.order_main.delivery_type == 'store'">
+                                <el-form-item :label="t('storeName')">
+                                    <div class="input-width">{{ formData.store.store_name }}</div>
+                                </el-form-item>
+                                <el-form-item :label="t('storeAddress')">
+                                    <div class="input-width">{{ formData.store.full_address }}</div>
+                                </el-form-item>
+                                <el-form-item :label="t('storeMobile')">
+                                    <div class="input-width">{{ formData.store.store_mobile }}</div>
+                                </el-form-item>
+                                <el-form-item :label="t('tradeTime')">
+                                    <div class="input-width">{{ formData.store.trade_time }}</div>
+                                </el-form-item>
+                            </div>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item :label="t('memberRemark')">
+                                <div class="input-width">{{ formData.order_main.member_remark }}</div>
+                            </el-form-item>
+                            <el-form-item :label="t('notes')">
+                                <div class="input-width line-feed">{{ formData.order_main.shop_remark }}</div>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
                 </div>
-              </el-form-item>
-              <el-form-item :label="t('orderForm')">
-                <div class="input-width">
-                  {{ formData.order_main.order_from_name }}
-                </div>
-              </el-form-item>
-              <el-form-item
-                :label="t('outTradeNo')"
-                v-if="formData.order_main.out_trade_no"
-              >
-                <div class="input-width">
-                  {{ formData.order_main.out_trade_no }}
-                </div>
-              </el-form-item>
-              <el-form-item :label="t('payType')" v-if="formData.pay_refund">
-                <div class="input-width">
-                  {{ formData.pay_refund.type_name }}
-                </div>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item :label="t('deliveryType')">
-                <div class="input-width">
-                  {{ formData.order_main.delivery_type_name }}
-                </div>
-              </el-form-item>
-              <div
-                v-if="
-                  formData.order_main.delivery_type == 'express' ||
-                  formData.order_main.delivery_type == 'local_delivery'
-                "
-              >
-                <el-form-item :label="t('takerName')">
-                  <div class="input-width">
-                    {{ formData.order_main.taker_name }}
-                  </div>
-                </el-form-item>
-                <el-form-item :label="t('takerMobile')">
-                  <div class="input-width">
-                    {{ formData.order_main.taker_mobile }}
-                  </div>
-                </el-form-item>
-                <el-form-item :label="t('takerFullAddress')">
-                  <div class="input-width">
-                    {{ formData.order_main.taker_full_address }}
-                  </div>
-                </el-form-item>
-              </div>
-              <div v-if="formData.order_main.delivery_type == 'store'">
-                <el-form-item :label="t('storeName')">
-                  <div class="input-width">{{ formData.store.store_name }}</div>
-                </el-form-item>
-                <el-form-item :label="t('storeAddress')">
-                  <div class="input-width">
-                    {{ formData.store.full_address }}
-                  </div>
-                </el-form-item>
-                <el-form-item :label="t('storeMobile')">
-                  <div class="input-width">
-                    {{ formData.store.store_mobile }}
-                  </div>
-                </el-form-item>
-                <el-form-item :label="t('tradeTime')">
-                  <div class="input-width">{{ formData.store.trade_time }}</div>
-                </el-form-item>
-              </div>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item :label="t('memberRemark')">
-                <div class="input-width">
-                  {{ formData.order_main.member_remark }}
+                <div v-if="activeName == 'refund'">
+                    <div class="text-[14px] min-w-[110px] border-solid border-l-[3px] border-[var(--el-color-primary)] pl-[5px]">{{ t('afterSales') }}</div>
+                    <div class="px-[30px] mt-[20px] mb-[20px]">
+                        <el-row class="row-bg px-[30px] mb-[20px]" :gutter="20">
+                            <el-col :span="12">
+                                <el-form-item :label="t('orderRefundNo')">
+                                    <div class="input-width">{{ formData.order_refund_no }}</div>
+                                </el-form-item>
+                                <el-form-item :label="t('refundType')">
+                                    <div class="input-width">{{ formData.refund_type_name }}</div>
+                                </el-form-item>
+                                <el-form-item :label="t('createTime')">
+                                    <div class="input-width">{{ formData.create_time }}</div>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="12">
+                                <el-form-item :label="t('refundMoney')">
+                                    <div class="input-width" v-if="formData.status == 8">￥{{ formData.money }}</div>
+                                    <div class="input-width" v-else>￥{{ formData.apply_money }}</div>
+                                </el-form-item>
+                                <el-form-item :label="t('refundReason')">
+                                    <div class="input-width">{{ formData.reason }}</div>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                        <el-row class="row-bg px-[30px] mb-[20px]" :gutter="20">
+                            <el-col :span="24">
+                                <el-form-item :label="t('refundVoucher')">
+                                    <div class="input-width flex" v-if="formData.voucher">
+                                        <div class="mr-3" v-for="(voucherItem, voucherIndex) in formData.voucher" :key="voucherIndex">
+                                            <el-image v-if="voucherItem" class="w-[70px] h-[70px]" :src="img(voucherItem)" fit="contain" :preview-src-list="[img(voucherItem)]">
+                                                <template #error>
+                                                    <div class="image-slot">
+                                                        <img class="w-[70px] h-[70px]" src="@/addon/shop/assets/goods_default.png" />
+                                                    </div>
+                                                </template>
+                                            </el-image>
+                                        </div>
+                                    </div>
+                                </el-form-item>
+                                <el-form-item :label="t('refundRemark')">
+                                    <div class="max-w-[100%] break-all">{{ formData.remark }}</div>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                    </div>
+                    <div class="text-[14px] min-w-[110px] border-solid border-l-[3px] border-[var(--el-color-primary)] pl-[5px]" v-if="formData.status == 4">买家退货信息</div>
+                    <div class="px-[30px] mt-[20px] mb-[20px]" v-if="formData.status == 4">
+                        <el-row class="row-bg px-[30px] mb-[20px]" :gutter="20" v-if="formData.status == 4">
+                            <el-col :span="8">
+                                <el-form-item :label="t('expressCompany')">
+                                    <div class="input-width">{{ formData.delivery.express_company }}</div>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item :label="t('expressNumber')">
+                                    <div class="input-width">{{ formData.delivery.express_number }}</div>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item :label="t('expressRemark')">
+                                    <div class="input-width">{{ formData.delivery.remark }}</div>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                    </div>
+                    <div class="text-[14px] min-w-[110px] border-solid border-l-[3px] border-[var(--el-color-primary)] pl-[5px]">{{ t('refundStatus') }}</div>
+                    <div class="px-[30px] mt-[20px] mb-[20px]">
+                        <p>
+                            <span class="ml-[30px] text-[14px] mr-[20px]">{{ t('refundStatus') }}：</span>
+                            <span class="text-[14px]">{{ formData.status_name }}</span>
+                        </p>
+                        <div class="mt-[20px] flex " v-if="formData.shop_reason">
+                            <span class="ml-[30px] text-[14px] mr-[20px] flex-shrink-0">{{ t('refuseReason') }}：</span>
+                            <div class="text-[14px] break-all">{{ formData.shop_reason }}</div>
+                        </div>
+                        <div class="flex mt-[10px]">
+                            <span class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#5c96fc] bg-[#ebf3ff] cursor-pointer" v-if="formData.status == 1" @click="agreeEvent">{{ t('agree') }}</span>
+                            <span class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#5c96fc] bg-[#ebf3ff] cursor-pointer" v-if="formData.status == 1" @click="refuseEvent">{{ t('refuse') }}</span>
+                            <span class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#5c96fc] bg-[#ebf3ff] cursor-pointer" v-if="formData.status == 4 && formData.refund_type == 2" @click="deliverEvent">{{ t('confirmDelivery') }}</span>
+                            <span class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#5c96fc] bg-[#ebf3ff] cursor-pointer" v-if="formData.status == 4 && formData.refund_type == 2" @click="deliveryRefuseEvent">{{ t('refuse') }}</span>
+                            <span class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#5c96fc] bg-[#ebf3ff] cursor-pointer" v-if="formData.status == 6" @click="transferEvent">{{ t('transferAccounts') }}</span>
+                        </div>
+                        <div class="flex ml-[30px] mt-[15px]">
+                            <span class="text-[14px] text-[#ff7f5b]">{{ t('remind') }}：</span>
+                            <div class="ml-[10px]">
+                                <p class="text-[14px] text-[#a4a4a4]">{{ t('remindTips1') }}</p>
+                                <p class="text-[14px] text-[#a4a4a4]">{{ t('remindTips2') }}</p>
+                                <p class="text-[14px] text-[#a4a4a4]">{{ t('remindTips3') }}</p>
+                            </div>
+                        </div>
+                    </div>
                 </div>
-              </el-form-item>
-              <el-form-item :label="t('notes')">
-                <div class="input-width line-feed">
-                  {{ formData.order_main.shop_remark }}
+                <div v-if="activeName == 'goods'">
+                    <el-table :data="formData.order_goods" size="large">
+                        <el-table-column :label="t('goodsName')" align="left" width="300">
+                            <template #default="{ row }">
+                                <div class="flex">
+                                    <div class="flex items-center w-[50px] h-[50px] mr-[10px]">
+                                        <img class="w-[50px] h-[50px]" :src="img(row.goods_image)" />
+                                    </div>
+                                    <div class="flex flex-col flex-1">
+                                        <span>{{ row.goods_name }}</span>
+                                        <span class="text-[12px] text-[#999] truncate">{{ row.sku_name }}</span>
+                                    </div>
+                                </div>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="price" :label="t('price')" min-width="50" align="left" />
+                        <el-table-column prop="num" :label="t('num')" min-width="50" align="right" />
+                    </el-table>
                 </div>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </div>
-        <div v-if="activeName == 'refund'">
-          <div
-            class="text-[14px] min-w-[110px] border-solid border-l-[3px] border-[var(--el-color-primary)] pl-[5px]"
-          >
-            {{ t('afterSales') }}
-          </div>
-          <div class="px-[30px] mt-[20px] mb-[20px]">
-            <el-row class="row-bg px-[30px] mb-[20px]" :gutter="20">
-              <el-col :span="12">
-                <el-form-item :label="t('orderRefundNo')">
-                  <div class="input-width">{{ formData.order_refund_no }}</div>
-                </el-form-item>
-                <el-form-item :label="t('refundType')">
-                  <div class="input-width">{{ formData.refund_type_name }}</div>
-                </el-form-item>
-                <el-form-item :label="t('createTime')">
-                  <div class="input-width">{{ formData.create_time }}</div>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item :label="t('refundMoney')">
-                  <div class="input-width" v-if="formData.status == 8">
-                    ￥{{ formData.money }}
-                  </div>
-                  <div class="input-width" v-else>
-                    ￥{{ formData.apply_money }}
-                  </div>
-                </el-form-item>
-                <el-form-item :label="t('refundReason')">
-                  <div class="input-width">{{ formData.reason }}</div>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row class="row-bg px-[30px] mb-[20px]" :gutter="20">
-              <el-col :span="24">
-                <el-form-item :label="t('refundVoucher')">
-                  <div class="input-width flex" v-if="formData.voucher">
-                    <div
-                      class="mr-3"
-                      v-for="(voucherItem, voucherIndex) in formData.voucher"
-                      :key="voucherIndex"
-                    >
-                      <el-image
-                        v-if="voucherItem"
-                        class="w-[70px] h-[70px]"
-                        :src="img(voucherItem)"
-                        fit="contain"
-                        :preview-src-list="[img(voucherItem)]"
-                      >
-                        <template #error>
-                          <div class="image-slot">
-                            <img
-                              class="w-[70px] h-[70px]"
-                              src="@/addon/shop/assets/goods_default.png"
-                            />
-                          </div>
+                <div v-if="activeName == 'log' && formData.refund_log.length > 0">
+                   <div class="mb-[100px] px-[20px]" style="min-height: 100px">
+                        <template v-if="formData.refund_log.length > 0">
+                            <div class="flex" v-for="(items, index) in formData.refund_log" :key="index">
+                                <div class="mr-[20px] min-w-[71px]">
+                                    <div class="leading-[1] w-full text-[14px] w-[100px] flex justify-end">
+                                        {{ items.create_time.split(' ')[0] }}
+                                    </div>
+                                    <div class="leading-[1] w-full text-[14px]  w-[100px] flex justify-end mt-[15px]">
+                                        {{ items.create_time.split(' ')[1] }}
+                                    </div>
+                                </div>
+                                <div>
+                                    <div class="w-[16px] h-[16px] flex items-center bg-[#D1EBFF] border-[1px] border-[#0091FF] rounded-[999px]">
+                                        <div class="w-[8px] h-[8px] mx-auto bg-[#0091FF] rounded-[999px]"></div>
+                                    </div>
+                                    <div v-if="index + 1 != formData.refund_log.length" class="w-[2px] h-[50px] bg-[#D1EBFF] mx-auto">
+                                    </div>
+                                </div>
+                                <div>
+                                    <div class="leading-[1] ml-[20px] text-[14px]">
+                                        {{ items.main_type_name }}{{ items.main_name }}
+                                    </div>
+                                    <div class="leading-[1] ml-[20px] text-[14px] mt-[15px]">
+                                        {{ items.type_name }}
+                                    </div>
+                                </div>
+                            </div>
                         </template>
-                      </el-image>
                     </div>
-                  </div>
-                </el-form-item>
-                <el-form-item :label="t('refundRemark')">
-                  <div class="max-w-[100%] break-all">
-                    {{ formData.remark }}
-                  </div>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </div>
-          <div
-            class="text-[14px] min-w-[110px] border-solid border-l-[3px] border-[var(--el-color-primary)] pl-[5px]"
-            v-if="formData.status == 4"
-          >
-            买家退货信息
-          </div>
-          <div
-            class="px-[30px] mt-[20px] mb-[20px]"
-            v-if="formData.status == 4"
-          >
-            <el-row
-              class="row-bg px-[30px] mb-[20px]"
-              :gutter="20"
-              v-if="formData.status == 4"
-            >
-              <el-col :span="8">
-                <el-form-item :label="t('expressCompany')">
-                  <div class="input-width">
-                    {{ formData.delivery.express_company }}
-                  </div>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item :label="t('expressNumber')">
-                  <div class="input-width">
-                    {{ formData.delivery.express_number }}
-                  </div>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item :label="t('expressRemark')">
-                  <div class="input-width">{{ formData.delivery.remark }}</div>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </div>
-          <div
-            class="text-[14px] min-w-[110px] border-solid border-l-[3px] border-[var(--el-color-primary)] pl-[5px]"
-          >
-            {{ t('refundStatus') }}
-          </div>
-          <div class="px-[30px] mt-[20px] mb-[20px]">
-            <p>
-              <span class="ml-[30px] text-[14px] mr-[20px]"
-                >{{ t('refundStatus') }}：</span
-              >
-              <span class="text-[14px]">{{ formData.status_name }}</span>
-            </p>
-            <div class="mt-[20px] flex" v-if="formData.shop_reason">
-              <span class="ml-[30px] text-[14px] mr-[20px] flex-shrink-0"
-                >{{ t('refuseReason') }}：</span
-              >
-              <div class="text-[14px] break-all">
-                {{ formData.shop_reason }}
-              </div>
-            </div>
-            <div class="flex mt-[10px]">
-              <span
-                class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#5c96fc] bg-[#ebf3ff] cursor-pointer"
-                v-if="formData.status == 1"
-                @click="agreeEvent"
-                >{{ t('agree') }}</span
-              >
-              <span
-                class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#5c96fc] bg-[#ebf3ff] cursor-pointer"
-                v-if="formData.status == 1"
-                @click="refuseEvent"
-                >{{ t('refuse') }}</span
-              >
-              <span
-                class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#5c96fc] bg-[#ebf3ff] cursor-pointer"
-                v-if="formData.status == 4 && formData.refund_type == 2"
-                @click="deliverEvent"
-                >{{ t('confirmDelivery') }}</span
-              >
-              <span
-                class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#5c96fc] bg-[#ebf3ff] cursor-pointer"
-                v-if="formData.status == 4 && formData.refund_type == 2"
-                @click="deliveryRefuseEvent"
-                >{{ t('refuse') }}</span
-              >
-              <span
-                class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#5c96fc] bg-[#ebf3ff] cursor-pointer"
-                v-if="formData.status == 6"
-                @click="transferEvent"
-                >{{ t('transferAccounts') }}</span
-              >
-            </div>
-            <div class="flex ml-[30px] mt-[15px]">
-              <span class="text-[14px] text-[#ff7f5b]"
-                >{{ t('remind') }}：</span
-              >
-              <div class="ml-[10px]">
-                <p class="text-[14px] text-[#a4a4a4]">{{ t('remindTips1') }}</p>
-                <p class="text-[14px] text-[#a4a4a4]">{{ t('remindTips2') }}</p>
-                <p class="text-[14px] text-[#a4a4a4]">{{ t('remindTips3') }}</p>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div v-if="activeName == 'goods'">
-          <el-table :data="formData.order_goods" size="large">
-            <el-table-column :label="t('goodsName')" align="left" width="300">
-              <template #default="{ row }">
-                <div class="flex">
-                  <div class="flex items-center w-[50px] h-[50px] mr-[10px]">
-                    <img
-                      class="w-[50px] h-[50px]"
-                      :src="img(row.goods_image)"
-                    />
-                  </div>
-                  <div class="flex flex-col flex-1">
-                    <span>{{ row.goods_name }}</span>
-                    <span class="text-[12px] text-[#999] truncate">{{
-                      row.sku_name
-                    }}</span>
-                  </div>
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="price"
-              :label="t('price')"
-              min-width="50"
-              align="left"
-            />
-            <el-table-column
-              prop="num"
-              :label="t('num')"
-              min-width="50"
-              align="right"
-            />
-          </el-table>
-        </div>
-        <div v-if="activeName == 'log' && formData.refund_log.length > 0">
-          <div class="mb-[100px] px-[20px]" style="min-height: 100px">
-            <template v-if="formData.refund_log.length > 0">
-              <div
-                class="flex"
-                v-for="(items, index) in formData.refund_log"
-                :key="index"
-              >
-                <div class="mr-[20px] min-w-[71px]">
-                  <div
-                    class="leading-[1] w-full text-[14px] w-[100px] flex justify-end"
-                  >
-                    {{ items.create_time.split(' ')[0] }}
-                  </div>
-                  <div
-                    class="leading-[1] w-full text-[14px] w-[100px] flex justify-end mt-[15px]"
-                  >
-                    {{ items.create_time.split(' ')[1] }}
-                  </div>
                 </div>
-                <div>
-                  <div
-                    class="w-[16px] h-[16px] flex items-center bg-[#D1EBFF] border-[1px] border-[#0091FF] rounded-[999px]"
-                  >
-                    <div
-                      class="w-[8px] h-[8px] mx-auto bg-[#0091FF] rounded-[999px]"
-                    ></div>
-                  </div>
-                  <div
-                    v-if="index + 1 != formData.refund_log.length"
-                    class="w-[2px] h-[50px] bg-[#D1EBFF] mx-auto"
-                  ></div>
-                </div>
-                <div>
-                  <div class="leading-[1] ml-[20px] text-[14px]">
-                    {{ items.main_type_name }}{{ items.main_name }}
-                  </div>
-                  <div class="leading-[1] ml-[20px] text-[14px] mt-[15px]">
-                    {{ items.type_name }}
-                  </div>
-                </div>
-              </div>
-            </template>
-          </div>
-        </div>
-      </el-form>
+            </el-form>
 
-      <el-card
-        class="box-card !border-none relative"
-        shadow="never"
-        v-if="!loading && !formData"
-      >
-        <el-empty :description="t('orderInfoEmpty')" />
-      </el-card>
+            <el-card class="box-card !border-none relative" shadow="never" v-if="!loading && !formData">
+				<el-empty :description="t('orderInfoEmpty')" />
+			</el-card>
 
-      <!-- 拒绝退款弹框 -->
-      <el-dialog
-        v-model="refuseShowDialog"
-        :title="t('orderRefundRefuse')"
-        width="460px"
-        class="diy-dialog-wrap"
-        :destroy-on-close="true"
-      >
-        <el-form
-          :model="refuseFormData"
-          label-width="90px"
-          ref="refuseFormRef"
-          :rules="refundFormRules"
-        >
-          <el-form-item :label="t('refuseReason')" prop="shop_reason">
-            <el-input
-              v-model.trim="refuseFormData.shop_reason"
-              type="textarea"
-              rows="4"
-              clearable
-              class="input-width"
-              maxlength="200"
-              show-word-limit
-            />
-          </el-form-item>
-        </el-form>
-        <template #footer>
-          <span class="dialog-footer">
-            <el-button @click="refuseShowDialog = false">{{
-              t('cancel')
-            }}</el-button>
-            <el-button
-              type="primary"
-              :loading="actionLoading"
-              @click="confirm(refuseFormRef)"
-              >{{ t('confirm') }}</el-button
-            >
-          </span>
-        </template>
-      </el-dialog>
-      <!-- 同意弹框 -->
-      <el-dialog
-        v-model="agreeRefundDialog"
-        :title="t('orderRefundAgree')"
-        width="460px"
-        class="diy-dialog-wrap"
-        :destroy-on-close="true"
-      >
-        <el-form
-          @submit.native.prevent="onSubmit"
-          :model="refuseFormData"
-          label-width="120px"
-          ref="formRef"
-          :rules="formRules"
-          class="page-form"
-          v-loading="loading"
-        >
-          <el-form-item :label="t('applyMoney')">
-            <span>￥{{ refuseFormData.apply_money }}</span>
-          </el-form-item>
-          <el-form-item :label="t('agreeMoney')" prop="money">
-            <div>
-              <el-input
-                v-model.trim="refuseFormData.money"
-                clearable
-                class="input-width"
-              />
-              <div
-                class="mt-[10px] text-[#999] text-[12px] leading-[20px]"
-                v-if="
-                  formData.gift_balance &&
-                  Number(formData.gift_balance) >
-                    Number(formData.member.balance)
-                "
-              >
-                当前订单需退还{{
-                  formData.gift_balance
-                }}元赠品余额。若用户余额不足，则默认不进行扣除。请联系客户确认退款金额。
-              </div>
-            </div>
-          </el-form-item>
-          <el-form-item
-            :label="t('refundDeliveryAddress')"
-            prop="refund_address_id"
-            v-if="refuseFormData.refund_type == 2"
-          >
-            <el-select
-              v-model="refuseFormData.refund_address_id"
-              clearable
-              class="input-item"
-            >
-              <el-option
-                v-for="(item, index) in refundAddress"
-                :key="index"
-                :label="item.full_address"
-                :value="item.id"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </el-form>
-        <template #footer>
-          <span class="dialog-footer">
-            <el-button @click="agreeRefundDialog = false">{{
-              t('cancel')
-            }}</el-button>
-            <el-button
-              type="primary"
-              :loading="actionLoading"
-              @click="agreeRefundEvent(formRef)"
-              >{{ t('confirm') }}</el-button
-            >
-          </span>
-        </template>
-      </el-dialog>
-      <!-- 拒绝收货 -->
-      <el-dialog
-        v-model="deliveryRefuseDialog"
-        :title="t('orderRefundRefuse')"
-        width="460px"
-        class="diy-dialog-wrap"
-        :destroy-on-close="true"
-      >
-        <el-form
-          :model="deliveryRefuseFormData"
-          label-width="90px"
-          ref="deliveryRefuseFormRef"
-          :rules="deliveryRefundFormRules"
-        >
-          <el-form-item :label="t('refuseReason')" prop="shop_reason">
-            <el-input
-              v-model.trim="deliveryRefuseFormData.shop_reason"
-              type="textarea"
-              rows="4"
-              clearable
-              class="input-width"
-              maxlength="200"
-              show-word-limit
-            />
-          </el-form-item>
-        </el-form>
-        <template #footer>
-          <span class="dialog-footer">
-            <el-button @click="deliveryRefuseDialog = false">{{
-              t('cancel')
-            }}</el-button>
-            <el-button
-              type="primary"
-              :loading="actionLoading"
-              @click="refundDeliveryFn(deliveryRefuseFormRef)"
-              >{{ t('confirm') }}</el-button
-            >
-          </span>
-        </template>
-      </el-dialog>
-    </div>
-  </el-drawer>
+            <!-- 拒绝退款弹框 -->
+            <el-dialog v-model="refuseShowDialog" :title="t('orderRefundRefuse')" width="460px" class="diy-dialog-wrap" :destroy-on-close="true">
+                <el-form :model="refuseFormData" label-width="90px" ref="refuseFormRef" :rules="refundFormRules">
+                    <el-form-item :label="t('refuseReason')" prop="shop_reason">
+                        <el-input v-model.trim="refuseFormData.shop_reason" type="textarea" rows="4" clearable class="input-width" maxlength="200" show-word-limit />
+                    </el-form-item>
+                </el-form>
+                <template #footer>
+                    <span class="dialog-footer">
+                        <el-button @click="refuseShowDialog = false">{{ t('cancel') }}</el-button>
+                        <el-button type="primary" :loading="actionLoading" @click="confirm(refuseFormRef)">{{ t('confirm') }}</el-button>
+                    </span>
+                </template>
+            </el-dialog>
+            <!-- 同意弹框 -->
+            <el-dialog v-model="agreeRefundDialog" :title="t('orderRefundAgree')" width="460px" class="diy-dialog-wrap" :destroy-on-close="true">
+                <el-form @submit.native.prevent="onSubmit" :model="refuseFormData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                    <el-form-item :label="t('applyMoney')">
+                        <span>￥{{ refuseFormData.apply_money }}</span>
+                    </el-form-item>
+                    <el-form-item :label="t('agreeMoney')" prop="money">
+                        <div>
+                            <el-input v-model.trim="refuseFormData.money" clearable class="input-width" />
+                            <div  class="mt-[10px] text-[#999] text-[12px] leading-[20px]" v-if="formData.gift_balance && (Number(formData.gift_balance) > Number(formData.member.balance))">
+                                当前订单需退还{{ formData.gift_balance}}元赠品余额。若用户余额不足，则默认不进行扣除。请联系客户确认退款金额。
+                            </div>
+                        </div>
+                    </el-form-item>
+                    <el-form-item :label="t('refundDeliveryAddress')" prop="refund_address_id" v-if="refuseFormData.refund_type == 2" >
+                        <el-select v-model="refuseFormData.refund_address_id" clearable class="input-item">
+                            <el-option v-for="(item, index) in refundAddress" :key="index" :label="item.full_address" :value="item.id"></el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-form>
+                <template #footer>
+                    <span class="dialog-footer">
+                        <el-button @click="agreeRefundDialog = false">{{ t('cancel') }}</el-button>
+                        <el-button type="primary" :loading="actionLoading" @click="agreeRefundEvent(formRef)">{{ t('confirm') }}</el-button>
+                    </span>
+                </template>
+            </el-dialog>
+            <!-- 拒绝收货 -->
+            <el-dialog v-model="deliveryRefuseDialog" :title="t('orderRefundRefuse')" width="460px" class="diy-dialog-wrap" :destroy-on-close="true">
+                <el-form :model="deliveryRefuseFormData" label-width="90px" ref="deliveryRefuseFormRef" :rules="deliveryRefundFormRules">
+                    <el-form-item :label="t('refuseReason')" prop="shop_reason">
+                        <el-input v-model.trim="deliveryRefuseFormData.shop_reason" type="textarea" rows="4" clearable class="input-width" maxlength="200" show-word-limit />
+                    </el-form-item>
+                </el-form>
+                <template #footer>
+                    <span class="dialog-footer">
+                        <el-button @click="deliveryRefuseDialog = false">{{ t('cancel') }}</el-button>
+                        <el-button type="primary" :loading="actionLoading" @click="refundDeliveryFn(deliveryRefuseFormRef)">{{ t('confirm') }}</el-button>
+                    </span>
+                </template>
+            </el-dialog>
+        </div>
+    </el-drawer>
 </template>
 
 <script lang="ts" setup>
 import { ref, reactive, computed } from 'vue'
 import { t } from '@/lang'
-import {
-  orderRefundDetail,
-  auditRefund,
-  refundDelivery,
-} from '@/addon/shop/api/order'
+import { orderRefundDetail, auditRefund, refundDelivery } from '@/addon/shop/api/order'
 import { getOrderRefundAddress } from '@/addon/shop/api/shop_address'
 import { useRoute, useRouter } from 'vue-router'
 import { img } from '@/utils/common'
@@ -557,38 +291,40 @@ const actionLoading = ref(false)
 const formData: Record<string, any> | null = ref(null)
 const showDialog = ref(false)
 const handleClose = (done: () => void) => {
-  showDialog.value = false
+    showDialog.value = false;
 }
 
 const activeName = ref('order')
-let refundId = ''
+let refundId = '';
 const emit = defineEmits(['load'])
 
+
 const getOrderInfoFn = async () => {
-  loading.value = true
-  if (refundId) {
-    await orderRefundDetail(refundId)
-      .then(({ data }) => {
-        formData.value = data
-        formData.value.order_goods = [data.order_goods]
+    loading.value = true
+    if (refundId) {
+        await orderRefundDetail(refundId).then(({ data }) => {
+            formData.value = data
+            formData.value.order_goods = [data.order_goods]
 
+            loading.value = false;
+        }).catch(() => {
+        })
+    } else {
         loading.value = false
-      })
-      .catch(() => {})
-  } else {
-    loading.value = false
-  }
+    }
 }
 
+
+
 // 退款参数
 const refuseShowDialog = ref(false)
 const initialFormData = {
-  shop_reason: '',
-  refund_address_id: '',
-  money: '',
-  type: '',
-  apply_money: 0.0,
-  refund_type: 1,
+    shop_reason: '',
+    refund_address_id: '',
+    money: '',
+    type: '',
+    apply_money: 0.00,
+    refund_type: 1
 }
 
 const refuseFormData: Record<string, any> = reactive({ ...initialFormData })
@@ -596,207 +332,200 @@ const formRef = ref<FormInstance>()
 const refuseFormRef = ref<FormInstance>()
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    money: [
-      { required: true, message: t('moneyPlaceholder'), trigger: 'blur' },
-    ],
-    refund_address_id: [
-      {
-        required: true,
-        message: t('refundaddressPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-  }
+    return {
+        money: [
+            { required: true, message: t('moneyPlaceholder'), trigger: 'blur' }
+        ],
+        refund_address_id: [
+            { required: true, message: t('refundaddressPlaceholder'), trigger: 'blur' }
+        ]
+    }
 })
 // 拒绝退款
 const refundFormRules = computed(() => {
-  return {
-    shop_reason: [
-      { required: true, message: t('shopReasonPlaceholder'), trigger: 'blur' },
-    ],
-  }
+    return {
+        shop_reason: [
+            { required: true, message: t('shopReasonPlaceholder'), trigger: 'blur' }
+        ]
+    }
 })
 
 const agreeRefundDialog = ref(false) // 同意退款 弹窗
 // 同意退款 弹窗
 const agreeEvent = () => {
-  refuseFormData.type = 'agree'
-  refuseFormData.refund_type = formData.value.refund_type
-  refuseFormData.apply_money = formData.value.apply_money
-  refuseFormData.money = formData.value.apply_money
-  agreeRefundDialog.value = true
-  if (formData.value.refund_type == 2) {
-    getRefundAddress()
-  }
+    refuseFormData.type = 'agree'
+    refuseFormData.refund_type = formData.value.refund_type
+    refuseFormData.apply_money = formData.value.apply_money
+    refuseFormData.money = formData.value.apply_money
+    agreeRefundDialog.value = true
+    if (formData.value.refund_type == 2) {
+        getRefundAddress()
+    }
 }
 
 // 获取退货地址
 const refundAddress = ref<any[]>([])
 const getRefundAddress = () => {
-  getOrderRefundAddress().then((data) => {
-    refundAddress.value = data.data
-    data.data.forEach((item: any) => {
-      if (item.is_refund_address == 1) {
-        refuseFormData.refund_address_id = item.id
-      }
+    getOrderRefundAddress().then((data) => {
+        refundAddress.value = data.data
+        data.data.forEach((item:any) => {
+            if (item.is_refund_address == 1) {
+                refuseFormData.refund_address_id = item.id
+            }
+        })
     })
-  })
 }
 
 // 同意退款  提交
 const agreeRefundEvent = async (formEl: FormInstance | undefined) => {
-  if (actionLoading.value || !formEl) return
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      actionLoading.value = true
-      auditRefund({
-        order_refund_no: formData.value.order_refund_no,
-        money: refuseFormData.money,
-        is_agree: 1,
-        refund_address_id: refuseFormData.refund_address_id,
-      })
-        .then(() => {
-          agreeRefundDialog.value = false
-          actionLoading.value = false
-          resetFn()
-        })
-        .catch(() => {
-          actionLoading.value = false
-        })
-    }
-  })
+    if (actionLoading.value || !formEl) return
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            actionLoading.value = true
+            auditRefund({
+                order_refund_no: formData.value.order_refund_no,
+                money: refuseFormData.money,
+                is_agree: 1,
+                refund_address_id: refuseFormData.refund_address_id
+            }).then(() => {
+                agreeRefundDialog.value = false
+                actionLoading.value = false
+                resetFn();
+            }).catch(() => {
+                actionLoading.value = false
+            })
+        }
+    })
 }
 
 // 拒绝退款 弹出
 const refuseEvent = () => {
-  refuseFormData.type = 'refuse'
-  refuseFormData.shop_reason = ''
-  refuseShowDialog.value = true
+    refuseFormData.type = 'refuse'
+    refuseFormData.shop_reason = ''
+    refuseShowDialog.value = true
 }
 
 // 拒绝退款  提交
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (actionLoading.value || !formEl) return
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      actionLoading.value = true
-      auditRefund({
-        order_refund_no: formData.value.order_refund_no,
-        is_agree: 0,
-        shop_reason: refuseFormData.shop_reason,
-      })
-        .then((res) => {
-          resetFn()
-          actionLoading.value = false
-          refuseShowDialog.value = false
-        })
-        .catch(() => {
-          actionLoading.value = false
-          refuseShowDialog.value = false
-        })
-    }
-  })
+    if (actionLoading.value || !formEl) return
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            actionLoading.value = true
+            auditRefund({
+                order_refund_no: formData.value.order_refund_no,
+                is_agree: 0,
+                shop_reason: refuseFormData.shop_reason
+            }).then(res => {
+                resetFn();
+                actionLoading.value = false
+                refuseShowDialog.value = false
+            }).catch(() => {
+                actionLoading.value = false
+                refuseShowDialog.value = false
+            })
+        }
+    })
 }
 
 // 确认收货
 const deliverEvent = () => {
-  ElMessageBox.confirm(t('orderDeliveryTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    refundDelivery({
-      order_refund_no: formData.value.order_refund_no,
-      is_agree: 1,
-    }).then(() => {
-      resetFn()
+    ElMessageBox.confirm(t('orderDeliveryTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        refundDelivery({
+            order_refund_no: formData.value.order_refund_no,
+            is_agree: 1
+        }).then(() => {
+            resetFn();
+        })
     })
-  })
 }
 
 // 收货拒绝弹出
 const deliveryRefuseDialog = ref<boolean>(false)
 const deliveryRefuseFormData = reactive<any>({
-  shop_reason: '',
+    shop_reason: ''
 })
 const deliveryRefuseFormRef = ref<FormInstance>()
 const deliveryRefundFormRules = computed(() => {
-  return {
-    shop_reason: [
-      { required: true, message: t('shopReasonPlaceholder'), trigger: 'blur' },
-    ],
-  }
+    return {
+        shop_reason: [
+            { required: true, message: t('shopReasonPlaceholder'), trigger: 'blur' }
+        ]
+    }
 })
 // 拒绝收货提交
 const refundDeliveryFn = async (formEl: FormInstance | undefined) => {
-  if (actionLoading.value || !formEl) return
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      actionLoading.value = true
-      refundDelivery({
-        order_refund_no: formData.value.order_refund_no,
-        is_agree: 0,
-        shop_reason: deliveryRefuseFormData.shop_reason,
-      })
-        .then((res) => {
-          resetFn()
-          actionLoading.value = false
-          deliveryRefuseDialog.value = false
-        })
-        .catch(() => {
-          actionLoading.value = false
-          deliveryRefuseDialog.value = false
-        })
-    }
-  })
+    if (actionLoading.value || !formEl) return
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            actionLoading.value = true
+            refundDelivery({
+                order_refund_no: formData.value.order_refund_no,
+                is_agree: 0,
+                shop_reason: deliveryRefuseFormData.shop_reason
+            }).then(res => {
+                resetFn();
+                actionLoading.value = false
+                deliveryRefuseDialog.value = false
+            }).catch(() => {
+                actionLoading.value = false
+                deliveryRefuseDialog.value = false
+            })
+        }
+    })
 }
 const deliveryRefuseEvent = () => {
-  refuseFormData.type = 'refuse'
-  refuseFormData.shop_reason = ''
-  deliveryRefuseDialog.value = true
+    refuseFormData.type = 'refuse'
+    refuseFormData.shop_reason = ''
+    deliveryRefuseDialog.value = true
 }
 
 const transferEvent = () => {
-  const routeUrl = router.resolve({
-    path: '/member/refund/detail',
-    query: { refund_no: formData.value.refund_no },
-  })
-  window.open(routeUrl.href, '_blank')
+    const routeUrl = router.resolve({
+        path: '/member/refund/detail',
+        query: { refund_no: formData.value.refund_no }
+    })
+    window.open(routeUrl.href, '_blank')
 }
 
 // 订单详情
-const toOrderDetail = (id: number) => {
-  const routeUrl = router.resolve({
-    path: '/shop/order/detail',
-    query: { order_id: id },
-  })
-  window.open(routeUrl.href, '_blank')
+const toOrderDetail = (id:number) => {
+    const routeUrl = router.resolve({
+        path: '/shop/order/detail',
+        query: { order_id: id }
+    })
+    window.open(routeUrl.href, '_blank')
 }
 
+
 const setFormData = async (row: any = null) => {
-  refundId = row.id
-  formData.value = null
-  activeName.value = 'order'
-  getOrderInfoFn()
+    refundId = row.id;
+    formData.value = null;
+    activeName.value = 'order';
+    getOrderInfoFn();
 }
 
-const resetFn = () => {
-  showDialog.value = false
-  emit('load')
+const resetFn = ()=>{
+    showDialog.value = false;
+    emit('load');
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
 <style lang="scss">
-.member-detail-drawer {
-  width: 1300px !important;
+.member-detail-drawer{
+    width: 1300px !important;
 }
-.page-form .input-width {
-  width: 170px;
+.page-form .input-width{
+    width: 170px;
 }
 </style>
diff --git a/admin/src/addon/shop/views/order/components/shop-active-refund.vue b/admin/src/addon/shop/views/order/components/shop-active-refund.vue
index 661fb74d..3f137754 100644
--- a/admin/src/addon/shop/views/order/components/shop-active-refund.vue
+++ b/admin/src/addon/shop/views/order/components/shop-active-refund.vue
@@ -1,138 +1,77 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="t('refundTitle')"
-    width="800px"
-    class="diy-dialog-wrap"
-    :destroy-on-close="true"
-  >
-    <div v-loading="loading">
-      <el-alert type="warning" :closable="false" class="!mb-[10px]">
-        <template #default>
-          <p>
-            商家主动退款功能仅作为退款维权业务的补充功能，请勿过度依赖和使用。此功能支持多次退款操作。
-          </p>
-          <p>
-            如果订单项全部退款，运费将在最后一次退款时一并退还，同时使用的优惠券也将返还给用户，退款金额将原路返还至用户的支付账户。
-          </p>
+    <el-dialog v-model="showDialog" :title="t('refundTitle')" width="800px" class="diy-dialog-wrap" :destroy-on-close="true">
+        <div v-loading="loading">
+            <el-alert type="warning" :closable="false" class="!mb-[10px]">
+                <template #default>
+                    <p>商家主动退款功能仅作为退款维权业务的补充功能，请勿过度依赖和使用。此功能支持多次退款操作。</p>
+                    <p>如果订单项全部退款，运费将在最后一次退款时一并退还，同时使用的优惠券也将返还给用户，退款金额将原路返还至用户的支付账户。</p>
+                </template>
+            </el-alert>
+            <el-form :model="formData" label-width="100px" ref="formRef" :rules="formRules" class="page-form mb-[30px]">
+                <el-form-item :label="t('refundMoney')">
+                    <div class="text-[red]">
+                        <span>￥{{ formData.refund_money }}</span>
+                        <span v-if="isShowDelivery" class="text-[#999] text-[24rpx]">（运费:￥{{formData.delivery_money}}）</span>
+                    </div>
+                </el-form-item>
+                <el-form-item :label="t('refundGoodsItem')">
+                    <el-table :data="refundTable" size="large" ref="refundTableRef" @select="refundSelectChange" @select-all="refundSelectAll">
+                        <el-table-column type="selection" width="40" :selectable="selectable" />
+                        <el-table-column align="left" min-width="200" :label="t('refundGoodsInfo')">
+                            <template #default="{ row }">
+                                <div class="flex cursor-pointer">
+                                    <div class="flex items-center min-w-[50px] mr-[10px]">
+                                        <img class="w-[50px] h-[50px]" v-if="row.goods_image" :src="img(row.goods_image)" alt="">
+                                        <img class="w-[50px] h-[50px]" v-else src="" alt="">
+                                    </div>
+                                    <div class="flex flex-col items-start">
+                                        <el-tooltip class="box-item" effect="light" placement="top">
+                                            <template #content>
+                                                <div class="max-w-[250px]">{{row.goods_name}}</div>
+                                            </template>
+                                            <p class="multi-hidden text-[14px]">{{ row.goods_name }}</p>
+                                        </el-tooltip>
+                                        <span class="text-[12px] text-[#999] truncate">{{ row.sku_name }}</span>
+                                        <span class="px-[4px]  text-[12px] text-[#fff] rounded-[4px] bg-primary leading-[18px]" v-if="row.is_gift == 1">赠品</span>
+                                    </div>
+                                </div>
+                            </template>
+                        </el-table-column>
+                        <el-table-column min-width="60" :label="t('refundPayPrice')">
+                            <template #default="{ row }">
+                                <div class="flex flex-col">
+                                    <span class="text-[13px]">￥{{ row.refund_money }}</span>
+                                </div>
+                            </template>
+                        </el-table-column>
+                        <el-table-column min-width="80" :label="t('refundGoodsPrice')">
+                            <template #default="{ row }">
+                                <div class="flex flex-col">
+                                    <span class="text-[13px]">￥{{ row.price }}</span>
+                                </div>
+                            </template>
+                        </el-table-column>
+                        <el-table-column min-width="60" :label="t('refundGoodsNum')">
+                            <template #default="{ row }">
+                                <div class="flex flex-col">
+                                    <span class="text-[13px] mt-[5px]">{{ row.num }}{{ t('piece') }}</span>
+                                </div>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </el-form-item>
+                <el-form-item :label="t('refundInstructions')" prop="shop_active_refund_remark">
+                    <el-input v-model.trim="formData.shop_active_refund_remark" :rows="5" type="textarea" maxlength="200" show-word-limit />
+                </el-form-item>
+            </el-form>
+        </div>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+            </span>
         </template>
-      </el-alert>
-      <el-form
-        :model="formData"
-        label-width="100px"
-        ref="formRef"
-        :rules="formRules"
-        class="page-form mb-[30px]"
-      >
-        <el-form-item :label="t('refundMoney')">
-          <div class="text-[red]">
-            <span>￥{{ formData.refund_money }}</span>
-            <span v-if="isShowDelivery" class="text-[#999] text-[24rpx]"
-              >（运费:￥{{ formData.delivery_money }}）</span
-            >
-          </div>
-        </el-form-item>
-        <el-form-item :label="t('refundGoodsItem')">
-          <el-table
-            :data="refundTable"
-            size="large"
-            ref="refundTableRef"
-            @select="refundSelectChange"
-            @select-all="refundSelectAll"
-          >
-            <el-table-column
-              type="selection"
-              width="40"
-              :selectable="selectable"
-            />
-            <el-table-column
-              align="left"
-              min-width="200"
-              :label="t('refundGoodsInfo')"
-            >
-              <template #default="{ row }">
-                <div class="flex cursor-pointer">
-                  <div class="flex items-center min-w-[50px] mr-[10px]">
-                    <img
-                      class="w-[50px] h-[50px]"
-                      v-if="row.goods_image"
-                      :src="img(row.goods_image)"
-                      alt=""
-                    />
-                    <img class="w-[50px] h-[50px]" v-else src="" alt="" />
-                  </div>
-                  <div class="flex flex-col items-start">
-                    <el-tooltip class="box-item" effect="light" placement="top">
-                      <template #content>
-                        <div class="max-w-[250px]">{{ row.goods_name }}</div>
-                      </template>
-                      <p class="multi-hidden text-[14px]">
-                        {{ row.goods_name }}
-                      </p>
-                    </el-tooltip>
-                    <span class="text-[12px] text-[#999] truncate">{{
-                      row.sku_name
-                    }}</span>
-                    <span
-                      class="px-[4px] text-[12px] text-[#fff] rounded-[4px] bg-primary leading-[18px]"
-                      v-if="row.is_gift == 1"
-                      >赠品</span
-                    >
-                  </div>
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column min-width="60" :label="t('refundPayPrice')">
-              <template #default="{ row }">
-                <div class="flex flex-col">
-                  <span class="text-[13px]">￥{{ row.refund_money }}</span>
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column min-width="80" :label="t('refundGoodsPrice')">
-              <template #default="{ row }">
-                <div class="flex flex-col">
-                  <span class="text-[13px]">￥{{ row.price }}</span>
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column min-width="60" :label="t('refundGoodsNum')">
-              <template #default="{ row }">
-                <div class="flex flex-col">
-                  <span class="text-[13px] mt-[5px]"
-                    >{{ row.num }}{{ t('piece') }}</span
-                  >
-                </div>
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-form-item>
-        <el-form-item
-          :label="t('refundInstructions')"
-          prop="shop_active_refund_remark"
-        >
-          <el-input
-            v-model.trim="formData.shop_active_refund_remark"
-            :rows="5"
-            type="textarea"
-            maxlength="200"
-            show-word-limit
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -149,62 +88,62 @@ const loading = ref(false)
  * 表单数据
  */
 const initialFormData = {
-  order_goods_ids: [],
-  refund_money: 0,
-  shop_active_refund_remark: '',
+    order_goods_ids: [],
+    refund_money: 0,
+    shop_active_refund_remark: '',
 }
 
-const refundTable = ref([])
+const refundTable = ref([]);
 const refundTableRef: Record<string, any> | null = ref(null)
 const formData: Record<string, any> = reactive({ ...initialFormData })
 const formRef = ref<FormInstance>()
-let refundItemNum = 0 //表示可退款项数量
-let isShowDelivery = ref(false)
+let refundItemNum = 0; //表示可退款项数量
+let isShowDelivery = ref(false);
 
 const emit = defineEmits(['complete'])
 
 // 监听选择
-const refundSelectChange = (selection, row) => {
-  formData.refund_money = 0
-  isShowDelivery.value = false
-  formData.order_goods_ids = []
-  selection.forEach((item, index) => {
-    formData.refund_money += item.refund_money
-    formData.order_goods_ids.push(item.order_goods_id)
-  })
-  if (selection.length == refundItemNum) {
-    formData.refund_money += parseFloat(formData.delivery_money)
-    isShowDelivery.value = true
-  }
-  formData.refund_money = formData.refund_money.toFixed(2)
+const refundSelectChange = (selection, row)=>{
+    formData.refund_money = 0;
+    isShowDelivery.value = false;
+    formData.order_goods_ids = [];
+    selection.forEach((item,index) => {
+        formData.refund_money += item.refund_money;
+        formData.order_goods_ids.push(item.order_goods_id);
+    });
+    if(selection.length == refundItemNum){
+        formData.refund_money += parseFloat(formData.delivery_money);
+        isShowDelivery.value = true;
+    }
+    formData.refund_money = formData.refund_money.toFixed(2);
 }
 
 // 全选
-const refundSelectAll = (selection) => {
-  formData.refund_money = 0
-  isShowDelivery.value = false
-  formData.order_goods_ids = []
-  selection.forEach((item, index) => {
-    formData.refund_money += item.refund_money
-    formData.order_goods_ids.push(item.order_goods_id)
-  })
-  if (selection.length == refundItemNum) {
-    formData.refund_money += parseFloat(formData.delivery_money)
-    isShowDelivery.value = true
-  }
-  formData.refund_money = formData.refund_money.toFixed(2)
+const refundSelectAll = (selection)=>{
+    formData.refund_money = 0;
+    isShowDelivery.value = false;
+    formData.order_goods_ids = [];
+    selection.forEach((item,index) => {
+        formData.refund_money += item.refund_money;
+        formData.order_goods_ids.push(item.order_goods_id);
+    });
+    if(selection.length == refundItemNum){
+        formData.refund_money += parseFloat(formData.delivery_money);
+        isShowDelivery.value = true;
+    }
+    formData.refund_money = formData.refund_money.toFixed(2);
 }
 
-const selectable = (row: any, index: number) => {
-  let bool = false
-  if (row.status == 1) {
-    bool = true
-  }
-  if (row.is_gift == 1) {
-    bool = false
-  }
+const selectable = (row:any, index:number) => {
+    let bool = false
+    if (row.status == 1) {
+        bool = true
+    }
+    if (row.is_gift == 1) {
+        bool = false
+    }
 
-  return bool
+    return bool
 }
 
 /**
@@ -212,80 +151,79 @@ const selectable = (row: any, index: number) => {
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  if (formData.order_goods_ids.length <= 0) {
-    ElMessage({
-      message: t('refundGoodsPlaceholder'),
-      type: 'warning',
-    })
-    return
-  }
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      const data = cloneDeep(formData)
-      data.shop_active_refund_money = formData.refund_money
-      delete data.refund_money
-      shopActiveRefund(data)
-        .then((res) => {
-          loading.value = false
-          showDialog.value = false
-          emit('complete')
-          initFormData()
+    if (loading.value || !formEl) return
+    if (formData.order_goods_ids.length <= 0) {
+        ElMessage({
+            message: t('refundGoodsPlaceholder'),
+            type: 'warning'
         })
-        .catch((err) => {})
+        return
     }
-  })
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+            const data = cloneDeep(formData)
+            data.shop_active_refund_money = formData.refund_money;
+            delete data.refund_money;
+            shopActiveRefund(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+                initFormData();
+            }).catch(err => {
+            })
+        }
+    })
 }
 
 const setFormData = async (row: any = null) => {
-  loading.value = true
-  if (row) {
-    refundItemNum = 0
-    formData.refund_money = 0
-    formData.order_goods_ids = []
-    refundTable.value = row.order_goods
-    refundTable.value.forEach((item, index, arr) => {
-      arr[index].refund_money = item.goods_money - item.discount_money
-      if (item.status == 1) {
-        refundItemNum++
-        formData.refund_money += arr[index].refund_money
-        formData.order_goods_ids.push(item.order_goods_id)
-      }
-    })
-    formData.delivery_money = row.delivery_money
-    formData.refund_money += parseFloat(row.delivery_money)
-    isShowDelivery.value = true
+    loading.value = true;
+    if (row) {
+        refundItemNum = 0;
+        formData.refund_money = 0;
+        formData.order_goods_ids = [];
+        refundTable.value = row.order_goods;
+        refundTable.value.forEach((item,index,arr) => {
+            arr[index].refund_money = item.goods_money - item.discount_money;
+            if(item.status == 1){
+                refundItemNum++;
+                formData.refund_money += arr[index].refund_money;
+                formData.order_goods_ids.push(item.order_goods_id);
+            }
+        });
+        formData.delivery_money = row.delivery_money;
+        formData.refund_money += parseFloat(row.delivery_money);
+        isShowDelivery.value = true;
 
-    formData.refund_money = formData.refund_money.toFixed(2)
-    formData.shop_active_refund_remark = ''
-  }
-  nextTick(() => {
-    setTimeout(() => {
-      refundTableRef.value.toggleAllSelection()
-    }, 100)
-  })
-  loading.value = false
+        formData.refund_money = formData.refund_money.toFixed(2);
+        formData.shop_active_refund_remark = '';
+    }
+    nextTick(()=>{
+        setTimeout(()=>{
+            refundTableRef.value.toggleAllSelection();
+        },100)
+    })
+    loading.value = false
 }
 
-const initFormData = () => {
-  formData.order_goods_id = 0
-  formData.refund_money = 0
-  formData.shop_active_refund_status = 'partial_refund'
-  formData.shop_active_money_type = 'back_refund'
-  formData.shop_active_refund_remark = ''
+const initFormData = ()=> {
+    formData.order_goods_id = 0
+    formData.refund_money = 0
+    formData.shop_active_refund_status = 'partial_refund'
+    formData.shop_active_money_type = 'back_refund'
+    formData.shop_active_refund_remark = ''
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
 <style lang="scss" scoped></style>
 <style lang="scss">
 .diy-dialog-wrap .el-form-item__label {
-  height: auto !important;
+    height: auto !important;
 }
 </style>
diff --git a/admin/src/addon/shop/views/order/config.vue b/admin/src/addon/shop/views/order/config.vue
index 44c2754f..e873134a 100644
--- a/admin/src/addon/shop/views/order/config.vue
+++ b/admin/src/addon/shop/views/order/config.vue
@@ -1,256 +1,159 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
-
-      <el-form
-        :model="formData"
-        label-width="95"
-        ref="formRef"
-        :rules="rules"
-        class="page-form"
-        v-loading="loading"
-      >
-        <el-card class="box-card !border-none" shadow="never">
-          <div class="flex justify-start items-center">
-            <h3 class="panel-title !text-sm pl-[15px]">
-              {{ t('closeOrderInfo') }}
-            </h3>
-            <el-form-item class="ml-[-80px]" prop="is_close">
-              <el-checkbox
-                v-model="formData.is_close"
-                true-label="1"
-                false-label="2"
-              />
-            </el-form-item>
-          </div>
-          <el-form-item prop="close_length" v-if="formData.is_close == '1'">
-            <div>
-              <p class="!text-sm">
-                <span>{{ t('closeOrderInfoLeft') }}</span>
-                <el-input
-                  v-model.trim="formData.close_length"
-                  class="!w-[120px] mx-[10px]"
-                  @keyup="filterNumber($event)"
-                  clearable
-                />
-                <span>{{ t('closeOrderInfoRight') }}</span>
-              </p>
-              <p class="text-[12px] text-[#a9a9a9] leading-normal mt-[5px]">
-                {{ t('closeOrderInfoBottom') }}
-              </p>
-            </div>
-          </el-form-item>
-        </el-card>
-        <el-card class="box-card !border-none" shadow="never">
-          <div class="flex justify-start items-center">
-            <h3 class="panel-title !text-sm pl-[15px]">{{ t('confirm') }}</h3>
-            <el-form-item class="ml-[-80px]" prop="is_finish">
-              <el-checkbox
-                v-model="formData.is_finish"
-                true-label="1"
-                false-label="2"
-              />
-            </el-form-item>
-          </div>
-          <el-form-item prop="finish_length" v-if="formData.is_finish == '1'">
-            <div>
-              <p class="!text-sm">
-                <span>{{ t('confirmLeft') }}</span>
-                <el-input
-                  v-model.trim="formData.finish_length"
-                  class="!w-[120px] mx-[10px]"
-                  @keyup="filterNumber($event)"
-                  clearable
-                />
-                <span>{{ t('confirmRight') }}</span>
-              </p>
-              <p class="text-[12px] text-[#a9a9a9] leading-normal mt-[5px]">
-                {{ t('confirmBottom') }}
-              </p>
-            </div>
-          </el-form-item>
-        </el-card>
+    <div class="main-container">
         <el-card class="box-card !border-none" shadow="never">
-          <div class="flex justify-start items-center">
-            <h3 class="panel-title !text-sm pl-[15px]">{{ t('refund') }}</h3>
-            <el-form-item class="ml-[-80px]" prop="no_allow_refund">
-              <el-checkbox
-                v-model="formData.no_allow_refund"
-                :true-label="1"
-                :false-label="2"
-              />
-            </el-form-item>
-          </div>
-          <el-form-item
-            prop="refund_length"
-            v-if="formData.no_allow_refund == '1'"
-          >
-            <div>
-              <p class="!text-sm">
-                <span>{{ t('refundLeft') }}</span>
-                <el-input
-                  v-model.trim="formData.refund_length"
-                  class="!w-[120px] mx-[10px]"
-                  @keyup="filterNumber($event)"
-                  clearable
-                />
-                <span>{{ t('refundRight') }}</span>
-              </p>
-              <p class="text-[12px] text-[#a9a9a9] leading-normal mt-[5px]">
-                {{ t('refundBottom') }}
-              </p>
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
             </div>
-          </el-form-item>
-        </el-card>
-        <!-- 万能表单 -->
-        <el-card class="box-card !border-none" shadow="never">
-          <h3 class="panel-title !text-sm pl-[15px]">{{ t('diyForm') }}</h3>
-          <el-form-item>
-            <el-select
-              v-model="formData.form_id"
-              :placeholder="t('diyFormPlaceholder')"
-              clearable
-            >
-              <el-option
-                v-for="item in diyFormOptions"
-                :key="item.form_id"
-                :label="item.page_title"
-                :value="item.form_id"
-              />
-            </el-select>
-            <div class="ml-[10px]">
-              <span
-                class="cursor-pointer text-primary mr-[10px]"
-                @click="refreshDiyForm(true)"
-                >{{ t('refresh') }}</span
-              >
-              <span
-                class="cursor-pointer text-primary"
-                @click="toDiyFormEvent"
-                >{{ t('addDiyForm') }}</span
-              >
-            </div>
-          </el-form-item>
-        </el-card>
-        <el-card class="box-card !border-none" shadow="never">
-          <h3 class="panel-title !text-sm pl-[15px]">{{ t('evaluate') }}</h3>
-          <el-form-item prop="refund_length">
-            <span>{{ t('isEvaluate') }}</span>
-            <el-radio-group class="mx-[10px]" v-model="formData.is_evaluate">
-              <el-radio :label="1">{{ t('isEvaluateOpen') }}</el-radio>
-              <el-radio :label="0">{{ t('isEvaluateClose') }}</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item prop="refund_length">
-            <span>{{ t('evaluateIsToExamine') }}</span>
-            <el-radio-group
-              class="mx-[10px]"
-              v-model="formData.evaluate_is_to_examine"
-            >
-              <el-radio :label="1">{{ t('isEvaluateOpen') }}</el-radio>
-              <el-radio :label="0">{{ t('isEvaluateClose') }}</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item prop="refund_length">
-            <span>{{ t('evaluateIsShow') }}</span>
-            <el-radio-group
-              class="mx-[10px]"
-              v-model="formData.evaluate_is_show"
-            >
-              <el-radio :label="1">{{ t('isEvaluateOpen') }}</el-radio>
-              <el-radio :label="0">{{ t('isEvaluateClose') }}</el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-card>
-        <el-card class="box-card !border-none" shadow="never">
-          <h3 class="panel-title !text-sm pl-[15px]">{{ t('invoice') }}</h3>
-          <el-form-item>
-            <span>{{ t('isInvoice') }}</span>
-            <el-radio-group class="mx-[10px]" v-model="formData.is_invoice">
-              <el-radio label="2">{{ t('isInvoiceClose') }}</el-radio>
-              <el-radio label="1">{{ t('isInvoiceOpen') }}</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item class="invoice">
-            <div class="flex">
-              <div>{{ t('invoiceContent') }}</div>
-              <div class="mx-[10px]">
-                <el-form-item
-                  :prop="`invoice_content[${index}]`"
-                  v-for="(item, index) in formData.invoice_content"
-                  :key="index"
-                  :rules="[
-                    {
-                      validator: (
-                        rule: any,
-                        value: any,
-                        callback: Function
-                      ) => {
-                        if (formData.is_invoice === '1') {
-                          if (value === '') {
-                            return callback(t('invoicePlaceholder'))
-                          } else {
-                            return callback()
-                          }
-                        } else {
-                          return callback()
-                        }
-                      },
-                      trigger: 'blur',
-                    },
-                  ]"
-                >
-                  <div
-                    :class="['w-[120px] relative', index ? 'mt-[15px]' : '']"
-                  >
-                    <el-input
-                      v-model.trim="formData.invoice_content[index]"
-                      class="!w-[120px]"
-                      clearable
-                    />
-                    <el-icon
-                      v-if="index"
-                      color="rgba(0, 0, 0, 0.3)"
-                      class="!absolute right-[-6px] top-[-5px]"
-                      @click="clearInvoiceContent(index)"
-                    >
-                      <CircleCloseFilled />
-                    </el-icon>
-                  </div>
-                </el-form-item>
-              </div>
-              <el-button @click="insertInvoiceContent">{{
-                t('insert')
-              }}</el-button>
+
+            <el-form :model="formData" label-width="95" ref="formRef" :rules="rules" class="page-form" v-loading="loading">
+                <el-card class="box-card !border-none" shadow="never">
+                    <div class="flex justify-start items-center">
+                        <h3 class="panel-title !text-sm pl-[15px]">{{ t('closeOrderInfo') }}</h3>
+                        <el-form-item class="ml-[-80px]" prop="is_close">
+                            <el-checkbox v-model="formData.is_close"  true-label="1" false-label="2" />
+                        </el-form-item>
+                    </div>
+                    <el-form-item prop="close_length" v-if="formData.is_close == '1'">
+                        <div>
+                            <p class="!text-sm">
+                                <span>{{ t('closeOrderInfoLeft') }}</span>
+                                <el-input v-model.trim="formData.close_length" class="!w-[120px] mx-[10px]" @keyup="filterNumber($event)" clearable />
+                                <span>{{ t('closeOrderInfoRight') }}</span>
+                            </p>
+                            <p class="text-[12px] text-[#a9a9a9] leading-normal  mt-[5px]">{{ t('closeOrderInfoBottom') }}</p>
+                        </div>
+                    </el-form-item>
+                </el-card>
+                <el-card class="box-card !border-none" shadow="never">
+                    <div class="flex justify-start items-center">
+                        <h3 class="panel-title !text-sm pl-[15px]">{{ t('confirm') }}</h3>
+                        <el-form-item  class="ml-[-80px]"  prop="is_finish">
+                            <el-checkbox v-model="formData.is_finish"  true-label="1" false-label="2" />
+                        </el-form-item>
+                    </div>
+                    <el-form-item prop="finish_length" v-if="formData.is_finish == '1'">
+                        <div>
+                            <p class="!text-sm">
+                                <span>{{ t('confirmLeft') }}</span>
+                                <el-input v-model.trim="formData.finish_length" class="!w-[120px] mx-[10px]" @keyup="filterNumber($event)" clearable />
+                                <span>{{ t('confirmRight') }}</span>
+                            </p>
+                            <p class="text-[12px] text-[#a9a9a9] leading-normal  mt-[5px]">{{ t('confirmBottom') }}</p>
+                        </div>
+                    </el-form-item>
+                </el-card>
+                <el-card class="box-card !border-none" shadow="never">
+                    <div class="flex justify-start items-center">
+                        <h3 class="panel-title !text-sm pl-[15px]">{{ t('refund') }}</h3>
+                        <el-form-item  class="ml-[-80px]" prop="no_allow_refund">
+                            <el-checkbox v-model="formData.no_allow_refund"  :true-label="1" :false-label="2" />
+                        </el-form-item>
+                    </div>
+                    <el-form-item prop="refund_length" v-if="formData.no_allow_refund == '1'">
+                        <div>
+                            <p class="!text-sm">
+                                <span>{{ t('refundLeft') }}</span>
+                                <el-input v-model.trim="formData.refund_length" class="!w-[120px] mx-[10px]" @keyup="filterNumber($event)" clearable />
+                                <span>{{ t('refundRight') }}</span>
+                            </p>
+                            <p class="text-[12px] text-[#a9a9a9] leading-normal  mt-[5px]">{{ t('refundBottom') }}</p>
+                        </div>
+                    </el-form-item>
+                </el-card>
+                <!-- 万能表单 -->
+                <el-card class="box-card !border-none" shadow="never">
+                    <h3 class="panel-title !text-sm pl-[15px]">{{ t('diyForm') }}</h3>
+                    <el-form-item>
+                        <el-select v-model="formData.form_id" :placeholder="t('diyFormPlaceholder')" clearable>
+                            <el-option v-for="item in diyFormOptions" :key="item.form_id" :label="item.page_title" :value="item.form_id" />
+                        </el-select>
+                        <div class="ml-[10px]">
+                            <span class="cursor-pointer text-primary mr-[10px]" @click="refreshDiyForm(true)">{{ t('refresh') }}</span>
+                            <span class="cursor-pointer text-primary" @click="toDiyFormEvent">{{ t('addDiyForm') }}</span>
+                        </div>
+                    </el-form-item>
+                </el-card>
+                <el-card class="box-card !border-none" shadow="never">
+                    <h3 class="panel-title !text-sm pl-[15px]">{{ t('evaluate') }}</h3>
+                    <el-form-item prop="refund_length">
+                        <span>{{ t('isEvaluate') }}</span>
+                        <el-radio-group class="mx-[10px]" v-model="formData.is_evaluate">
+                            <el-radio :label="1">{{ t('isEvaluateOpen') }}</el-radio>
+                            <el-radio :label="0">{{ t('isEvaluateClose') }}</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+                    <el-form-item prop="refund_length">
+                        <span>{{ t('evaluateIsToExamine') }}</span>
+                        <el-radio-group class="mx-[10px]" v-model="formData.evaluate_is_to_examine">
+                            <el-radio :label="1">{{ t('isEvaluateOpen') }}</el-radio>
+                            <el-radio :label="0">{{ t('isEvaluateClose') }}</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+                    <el-form-item prop="refund_length">
+                        <span>{{ t('evaluateIsShow') }}</span>
+                        <el-radio-group class="mx-[10px]" v-model="formData.evaluate_is_show">
+                            <el-radio :label="1">{{ t('isEvaluateOpen') }}</el-radio>
+                            <el-radio :label="0">{{ t('isEvaluateClose') }}</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+                </el-card>
+                <el-card class="box-card !border-none" shadow="never">
+                    <h3 class="panel-title !text-sm pl-[15px]">{{ t('invoice') }}</h3>
+                    <el-form-item>
+                        <span>{{ t('isInvoice') }}</span>
+                        <el-radio-group class="mx-[10px]" v-model="formData.is_invoice">
+                            <el-radio label="2">{{ t('isInvoiceClose') }}</el-radio>
+                            <el-radio label="1">{{ t('isInvoiceOpen') }}</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+                    <el-form-item class="invoice">
+                        <div class="flex">
+                            <div>{{ t('invoiceContent') }}</div>
+                            <div class="mx-[10px]">
+                                <el-form-item :prop="`invoice_content[${index}]`" v-for="(item, index) in formData.invoice_content" :key="index" :rules="[{ validator: (rule:any, value:any, callback:Function) => {
+                                            if (formData.is_invoice === '1') {
+                                                if (value === ''){
+                                                    return callback(t('invoicePlaceholder'))
+                                                } else {
+                                                    return callback()
+                                                }
+                                            } else {
+                                                return callback()
+                                            }
+                                        }, trigger: 'blur' }]">
+                                    <div :class="['w-[120px] relative', index ? 'mt-[15px]' : '']" >
+                                        <el-input v-model.trim="formData.invoice_content[index]" class="!w-[120px]" clearable />
+                                        <el-icon v-if="index" color="rgba(0, 0, 0, 0.3)" class="!absolute right-[-6px] top-[-5px]" @click="clearInvoiceContent(index)">
+                                            <CircleCloseFilled />
+                                        </el-icon>
+                                    </div>
+                                </el-form-item>
+                            </div>
+                            <el-button @click="insertInvoiceContent">{{ t('insert') }}</el-button>
+                        </div>
+                    </el-form-item>
+                    <el-form-item prop="invoice_type">
+                        <span class="mr-[10px]">{{ t('invoiceType') }}</span>
+                        <el-checkbox-group v-model="formData.invoice_type">
+                            <el-checkbox label="1">{{ t('electronicInvoice') }}</el-checkbox>
+                            <el-checkbox label="2">{{ t('paperInvoice') }}</el-checkbox>
+                        </el-checkbox-group>
+                    </el-form-item>
+                </el-card>
+            </el-form>
+            <div class="fixed-footer-wrap" v-if="!loading">
+                <div class="fixed-footer">
+                    <el-button type="primary" @click="onSave(formRef)">{{ t('save') }}</el-button>
+                </div>
             </div>
-          </el-form-item>
-          <el-form-item prop="invoice_type">
-            <span class="mr-[10px]">{{ t('invoiceType') }}</span>
-            <el-checkbox-group v-model="formData.invoice_type">
-              <el-checkbox label="1">{{ t('electronicInvoice') }}</el-checkbox>
-              <el-checkbox label="2">{{ t('paperInvoice') }}</el-checkbox>
-            </el-checkbox-group>
-          </el-form-item>
         </el-card>
-      </el-form>
-      <div class="fixed-footer-wrap" v-if="!loading">
-        <div class="fixed-footer">
-          <el-button type="primary" @click="onSave(formRef)">{{
-            t('save')
-          }}</el-button>
-        </div>
-      </div>
-    </el-card>
-  </div>
+    </div>
 </template>
 <script lang="ts" setup>
-import { ref, reactive } from 'vue'
+import { ref,reactive } from 'vue'
 import { t } from '@/lang'
 import { getConfig, setConfig } from '@/addon/shop/api/order'
-import { useRoute, useRouter } from 'vue-router'
+import { useRoute,useRouter } from 'vue-router'
 import { filterNumber } from '@/utils/common'
 import { getDiyFormList } from '@/app/api/diy_form'
 import { ElMessage } from 'element-plus'
@@ -260,80 +163,88 @@ const router = useRouter()
 
 const pageName = route.meta.title
 const formData = ref({
-  close_length: '10',
-  finish_length: '1',
-  invoice_content: [''],
-  invoice_type: [],
-  is_close: '1',
-  is_finish: '1',
-  is_invoice: '1',
-  no_allow_refund: '1',
-  refund_length: '1',
-  is_evaluate: 1,
-  evaluate_is_to_examine: 1,
-  evaluate_is_show: 1,
-  form_id: '',
+    close_length: '10',
+    finish_length: '1',
+    invoice_content: [''],
+    invoice_type: [],
+    is_close: '1',
+    is_finish: '1',
+    is_invoice: '1',
+    no_allow_refund: '1',
+    refund_length: '1',
+    is_evaluate: 1,
+    evaluate_is_to_examine: 1,
+    evaluate_is_show: 1,
+    form_id: ''
 })
 
-const validCloseLength = (rule: any, value: any, callback: Function) => {
-  if (formData.value.is_close != '2') {
-    if (value == '') {
-      return callback(new Error(t('CloseLengthPlaceholder')))
-    } else if (Number(value) >= 10 && Number(value) <= 1440) {
-      return callback()
+const validCloseLength = (rule:any, value:any, callback:Function) => {
+    if (formData.value.is_close != '2') {
+        if (value == '') {
+            return callback(new Error(t('CloseLengthPlaceholder')))
+        } else if (Number(value) >= 10 && Number(value) <= 1440) {
+            return callback()
+        } else {
+            return callback(new Error(t('closeOrderInfoBottom')))
+        }
     } else {
-      return callback(new Error(t('closeOrderInfoBottom')))
+        return callback()
     }
-  } else {
-    return callback()
-  }
 }
 
-const validFinishLength = (rule: any, value: any, callback: Function) => {
-  if (formData.value.is_finish != '2') {
-    if (value == '') {
-      return callback(new Error(t('finishLengthPlaceholder')))
-    } else if (Number(value) >= 1 && Number(value) <= 30) {
-      return callback()
+const validFinishLength = (rule:any, value:any, callback:Function) => {
+    if (formData.value.is_finish != '2') {
+        if (value == '') {
+            return callback(new Error(t('finishLengthPlaceholder')))
+        } else if (Number(value) >= 1 && Number(value) <= 30) {
+            return callback()
+        } else {
+            return callback(new Error(t('confirmBottom')))
+        }
     } else {
-      return callback(new Error(t('confirmBottom')))
+        return callback()
     }
-  } else {
-    return callback()
-  }
 }
 
-const validRefundLength = (rule: any, value: any, callback: Function) => {
-  if (formData.value.no_allow_refund != '2') {
-    if (value == '') {
-      return callback(new Error(t('validRefundLengthPlaceholder')))
-    } else if (Number(value) >= 1 && Number(value) <= 30) {
-      return callback()
+const validRefundLength = (rule:any, value:any, callback:Function) => {
+    if (formData.value.no_allow_refund != '2') {
+        if (value == '') {
+            return callback(new Error(t('validRefundLengthPlaceholder')))
+        } else if (Number(value) >= 1 && Number(value) <= 30) {
+            return callback()
+        } else {
+            return callback(new Error(t('refundBottom')))
+        }
     } else {
-      return callback(new Error(t('refundBottom')))
+        return callback()
     }
-  } else {
-    return callback()
-  }
 }
 
-const validInvoiceType = (rule: any, value: any, callback: Function) => {
-  if (formData.value.is_invoice === '1') {
-    if (!value.length) {
-      return callback(new Error(t('invoiceTypePlaceholder')))
+const validInvoiceType = (rule:any, value:any, callback:Function) => {
+    if (formData.value.is_invoice === '1') {
+        if (!value.length) {
+            return callback(new Error(t('invoiceTypePlaceholder')))
+        } else {
+            return callback()
+        }
     } else {
-      return callback()
+        return callback()
     }
-  } else {
-    return callback()
-  }
 }
 
 const rules = ref({
-  close_length: [{ validator: validCloseLength, trigger: 'blur' }],
-  finish_length: [{ validator: validFinishLength, trigger: 'blur' }],
-  refund_length: [{ validator: validRefundLength, trigger: 'blur' }],
-  invoice_type: [{ validator: validInvoiceType, trigger: 'change' }],
+    close_length: [
+        { validator: validCloseLength, trigger: 'blur' }
+    ],
+    finish_length: [
+        { validator: validFinishLength, trigger: 'blur' }
+    ],
+    refund_length: [
+        { validator: validRefundLength, trigger: 'blur' }
+    ],
+    invoice_type: [
+        { validator: validInvoiceType, trigger: 'change' }
+    ]
 })
 
 /** ***************** 万能表单-start *************************/
@@ -341,29 +252,29 @@ const rules = ref({
 const diyFormOptions = reactive([])
 // 跳转到万能表单列表，添加表单
 const toDiyFormEvent = () => {
-  const url = router.resolve({
-    path: '/diy_form/list',
-  })
-  window.open(url.href)
+    const url = router.resolve({
+        path: '/diy_form/list'
+    })
+    window.open(url.href)
 }
 
 // 刷新万能表单
 const refreshDiyForm = (bool = false) => {
-  getDiyFormList({
-    type: 'DIY_FROM_ORDER_PAYMENT',
-    status: 1,
-  }).then((res) => {
-    const data = res.data
-    if (data) {
-      diyFormOptions.splice(0, diyFormOptions.length, ...data)
-      if (bool) {
-        ElMessage({
-          message: t('refreshSuccess'),
-          type: 'success',
-        })
-      }
-    }
-  })
+    getDiyFormList({
+        type: 'DIY_FROM_ORDER_PAYMENT',
+        status: 1
+    }).then((res) => {
+        const data = res.data
+        if (data) {
+            diyFormOptions.splice(0, diyFormOptions.length, ...data)
+            if (bool) {
+                ElMessage({
+                    message: t('refreshSuccess'),
+                    type: 'success'
+                })
+            }
+        }
+    })
 }
 
 refreshDiyForm()
@@ -371,43 +282,39 @@ refreshDiyForm()
 
 const loading = ref(false)
 const getConfigFn = () => {
-  loading.value = true
-  getConfig()
-    .then((res) => {
-      Object.values(res.data).forEach((el) => {
-        formData.value = Object.assign(formData.value, el)
-      })
-      formData.value.form_id = res.data.form_id
-      if (!formData.value.invoice_content.length)
-        formData.value.invoice_content.push('')
-      loading.value = false
-    })
-    .catch(() => {
-      loading.value = false
+    loading.value = true
+    getConfig().then(res => {
+        Object.values(res.data).forEach(el => {
+            formData.value = Object.assign(formData.value, el)
+        })
+        formData.value.form_id = res.data.form_id;
+        if (!formData.value.invoice_content.length) formData.value.invoice_content.push('')
+        loading.value = false
+    }).catch(() => {
+        loading.value = false
     })
 }
 const insertInvoiceContent = () => {
-  formData.value.invoice_content.push('')
+    formData.value.invoice_content.push('')
 }
-const clearInvoiceContent = (index: number) => {
-  formData.value.invoice_content.splice(index, 1)
+const clearInvoiceContent = (index:number) => {
+    formData.value.invoice_content.splice(index, 1)
 }
 getConfigFn()
 const formRef = ref()
 
 const onSave = async (formEl: any) => {
-  await formEl.validate(async (valid: any) => {
-    if (valid) {
-      loading.value = true
-      setConfig(formData.value)
-        .then((res) => {
-          getConfigFn()
-        })
-        .catch(() => {
-          loading.value = false
-        })
-    }
-  })
+    await formEl.validate(async (valid:any) => {
+        if (valid) {
+            loading.value = true
+            setConfig(formData.value).then(res => {
+                getConfigFn()
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
 }
 </script>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
diff --git a/admin/src/addon/shop/views/order/detail.vue b/admin/src/addon/shop/views/order/detail.vue
index 4ff8659b..42357014 100644
--- a/admin/src/addon/shop/views/order/detail.vue
+++ b/admin/src/addon/shop/views/order/detail.vue
@@ -1,470 +1,247 @@
 <template>
-  <div class="main-container">
-    <el-card class="card !border-none mb-[15px]" shadow="never">
-      <el-page-header
-        :content="pageName"
-        :icon="ArrowLeft"
-        @back="router.push({ path: '/shop/order/index' })"
-      />
-    </el-card>
-
-    <el-form
-      :model="formData"
-      label-width="100px"
-      ref="formRef"
-      class="page-form"
-      v-loading="loading"
-      label-position="left"
-    >
-      <el-card
-        class="box-card !border-none relative"
-        shadow="never"
-        v-if="formData"
-      >
-        <h3 class="panel-title">{{ t('orderInfo') }}</h3>
-        <el-row class="row-bg px-[30px] mb-[20px]" :gutter="20">
-          <el-col :span="8">
-            <el-form-item :label="t('orderNo')">
-              <div class="input-width">{{ formData.order_no }}</div>
-            </el-form-item>
-            <el-form-item :label="t('orderForm')">
-              <div class="input-width">{{ formData.order_from_name }}</div>
-            </el-form-item>
-            <el-form-item :label="t('outTradeNo')" v-if="formData.out_trade_no">
-              <div class="input-width">{{ formData.out_trade_no }}</div>
-            </el-form-item>
-            <el-form-item :label="t('payType')" v-if="formData.pay">
-              <div class="input-width">
-                <span>{{ formData.pay.type_name }}</span>
-              </div>
-            </el-form-item>
-            <el-form-item v-if="formData.pay">
-              <div
-                class="input-width"
-                v-if="
-                  formData.member_id !== formData.pay.main_id &&
-                  formData.pay.status == 2
-                "
-              >
-                <span>{{ formData.pay.pay_type_name }}, 帮付人：</span>
-                <span
-                  class="text-primary cursor-pointer"
-                  @click="memberEvent(formData.pay.main_id)"
-                  >{{ formData.pay.pay_member }}</span
-                >
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item :label="t('deliveryType')">
-              <div class="input-width">{{ formData.delivery_type_name }}</div>
-            </el-form-item>
-            <div
-              v-if="
-                formData.delivery_type == 'express' ||
-                formData.delivery_type == 'local_delivery'
-              "
-            >
-              <el-form-item :label="t('takerName')">
-                <div class="input-width">{{ formData.taker_name }}</div>
-              </el-form-item>
-              <el-form-item :label="t('takerMobile')">
-                <div class="input-width">{{ formData.taker_mobile }}</div>
-              </el-form-item>
-              <el-form-item :label="t('takerFullAddress')">
-                <div class="input-width">{{ formData.taker_full_address }}</div>
-              </el-form-item>
-            </div>
-            <div v-if="formData.delivery_type == 'store'">
-              <el-form-item :label="t('storeName')">
-                <div class="input-width">{{ formData.store.store_name }}</div>
-              </el-form-item>
-              <el-form-item :label="t('storeAddress')">
-                <div class="input-width">{{ formData.store.full_address }}</div>
-              </el-form-item>
-              <el-form-item :label="t('storeMobile')">
-                <div class="input-width">{{ formData.store.store_mobile }}</div>
-              </el-form-item>
-              <el-form-item :label="t('tradeTime')">
-                <div class="input-width">{{ formData.store.trade_time }}</div>
-              </el-form-item>
-            </div>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item :label="t('memberRemark')">
-              <div class="input-width line-feed">
-                {{ formData.member_remark ?? '--' }}
-              </div>
-            </el-form-item>
-            <el-form-item :label="t('notes')">
-              <div class="input-width line-feed">
-                {{ formData.shop_remark ?? '--' }}
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <h3 class="panel-title">{{ t('orderStatus') }}</h3>
-        <div class="mb-[20px]">
-          <p>
-            <span class="ml-[30px] text-[14px] mr-[20px]"
-              >{{ t('orderStatus') }}：</span
-            >
-            <span class="text-[14px]">{{ formData.status_name.name }}</span>
-          </p>
-          <div class="flex mt-[10px]">
-            <span
-              class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#ff7f5b] bg-[#fff0e5] cursor-pointer"
-              @click="setNotes"
-              >{{ t('notes') }}</span
-            >
-            <span
-              class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#5c96fc] bg-[#ebf3ff] cursor-pointer"
-              @click="delivery"
-              v-if="formData.status == 2"
-              >{{ t('delivery') }}</span
-            >
-            <span
-              class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#5c96fc] bg-[#ebf3ff] cursor-pointer"
-              @click="close"
-              v-if="formData.status == 1"
-              >{{ t('close') }}</span
-            >
-            <span
-              class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#5c96fc] bg-[#ebf3ff] cursor-pointer"
-              @click="orderAdjustMoney"
-              v-if="formData.status == 1"
-              >{{ t('editPrice') }}</span
-            >
-            <span
-              class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#5c96fc] bg-[#ebf3ff] cursor-pointer"
-              @click="finish"
-              v-if="formData.status == 3"
-              >{{ t('finish') }}</span
-            >
-            <span
-              class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#5c96fc] bg-[#ebf3ff] cursor-pointer"
-              @click="openElectronicSheetPrintDialog"
-              v-if="formData.delivery_type == 'express' && formData.status == 3"
-              >{{ t('electronicSheetPrintTitle') }}</span
-            >
-            <span
-              class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#5c96fc] bg-[#ebf3ff] cursor-pointer"
-              @click="printTicketEvent"
-              v-if="
-                formData.delivery_type == 'virtual' &&
-                (formData.status == 2 ||
-                  formData.status == 3 ||
-                  formData.status == 5)
-              "
-              >{{ t('printTicket') }}</span
-            >
-            <span
-              class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#5c96fc] bg-[#ebf3ff] cursor-pointer"
-              @click="orderEditAddressFn"
-              v-if="
-                formData.status == 1 &&
-                formData.delivery_type != 'virtual' &&
-                formData.activity_type != 'giftcard'
-              "
-              >{{ t('editAddress') }}</span
-            >
-            <span
-              class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#5c96fc] bg-[#ebf3ff] cursor-pointer"
-              @click="refundEvent"
-              v-if="
-                formData.is_refund_show &&
-                formData.status != 1 &&
-                formData.status != -1
-              "
-              >{{ t('voluntaryRefund') }}</span
-            >
-            <div class="flex" v-if="formData.order_delivery">
-              <template
-                v-for="(item, index) in formData.order_delivery"
-                :key="index"
-              >
-                <span
-                  v-if="
-                    item.delivery_type == 'express' &&
-                    item.sub_delivery_type == 'express'
-                  "
-                  class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#ff7f5b] bg-[#fff0e5] cursor-pointer"
-                  @click="packageEvent(item.id, formData.taker_mobile)"
-                  >{{ t('package') }}{{ index + 1 }}
-                </span>
-                <span
-                  v-if="
-                    item.delivery_type == 'express' &&
-                    item.sub_delivery_type == 'none_express'
-                  "
-                  class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#ff7f5b] bg-[#fff0e5] cursor-pointer"
-                  @click="packageEvent(item.id, formData.taker_mobile)"
-                  >{{ t('noLogisticsRequired') }}
-                </span>
-              </template>
-            </div>
-          </div>
-          <div class="flex ml-[30px] mt-[15px]">
-            <span class="text-[14px] text-[#ff7f5b]">{{ t('remind') }}：</span>
-            <div class="ml-[10px]">
-              <p class="text-[14px] text-[#a4a4a4]">{{ t('remindTips1') }}</p>
-              <p class="text-[14px] text-[#a4a4a4]">{{ t('remindTips2') }}</p>
-              <p class="text-[14px] text-[#a4a4a4]">{{ t('remindTips3') }}</p>
-            </div>
-          </div>
-        </div>
-        <h3 class="panel-title" v-if="formData.form_record_show == 1">
-          {{ t('formDetail') }}
-        </h3>
-        <div
-          class="row-bg px-[30px] mb-[20px]"
-          v-if="formData.form_record_show == 1"
-        >
-          <div class="grid grid-cols-3 gap-[20px]">
-            <el-form-item
-              v-for="(field, fieldKey) in tableData[0]?.recordsFieldList || []"
-              :key="fieldKey"
-              :label="field.field_name"
-              min-width="200"
-            >
-              <component
-                :is="tableData[0]?.recordsFieldList[fieldKey].detailComponent"
-                :data="tableData[0]?.recordsFieldList[fieldKey]"
-              />
-            </el-form-item>
-          </div>
-        </div>
-
-        <h3 class="panel-title mt-[30rpx]">{{ t('goodsDetail') }}</h3>
-        <el-table :data="formData.order_goods" size="large">
-          <el-table-column :label="t('goodsName')" align="left" width="300">
-            <template #default="{ row }">
-              <div class="flex">
-                <div class="flex items-center shrink-0">
-                  <img
-                    class="w-[50px] h-[50px] mr-[10px]"
-                    :src="img(row.goods_image)"
-                  />
-                </div>
-                <div class="flex flex-col items-start">
-                  <p class="multi-hidden text-[14px]">{{ row.goods_name }}</p>
-                  <span class="text-[12px] text-[#999]">{{
-                    row.sku_name
-                  }}</span>
-                  <span
-                    class="px-[4px] text-[12px] text-[#fff] rounded-[4px] bg-primary leading-[18px]"
-                    v-if="row.is_gift == 1"
-                    >赠品</span
-                  >
+	<div class="main-container">
+        <el-card class="card !border-none mb-[15px]" shadow="never">
+            <el-page-header :content="pageName" :icon="ArrowLeft" @back="router.push({ path: '/shop/order/index' })" />
+        </el-card>
+        
+		<el-form :model="formData" label-width="100px" ref="formRef" class="page-form" v-loading="loading" label-position="left">
+			<el-card class="box-card !border-none relative" shadow="never" v-if="formData">
+				<h3 class="panel-title">{{ t('orderInfo') }}</h3>
+				<el-row class="row-bg px-[30px] mb-[20px]" :gutter="20">
+					<el-col :span="8">
+						<el-form-item :label="t('orderNo')">
+							<div class="input-width">{{ formData.order_no }}</div>
+						</el-form-item>
+						<el-form-item :label="t('orderForm')">
+							<div class="input-width">{{ formData.order_from_name }}</div>
+						</el-form-item>
+						<el-form-item :label="t('outTradeNo')" v-if="formData.out_trade_no">
+							<div class="input-width">{{ formData.out_trade_no }}</div>
+						</el-form-item>
+						<el-form-item :label="t('payType')" v-if="formData.pay">
+							<div class="input-width">
+								<span>{{ formData.pay.type_name }}</span>
+							</div>
+						</el-form-item>
+						<el-form-item  v-if="formData.pay">
+							<div class="input-width" v-if="formData.member_id !== formData.pay.main_id && formData.pay.status == 2">
+								<span >{{ formData.pay.pay_type_name }}, 帮付人：</span>
+								<span class="text-primary cursor-pointer" @click="memberEvent(formData.pay.main_id)">{{ formData.pay.pay_member }}</span>
+							</div>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item :label="t('deliveryType')">
+							<div class="input-width">{{ formData.delivery_type_name }}</div>
+						</el-form-item>
+						<div v-if="formData.delivery_type == 'express' || formData.delivery_type == 'local_delivery'">
+							<el-form-item :label="t('takerName')">
+								<div class="input-width">{{ formData.taker_name }}</div>
+							</el-form-item>
+							<el-form-item :label="t('takerMobile')">
+								<div class="input-width">{{ formData.taker_mobile }}</div>
+							</el-form-item>
+							<el-form-item :label="t('takerFullAddress')">
+								<div class="input-width">{{ formData.taker_full_address }}</div>
+							</el-form-item>
+						</div>
+						<div v-if="formData.delivery_type == 'store'">
+							<el-form-item :label="t('storeName')">
+								<div class="input-width">{{ formData.store.store_name }}</div>
+							</el-form-item>
+							<el-form-item :label="t('storeAddress')">
+								<div class="input-width">{{ formData.store.full_address }}</div>
+							</el-form-item>
+							<el-form-item :label="t('storeMobile')">
+								<div class="input-width">{{ formData.store.store_mobile }}</div>
+							</el-form-item>
+							<el-form-item :label="t('tradeTime')">
+								<div class="input-width">{{ formData.store.trade_time }}</div>
+							</el-form-item>
+						</div>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item :label="t('memberRemark')">
+							<div class="input-width line-feed">{{ formData.member_remark ?? '--' }}</div>
+						</el-form-item>
+						<el-form-item :label="t('notes')">
+							<div class="input-width line-feed">{{ formData.shop_remark ?? '--' }}</div>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<h3 class="panel-title">{{ t('orderStatus') }}</h3>
+				<div class="mb-[20px]">
+					<p>
+						<span class="ml-[30px] text-[14px] mr-[20px]">{{ t('orderStatus') }}：</span>
+						<span class="text-[14px]">{{ formData.status_name.name }}</span>
+					</p>
+					<div class="flex mt-[10px]">
+						<span class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#ff7f5b] bg-[#fff0e5] cursor-pointer" @click="setNotes">{{ t('notes') }}</span>
+						<span class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#5c96fc] bg-[#ebf3ff] cursor-pointer" @click="delivery" v-if="formData.status == 2">{{ t('delivery') }}</span>
+						<span class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#5c96fc] bg-[#ebf3ff] cursor-pointer" @click="close" v-if="formData.status == 1">{{ t('close') }}</span>
+						<span class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#5c96fc] bg-[#ebf3ff] cursor-pointer" @click="orderAdjustMoney" v-if="formData.status == 1">{{ t('editPrice') }}</span>
+						<span class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#5c96fc] bg-[#ebf3ff] cursor-pointer" @click="finish" v-if="formData.status == 3">{{ t('finish') }}</span>
+						<span class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#5c96fc] bg-[#ebf3ff] cursor-pointer" @click="openElectronicSheetPrintDialog" v-if="formData.delivery_type == 'express' && formData.status == 3">{{ t('electronicSheetPrintTitle') }}</span>
+						<span class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#5c96fc] bg-[#ebf3ff] cursor-pointer" @click="printTicketEvent" v-if="formData.delivery_type == 'virtual' && (formData.status == 2 || formData.status == 3 || formData.status == 5)">{{ t('printTicket') }}</span>
+                        <span class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#5c96fc] bg-[#ebf3ff] cursor-pointer" @click="orderEditAddressFn" v-if="formData.status == 1 && formData.delivery_type != 'virtual' && formData.activity_type != 'giftcard'">{{ t('editAddress') }}</span>
+                        <span class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#5c96fc] bg-[#ebf3ff] cursor-pointer" @click="refundEvent" v-if="formData.is_refund_show && formData.status != 1 && formData.status != -1">{{ t('voluntaryRefund') }}</span>
+						<div class="flex" v-if="formData.order_delivery">
+							<template v-for="(item, index) in formData.order_delivery" :key="index">
+								<span v-if="item.delivery_type == 'express' && item.sub_delivery_type == 'express'"
+								      class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#ff7f5b] bg-[#fff0e5] cursor-pointer"
+								      @click="packageEvent(item.id, formData.taker_mobile)">{{ t('package') }}{{ index + 1 }}
+								</span>
+								<span v-if="item.delivery_type == 'express' && item.sub_delivery_type == 'none_express'"
+								      class="text-[14px] px-[15px] py-[5px] ml-[30px] text-[#ff7f5b] bg-[#fff0e5] cursor-pointer"
+								      @click="packageEvent(item.id, formData.taker_mobile)">{{ t('noLogisticsRequired') }}
+								</span>
+							</template>
+						</div>
+					</div>
+					<div class="flex ml-[30px] mt-[15px]">
+						<span class="text-[14px] text-[#ff7f5b]">{{ t('remind') }}：</span>
+						<div class="ml-[10px]">
+							<p class="text-[14px] text-[#a4a4a4]">{{ t('remindTips1') }}</p>
+							<p class="text-[14px] text-[#a4a4a4]">{{ t('remindTips2') }}</p>
+							<p class="text-[14px] text-[#a4a4a4]">{{ t('remindTips3') }}</p>
+						</div>
+					</div>
+				</div>
+                <h3 class="panel-title" v-if="formData.form_record_show==1">{{ t('formDetail') }}</h3>
+                <div class="row-bg px-[30px] mb-[20px]" v-if="formData.form_record_show==1">
+                    <div class="grid grid-cols-3 gap-[20px]">
+                        <el-form-item v-for="(field, fieldKey) in tableData[0]?.recordsFieldList || []" :key="fieldKey" :label="field.field_name" min-width="200" >
+                            <component :is="tableData[0]?.recordsFieldList[fieldKey].detailComponent" :data="tableData[0]?.recordsFieldList[fieldKey]" />
+                        </el-form-item> 
+                    </div>    
                 </div>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('price')" min-width="50" align="left">
-            <template #default="{ row }">
-              <div class="flex flex-col">
-                <span v-if="formData.activity_type == 'exchange'"
-                  >{{ row.extend.point }}{{ t('point') }}
-                  <span v-if="parseFloat(row.price)">+￥{{ row.price }}</span>
-                </span>
-                <span v-else class="text-[13px]">￥{{ row.price }}</span>
-                <span
-                  v-if="row.extend && row.extend.newcomer_price"
-                  class="text-[13px] mt-[5px]"
-                >
-                  <span
-                    v-if="parseFloat(row.extend.newcomer_price) && row.num > 1"
-                    >{{ row.num }}{{ t('piece')
-                    }}<span class="text-[#999]"
-                      >（第1{{ t('piece') }}，￥{{
-                        parseFloat(row.extend.newcomer_price).toFixed(2)
-                      }}/{{ t('piece') }}；第{{
-                        row.num > 2 ? '2~' + row.num : '2'
-                      }}{{ t('piece') }}，￥{{
-                        parseFloat(row.price).toFixed(2)
-                      }}/{{ t('piece') }}）</span
-                    ></span
-                  >
-                  <span v-else>{{ row.num }}{{ t('piece') }}</span>
-                </span>
-                <span v-else class="text-[13px] mt-[5px]"
-                  >{{ row.num }}{{ t('piece') }}</span
-                >
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="num"
-            :label="t('num')"
-            min-width="50"
-            align="right"
-          />
-          <el-table-column align="right" min-width="120">
-            <template #default="{ row }">
-              <el-button
-                type="primary"
-                v-if="row.form_record_show == 1"
-                link
-                @click="formDetailEvent(row.form_record_id)"
-                >{{ t('formDetail') }}</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="py-[12px] px-[16px] border-b border-color flex justify-end">
-          <div class="w-[310px] flex flex-col text-right">
-            <div class="flex mb-[10px]">
-              <div class="text-base flex-1">{{ t('goodsMoney') }}</div>
-              <div class="text-base flex-1 pl-[30px]">
-                <span
-                  v-if="formData.activity_type == 'exchange'"
-                  class="text-[14px]"
-                  >{{ formData.point }}{{ t('point') }}
-                  <span v-if="parseFloat(formData.goods_money)"
-                    >+￥{{ formData.goods_money }}</span
-                  >
-                </span>
-                <span v-else class="text-[14px]"
-                  >￥{{ formData.goods_money }}</span
-                >
-              </div>
-            </div>
-            <div class="flex mb-[10px]" v-if="formData.coupon_money > 0">
-              <div class="text-base flex-1">{{ t('couponMoney') }}</div>
-              <div class="text-base flex-1 pl-[30px]">
-                {{ formData.coupon_money }}
-              </div>
-            </div>
-            <div
-              class="flex mb-[10px]"
-              v-if="formData.manjian_discount_money > 0"
-            >
-              <div class="text-base flex-1">
-                {{ t('manjianDiscountMoney') }}
-              </div>
-              <div class="text-base flex-1 pl-[30px]">
-                {{ formData.manjian_discount_money }}
-              </div>
-            </div>
-            <div class="flex mb-[10px]">
-              <div class="text-base flex-1">{{ t('discountMoney') }}</div>
-              <div class="text-base flex-1 pl-[30px]">
-                {{ formData.discount_money }}
-              </div>
-            </div>
-            <div class="flex mb-[10px]">
-              <div class="text-base flex-1">{{ t('deliveryMoney') }}</div>
-              <div class="text-base flex-1 pl-[30px]">
-                {{ formData.delivery_money }}
-              </div>
-            </div>
-            <div class="flex">
-              <div class="text-base flex-1">{{ t('orderMoney') }}</div>
-              <div class="text-base flex-1 pl-[30px] text-[red]">
-                <span
-                  v-if="formData.activity_type == 'exchange'"
-                  class="text-[14px]"
-                  >{{ formData.point }}{{ t('point') }}
-                  <span v-if="parseFloat(formData.order_money)"
-                    >+￥{{ formData.order_money }}</span
-                  >
-                </span>
-                <span v-else class="text-[14px]"
-                  >￥{{ formData.order_money }}</span
-                >
-              </div>
-            </div>
-          </div>
-        </div>
-        <h3 class="mt-[50px] mb-[20px]" v-if="formData.order_log.length > 0">
-          {{ t('operateLog') }}
-        </h3>
-        <div
-          class="mb-[100px]"
-          style="min-height: 100px"
-          v-if="formData.order_log.length > 0"
-        >
-          <div
-            class="flex"
-            v-for="(items, index) in formData.order_log"
-            :key="index"
-          >
-            <div class="mr-[20px] min-w-[71px]">
-              <div
-                class="leading-[1] w-full text-[14px] w-[100px] flex justify-end"
-              >
-                {{ items.create_time && items.create_time.split(' ')[0] }}
-              </div>
-              <div
-                class="leading-[1] w-full text-[14px] w-[100px] flex justify-end mt-[15px]"
-              >
-                {{ items.create_time && items.create_time.split(' ')[1] }}
-              </div>
-            </div>
-            <div>
-              <div
-                class="w-[16px] h-[16px] flex items-center bg-[#D1EBFF] border-[1px] border-[#0091FF] rounded-[999px]"
-              >
-                <div
-                  class="w-[8px] h-[8px] mx-auto bg-[#0091FF] rounded-[999px]"
-                ></div>
-              </div>
-              <div
-                v-if="index + 1 != formData.order_log.length"
-                class="w-[2px] h-[50px] bg-[#D1EBFF] mx-auto"
-              ></div>
-            </div>
-            <div>
-              <div class="leading-[1] ml-[20px] text-[14px]">
-                {{ items.main_type_name }}{{ items.main_name }}
-              </div>
-              <div class="leading-[1] ml-[20px] text-[14px] mt-[15px]">
-                <span>{{ items.type_name }}</span>
-                <span class="ml-[10px]">{{ items.content }}</span>
-              </div>
-            </div>
-          </div>
-        </div>
-      </el-card>
-      <el-card
-        class="box-card !border-none relative"
-        shadow="never"
-        v-if="!loading && !formData"
-      >
-        <el-empty :description="t('orderInfoEmpty')" />
-      </el-card>
-    </el-form>
-    <adjust-money
-      ref="orderAdjustMoneyActionDialog"
-      @complete="setFormData(orderId)"
-    />
-    <delivery-action
-      ref="deliveryActionDialog"
-      @complete="setFormData(orderId)"
-    />
-    <order-notes ref="orderNotesDialog" @complete="setFormData(orderId)" />
-    <delivery-package ref="packageDialog" />
-    <electronic-sheet-print
-      ref="electronicSheetPrintDialog"
-      @complete="loadOrderList"
-    />
-    <order-edit-address
-      ref="orderEditAddressDialog"
-      @complete="loadOrderList"
-    />
-    <shop-active-refund
-      ref="shopActiveRefundDialog"
-      @complete="setFormData(orderId)"
-    />
-    <form-detail ref="formDetailDialog" />
-  </div>
+
+				<h3 class="panel-title mt-[30rpx]">{{ t('goodsDetail') }}</h3>
+				<el-table :data="formData.order_goods" size="large">
+					<el-table-column :label="t('goodsName')" align="left" width="300">
+						<template #default="{ row }">
+							<div class="flex">
+								<div class="flex items-center shrink-0">
+									<img class="w-[50px] h-[50px] mr-[10px]" :src="img(row.goods_image)" />
+								</div>
+								<div class="flex flex-col items-start">
+									<p class="multi-hidden text-[14px]">{{ row.goods_name }}</p>
+									<span class="text-[12px] text-[#999]">{{ row.sku_name }}</span>
+									<span class="px-[4px]  text-[12px] text-[#fff] rounded-[4px] bg-primary leading-[18px]" v-if="row.is_gift == 1">赠品</span>
+								</div>
+							</div>
+						</template>
+					</el-table-column>
+					<el-table-column :label="t('price')" min-width="50" align="left">
+						<template #default="{ row }">
+							<div class="flex flex-col">
+								<span v-if="formData.activity_type == 'exchange'">{{ row.extend.point }}{{ t('point') }}
+									<span v-if="parseFloat(row.price)">+￥{{ row.price }}</span>
+								</span>
+								<span v-else class="text-[13px]">￥{{ row.price }}</span>
+								<span v-if="row.extend && row.extend.newcomer_price" class="text-[13px] mt-[5px]">
+									<span v-if="parseFloat(row.extend.newcomer_price) && row.num > 1">{{ row.num }}{{ t('piece') }}<span class="text-[#999]">（第1{{ t('piece') }}，￥{{parseFloat(row.extend.newcomer_price).toFixed(2)}}/{{ t('piece') }}；第{{row.num>2?'2~'+row.num:'2'}}{{ t('piece') }}，￥{{parseFloat(row.price).toFixed(2)}}/{{ t('piece') }}）</span></span>
+									<span v-else>{{ row.num }}{{ t('piece') }}</span>
+								</span>
+								<span v-else class="text-[13px] mt-[5px]">{{ row.num }}{{ t('piece') }}</span>
+							</div>
+						</template>
+					</el-table-column>
+					<el-table-column prop="num" :label="t('num')" min-width="50" align="right" />
+                    <el-table-column align="right" min-width="120">
+						<template #default="{ row }">
+							<el-button type="primary" v-if="row.form_record_show==1" link @click="formDetailEvent(row.form_record_id)">{{ t('formDetail') }}</el-button>
+						</template>
+					</el-table-column>
+				</el-table>          
+				<div class="py-[12px] px-[16px] border-b border-color flex justify-end">
+					<div class="w-[310px] flex flex-col text-right">
+						<div class="flex mb-[10px]">
+							<div class="text-base flex-1">{{ t('goodsMoney') }}</div>
+							<div class="text-base flex-1 pl-[30px]">
+								<span v-if="formData.activity_type == 'exchange'" class="text-[14px]">{{ formData.point }}{{ t('point') }}
+									<span v-if="parseFloat(formData.goods_money)">+￥{{ formData.goods_money }}</span>
+								</span>
+								<span v-else class="text-[14px]">￥{{ formData.goods_money }}</span>
+							</div>
+						</div>
+						<div class="flex mb-[10px]" v-if="formData.coupon_money > 0">
+							<div class="text-base flex-1">{{ t('couponMoney') }}</div>
+							<div class="text-base flex-1 pl-[30px]">{{ formData.coupon_money }}</div>
+						</div>
+						<div class="flex mb-[10px]" v-if="formData.manjian_discount_money > 0">
+							<div class="text-base flex-1">{{ t('manjianDiscountMoney') }}</div>
+							<div class="text-base flex-1 pl-[30px]">{{ formData.manjian_discount_money }}</div>
+						</div>
+						<div class="flex mb-[10px]">
+							<div class="text-base flex-1">{{ t('discountMoney') }}</div>
+							<div class="text-base flex-1 pl-[30px]">{{ formData.discount_money }}</div>
+						</div>
+						<div class="flex mb-[10px]">
+							<div class="text-base flex-1">{{ t('deliveryMoney') }}</div>
+							<div class="text-base flex-1 pl-[30px]">{{ formData.delivery_money }}</div>
+						</div>
+						<div class="flex">
+							<div class="text-base flex-1">{{ t('orderMoney') }}</div>
+							<div class="text-base flex-1 pl-[30px] text-[red]">
+								<span v-if="formData.activity_type == 'exchange'" class="text-[14px]">{{ formData.point }}{{ t('point') }}
+									<span v-if="parseFloat(formData.order_money)">+￥{{ formData.order_money }}</span>
+								</span>
+								<span v-else class="text-[14px]">￥{{ formData.order_money }}</span>
+							</div>
+						</div>
+					</div>
+				</div>
+				<h3 class="mt-[50px] mb-[20px]" v-if="formData.order_log.length > 0">{{ t('operateLog') }}</h3>
+				<div class="mb-[100px]" style="min-height: 100px" v-if="formData.order_log.length > 0">
+					<div class="flex" v-for="(items, index) in formData.order_log" :key="index">
+						<div class="mr-[20px] min-w-[71px]">
+							<div class="leading-[1] w-full text-[14px] w-[100px] flex justify-end">
+								{{ items.create_time && items.create_time.split(' ')[0] }}
+							</div>
+							<div class="leading-[1] w-full text-[14px]  w-[100px] flex justify-end mt-[15px]">
+								{{ items.create_time && items.create_time.split(' ')[1] }}
+							</div>
+						</div>
+						<div>
+							<div class="w-[16px] h-[16px] flex items-center bg-[#D1EBFF] border-[1px] border-[#0091FF] rounded-[999px]">
+								<div class="w-[8px] h-[8px] mx-auto bg-[#0091FF] rounded-[999px]"></div>
+							</div>
+							<div v-if="index + 1 != formData.order_log.length" class="w-[2px] h-[50px] bg-[#D1EBFF] mx-auto">
+							</div>
+						</div>
+						<div>
+							<div class="leading-[1] ml-[20px] text-[14px]">
+								{{ items.main_type_name }}{{ items.main_name }}
+							</div>
+							<div class="leading-[1] ml-[20px] text-[14px] mt-[15px]">
+								<span>{{ items.type_name }}</span>
+								<span class="ml-[10px]">{{items.content}}</span>
+							</div>
+						</div>
+					</div>
+				</div>
+			</el-card>
+			<el-card class="box-card !border-none relative" shadow="never" v-if="!loading && !formData">
+				<el-empty :description="t('orderInfoEmpty')" />
+			</el-card>
+		</el-form>
+		<adjust-money ref="orderAdjustMoneyActionDialog" @complete="setFormData(orderId)" />
+		<delivery-action ref="deliveryActionDialog" @complete="setFormData(orderId)" />
+		<order-notes ref="orderNotesDialog" @complete="setFormData(orderId)" />
+		<delivery-package ref="packageDialog" />
+		<electronic-sheet-print ref="electronicSheetPrintDialog" @complete="loadOrderList" />
+        <order-edit-address ref="orderEditAddressDialog" @complete="loadOrderList"/>
+        <shop-active-refund ref="shopActiveRefundDialog" @complete="setFormData(orderId)" />
+        <form-detail ref="formDetailDialog" />
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { ref, computed, defineAsyncComponent } from 'vue'
+import { ref,computed ,defineAsyncComponent} from 'vue'
 import { t } from '@/lang'
 import { getOrderDetail, orderClose, orderFinish } from '@/addon/shop/api/order'
-import { getFormRecordsInfo, getDiyFormFieldsList } from '@/app/api/diy_form'
+import { getFormRecordsInfo,getDiyFormFieldsList} from '@/app/api/diy_form'
 import { printTicket } from '@/app/api/printer'
 import DeliveryAction from '@/addon/shop/views/order/components/delivery-action.vue'
 import OrderNotes from '@/addon/shop/views/order/components/order-notes.vue'
@@ -486,84 +263,79 @@ const orderId: number = parseInt(route.query.order_id as string)
 const loading = ref(true)
 
 const formData: Record<string, any> | null = ref(null)
-const tableData = ref([])
+const tableData = ref([]);
 const modules: any = import.meta.glob('@/**/*.vue')
 const formDetailDialog: any = ref(null)
 const formDetailEvent = (data: any) => {
-  formDetailDialog.value.show(data)
+    formDetailDialog.value.show(data)
 }
 
 const setFormData = async (orderId: number = 0) => {
-  loading.value = true
-  formData.value = null
+    loading.value = true;
+    formData.value = null;
 
-  try {
-    // 获取订单详情
-    const { data } = await getOrderDetail(orderId)
-    formData.value = data
+    try {
+        // 获取订单详情
+        const { data } = await getOrderDetail(orderId);
+        formData.value = data;
 
-    let refundOrderNum = 0
-    formData.value.form_details = null // 订单表单详情
-    formData.value.order_goods.forEach((orderItem: any) => {
-      if (orderItem.is_enable_refund == 1) {
-        refundOrderNum++
-      }
-      orderItem.form_details = null // 每个商品的表单详情
-    })
-    formData.value.is_refund_show = refundOrderNum > 0
+        let refundOrderNum = 0;
+        formData.value.form_details = null; // 订单表单详情
+        formData.value.order_goods.forEach((orderItem:any) => {
+            if (orderItem.is_enable_refund == 1) {
+                refundOrderNum++;
+            }
+            orderItem.form_details = null; // 每个商品的表单详情
+        });
+        formData.value.is_refund_show = refundOrderNum > 0;
 
-    // 获取订单的表单详情
-    if (formData.value.form_record_id) {
-      try {
-        const orderFormResponse = await getFormRecordsInfo(
-          formData.value.form_record_id
-        )
-        formData.value.form_details = orderFormResponse.data
-        if (
-          formData.value.form_details &&
-          formData.value.form_details.recordsFieldList
-        ) {
-          const recordsFieldList = formData.value.form_details.recordsFieldList
-          for (const key in recordsFieldList) {
-            if (modules[recordsFieldList[key].detailComponent]) {
-              recordsFieldList[key].detailComponent = defineAsyncComponent(
-                modules[recordsFieldList[key].detailComponent]
-              )
-            } else {
-              delete recordsFieldList[key]
+        // 获取订单的表单详情
+        if (formData.value.form_record_id) {
+            try {
+                const orderFormResponse = await getFormRecordsInfo(formData.value.form_record_id);
+                formData.value.form_details = orderFormResponse.data;
+                if (formData.value.form_details && formData.value.form_details.recordsFieldList) {
+                    const recordsFieldList = formData.value.form_details.recordsFieldList;
+                    for (const key in recordsFieldList) {
+                        if (modules[recordsFieldList[key].detailComponent]) {
+                            recordsFieldList[key].detailComponent = defineAsyncComponent(modules[recordsFieldList[key].detailComponent]);
+                        } else {
+                            delete recordsFieldList[key];
+                        }
+                    }
+                    tableData.value = [formData.value.form_details];                
+                } else {
+                }
+            } catch (error) {
             }
-          }
-          tableData.value = [formData.value.form_details]
-        } else {
         }
-      } catch (error) {}
+    } catch (error) {
+    } finally {
+        loading.value = false;
     }
-  } catch (error) {
-  } finally {
-    loading.value = false
-  }
-}
+};
 
 if (orderId) setFormData(orderId)
 else loading.value = false
 
 const close = () => {
-  ElMessageBox.confirm(t('orderCloseTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    orderClose(orderId).then(() => {
-      setFormData(orderId)
+    ElMessageBox.confirm(t('orderCloseTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }).then(() => {
+        orderClose(orderId).then(() => {
+            setFormData(orderId)
+        })
     })
-  })
 }
 
 // 订单调整价格
 const orderAdjustMoneyActionDialog: Record<string, any> | null = ref(null)
 const orderAdjustMoney = () => {
-  orderAdjustMoneyActionDialog.value.setFormData(formData.value)
-  orderAdjustMoneyActionDialog.value.showDialog = true
+    orderAdjustMoneyActionDialog.value.setFormData(formData.value)
+    orderAdjustMoneyActionDialog.value.showDialog = true
 }
 
 const deliveryActionDialog: Record<string, any> | null = ref(null)
@@ -571,8 +343,8 @@ const deliveryActionDialog: Record<string, any> | null = ref(null)
  * 发货
  */
 const delivery = () => {
-  deliveryActionDialog.value.setFormData(formData.value)
-  deliveryActionDialog.value.showDialog = true
+    deliveryActionDialog.value.setFormData(formData.value)
+    deliveryActionDialog.value.showDialog = true
 }
 
 const orderNotesDialog: Record<string, any> | null = ref(null)
@@ -580,20 +352,21 @@ const orderNotesDialog: Record<string, any> | null = ref(null)
  * 设置备注
  */
 const setNotes = () => {
-  orderNotesDialog.value.setFormData(formData.value)
-  orderNotesDialog.value.showDialog = true
+    orderNotesDialog.value.setFormData(formData.value)
+    orderNotesDialog.value.showDialog = true
 }
 // 订单完成
 const finish = () => {
-  ElMessageBox.confirm(t('orderFinishTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    orderFinish(orderId).then(() => {
-      setFormData(orderId)
+    ElMessageBox.confirm(t('orderFinishTips'), t('warning'), {
+        confirmButtonText: t('confirm'),
+        cancelButtonText: t('cancel'),
+        type: 'warning'
+    }
+    ).then(() => {
+        orderFinish(orderId).then(() => {
+            setFormData(orderId)
+        })
     })
-  })
 }
 
 const packageDialog: Record<string, any> | null = ref(null)
@@ -601,21 +374,21 @@ const packageDialog: Record<string, any> | null = ref(null)
  * 发货
  */
 const packageEvent = (id: number, mobile: number) => {
-  packageDialog.value.setFormData(id, mobile)
-  packageDialog.value.showDialog = true
+    packageDialog.value.setFormData(id, mobile)
+    packageDialog.value.showDialog = true
 }
 
 // 打印电子面单
 const electronicSheetPrintDialog: Record<string, any> | null = ref(null)
 
 const openElectronicSheetPrintDialog = () => {
-  let data = {
-    print_type: 'single',
-  }
+    let data = {
+        print_type: 'single'
+    };
 
-  Object.assign(data, cloneDeep(formData.value))
-  electronicSheetPrintDialog.value.setFormData(data)
-  electronicSheetPrintDialog.value.showDialog = true
+    Object.assign(data, cloneDeep(formData.value))
+    electronicSheetPrintDialog.value.setFormData(data)
+    electronicSheetPrintDialog.value.showDialog = true
 }
 
 const repeat = ref(false)
@@ -623,68 +396,67 @@ const repeat = ref(false)
 /**
  * 修改地址
  */
-const orderEditAddressDialog: Record<string, any> | null = ref(null)
-const orderEditAddressFn = async () => {
-  let data = cloneDeep(formData.value)
-  orderEditAddressDialog.value.showDialog = true
-  orderEditAddressDialog.value.setFormData(data)
+const orderEditAddressDialog :Record<string, any> | null = ref(null)
+const orderEditAddressFn = async () =>{
+    let data = cloneDeep(formData.value);
+    orderEditAddressDialog.value.showDialog = true
+    orderEditAddressDialog.value.setFormData(data)
 }
 
 /**
  * 打印小票
  */
 const printTicketEvent = () => {
-  if (!formData.value.order_id) return
+    if (!formData.value.order_id) return;
 
-  if (repeat.value) return
-  repeat.value = true
+    if (repeat.value) return
+    repeat.value = true
 
-  printTicket({
-    type: 'shopGoodsOrder', // 小票模板类型
-    trigger: 'manual', // 触发时机：手动触发
-    // 业务参数，根据自身业务传值
-    business: {
-      order_id: formData.value.order_id,
-    },
-  })
-    .then((res: any) => {
-      repeat.value = false
-    })
-    .catch(() => {
-      repeat.value = false
+    printTicket({
+        type: 'shopGoodsOrder', // 小票模板类型
+        trigger: 'manual', // 触发时机：手动触发
+        // 业务参数，根据自身业务传值
+        business: {
+            order_id: formData.value.order_id
+        }
+    }).then((res: any) => {
+        repeat.value = false
+    }).catch(() => {
+        repeat.value = false
     })
 }
 
+
 /**
  * 商家主动退款
  */
 const shopActiveRefundDialog: Record<string, any> | null = ref(null)
 const refundEvent = () => {
-  shopActiveRefundDialog.value.setFormData(formData.value)
-  shopActiveRefundDialog.value.showDialog = true
+    shopActiveRefundDialog.value.setFormData(formData.value)
+    shopActiveRefundDialog.value.showDialog = true
 }
 
 const memberEvent = (id: number) => {
-  const routeUrl = router.resolve({
-    path: '/member/detail',
-    query: { id },
-  })
-  window.open(routeUrl.href, '_blank')
+    const routeUrl = router.resolve({
+        path: '/member/detail',
+        query: { id }
+    })
+    window.open(routeUrl.href, '_blank')
 }
 </script>
 
 <style lang="scss" scoped>
 /* 多行超出隐藏 */
 .multi-hidden {
-  word-break: break-all;
-  text-overflow: ellipsis;
-  overflow: hidden;
-  display: -webkit-box;
-  -webkit-line-clamp: 2;
-  -webkit-box-orient: vertical;
+	word-break: break-all;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	display: -webkit-box;
+	-webkit-line-clamp: 2;
+	-webkit-box-orient: vertical;
 }
 
 .line-feed {
-  word-wrap: break-word;
+	word-wrap: break-word;
 }
 </style>
diff --git a/admin/src/addon/shop/views/order/invoice.vue b/admin/src/addon/shop/views/order/invoice.vue
index 18555c4b..539d8d87 100644
--- a/admin/src/addon/shop/views/order/invoice.vue
+++ b/admin/src/addon/shop/views/order/invoice.vue
@@ -1,158 +1,84 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="invoiceManagementTableData.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('headerName')" prop="header_name">
-            <el-input
-              v-model.trim="invoiceManagementTableData.searchParam.header_name"
-              :placeholder="t('headerNamePlaceholder')"
-              clearable
-            />
-          </el-form-item>
-          <el-form-item :label="t('createTime')" prop="create_time">
-            <el-date-picker
-              v-model="invoiceManagementTableData.searchParam.create_time"
-              type="datetimerange"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              :start-placeholder="t('startDate')"
-              :end-placeholder="t('endDate')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('invoiceTime')" prop="invoice_time">
-            <el-date-picker
-              v-model="invoiceManagementTableData.searchParam.invoice_time"
-              type="datetimerange"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              :start-placeholder="t('startDate')"
-              :end-placeholder="t('endDate')"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="loadInvoiceList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-            <el-button type="primary" @click="exportEvent">{{
-              t('export')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
-      <el-tabs v-model="activeName" class="demo-tabs" @tab-change="handleClick">
-        <el-tab-pane :label="t('all')" name=""></el-tab-pane>
-        <el-tab-pane :label="t('已开票')" name="1"></el-tab-pane>
-        <el-tab-pane :label="t('未开票')" name="0"></el-tab-pane>
-      </el-tabs>
-      <!-- 表格数据 -->
-      <div>
-        <el-table
-          :data="invoiceManagementTableData.data"
-          size="large"
-          v-loading="invoiceManagementTableData.loading"
-        >
-          <template #empty>
-            <span>{{
-              !invoiceManagementTableData.loading ? t('emptyData') : ''
-            }}</span>
-          </template>
-          <el-table-column
-            prop="header_name"
-            :label="t('headerName')"
-            min-width="100"
-          />
-          <el-table-column
-            prop="header_type_name"
-            :label="t('headerTypeName')"
-            min-width="120"
-          />
-          <el-table-column
-            prop="tax_number"
-            :label="t('taxNumber')"
-            min-width="180"
-          />
-          <el-table-column prop="name" :label="t('name')" min-width="120" />
-          <el-table-column
-            prop="money"
-            :label="t('money')"
-            min-width="120"
-            align="right"
-          />
-          <el-table-column :label="t('createTime')" min-width="180">
-            <template #default="{ row }">
-              {{ row.create_time || '' }}
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('invoiceTime')" min-width="180">
-            <template #default="{ row }">
-              {{ row.invoice_time || '' }}
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('isInvoice')" min-width="120">
-            <template #default="{ row }">
-              {{ row.is_invoice === 1 ? t('hasInvoice') : t('noInvoice') }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            :label="t('operation')"
-            fixed="right"
-            align="center"
-            width="130"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="detailEvent(row)">{{
-                t('detail')
-              }}</el-button>
-              <el-button
-                type="primary"
-                link
-                @click="invoiceEvent(row)"
-                v-if="row.is_invoice === 0"
-                >{{ t('invoice') }}</el-button
-              >
-              <el-button type="primary" link @click="checkOrder(row)">{{
-                t('viewOrder')
-              }}</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="invoiceManagementTableData.page"
-            v-model:page-size="invoiceManagementTableData.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="invoiceManagementTableData.total"
-            @size-change="loadInvoiceList()"
-            @current-change="loadInvoiceList"
-          />
-        </div>
-        <invoice-detail
-          ref="invoiceDetailDialog"
-          @complete="loadInvoiceList()"
-        />
-        <invoice-dialog ref="invoiceListDialog" @complete="loadInvoiceList()" />
-        <export-sure
-          ref="exportSureDialog"
-          :show="flag"
-          type="shop_invoice"
-          :searchParam="invoiceManagementTableData.searchParam"
-          @close="handleClose"
-        />
-      </div>
-    </el-card>
-  </div>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+            </div>
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="invoiceManagementTableData.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('headerName')" prop="header_name">
+                        <el-input v-model.trim="invoiceManagementTableData.searchParam.header_name" :placeholder="t('headerNamePlaceholder')" clearable />
+                    </el-form-item>
+                    <el-form-item :label="t('createTime')" prop="create_time">
+                        <el-date-picker v-model="invoiceManagementTableData.searchParam.create_time" type="datetimerange"
+                            value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')"
+                            :end-placeholder="t('endDate')" />
+                    </el-form-item>
+                    <el-form-item :label="t('invoiceTime')" prop="invoice_time">
+                        <el-date-picker v-model="invoiceManagementTableData.searchParam.invoice_time" type="datetimerange"
+                            value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')"
+                            :end-placeholder="t('endDate')" />
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="loadInvoiceList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                        <el-button type="primary" @click="exportEvent">{{ t('export') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+            <el-tabs v-model="activeName" class="demo-tabs" @tab-change="handleClick">
+                <el-tab-pane :label="t('all')" name=""></el-tab-pane>
+                <el-tab-pane :label="t('已开票')" name="1"></el-tab-pane>
+                <el-tab-pane :label="t('未开票')" name="0"></el-tab-pane>
+            </el-tabs>
+            <!-- 表格数据 -->
+            <div>
+                <el-table :data="invoiceManagementTableData.data" size="large" v-loading="invoiceManagementTableData.loading">
+                    <template #empty>
+                        <span>{{ !invoiceManagementTableData.loading ? t('emptyData') : '' }}</span>
+                    </template>
+                    <el-table-column prop="header_name" :label="t('headerName')" min-width="100"  />
+                    <el-table-column prop="header_type_name" :label="t('headerTypeName')" min-width="120" />
+                    <el-table-column prop="tax_number" :label="t('taxNumber')" min-width="180" />
+                    <el-table-column prop="name" :label="t('name')" min-width="120" />
+                    <el-table-column prop="money" :label="t('money')" min-width="120" align="right" />
+                    <el-table-column :label="t('createTime')" min-width="180">
+                        <template #default="{ row }">
+                            {{ row.create_time || '' }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('invoiceTime')" min-width="180">
+                        <template #default="{ row }">
+                            {{ row.invoice_time || '' }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('isInvoice')" min-width="120">
+                        <template #default="{ row }">
+                            {{ row.is_invoice === 1 ? t('hasInvoice') : t('noInvoice') }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('operation')" fixed="right" align="center" width="130">
+                        <template #default="{ row }">
+                            <el-button type="primary" link @click="detailEvent(row)">{{ t('detail') }}</el-button>
+                            <el-button type="primary" link @click="invoiceEvent(row)" v-if="row.is_invoice === 0">{{ t('invoice') }}</el-button>
+                            <el-button type="primary" link @click="checkOrder(row)">{{ t('viewOrder') }}</el-button>
+                        </template>
+                    </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="invoiceManagementTableData.page"
+                        v-model:page-size="invoiceManagementTableData.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="invoiceManagementTableData.total"
+                        @size-change="loadInvoiceList()" @current-change="loadInvoiceList" />
+                </div>
+                <invoice-detail ref="invoiceDetailDialog" @complete="loadInvoiceList()" />
+                <invoice-dialog ref="invoiceListDialog" @complete="loadInvoiceList()" />
+                <export-sure ref="exportSureDialog" :show="flag" type="shop_invoice" :searchParam="invoiceManagementTableData.searchParam" @close="handleClose" />
+            </div>
+        </el-card>
+
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -163,69 +89,61 @@ import { FormInstance } from 'element-plus'
 import InvoiceDetail from '@/addon/shop/views/order/components/invoice-detail.vue'
 import InvoiceDialog from '@/addon/shop/views/order/components/invoice-dialog.vue'
 import { useRouter, useRoute } from 'vue-router'
-import { setTablePageStorage, getTablePageStorage } from '@/utils/common'
+import { setTablePageStorage,getTablePageStorage } from "@/utils/common";
 
 const route = useRoute()
 const router = useRouter()
 const pageName = route.meta.title
 
 const invoiceManagementTableData = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    is_invoice: '',
-    create_time: '',
-    invoice_time: '',
-    header_name: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        is_invoice: '',
+        create_time: '',
+        invoice_time: '',
+        header_name: ''
+    }
 })
 
 const searchFormRef = ref<FormInstance>()
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
+    if (!formEl) return
 
-  formEl.resetFields()
-  loadInvoiceList()
+    formEl.resetFields()
+    loadInvoiceList()
 }
 
 const activeName = ref('')
 
 const handleClick = (event: any) => {
-  invoiceManagementTableData.searchParam.is_invoice = event
-  loadInvoiceList()
+    invoiceManagementTableData.searchParam.is_invoice = event
+    loadInvoiceList()
 }
 /**
  * 获取发票列表数据
  */
 const loadInvoiceList = (page: number = 1) => {
-  invoiceManagementTableData.loading = true
-  invoiceManagementTableData.page = page
-  getInvoiceList({
-    page: invoiceManagementTableData.page,
-    limit: invoiceManagementTableData.limit,
-    ...invoiceManagementTableData.searchParam,
-  })
-    .then((res) => {
-      invoiceManagementTableData.loading = false
-      invoiceManagementTableData.data = res.data.data
-      invoiceManagementTableData.total = res.data.total
-      setTablePageStorage(
-        invoiceManagementTableData.page,
-        invoiceManagementTableData.limit,
-        invoiceManagementTableData.searchParam
-      )
-    })
-    .catch(() => {
-      invoiceManagementTableData.loading = false
+    invoiceManagementTableData.loading = true
+    invoiceManagementTableData.page = page
+    getInvoiceList({
+        page: invoiceManagementTableData.page,
+        limit: invoiceManagementTableData.limit,
+        ...invoiceManagementTableData.searchParam
+    }).then(res => {
+        invoiceManagementTableData.loading = false
+        invoiceManagementTableData.data = res.data.data
+        invoiceManagementTableData.total = res.data.total
+        setTablePageStorage(invoiceManagementTableData.page, invoiceManagementTableData.limit, invoiceManagementTableData.searchParam);
+    }).catch(() => {
+        invoiceManagementTableData.loading = false
     })
 }
 
-loadInvoiceList(
-  getTablePageStorage(invoiceManagementTableData.searchParam).page
-)
+loadInvoiceList(getTablePageStorage(invoiceManagementTableData.searchParam).page);
 
 const invoiceDetailDialog: Record<string, any> | null = ref(null)
 /**
@@ -233,8 +151,8 @@ const invoiceDetailDialog: Record<string, any> | null = ref(null)
  * @param data
  */
 const detailEvent = (data: any) => {
-  invoiceDetailDialog.value.setFormData(data)
-  invoiceDetailDialog.value.showDialog = true
+    invoiceDetailDialog.value.setFormData(data)
+    invoiceDetailDialog.value.showDialog = true
 }
 /**
  * 开具发票
@@ -242,19 +160,19 @@ const detailEvent = (data: any) => {
  */
 const invoiceListDialog: Record<string, any> | null = ref(null)
 const invoiceEvent = (data: any) => {
-  invoiceListDialog.value.setInvoiceData(data)
-  invoiceListDialog.value.invoiceDialog = true
+    invoiceListDialog.value.setInvoiceData(data)
+    invoiceListDialog.value.invoiceDialog = true
 }
 
 // 订单详情
 const checkOrder = (data: any) => {
-  if (data.trade_type === 'shop') {
-    const routeUrl = router.resolve({
-      path: '/shop/order/detail',
-      query: { order_id: data.trade_id },
-    })
-    window.open(routeUrl.href, '_blank')
-  }
+    if (data.trade_type === 'shop') {
+        const routeUrl = router.resolve({
+            path: '/shop/order/detail',
+            query: { order_id: data.trade_id }
+        })
+        window.open(routeUrl.href, '_blank')
+    }
 }
 
 /**
@@ -263,11 +181,12 @@ const checkOrder = (data: any) => {
 const exportSureDialog = ref(null)
 const flag = ref(false)
 const handleClose = (val) => {
-  flag.value = val
+    flag.value = val
 }
 const exportEvent = (data: any) => {
-  flag.value = true
+    flag.value = true
 }
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/addon/shop/views/order/list.vue b/admin/src/addon/shop/views/order/list.vue
index 95906707..111158e9 100644
--- a/admin/src/addon/shop/views/order/list.vue
+++ b/admin/src/addon/shop/views/order/list.vue
@@ -1,436 +1,208 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
-
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="orderTable.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('orderInfo')" prop="search_name">
-            <el-select
-              v-model="orderTable.searchParam.search_type"
-              clearable
-              class="input-item"
-            >
-              <el-option :label="t('orderNo')" value="order_no"></el-option>
-              <el-option
-                :label="t('outTradeNo')"
-                value="out_trade_no"
-              ></el-option>
-            </el-select>
-            <el-input
-              class="input-item ml-3"
-              v-model.trim="orderTable.searchParam.search_name"
-            />
-          </el-form-item>
-          <el-form-item :label="t('memberInfo')" prop="keyword">
-            <el-input
-              class="w-[200px]"
-              v-model.trim="orderTable.searchParam.keyword"
-              :placeholder="t('memberInfoPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('payType')" prop="pay_type">
-            <el-select
-              v-model="orderTable.searchParam.pay_type"
-              clearable
-              class="input-item"
-            >
-              <el-option
-                v-for="(item, index) in payTypeData"
-                :key="index"
-                :label="item.name"
-                :value="item.key"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="t('fromType')" prop="order_from">
-            <el-select
-              v-model="orderTable.searchParam.order_from"
-              clearable
-              class="input-item"
-            >
-              <el-option
-                v-for="(item, index) in orderFromData"
-                :key="index"
-                :label="item"
-                :value="index"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="t('createTime')" prop="create_time">
-            <el-date-picker
-              v-model="orderTable.searchParam.create_time"
-              type="datetimerange"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              :start-placeholder="t('startDate')"
-              :end-placeholder="t('endDate')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('payTime')" prop="pay_time">
-            <el-date-picker
-              v-model="orderTable.searchParam.pay_time"
-              type="datetimerange"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              :start-placeholder="t('startDate')"
-              :end-placeholder="t('endDate')"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="loadOrderList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-            <el-button type="primary" @click="exportSelectEvent">{{
-              t('export')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
-      <el-tabs v-model="activeName" class="demo-tabs" @tab-change="handleClick">
-        <el-tab-pane :label="t('all')" name=""></el-tab-pane>
-        <el-tab-pane :label="t('toBePaid')" name="1"></el-tab-pane>
-        <el-tab-pane :label="t('toBeShipped')" name="2"></el-tab-pane>
-        <el-tab-pane :label="t('shipped')" name="3"></el-tab-pane>
-        <el-tab-pane :label="t('completed')" name="5"></el-tab-pane>
-        <el-tab-pane :label="t('closed')" name="-1"></el-tab-pane>
-      </el-tabs>
-      <div>
-        <!-- todo 后续完善，增加批量发货，再修改判断逻辑 -->
-        <div class="mb-[10px] flex items-center" v-if="activeName == 3">
-          <el-button
-            @click="batchPrintElectronicSheet"
-            size="small"
-            v-if="activeName == 3"
-            >{{ t('batchPrintElectronicSheet') }}</el-button
-          >
-        </div>
-        <el-table
-          :data="orderTable.data"
-          size="large"
-          class="table-top"
-          @select-all="selectAllCheck"
-        >
-          <el-table-column type="selection" width="40" />
-          <el-table-column :label="t('orderGoods')" min-width="200" />
-          <el-table-column :label="t('goodsPriceNumber')" min-width="120" />
-          <el-table-column :label="t('rightsProtection')" min-width="120" />
-          <el-table-column :label="t('orderMoney')" min-width="120" />
-          <el-table-column :label="t('buyInfo')" min-width="120" />
-          <el-table-column :label="t('deliveryType')" min-width="100" />
-          <el-table-column :label="t('orderStatus')" min-width="100" />
-          <el-table-column
-            :label="t('operation')"
-            fixed="right"
-            align="right"
-            min-width="120"
-          />
-        </el-table>
-        <div class="table-body min-h-[150px]" v-loading="orderTable.loading">
-          <div v-if="!orderTable.loading">
-            <template v-if="orderTable.data.length">
-              <div v-for="(item, index) in orderTable.data" :key="index">
-                <div
-                  class="flex items-center justify-between bg-[#f7f8fa] mt-[10px] border-[#e4e7ed] border-solid border-b-[1px] px-3 h-[35px] text-[12px] text-[#666]"
-                >
-                  <div>
-                    <span
-                      >{{ t('orderNo') }}：{{ (item as any).order_no }}</span
-                    >
-                    <span class="ml-5"
-                      >{{ t('createTime') }}：{{
-                        (item as any).create_time
-                      }}</span
-                    >
-                    <!-- <span class="ml-5">{{ t('orderFrom') }}：{{ (item as any).order_form_name }}</span> -->
-                    <span class="ml-5" v-if="item.pay"
-                      >{{ t('payType') }}：{{
-                        (item as any).pay.type_name
-                      }}</span
-                    >
-                  </div>
-                  <div>
-                    <!-- <el-button type="primary" link>{{ t('offlinePayment') }}</el-button> -->
-                    <el-button
-                      type="primary"
-                      link
-                      @click="printTicketEvent(item)"
-                      v-if="item.isSupportPrintTicket"
-                      >{{ t('printTicket') }}</el-button
-                    >
-                    <el-button
-                      type="primary"
-                      link
-                      @click="openElectronicSheetPrintDialog(item)"
-                      v-if="item.isSupportElectronicSheet"
-                      >{{ t('electronicSheetPrintTitle') }}</el-button
-                    >
-                    <el-button type="primary" link @click="detailEvent(item)">{{
-                      t('info')
-                    }}</el-button>
-                    <el-button type="primary" link @click="setNotes(item)">{{
-                      t('notes')
-                    }}</el-button>
-                  </div>
-                </div>
-
-                <el-table
-                  :data="item.order_goods"
-                  size="large"
-                  :show-header="false"
-                  :span-method="arraySpanMethod"
-                  ref="multipleTable"
-                  @select="handleSelectChange"
-                >
-                  <el-table-column type="selection" width="40" />
-                  <el-table-column align="left" min-width="200">
-                    <template #default="{ row }">
-                      <div class="flex cursor-pointer">
-                        <div class="flex items-center min-w-[50px] mr-[10px]">
-                          <img
-                            class="w-[50px] h-[50px]"
-                            v-if="row.goods_image"
-                            :src="img(row.goods_image)"
-                            alt=""
-                          />
-                          <img class="w-[50px] h-[50px]" v-else src="" alt="" />
-                        </div>
-                        <div class="flex flex-col items-start">
-                          <el-tooltip
-                            class="box-item"
-                            effect="light"
-                            placement="top"
-                          >
-                            <template #content>
-                              <div class="max-w-[250px]">
-                                {{ row.goods_name }}
-                              </div>
-                            </template>
-                            <p class="multi-hidden text-[14px]">
-                              {{ row.goods_name }}
-                            </p>
-                          </el-tooltip>
-                          <span class="text-[12px] text-[#999] truncate">{{
-                            row.sku_name
-                          }}</span>
-                          <span
-                            class="px-[4px] text-[12px] text-[#fff] rounded-[4px] bg-primary leading-[18px]"
-                            v-if="row.is_gift == 1"
-                            >赠品</span
-                          >
-                        </div>
-                      </div>
-                    </template>
-                  </el-table-column>
-                  <el-table-column min-width="120">
-                    <template #default="{ row }">
-                      <div class="flex flex-col">
-                        <span v-if="item.activity_type == 'exchange'"
-                          >{{ row.extend.point }}{{ t('point') }}
-                          <span v-if="parseFloat(row.price)"
-                            >+￥{{ row.price }}</span
-                          >
-                        </span>
-                        <span v-else class="text-[13px]"
-                          >￥{{ row.price }}</span
-                        >
-                        <span class="text-[13px] mt-[5px]"
-                          >{{ row.num }}{{ t('piece') }}</span
-                        >
-                      </div>
-                    </template>
-                  </el-table-column>
-                  <el-table-column min-width="120">
-                    <template #default="{ row }">
-                      <div class="flex flex-col cursor-pointer">
-                        <span>{{ row.status_name }}</span>
-                      </div>
-                    </template>
-                  </el-table-column>
-                  <el-table-column
-                    min-width="120"
-                    class-name="border-0 border-l-[1px] border-solid border-[var(--el-table-border-color)]"
-                  >
-                    <template #default>
-                      <div
-                        v-if="item.activity_type == 'exchange'"
-                        class="text-[14px]"
-                      >
-                        {{ item.point }}{{ t('point') }}
-                        <span v-if="parseFloat(item.order_money)"
-                          >+￥{{ item.order_money }}</span
-                        >
-                      </div>
-                      <span v-else class="text-[14px]"
-                        >￥{{ item.order_money }}</span
-                      >
-                      <div v-if="item.pay">
-                        {{
-                          item.member_id !== item.pay.main_id &&
-                          item.pay.status == 2
-                            ? item.pay.pay_type_name
-                            : ''
-                        }}
-                      </div>
-                    </template>
-                  </el-table-column>
-                  <el-table-column min-width="120">
-                    <template #default>
-                      <div class="flex flex-col">
-                        <span
-                          class="text-[12px] text-primary cursor-pointer"
-                          @click="memberEvent(item.member.member_id)"
-                          >{{ item.member.nickname }}</span
-                        >
-                        <span class="text-[12px] mt-[5px]"
-                          >{{ item.taker_name }} {{ item.taker_mobile }}</span
-                        >
-                        <span class="text-[12px] mt-[5px]">{{
-                          item.taker_full_address
-                        }}</span>
-                      </div>
-                    </template>
-                  </el-table-column>
-                  <el-table-column min-width="100">
-                    <template #default>
-                      <span class="text-[14px]">{{
-                        item.delivery_type_name
-                      }}</span>
-                    </template>
-                  </el-table-column>
-                  <el-table-column min-width="100">
-                    <template #default>
-                      <span class="text-[14px]">{{
-                        item.status_name.name
-                      }}</span>
-                    </template>
-                  </el-table-column>
-                  <el-table-column align="right" min-width="120">
-                    <template #default>
-                      <template v-if="item.status == 1">
-                        <el-button type="primary" link @click="close(item)">{{
-                          t('orderClose')
-                        }}</el-button>
-                        <el-button
-                          type="primary"
-                          link
-                          @click="orderAdjustMoney(item)"
-                          >{{ t('editPrice') }}</el-button
-                        >
-                        <el-button
-                          type="primary"
-                          v-if="
-                            item.delivery_type != 'virtual' &&
-                            item.activity_type != 'giftcard'
-                          "
-                          link
-                          @click="orderEditAddressFn(item)"
-                          >{{ t('editAddress') }}</el-button
-                        >
-                      </template>
-                      <el-button
-                        type="primary"
-                        link
-                        @click="delivery(item)"
-                        v-if="item.status == 2"
-                        >{{ t('sendOutGoods') }}</el-button
-                      >
-                      <el-button
-                        type="primary"
-                        link
-                        @click="finish(item)"
-                        v-if="item.status == 3"
-                        >{{ t('confirmTakeDelivery') }}</el-button
-                      >
-                      <el-button
-                        type="primary"
-                        v-if="
-                          item.is_refund_show &&
-                          item.status != 1 &&
-                          item.status != -1
-                        "
-                        link
-                        @click="refundEvent(item)"
-                        >{{ t('voluntaryRefund') }}</el-button
-                      >
-                    </template>
-                  </el-table-column>
-                </el-table>
-                <div
-                  v-if="item.shop_remark"
-                  class="text-[14px] min-h-[30px] leading-[30px] px-3 bg-[#fff0e5] text-[#ff7f5b]"
-                >
-                  <span class="mr-[5px]">{{ t('notes') }}：</span>
-                  <span>{{ item.shop_remark }}</span>
-                </div>
-              </div>
-            </template>
-            <el-empty v-else :image-size="1" :description="t('emptyData')" />
-          </div>
-        </div>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="orderTable.page"
-            v-model:page-size="orderTable.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="orderTable.total"
-            @size-change="loadOrderList()"
-            @current-change="loadOrderList"
-          />
-        </div>
-      </div>
-    </el-card>
-
-    <adjust-money
-      ref="orderAdjustMoneyActionDialog"
-      @complete="loadOrderList"
-    />
-    <delivery-action ref="deliveryActionDialog" @complete="loadOrderList" />
-    <order-notes ref="orderNotesDialog" @complete="loadOrderList" />
-    <order-export-select ref="selectExportDialog" @complete="exportEvent" />
-    <export-sure
-      ref="exportSureDialog"
-      :show="flag"
-      :type="export_type"
-      :searchParam="orderTable.searchParam"
-      @close="handleClose"
-    />
-    <order-edit-address
-      ref="orderEditAddressDialog"
-      @complete="loadOrderList"
-    />
-    <electronic-sheet-print
-      ref="electronicSheetPrintDialog"
-      @complete="electronicSheetPrintComplete"
-    />
-    <shop-active-refund
-      ref="shopActiveRefundDialog"
-      @complete="loadOrderList"
-    />
-  </div>
+	<div class="main-container">
+		<el-card class="box-card !border-none" shadow="never">
+
+			<div class="flex justify-between items-center">
+				<span class="text-page-title">{{ pageName }}</span>
+			</div>
+
+			<el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+				<el-form :inline="true" :model="orderTable.searchParam" ref="searchFormRef">
+
+					<el-form-item :label="t('orderInfo')" prop='search_name'>
+						<el-select v-model="orderTable.searchParam.search_type" clearable class="input-item">
+							<el-option :label="t('orderNo')" value="order_no"></el-option>
+							<el-option :label="t('outTradeNo')" value="out_trade_no"></el-option>
+						</el-select>
+						<el-input class="input-item ml-3" v-model.trim="orderTable.searchParam.search_name" />
+					</el-form-item>
+					<el-form-item :label="t('memberInfo')" prop='keyword'>
+						<el-input class="w-[200px]" v-model.trim="orderTable.searchParam.keyword"  :placeholder="t('memberInfoPlaceholder')"/>
+					</el-form-item>
+					<el-form-item :label="t('payType')" prop='pay_type'>
+						<el-select v-model="orderTable.searchParam.pay_type" clearable class="input-item">
+							<el-option v-for="(item, index) in payTypeData" :key="index" :label="item.name" :value="item.key"></el-option>
+						</el-select>
+					</el-form-item>
+					<el-form-item :label="t('fromType')" prop='order_from'>
+						<el-select v-model="orderTable.searchParam.order_from" clearable class="input-item">
+							<el-option v-for="(item, index) in orderFromData" :key="index" :label="item" :value="index"></el-option>
+						</el-select>
+					</el-form-item>
+					<el-form-item :label="t('createTime')" prop="create_time">
+						<el-date-picker v-model="orderTable.searchParam.create_time" type="datetimerange"
+							value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')"
+							:end-placeholder="t('endDate')" />
+					</el-form-item>
+					<el-form-item :label="t('payTime')" prop="pay_time">
+						<el-date-picker v-model="orderTable.searchParam.pay_time" type="datetimerange"
+							value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')"
+							:end-placeholder="t('endDate')" />
+					</el-form-item>
+					<el-form-item>
+						<el-button type="primary" @click="loadOrderList()">{{ t('search') }}</el-button>
+						<el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+						<el-button type="primary" @click="exportSelectEvent">{{ t('export') }}</el-button>
+					</el-form-item>
+				</el-form>
+			</el-card>
+			<el-tabs v-model="activeName" class="demo-tabs" @tab-change="handleClick">
+				<el-tab-pane :label="t('all')" name=""></el-tab-pane>
+				<el-tab-pane :label="t('toBePaid')" name="1"></el-tab-pane>
+				<el-tab-pane :label="t('toBeShipped')" name="2"></el-tab-pane>
+				<el-tab-pane :label="t('shipped')" name="3"></el-tab-pane>
+				<el-tab-pane :label="t('completed')" name="5"></el-tab-pane>
+				<el-tab-pane :label="t('closed')" name="-1"></el-tab-pane>
+			</el-tabs>
+			<div>
+				<!-- todo 后续完善，增加批量发货，再修改判断逻辑 -->
+				<div class="mb-[10px] flex items-center" v-if="activeName == 3">
+					<el-button @click="batchPrintElectronicSheet" size="small" v-if="activeName == 3">{{ t('batchPrintElectronicSheet') }}</el-button>
+				</div>
+				<el-table :data="orderTable.data" size="large" class="table-top" @select-all="selectAllCheck" >
+					<el-table-column type="selection" width="40" />
+					<el-table-column :label="t('orderGoods')" min-width="200" />
+					<el-table-column :label="t('goodsPriceNumber')" min-width="120" />
+					<el-table-column :label="t('rightsProtection')" min-width="120" />
+					<el-table-column :label="t('orderMoney')" min-width="120" />
+					<el-table-column :label="t('buyInfo')" min-width="120" />
+					<el-table-column :label="t('deliveryType')" min-width="100" />
+					<el-table-column :label="t('orderStatus')" min-width="100" />
+					<el-table-column :label="t('operation')" fixed="right" align="right" min-width="120" />
+				</el-table>
+				<div class="table-body min-h-[150px]" v-loading="orderTable.loading">
+					<div v-if="!orderTable.loading">
+						<template v-if="orderTable.data.length">
+							<div v-for="(item, index) in orderTable.data" :key="index">
+								<div class="flex items-center justify-between bg-[#f7f8fa] mt-[10px] border-[#e4e7ed] border-solid border-b-[1px] px-3 h-[35px] text-[12px] text-[#666]">
+									<div>
+										<span>{{ t('orderNo') }}：{{ (item as any).order_no }}</span>
+										<span class="ml-5">{{ t('createTime') }}：{{ (item as any).create_time }}</span>
+										<!-- <span class="ml-5">{{ t('orderFrom') }}：{{ (item as any).order_form_name }}</span> -->
+										<span class="ml-5" v-if="item.pay">{{ t('payType') }}：{{ (item as any).pay.type_name }}</span>
+									</div>
+									<div>
+										<!-- <el-button type="primary" link>{{ t('offlinePayment') }}</el-button> -->
+										<el-button type="primary" link @click="printTicketEvent(item)" v-if="item.isSupportPrintTicket">{{ t('printTicket') }}</el-button>
+										<el-button type="primary" link @click="openElectronicSheetPrintDialog(item)" v-if="item.isSupportElectronicSheet">{{ t('electronicSheetPrintTitle') }}</el-button>
+										<el-button type="primary" link @click="detailEvent(item)">{{ t('info') }}</el-button>
+										<el-button type="primary" link @click="setNotes(item)">{{ t('notes') }}</el-button>
+									</div>
+								</div>
+
+								<el-table :data="item.order_goods" size="large" :show-header="false" :span-method="arraySpanMethod" ref="multipleTable" @select="handleSelectChange">
+									<el-table-column type="selection" width="40"/>
+									<el-table-column align="left" min-width="200">
+										<template #default="{ row }">
+											<div class="flex cursor-pointer">
+												<div class="flex items-center min-w-[50px] mr-[10px]">
+													<img class="w-[50px] h-[50px]" v-if="row.goods_image" :src="img(row.goods_image)" alt="">
+													<img class="w-[50px] h-[50px]" v-else src="" alt="">
+												</div>
+												<div class="flex flex-col items-start">
+                                                    <el-tooltip class="box-item" effect="light" placement="top">
+                                                        <template #content>
+                                                            <div class="max-w-[250px]">{{row.goods_name}}</div>
+                                                        </template>
+                                                        <p class="multi-hidden text-[14px]">{{ row.goods_name }}</p>
+                                                    </el-tooltip>
+													<span class="text-[12px] text-[#999] truncate">{{ row.sku_name }}</span>
+                                                    <span class="px-[4px]  text-[12px] text-[#fff] rounded-[4px] bg-primary leading-[18px]" v-if="row.is_gift == 1">赠品</span>
+												</div>
+											</div>
+										</template>
+									</el-table-column>
+									<el-table-column min-width="120">
+										<template #default="{ row }">
+											<div class="flex flex-col">
+												<span v-if="item.activity_type == 'exchange'">{{ row.extend.point }}{{ t('point') }}
+													<span v-if="parseFloat(row.price)">+￥{{ row.price }}</span>
+												</span>
+												<span v-else class="text-[13px]">￥{{ row.price }}</span>
+												<span class="text-[13px] mt-[5px]">{{ row.num }}{{ t('piece') }}</span>
+											</div>
+										</template>
+									</el-table-column>
+									<el-table-column min-width="120">
+										<template #default="{ row }">
+											<div class="flex flex-col cursor-pointer">
+                                                <span>{{ row.status_name }}</span>
+											</div>
+										</template>
+									</el-table-column>
+									<el-table-column min-width="120" class-name="border-0 border-l-[1px] border-solid border-[var(--el-table-border-color)]">
+										<template #default>
+											<div v-if="item.activity_type == 'exchange'" class="text-[14px]">{{ item.point }}{{ t('point') }}
+												<span v-if="parseFloat(item.order_money)">+￥{{ item.order_money }}</span>
+											</div>
+											<span v-else class="text-[14px]">￥{{ item.order_money }}</span>
+                                            <div v-if="item.pay">{{item.member_id !== item.pay.main_id && item.pay.status == 2 ? item.pay.pay_type_name:''}}</div>
+										</template>
+									</el-table-column>
+									<el-table-column min-width="120">
+										<template #default>
+											<div class="flex flex-col">
+												<span class="text-[12px] text-primary cursor-pointer" @click="memberEvent(item.member.member_id)">{{ item.member.nickname }}</span>
+												<span class="text-[12px] mt-[5px]">{{ item.taker_name }} {{ item.taker_mobile }}</span>
+												<span class="text-[12px] mt-[5px]">{{ item.taker_full_address }}</span>
+											</div>
+										</template>
+									</el-table-column>
+									<el-table-column min-width="100">
+										<template #default>
+											<span class="text-[14px]">{{ item.delivery_type_name }}</span>
+										</template>
+									</el-table-column>
+									<el-table-column min-width="100">
+										<template #default>
+											<span class="text-[14px]">{{ item.status_name.name }}</span>
+										</template>
+									</el-table-column>
+									<el-table-column align="right" min-width="120">
+										<template #default>
+											<template v-if="item.status == 1">
+												<el-button type="primary" link @click="close(item)">{{ t('orderClose') }}</el-button>
+												<el-button type="primary" link @click="orderAdjustMoney(item)">{{ t('editPrice') }}</el-button>
+												<el-button type="primary" v-if="item.delivery_type != 'virtual' && item.activity_type != 'giftcard'" link @click="orderEditAddressFn(item)">{{ t('editAddress') }}</el-button>
+											</template>
+											<el-button type="primary" link @click="delivery(item)" v-if="item.status == 2">{{ t('sendOutGoods') }}</el-button>
+											<el-button type="primary" link @click="finish(item)" v-if="item.status == 3">{{ t('confirmTakeDelivery') }}</el-button>
+											<el-button type="primary"  v-if="item.is_refund_show && item.status != 1 && item.status != -1" link @click="refundEvent(item)">{{ t('voluntaryRefund') }}</el-button>
+										</template>
+									</el-table-column>
+								</el-table>
+								<div v-if="item.shop_remark" class="text-[14px] min-h-[30px] leading-[30px] px-3 bg-[#fff0e5] text-[#ff7f5b]">
+									<span class="mr-[5px]">{{ t('notes') }}：</span>
+									<span>{{ item.shop_remark }}</span>
+								</div>
+							</div>
+						</template>
+						<el-empty v-else :image-size="1" :description="t('emptyData')" />
+					</div>
+				</div>
+				<div class="mt-[16px] flex justify-end">
+					<el-pagination v-model:current-page="orderTable.page" v-model:page-size="orderTable.limit"
+						layout="total, sizes, prev, pager, next, jumper" :total="orderTable.total"
+						@size-change="loadOrderList()" @current-change="loadOrderList" />
+				</div>
+			</div>
+		</el-card>
+
+		<adjust-money ref="orderAdjustMoneyActionDialog" @complete="loadOrderList" />
+		<delivery-action ref="deliveryActionDialog" @complete="loadOrderList" />
+		<order-notes ref="orderNotesDialog" @complete="loadOrderList" />
+		<order-export-select ref="selectExportDialog" @complete="exportEvent" />
+		<export-sure ref="exportSureDialog" :show="flag" :type="export_type" :searchParam="orderTable.searchParam" @close="handleClose" />
+        <order-edit-address ref="orderEditAddressDialog" @complete="loadOrderList"/>
+		<electronic-sheet-print ref="electronicSheetPrintDialog" @complete="electronicSheetPrintComplete" />
+        <shop-active-refund ref="shopActiveRefundDialog" @complete="loadOrderList" />
+	</div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
 import { t } from '@/lang'
-import {
-  getOrderList,
-  getOrderStatus,
-  orderClose,
-  orderFinish,
-  getOrderPayType,
-  getOrderFrom,
-} from '@/addon/shop/api/order'
+import { getOrderList, getOrderStatus, orderClose, orderFinish, getOrderPayType, getOrderFrom } from '@/addon/shop/api/order'
 import { printTicket } from '@/app/api/printer'
 import DeliveryAction from '@/addon/shop/views/order/components/delivery-action.vue'
 import OrderNotes from '@/addon/shop/views/order/components/order-notes.vue'
@@ -443,21 +215,21 @@ import { img } from '@/utils/common'
 import { ElMessage, ElMessageBox, FormInstance } from 'element-plus'
 import { useRouter, useRoute } from 'vue-router'
 import { cloneDeep } from 'lodash-es'
-import { setTablePageStorage, getTablePageStorage } from '@/utils/common'
+import { setTablePageStorage,getTablePageStorage } from '@/utils/common'
 
 const route = useRoute()
 const router = useRouter()
 const pageName = route.meta.title
-const activeName: any = ref(route.query.status || '')
+const activeName:any = ref(route.query.status || '')
 
 const statusData = ref([])
 const payTypeData = ref<any[]>([])
 const orderFromData = ref([])
 
 const setFormData = async () => {
-  statusData.value = await (await getOrderStatus()).data
-  payTypeData.value = await (await getOrderPayType()).data
-  orderFromData.value = await (await getOrderFrom()).data
+    statusData.value = await (await getOrderStatus()).data
+    payTypeData.value = await (await getOrderPayType()).data
+    orderFromData.value = await (await getOrderFrom()).data
 }
 setFormData()
 
@@ -465,79 +237,74 @@ const multipleSelection: any = reactive({}) // 选中数据
 const multipleTable: Record<string, any> | null = ref(null)
 const isSelectAll = ref(false)
 const selectAllCheck = () => {
-  if (!isSelectAll.value) {
-    isSelectAll.value = true
-    for (const i in orderTable.data) {
-      let isAdd = false
-      for (const j in orderTable.data[i].order_goods) {
-        // 存在一个没有退款的订单项就设为选中状态
-        if (orderTable.data[i].order_goods[j].status == 1) {
-          multipleTable.value[i].toggleRowSelection(
-            orderTable.data[i].order_goods[j],
-            true
-          )
-          isAdd = true
+    if (!isSelectAll.value) {
+        isSelectAll.value = true
+        for (const i in orderTable.data) {
+            let isAdd = false
+            for (const j in orderTable.data[i].order_goods) {
+                // 存在一个没有退款的订单项就设为选中状态
+                if (orderTable.data[i].order_goods[j].status == 1) {
+                    multipleTable.value[i].toggleRowSelection(orderTable.data[i].order_goods[j], true)
+                    isAdd = true
+                }
+            }
+            if (isAdd) {
+                multipleSelection['order_' + orderTable.data[i].order_id] = cloneDeep(orderTable.data[i])
+            }
+        }
+    } else {
+        isSelectAll.value = false
+        for (const v in orderTable.data) {
+            multipleTable.value[v].clearSelection()
+            delete multipleSelection['order_' + orderTable.data[v].order_id]
         }
-      }
-      if (isAdd) {
-        multipleSelection['order_' + orderTable.data[i].order_id] = cloneDeep(
-          orderTable.data[i]
-        )
-      }
-    }
-  } else {
-    isSelectAll.value = false
-    for (const v in orderTable.data) {
-      multipleTable.value[v].clearSelection()
-      delete multipleSelection['order_' + orderTable.data[v].order_id]
     }
-  }
 }
 
 // 监听表格复选框
 const handleSelectChange = (selection: any, row: any) => {
-  // 是否选中
-  let isSelected = false
-  let item: any = null
-
-  for (let i = 0; i < orderTable.data.length; i++) {
-    if (orderTable.data[i].order_id == row.order_id) {
-      item = orderTable.data[i]
-      break
+    // 是否选中
+    let isSelected = false
+    let item: any = null
+
+    for (let i = 0; i < orderTable.data.length; i++) {
+        if (orderTable.data[i].order_id == row.order_id) {
+            item = orderTable.data[i]
+            break
+        }
     }
-  }
 
-  for (let i = 0; i < selection.length; i++) {
-    if (selection[i].order_id == row.order_id) {
-      isSelected = true
-      break
+    for (let i = 0; i < selection.length; i++) {
+        if (selection[i].order_id == row.order_id) {
+            isSelected = true
+            break
+        }
+    }
+
+    if (isSelected) {
+        multipleSelection['order_' + row.order_id] = item
+    } else {
+        // 未选中，删除当前商品
+        delete multipleSelection['order_' + row.order_id]
     }
-  }
-
-  if (isSelected) {
-    multipleSelection['order_' + row.order_id] = item
-  } else {
-    // 未选中，删除当前商品
-    delete multipleSelection['order_' + row.order_id]
-  }
 }
 
-const orderTable: any = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    search_type: 'order_no',
-    search_name: '',
-    keyword: '',
-    pay_type: '',
-    order_from: '',
-    status: route.query.status || '',
-    create_time: [],
-    pay_time: [],
-  },
+const orderTable:any = reactive({
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        search_type: 'order_no',
+        search_name: '',
+        keyword: '',
+        pay_type: '',
+        order_from: '',
+        status: route.query.status || '',
+        create_time: [],
+        pay_time: []
+    }
 })
 
 const searchFormRef = ref<FormInstance>()
@@ -546,90 +313,86 @@ const searchFormRef = ref<FormInstance>()
  * 获取订单列表
  */
 const loadOrderList = (page: number = 1) => {
-  orderTable.loading = true
-  orderTable.page = page
-
-  getOrderList({
-    page: orderTable.page,
-    limit: orderTable.limit,
-    ...orderTable.searchParam,
-  })
-    .then((res) => {
-      orderTable.loading = false
-      orderTable.data = res.data.data.map((el: any) => {
-        el.isSupportElectronicSheet = false // 是否支持打印电子面单
-        el.isSupportPrintTicket = false // 是否支持打印小票
-
-        // 只有待发货、待收货，物流配送的情况下才能打印电子面单
-        if (el.delivery_type == 'express' && el.status == 3) {
-          el.isSupportElectronicSheet = true
-        }
-
-        //  待发货、待收货、已完成状态下可以打印小票
-        if (
-          el.delivery_type != 'virtual' &&
-          (el.status == 2 || el.status == 3 || el.status == 5)
-        ) {
-          el.isSupportPrintTicket = true
-        }
-        el.order_goods.forEach((v: any) => {
-          v.rowNum = el.order_goods.length
+    orderTable.loading = true
+    orderTable.page = page
+
+    getOrderList({
+        page: orderTable.page,
+        limit: orderTable.limit,
+        ...orderTable.searchParam
+    }).then(res => {
+        orderTable.loading = false
+        orderTable.data = res.data.data.map((el: any) => {
+            el.isSupportElectronicSheet = false // 是否支持打印电子面单
+            el.isSupportPrintTicket = false // 是否支持打印小票
+
+            // 只有待发货、待收货，物流配送的情况下才能打印电子面单
+            if (el.delivery_type == 'express' && el.status == 3) {
+                el.isSupportElectronicSheet = true
+            }
+
+            //  待发货、待收货、已完成状态下可以打印小票
+            if (el.delivery_type != 'virtual' && (el.status == 2 || el.status == 3 || el.status == 5)) {
+                el.isSupportPrintTicket = true
+            }
+            el.order_goods.forEach((v: any) => {
+                v.rowNum = el.order_goods.length
+            })
+            return el
         })
-        return el
-      })
-
-      // 处理主力退款按钮是否出现
-      orderTable.data.forEach((item: any, index: number, arr: any) => {
-        let refundOrderNum = 0
-        item.order_goods.forEach((orderItem: any, orderIndex: number) => {
-          if (orderItem.is_enable_refund == 1) {
-            refundOrderNum++
-          }
+
+        // 处理主力退款按钮是否出现
+        orderTable.data.forEach((item: any, index: number, arr: any) => {
+            let refundOrderNum = 0
+            item.order_goods.forEach((orderItem: any, orderIndex:number) => {
+                if (orderItem.is_enable_refund == 1) {
+                    refundOrderNum++
+                }
+            })
+            arr[index].is_refund_show = refundOrderNum > 0 ? true : false;
         })
-        arr[index].is_refund_show = refundOrderNum > 0 ? true : false
-      })
-      orderTable.total = res.data.total
-      setTablePageStorage(
-        orderTable.page,
-        orderTable.limit,
-        orderTable.searchParam
-      )
-    })
-    .catch(() => {
-      orderTable.loading = false
+        orderTable.total = res.data.total
+	    setTablePageStorage(orderTable.page,orderTable.limit,orderTable.searchParam);
+    }).catch(() => {
+        orderTable.loading = false
     })
 }
 
 loadOrderList(getTablePageStorage(orderTable.searchParam).page)
 
 const handleClick = (event: any) => {
-  orderTable.searchParam.status = event
-  isSelectAll.value = false
-  for (let key in multipleSelection) {
-    delete multipleSelection[key]
-  }
-  loadOrderList()
+    orderTable.searchParam.status = event
+    isSelectAll.value = false
+    for (let key in multipleSelection) {
+        delete multipleSelection[key]
+    }
+    loadOrderList()
 }
 
 // 合并表格行
-const arraySpanMethod = ({ row, column, rowIndex, columnIndex }: any) => {
-  if (rowIndex === 0) {
-    if (columnIndex === 0) {
-      return [row.rowNum, 1]
-    } else if (columnIndex > 3) {
-      return [row.rowNum, 1]
-    } else {
-      return [1, 1]
-    }
-  } else {
-    if (columnIndex === 0) {
-      return [0, 0]
-    } else if (columnIndex > 3) {
-      return [0, 0]
+const arraySpanMethod = ({
+    row,
+    column,
+    rowIndex,
+    columnIndex
+}:any) => {
+    if (rowIndex === 0) {
+        if (columnIndex === 0) {
+            return [row.rowNum, 1]
+        } else if (columnIndex > 3) {
+            return [row.rowNum, 1]
+        } else {
+            return [1, 1]
+        }
     } else {
-      return [1, 1]
+        if (columnIndex === 0) {
+            return [0, 0]
+        } else if (columnIndex > 3) {
+            return [0, 0]
+        } else {
+            return [1, 1]
+        }
     }
-  }
 }
 
 /**
@@ -638,12 +401,12 @@ const arraySpanMethod = ({ row, column, rowIndex, columnIndex }: any) => {
 const exportSureDialog = ref(null)
 const export_type = ref('')
 const flag = ref(false)
-const handleClose = (val: any) => {
-  flag.value = val
+const handleClose = (val:any) => {
+    flag.value = val
 }
 const exportEvent = (data: any) => {
-  export_type.value = data
-  flag.value = true
+    export_type.value = data
+    flag.value = true
 }
 
 const selectExportDialog: Record<string, any> | null = ref(null)
@@ -652,39 +415,41 @@ const selectExportDialog: Record<string, any> | null = ref(null)
  * 订单导出类型选择
  */
 const exportSelectEvent = () => {
-  selectExportDialog.value.showDialog = true
+    selectExportDialog.value.showDialog = true
 }
 
 // 订单详情
 const detailEvent = (data: any) => {
-  router.push('/shop/order/detail?order_id=' + data.order_id)
+    router.push('/shop/order/detail?order_id=' + data.order_id)
 }
 
 const memberEvent = (id: number) => {
-  const routeUrl = router.resolve({
-    path: '/member/detail',
-    query: { id },
-  })
-  window.open(routeUrl.href, '_blank')
+    const routeUrl = router.resolve({
+        path: '/member/detail',
+        query: { id }
+    })
+    window.open(routeUrl.href, '_blank')
 }
 
 const close = (data: any) => {
-  ElMessageBox.confirm(t('orderCloseTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    orderClose(data.order_id).then(() => {
-      loadOrderList()
+    ElMessageBox.confirm(t('orderCloseTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        orderClose(data.order_id).then(() => {
+            loadOrderList()
+        })
     })
-  })
 }
 
 // 订单调整价格
 const orderAdjustMoneyActionDialog: Record<string, any> | null = ref(null)
 const orderAdjustMoney = (data: any) => {
-  orderAdjustMoneyActionDialog.value.setFormData(data)
-  orderAdjustMoneyActionDialog.value.showDialog = true
+    orderAdjustMoneyActionDialog.value.setFormData(data)
+    orderAdjustMoneyActionDialog.value.showDialog = true
 }
 
 const deliveryActionDialog: Record<string, any> | null = ref(null)
@@ -692,8 +457,8 @@ const deliveryActionDialog: Record<string, any> | null = ref(null)
  * 发货
  */
 const delivery = (data: any) => {
-  deliveryActionDialog.value.setFormData(data)
-  deliveryActionDialog.value.showDialog = true
+    deliveryActionDialog.value.setFormData(data)
+    deliveryActionDialog.value.showDialog = true
 }
 
 const orderNotesDialog: Record<string, any> | null = ref(null)
@@ -701,36 +466,38 @@ const orderNotesDialog: Record<string, any> | null = ref(null)
  * 设置备注
  */
 const setNotes = (data: any) => {
-  orderNotesDialog.value.setFormData(data)
-  orderNotesDialog.value.showDialog = true
+    orderNotesDialog.value.setFormData(data)
+    orderNotesDialog.value.showDialog = true
 }
 
 // 订单完成
 const finish = (data: any) => {
-  ElMessageBox.confirm(t('orderFinishTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    orderFinish(data.order_id).then(() => {
-      loadOrderList()
+    ElMessageBox.confirm(t('orderFinishTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        orderFinish(data.order_id).then(() => {
+            loadOrderList()
+        })
     })
-  })
 }
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadOrderList()
+    if (!formEl) return
+    formEl.resetFields()
+    loadOrderList()
 }
 
 /**
  * 修改地址
  */
-const orderEditAddressDialog: Record<string, any> | null = ref(null)
-const orderEditAddressFn = async (data: any) => {
-  orderEditAddressDialog.value.showDialog = true
-  orderEditAddressDialog.value.setFormData(data)
+const orderEditAddressDialog :Record<string, any> | null = ref(null)
+const orderEditAddressFn = async (data:any) => {
+    orderEditAddressDialog.value.showDialog = true
+    orderEditAddressDialog.value.setFormData(data)
 }
 
 // 打印电子面单
@@ -738,54 +505,54 @@ const electronicSheetPrintDialog: Record<string, any> | null = ref(null)
 
 // 单个订单打印电子面单
 const openElectronicSheetPrintDialog = (data: any) => {
-  let formData = cloneDeep(data)
-  formData.print_type = 'single'
-  electronicSheetPrintDialog.value.setFormData(formData)
-  electronicSheetPrintDialog.value.showDialog = true
+    let formData = cloneDeep(data)
+    formData.print_type = 'single'
+    electronicSheetPrintDialog.value.setFormData(formData)
+    electronicSheetPrintDialog.value.showDialog = true
 }
 
 // 批量打印电子面单
 const batchPrintElectronicSheet = () => {
-  let noSupportCount = 0
-  let order_ids = []
-  for (let key in multipleSelection) {
-    if (multipleSelection[key].isSupportElectronicSheet) {
-      order_ids.push(multipleSelection[key].order_id)
-    } else {
-      noSupportCount++
+    let noSupportCount = 0
+    let order_ids = []
+    for (let key in multipleSelection) {
+        if (multipleSelection[key].isSupportElectronicSheet) {
+            order_ids.push(multipleSelection[key].order_id)
+        } else {
+            noSupportCount++
+        }
     }
-  }
 
-  if (noSupportCount && order_ids.length == 0) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('notSupportPrintElectronicSheetTips')}`,
-    })
-    return
-  }
+    if (noSupportCount && order_ids.length == 0) {
+        ElMessage({
+            type: 'warning',
+            message: `${t('notSupportPrintElectronicSheetTips')}`
+        })
+        return
+    }
 
-  if (order_ids.length == 0) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('batchEmptySelectedOrderTips')}`,
+    if (order_ids.length == 0) {
+        ElMessage({
+            type: 'warning',
+            message: `${t('batchEmptySelectedOrderTips')}`
+        })
+        return
+    }
+
+    electronicSheetPrintDialog.value.setFormData({
+        order_id: order_ids.toString(),
+        print_type: 'multiple'
     })
-    return
-  }
-
-  electronicSheetPrintDialog.value.setFormData({
-    order_id: order_ids.toString(),
-    print_type: 'multiple',
-  })
-  electronicSheetPrintDialog.value.showDialog = true
+    electronicSheetPrintDialog.value.showDialog = true
 }
 
 // 电子面单完成事件
 const electronicSheetPrintComplete = () => {
-  isSelectAll.value = false
-  for (const v in orderTable.data) {
-    multipleTable.value[v].clearSelection()
-    delete multipleSelection['order_' + orderTable.data[v].order_id]
-  }
+    isSelectAll.value = false
+    for (const v in orderTable.data) {
+        multipleTable.value[v].clearSelection()
+        delete multipleSelection['order_' + orderTable.data[v].order_id];
+    }
 }
 
 const repeat = ref(false)
@@ -794,22 +561,20 @@ const repeat = ref(false)
  * 打印小票
  */
 const printTicketEvent = (data: any) => {
-  if (repeat.value) return
-  repeat.value = true
-
-  printTicket({
-    type: 'shopGoodsOrder', // 小票模板类型
-    trigger: 'manual', // 触发时机：手动触发
-    // 业务参数，根据自身业务传值
-    business: {
-      order_id: data.order_id,
-    },
-  })
-    .then((res: any) => {
-      repeat.value = false
-    })
-    .catch(() => {
-      repeat.value = false
+    if (repeat.value) return
+    repeat.value = true
+
+    printTicket({
+        type: 'shopGoodsOrder', // 小票模板类型
+        trigger: 'manual', // 触发时机：手动触发
+        // 业务参数，根据自身业务传值
+        business: {
+            order_id: data.order_id
+        }
+    }).then((res: any) => {
+        repeat.value = false
+    }).catch(() => {
+        repeat.value = false
     })
 }
 
@@ -818,31 +583,32 @@ const printTicketEvent = (data: any) => {
  */
 const shopActiveRefundDialog: Record<string, any> | null = ref(null)
 const refundEvent = (data: any) => {
-  shopActiveRefundDialog.value.setFormData(data)
-  shopActiveRefundDialog.value.showDialog = true
+    shopActiveRefundDialog.value.setFormData(data)
+    shopActiveRefundDialog.value.showDialog = true
 }
+
 </script>
 
 <style lang="scss" scoped>
 .table-top :deep(.el-table__body-wrapper) {
-  display: none;
+	display: none;
 }
 
 .input-item {
-  width: 150px !important;
+	width: 150px !important;
 }
 
 :deep(.el-table) {
-  --el-table-row-hover-bg-color: var(--el-transfer-border-color);
+	--el-table-row-hover-bg-color: var(--el-transfer-border-color);
 }
 
 /* 多行超出隐藏 */
 .multi-hidden {
-  word-break: break-all;
-  text-overflow: ellipsis;
-  overflow: hidden;
-  display: -webkit-box;
-  -webkit-line-clamp: 2;
-  -webkit-box-orient: vertical;
+	word-break: break-all;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	display: -webkit-box;
+	-webkit-line-clamp: 2;
+	-webkit-box-orient: vertical;
 }
 </style>
diff --git a/admin/src/addon/shop/views/order/refund.vue b/admin/src/addon/shop/views/order/refund.vue
index c0273413..6ced40f7 100644
--- a/admin/src/addon/shop/views/order/refund.vue
+++ b/admin/src/addon/shop/views/order/refund.vue
@@ -1,257 +1,158 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
+	<div class="main-container">
+		<el-card class="box-card !border-none" shadow="never">
 
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="orderTable.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('orderRefundNo')" prop="order_refund_no">
-            <el-input
-              v-model.trim="orderTable.searchParam.order_refund_no"
-              :placeholder="t('orderRefundNoPlaceholder')"
-              @keyup="filterNumber($event)"
-              maxlength="30"
-            />
-          </el-form-item>
-          <el-form-item :label="t('createTime')" prop="create_time">
-            <el-date-picker
-              v-model="orderTable.searchParam.create_time"
-              type="datetimerange"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              :start-placeholder="t('startDate')"
-              :end-placeholder="t('endDate')"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="loadOrderList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-            <el-button type="primary" @click="exportEvent">{{
-              t('export')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
-      <el-tabs v-model="activeName" class="demo-tabs" @tab-change="handleClick">
-        <el-tab-pane :label="t('all')" name=""></el-tab-pane>
-        <el-tab-pane :label="t('applyForRefund')" name="1"></el-tab-pane>
-        <el-tab-pane :label="t('refundEnd')" name="8"></el-tab-pane>
-        <el-tab-pane :label="t('toBeReturned')" name="2"></el-tab-pane>
-        <el-tab-pane :label="t('receivedGoods')" name="4"></el-tab-pane>
-        <el-tab-pane :label="t('refundRefuse')" name="3"></el-tab-pane>
-      </el-tabs>
-      <div>
-        <el-table
-          :data="orderTable.data"
-          size="large"
-          class="table-top"
-          @select-all="selectAllCheck"
-        >
-          <el-table-column type="selection" width="40" />
-          <el-table-column :label="t('goodsInfo')" min-width="240" />
-          <el-table-column :label="t('goodsMoney')" min-width="120" />
-          <el-table-column :label="t('realityMoney')" min-width="120" />
-          <el-table-column :label="t('buyMember')" min-width="120" />
-          <el-table-column :label="t('refundMoney')" min-width="120" />
-          <el-table-column :label="t('refundType')" min-width="120" />
-          <el-table-column :label="t('createTime')" min-width="120" />
-          <el-table-column :label="t('refundStatus')" min-width="120" />
-          <el-table-column
-            :label="t('operation')"
-            fixed="right"
-            align="right"
-            min-width="120"
-          />
-        </el-table>
-        <div class="table-body min-h-[150px]" v-loading="orderTable.loading">
-          <div v-if="!orderTable.loading">
-            <template v-if="orderTable.data.length">
-              <div v-for="(item, index) in orderTable.data" :key="index">
-                <div
-                  class="flex items-center justify-between bg-[#f7f8fa] mt-[10px] border-[#e4e7ed] border-solid border-b-[1px] px-3 h-[35px] text-[12px] text-[#666]"
-                >
-                  <div>
-                    <span class="ml-5"
-                      >{{ t('orderRefundNo') }}：{{
-                        (item as any).order_refund_no
-                      }}</span
-                    >
-                  </div>
-                </div>
+			<div class="flex justify-between items-center">
+				<span class="text-page-title">{{ pageName }}</span>
+			</div>
 
-                <el-table
-                  :data="(item as any).order_goods"
-                  size="large"
-                  :show-header="false"
-                  ref="multipleTable"
-                >
-                  <el-table-column type="selection" width="40" />
-                  <el-table-column align="left" min-width="240">
-                    <template #default="{ row }">
-                      <div class="flex cursor-pointer">
-                        <div class="flex items-center min-w-[50px] mr-[10px]">
-                          <img
-                            class="w-[50px] h-[50px]"
-                            v-if="row.goods_image_thumb_small"
-                            :src="img(row.goods_image_thumb_small)"
-                            alt=""
-                          />
-                          <img class="w-[50px] h-[50px]" v-else src="" alt="" />
-                        </div>
-                        <div class="flex flex-col">
-                          <el-tooltip
-                            class="box-item"
-                            effect="light"
-                            placement="top"
-                          >
-                            <template #content>
-                              <div class="max-w-[250px]">
-                                {{ row.goods_name }}
-                              </div>
-                            </template>
-                            <p class="multi-hidden">{{ row.goods_name }}</p>
-                          </el-tooltip>
-                          <span class="text-[12px] text-[#999] truncate">{{
-                            row.sku_name
-                          }}</span>
-                        </div>
-                      </div>
-                    </template>
-                  </el-table-column>
-                  <el-table-column min-width="120">
-                    <template #default="{ row }">
-                      <div class="flex flex-col">
-                        <span class="text-[14px]">￥{{ row.goods_money }}</span>
-                      </div>
-                    </template>
-                  </el-table-column>
-                  <el-table-column min-width="120">
-                    <template #default="{ row }">
-                      <div class="flex flex-col">
-                        <span class="text-[14px]"
-                          >￥{{
-                            parseFloat(
-                              row.goods_money - row.discount_money
-                            ).toFixed(2)
-                          }}</span
-                        >
-                      </div>
-                    </template>
-                  </el-table-column>
-                  <el-table-column min-width="120">
-                    <template #default>
-                      <el-button
-                        link
-                        type="primary"
-                        @click="memberEvent(item.member.member_id)"
-                        v-if="item.member"
-                        >{{ item.member.nickname }}</el-button
-                      >
-                    </template>
-                  </el-table-column>
-                  <el-table-column min-width="120">
-                    <template #default>
-                      <span class="text-[14px]" v-if="item.status == 8"
-                        >￥{{ item.money }}</span
-                      >
-                      <span class="text-[14px]" v-else
-                        >￥{{ item.apply_money }}</span
-                      >
-                    </template>
-                  </el-table-column>
-                  <el-table-column min-width="120">
-                    <template #default>
-                      <span class="text-[14px]">{{
-                        item.refund_type_name
-                      }}</span>
-                    </template>
-                  </el-table-column>
-                  <el-table-column min-width="120">
-                    <template #default>
-                      <span class="text-[14px]">{{ item.create_time }}</span>
-                    </template>
-                  </el-table-column>
-                  <el-table-column min-width="120">
-                    <template #default>
-                      <span class="text-[14px]">{{ item.status_name }}</span>
-                    </template>
-                  </el-table-column>
-                  <el-table-column align="right" min-width="120">
-                    <template #default>
-                      <el-button
-                        type="primary"
-                        link
-                        @click="detailEvent(item)"
-                        >{{ t('info') }}</el-button
-                      >
-                    </template>
-                  </el-table-column>
-                </el-table>
-                <div
-                  v-if="item.shop_remark"
-                  class="text-[14px] h-[30px] leading-[30px] px-3 bg-[#fff0e5] text-[#ff7f5b]"
-                >
-                  <span class="mr-[5px]">{{ t('notes') }}：</span>
-                  <span>{{ item.shop_remark }}</span>
-                </div>
-              </div>
-            </template>
-            <el-empty v-else :image-size="1" :description="t('emptyData')" />
-          </div>
-        </div>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="orderTable.page"
-            v-model:page-size="orderTable.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="orderTable.total"
-            @size-change="loadOrderList()"
-            @current-change="loadOrderList"
-          />
-        </div>
-      </div>
-    </el-card>
-    <order-notes ref="orderNotesDialog" @complete="loadOrderList"></order-notes>
-    <export-sure
-      ref="exportSureDialog"
-      :show="flag"
-      type="shop_order_refund"
-      :searchParam="orderTable.searchParam"
-      @close="handleClose"
-    />
-    <refund-detail
-      ref="refundDetailDialog"
-      @load="loadOrderList"
-    ></refund-detail>
-  </div>
+			<el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+				<el-form :inline="true" :model="orderTable.searchParam" ref="searchFormRef">
+					<el-form-item :label="t('orderRefundNo')" prop="order_refund_no">
+						<el-input v-model.trim="orderTable.searchParam.order_refund_no" :placeholder="t('orderRefundNoPlaceholder')" @keyup="filterNumber($event)" maxlength="30" />
+					</el-form-item>
+					<el-form-item :label="t('createTime')" prop="create_time">
+						<el-date-picker v-model="orderTable.searchParam.create_time" type="datetimerange"
+							value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')"
+							:end-placeholder="t('endDate')" />
+					</el-form-item>
+					<el-form-item>
+						<el-button type="primary" @click="loadOrderList()">{{ t('search') }}</el-button>
+						<el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+						<el-button type="primary" @click="exportEvent">{{ t('export') }}</el-button>
+					</el-form-item>
+				</el-form>
+			</el-card>
+			<el-tabs v-model="activeName" class="demo-tabs" @tab-change="handleClick">
+				<el-tab-pane :label="t('all')" name=""></el-tab-pane>
+				<el-tab-pane :label="t('applyForRefund')" name="1"></el-tab-pane>
+				<el-tab-pane :label="t('refundEnd')" name="8"></el-tab-pane>
+				<el-tab-pane :label="t('toBeReturned')" name="2"></el-tab-pane>
+				<el-tab-pane :label="t('receivedGoods')" name="4"></el-tab-pane>
+				<el-tab-pane :label="t('refundRefuse')" name="3"></el-tab-pane>
+			</el-tabs>
+			<div>
+				<el-table :data="orderTable.data" size="large" class="table-top" @select-all="selectAllCheck">
+					<el-table-column type="selection" width="40" />
+					<el-table-column :label="t('goodsInfo')" min-width="240" />
+					<el-table-column :label="t('goodsMoney')" min-width="120" />
+					<el-table-column :label="t('realityMoney')" min-width="120" />
+					<el-table-column :label="t('buyMember')" min-width="120" />
+					<el-table-column :label="t('refundMoney')" min-width="120" />
+					<el-table-column :label="t('refundType')" min-width="120" />
+					<el-table-column :label="t('createTime')" min-width="120" />
+					<el-table-column :label="t('refundStatus')" min-width="120" />
+					<el-table-column :label="t('operation')" fixed="right" align="right" min-width="120" />
+				</el-table>
+				<div class="table-body min-h-[150px]" v-loading="orderTable.loading">
+					<div v-if="!orderTable.loading">
+						<template v-if="orderTable.data.length">
+							<div v-for="(item, index) in orderTable.data" :key="index">
+								<div class="flex items-center justify-between bg-[#f7f8fa] mt-[10px] border-[#e4e7ed] border-solid border-b-[1px] px-3 h-[35px] text-[12px] text-[#666]">
+									<div>
+										<span class="ml-5">{{ t('orderRefundNo') }}：{{ (item as any).order_refund_no }}</span>
+									</div>
+								</div>
+
+								<el-table :data="(item as any).order_goods" size="large" :show-header="false" ref="multipleTable">
+									<el-table-column type="selection" width="40" />
+									<el-table-column align="left" min-width="240">
+										<template #default="{ row }">
+											<div class="flex cursor-pointer">
+												<div class="flex items-center min-w-[50px] mr-[10px]">
+													<img class="w-[50px] h-[50px]" v-if="row.goods_image_thumb_small" :src="img(row.goods_image_thumb_small)" alt="">
+													<img class="w-[50px] h-[50px]" v-else src="" alt="">
+												</div>
+												<div class="flex  flex-col">
+                                                    <el-tooltip class="box-item" effect="light" placement="top">
+                                                        <template #content>
+                                                            <div class="max-w-[250px]">{{row.goods_name}}</div>
+                                                        </template>
+													    <p class="multi-hidden">{{ row.goods_name }}</p>
+                                                    </el-tooltip>
+													<span class="text-[12px] text-[#999] truncate">{{ row.sku_name }}</span>
+												</div>
+											</div>
+										</template>
+									</el-table-column>
+									<el-table-column min-width="120">
+										<template #default="{ row }">
+											<div class="flex flex-col">
+												<span class="text-[14px]">￥{{ row.goods_money }}</span>
+											</div>
+										</template>
+									</el-table-column>
+									<el-table-column min-width="120">
+										<template #default="{ row }">
+											<div class="flex flex-col">
+												<span class="text-[14px]">￥{{ parseFloat(row.goods_money - row.discount_money).toFixed(2) }}</span>
+											</div>
+										</template>
+									</el-table-column>
+									<el-table-column min-width="120">
+										<template #default>
+											<el-button link type="primary" @click="memberEvent(item.member.member_id)" v-if="item.member">{{ item.member.nickname }}</el-button>
+										</template>
+									</el-table-column>
+									<el-table-column min-width="120">
+										<template #default>
+											<span class="text-[14px]" v-if="item.status == 8">￥{{ item.money }}</span>
+											<span class="text-[14px]" v-else>￥{{ item.apply_money }}</span>
+										</template>
+									</el-table-column>
+									<el-table-column min-width="120">
+										<template #default>
+											<span class="text-[14px]">{{ item.refund_type_name }}</span>
+										</template>
+									</el-table-column>
+									<el-table-column min-width="120">
+										<template #default>
+											<span class="text-[14px]">{{ item.create_time }}</span>
+										</template>
+									</el-table-column>
+									<el-table-column min-width="120">
+										<template #default>
+											<span class="text-[14px]">{{ item.status_name }}</span>
+										</template>
+									</el-table-column>
+									<el-table-column align="right" min-width="120">
+										<template #default>
+											<el-button type="primary" link @click="detailEvent(item)">{{ t('info') }}</el-button>
+										</template>
+									</el-table-column>
+								</el-table>
+								<div v-if="item.shop_remark" class="text-[14px] h-[30px] leading-[30px] px-3 bg-[#fff0e5] text-[#ff7f5b]">
+									<span class="mr-[5px]">{{ t('notes') }}：</span>
+									<span>{{ item.shop_remark }}</span>
+								</div>
+							</div>
+						</template>
+						<el-empty v-else :image-size="1" :description="t('emptyData')" />
+					</div>
+				</div>
+				<div class="mt-[16px] flex justify-end">
+					<el-pagination v-model:current-page="orderTable.page" v-model:page-size="orderTable.limit"
+						layout="total, sizes, prev, pager, next, jumper" :total="orderTable.total"
+						@size-change="loadOrderList()" @current-change="loadOrderList" />
+				</div>
+			</div>
+		</el-card>
+		<order-notes ref="orderNotesDialog" @complete="loadOrderList"></order-notes>
+		<export-sure ref="exportSureDialog" :show="flag" type="shop_order_refund" :searchParam="orderTable.searchParam" @close="handleClose" />
+		<refund-detail ref="refundDetailDialog" @load="loadOrderList"></refund-detail>
+	</div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
 import { t } from '@/lang'
 import { orderRefund } from '@/addon/shop/api/order'
-import {
-  img,
-  filterNumber,
-  setTablePageStorage,
-  getTablePageStorage,
-} from '@/utils/common'
+import { img, filterNumber,setTablePageStorage,getTablePageStorage } from '@/utils/common'
 import type { FormInstance } from 'element-plus'
 import { useRouter, useRoute } from 'vue-router'
 import refundDetail from '@/addon/shop/views/order/components/refund-detail.vue'
 
+
 const route = useRoute()
 const router = useRouter()
 const pageName = route.meta.title
@@ -261,48 +162,45 @@ const refundDetailDialog: Record<string, any> | null = ref(null)
 const multipleTable: Record<string, any> | null = ref(null)
 const isSelectAll = ref(false)
 const selectAllCheck = () => {
-  if (isSelectAll.value == false) {
-    isSelectAll.value = true
-    for (const i in orderTable.data) {
-      for (const j in orderTable.data[i].order_goods) {
-        multipleTable.value[i].toggleRowSelection(
-          orderTable.data[i].order_goods[j],
-          true
-        )
-      }
-    }
-  } else {
-    isSelectAll.value = false
-    for (const v in orderTable.data) {
-      for (const k in orderTable.data[v].order_goods) {
-        multipleTable.value[v].clearSelection()
-      }
-    }
-  }
+	if (isSelectAll.value == false) {
+		isSelectAll.value = true
+		for (const i in orderTable.data) {
+			for (const j in orderTable.data[i].order_goods) {
+				multipleTable.value[i].toggleRowSelection(orderTable.data[i].order_goods[j], true)
+			}
+		}
+	} else {
+		isSelectAll.value = false
+		for (const v in orderTable.data) {
+			for (const k in orderTable.data[v].order_goods) {
+				multipleTable.value[v].clearSelection()
+			}
+		}
+	}
 }
 interface orderTableType {
-  page: number
-  limit: number
-  total: number
-  loading: boolean
-  data: any[]
-  searchParam: {
-    order_refund_no: string
-    create_time: string[]
-    status: string
-  }
+	page: number
+	limit: number
+	total: number
+	loading: boolean
+	data: any[]
+	searchParam: {
+		order_refund_no: string
+		create_time: string[]
+		status: string
+	}
 }
 const orderTable = reactive<orderTableType>({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    order_refund_no: '',
-    create_time: [],
-    status: '',
-  },
+	page: 1,
+	limit: 10,
+	total: 0,
+	loading: true,
+	data: [],
+	searchParam: {
+		order_refund_no: '',
+		create_time: [],
+		status: ''
+	}
 })
 
 const searchFormRef = ref<FormInstance>()
@@ -311,36 +209,30 @@ const searchFormRef = ref<FormInstance>()
  * 获取订单列表
  */
 const loadOrderList = (page: number = 1) => {
-  orderTable.loading = true
-  orderTable.page = page
+	orderTable.loading = true
+	orderTable.page = page
 
-  orderRefund({
-    page: orderTable.page,
-    limit: orderTable.limit,
-    ...orderTable.searchParam,
-  })
-    .then((res) => {
-      orderTable.loading = false
-      orderTable.data = res.data.data.map((el: any) => {
-        el.order_goods = [el.order_goods]
-        return el
-      })
-      orderTable.total = res.data.total
-      setTablePageStorage(
-        orderTable.page,
-        orderTable.limit,
-        orderTable.searchParam
-      )
-    })
-    .catch(() => {
-      orderTable.loading = false
-    })
+	orderRefund({
+		page: orderTable.page,
+		limit: orderTable.limit,
+		...orderTable.searchParam
+	}).then(res => {
+		orderTable.loading = false
+		orderTable.data = res.data.data.map((el: any) => {
+			el.order_goods = [el.order_goods]
+			return el
+		})
+		orderTable.total = res.data.total
+		setTablePageStorage(orderTable.page,orderTable.limit,orderTable.searchParam);
+	}).catch(() => {
+		orderTable.loading = false
+	})
 }
 loadOrderList(getTablePageStorage(orderTable.searchParam).page)
 
 const handleClick = (event: string) => {
-  orderTable.searchParam.status = event
-  loadOrderList()
+	orderTable.searchParam.status = event
+	loadOrderList()
 }
 
 /**
@@ -349,50 +241,50 @@ const handleClick = (event: string) => {
 const exportSureDialog = ref(null)
 const flag = ref(false)
 const handleClose = (val) => {
-  flag.value = val
+	flag.value = val
 }
 const exportEvent = (data: any) => {
-  flag.value = true
+	flag.value = true
 }
 
 // 订单详情
 const detailEvent = (data: any) => {
-  let parameter = { id: data.refund_id }
-  refundDetailDialog.value.setFormData(parameter)
-  refundDetailDialog.value.showDialog = true
+    let parameter = {id: data.refund_id};
+    refundDetailDialog.value.setFormData(parameter);
+    refundDetailDialog.value.showDialog = true;
 }
 
 const memberEvent = (id: number) => {
-  const routeUrl = router.resolve({
-    path: '/member/detail',
-    query: { id },
-  })
-  window.open(routeUrl.href, '_blank')
+	const routeUrl = router.resolve({
+		path: '/member/detail',
+		query: { id }
+	})
+    window.open(routeUrl.href, '_blank')
 }
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadOrderList()
+	if (!formEl) return
+	formEl.resetFields()
+	loadOrderList()
 }
 </script>
 
 <style lang="scss" scoped>
 .table-top :deep(.el-table__body-wrapper) {
-  display: none;
+	display: none;
 }
 
 :deep(.el-table) {
-  --el-table-row-hover-bg-color: var(--el-transfer-border-color);
+	--el-table-row-hover-bg-color: var(--el-transfer-border-color);
 }
 
 /* 多行超出隐藏 */
 .multi-hidden {
-  word-break: break-all;
-  text-overflow: ellipsis;
-  overflow: hidden;
-  display: -webkit-box;
-  -webkit-line-clamp: 2;
-  -webkit-box-orient: vertical;
+	word-break: break-all;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	display: -webkit-box;
+	-webkit-line-clamp: 2;
+	-webkit-box-orient: vertical;
 }
 </style>
diff --git a/admin/src/addon/shop/views/poster/components/edit-goods-image.vue b/admin/src/addon/shop/views/poster/components/edit-goods-image.vue
index bf936a62..39ea162a 100644
--- a/admin/src/addon/shop/views/poster/components/edit-goods-image.vue
+++ b/admin/src/addon/shop/views/poster/components/edit-goods-image.vue
@@ -1,9 +1,11 @@
 <template>
-  <!-- 属性内容 -->
-  <div class="content-wrap">
-    <!-- 组件公共属性 -->
-    <slot name="common"></slot>
-  </div>
+	<!-- 属性内容 -->
+	<div class="content-wrap">
+
+		<!-- 组件公共属性 -->
+		<slot name="common"></slot>
+
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -14,6 +16,7 @@ import usePosterStore from '@/stores/modules/poster'
 const posterStore = usePosterStore()
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/addon/shop/views/poster/components/edit-goods-market-price.vue b/admin/src/addon/shop/views/poster/components/edit-goods-market-price.vue
index bf936a62..39ea162a 100644
--- a/admin/src/addon/shop/views/poster/components/edit-goods-market-price.vue
+++ b/admin/src/addon/shop/views/poster/components/edit-goods-market-price.vue
@@ -1,9 +1,11 @@
 <template>
-  <!-- 属性内容 -->
-  <div class="content-wrap">
-    <!-- 组件公共属性 -->
-    <slot name="common"></slot>
-  </div>
+	<!-- 属性内容 -->
+	<div class="content-wrap">
+
+		<!-- 组件公共属性 -->
+		<slot name="common"></slot>
+
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -14,6 +16,7 @@ import usePosterStore from '@/stores/modules/poster'
 const posterStore = usePosterStore()
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/addon/shop/views/poster/components/edit-goods-name.vue b/admin/src/addon/shop/views/poster/components/edit-goods-name.vue
index bf936a62..39ea162a 100644
--- a/admin/src/addon/shop/views/poster/components/edit-goods-name.vue
+++ b/admin/src/addon/shop/views/poster/components/edit-goods-name.vue
@@ -1,9 +1,11 @@
 <template>
-  <!-- 属性内容 -->
-  <div class="content-wrap">
-    <!-- 组件公共属性 -->
-    <slot name="common"></slot>
-  </div>
+	<!-- 属性内容 -->
+	<div class="content-wrap">
+
+		<!-- 组件公共属性 -->
+		<slot name="common"></slot>
+
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -14,6 +16,7 @@ import usePosterStore from '@/stores/modules/poster'
 const posterStore = usePosterStore()
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/addon/shop/views/poster/components/edit-goods-price.vue b/admin/src/addon/shop/views/poster/components/edit-goods-price.vue
index bf936a62..39ea162a 100644
--- a/admin/src/addon/shop/views/poster/components/edit-goods-price.vue
+++ b/admin/src/addon/shop/views/poster/components/edit-goods-price.vue
@@ -1,9 +1,11 @@
 <template>
-  <!-- 属性内容 -->
-  <div class="content-wrap">
-    <!-- 组件公共属性 -->
-    <slot name="common"></slot>
-  </div>
+	<!-- 属性内容 -->
+	<div class="content-wrap">
+
+		<!-- 组件公共属性 -->
+		<slot name="common"></slot>
+
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -14,6 +16,7 @@ import usePosterStore from '@/stores/modules/poster'
 const posterStore = usePosterStore()
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/addon/shop/views/poster/components/preview-goods-image.vue b/admin/src/addon/shop/views/poster/components/preview-goods-image.vue
index eb85891c..50b45451 100644
--- a/admin/src/addon/shop/views/poster/components/preview-goods-image.vue
+++ b/admin/src/addon/shop/views/poster/components/preview-goods-image.vue
@@ -1,31 +1,32 @@
 <template>
-  <div class="pointer-events-none max-w-[720px]" :style="componentStyle">
-    <img src="@/addon/shop/assets/goods_default.png" class="w-full h-full" />
-  </div>
+	<div class="pointer-events-none max-w-[720px]" :style="componentStyle">
+		<img src="@/addon/shop/assets/goods_default.png" class="w-full h-full" />
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { ref, computed } from 'vue'
+import { ref,computed } from 'vue'
 import { img } from '@/utils/common'
 
 const prop = defineProps({
-  value: {
-    type: Object,
-    default: {},
-  },
+    value: {
+        type: Object,
+        default: {}
+    }
 })
 
-const data = computed(() => {
-  return prop.value
+const data = computed(()=> {
+    return prop.value;
 })
 
-const componentStyle = computed(() => {
-  var style = ''
-  style += `width: ${prop.value.width}px;`
-  return style
+const componentStyle = computed(()=> {
+    var style = '';
+    style += `width: ${prop.value.width}px;`;
+    return style;
 })
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/addon/shop/views/poster/components/preview-goods-market-price.vue b/admin/src/addon/shop/views/poster/components/preview-goods-market-price.vue
index 0124ca16..0a5e184f 100644
--- a/admin/src/addon/shop/views/poster/components/preview-goods-market-price.vue
+++ b/admin/src/addon/shop/views/poster/components/preview-goods-market-price.vue
@@ -1,50 +1,44 @@
 <template>
-  <div class="overflow-hidden" :style="componentStyle">￥1999.00</div>
+	<div class="overflow-hidden" :style="componentStyle">￥1999.00</div>
 </template>
 
 <script lang="ts" setup>
-import { ref, computed } from 'vue'
+import { ref,computed } from 'vue'
 
 const prop = defineProps({
-  value: {
-    type: Object,
-    default: {},
-  },
+    value: {
+        type: Object,
+        default: {}
+    }
 })
 
-const data = computed(() => {
-  return prop.value
+const data = computed(()=> {
+    return prop.value;
 })
 
-const componentStyle = computed(() => {
-  var style = ''
-  style += `font-size: ${prop.value.fontSize}px;color: ${prop.value.fontColor};line-height: ${prop.value.lineHeight + prop.value.fontSize}px;`
-  if (
-    prop.value.x == 'left' ||
-    prop.value.x == 'center' ||
-    prop.value.x == 'right'
-  ) {
-    style += `text-align: ${prop.value.x};`
-  }
-  if (prop.value.weight) {
-    style += `font-weight: bold;`
-  }
-  if (
-    !prop.value.fontFamily ||
-    prop.value.fontFamily == 'static/font/price.ttf'
-  ) {
-    style += `font-family: poster_price_font;`
-  }
-  let box: any = document.getElementById(prop.value.id)
-  if (box) {
-    style += `width:${box.offsetWidth}px;height:${box.offsetHeight}px;`
-  } else {
-    style += `width:${prop.value.width}px;height:${prop.value.height}px;`
-  }
-  return style
+const componentStyle = computed(()=> {
+    var style = '';
+    style += `font-size: ${prop.value.fontSize}px;color: ${prop.value.fontColor};line-height: ${prop.value.lineHeight + prop.value.fontSize}px;`;
+    if(prop.value.x == 'left' || prop.value.x == 'center' || prop.value.x == 'right'){
+        style += `text-align: ${prop.value.x};`;
+    }
+    if(prop.value.weight){
+        style += `font-weight: bold;`;
+    }
+    if(!prop.value.fontFamily || prop.value.fontFamily == 'static/font/price.ttf'){
+        style += `font-family: poster_price_font;`;
+    }
+    let box: any = document.getElementById(prop.value.id)
+    if (box) {
+        style += `width:${box.offsetWidth}px;height:${box.offsetHeight}px;`;
+    }else{
+        style += `width:${prop.value.width}px;height:${prop.value.height}px;`;
+    }
+    return style;
 })
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/addon/shop/views/poster/components/preview-goods-name.vue b/admin/src/addon/shop/views/poster/components/preview-goods-name.vue
index 8faa31e9..c6d018e5 100644
--- a/admin/src/addon/shop/views/poster/components/preview-goods-name.vue
+++ b/admin/src/addon/shop/views/poster/components/preview-goods-name.vue
@@ -1,53 +1,47 @@
 <template>
-  <div class="overflow-hidden" :style="componentStyle">商品名称</div>
+	<div class="overflow-hidden" :style="componentStyle">商品名称</div>
 </template>
 
 <script lang="ts" setup>
-import { ref, computed } from 'vue'
+import { ref,computed } from 'vue'
 import usePosterStore from '@/stores/modules/poster'
 
 const posterStore = usePosterStore()
 
 const prop = defineProps({
-  value: {
-    type: Object,
-    default: {},
-  },
+    value: {
+        type: Object,
+        default: {}
+    }
 })
 
-const data = computed(() => {
-  return prop.value
+const data = computed(()=> {
+    return prop.value;
 })
 
-const componentStyle = computed(() => {
-  var style = ''
-  style += `font-size: ${prop.value.fontSize}px;color: ${prop.value.fontColor};line-height: ${prop.value.lineHeight + prop.value.fontSize}px;`
-  if (
-    prop.value.x == 'left' ||
-    prop.value.x == 'center' ||
-    prop.value.x == 'right'
-  ) {
-    style += `text-align: ${prop.value.x};`
-  }
-  if (prop.value.weight) {
-    style += `font-weight: bold;`
-  }
-  if (
-    !prop.value.fontFamily ||
-    prop.value.fontFamily == 'static/font/SourceHanSansCN-Regular.ttf'
-  ) {
-    style += `font-family: poster_default_font;`
-  }
-  let box: any = document.getElementById(prop.value.id)
-  if (box) {
-    style += `width:${box.offsetWidth}px;height:${box.offsetHeight}px;`
-  } else {
-    style += `width:${prop.value.width}px;height:${prop.value.height}px;`
-  }
-  return style
+const componentStyle = computed(()=> {
+    var style = '';
+    style += `font-size: ${prop.value.fontSize}px;color: ${prop.value.fontColor};line-height: ${prop.value.lineHeight + prop.value.fontSize}px;`;
+    if(prop.value.x == 'left' || prop.value.x == 'center' || prop.value.x == 'right'){
+        style += `text-align: ${prop.value.x};`;
+    }
+    if(prop.value.weight){
+        style += `font-weight: bold;`;
+    }
+    if(!prop.value.fontFamily || prop.value.fontFamily == 'static/font/SourceHanSansCN-Regular.ttf'){
+        style += `font-family: poster_default_font;`;
+    }
+    let box: any = document.getElementById(prop.value.id)
+    if (box) {
+        style += `width:${box.offsetWidth}px;height:${box.offsetHeight}px;`;
+    }else{
+        style += `width:${prop.value.width}px;height:${prop.value.height}px;`;
+    }
+    return style;
 })
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/addon/shop/views/poster/components/preview-goods-price.vue b/admin/src/addon/shop/views/poster/components/preview-goods-price.vue
index e02b3f81..cd4ca9ca 100644
--- a/admin/src/addon/shop/views/poster/components/preview-goods-price.vue
+++ b/admin/src/addon/shop/views/poster/components/preview-goods-price.vue
@@ -1,54 +1,48 @@
 <template>
-  <div class="overflow-hidden" :style="componentStyle">￥980.00</div>
+	<div class="overflow-hidden" :style="componentStyle">￥980.00</div>
 </template>
 
 <script lang="ts" setup>
-import { ref, computed } from 'vue'
+import { ref,computed } from 'vue'
 import usePosterStore from '@/stores/modules/poster'
 
 const posterStore = usePosterStore()
 
 const prop = defineProps({
-  value: {
-    type: Object,
-    default: {},
-  },
+    value: {
+        type: Object,
+        default: {}
+    }
 })
 
-const data = computed(() => {
-  return prop.value
+const data = computed(()=> {
+    return prop.value;
 })
 
-const componentStyle = computed(() => {
-  var style = ''
-  style += `font-size: ${prop.value.fontSize}px;color: ${prop.value.fontColor};line-height: ${prop.value.lineHeight + prop.value.fontSize}px;`
-  if (
-    prop.value.x == 'left' ||
-    prop.value.x == 'center' ||
-    prop.value.x == 'right'
-  ) {
-    style += `text-align: ${prop.value.x};`
-  }
-  if (prop.value.weight) {
-    style += `font-weight: bold;`
-  }
-  if (
-    !prop.value.fontFamily ||
-    prop.value.fontFamily == 'static/font/price.ttf'
-  ) {
-    style += `font-family: poster_price_font;`
-  }
-
-  let box: any = document.getElementById(prop.value.id)
-  if (box) {
-    style += `width:${box.offsetWidth}px;height:${box.offsetHeight}px;`
-  } else {
-    style += `width:${prop.value.width}px;height:${prop.value.height}px;`
-  }
-  return style
+const componentStyle = computed(()=> {
+    var style = '';
+    style += `font-size: ${prop.value.fontSize}px;color: ${prop.value.fontColor};line-height: ${prop.value.lineHeight + prop.value.fontSize}px;`;
+    if(prop.value.x == 'left' || prop.value.x == 'center' || prop.value.x == 'right'){
+        style += `text-align: ${prop.value.x};`;
+    }
+    if(prop.value.weight){
+        style += `font-weight: bold;`;
+    }
+    if(!prop.value.fontFamily || prop.value.fontFamily == 'static/font/price.ttf'){
+        style += `font-family: poster_price_font;`;
+    }
+    
+    let box: any = document.getElementById(prop.value.id)
+    if (box) {
+        style += `width:${box.offsetWidth}px;height:${box.offsetHeight}px;`;
+    }else{
+        style += `width:${prop.value.width}px;height:${prop.value.height}px;`;
+    }
+    return style;
 })
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/addon/shop/views/printer/components/preview-goods-order.vue b/admin/src/addon/shop/views/printer/components/preview-goods-order.vue
index 50df8dcd..c08b1b66 100644
--- a/admin/src/addon/shop/views/printer/components/preview-goods-order.vue
+++ b/admin/src/addon/shop/views/printer/components/preview-goods-order.vue
@@ -1,358 +1,126 @@
 <template>
-  <div class="print-preview">
-    <!-- 票头信息 -->
-    <div
-      class="my-[10px] text-center"
-      v-show="data.head_info.ticket_name.status"
-      :class="[
-        data.head_info.ticket_name.fontSize + '-size',
-        data.head_info.ticket_name.fontWeight + '-weight',
-      ]"
-    >
-      {{ data.head_info.ticket_name.value }}
-    </div>
-    <div class="bottom-border" v-show="data.head_info.ticket_name.status"></div>
-
-    <div
-      class="my-[10px] text-center"
-      v-show="data.head_info.shop_name.status"
-      :class="[
-        data.head_info.shop_name.fontSize + '-size',
-        data.head_info.shop_name.fontWeight + '-weight',
-      ]"
-    >
-      商城名称
-    </div>
-    <div class="bottom-border" v-show="data.head_info.shop_name.status"></div>
-
-    <!-- 订单信息 -->
-    <div v-show="data.order_info.order_item.value.length">
-      <div
-        class="text-[16px] my-[10px]"
-        v-show="data.order_info.order_item.value.indexOf('order_no') != -1"
-      >
-        订单编号：20240713456280064905216
-      </div>
-      <div
-        class="text-[16px] my-[10px]"
-        v-show="data.order_info.order_item.value.indexOf('order_from') != -1"
-      >
-        订单来源：微信小程序
-      </div>
-      <div
-        class="text-[16px] my-[10px]"
-        v-show="data.order_info.order_item.value.indexOf('order_status') != -1"
-      >
-        订单状态：已完成
-      </div>
-      <div
-        class="text-[16px] my-[10px]"
-        v-show="data.order_info.order_item.value.indexOf('pay_type') != -1"
-      >
-        支付方式：微信支付
-      </div>
-      <div
-        class="text-[16px] my-[10px]"
-        v-show="data.order_info.order_item.value.indexOf('delivery_type') != -1"
-      >
-        配送方式：同城配送
-      </div>
-      <div
-        class="text-[16px] my-[10px]"
-        v-show="data.order_info.order_item.value.indexOf('create_time') != -1"
-      >
-        下单时间：2023-12-12 14:20:20
-      </div>
-      <div
-        class="text-[16px] my-[10px]"
-        v-show="data.order_info.order_item.value.indexOf('pay_time') != -1"
-      >
-        付款时间：2023-12-12 14:20:30
-      </div>
-      <div
-        class="text-[16px] my-[10px]"
-        v-show="data.order_info.order_item.value.indexOf('goods_money') != -1"
-      >
-        商品总额：￥10.00
-      </div>
-      <div
-        class="text-[16px] my-[10px]"
-        v-show="
-          data.order_info.order_item.value.indexOf('delivery_money') != -1
-        "
-      >
-        配送金额：￥1.00
-      </div>
-      <div
-        class="text-[16px] my-[10px]"
-        v-show="
-          data.order_info.order_item.value.indexOf('discount_money') != -1
-        "
-      >
-        优惠金额：￥2.00
-      </div>
-    </div>
-    <div
-      class="my-[10px]"
-      v-show="data.order_info.order_money.status"
-      :class="[
-        data.order_info.order_money.fontSize + '-size',
-        data.order_info.order_money.fontWeight + '-weight',
-      ]"
-    >
-      实付金额：¥7.00
-    </div>
-    <div
-      class="my-[10px]"
-      v-show="data.order_info.shop_remark.status"
-      :class="[
-        data.order_info.shop_remark.fontSize + '-size',
-        data.order_info.shop_remark.fontWeight + '-weight',
-      ]"
-    >
-      商家备注：新用户优惠
-    </div>
-    <div
-      class="bottom-border"
-      v-show="
-        data.order_info.order_item.value.length ||
-        data.order_info.order_money.status ||
-        data.order_info.shop_remark.status
-      "
-    ></div>
-
-    <!-- 商品信息 -->
-    <div class="flex my-[10px]">
-      <div class="text-[16px]" style="flex: 2 1 0">商品名称</div>
-      <div class="text-[16px] flex-1 text-right">数量</div>
-      <div
-        class="text-[16px] flex-1 text-right"
-        v-show="data.goods_info.goods_price.status"
-      >
-        金额
-      </div>
-    </div>
-    <div class="flex my-[10px]">
-      <div
-        class="text-[16px]"
-        style="flex: 2 1 0"
-        :class="[
-          data.goods_info.goods_name.fontSize + '-size',
-          data.goods_info.goods_name.fontWeight + '-weight',
-        ]"
-      >
-        可口可乐碳酸饮料
-      </div>
-      <div class="text-[16px] flex-1 text-right">x2</div>
-      <div
-        class="text-[16px] flex-1 text-right"
-        v-show="data.goods_info.goods_price.status"
-        :class="[
-          data.goods_info.goods_price.fontSize + '-size',
-          data.goods_info.goods_price.fontWeight + '-weight',
-        ]"
-      >
-        ¥54.50
-      </div>
-    </div>
-    <div class="flex my-[10px]">
-      <div
-        class="text-[16px]"
-        style="flex: 2 1 0"
-        :class="[
-          data.goods_info.goods_name.fontSize + '-size',
-          data.goods_info.goods_name.fontWeight + '-weight',
-        ]"
-      >
-        液晶电视
-      </div>
-      <div class="text-[16px] flex-1 text-right">x1</div>
-      <div
-        class="text-[16px] flex-1 text-right"
-        v-show="data.goods_info.goods_price.status"
-        :class="[
-          data.goods_info.goods_price.fontSize + '-size',
-          data.goods_info.goods_price.fontWeight + '-weight',
-        ]"
-      >
-        ¥1999.00
-      </div>
-    </div>
-    <div class="bottom-border"></div>
-
-    <!-- 买家/收货信息 -->
-    <div
-      class="my-[10px]"
-      v-show="data.buyer_info.member_basic_info.value.indexOf('nickname') != -1"
-    >
-      <div>会员昵称：张三</div>
-    </div>
-    <div
-      class="my-[10px]"
-      v-show="
-        data.buyer_info.member_basic_info.value.indexOf('account_balance') != -1
-      "
-    >
-      账户余额：￥2000.00
-    </div>
-    <div
-      class="my-[10px]"
-      v-show="
-        data.buyer_info.member_basic_info.value.indexOf('account_point') != -1
-      "
-    >
-      账户积分：300
-    </div>
-    <div
-      class="my-[10px]"
-      v-show="data.buyer_info.buyer_mobile.status"
-      :class="[
-        data.buyer_info.buyer_mobile.fontSize + '-size',
-        data.buyer_info.buyer_mobile.fontWeight + '-weight',
-      ]"
-    >
-      会员手机号：{{
-        data.buyer_info.buyer_mobile.value == 'yes'
-          ? '152****5131'
-          : '15266665131'
-      }}
-    </div>
-    <div
-      class="bottom-border"
-      v-show="
-        data.buyer_info.member_basic_info.value ||
-        data.buyer_info.buyer_mobile.status
-      "
-    ></div>
-
-    <div
-      class="my-[10px]"
-      v-show="data.buyer_info.taker_name.status"
-      :class="[
-        data.buyer_info.taker_name.fontSize + '-size',
-        data.buyer_info.taker_name.fontWeight + '-weight',
-      ]"
-    >
-      收货人：小张
-    </div>
-    <div
-      class="my-[10px]"
-      v-show="data.buyer_info.taker_mobile.status"
-      :class="[
-        data.buyer_info.taker_mobile.fontSize + '-size',
-        data.buyer_info.taker_mobile.fontWeight + '-weight',
-      ]"
-    >
-      联系方式：{{
-        data.buyer_info.taker_mobile.value == 'yes'
-          ? '152****5131'
-          : '15266665131'
-      }}
-    </div>
-    <div
-      class="my-[10px]"
-      v-show="data.buyer_info.taker_full_address.status"
-      :class="[
-        data.buyer_info.taker_full_address.fontSize + '-size',
-        data.buyer_info.taker_full_address.fontWeight + '-weight',
-      ]"
-    >
-      收货地址：山西省太原市小店区创业街27号时代广场大厦
-    </div>
-    <div
-      class="my-[10px]"
-      v-show="data.buyer_info.member_remark.status"
-      :class="[
-        data.buyer_info.member_remark.fontSize + '-size',
-        data.buyer_info.member_remark.fontWeight + '-weight',
-      ]"
-    >
-      买家备注：微辣，多放孜然，谢谢！
-    </div>
-    <div
-      class="bottom-border"
-      v-show="
-        data.buyer_info.taker_name.status ||
-        data.buyer_info.taker_mobile.status ||
-        data.buyer_info.taker_full_address.status ||
-        data.buyer_info.member_remark.status
-      "
-    ></div>
-
-    <!-- 底部信息 -->
-    <div class="my-[10px]" v-show="data.bottom_info.qrcode.status">
-      <img :src="qrcode" class="w-[150px] h-[150px] mx-auto" />
-    </div>
-    <div
-      class="my-[10px] text-center text-[16px]"
-      v-show="data.bottom_info.ticket_print_time.status"
-    >
-      打印时间：2024年7月13日 17:48:39
-    </div>
-    <div
-      class="my-[10px] text-center text-[16px]"
-      v-show="data.bottom_info.bottom_remark.status"
-    >
-      {{ data.bottom_info.bottom_remark.value }}
-    </div>
-  </div>
+	<div class="print-preview">
+
+		<!-- 票头信息 -->
+		<div class="my-[10px] text-center" v-show="data.head_info.ticket_name.status" :class="[data.head_info.ticket_name.fontSize + '-size',data.head_info.ticket_name.fontWeight + '-weight']">{{ data.head_info.ticket_name.value }}</div>
+		<div class="bottom-border" v-show="data.head_info.ticket_name.status"></div>
+
+		<div class="my-[10px] text-center" v-show="data.head_info.shop_name.status" :class="[data.head_info.shop_name.fontSize + '-size',data.head_info.shop_name.fontWeight + '-weight']">商城名称</div>
+		<div class="bottom-border" v-show="data.head_info.shop_name.status"></div>
+
+		<!-- 订单信息 -->
+		<div v-show="data.order_info.order_item.value.length">
+			<div class="text-[16px] my-[10px]" v-show="data.order_info.order_item.value.indexOf('order_no') != -1">订单编号：20240713456280064905216</div>
+			<div class="text-[16px] my-[10px]" v-show="data.order_info.order_item.value.indexOf('order_from') != -1">订单来源：微信小程序</div>
+			<div class="text-[16px] my-[10px]" v-show="data.order_info.order_item.value.indexOf('order_status') != -1">订单状态：已完成</div>
+			<div class="text-[16px] my-[10px]" v-show="data.order_info.order_item.value.indexOf('pay_type') != -1">支付方式：微信支付</div>
+			<div class="text-[16px] my-[10px]" v-show="data.order_info.order_item.value.indexOf('delivery_type') != -1">配送方式：同城配送</div>
+			<div class="text-[16px] my-[10px]" v-show="data.order_info.order_item.value.indexOf('create_time') != -1">下单时间：2023-12-12 14:20:20</div>
+			<div class="text-[16px] my-[10px]" v-show="data.order_info.order_item.value.indexOf('pay_time') != -1">付款时间：2023-12-12 14:20:30</div>
+			<div class="text-[16px] my-[10px]" v-show="data.order_info.order_item.value.indexOf('goods_money') != -1">商品总额：￥10.00</div>
+			<div class="text-[16px] my-[10px]" v-show="data.order_info.order_item.value.indexOf('delivery_money') != -1">配送金额：￥1.00</div>
+			<div class="text-[16px] my-[10px]" v-show="data.order_info.order_item.value.indexOf('discount_money') != -1">优惠金额：￥2.00</div>
+		</div>
+		<div class="my-[10px]" v-show="data.order_info.order_money.status" :class="[data.order_info.order_money.fontSize + '-size',data.order_info.order_money.fontWeight + '-weight']">实付金额：¥7.00</div>
+		<div class="my-[10px]" v-show="data.order_info.shop_remark.status" :class="[data.order_info.shop_remark.fontSize + '-size',data.order_info.shop_remark.fontWeight + '-weight']">商家备注：新用户优惠</div>
+		<div class="bottom-border" v-show="data.order_info.order_item.value.length || data.order_info.order_money.status||data.order_info.shop_remark.status"></div>
+
+		<!-- 商品信息 -->
+		<div class="flex my-[10px]">
+			<div class="text-[16px]" style="flex: 2 1 0;">商品名称</div>
+			<div class="text-[16px] flex-1 text-right">数量</div>
+			<div class="text-[16px] flex-1 text-right" v-show="data.goods_info.goods_price.status">金额</div>
+		</div>
+		<div class="flex my-[10px]">
+			<div class="text-[16px]" style="flex: 2 1 0;" :class="[data.goods_info.goods_name.fontSize + '-size',data.goods_info.goods_name.fontWeight + '-weight']">可口可乐碳酸饮料</div>
+			<div class="text-[16px] flex-1 text-right">x2</div>
+			<div class="text-[16px] flex-1 text-right" v-show="data.goods_info.goods_price.status" :class="[data.goods_info.goods_price.fontSize + '-size',data.goods_info.goods_price.fontWeight + '-weight']">¥54.50</div>
+		</div>
+		<div class="flex my-[10px]">
+			<div class="text-[16px]" style="flex: 2 1 0;" :class="[data.goods_info.goods_name.fontSize + '-size',data.goods_info.goods_name.fontWeight + '-weight']">液晶电视</div>
+			<div class="text-[16px] flex-1 text-right">x1</div>
+			<div class="text-[16px] flex-1 text-right" v-show="data.goods_info.goods_price.status" :class="[data.goods_info.goods_price.fontSize + '-size',data.goods_info.goods_price.fontWeight + '-weight']">¥1999.00</div>
+		</div>
+		<div class="bottom-border"></div>
+
+		<!-- 买家/收货信息 -->
+		<div class="my-[10px]" v-show="data.buyer_info.member_basic_info.value.indexOf('nickname') != -1"><div>会员昵称：张三</div></div>
+		<div class="my-[10px]" v-show="data.buyer_info.member_basic_info.value.indexOf('account_balance') != -1">账户余额：￥2000.00</div>
+		<div class="my-[10px]" v-show="data.buyer_info.member_basic_info.value.indexOf('account_point') != -1">账户积分：300</div>
+		<div class="my-[10px]" v-show="data.buyer_info.buyer_mobile.status" :class="[data.buyer_info.buyer_mobile.fontSize + '-size',data.buyer_info.buyer_mobile.fontWeight + '-weight']">会员手机号：{{ data.buyer_info.buyer_mobile.value == 'yes' ? '152****5131' : '15266665131' }}</div>
+		<div class="bottom-border" v-show="data.buyer_info.member_basic_info.value || data.buyer_info.buyer_mobile.status"></div>
+
+		<div class="my-[10px]" v-show="data.buyer_info.taker_name.status" :class="[data.buyer_info.taker_name.fontSize + '-size',data.buyer_info.taker_name.fontWeight + '-weight']">收货人：小张</div>
+		<div class="my-[10px]" v-show="data.buyer_info.taker_mobile.status" :class="[data.buyer_info.taker_mobile.fontSize + '-size',data.buyer_info.taker_mobile.fontWeight + '-weight']">联系方式：{{ data.buyer_info.taker_mobile.value == 'yes' ? '152****5131' : '15266665131' }}</div>
+		<div class="my-[10px]" v-show="data.buyer_info.taker_full_address.status" :class="[data.buyer_info.taker_full_address.fontSize + '-size',data.buyer_info.taker_full_address.fontWeight + '-weight']">收货地址：山西省太原市小店区创业街27号时代广场大厦</div>
+		<div class="my-[10px]" v-show="data.buyer_info.member_remark.status" :class="[data.buyer_info.member_remark.fontSize + '-size',data.buyer_info.member_remark.fontWeight + '-weight']">买家备注：微辣，多放孜然，谢谢！</div>
+		<div class="bottom-border" v-show="data.buyer_info.taker_name.status || data.buyer_info.taker_mobile.status|| data.buyer_info.taker_full_address.status || data.buyer_info.member_remark.status"></div>
+
+		<!-- 底部信息 -->
+		<div class="my-[10px]" v-show="data.bottom_info.qrcode.status">
+			<img :src="qrcode" class="w-[150px] h-[150px] mx-auto" />
+		</div>
+		<div class="my-[10px] text-center text-[16px]" v-show="data.bottom_info.ticket_print_time.status">打印时间：2024年7月13日 17:48:39</div>
+		<div class="my-[10px] text-center text-[16px]" v-show="data.bottom_info.bottom_remark.status">{{ data.bottom_info.bottom_remark.value }}</div>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { ref, computed } from 'vue'
-import usePosterStore from '@/stores/modules/poster'
-import QRCode from 'qrcode'
+    import { ref, computed } from 'vue'
+    import usePosterStore from '@/stores/modules/poster'
+    import QRCode from 'qrcode'
 
-const posterStore = usePosterStore()
+    const posterStore = usePosterStore()
 
-const prop = defineProps({
-  value: {
-    type: Object,
-    default: {},
-  },
-})
+    const prop = defineProps({
+        value: {
+            type: Object,
+            default: {}
+        }
+    })
 
-const data = computed(() => {
-  return prop.value
-})
+    const data = computed(() => {
+        return prop.value;
+    })
 
-const qrcode = ref('')
+    const qrcode = ref('')
 
-QRCode.toDataURL('小票预览二维码', {
-  errorCorrectionLevel: 'L',
-  margin: 0,
-  width: 200,
-}).then((url) => {
-  qrcode.value = url
-})
+    QRCode.toDataURL('小票预览二维码', {
+        errorCorrectionLevel: 'L',
+        margin: 0,
+        width: 200
+    }).then(url => {
+        qrcode.value = url
+    })
+
+    defineExpose({})
 
-defineExpose({})
 </script>
 
 <style lang="scss" scoped>
-.print-preview {
-  width: 400px;
-  padding: 10px;
-  border: 1px solid #ededed;
-  border-radius: 10px;
-  background: #f8f8f9;
-  color: #333;
-  margin: 0 auto;
-
-  .bottom-border {
-    border-bottom: 1px dashed #ccc;
-  }
-
-  .normal-size {
-    font-size: 16px;
-  }
-
-  .big-size {
-    font-size: 20px;
-  }
-
-  .bold-weight {
-    font-weight: 700;
-  }
-}
+	.print-preview {
+		width: 400px;
+		padding: 10px;
+		border: 1px solid #ededed;
+		border-radius: 10px;
+		background: #f8f8f9;
+		color: #333;
+		margin: 0 auto;
+
+		.bottom-border {
+			border-bottom: 1px dashed #ccc;
+		}
+
+		.normal-size {
+			font-size: 16px;
+		}
+
+		.big-size {
+			font-size: 20px;
+		}
+
+		.bold-weight {
+			font-weight: 700;
+		}
+	}
 </style>
diff --git a/admin/src/addon/shop/views/stat/goods.vue b/admin/src/addon/shop/views/stat/goods.vue
index 6f080a05..efc1f8a8 100644
--- a/admin/src/addon/shop/views/stat/goods.vue
+++ b/admin/src/addon/shop/views/stat/goods.vue
@@ -1,412 +1,231 @@
 <template>
-  <div class="main-container">
-    <!-- 商品概况 -->
-    <el-card shadow="never" class="!border-none goods-stat">
-      <template #header>
-        <div class="flex justify-between items-start">
-          <span class="text-lg font-extrabold mr-[10px]">{{
-            t('goodsOverview')
-          }}</span>
-          <div class="flex items-center">
-            <el-form :inline="true">
-              <el-form-item :label="t('timeFilter')" prop="date">
-                <el-date-picker
-                  v-model="date"
-                  type="daterange"
-                  value-format="YYYY/MM/DD"
-                  :start-placeholder="t('startTime')"
-                  :end-placeholder="t('endTime')"
-                  :shortcuts="shortcuts"
-                />
-              </el-form-item>
-              <el-form-item>
-                <el-button type="primary" @click="getGoodsStatisticsFn()">{{
-                  t('search')
-                }}</el-button>
-              </el-form-item>
-            </el-form>
-          </div>
-        </div>
-      </template>
-      <div class="flex flex-wrap">
-        <div class="w-[25%] flex flex-shrink-0 mb-[30px]">
-          <div
-            class="w-[32px] h-[32px] bg-[#1890ff] rounded-full flex justify-center items-center mr-[15px]"
-          >
-            <span class="nc-iconfont nc-icon-a-Group840V6xx text-[#fff]"></span>
-          </div>
-          <el-statistic :value="goodsTotal.access_num">
-            <template #title>
-              <div class="flex items-center">
-                <span class="mr-[5px] text-[14px]">{{
-                  t('goodsAccessNum')
-                }}</span>
-                <el-tooltip
-                  class="box-item"
-                  effect="light"
-                  :content="t('goodsAccessNumTip')"
-                  placement="top"
-                >
-                  <el-icon>
-                    <QuestionFilled />
-                  </el-icon>
-                </el-tooltip>
-              </div>
-            </template>
-          </el-statistic>
-        </div>
-        <div class="w-[25%] flex flex-shrink-0 mb-[30px]">
-          <div
-            class="w-[32px] h-[32px] bg-[#00c050] rounded-full flex justify-center items-center mr-[15px]"
-          >
-            <span class="nc-iconfont nc-icon-a-zuji34 text-[#fff]"></span>
-          </div>
-          <el-statistic :value="goodsTotal.goods_visit_member_count">
-            <template #title>
-              <div class="flex items-center">
-                <span class="mr-[5px] text-[14px]">{{
-                  t('goodsVisitCount')
-                }}</span>
-                <el-tooltip
-                  class="box-item"
-                  effect="light"
-                  :content="t('goodsVisitCountTips')"
-                  placement="top"
-                >
-                  <el-icon>
-                    <QuestionFilled />
-                  </el-icon>
-                </el-tooltip>
-              </div>
-            </template>
-          </el-statistic>
-        </div>
-        <div class="w-[25%] flex flex-shrink-0 mb-[30px]">
-          <div
-            class="w-[32px] h-[32px] bg-[#ffab2b] rounded-full flex justify-center items-center mr-[15px]"
-          >
-            <span
-              class="nc-iconfont nc-icon-gouwucheV6xx-11 text-[#fff]"
-            ></span>
-          </div>
-          <el-statistic :value="goodsTotal.cart_num">
-            <template #title>
-              <div class="flex items-center">
-                <span class="mr-[5px] text-[14px]">{{ t('cartNum') }}</span>
-                <el-tooltip
-                  class="box-item"
-                  effect="light"
-                  :content="t('cartNumTips')"
-                  placement="top"
-                >
-                  <el-icon>
-                    <QuestionFilled />
-                  </el-icon>
-                </el-tooltip>
-              </div>
-            </template>
-          </el-statistic>
-        </div>
-        <div class="w-[25%] flex flex-shrink-0 mb-[30px]">
-          <div
-            class="w-[32px] h-[32px] bg-[#b37feb] rounded-full flex justify-center items-center mr-[15px]"
-          >
-            <span class="nc-iconfont nc-icon-xiadanjianshu text-[#fff]"></span>
-          </div>
-          <el-statistic :value="goodsTotal.sale_num">
-            <template #title>
-              <div class="flex items-center">
-                <span class="mr-[5px] text-[14px]">{{ t('saleNum') }}</span>
-                <el-tooltip
-                  class="box-item"
-                  effect="light"
-                  :content="t('saleNumTips')"
-                  placement="top"
-                >
-                  <el-icon>
-                    <QuestionFilled />
-                  </el-icon>
-                </el-tooltip>
-              </div>
-            </template>
-          </el-statistic>
-        </div>
-        <div class="w-[25%] flex flex-shrink-0 mb-[30px]">
-          <div
-            class="w-[32px] h-[32px] bg-[#627DFE] rounded-full flex justify-center items-center mr-[15px]"
-          >
-            <span class="nc-iconfont nc-icon-zhifujianshu text-[#fff]"></span>
-          </div>
-          <el-statistic :value="goodsTotal.pay_num">
-            <template #title>
-              <div class="flex items-center">
-                <span class="mr-[5px] text-[14px]">{{ t('payNum') }}</span>
-                <el-tooltip
-                  class="box-item"
-                  effect="light"
-                  :content="t('payNumTips')"
-                  placement="top"
-                >
-                  <el-icon>
-                    <QuestionFilled />
-                  </el-icon>
-                </el-tooltip>
-              </div>
-            </template>
-          </el-statistic>
-        </div>
-        <div class="w-[25%] flex flex-shrink-0">
-          <div
-            class="w-[32px] h-[32px] bg-[#F76A6C] rounded-full flex justify-center items-center mr-[15px]"
-          >
-            <span class="nc-iconfont nc-icon-zhifujine text-[#fff]"></span>
-          </div>
-          <el-statistic
-            :value="goodsTotal.pay_money"
-            class="flex-1"
-            precision="2"
-          >
-            <template #title>
-              <div class="flex items-center">
-                <span class="mr-[5px] text-[14px]">{{ t('payMoney') }}</span>
-                <el-tooltip
-                  class="box-item"
-                  effect="light"
-                  :content="t('payMoneyTips')"
-                  placement="top"
-                >
-                  <el-icon>
-                    <QuestionFilled />
-                  </el-icon>
-                </el-tooltip>
-              </div>
-            </template>
-          </el-statistic>
-        </div>
-        <div class="w-[25%] flex flex-shrink-0">
-          <div
-            class="w-[32px] h-[32px] bg-[#43C5FF] rounded-full flex justify-center items-center mr-[15px]"
-          >
-            <span class="nc-iconfont nc-icon-tuikuanjine text-[#fff]"></span>
-          </div>
-          <el-statistic
-            :value="goodsTotal.refund_money"
-            class="flex-1"
-            precision="2"
-          >
-            <template #title>
-              <div class="flex items-center">
-                <span class="mr-[5px] text-[14px]">{{ t('refundMoney') }}</span>
-                <el-tooltip
-                  class="box-item"
-                  effect="light"
-                  :content="t('refundMoneyTips')"
-                  placement="top"
-                >
-                  <el-icon>
-                    <QuestionFilled />
-                  </el-icon>
-                </el-tooltip>
-              </div>
+    <div class="main-container">
+        <!-- 商品概况 -->
+        <el-card shadow="never" class="!border-none goods-stat">
+            <template #header>
+               <div class="flex justify-between items-start">
+                    <span class="text-lg font-extrabold mr-[10px]">{{  t('goodsOverview') }}</span>
+                    <div class="flex items-center">
+                        <el-form :inline="true">
+                            <el-form-item :label="t('timeFilter')" prop="date">
+                                <el-date-picker v-model="date" type="daterange" value-format="YYYY/MM/DD" :start-placeholder="t('startTime')" :end-placeholder="t('endTime')" :shortcuts="shortcuts" />
+                            </el-form-item>
+                            <el-form-item>
+                                <el-button type="primary"  @click="getGoodsStatisticsFn()">{{ t('search') }}</el-button>
+                            </el-form-item>
+                        </el-form>
+                    </div>
+                </div>
             </template>
-          </el-statistic>
+            <div class="flex flex-wrap">
+                <div class="w-[25%] flex flex-shrink-0 mb-[30px]">
+                    <div class="w-[32px] h-[32px] bg-[#1890ff] rounded-full flex justify-center items-center mr-[15px]">
+                        <span class="nc-iconfont nc-icon-a-Group840V6xx text-[#fff]"></span>
+                    </div>
+                    <el-statistic :value="goodsTotal.access_num">
+                        <template #title>
+                            <div class="flex items-center">
+                                <span class="mr-[5px] text-[14px]">{{ t('goodsAccessNum') }}</span>
+                                <el-tooltip class="box-item" effect="light" :content="t('goodsAccessNumTip')" placement="top">
+                                    <el-icon>
+                                        <QuestionFilled />
+                                    </el-icon>
+                                </el-tooltip>
+                            </div>
+                        </template>
+                    </el-statistic>
+                </div>
+                <div class="w-[25%] flex flex-shrink-0 mb-[30px]">
+                    <div class="w-[32px] h-[32px] bg-[#00c050] rounded-full flex justify-center items-center mr-[15px]">
+                        <span class="nc-iconfont nc-icon-a-zuji34 text-[#fff]"></span>
+                    </div>
+                    <el-statistic :value="goodsTotal.goods_visit_member_count">
+                        <template #title>
+                            <div class="flex items-center">
+                                <span class="mr-[5px] text-[14px]">{{ t('goodsVisitCount') }}</span>
+                                <el-tooltip class="box-item" effect="light" :content="t('goodsVisitCountTips')" placement="top">
+                                    <el-icon>
+                                        <QuestionFilled />
+                                    </el-icon>
+                                </el-tooltip>
+                            </div>
+                        </template>
+                    </el-statistic>
+                </div>
+                <div class="w-[25%] flex flex-shrink-0 mb-[30px]">
+                    <div class="w-[32px] h-[32px] bg-[#ffab2b] rounded-full flex justify-center items-center mr-[15px]">
+                        <span class="nc-iconfont nc-icon-gouwucheV6xx-11 text-[#fff]"></span>
+                    </div>
+                    <el-statistic :value="goodsTotal.cart_num">
+                        <template #title>
+                            <div class="flex items-center">
+                                <span class="mr-[5px] text-[14px]">{{ t('cartNum') }}</span>
+                                <el-tooltip class="box-item" effect="light" :content="t('cartNumTips')" placement="top">
+                                    <el-icon>
+                                        <QuestionFilled />
+                                    </el-icon>
+                                </el-tooltip>
+                            </div>
+                        </template>
+                    </el-statistic>
+                </div>
+                <div class="w-[25%] flex flex-shrink-0 mb-[30px]">
+                    <div class="w-[32px] h-[32px] bg-[#b37feb] rounded-full flex justify-center items-center mr-[15px]">
+                        <span class="nc-iconfont nc-icon-xiadanjianshu text-[#fff]"></span>
+                    </div>
+                    <el-statistic :value="goodsTotal.sale_num">
+                        <template #title>
+                            <div class="flex items-center">
+                                <span class="mr-[5px] text-[14px]">{{ t('saleNum') }}</span>
+                                <el-tooltip class="box-item" effect="light" :content="t('saleNumTips')" placement="top">
+                                    <el-icon>
+                                        <QuestionFilled />
+                                    </el-icon>
+                                </el-tooltip>
+                            </div>
+                        </template>
+                    </el-statistic>
+                </div>
+                <div class="w-[25%] flex flex-shrink-0 mb-[30px]">
+                    <div class="w-[32px] h-[32px] bg-[#627DFE] rounded-full flex justify-center items-center mr-[15px]">
+                        <span class="nc-iconfont nc-icon-zhifujianshu text-[#fff]"></span>
+                    </div>
+                    <el-statistic :value="goodsTotal.pay_num">
+                        <template #title>
+                            <div class="flex items-center">
+                                <span class="mr-[5px] text-[14px]">{{ t('payNum') }}</span>
+                                <el-tooltip class="box-item" effect="light" :content="t('payNumTips')" placement="top">
+                                    <el-icon>
+                                        <QuestionFilled />
+                                    </el-icon>
+                                </el-tooltip>
+                            </div>
+                        </template>
+                    </el-statistic>
+                </div>
+                <div class="w-[25%] flex flex-shrink-0">
+                    <div class="w-[32px] h-[32px] bg-[#F76A6C] rounded-full flex justify-center items-center mr-[15px]">
+                        <span class="nc-iconfont nc-icon-zhifujine text-[#fff]"></span>
+                    </div>
+                    <el-statistic :value="goodsTotal.pay_money" class="flex-1" precision="2">
+                        <template #title>
+                            <div class="flex items-center">
+                                <span class="mr-[5px] text-[14px]">{{ t('payMoney') }}</span>
+                                <el-tooltip class="box-item" effect="light" :content="t('payMoneyTips')" placement="top">
+                                    <el-icon>
+                                        <QuestionFilled />
+                                    </el-icon>
+                                </el-tooltip>
+                            </div>
+                        </template>
+                    </el-statistic>
+                </div>
+                <div class="w-[25%] flex flex-shrink-0">
+                    <div class="w-[32px] h-[32px] bg-[#43C5FF] rounded-full flex justify-center items-center mr-[15px]">
+                        <span class="nc-iconfont nc-icon-tuikuanjine text-[#fff]"></span>
+                    </div>
+                    <el-statistic :value="goodsTotal.refund_money" class="flex-1" precision="2">
+                        <template #title>
+                            <div class="flex items-center">
+                                <span class="mr-[5px] text-[14px]">{{ t('refundMoney') }}</span>
+                                <el-tooltip class="box-item" effect="light" :content="t('refundMoneyTips')" placement="top">
+                                    <el-icon>
+                                        <QuestionFilled />
+                                    </el-icon>
+                                </el-tooltip>
+                            </div>
+                        </template>
+                    </el-statistic>
+                </div>
+                <div class="w-[25%] flex flex-shrink-0">
+                    <div class="w-[32px] h-[32px] bg-[#11D0EA] rounded-full flex justify-center items-center mr-[15px]">
+                        <span class="nc-iconfont nc-icon-tuikuanjianshu text-[#fff]"></span>
+                    </div>
+                    <el-statistic :value="goodsTotal.refund_num">
+                        <template #title>
+                            <div class="flex items-center">
+                                <span class="mr-[5px] text-[14px]">{{ t('refundNum') }}</span>
+                                <el-tooltip class="box-item" effect="light" :content="t('refundNumTips')" placement="top">
+                                    <el-icon>
+                                        <QuestionFilled />
+                                    </el-icon>
+                                </el-tooltip>
+                            </div>
+                        </template>
+                    </el-statistic>
+                </div>
+            </div>
+        </el-card>
+        <div class="bg-[white] mt-[20px]">
+            <div ref="incomeChartRef" class="h-[400px] w-full pt-[30px]"></div>
         </div>
-        <div class="w-[25%] flex flex-shrink-0">
-          <div
-            class="w-[32px] h-[32px] bg-[#11D0EA] rounded-full flex justify-center items-center mr-[15px]"
-          >
-            <span class="nc-iconfont nc-icon-tuikuanjianshu text-[#fff]"></span>
-          </div>
-          <el-statistic :value="goodsTotal.refund_num">
-            <template #title>
-              <div class="flex items-center">
-                <span class="mr-[5px] text-[14px]">{{ t('refundNum') }}</span>
-                <el-tooltip
-                  class="box-item"
-                  effect="light"
-                  :content="t('refundNumTips')"
-                  placement="top"
-                >
-                  <el-icon>
-                    <QuestionFilled />
-                  </el-icon>
-                </el-tooltip>
-              </div>
+        <el-card shadow="never" class="!border-none goods-stat mt-[20px]">
+            <template #header>
+               <div>
+                    <div class="text-lg font-extrabold mb-[20px]">{{ t('goodsRank') }}</div>
+                    <el-form :inline="true" :model="goodsData.searchParam" ref="searchFormRef">
+                        <el-form-item :label="t('goodsName')" prop="goods_name">
+                            <el-input v-model.trim="goodsData.searchParam.goods_name" :placeholder="t('goodsNamePlaceholder')" maxlength="60" />
+                        </el-form-item>
+                        <el-form-item :label="t('goodsCategory')" prop="category_ids">
+                            <el-cascader v-model="goodsData.searchParam.category_ids" :options="goodsCategoryOptions" :placeholder="t('all')" clearable :props="{ value: 'value', label: 'label', emitPath:false }" @change="handleSearch"/>
+                        </el-form-item>
+                        <el-form-item :label="t('totalType')" prop="type">
+                            <el-select v-model="goodsData.searchParam.type" :placeholder="t('totalTypePlaceholder')" clearable @change="handleSearch">
+                                <el-option v-for="item in goodsStatisticsType" :key="item.value" :label="item.label" :value="item.value" />
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item :label="t('timeFilter')" prop="date">
+                            <el-date-picker v-model="goodsData.searchParam.date" type="daterange" value-format="YYYY/MM/DD" :start-placeholder="t('startTime')" :end-placeholder="t('endTime')" :shortcuts="shortcuts" />
+                        </el-form-item>
+                        <el-form-item>
+                            <el-button type="primary"  @click="loadGoodsList()">{{ t('search') }}</el-button>
+                            <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                        </el-form-item>
+                    </el-form>
+                </div>
             </template>
-          </el-statistic>
-        </div>
-      </div>
-    </el-card>
-    <div class="bg-[white] mt-[20px]">
-      <div ref="incomeChartRef" class="h-[400px] w-full pt-[30px]"></div>
-    </div>
-    <el-card shadow="never" class="!border-none goods-stat mt-[20px]">
-      <template #header>
-        <div>
-          <div class="text-lg font-extrabold mb-[20px]">
-            {{ t('goodsRank') }}
-          </div>
-          <el-form
-            :inline="true"
-            :model="goodsData.searchParam"
-            ref="searchFormRef"
-          >
-            <el-form-item :label="t('goodsName')" prop="goods_name">
-              <el-input
-                v-model.trim="goodsData.searchParam.goods_name"
-                :placeholder="t('goodsNamePlaceholder')"
-                maxlength="60"
-              />
-            </el-form-item>
-            <el-form-item :label="t('goodsCategory')" prop="category_ids">
-              <el-cascader
-                v-model="goodsData.searchParam.category_ids"
-                :options="goodsCategoryOptions"
-                :placeholder="t('all')"
-                clearable
-                :props="{ value: 'value', label: 'label', emitPath: false }"
-                @change="handleSearch"
-              />
-            </el-form-item>
-            <el-form-item :label="t('totalType')" prop="type">
-              <el-select
-                v-model="goodsData.searchParam.type"
-                :placeholder="t('totalTypePlaceholder')"
-                clearable
-                @change="handleSearch"
-              >
-                <el-option
-                  v-for="item in goodsStatisticsType"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item :label="t('timeFilter')" prop="date">
-              <el-date-picker
-                v-model="goodsData.searchParam.date"
-                type="daterange"
-                value-format="YYYY/MM/DD"
-                :start-placeholder="t('startTime')"
-                :end-placeholder="t('endTime')"
-                :shortcuts="shortcuts"
-              />
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" @click="loadGoodsList()">{{
-                t('search')
-              }}</el-button>
-              <el-button @click="resetForm(searchFormRef)">{{
-                t('reset')
-              }}</el-button>
-            </el-form-item>
-          </el-form>
-        </div>
-      </template>
-      <div>
-        <el-table
-          :data="goodsData.data"
-          size="large"
-          v-loading="goodsData.loading"
-          ref="goodsListTableRef"
-        >
-          <template #empty>
-            <span>{{ !goodsData.loading ? t('emptyData') : '' }}</span>
-          </template>
-          <el-table-column :label="t('goodsInfo')" min-width="300">
-            <template #default="{ row }">
-              <div
-                class="flex items-center cursor-pointer"
-                @click="previewEvent(row)"
-              >
-                <div
-                  class="min-w-[70px] h-[70px] flex items-center justify-center"
-                >
-                  <el-image
-                    v-if="row.goods_cover_thumb_small"
-                    class="w-[70px] h-[70px]"
-                    :src="img(row.goods_cover_thumb_small)"
-                    fit="contain"
-                  >
-                    <template #error>
-                      <div class="image-slot">
-                        <img
-                          class="w-[70px] h-[70px]"
-                          src="@/addon/shop/assets/goods_default.png"
-                        />
-                      </div>
+            <div>
+                <el-table :data="goodsData.data" size="large" v-loading="goodsData.loading" ref="goodsListTableRef" >
+                    <template #empty>
+                        <span>{{ !goodsData.loading ? t('emptyData') : '' }}</span>
                     </template>
-                  </el-image>
-                  <img
-                    v-else
-                    class="w-[70px] h-[70px]"
-                    src="@/addon/shop/assets/goods_default.png"
-                    fit="contain"
-                  />
+                    <el-table-column :label="t('goodsInfo')" min-width="300">
+                        <template #default="{ row }">
+                            <div class="flex items-center cursor-pointer" @click="previewEvent(row)">
+                                <div class="min-w-[70px] h-[70px] flex items-center justify-center">
+                                    <el-image v-if="row.goods_cover_thumb_small" class="w-[70px] h-[70px]" :src="img(row.goods_cover_thumb_small)" fit="contain">
+                                        <template #error>
+                                            <div class="image-slot">
+                                                <img class="w-[70px] h-[70px]" src="@/addon/shop/assets/goods_default.png" />
+                                            </div>
+                                        </template>
+                                    </el-image>
+                                    <img v-else class="w-[70px] h-[70px]" src="@/addon/shop/assets/goods_default.png" fit="contain" />
+                                </div>
+                                <div class="ml-2 flex flex-col items-start">
+                                    <span :title="row.goods_name" class="multi-hidden">{{ row.goods_name }}</span>
+                                    <span class="px-[4px]  text-[12px] text-[#fff] rounded-[4px] bg-primary leading-[18px]" v-if="row.is_gift == 1">赠品</span>
+                                </div>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="access_num" :label="t('accessNum')" min-width="100"  />
+                    <el-table-column prop="goods_visit_member_count" :label="t('visitCount')" min-width="100"  />
+                    <el-table-column prop="cart_num" :label="t('cartNumber')" min-width="100"  />
+                    <el-table-column prop="sale_num" :label="t('saleNumber')" min-width="100"  />
+                    <el-table-column prop="pay_num" :label="t('payNum')" min-width="100"  />
+                    <el-table-column prop="pay_money" :label="t('payTotal')" min-width="100" />
+                    <el-table-column prop="collect_num" :label="t('collectNum')" min-width="100"  />
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="goodsData.page" v-model:page-size="goodsData.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="goodsData.total"
+                        @size-change="loadGoodsList()" @current-change="loadGoodsList" />
                 </div>
-                <div class="ml-2 flex flex-col items-start">
-                  <span :title="row.goods_name" class="multi-hidden">{{
-                    row.goods_name
-                  }}</span>
-                  <span
-                    class="px-[4px] text-[12px] text-[#fff] rounded-[4px] bg-primary leading-[18px]"
-                    v-if="row.is_gift == 1"
-                    >赠品</span
-                  >
-                </div>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="access_num"
-            :label="t('accessNum')"
-            min-width="100"
-          />
-          <el-table-column
-            prop="goods_visit_member_count"
-            :label="t('visitCount')"
-            min-width="100"
-          />
-          <el-table-column
-            prop="cart_num"
-            :label="t('cartNumber')"
-            min-width="100"
-          />
-          <el-table-column
-            prop="sale_num"
-            :label="t('saleNumber')"
-            min-width="100"
-          />
-          <el-table-column
-            prop="pay_num"
-            :label="t('payNum')"
-            min-width="100"
-          />
-          <el-table-column
-            prop="pay_money"
-            :label="t('payTotal')"
-            min-width="100"
-          />
-          <el-table-column
-            prop="collect_num"
-            :label="t('collectNum')"
-            min-width="100"
-          />
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="goodsData.page"
-            v-model:page-size="goodsData.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="goodsData.total"
-            @size-change="loadGoodsList()"
-            @current-change="loadGoodsList"
-          />
-        </div>
-      </div>
-    </el-card>
-  </div>
+            </div>
+        </el-card>
+    </div>
 </template>
 <script lang="ts" setup>
 import { ref, reactive } from 'vue'
@@ -415,238 +234,216 @@ import { t } from '@/lang'
 import * as echarts from 'echarts'
 import { useRouter } from 'vue-router'
 import { getCategoryTree } from '@/addon/shop/api/goods'
-import {
-  getGoodsStatisticsBasic,
-  getGoodsStatisticsTrend,
-  getGoodsStatisticsType,
-  getGoodsStatisticsRank,
-} from '@/addon/shop/api/stat'
+import { getGoodsStatisticsBasic, getGoodsStatisticsTrend, getGoodsStatisticsType, getGoodsStatisticsRank } from '@/addon/shop/api/stat'
 import { FormInstance } from 'element-plus'
 
 const router = useRouter()
 const curDateRange = () => {
-  const end = new Date()
-  const start = new Date()
-  start.setTime(start.getTime() - 3600 * 1000 * 24 * 29)
-  const format = (date: any) => {
-    const year = date.getFullYear()
-    const month = date.getMonth() + 1
-    const day = date.getDate()
+    const end = new Date()
+    const start = new Date()
+    start.setTime(start.getTime() - 3600 * 1000 * 24 * 29)
+    const format = (date: any) => {
+        const year = date.getFullYear()
+        const month = date.getMonth() + 1
+        const day = date.getDate()
 
-    return year + '/' + month + '/' + day
-  }
-  return [format(start), format(end)]
+        return year + '/' + month + '/' + day
+    }
+    return [format(start), format(end)]
 }
 const date = ref<any>([])
 date.value = curDateRange()
 
 const shortcuts = [
-  {
-    text: '今天',
-    value: new Date(),
-  },
-  {
-    text: '昨天',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setTime(start.getTime() - 3600 * 1000 * 24)
-      return [start, end]
-    },
-  },
-  {
-    text: '最近7天',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '最近30天',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setTime(start.getTime() - 3600 * 1000 * 24 * 29)
-      return [start, end]
-    },
-  },
-  {
-    text: '上月',
-    value: () => {
-      const date = new Date()
-      const year = date.getFullYear()
-      const month = date.getMonth()
-      const start = new Date(year, month - 1, 1)
-      const end = new Date(year, month, 0)
-      return [start, end]
-    },
-  },
-  {
-    text: '本月',
-    value: () => {
-      const date = new Date()
-      const year = date.getFullYear()
-      const month = date.getMonth()
-      const start = new Date(year, month, 1)
-      const end = new Date()
-      return [start, end]
-    },
-  },
-  {
-    text: '本年',
-    value: () => {
-      const date = new Date()
-      const year = date.getFullYear()
-      const start = new Date(year, 0, 1)
-      const end = new Date()
-      return [start, end]
-    },
-  },
+    {
+        text: '今天',
+        value: new Date()
+    }, {
+        text: '昨天',
+        value: () => {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24)
+            return [start, end]
+        }
+    }, {
+        text: '最近7天',
+        value: () => {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            return [start, end]
+        }
+    }, {
+        text: '最近30天',
+        value: () => {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 29)
+            return [start, end]
+        }
+    }, {
+        text: '上月',
+        value: () => {
+            const date = new Date()
+            const year = date.getFullYear()
+            const month = date.getMonth()
+            const start = new Date(year, month - 1, 1)
+            const end = new Date(year, month, 0)
+            return [start, end]
+        }
+    }, {
+        text: '本月',
+        value: () => {
+            const date = new Date()
+            const year = date.getFullYear()
+            const month = date.getMonth()
+            const start = new Date(year, month, 1)
+            const end = new Date()
+            return [start, end]
+        }
+    }, {
+        text: '本年',
+        value: () => {
+            const date = new Date()
+            const year = date.getFullYear()
+            const start = new Date(year, 0, 1)
+            const end = new Date()
+            return [start, end]
+        }
+    }
 ]
 
 const goodsTotal = ref<any>([]) // 基本信息
 const goodsTrend = ref<any>([]) // 图表数据
 const getGoodsStatisticsFn = async () => {
-  const data = date.value ? date.value.join('-') : ''
-  goodsTotal.value = await (await getGoodsStatisticsBasic({ date: data })).data
-  goodsTrend.value = await (await getGoodsStatisticsTrend({ date: data })).data
-  setTimeout(() => {
-    initIncomeChart()
-  }, 20)
+    const data = date.value ? date.value.join('-') : ''
+    goodsTotal.value = await (await getGoodsStatisticsBasic({ date: data })).data
+    goodsTrend.value = await (await getGoodsStatisticsTrend({ date: data })).data
+    setTimeout(() => {
+        initIncomeChart()
+    }, 20)
 }
 getGoodsStatisticsFn()
 
 // 折线图
 const incomeChartRef = ref(null)
 const initIncomeChart = () => {
-  const goodsData = reactive<any>([])
-  const goodsLegend = reactive<any>([])
+    const goodsData = reactive<any>([])
+    const goodsLegend = reactive<any>([])
 
-  goodsTrend.value.data.forEach((item: any) => {
-    if (item.name == 'goods_visit_member_count') {
-      goodsData.push({
-        name: '商品访客数',
-        type: 'line',
-        smooth: true,
-        data: item.data,
-      })
-      goodsLegend.push('商品访客数')
-    } else if (item.name == 'access_count') {
-      goodsData.push({
-        name: '浏览量',
-        type: 'line',
-        smooth: true,
-        data: item.data,
-      })
-      goodsLegend.push('浏览量')
-    } else if (item.name == 'cart_num') {
-      goodsData.push({
-        name: '加购件数',
-        type: 'bar',
-        data: item.data,
-      })
-      goodsLegend.push('加购件数')
-    } else if (item.name == 'sale_num') {
-      goodsData.push({
-        name: '下单件数',
-        type: 'bar',
-        data: item.data,
-      })
-      goodsLegend.push('下单件数')
-    } else if (item.name == 'pay_num') {
-      goodsData.push({
-        name: '支付件数',
-        type: 'bar',
-        data: item.data,
-      })
-      goodsLegend.push('支付件数')
-    } else if (item.name == 'pay_money') {
-      goodsData.push({
-        name: '支付金额',
-        type: 'bar',
-        data: item.data,
-      })
-      goodsLegend.push('支付金额')
-    } else if (item.name == 'refund_money') {
-      goodsData.push({
-        name: '退款金额',
-        type: 'bar',
-        data: item.data,
-      })
-      goodsLegend.push('退款金额')
-    } else if (item.name == 'refund_num') {
-      goodsData.push({
-        name: '退款件数',
-        type: 'bar',
-        data: item.data,
-      })
-      goodsLegend.push('退款件数')
-    }
-  })
-  if (incomeChartRef.value !== null) {
-    const incomeChart = echarts.init(incomeChartRef.value)
-    // 配置项
-    const option = {
-      tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-          type: 'cross',
-        },
-      },
-      color: [
-        '#1890ff',
-        '#00c050',
-        '#F76A6C',
-        '#43C5FF',
-        '#ffab2b',
-        '#b37feb',
-        '#627DFE',
-        '#11D0EA',
-      ],
-      legend: {
-        data: [],
-        selected: {
-          加购件数: false,
-          下单件数: false,
-          支付件数: false,
-          退款件数: false,
-        },
-      },
-      xAxis: {
-        type: 'category',
-        axisLabel: {
-          interval: 0,
-          rotate: 45,
-        },
-        data: goodsTrend.value.xAxis,
-      },
-      yAxis: {
-        type: 'value',
-      },
-      grid: [
-        {
-          left: '3%',
-          right: '3%',
-          bottom: '40',
-          containLabel: true,
-        },
-      ],
-      series: [],
-    }
-    // 使用配置项初始化图表
-    option.series = goodsData
-    option.legend.data = goodsLegend
-    incomeChart.setOption(option)
-    incomeChart.resize({
-      width: 'auto',
-    })
-    window.addEventListener('resize', () => {
-      // 页面大小变化后Echarts也更改大小
-      incomeChart.resize()
+    goodsTrend.value.data.forEach((item: any) => {
+        if (item.name == 'goods_visit_member_count') {
+            goodsData.push({
+                name: '商品访客数',
+                type: 'line',
+                smooth: true,
+                data: item.data
+            })
+            goodsLegend.push('商品访客数')
+        } else if (item.name == 'access_count') {
+            goodsData.push({
+                name: '浏览量',
+                type: 'line',
+                smooth: true,
+                data: item.data
+            })
+            goodsLegend.push('浏览量')
+        } else if (item.name == 'cart_num') {
+            goodsData.push({
+                name: '加购件数',
+                type: 'bar',
+                data: item.data
+            })
+            goodsLegend.push('加购件数')
+        } else if (item.name == 'sale_num') {
+            goodsData.push({
+                name: '下单件数',
+                type: 'bar',
+                data: item.data
+            })
+            goodsLegend.push('下单件数')
+        } else if (item.name == 'pay_num') {
+            goodsData.push({
+                name: '支付件数',
+                type: 'bar',
+                data: item.data
+            })
+            goodsLegend.push('支付件数')
+        } else if (item.name == 'pay_money') {
+            goodsData.push({
+                name: '支付金额',
+                type: 'bar',
+                data: item.data
+            })
+            goodsLegend.push('支付金额')
+        } else if (item.name == 'refund_money') {
+            goodsData.push({
+                name: '退款金额',
+                type: 'bar',
+                data: item.data
+            })
+            goodsLegend.push('退款金额')
+        } else if (item.name == 'refund_num') {
+            goodsData.push({
+                name: '退款件数',
+                type: 'bar',
+                data: item.data
+            })
+            goodsLegend.push('退款件数')
+        }
     })
-  }
+    if (incomeChartRef.value !== null) {
+        const incomeChart = echarts.init(incomeChartRef.value)
+        // 配置项
+        const option = {
+            tooltip: {
+                trigger: 'axis',
+                axisPointer: {
+                    type: 'cross'
+                }
+            },
+            color: ['#1890ff', '#00c050', '#F76A6C', '#43C5FF', '#ffab2b', '#b37feb', '#627DFE', '#11D0EA'],
+            legend: {
+                data: [],
+                selected: {
+                    '加购件数': false,
+                    '下单件数': false,
+                    '支付件数': false,
+                    '退款件数': false,
+                }
+            },
+            xAxis: {
+                type: 'category',
+                axisLabel: {
+                    interval: 0,
+                    rotate: 45
+                },
+                data: goodsTrend.value.xAxis
+            },
+            yAxis: {
+                type: 'value'
+            },
+            grid: [{
+                left: '3%',
+                right: '3%',
+                bottom: '40',
+                containLabel: true
+            }],
+            series: []
+        }
+        // 使用配置项初始化图表
+        option.series = goodsData
+        option.legend.data = goodsLegend
+        incomeChart.setOption(option)
+        incomeChart.resize({
+            width: 'auto'
+        })
+        window.addEventListener('resize', () => {
+            // 页面大小变化后Echarts也更改大小
+            incomeChart.resize()
+        })
+    }
 }
 
 // 商品分类
@@ -655,120 +452,113 @@ const goodsCategoryOptions: any = reactive([])
 // 商品类型
 const goodsStatisticsType: any = reactive([])
 const initData = () => {
-  // 查询商品分类树结构
-  getCategoryTree().then((res) => {
-    const data = res.data
-    if (data) {
-      const goodsCategoryTree: any = []
-      // 增加全部筛选选择
-      goodsCategoryTree.push({
-        value: '',
-        label: '全部',
-        children: [],
-      })
-      data.forEach((item: any) => {
-        const children: any = []
-        if (item.child_list) {
-          children.push({
-            value: item.category_id,
-            label: '全部',
-          })
-          item.child_list.forEach((childItem: any) => {
-            children.push({
-              value: childItem.category_id,
-              label: childItem.category_name,
+    // 查询商品分类树结构
+    getCategoryTree().then((res) => {
+        const data = res.data
+        if (data) {
+            const goodsCategoryTree: any = []
+            // 增加全部筛选选择
+            goodsCategoryTree.push({
+                value: '',
+                label: '全部',
+                children: []
             })
-          })
+            data.forEach((item: any) => {
+                const children: any = []
+                if (item.child_list) {
+                    children.push({
+                        value: item.category_id,
+                        label: '全部'
+                    })
+                    item.child_list.forEach((childItem: any) => {
+                        children.push({
+                            value: childItem.category_id,
+                            label: childItem.category_name
+                        })
+                    })
+                }
+                goodsCategoryTree.push({
+                    value: item.category_id,
+                    label: item.category_name,
+                    children
+                })
+            })
+            goodsCategoryOptions.splice(0, goodsCategoryOptions.length, ...goodsCategoryTree)
         }
-        goodsCategoryTree.push({
-          value: item.category_id,
-          label: item.category_name,
-          children,
-        })
-      })
-      goodsCategoryOptions.splice(
-        0,
-        goodsCategoryOptions.length,
-        ...goodsCategoryTree
-      )
-    }
-  })
+    })
 
-  // 统计类型
-  getGoodsStatisticsType().then((res) => {
-    if (res.data) {
-      for (const k in res.data) {
-        goodsStatisticsType.push({
-          label: res.data[k],
-          value: k,
-        })
-      }
-    }
-  })
+    // 统计类型
+    getGoodsStatisticsType().then((res) => {
+        if (res.data) {
+            for (const k in res.data) {
+                goodsStatisticsType.push({
+                    label: res.data[k],
+                    value: k
+                })
+            }
+        }
+    })
 }
 initData()
 
 const goodsData = reactive<any>({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    goods_name: '',
-    date: [],
-    category_ids: '',
-    type: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        goods_name: '',
+        date: [],
+        category_ids: '',
+        type: ''
+    }
 })
 
 const loadGoodsList = (page: number = 1) => {
-  goodsData.loading = true
-  goodsData.page = page
-  const data = {
-    page: goodsData.page,
-    limit: goodsData.limit,
-    goods_name: goodsData.searchParam.goods_name,
-    type: goodsData.searchParam.type,
-    date: goodsData.searchParam.date
-      ? goodsData.searchParam.date.join('-')
-      : '',
-    category_ids: goodsData.searchParam.category_ids
-      ? [goodsData.searchParam.category_ids]
-      : [],
-  }
-  getGoodsStatisticsRank(data).then((res: any) => {
-    goodsData.data = res.data.data
-    goodsData.total = res.data.total
-    goodsData.loading = false
-  })
+    goodsData.loading = true
+    goodsData.page = page
+    const data = {
+        page: goodsData.page,
+        limit: goodsData.limit,
+        goods_name: goodsData.searchParam.goods_name,
+        type: goodsData.searchParam.type,
+        date: goodsData.searchParam.date ? goodsData.searchParam.date.join('-') : '',
+        category_ids: goodsData.searchParam.category_ids ? [goodsData.searchParam.category_ids] : []
+    }
+    getGoodsStatisticsRank(data).then((res: any) => {
+        goodsData.data = res.data.data
+        goodsData.total = res.data.total
+        goodsData.loading = false
+    })
 }
 loadGoodsList()
 
 const handleSearch = () => {
-  loadGoodsList()
+    loadGoodsList()
 }
 
 const searchFormRef = ref<FormInstance>()
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadGoodsList()
+    if (!formEl) return
+    formEl.resetFields()
+    loadGoodsList()
 }
 // 商品预览
 const previewEvent = (data: any) => {
-  const url = router.resolve({
-    path: '/preview/wap',
-    query: {
-      page: `/addon/shop/pages/goods/detail?goods_id=${data.goods_id}`,
-    },
-  })
-  window.open(url.href)
+    const url = router.resolve({
+        path: '/preview/wap',
+        query: {
+            page: `/addon/shop/pages/goods/detail?goods_id=${data.goods_id}`
+        }
+    })
+    window.open(url.href)
 }
 </script>
 <style lang="scss" scoped>
-:deep(.goods-stat .el-card__header) {
-  border-bottom: none;
-  padding-bottom: 0;
+:deep(.goods-stat .el-card__header){
+    border-bottom: none;
+    padding-bottom: 0;
 }
+
 </style>
diff --git a/admin/src/addon/shop/views/stat/index.vue b/admin/src/addon/shop/views/stat/index.vue
index 6a4c5ccc..c6be5443 100644
--- a/admin/src/addon/shop/views/stat/index.vue
+++ b/admin/src/addon/shop/views/stat/index.vue
@@ -1,313 +1,147 @@
 <template>
-  <div class="min-w-[100px] min-h-[650px] p-[15px] bg-white tab-index">
-    <el-tabs
-      v-model="activeName"
-      class="demo-tabs"
-      @tab-click="handleClick"
-      type="card"
-    >
-      <el-tab-pane name="first">
-        <template #label>今日</template>
-        <div class="flex w-full justify-between flex-wrap">
-          <div
-            class="w-[32%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] cursor-pointer"
-            v-for="(item, index) in boxes.slice(0, 3)"
-            @click="selectBox(item)"
-            :class="{
-              'border-[#105CFB]': currentIndex == item.id,
-              'text-[#105CFB]': currentIndex == item.id,
-            }"
-          >
-            <div class="flex items-center">
-              <div class="text-[14px]">预计收入</div>
-              <div class="ml-[5px] text-[14px]">(元)</div>
-              <el-tooltip
-                class="box-item"
-                effect="light"
-                content="统计时间内，店铺收入金额减去支出的金额"
-                placement="top-start"
-              >
-                <div
-                  class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[12px]"
-                ></div>
-              </el-tooltip>
-            </div>
-            <div class="text-[25px] font-bold">0.00</div>
-          </div>
-          <div
-            class="w-[23%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] mt-[20px] cursor-pointer"
-            v-for="(item, index) in boxes.slice(3)"
-            @click="selectBox(item)"
-            :class="{
-              'border-[#105CFB]': currentIndex == item.id,
-              'text-[#105CFB]': currentIndex == item.id,
-            }"
-          >
-            <div class="flex items-center">
-              <div class="text-[14px]">访客人数</div>
-              <el-tooltip
-                class="box-item"
-                effect="light"
-                content="统计时间内，站点访问人数"
-                placement="top-start"
-              >
-                <div
-                  class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[12px]"
-                ></div>
-              </el-tooltip>
-            </div>
-            <div class="text-[25px] font-bold">0</div>
-          </div>
-        </div>
-      </el-tab-pane>
-      <el-tab-pane label="昨日" name="second">
-        <div class="flex w-full justify-between flex-wrap">
-          <div
-            class="w-[32%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] cursor-pointer"
-            v-for="(item, index) in boxes.slice(0, 3)"
-            @click="selectBox(item)"
-            :class="{
-              'border-[#105CFB]': currentIndex == item.id,
-              'text-[#105CFB]': currentIndex == item.id,
-            }"
-          >
-            <div class="flex items-center">
-              <div class="text-[14px]">预计收入</div>
-              <div class="ml-[5px] text-[14px]">(元)</div>
-              <el-tooltip
-                class="box-item"
-                effect="light"
-                content="统计时间内，店铺收入金额减去支出的金额"
-                placement="top-start"
-              >
-                <div
-                  class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[12px]"
-                ></div>
-              </el-tooltip>
-            </div>
-            <div class="text-[25px] font-bold">0.00</div>
-          </div>
-          <div
-            class="w-[23%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] mt-[20px] cursor-pointer"
-            v-for="(item, index) in boxes.slice(3)"
-            @click="selectBox(item)"
-            :class="{
-              'border-[#105CFB]': currentIndex == item.id,
-              'text-[#105CFB]': currentIndex == item.id,
-            }"
-          >
-            <div class="flex items-center">
-              <div class="text-[14px]">访客人数</div>
-              <el-tooltip
-                class="box-item"
-                effect="light"
-                content="统计时间内，站点访问人数"
-                placement="top-start"
-              >
-                <div
-                  class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[12px]"
-                ></div>
-              </el-tooltip>
-            </div>
-            <div class="text-[25px] font-bold">0</div>
-          </div>
-        </div>
-        <!-- <div ref="incomeChartRef1"  class="w-full h-[400px] mt-[60px]"></div> -->
-      </el-tab-pane>
-      <el-tab-pane label="7日内" name="third">
-        <div class="flex w-full justify-between flex-wrap">
-          <div
-            class="w-[32%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] cursor-pointer"
-            v-for="(item, index) in boxes.slice(0, 3)"
-            @click="selectBox(item)"
-            :class="{
-              'border-[#105CFB]': currentIndex == item.id,
-              'text-[#105CFB]': currentIndex == item.id,
-            }"
-          >
-            <div class="flex items-center">
-              <div class="text-[14px]">预计收入</div>
-              <div class="ml-[5px] text-[14px]">(元)</div>
-              <el-tooltip
-                class="box-item"
-                effect="light"
-                content="统计时间内，店铺收入金额减去支出的金额"
-                placement="top-start"
-              >
-                <div
-                  class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[12px]"
-                ></div>
-              </el-tooltip>
-            </div>
-            <div class="text-[25px] font-bold">0.00</div>
-          </div>
-          <div
-            class="w-[23%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] mt-[20px] cursor-pointer"
-            v-for="(item, index) in boxes.slice(3)"
-            @click="selectBox(item)"
-            :class="{
-              'border-[#105CFB]': currentIndex == item.id,
-              'text-[#105CFB]': currentIndex == item.id,
-            }"
-          >
-            <div class="flex items-center">
-              <div class="text-[14px]">访客人数</div>
-              <el-tooltip
-                class="box-item"
-                effect="light"
-                content="统计时间内，站点访问人数"
-                placement="top-start"
-              >
-                <div
-                  class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[12px]"
-                ></div>
-              </el-tooltip>
-            </div>
-            <div class="text-[25px] font-bold">0</div>
-          </div>
-        </div>
-      </el-tab-pane>
-      <el-tab-pane label="30日内" name="fourth">
-        <div class="flex w-full justify-between flex-wrap">
-          <div
-            class="w-[32%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] cursor-pointer"
-            v-for="(item, index) in boxes.slice(0, 3)"
-            @click="selectBox(item)"
-            :class="{
-              'border-[#105CFB]': currentIndex == item.id,
-              'text-[#105CFB]': currentIndex == item.id,
-            }"
-          >
-            <div class="flex items-center">
-              <div class="text-[14px]">预计收入</div>
-              <div class="ml-[5px] text-[14px]">(元)</div>
-              <el-tooltip
-                class="box-item"
-                effect="light"
-                content="统计时间内，店铺收入金额减去支出的金额"
-                placement="top-start"
-              >
-                <div
-                  class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[12px]"
-                ></div>
-              </el-tooltip>
-            </div>
-            <div class="text-[25px] font-bold">0.00</div>
-          </div>
-          <div
-            class="w-[23%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] mt-[20px] cursor-pointer"
-            v-for="(item, index) in boxes.slice(3)"
-            @click="selectBox(item)"
-            :class="{
-              'border-[#105CFB]': currentIndex == item.id,
-              'text-[#105CFB]': currentIndex == item.id,
-            }"
-          >
-            <div class="flex items-center">
-              <div class="text-[14px]">访客人数</div>
-              <el-tooltip
-                class="box-item"
-                effect="light"
-                content="统计时间内，站点访问人数"
-                placement="top-start"
-              >
-                <div
-                  class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[12px]"
-                ></div>
-              </el-tooltip>
-            </div>
-            <div class="text-[25px] font-bold">0</div>
-          </div>
-        </div>
-      </el-tab-pane>
-      <el-tab-pane label="自定义" name="fifth">
-        <el-dialog v-model="dialogVisible" width="520" draggable="true">
-          <template #header>
-            <div class="text-[14px] color-[#333] h-[42px] leading-[42px]">
-              自定义时间选择
-            </div>
-          </template>
-          <div class="flex items-center">
-            <span class="mr-[10px]">选择时间:</span>
-            <el-date-picker
-              v-model="value2"
-              class="w-[100px]"
-              type="datetimerange"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
-              format="YYYY-MM-DD HH:mm:ss"
-              date-format="YYYY/MM/DD ddd"
-              time-format="A hh:mm:ss"
-            />
-          </div>
-          <template #footer>
-            <div class="dialog-footer">
-              <el-button type="primary" @click="dialogVisible = false"
-                >确认</el-button
-              >
-              <el-button @click="dialogVisible = false">取消</el-button>
-            </div>
-          </template>
-        </el-dialog>
-        <div class="flex w-full justify-between flex-wrap">
-          <div
-            class="w-[32%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] cursor-pointer"
-            v-for="(item, index) in boxes.slice(0, 3)"
-            @click="selectBox(item)"
-            :class="{
-              'border-[#105CFB]': currentIndex == item.id,
-              'text-[#105CFB]': currentIndex == item.id,
-            }"
-          >
-            <div class="flex items-center">
-              <div class="text-[14px]">预计收入</div>
-              <div class="ml-[5px] text-[14px]">(元)</div>
-              <el-tooltip
-                class="box-item"
-                effect="light"
-                content="统计时间内，店铺收入金额减去支出的金额"
-                placement="top-start"
-              >
-                <div
-                  class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[12px]"
-                ></div>
-              </el-tooltip>
-            </div>
-            <div class="text-[25px] font-bold">0.00</div>
-          </div>
-          <div
-            class="w-[23%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] mt-[20px] cursor-pointer"
-            v-for="(item, index) in boxes.slice(3)"
-            @click="selectBox(item)"
-            :class="{
-              'border-[#105CFB]': currentIndex == item.id,
-              'text-[#105CFB]': currentIndex == item.id,
-            }"
-          >
-            <div class="flex items-center">
-              <div class="text-[14px]">访客人数</div>
-              <el-tooltip
-                class="box-item"
-                effect="light"
-                content="统计时间内，站点访问人数"
-                placement="top-start"
-              >
-                <div
-                  class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[12px]"
-                ></div>
-              </el-tooltip>
-            </div>
-            <div class="text-[25px] font-bold">0</div>
-          </div>
-        </div>
-      </el-tab-pane>
-    </el-tabs>
-    <div ref="incomeChartRef" class="h-[400px] mt-[60px] ml-[-90px]"></div>
-  </div>
+    <div class="min-w-[100px] min-h-[650px] p-[15px] bg-white tab-index">
+        <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick" type="card">
+            <el-tab-pane name="first">
+                <template #label>今日</template>
+                <div class="flex w-full justify-between flex-wrap">
+                    <div class="w-[32%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] cursor-pointer" v-for="(item, index) in boxes.slice(0, 3)"  @click="selectBox(item)" :class="{ 'border-[#105CFB]': currentIndex == item.id,'text-[#105CFB]': currentIndex == item.id }">
+                        <div class="flex items-center">
+                            <div class="text-[14px]">预计收入</div>
+                            <div class="ml-[5px] text-[14px]">(元)</div>
+                            <el-tooltip class="box-item" effect="light" content="统计时间内，店铺收入金额减去支出的金额" placement="top-start">
+                              <div class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[12px]"></div>
+                            </el-tooltip>
+                        </div>
+                        <div class="text-[25px] font-bold">0.00</div>
+                    </div>
+                    <div class="w-[23%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] mt-[20px] cursor-pointer" v-for="(item, index) in boxes.slice(3)" @click="selectBox(item)" :class="{ 'border-[#105CFB]': currentIndex == item.id,'text-[#105CFB]': currentIndex == item.id }">
+                        <div class="flex items-center">
+                            <div class="text-[14px]">访客人数</div>
+                            <el-tooltip class="box-item" effect="light" content="统计时间内，站点访问人数" placement="top-start">
+                                <div class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[12px]"></div>
+                            </el-tooltip>
+                        </div>
+                        <div class="text-[25px] font-bold">0</div>
+                    </div>
+                </div>
+                
+            </el-tab-pane>
+            <el-tab-pane label="昨日" name="second">
+                <div class="flex w-full justify-between flex-wrap">
+                    <div class="w-[32%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] cursor-pointer" v-for="(item, index) in boxes.slice(0, 3)"  @click="selectBox(item)" :class="{ 'border-[#105CFB]': currentIndex == item.id,'text-[#105CFB]': currentIndex == item.id }">
+                        <div class="flex items-center">
+                            <div class="text-[14px]">预计收入</div>
+                            <div class="ml-[5px] text-[14px]">(元)</div>
+                            <el-tooltip class="box-item" effect="light" content="统计时间内，店铺收入金额减去支出的金额" placement="top-start">
+                              <div class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[12px]"></div>
+                            </el-tooltip>
+                        </div>
+                        <div class="text-[25px] font-bold">0.00</div>
+                    </div>
+                    <div class="w-[23%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] mt-[20px] cursor-pointer" v-for="(item, index) in boxes.slice(3)" @click="selectBox(item)" :class="{ 'border-[#105CFB]': currentIndex == item.id,'text-[#105CFB]': currentIndex == item.id }">
+                        <div class="flex items-center">
+                            <div class="text-[14px]">访客人数</div>
+                            <el-tooltip class="box-item" effect="light" content="统计时间内，站点访问人数" placement="top-start">
+                                <div class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[12px]"></div>
+                            </el-tooltip>
+                        </div>
+                        <div class="text-[25px] font-bold">0</div>
+                    </div>
+                </div>
+                <!-- <div ref="incomeChartRef1"  class="w-full h-[400px] mt-[60px]"></div> -->
+            </el-tab-pane>
+            <el-tab-pane label="7日内" name="third">
+                <div class="flex w-full justify-between flex-wrap">
+                    <div class="w-[32%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] cursor-pointer" v-for="(item, index) in boxes.slice(0, 3)"  @click="selectBox(item)" :class="{ 'border-[#105CFB]': currentIndex == item.id,'text-[#105CFB]': currentIndex == item.id }">
+                        <div class="flex items-center">
+                            <div class="text-[14px]">预计收入</div>
+                            <div class="ml-[5px] text-[14px]">(元)</div>
+                            <el-tooltip class="box-item" effect="light" content="统计时间内，店铺收入金额减去支出的金额" placement="top-start">
+                              <div class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[12px]"></div>
+                            </el-tooltip>
+                        </div>
+                        <div class="text-[25px] font-bold">0.00</div>
+                    </div>
+                    <div class="w-[23%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] mt-[20px] cursor-pointer" v-for="(item, index) in boxes.slice(3)" @click="selectBox(item)" :class="{ 'border-[#105CFB]': currentIndex == item.id,'text-[#105CFB]': currentIndex == item.id }">
+                        <div class="flex items-center">
+                            <div class="text-[14px]">访客人数</div>
+                            <el-tooltip class="box-item" effect="light" content="统计时间内，站点访问人数" placement="top-start">
+                                <div class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[12px]"></div>
+                            </el-tooltip>
+                        </div>
+                        <div class="text-[25px] font-bold">0</div>
+                    </div>
+                </div>
+            </el-tab-pane>
+            <el-tab-pane label="30日内" name="fourth">
+                <div class="flex w-full justify-between flex-wrap">
+                    <div class="w-[32%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] cursor-pointer" v-for="(item, index) in boxes.slice(0, 3)"  @click="selectBox(item)" :class="{ 'border-[#105CFB]': currentIndex == item.id,'text-[#105CFB]': currentIndex == item.id }">
+                        <div class="flex items-center">
+                            <div class="text-[14px]">预计收入</div>
+                            <div class="ml-[5px] text-[14px]">(元)</div>
+                            <el-tooltip class="box-item" effect="light" content="统计时间内，店铺收入金额减去支出的金额" placement="top-start">
+                              <div class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[12px]"></div>
+                            </el-tooltip>
+                        </div>
+                        <div class="text-[25px] font-bold">0.00</div>
+                    </div>
+                    <div class="w-[23%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] mt-[20px] cursor-pointer" v-for="(item, index) in boxes.slice(3)" @click="selectBox(item)" :class="{ 'border-[#105CFB]': currentIndex == item.id,'text-[#105CFB]': currentIndex == item.id }">
+                        <div class="flex items-center">
+                            <div class="text-[14px]">访客人数</div>
+                            <el-tooltip class="box-item" effect="light" content="统计时间内，站点访问人数" placement="top-start">
+                                <div class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[12px]"></div>
+                            </el-tooltip>
+                        </div>
+                        <div class="text-[25px] font-bold">0</div>
+                    </div>
+                </div>
+            </el-tab-pane>
+            <el-tab-pane label="自定义" name="fifth">
+                <el-dialog v-model="dialogVisible" width="520" draggable="true">
+                    <template #header>
+                        <div class="text-[14px] color-[#333] h-[42px] leading-[42px]">自定义时间选择</div>
+                    </template>
+                    <div class="flex items-center">
+                        <span class="mr-[10px]">选择时间:</span>
+                        <el-date-picker v-model="value2" class="w-[100px]" type="datetimerange" start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD HH:mm:ss" date-format="YYYY/MM/DD ddd" time-format="A hh:mm:ss"/>
+                    </div>
+                    <template #footer>
+                    <div class="dialog-footer">
+                        <el-button type="primary" @click="dialogVisible = false">确认</el-button>
+                        <el-button @click="dialogVisible = false">取消</el-button>
+                    </div>
+                    </template>
+                </el-dialog>
+                <div class="flex w-full justify-between flex-wrap" >
+                    <div class="w-[32%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] cursor-pointer" v-for="(item, index) in boxes.slice(0, 3)"  @click="selectBox(item)" :class="{ 'border-[#105CFB]': currentIndex == item.id,'text-[#105CFB]': currentIndex == item.id }">
+                        <div class="flex items-center">
+                            <div class="text-[14px]">预计收入</div>
+                            <div class="ml-[5px] text-[14px]">(元)</div>
+                            <el-tooltip class="box-item" effect="light" content="统计时间内，店铺收入金额减去支出的金额" placement="top-start">
+                              <div class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[12px]"></div>
+                            </el-tooltip>
+                        </div>
+                        <div class="text-[25px] font-bold">0.00</div>
+                    </div>
+                    <div class="w-[23%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] mt-[20px] cursor-pointer" v-for="(item, index) in boxes.slice(3)" @click="selectBox(item)" :class="{ 'border-[#105CFB]': currentIndex == item.id,'text-[#105CFB]': currentIndex == item.id }">
+                        <div class="flex items-center">
+                            <div class="text-[14px]">访客人数</div>
+                            <el-tooltip class="box-item" effect="light" content="统计时间内，站点访问人数" placement="top-start">
+                                <div class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[12px]"></div>
+                            </el-tooltip>
+                        </div>
+                        <div class="text-[25px] font-bold">0</div>
+                    </div>
+                </div>
+                
+            </el-tab-pane>
+        </el-tabs>
+        <div ref="incomeChartRef" class="h-[400px] mt-[60px] ml-[-90px]"></div>
+    </div>
 </template>
 <script lang="ts" setup>
 import { ref, reactive, onMounted, nextTick } from 'vue'
-import type { TabsPaneContext } from 'element-plus'
+import type { TabsPaneContext} from 'element-plus'
 import * as echarts from 'echarts'
 
 const activeName = ref('first')
@@ -315,104 +149,103 @@ const dialogVisible = ref(false)
 const value2 = ref('')
 
 const handleClick = (tab: TabsPaneContext, event: Event) => {
-  if (tab.props.name == 'fifth') {
+  if(tab.props.name == 'fifth'){
     dialogVisible.value = true
   }
-  nextTick(() => {
+  nextTick(()=>{
     initIncomeChart()
   })
+  
 }
 
 const boxes = reactive([
-  { content: '盒子 1', id: 1 },
-  { content: '盒子 2', id: 2 },
-  { content: '盒子 3', id: 3 },
-  { content: '盒子 1', id: 4 },
-  { content: '盒子 2', id: 5 },
-  { content: '盒子 3', id: 6 },
-  { content: '盒子 3', id: 7 },
-])
-const currentIndex = ref(-1)
+  { content: '盒子 1', id : 1 },
+  { content: '盒子 2', id : 2 },
+  { content: '盒子 3', id : 3 },
+  { content: '盒子 1', id : 4  },
+  { content: '盒子 2', id : 5  },
+  { content: '盒子 3', id : 6  },
+  { content: '盒子 3', id : 7  },
+]);
+const currentIndex = ref(-1); 
 
 const selectBox = (item) => {
-  currentIndex.value = item.id
-}
+  currentIndex.value = item.id;
+};
 
 // 折线图
-const incomeChartRef = ref(null)
+const incomeChartRef = ref(null);
 
 const initIncomeChart = () => {
   if (incomeChartRef.value !== null) {
-    const incomeChart = echarts.init(incomeChartRef.value)
+    const incomeChart = echarts.init(incomeChartRef.value);
 
     // 准备数据
-    const xAxisData = ['周一', '周二', '周三', '周四', '周五', '周六', '周日']
-    const yAxisData = [0, -20, -50, 134, 90, 230, 210]
+    const xAxisData = ['周一', '周二', '周三', '周四', '周五', '周六', '周日'];
+    const yAxisData = [0, -20, -50, 134, 90, 230, 210];
 
     // 配置项
     const option = {
       tooltip: {
-        trigger: 'axis',
+        trigger: 'axis'
       },
       legend: {
-        data: ['预计收入'],
+        data: ['预计收入']
       },
       xAxis: {
         type: 'category',
-        data: xAxisData,
+        data: xAxisData
       },
       yAxis: {
-        type: 'value',
+        type: 'value'
       },
-      series: [
-        {
-          name: '预计收入',
-          type: 'line',
-          data: yAxisData,
-        },
-      ],
-    }
+      series: [{
+        name: '预计收入',
+        type: 'line',
+        data: yAxisData
+      }]
+    };
 
     // 使用配置项初始化图表
-    incomeChart.setOption(option)
+    incomeChart.setOption(option);
     incomeChart.resize({
-      width: 'auto',
-    })
+        width: 'auto'
+    });
   }
-}
+};
 
 onMounted(() => {
-  initIncomeChart()
-})
+  initIncomeChart();
+});
 </script>
 <style lang="scss" scoped>
-.wenHao {
-  font-size: 14px;
+.wenHao{
+    font-size: 14px;
 }
-.tab-index :deep(.el-tabs__item.is-active) {
-  background-color: #105cfb;
-  border-left: 1px solid #105cfb;
-  color: white;
+.tab-index :deep(.el-tabs__item.is-active){
+    background-color: #105CFB;
+    border-left: 1px solid #105CFB;
+    color: white;
 }
-.tab-index :deep(.el-tabs__item:first-child.is-active) {
-  border-left-width: 0px !important;
+.tab-index :deep(.el-tabs__item:first-child.is-active){
+    border-left-width: 0px !important;
 }
-.tab-index :deep(.el-tabs__item:first-child:hover) {
-  border-left-width: 0px !important;
+.tab-index :deep(.el-tabs__item:first-child:hover){
+    border-left-width: 0px !important;
 }
-.tab-index :deep(.el-tabs__item):hover {
-  background-color: #105cfb;
-  border-left: 1px solid #105cfb;
-  color: white;
+.tab-index :deep(.el-tabs__item):hover{
+    background-color: #105CFB;
+    border-left: 1px solid #105CFB;
+    color: white;
 }
-.tab-index :deep(.el-tabs__item) {
-  line-height: 34px;
-  height: 34px !important;
+.tab-index :deep(.el-tabs__item){
+    line-height: 34px;
+    height: 34px !important;
 }
-.tab-index :deep(.el-tabs__nav) {
-  border: 1px solid #d2d2d2;
-  height: 34px;
-  border-radius: 0;
+.tab-index :deep(.el-tabs__nav){
+    border: 1px solid #D2D2D2;
+    height: 34px;
+    border-radius: 0;
 }
 .tab-index :deep(.el-tabs__header) {
   border: none;
diff --git a/admin/src/addon/shop/views/stat/member.vue b/admin/src/addon/shop/views/stat/member.vue
index 51072665..b0b3172a 100644
--- a/admin/src/addon/shop/views/stat/member.vue
+++ b/admin/src/addon/shop/views/stat/member.vue
@@ -1,188 +1,97 @@
 <template>
-  <div class="min-w-[100px] min-h-[650px] p-[15px] bg-white tab-index">
-    <el-tabs
-      v-model="activeName"
-      class="demo-tabs"
-      @tab-click="handleClick"
-      type="card"
-    >
-      <el-tab-pane name="first">
-        <template #label>今日</template>
-        <div class="flex w-full justify-between flex-wrap">
-          <div
-            class="w-[19%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] cursor-pointer"
-            v-for="(item, index) in boxes"
-            @click="selectBox(item)"
-            :class="{
-              'border-[#105CFB]': currentIndex == item.id,
-              'text-[#105CFB]': currentIndex == item.id,
-            }"
-          >
-            <div class="flex items-center">
-              <div class="text-[14px]">新增会员数</div>
-              <el-tooltip
-                class="box-item"
-                effect="light"
-                content="统计时间内，店铺收入金额减去支出的金额"
-                placement="top-start"
-              >
-                <div
-                  class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[4px]"
-                ></div>
-              </el-tooltip>
-            </div>
-            <div class="text-[25px] font-bold">0</div>
-          </div>
-        </div>
-      </el-tab-pane>
-      <el-tab-pane label="昨日" name="second">
-        <div class="flex w-full justify-between flex-wrap">
-          <div
-            class="w-[19%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] cursor-pointer"
-            v-for="(item, index) in boxes"
-            @click="selectBox(item)"
-            :class="{
-              'border-[#105CFB]': currentIndex == item.id,
-              'text-[#105CFB]': currentIndex == item.id,
-            }"
-          >
-            <div class="flex items-center">
-              <div class="text-[14px]">新增会员数</div>
-              <el-tooltip
-                class="box-item"
-                effect="light"
-                content="统计时间内，店铺收入金额减去支出的金额"
-                placement="top-start"
-              >
-                <div
-                  class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[4px]"
-                ></div>
-              </el-tooltip>
-            </div>
-            <div class="text-[25px] font-bold">0</div>
-          </div>
-        </div>
-        <!-- <div ref="incomeChartRef1"  class="w-full h-[400px] mt-[60px]"></div> -->
-      </el-tab-pane>
-      <el-tab-pane label="7日内" name="third">
-        <div class="flex w-full justify-between flex-wrap">
-          <div
-            class="w-[19%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] cursor-pointer"
-            v-for="(item, index) in boxes"
-            @click="selectBox(item)"
-            :class="{
-              'border-[#105CFB]': currentIndex == item.id,
-              'text-[#105CFB]': currentIndex == item.id,
-            }"
-          >
-            <div class="flex items-center">
-              <div class="text-[14px]">新增会员数</div>
-              <el-tooltip
-                class="box-item"
-                effect="light"
-                content="统计时间内，店铺收入金额减去支出的金额"
-                placement="top-start"
-              >
-                <div
-                  class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[4px]"
-                ></div>
-              </el-tooltip>
-            </div>
-            <div class="text-[25px] font-bold">0</div>
-          </div>
-        </div>
-      </el-tab-pane>
-      <el-tab-pane label="30日内" name="fourth">
-        <div class="flex w-full justify-between flex-wrap">
-          <div
-            class="w-[19%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] cursor-pointer"
-            v-for="(item, index) in boxes"
-            @click="selectBox(item)"
-            :class="{
-              'border-[#105CFB]': currentIndex == item.id,
-              'text-[#105CFB]': currentIndex == item.id,
-            }"
-          >
-            <div class="flex items-center">
-              <div class="text-[14px]">新增会员数</div>
-              <el-tooltip
-                class="box-item"
-                effect="light"
-                content="统计时间内，店铺收入金额减去支出的金额"
-                placement="top-start"
-              >
-                <div
-                  class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[4px]"
-                ></div>
-              </el-tooltip>
-            </div>
-            <div class="text-[25px] font-bold">0</div>
-          </div>
-        </div>
-      </el-tab-pane>
-      <el-tab-pane label="自定义" name="fifth">
-        <el-dialog v-model="dialogVisible" width="520" draggable="true">
-          <template #header>
-            <div class="text-[14px] color-[#333] h-[42px] leading-[42px]">
-              自定义时间选择
-            </div>
-          </template>
-          <div class="flex items-center">
-            <span class="mr-[10px]">选择时间:</span>
-            <el-date-picker
-              v-model="value2"
-              class="w-[100px]"
-              type="datetimerange"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
-              format="YYYY-MM-DD HH:mm:ss"
-              date-format="YYYY/MM/DD ddd"
-              time-format="A hh:mm:ss"
-            />
-          </div>
-          <template #footer>
-            <div class="dialog-footer">
-              <el-button type="primary" @click="dialogVisible = false"
-                >确认</el-button
-              >
-              <el-button @click="dialogVisible = false">取消</el-button>
-            </div>
-          </template>
-        </el-dialog>
-        <div class="flex w-full justify-between flex-wrap">
-          <div
-            class="w-[19%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] cursor-pointer"
-            v-for="(item, index) in boxes"
-            @click="selectBox(item)"
-            :class="{
-              'border-[#105CFB]': currentIndex == item.id,
-              'text-[#105CFB]': currentIndex == item.id,
-            }"
-          >
-            <div class="flex items-center">
-              <div class="text-[14px]">新增会员数</div>
-              <el-tooltip
-                class="box-item"
-                effect="light"
-                content="统计时间内，店铺收入金额减去支出的金额"
-                placement="top-start"
-              >
-                <div
-                  class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[4px]"
-                ></div>
-              </el-tooltip>
-            </div>
-            <div class="text-[25px] font-bold">0</div>
-          </div>
-        </div>
-      </el-tab-pane>
-    </el-tabs>
-    <div ref="incomeChartRef" class="h-[400px] mt-[60px] ml-[-90px]"></div>
-  </div>
+    <div class="min-w-[100px] min-h-[650px] p-[15px] bg-white tab-index">
+        <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick" type="card">
+            <el-tab-pane name="first">
+                <template #label>今日</template>
+                <div class="flex w-full justify-between flex-wrap">
+                    <div class="w-[19%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] cursor-pointer" v-for="(item, index) in boxes"  @click="selectBox(item)" :class="{ 'border-[#105CFB]': currentIndex == item.id,'text-[#105CFB]': currentIndex == item.id }">
+                        <div class="flex items-center">
+                            <div class="text-[14px]">新增会员数</div>
+                            <el-tooltip class="box-item" effect="light" content="统计时间内，店铺收入金额减去支出的金额" placement="top-start">
+                              <div class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[4px]"></div>
+                            </el-tooltip>
+                        </div>
+                        <div class="text-[25px] font-bold">0</div>
+                    </div>
+                </div>
+
+            </el-tab-pane>
+            <el-tab-pane label="昨日" name="second">
+                <div class="flex w-full justify-between flex-wrap">
+                    <div class="w-[19%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] cursor-pointer" v-for="(item, index) in boxes"  @click="selectBox(item)" :class="{ 'border-[#105CFB]': currentIndex == item.id,'text-[#105CFB]': currentIndex == item.id }">
+                        <div class="flex items-center">
+                            <div class="text-[14px]">新增会员数</div>
+                            <el-tooltip class="box-item" effect="light" content="统计时间内，店铺收入金额减去支出的金额" placement="top-start">
+                              <div class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[4px]"></div>
+                            </el-tooltip>
+                        </div>
+                        <div class="text-[25px] font-bold">0</div>
+                    </div>
+                </div>
+                <!-- <div ref="incomeChartRef1"  class="w-full h-[400px] mt-[60px]"></div> -->
+            </el-tab-pane>
+            <el-tab-pane label="7日内" name="third">
+                <div class="flex w-full justify-between flex-wrap">
+                    <div class="w-[19%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] cursor-pointer" v-for="(item, index) in boxes"  @click="selectBox(item)" :class="{ 'border-[#105CFB]': currentIndex == item.id,'text-[#105CFB]': currentIndex == item.id }">
+                        <div class="flex items-center">
+                            <div class="text-[14px]">新增会员数</div>
+                            <el-tooltip class="box-item" effect="light" content="统计时间内，店铺收入金额减去支出的金额" placement="top-start">
+                              <div class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[4px]"></div>
+                            </el-tooltip>
+                        </div>
+                        <div class="text-[25px] font-bold">0</div>
+                    </div>
+                </div>
+            </el-tab-pane>
+            <el-tab-pane label="30日内" name="fourth">
+                <div class="flex w-full justify-between flex-wrap">
+                    <div class="w-[19%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] cursor-pointer" v-for="(item, index) in boxes"  @click="selectBox(item)" :class="{ 'border-[#105CFB]': currentIndex == item.id,'text-[#105CFB]': currentIndex == item.id }">
+                        <div class="flex items-center">
+                            <div class="text-[14px]">新增会员数</div>
+                            <el-tooltip class="box-item" effect="light" content="统计时间内，店铺收入金额减去支出的金额" placement="top-start">
+                              <div class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[4px]"></div>
+                            </el-tooltip>
+                        </div>
+                        <div class="text-[25px] font-bold">0</div>
+                    </div>
+                </div>
+            </el-tab-pane>
+            <el-tab-pane label="自定义" name="fifth">
+                <el-dialog v-model="dialogVisible" width="520" draggable="true">
+                    <template #header>
+                        <div class="text-[14px] color-[#333] h-[42px] leading-[42px]">自定义时间选择</div>
+                    </template>
+                    <div class="flex items-center">
+                        <span class="mr-[10px]">选择时间:</span>
+                        <el-date-picker v-model="value2" class="w-[100px]" type="datetimerange" start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD HH:mm:ss" date-format="YYYY/MM/DD ddd" time-format="A hh:mm:ss"/>
+                    </div>
+                    <template #footer>
+                    <div class="dialog-footer">
+                        <el-button type="primary" @click="dialogVisible = false">确认</el-button>
+                        <el-button @click="dialogVisible = false">取消</el-button>
+                    </div>
+                    </template>
+                </el-dialog>
+                <div class="flex w-full justify-between flex-wrap" >
+                    <div class="w-[19%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] cursor-pointer" v-for="(item, index) in boxes"  @click="selectBox(item)" :class="{ 'border-[#105CFB]': currentIndex == item.id,'text-[#105CFB]': currentIndex == item.id }">
+                        <div class="flex items-center">
+                            <div class="text-[14px]">新增会员数</div>
+                            <el-tooltip class="box-item" effect="light" content="统计时间内，店铺收入金额减去支出的金额" placement="top-start">
+                              <div class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[4px]"></div>
+                            </el-tooltip>
+                        </div>
+                        <div class="text-[25px] font-bold">0</div>
+                    </div>
+                </div>
+
+            </el-tab-pane>
+        </el-tabs>
+        <div ref="incomeChartRef" class="h-[400px] mt-[60px] ml-[-90px]"></div>
+    </div>
 </template>
 <script lang="ts" setup>
 import { ref, reactive, onMounted, nextTick } from 'vue'
-import type { TabsPaneContext } from 'element-plus'
+import type { TabsPaneContext} from 'element-plus'
 import * as echarts from 'echarts'
 
 const activeName = ref('first')
@@ -190,94 +99,93 @@ const dialogVisible = ref(false)
 const value2 = ref('')
 
 const handleClick = (tab: TabsPaneContext, event: Event) => {
-  if (tab.props.name == 'fifth') {
+  if(tab.props.name == 'fifth'){
     dialogVisible.value = true
   }
-  nextTick(() => {
+  nextTick(()=>{
     initIncomeChart()
   })
+
 }
 
 const boxes = reactive([
-  { content: '盒子 1', id: 1 },
-  { content: '盒子 2', id: 2 },
-  { content: '盒子 3', id: 3 },
-  { content: '盒子 1', id: 4 },
-  { content: '盒子 2', id: 5 },
-])
-const currentIndex = ref(-1)
+  { content: '盒子 1', id : 1 },
+  { content: '盒子 2', id : 2 },
+  { content: '盒子 3', id : 3 },
+  { content: '盒子 1', id : 4  },
+  { content: '盒子 2', id : 5  },
+]);
+const currentIndex = ref(-1);
 
 const selectBox = (item) => {
-  currentIndex.value = item.id
-}
+  currentIndex.value = item.id;
+};
 
 // 折线图
-const incomeChartRef = ref(null)
+const incomeChartRef = ref(null);
 
 const initIncomeChart = () => {
   if (incomeChartRef.value !== null) {
-    const incomeChart = echarts.init(incomeChartRef.value)
+    const incomeChart = echarts.init(incomeChartRef.value);
 
     // 准备数据
-    const xAxisData = ['周一', '周二', '周三', '周四', '周五', '周六', '周日']
-    const yAxisData = [0, -20, -50, 134, 90, 230, 210]
+    const xAxisData = ['周一', '周二', '周三', '周四', '周五', '周六', '周日'];
+    const yAxisData = [0, -20, -50, 134, 90, 230, 210];
 
     // 配置项
     const option = {
       tooltip: {
-        trigger: 'axis',
+        trigger: 'axis'
       },
       legend: {
-        data: ['新增会员数'],
+        data: ['新增会员数']
       },
       xAxis: {
         type: 'category',
-        data: xAxisData,
+        data: xAxisData
       },
       yAxis: {
-        type: 'value',
+        type: 'value'
       },
-      series: [
-        {
-          name: '新增会员数',
-          type: 'line',
-          data: yAxisData,
-        },
-      ],
-    }
+      series: [{
+        name: '新增会员数',
+        type: 'line',
+        data: yAxisData
+      }]
+    };
 
     // 使用配置项初始化图表
-    incomeChart.setOption(option)
+    incomeChart.setOption(option);
     incomeChart.resize({
-      width: 'auto',
-    })
+        width: 'auto'
+    });
   }
-}
+};
 
 onMounted(() => {
-  initIncomeChart()
-})
+  initIncomeChart();
+});
 </script>
 <style lang="scss" scoped>
-.wenHao {
-  font-size: 14px;
+.wenHao{
+    font-size: 14px;
 }
-.tab-index :deep(.el-tabs__item.is-active) {
-  background-color: #105cfb;
-  color: white;
+.tab-index :deep(.el-tabs__item.is-active){
+    background-color: #105CFB;
+    color: white;
 }
-.tab-index :deep(.el-tabs__item):hover {
-  background-color: #105cfb;
-  color: white;
+.tab-index :deep(.el-tabs__item):hover{
+    background-color: #105CFB;
+    color: white;
 }
-.tab-index :deep(.el-tabs__item) {
-  line-height: 34px;
-  height: 34px !important;
+.tab-index :deep(.el-tabs__item){
+    line-height: 34px;
+    height: 34px !important;
 }
-.tab-index :deep(.el-tabs__nav) {
-  border: 1px solid #d2d2d2;
-  height: 34px;
-  border-radius: 0;
+.tab-index :deep(.el-tabs__nav){
+    border: 1px solid #D2D2D2;
+    height: 34px;
+    border-radius: 0;
 }
 .tab-index :deep(.el-tabs__header) {
   border: none;
diff --git a/admin/src/addon/shop/views/stat/order.vue b/admin/src/addon/shop/views/stat/order.vue
index 9b9c3253..d9288150 100644
--- a/admin/src/addon/shop/views/stat/order.vue
+++ b/admin/src/addon/shop/views/stat/order.vue
@@ -1,421 +1,202 @@
 <template>
-  <div class="min-w-[100px] min-h-[650px] p-[15px] bg-white tab-index">
-    <el-tabs
-      v-model="activeName"
-      class="demo-tabs"
-      @tab-click="handleClick"
-      type="card"
-    >
-      <el-tab-pane name="first">
-        <template #label>今日</template>
-        <div class="flex w-full justify-between flex-wrap">
-          <div
-            class="w-[32%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] cursor-pointer"
-            v-for="(item, index) in boxes.slice(0, 3)"
-            @click="selectBox(item)"
-            :class="{
-              'border-[#105CFB]': currentIndex == item.id,
-              'text-[#105CFB]': currentIndex == item.id,
-            }"
-          >
-            <div class="flex items-center">
-              <div class="text-[14px]">预计收入</div>
-              <div class="ml-[5px] text-[14px]">(元)</div>
-              <el-tooltip
-                class="box-item"
-                effect="light"
-                content="统计时间内，店铺收入金额减去支出的金额"
-                placement="top-start"
-              >
-                <div
-                  class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[12px]"
-                ></div>
-              </el-tooltip>
+    <div class="min-w-[100px] min-h-[650px] p-[15px] bg-white tab-index">
+        <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick" type="card">
+            <el-tab-pane name="first">
+                <template #label>今日</template>
+                <div class="flex w-full justify-between flex-wrap">
+                    <div class="w-[32%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] cursor-pointer" v-for="(item, index) in boxes.slice(0, 3)"  @click="selectBox(item)" :class="{ 'border-[#105CFB]': currentIndex == item.id,'text-[#105CFB]': currentIndex == item.id }">
+                        <div class="flex items-center">
+                            <div class="text-[14px]">预计收入</div>
+                            <div class="ml-[5px] text-[14px]">(元)</div>
+                            <el-tooltip class="box-item" effect="light" content="统计时间内，店铺收入金额减去支出的金额" placement="top-start">
+                              <div class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[12px]"></div>
+                            </el-tooltip>
+                        </div>
+                        <div class="text-[25px] font-bold">0.00</div>
+                    </div>
+                    <div class="w-[13.5%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] mt-[20px] cursor-pointer" v-for="(item, index) in boxes.slice(3)" @click="selectBox(item)" :class="{ 'border-[#105CFB]': currentIndex == item.id,'text-[#105CFB]': currentIndex == item.id }">
+                        <div class="flex items-center">
+                            <div class="text-[14px]">访客人数</div>
+                            <el-tooltip class="box-item" effect="light" content="统计时间内，站点访问人数" placement="top-start">
+                                <div class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[12px]"></div>
+                            </el-tooltip>
+                        </div>
+                        <div class="text-[25px] font-bold">0</div>
+                    </div>
+                </div>
+                
+            </el-tab-pane>
+            <el-tab-pane label="昨日" name="second">
+                <div class="flex w-full justify-between flex-wrap">
+                    <div class="w-[32%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] cursor-pointer" v-for="(item, index) in boxes.slice(0, 3)"  @click="selectBox(item)" :class="{ 'border-[#105CFB]': currentIndex == item.id,'text-[#105CFB]': currentIndex == item.id }">
+                        <div class="flex items-center">
+                            <div class="text-[14px]">预计收入</div>
+                            <div class="ml-[5px] text-[14px]">(元)</div>
+                            <el-tooltip class="box-item" effect="light" content="统计时间内，店铺收入金额减去支出的金额" placement="top-start">
+                              <div class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[12px]"></div>
+                            </el-tooltip>
+                        </div>
+                        <div class="text-[25px] font-bold">0.00</div>
+                    </div>
+                    <div class="w-[13.5%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] mt-[20px] cursor-pointer" v-for="(item, index) in boxes.slice(3)" @click="selectBox(item)" :class="{ 'border-[#105CFB]': currentIndex == item.id,'text-[#105CFB]': currentIndex == item.id }">
+                        <div class="flex items-center">
+                            <div class="text-[14px]">访客人数</div>
+                            <el-tooltip class="box-item" effect="light" content="统计时间内，站点访问人数" placement="top-start">
+                                <div class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[12px]"></div>
+                            </el-tooltip>
+                        </div>
+                        <div class="text-[25px] font-bold">0</div>
+                    </div>
+                </div>
+                <!-- <div ref="incomeChartRef1"  class="w-full h-[400px] mt-[60px]"></div> -->
+            </el-tab-pane>
+            <el-tab-pane label="7日内" name="third">
+                <div class="flex w-full justify-between flex-wrap">
+                    <div class="w-[32%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] cursor-pointer" v-for="(item, index) in boxes.slice(0, 3)"  @click="selectBox(item)" :class="{ 'border-[#105CFB]': currentIndex == item.id,'text-[#105CFB]': currentIndex == item.id }">
+                        <div class="flex items-center">
+                            <div class="text-[14px]">预计收入</div>
+                            <div class="ml-[5px] text-[14px]">(元)</div>
+                            <el-tooltip class="box-item" effect="light" content="统计时间内，店铺收入金额减去支出的金额" placement="top-start">
+                              <div class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[12px]"></div>
+                            </el-tooltip>
+                        </div>
+                        <div class="text-[25px] font-bold">0.00</div>
+                    </div>
+                    <div class="w-[13.5%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] mt-[20px] cursor-pointer" v-for="(item, index) in boxes.slice(3)" @click="selectBox(item)" :class="{ 'border-[#105CFB]': currentIndex == item.id,'text-[#105CFB]': currentIndex == item.id }">
+                        <div class="flex items-center">
+                            <div class="text-[14px]">访客人数</div>
+                            <el-tooltip class="box-item" effect="light" content="统计时间内，站点访问人数" placement="top-start">
+                                <div class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[12px]"></div>
+                            </el-tooltip>
+                        </div>
+                        <div class="text-[25px] font-bold">0</div>
+                    </div>
+                </div>
+            </el-tab-pane>
+            <el-tab-pane label="30日内" name="fourth">
+                <div class="flex w-full justify-between flex-wrap">
+                    <div class="w-[32%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] cursor-pointer" v-for="(item, index) in boxes.slice(0, 3)"  @click="selectBox(item)" :class="{ 'border-[#105CFB]': currentIndex == item.id,'text-[#105CFB]': currentIndex == item.id }">
+                        <div class="flex items-center">
+                            <div class="text-[14px]">预计收入</div>
+                            <div class="ml-[5px] text-[14px]">(元)</div>
+                            <el-tooltip class="box-item" effect="light" content="统计时间内，店铺收入金额减去支出的金额" placement="top-start">
+                              <div class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[12px]"></div>
+                            </el-tooltip>
+                        </div>
+                        <div class="text-[25px] font-bold">0.00</div>
+                    </div>
+                    <div class="w-[13.5%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] mt-[20px] cursor-pointer" v-for="(item, index) in boxes.slice(3)" @click="selectBox(item)" :class="{ 'border-[#105CFB]': currentIndex == item.id,'text-[#105CFB]': currentIndex == item.id }">
+                        <div class="flex items-center">
+                            <div class="text-[14px]">访客人数</div>
+                            <el-tooltip class="box-item" effect="light" content="统计时间内，站点访问人数" placement="top-start">
+                                <div class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[12px]"></div>
+                            </el-tooltip>
+                        </div>
+                        <div class="text-[25px] font-bold">0</div>
+                    </div>
+                </div>
+            </el-tab-pane>
+            <el-tab-pane label="自定义" name="fifth">
+                <el-dialog v-model="dialogVisible" width="520" draggable="true">
+                    <template #header>
+                        <div class="text-[14px] color-[#333] h-[42px] leading-[42px]">自定义时间选择</div>
+                    </template>
+                    <div class="flex items-center">
+                        <span class="mr-[10px]">选择时间:</span>
+                        <el-date-picker v-model="value2" class="w-[100px]" type="datetimerange" start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD HH:mm:ss" date-format="YYYY/MM/DD ddd" time-format="A hh:mm:ss"/>
+                    </div>
+                    <template #footer>
+                    <div class="dialog-footer">
+                        <el-button type="primary" @click="dialogVisible = false">确认</el-button>
+                        <el-button @click="dialogVisible = false">取消</el-button>
+                    </div>
+                    </template>
+                </el-dialog>
+                <div class="flex w-full justify-between flex-wrap" >
+                    <div class="w-[32%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] cursor-pointer" v-for="(item, index) in boxes.slice(0, 3)"  @click="selectBox(item)" :class="{ 'border-[#105CFB]': currentIndex == item.id,'text-[#105CFB]': currentIndex == item.id }">
+                        <div class="flex items-center">
+                            <div class="text-[14px]">预计收入</div>
+                            <div class="ml-[5px] text-[14px]">(元)</div>
+                            <el-tooltip class="box-item" effect="light" content="统计时间内，店铺收入金额减去支出的金额" placement="top-start">
+                              <div class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[12px]"></div>
+                            </el-tooltip>
+                        </div>
+                        <div class="text-[25px] font-bold">0.00</div>
+                    </div>
+                    <div class="w-[13.5%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] mt-[20px] cursor-pointer" v-for="(item, index) in boxes.slice(3)" @click="selectBox(item)" :class="{ 'border-[#105CFB]': currentIndex == item.id,'text-[#105CFB]': currentIndex == item.id }">
+                        <div class="flex items-center">
+                            <div class="text-[14px]">访客人数</div>
+                            <el-tooltip class="box-item" effect="light" content="统计时间内，站点访问人数" placement="top-start">
+                                <div class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[12px]"></div>
+                            </el-tooltip>
+                        </div>
+                        <div class="text-[25px] font-bold">0</div>
+                    </div>
+                </div>
+            </el-tab-pane>
+        </el-tabs>
+        <div class="w-full flex justify-between mt-[20px]">
+            <div class="w-[68%] h-[115px] bg-[#f2f3f5] flex justify-between">
+                <div class="flex flex-col justify-center   h-76px">
+                    <div class="text-[14px] ml-[15px]">收入总额</div>
+                    <div class="text-[24px] ml-[15px]">433.00</div>
+                </div>
+                <div class="flex flex-col justify-center items-center w-[50px] h-76px text-[18px]">=</div>
+                <div class="flex flex-col justify-center  h-76px">
+                    <div class="text-[14px] ml-[15px] mt-[10px]">收入总额</div>
+                    <div class="text-[24px] ml-[15px] mb-[10px] mt-[5px]">433.00</div>
+                    <div class="text-[#105CFB] text-[14px] cursor-pointer ml-[15px] mt-[-5px]">明细</div>
+                </div>
+                <div class="flex flex-col justify-center items-center w-[50px] h-76px">+</div>
+                <div class="flex flex-col justify-center   h-76px">
+                    <div class="text-[14px] ml-[15px] mt-[10px]">收入总额</div>
+                    <div class="text-[24px] ml-[15px] mb-[10px] mt-[5px]">433.00</div>
+                    <div class="text-[#105CFB] text-[14px] cursor-pointer ml-[15px] mt-[-5px]">明细</div>
+                </div>
+                <div class="flex flex-col justify-center items-center w-[50px] h-76px text-[18px]">+</div>
+                <div class="flex flex-col justify-center   h-76px">
+                    <div class="text-[14px] ml-[15px] mt-[10px]">收入总额</div>
+                    <div class="text-[24px] ml-[15px] mb-[10px] mt-[5px]">433.00</div>
+                    <div class="text-[#105CFB] text-[14px] cursor-pointer ml-[15px] mt-[-5px]">明细</div>
+                </div>
+                <div class="flex flex-col justify-center items-center w-[50px] h-76px text-[18px]">+</div>
+                <div class="flex flex-col justify-center   h-76px">
+                    <div class="text-[14px] ml-[15px] mt-[10px]">收入总额</div>
+                    <div class="text-[24px] ml-[15px] mb-[10px] mt-[5px]">433.00</div>
+                    <div class="text-[#105CFB] text-[14px] cursor-pointer ml-[15px] mt-[-5px]">明细</div>
+                </div>
+                <div class="flex flex-col justify-center items-center w-[50px] h-76px text-[18px]">+</div>
+                <div class="flex flex-col justify-center   h-76px mr-[20px]">
+                    <div class="text-[14px] ml-[15px] mt-[10px]">收入总额</div>
+                    <div class="text-[24px] ml-[15px] mb-[10px] mt-[5px]">433.00</div>
+                    <div class="text-[#105CFB] text-[14px] cursor-pointer ml-[15px] mt-[-5px]">明细</div>
+                </div>
             </div>
-            <div class="text-[25px] font-bold">0.00</div>
-          </div>
-          <div
-            class="w-[13.5%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] mt-[20px] cursor-pointer"
-            v-for="(item, index) in boxes.slice(3)"
-            @click="selectBox(item)"
-            :class="{
-              'border-[#105CFB]': currentIndex == item.id,
-              'text-[#105CFB]': currentIndex == item.id,
-            }"
-          >
-            <div class="flex items-center">
-              <div class="text-[14px]">访客人数</div>
-              <el-tooltip
-                class="box-item"
-                effect="light"
-                content="统计时间内，站点访问人数"
-                placement="top-start"
-              >
-                <div
-                  class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[12px]"
-                ></div>
-              </el-tooltip>
+            <div class="w-[30%] h-[115px] bg-[#f2f3f5] flex">
+                    <div class="flex flex-col justify-center  w-[149px] h-76px">
+                    <div class="text-[14px] ml-[15px]">收入总额</div>
+                    <div class="text-[24px] ml-[15px]">433.00</div>
+                </div>
+                <div class="flex flex-col justify-center items-center w-[50px] h-76px text-[18px]">=</div>
+                <div class="flex flex-col justify-center w-[149px] h-76px">
+                    <div class="text-[14px] ml-[15px] mt-[10px]">收入总额</div>
+                    <div class="text-[24px] ml-[15px] mb-[10px] mt-[5px]">433.00</div>
+                    <div class="text-[#105CFB] text-[14px] cursor-pointer ml-[15px] mt-[-5px]">明细</div>
+                </div>
+                <div class="flex flex-col justify-center items-center w-[50px] h-76px">+</div>
+                <div class="flex flex-col justify-center  w-[149px] h-76px">
+                    <div class="text-[14px] ml-[15px] mt-[10px]">收入总额</div>
+                    <div class="text-[24px] ml-[15px] mb-[10px] mt-[5px]">433.00</div>
+                    <div class="text-[#105CFB] text-[14px] cursor-pointer ml-[15px] mt-[-5px]">明细</div>
+                </div>
             </div>
-            <div class="text-[25px] font-bold">0</div>
-          </div>
         </div>
-      </el-tab-pane>
-      <el-tab-pane label="昨日" name="second">
-        <div class="flex w-full justify-between flex-wrap">
-          <div
-            class="w-[32%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] cursor-pointer"
-            v-for="(item, index) in boxes.slice(0, 3)"
-            @click="selectBox(item)"
-            :class="{
-              'border-[#105CFB]': currentIndex == item.id,
-              'text-[#105CFB]': currentIndex == item.id,
-            }"
-          >
-            <div class="flex items-center">
-              <div class="text-[14px]">预计收入</div>
-              <div class="ml-[5px] text-[14px]">(元)</div>
-              <el-tooltip
-                class="box-item"
-                effect="light"
-                content="统计时间内，店铺收入金额减去支出的金额"
-                placement="top-start"
-              >
-                <div
-                  class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[12px]"
-                ></div>
-              </el-tooltip>
-            </div>
-            <div class="text-[25px] font-bold">0.00</div>
-          </div>
-          <div
-            class="w-[13.5%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] mt-[20px] cursor-pointer"
-            v-for="(item, index) in boxes.slice(3)"
-            @click="selectBox(item)"
-            :class="{
-              'border-[#105CFB]': currentIndex == item.id,
-              'text-[#105CFB]': currentIndex == item.id,
-            }"
-          >
-            <div class="flex items-center">
-              <div class="text-[14px]">访客人数</div>
-              <el-tooltip
-                class="box-item"
-                effect="light"
-                content="统计时间内，站点访问人数"
-                placement="top-start"
-              >
-                <div
-                  class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[12px]"
-                ></div>
-              </el-tooltip>
-            </div>
-            <div class="text-[25px] font-bold">0</div>
-          </div>
-        </div>
-        <!-- <div ref="incomeChartRef1"  class="w-full h-[400px] mt-[60px]"></div> -->
-      </el-tab-pane>
-      <el-tab-pane label="7日内" name="third">
-        <div class="flex w-full justify-between flex-wrap">
-          <div
-            class="w-[32%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] cursor-pointer"
-            v-for="(item, index) in boxes.slice(0, 3)"
-            @click="selectBox(item)"
-            :class="{
-              'border-[#105CFB]': currentIndex == item.id,
-              'text-[#105CFB]': currentIndex == item.id,
-            }"
-          >
-            <div class="flex items-center">
-              <div class="text-[14px]">预计收入</div>
-              <div class="ml-[5px] text-[14px]">(元)</div>
-              <el-tooltip
-                class="box-item"
-                effect="light"
-                content="统计时间内，店铺收入金额减去支出的金额"
-                placement="top-start"
-              >
-                <div
-                  class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[12px]"
-                ></div>
-              </el-tooltip>
-            </div>
-            <div class="text-[25px] font-bold">0.00</div>
-          </div>
-          <div
-            class="w-[13.5%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] mt-[20px] cursor-pointer"
-            v-for="(item, index) in boxes.slice(3)"
-            @click="selectBox(item)"
-            :class="{
-              'border-[#105CFB]': currentIndex == item.id,
-              'text-[#105CFB]': currentIndex == item.id,
-            }"
-          >
-            <div class="flex items-center">
-              <div class="text-[14px]">访客人数</div>
-              <el-tooltip
-                class="box-item"
-                effect="light"
-                content="统计时间内，站点访问人数"
-                placement="top-start"
-              >
-                <div
-                  class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[12px]"
-                ></div>
-              </el-tooltip>
-            </div>
-            <div class="text-[25px] font-bold">0</div>
-          </div>
-        </div>
-      </el-tab-pane>
-      <el-tab-pane label="30日内" name="fourth">
-        <div class="flex w-full justify-between flex-wrap">
-          <div
-            class="w-[32%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] cursor-pointer"
-            v-for="(item, index) in boxes.slice(0, 3)"
-            @click="selectBox(item)"
-            :class="{
-              'border-[#105CFB]': currentIndex == item.id,
-              'text-[#105CFB]': currentIndex == item.id,
-            }"
-          >
-            <div class="flex items-center">
-              <div class="text-[14px]">预计收入</div>
-              <div class="ml-[5px] text-[14px]">(元)</div>
-              <el-tooltip
-                class="box-item"
-                effect="light"
-                content="统计时间内，店铺收入金额减去支出的金额"
-                placement="top-start"
-              >
-                <div
-                  class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[12px]"
-                ></div>
-              </el-tooltip>
-            </div>
-            <div class="text-[25px] font-bold">0.00</div>
-          </div>
-          <div
-            class="w-[13.5%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] mt-[20px] cursor-pointer"
-            v-for="(item, index) in boxes.slice(3)"
-            @click="selectBox(item)"
-            :class="{
-              'border-[#105CFB]': currentIndex == item.id,
-              'text-[#105CFB]': currentIndex == item.id,
-            }"
-          >
-            <div class="flex items-center">
-              <div class="text-[14px]">访客人数</div>
-              <el-tooltip
-                class="box-item"
-                effect="light"
-                content="统计时间内，站点访问人数"
-                placement="top-start"
-              >
-                <div
-                  class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[12px]"
-                ></div>
-              </el-tooltip>
-            </div>
-            <div class="text-[25px] font-bold">0</div>
-          </div>
-        </div>
-      </el-tab-pane>
-      <el-tab-pane label="自定义" name="fifth">
-        <el-dialog v-model="dialogVisible" width="520" draggable="true">
-          <template #header>
-            <div class="text-[14px] color-[#333] h-[42px] leading-[42px]">
-              自定义时间选择
-            </div>
-          </template>
-          <div class="flex items-center">
-            <span class="mr-[10px]">选择时间:</span>
-            <el-date-picker
-              v-model="value2"
-              class="w-[100px]"
-              type="datetimerange"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
-              format="YYYY-MM-DD HH:mm:ss"
-              date-format="YYYY/MM/DD ddd"
-              time-format="A hh:mm:ss"
-            />
-          </div>
-          <template #footer>
-            <div class="dialog-footer">
-              <el-button type="primary" @click="dialogVisible = false"
-                >确认</el-button
-              >
-              <el-button @click="dialogVisible = false">取消</el-button>
-            </div>
-          </template>
-        </el-dialog>
-        <div class="flex w-full justify-between flex-wrap">
-          <div
-            class="w-[32%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] cursor-pointer"
-            v-for="(item, index) in boxes.slice(0, 3)"
-            @click="selectBox(item)"
-            :class="{
-              'border-[#105CFB]': currentIndex == item.id,
-              'text-[#105CFB]': currentIndex == item.id,
-            }"
-          >
-            <div class="flex items-center">
-              <div class="text-[14px]">预计收入</div>
-              <div class="ml-[5px] text-[14px]">(元)</div>
-              <el-tooltip
-                class="box-item"
-                effect="light"
-                content="统计时间内，店铺收入金额减去支出的金额"
-                placement="top-start"
-              >
-                <div
-                  class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[12px]"
-                ></div>
-              </el-tooltip>
-            </div>
-            <div class="text-[25px] font-bold">0.00</div>
-          </div>
-          <div
-            class="w-[13.5%] border-[#eee] border-solid border-[1px] h-[90px] p-[15px] mt-[20px] cursor-pointer"
-            v-for="(item, index) in boxes.slice(3)"
-            @click="selectBox(item)"
-            :class="{
-              'border-[#105CFB]': currentIndex == item.id,
-              'text-[#105CFB]': currentIndex == item.id,
-            }"
-          >
-            <div class="flex items-center">
-              <div class="text-[14px]">访客人数</div>
-              <el-tooltip
-                class="box-item"
-                effect="light"
-                content="统计时间内，站点访问人数"
-                placement="top-start"
-              >
-                <div
-                  class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[12px]"
-                ></div>
-              </el-tooltip>
-            </div>
-            <div class="text-[25px] font-bold">0</div>
-          </div>
-        </div>
-      </el-tab-pane>
-    </el-tabs>
-    <div class="w-full flex justify-between mt-[20px]">
-      <div class="w-[68%] h-[115px] bg-[#f2f3f5] flex justify-between">
-        <div class="flex flex-col justify-center h-76px">
-          <div class="text-[14px] ml-[15px]">收入总额</div>
-          <div class="text-[24px] ml-[15px]">433.00</div>
-        </div>
-        <div
-          class="flex flex-col justify-center items-center w-[50px] h-76px text-[18px]"
-        >
-          =
-        </div>
-        <div class="flex flex-col justify-center h-76px">
-          <div class="text-[14px] ml-[15px] mt-[10px]">收入总额</div>
-          <div class="text-[24px] ml-[15px] mb-[10px] mt-[5px]">433.00</div>
-          <div
-            class="text-[#105CFB] text-[14px] cursor-pointer ml-[15px] mt-[-5px]"
-          >
-            明细
-          </div>
-        </div>
-        <div class="flex flex-col justify-center items-center w-[50px] h-76px">
-          +
-        </div>
-        <div class="flex flex-col justify-center h-76px">
-          <div class="text-[14px] ml-[15px] mt-[10px]">收入总额</div>
-          <div class="text-[24px] ml-[15px] mb-[10px] mt-[5px]">433.00</div>
-          <div
-            class="text-[#105CFB] text-[14px] cursor-pointer ml-[15px] mt-[-5px]"
-          >
-            明细
-          </div>
-        </div>
-        <div
-          class="flex flex-col justify-center items-center w-[50px] h-76px text-[18px]"
-        >
-          +
-        </div>
-        <div class="flex flex-col justify-center h-76px">
-          <div class="text-[14px] ml-[15px] mt-[10px]">收入总额</div>
-          <div class="text-[24px] ml-[15px] mb-[10px] mt-[5px]">433.00</div>
-          <div
-            class="text-[#105CFB] text-[14px] cursor-pointer ml-[15px] mt-[-5px]"
-          >
-            明细
-          </div>
-        </div>
-        <div
-          class="flex flex-col justify-center items-center w-[50px] h-76px text-[18px]"
-        >
-          +
-        </div>
-        <div class="flex flex-col justify-center h-76px">
-          <div class="text-[14px] ml-[15px] mt-[10px]">收入总额</div>
-          <div class="text-[24px] ml-[15px] mb-[10px] mt-[5px]">433.00</div>
-          <div
-            class="text-[#105CFB] text-[14px] cursor-pointer ml-[15px] mt-[-5px]"
-          >
-            明细
-          </div>
-        </div>
-        <div
-          class="flex flex-col justify-center items-center w-[50px] h-76px text-[18px]"
-        >
-          +
-        </div>
-        <div class="flex flex-col justify-center h-76px mr-[20px]">
-          <div class="text-[14px] ml-[15px] mt-[10px]">收入总额</div>
-          <div class="text-[24px] ml-[15px] mb-[10px] mt-[5px]">433.00</div>
-          <div
-            class="text-[#105CFB] text-[14px] cursor-pointer ml-[15px] mt-[-5px]"
-          >
-            明细
-          </div>
-        </div>
-      </div>
-      <div class="w-[30%] h-[115px] bg-[#f2f3f5] flex">
-        <div class="flex flex-col justify-center w-[149px] h-76px">
-          <div class="text-[14px] ml-[15px]">收入总额</div>
-          <div class="text-[24px] ml-[15px]">433.00</div>
-        </div>
-        <div
-          class="flex flex-col justify-center items-center w-[50px] h-76px text-[18px]"
-        >
-          =
-        </div>
-        <div class="flex flex-col justify-center w-[149px] h-76px">
-          <div class="text-[14px] ml-[15px] mt-[10px]">收入总额</div>
-          <div class="text-[24px] ml-[15px] mb-[10px] mt-[5px]">433.00</div>
-          <div
-            class="text-[#105CFB] text-[14px] cursor-pointer ml-[15px] mt-[-5px]"
-          >
-            明细
-          </div>
-        </div>
-        <div class="flex flex-col justify-center items-center w-[50px] h-76px">
-          +
-        </div>
-        <div class="flex flex-col justify-center w-[149px] h-76px">
-          <div class="text-[14px] ml-[15px] mt-[10px]">收入总额</div>
-          <div class="text-[24px] ml-[15px] mb-[10px] mt-[5px]">433.00</div>
-          <div
-            class="text-[#105CFB] text-[14px] cursor-pointer ml-[15px] mt-[-5px]"
-          >
-            明细
-          </div>
-        </div>
-      </div>
+        <div ref="incomeChartRef" class="h-[400px] mt-[40px] ml-[-90px]"></div>
     </div>
-    <div ref="incomeChartRef" class="h-[400px] mt-[40px] ml-[-90px]"></div>
-  </div>
 </template>
 <script lang="ts" setup>
 import { ref, reactive, onMounted, nextTick } from 'vue'
-import type { TabsPaneContext } from 'element-plus'
+import type { TabsPaneContext} from 'element-plus'
 import * as echarts from 'echarts'
 
 const activeName = ref('first')
@@ -423,99 +204,99 @@ const dialogVisible = ref(false)
 const value2 = ref('')
 
 const handleClick = (tab: TabsPaneContext, event: Event) => {
-  if (tab.props.name == 'fifth') {
+  if(tab.props.name == 'fifth'){
     dialogVisible.value = true
   }
-  nextTick(() => {
+  nextTick(()=>{
     initIncomeChart()
   })
+  
 }
 
 const boxes = reactive([
-  { content: '盒子 1', id: 1 },
-  { content: '盒子 2', id: 2 },
-  { content: '盒子 3', id: 3 },
-  { content: '盒子 1', id: 4 },
-  { content: '盒子 2', id: 5 },
-  { content: '盒子 3', id: 6 },
-  { content: '盒子 3', id: 8 },
-  { content: '盒子 3', id: 9 },
-  { content: '盒子 3', id: 10 },
-  { content: '盒子 3', id: 11 },
-])
-const currentIndex = ref(-1)
+  { content: '盒子 1', id : 1 },
+  { content: '盒子 2', id : 2 },
+  { content: '盒子 3', id : 3 },
+  { content: '盒子 1', id : 4  },
+  { content: '盒子 2', id : 5  },
+  { content: '盒子 3', id : 6  },
+  { content: '盒子 3', id : 8  },
+  { content: '盒子 3', id : 9  },
+  { content: '盒子 3', id : 10  },
+  { content: '盒子 3', id : 11  },
+]);
+const currentIndex = ref(-1); 
 
 const selectBox = (item) => {
-  currentIndex.value = item.id
-}
+  currentIndex.value = item.id;
+};
 
 // 折线图
-const incomeChartRef = ref(null)
+const incomeChartRef = ref(null);
 
 const initIncomeChart = () => {
   if (incomeChartRef.value !== null) {
-    const incomeChart = echarts.init(incomeChartRef.value)
+    const incomeChart = echarts.init(incomeChartRef.value);
 
     // 准备数据
-    const xAxisData = ['周一', '周二', '周三', '周四', '周五', '周六', '周日']
-    const yAxisData = [0, -20, -50, 134, 90, 230, 210]
+    const xAxisData = ['周一', '周二', '周三', '周四', '周五', '周六', '周日'];
+    const yAxisData = [0, -20, -50, 134, 90, 230, 210];
 
     // 配置项
     const option = {
       tooltip: {
-        trigger: 'axis',
+        trigger: 'axis'
       },
       legend: {
-        data: ['预计收入'],
+        data: ['预计收入']
       },
       xAxis: {
         type: 'category',
-        data: xAxisData,
+        data: xAxisData
       },
       yAxis: {
-        type: 'value',
+        type: 'value'
       },
-      series: [
-        {
-          name: '预计收入',
-          type: 'line',
-          data: yAxisData,
-        },
-      ],
-    }
+      series: [{
+        name: '预计收入',
+        type: 'line',
+        data: yAxisData
+      }]
+    };
 
     // 使用配置项初始化图表
-    incomeChart.setOption(option)
+    incomeChart.setOption(option);
     incomeChart.resize({
-      width: 'auto',
-    })
+        width: 'auto'
+    });
   }
-}
+};
+
 
 onMounted(() => {
-  initIncomeChart()
-})
+  initIncomeChart();
+});
 </script>
 <style lang="scss" scoped>
-.wenHao {
-  font-size: 14px;
+.wenHao{
+    font-size: 14px;
 }
-.tab-index :deep(.el-tabs__item.is-active) {
-  background-color: #105cfb;
-  color: white;
+.tab-index :deep(.el-tabs__item.is-active){
+    background-color: #105CFB;
+    color: white;
 }
-.tab-index :deep(.el-tabs__item):hover {
-  background-color: #105cfb;
-  color: white;
+.tab-index :deep(.el-tabs__item):hover{
+    background-color: #105CFB;
+    color: white;
 }
-.tab-index :deep(.el-tabs__item) {
-  line-height: 34px;
-  height: 34px !important;
+.tab-index :deep(.el-tabs__item){
+    line-height: 34px;
+    height: 34px !important;
 }
-.tab-index :deep(.el-tabs__nav) {
-  border: 1px solid #d2d2d2;
-  height: 34px;
-  border-radius: 0;
+.tab-index :deep(.el-tabs__nav){
+    border: 1px solid #D2D2D2;
+    height: 34px;
+    border-radius: 0;
 }
 .tab-index :deep(.el-tabs__header) {
   border: none;
diff --git a/admin/src/addon/shop/views/stat/visit.vue b/admin/src/addon/shop/views/stat/visit.vue
index 01f6ced7..3565da92 100644
--- a/admin/src/addon/shop/views/stat/visit.vue
+++ b/admin/src/addon/shop/views/stat/visit.vue
@@ -1,258 +1,159 @@
 <template>
-  <div
-    class="min-w-[100px] min-h-[650px] p-[15px] bg-white tab-index mb-[150px]"
-  >
-    <el-tabs
-      v-model="activeName"
-      class="demo-tabs"
-      @tab-click="handleClick"
-      type="card"
-    >
-      <el-tab-pane name="first">
-        <template #label>今日</template>
-        <div class="flex w-full justify-between flex-wrap">
-          <div
-            class="w-[24.3%] border-[#eee] border-solid border-[1px] h-[85px] p-[15px] cursor-pointer"
-            v-for="(item, index) in boxes"
-            @click="selectBox(item)"
-            :class="{
-              'border-[#105CFB]': currentIndex == item.id,
-              'text-[#105CFB]': currentIndex == item.id,
-            }"
-          >
-            <div class="flex items-center">
-              <div class="text-[14px]">全部</div>
-              <el-tooltip
-                class="box-item"
-                effect="light"
-                content="统计时间内，全部站点总的访客人数"
-                placement="top-start"
-              >
-                <div
-                  class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[4px]"
-                ></div>
-              </el-tooltip>
+    <div class="min-w-[100px] min-h-[650px] p-[15px] bg-white tab-index mb-[150px]">
+        <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick" type="card">
+            <el-tab-pane name="first">
+                <template #label>今日</template>
+                <div class="flex w-full justify-between flex-wrap">
+                    <div class="w-[24.3%] border-[#eee] border-solid border-[1px] h-[85px] p-[15px] cursor-pointer" v-for="(item, index) in boxes"  @click="selectBox(item)" :class="{ 'border-[#105CFB]': currentIndex == item.id,'text-[#105CFB]': currentIndex == item.id }">
+                        <div class="flex items-center">
+                            <div class="text-[14px]">全部</div>
+                            <el-tooltip class="box-item" effect="light" content="统计时间内，全部站点总的访客人数" placement="top-start">
+                              <div class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[4px]"></div>
+                            </el-tooltip>
+                        </div>
+                        <div class="flex justify-between">
+                            <div class="text-[14px] mt-[16px] text-[#999]">访客数</div>
+                            <div class="text-[14px] mt-[16px] text-[#999]">3</div>
+                        </div>
+                    </div>
+                </div>
+            </el-tab-pane>
+            <el-tab-pane label="昨日" name="second">
+                <div class="flex w-full justify-between flex-wrap">
+                    <div class="w-[24.3%] border-[#eee] border-solid border-[1px] h-[85px] p-[15px] cursor-pointer" v-for="(item, index) in boxes"  @click="selectBox(item)" :class="{ 'border-[#105CFB]': currentIndex == item.id,'text-[#105CFB]': currentIndex == item.id }">
+                        <div class="flex items-center">
+                            <div class="text-[14px]">全部</div>
+                            <el-tooltip class="box-item" effect="light" content="统计时间内，全部站点总的访客人数" placement="top-start">
+                              <div class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[4px]"></div>
+                            </el-tooltip>
+                        </div>
+                        <div class="flex justify-between">
+                            <div class="text-[14px] mt-[16px] text-[#999]">访客数</div>
+                            <div class="text-[14px] mt-[16px] text-[#999]">3</div>
+                        </div>
+                    </div>
+                </div>
+            </el-tab-pane>
+            <el-tab-pane label="7日内" name="third">
+                <div class="flex w-full justify-between flex-wrap">
+                    <div class="w-[24.3%] border-[#eee] border-solid border-[1px] h-[85px] p-[15px] cursor-pointer" v-for="(item, index) in boxes"  @click="selectBox(item)" :class="{ 'border-[#105CFB]': currentIndex == item.id,'text-[#105CFB]': currentIndex == item.id }">
+                        <div class="flex items-center">
+                            <div class="text-[14px]">全部</div>
+                            <el-tooltip class="box-item" effect="light" content="统计时间内，全部站点总的访客人数" placement="top-start">
+                              <div class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[4px]"></div>
+                            </el-tooltip>
+                        </div>
+                        <div class="flex justify-between">
+                            <div class="text-[14px] mt-[16px] text-[#999]">访客数</div>
+                            <div class="text-[14px] mt-[16px] text-[#999]">3</div>
+                        </div>
+                    </div>
+                </div>
+            </el-tab-pane>
+            <el-tab-pane label="30日内" name="fourth">
+                <div class="flex w-full justify-between flex-wrap">
+                    <div class="w-[24.3%] border-[#eee] border-solid border-[1px] h-[85px] p-[15px] cursor-pointer" v-for="(item, index) in boxes"  @click="selectBox(item)" :class="{ 'border-[#105CFB]': currentIndex == item.id,'text-[#105CFB]': currentIndex == item.id }">
+                        <div class="flex items-center">
+                            <div class="text-[14px]">全部</div>
+                            <el-tooltip class="box-item" effect="light" content="统计时间内，全部站点总的访客人数" placement="top-start">
+                              <div class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[4px]"></div>
+                            </el-tooltip>
+                        </div>
+                        <div class="flex justify-between">
+                            <div class="text-[14px] mt-[16px] text-[#999]">访客数</div>
+                            <div class="text-[14px] mt-[16px] text-[#999]">3</div>
+                        </div>
+                    </div>
+                </div>
+            </el-tab-pane>
+            <el-tab-pane label="自定义" name="fifth">
+                <el-dialog v-model="dialogVisible" width="520" draggable="true">
+                    <template #header>
+                        <div class="text-[14px] color-[#333] h-[42px] leading-[42px]">自定义时间选择</div>
+                    </template>
+                    <div class="flex items-center">
+                        <span class="mr-[10px]">选择时间:</span>
+                        <el-date-picker v-model="value2" class="w-[100px]" type="datetimerange" start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD HH:mm:ss" date-format="YYYY/MM/DD ddd" time-format="A hh:mm:ss"/>
+                    </div>
+                    <template #footer>
+                    <div class="dialog-footer">
+                        <el-button type="primary" @click="dialogVisible = false">确认</el-button>
+                        <el-button @click="dialogVisible = false">取消</el-button>
+                    </div>
+                    </template>
+                </el-dialog>
+                <div class="flex w-full justify-between flex-wrap" >
+                    <div class="flex w-full justify-between flex-wrap">
+                        <div class="w-[24.3%] border-[#eee] border-solid border-[1px] h-[85px] p-[15px] cursor-pointer" v-for="(item, index) in boxes"  @click="selectBox(item)" :class="{ 'border-[#105CFB]': currentIndex == item.id,'text-[#105CFB]': currentIndex == item.id }">
+                            <div class="flex items-center">
+                                <div class="text-[14px]">全部</div>
+                                <el-tooltip class="box-item" effect="light" content="统计时间内，全部站点总的访客人数" placement="top-start">
+                                <div class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[4px]"></div>
+                                </el-tooltip>
+                            </div>
+                            <div class="flex justify-between">
+                                <div class="text-[14px] mt-[16px] text-[#999]">访客数</div>
+                                <div class="text-[14px] mt-[16px] text-[#999]">3</div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </el-tab-pane>
+        </el-tabs>
+        <div ref="incomeChartRef" class="h-[400px] mt-[60px] ml-[-90px]"></div>
+        <div class="w-full h-[120px] bg-[#f3f8ff] mt-[15px] flex">
+            <div class="flex items-center justify-center flex-col w-[100px] h-[120px] bg-[#105CFB] text-[#fff]">
+                <div class="nc-iconfont nc-icon-wodeV6xx-11 my_icon"></div>
+                <div class="text-[14px]">浏览访问</div>
             </div>
-            <div class="flex justify-between">
-              <div class="text-[14px] mt-[16px] text-[#999]">访客数</div>
-              <div class="text-[14px] mt-[16px] text-[#999]">3</div>
+            <div class="w-[237px] h-[120px] mx-[50px] flex flex-col justify-center">
+                <div class="text-[14px]">访客数(人)</div>
+                <div class="text-[26px]">3</div>
+                <div class="flex">
+                    <div class="text-[12px] text-[#666] pr-[2px]">比前日</div>
+                    <div class="text-[12px] text-[#f97337] pr-[2px]">⬆</div>
+                    <div class="text-[12px] text-[#f97337]">100%</div>
+                </div>
             </div>
-          </div>
-        </div>
-      </el-tab-pane>
-      <el-tab-pane label="昨日" name="second">
-        <div class="flex w-full justify-between flex-wrap">
-          <div
-            class="w-[24.3%] border-[#eee] border-solid border-[1px] h-[85px] p-[15px] cursor-pointer"
-            v-for="(item, index) in boxes"
-            @click="selectBox(item)"
-            :class="{
-              'border-[#105CFB]': currentIndex == item.id,
-              'text-[#105CFB]': currentIndex == item.id,
-            }"
-          >
-            <div class="flex items-center">
-              <div class="text-[14px]">全部</div>
-              <el-tooltip
-                class="box-item"
-                effect="light"
-                content="统计时间内，全部站点总的访客人数"
-                placement="top-start"
-              >
-                <div
-                  class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[4px]"
-                ></div>
-              </el-tooltip>
-            </div>
-            <div class="flex justify-between">
-              <div class="text-[14px] mt-[16px] text-[#999]">访客数</div>
-              <div class="text-[14px] mt-[16px] text-[#999]">3</div>
-            </div>
-          </div>
-        </div>
-      </el-tab-pane>
-      <el-tab-pane label="7日内" name="third">
-        <div class="flex w-full justify-between flex-wrap">
-          <div
-            class="w-[24.3%] border-[#eee] border-solid border-[1px] h-[85px] p-[15px] cursor-pointer"
-            v-for="(item, index) in boxes"
-            @click="selectBox(item)"
-            :class="{
-              'border-[#105CFB]': currentIndex == item.id,
-              'text-[#105CFB]': currentIndex == item.id,
-            }"
-          >
-            <div class="flex items-center">
-              <div class="text-[14px]">全部</div>
-              <el-tooltip
-                class="box-item"
-                effect="light"
-                content="统计时间内，全部站点总的访客人数"
-                placement="top-start"
-              >
-                <div
-                  class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[4px]"
-                ></div>
-              </el-tooltip>
-            </div>
-            <div class="flex justify-between">
-              <div class="text-[14px] mt-[16px] text-[#999]">访客数</div>
-              <div class="text-[14px] mt-[16px] text-[#999]">3</div>
-            </div>
-          </div>
-        </div>
-      </el-tab-pane>
-      <el-tab-pane label="30日内" name="fourth">
-        <div class="flex w-full justify-between flex-wrap">
-          <div
-            class="w-[24.3%] border-[#eee] border-solid border-[1px] h-[85px] p-[15px] cursor-pointer"
-            v-for="(item, index) in boxes"
-            @click="selectBox(item)"
-            :class="{
-              'border-[#105CFB]': currentIndex == item.id,
-              'text-[#105CFB]': currentIndex == item.id,
-            }"
-          >
-            <div class="flex items-center">
-              <div class="text-[14px]">全部</div>
-              <el-tooltip
-                class="box-item"
-                effect="light"
-                content="统计时间内，全部站点总的访客人数"
-                placement="top-start"
-              >
-                <div
-                  class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[4px]"
-                ></div>
-              </el-tooltip>
-            </div>
-            <div class="flex justify-between">
-              <div class="text-[14px] mt-[16px] text-[#999]">访客数</div>
-              <div class="text-[14px] mt-[16px] text-[#999]">3</div>
+            <div class="w-[237px] h-[120px] mx-[50px] flex flex-col justify-center">
+                <div class="text-[14px]">新增会员数(人)</div>
+                <div class="text-[26px]">3</div>
+                <div class="flex">
+                    <div class="text-[12px] text-[#666] pr-[2px]">比前日</div>
+                    <div class="text-[12px] text-[#f97337] pr-[2px]">⬆</div>
+                    <div class="text-[12px] text-[#f97337]">0%</div>
+                </div>
             </div>
-          </div>
         </div>
-      </el-tab-pane>
-      <el-tab-pane label="自定义" name="fifth">
-        <el-dialog v-model="dialogVisible" width="520" draggable="true">
-          <template #header>
-            <div class="text-[14px] color-[#333] h-[42px] leading-[42px]">
-              自定义时间选择
+        <div class="w-full h-[120px] bg-[#fffaf3] mt-[15px] flex">
+            <div class="flex items-center justify-center flex-col w-[100px] h-[120px] bg-[#ff9f15] text-[#fff]">
+                <div class="nc-iconfont nc-icon-liebiaoV6xx my_icon"></div>
+                <div class="text-[14px]">成交转化</div>
             </div>
-          </template>
-          <div class="flex items-center">
-            <span class="mr-[10px]">选择时间:</span>
-            <el-date-picker
-              v-model="value2"
-              class="w-[100px]"
-              type="datetimerange"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
-              format="YYYY-MM-DD HH:mm:ss"
-              date-format="YYYY/MM/DD ddd"
-              time-format="A hh:mm:ss"
-            />
-          </div>
-          <template #footer>
-            <div class="dialog-footer">
-              <el-button type="primary" @click="dialogVisible = false"
-                >确认</el-button
-              >
-              <el-button @click="dialogVisible = false">取消</el-button>
+            <div class="w-[237px] h-[120px] mx-[50px] flex flex-col justify-center">
+                <div class="text-[14px]">支付人数(人)</div>
+                <div class="text-[26px]">3</div>
+                <div class="flex">
+                    <div class="text-[12px] text-[#666] pr-[2px]">比前日</div>
+                    <div class="text-[12px] text-[#f97337] pr-[2px]">⬆</div>
+                    <div class="text-[12px] text-[#f97337]">100%</div>
+                </div>
             </div>
-          </template>
-        </el-dialog>
-        <div class="flex w-full justify-between flex-wrap">
-          <div class="flex w-full justify-between flex-wrap">
-            <div
-              class="w-[24.3%] border-[#eee] border-solid border-[1px] h-[85px] p-[15px] cursor-pointer"
-              v-for="(item, index) in boxes"
-              @click="selectBox(item)"
-              :class="{
-                'border-[#105CFB]': currentIndex == item.id,
-                'text-[#105CFB]': currentIndex == item.id,
-              }"
-            >
-              <div class="flex items-center">
-                <div class="text-[14px]">全部</div>
-                <el-tooltip
-                  class="box-item"
-                  effect="light"
-                  content="统计时间内，全部站点总的访客人数"
-                  placement="top-start"
-                >
-                  <div
-                    class="nc-iconfont nc-icon-bangzhuV6xx wenHao text-[#666] ml-[4px]"
-                  ></div>
-                </el-tooltip>
-              </div>
-              <div class="flex justify-between">
-                <div class="text-[14px] mt-[16px] text-[#999]">访客数</div>
-                <div class="text-[14px] mt-[16px] text-[#999]">3</div>
-              </div>
+            <div class="w-[237px] h-[120px] mx-[50px] flex flex-col justify-center">
+                <div class="text-[14px]">访问-支付转化率(%)</div>
+                <div class="text-[26px]">0.33</div>
+                <div class="flex">
+                    <div class="text-[12px] text-[#666] pr-[2px]">比前日</div>
+                    <div class="text-[12px] text-[#f97337] pr-[2px]">⬆</div>
+                    <div class="text-[12px] text-[#f97337]">0%</div>
+                </div>
             </div>
-          </div>
         </div>
-      </el-tab-pane>
-    </el-tabs>
-    <div ref="incomeChartRef" class="h-[400px] mt-[60px] ml-[-90px]"></div>
-    <div class="w-full h-[120px] bg-[#f3f8ff] mt-[15px] flex">
-      <div
-        class="flex items-center justify-center flex-col w-[100px] h-[120px] bg-[#105CFB] text-[#fff]"
-      >
-        <div class="nc-iconfont nc-icon-wodeV6xx-11 my_icon"></div>
-        <div class="text-[14px]">浏览访问</div>
-      </div>
-      <div class="w-[237px] h-[120px] mx-[50px] flex flex-col justify-center">
-        <div class="text-[14px]">访客数(人)</div>
-        <div class="text-[26px]">3</div>
-        <div class="flex">
-          <div class="text-[12px] text-[#666] pr-[2px]">比前日</div>
-          <div class="text-[12px] text-[#f97337] pr-[2px]">⬆</div>
-          <div class="text-[12px] text-[#f97337]">100%</div>
-        </div>
-      </div>
-      <div class="w-[237px] h-[120px] mx-[50px] flex flex-col justify-center">
-        <div class="text-[14px]">新增会员数(人)</div>
-        <div class="text-[26px]">3</div>
-        <div class="flex">
-          <div class="text-[12px] text-[#666] pr-[2px]">比前日</div>
-          <div class="text-[12px] text-[#f97337] pr-[2px]">⬆</div>
-          <div class="text-[12px] text-[#f97337]">0%</div>
-        </div>
-      </div>
-    </div>
-    <div class="w-full h-[120px] bg-[#fffaf3] mt-[15px] flex">
-      <div
-        class="flex items-center justify-center flex-col w-[100px] h-[120px] bg-[#ff9f15] text-[#fff]"
-      >
-        <div class="nc-iconfont nc-icon-liebiaoV6xx my_icon"></div>
-        <div class="text-[14px]">成交转化</div>
-      </div>
-      <div class="w-[237px] h-[120px] mx-[50px] flex flex-col justify-center">
-        <div class="text-[14px]">支付人数(人)</div>
-        <div class="text-[26px]">3</div>
-        <div class="flex">
-          <div class="text-[12px] text-[#666] pr-[2px]">比前日</div>
-          <div class="text-[12px] text-[#f97337] pr-[2px]">⬆</div>
-          <div class="text-[12px] text-[#f97337]">100%</div>
-        </div>
-      </div>
-      <div class="w-[237px] h-[120px] mx-[50px] flex flex-col justify-center">
-        <div class="text-[14px]">访问-支付转化率(%)</div>
-        <div class="text-[26px]">0.33</div>
-        <div class="flex">
-          <div class="text-[12px] text-[#666] pr-[2px]">比前日</div>
-          <div class="text-[12px] text-[#f97337] pr-[2px]">⬆</div>
-          <div class="text-[12px] text-[#f97337]">0%</div>
-        </div>
-      </div>
     </div>
-  </div>
 </template>
 <script lang="ts" setup>
 import { ref, reactive, onMounted, nextTick } from 'vue'
-import type { TabsPaneContext } from 'element-plus'
+import type { TabsPaneContext} from 'element-plus'
 import * as echarts from 'echarts'
 
 const activeName = ref('first')
@@ -260,93 +161,93 @@ const dialogVisible = ref(false)
 const value2 = ref('')
 
 const handleClick = (tab: TabsPaneContext, event: Event) => {
-  if (tab.props.name == 'fifth') {
+  if(tab.props.name == 'fifth'){
     dialogVisible.value = true
   }
-  nextTick(() => {
+  nextTick(()=>{
     initIncomeChart()
   })
+  
 }
 
 const boxes = reactive([
-  { content: '盒子 1', id: 1 },
-  { content: '盒子 2', id: 2 },
-  { content: '盒子 3', id: 3 },
-  { content: '盒子 1', id: 4 },
-])
-const currentIndex = ref(-1)
+  { content: '盒子 1', id : 1 },
+  { content: '盒子 2', id : 2 },
+  { content: '盒子 3', id : 3 },
+  { content: '盒子 1', id : 4  }
+]);
+const currentIndex = ref(-1); 
 
 const selectBox = (item) => {
-  currentIndex.value = item.id
-}
+  currentIndex.value = item.id;
+};
 
 // 折线图
-const incomeChartRef = ref(null)
+const incomeChartRef = ref(null);
 
 const initIncomeChart = () => {
   if (incomeChartRef.value !== null) {
-    const incomeChart = echarts.init(incomeChartRef.value)
+    const incomeChart = echarts.init(incomeChartRef.value);
 
     // 准备数据
-    const xAxisData = ['周一', '周二', '周三', '周四', '周五', '周六', '周日']
-    const yAxisData = [0, -20, -50, 134, 90, 230, 210]
+    const xAxisData = ['周一', '周二', '周三', '周四', '周五', '周六', '周日'];
+    const yAxisData = [0, -20, -50, 134, 90, 230, 210];
 
     // 配置项
     const option = {
       tooltip: {
-        trigger: 'axis',
+        trigger: 'axis'
       },
       legend: {
-        data: ['全部'],
+        data: ['全部']
       },
       xAxis: {
         type: 'category',
-        data: xAxisData,
+        data: xAxisData
       },
       yAxis: {
-        type: 'value',
+        type: 'value'
       },
-      series: [
-        {
-          name: '全部',
-          type: 'line',
-          data: yAxisData,
-        },
-      ],
-    }
+      series: [{
+        name: '全部',
+        type: 'line',
+        data: yAxisData
+      }]
+    };
 
     // 使用配置项初始化图表
-    incomeChart.setOption(option)
+    incomeChart.setOption(option);
     incomeChart.resize({
-      width: 'auto',
-    })
+        width: 'auto'
+    });
   }
-}
+};
+
 
 onMounted(() => {
-  initIncomeChart()
-})
+  initIncomeChart();
+});
 </script>
 <style lang="scss" scoped>
-.wenHao {
-  font-size: 14px;
+.wenHao{
+    font-size: 14px;
 }
-.tab-index :deep(.el-tabs__item.is-active) {
-  background-color: #105cfb;
-  color: white;
+.tab-index :deep(.el-tabs__item.is-active){
+    background-color: #105CFB;
+    color: white;
 }
-.tab-index :deep(.el-tabs__item):hover {
-  background-color: #105cfb;
-  color: white;
+.tab-index :deep(.el-tabs__item):hover{
+    background-color: #105CFB;
+    color: white;
 }
-.tab-index :deep(.el-tabs__item) {
-  line-height: 34px;
-  height: 34px !important;
+.tab-index :deep(.el-tabs__item){
+    line-height: 34px;
+    height: 34px !important;
 }
-.tab-index :deep(.el-tabs__nav) {
-  border: 1px solid #d2d2d2;
-  height: 34px;
-  border-radius: 0;
+.tab-index :deep(.el-tabs__nav){
+    border: 1px solid #D2D2D2;
+    height: 34px;
+    border-radius: 0;
 }
 .tab-index :deep(.el-tabs__header) {
   border: none;
diff --git a/admin/src/app/api/addon.ts b/admin/src/app/api/addon.ts
index ca7bbc17..5e09bdfe 100644
--- a/admin/src/app/api/addon.ts
+++ b/admin/src/app/api/addon.ts
@@ -5,7 +5,7 @@ import request from '@/utils/request'
  * @returns
  */
 export function getAddonLocal(params: Record<string, any>) {
-  return request.get('addon/local', params)
+    return request.get('addon/local', params)
 }
 
 /**
@@ -13,7 +13,7 @@ export function getAddonLocal(params: Record<string, any>) {
  * @returns
  */
 export function getAddonDetail(id: number) {
-  return request.get(`addon/${id}`)
+    return request.get(`addon/${ id }`)
 }
 
 /**
@@ -22,7 +22,7 @@ export function getAddonDetail(id: number) {
  * @returns
  */
 export function installAddon(params: Record<string, any>) {
-  return request.post(`addon/install/${params.addon}`, params)
+    return request.post(`addon/install/${ params.addon }`, params)
 }
 
 /**
@@ -31,7 +31,7 @@ export function installAddon(params: Record<string, any>) {
  * @returns
  */
 export function cloudInstallAddon(params: Record<string, any>) {
-  return request.post(`addon/cloudinstall/${params.addon}`, params)
+    return request.post(`addon/cloudinstall/${ params.addon }`, params)
 }
 
 /**
@@ -40,9 +40,7 @@ export function cloudInstallAddon(params: Record<string, any>) {
  * @returns
  */
 export function uninstallAddon(params: Record<string, any>) {
-  return request.post(`addon/uninstall/${params.addon}`, params, {
-    showSuccessMessage: true,
-  })
+    return request.post(`addon/uninstall/${ params.addon }`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -51,7 +49,7 @@ export function uninstallAddon(params: Record<string, any>) {
  * @returns
  */
 export function preInstallCheck(addon: string) {
-  return request.get(`addon/install/check/${addon}`)
+    return request.get(`addon/install/check/${ addon }`)
 }
 
 /**
@@ -59,7 +57,7 @@ export function preInstallCheck(addon: string) {
  * @returns
  */
 export function getAddonInstalltask() {
-  return request.get('addon/installtask')
+    return request.get('addon/installtask')
 }
 
 /**
@@ -68,7 +66,7 @@ export function getAddonInstalltask() {
  * @returns
  */
 export function getAddonCloudInstallLog(addon: string) {
-  return request.get(`addon/cloudinstall/${addon}`)
+    return request.get(`addon/cloudinstall/${ addon }`)
 }
 
 /**
@@ -77,7 +75,7 @@ export function getAddonCloudInstallLog(addon: string) {
  * @returns
  */
 export function preUninstallCheck(addon: string) {
-  return request.get(`addon/uninstall/check/${addon}`)
+    return request.get(`addon/uninstall/check/${ addon }`)
 }
 
 /**
@@ -86,15 +84,11 @@ export function preUninstallCheck(addon: string) {
  * @returns
  */
 export function cancelInstall(addon: string) {
-  return request.put(
-    `addon/install/cancel/${addon}`,
-    {},
-    { showErrorMessage: false }
-  )
+    return request.put(`addon/install/cancel/${ addon }`, {}, { showErrorMessage: false })
 }
 
 export function getInstalledAddonList() {
-  return request.get('addon/list/install')
+    return request.get('addon/list/install')
 }
 
 /**
@@ -102,5 +96,5 @@ export function getInstalledAddonList() {
  * @returns
  */
 export function getShowApp() {
-  return request.get('addon/list/showapp')
+    return request.get('addon/list/showapp')
 }
diff --git a/admin/src/app/api/aliapp.ts b/admin/src/app/api/aliapp.ts
index 8a1d8218..e3df32a9 100644
--- a/admin/src/app/api/aliapp.ts
+++ b/admin/src/app/api/aliapp.ts
@@ -5,7 +5,7 @@ import request from '@/utils/request'
  * @returns
  */
 export function getAliappConfig() {
-  return request.get('aliapp/config')
+    return request.get('aliapp/config')
 }
 
 /**
@@ -14,7 +14,7 @@ export function getAliappConfig() {
  * @returns
  */
 export function setAliappConfig(params: Record<string, any>) {
-  return request.put('aliapp/config', params, { showSuccessMessage: true })
+    return request.put('aliapp/config', params, {showSuccessMessage: true})
 }
 
 /**
@@ -22,5 +22,5 @@ export function setAliappConfig(params: Record<string, any>) {
  * @returns
  */
 export function getAliappStatic() {
-  return request.get('aliapp/static')
+    return request.get('aliapp/static')
 }
diff --git a/admin/src/app/api/auth.ts b/admin/src/app/api/auth.ts
index 9d53a76e..b8876395 100644
--- a/admin/src/app/api/auth.ts
+++ b/admin/src/app/api/auth.ts
@@ -1,18 +1,19 @@
 import request from '@/utils/request'
 
+
 /**
  * 登录
  * @param params
  */
 export function login(params: Record<string, any>) {
-  return request.get(`login`, { params })
+    return request.get(`login`, {params})
 }
 
 /**
  * 退出登录
  */
 export function logout() {
-  return request.put('auth/logout', {}, { showErrorMessage: false })
+    return request.put('auth/logout', {}, { showErrorMessage: false })
 }
 
 /**
@@ -20,7 +21,7 @@ export function logout() {
  * @returns
  */
 export function getAuthMenus(params: Record<string, any>) {
-  return request.get('auth/authmenu', { params })
+    return request.get('auth/authmenu', {params})
 }
 
 /**
@@ -28,7 +29,7 @@ export function getAuthMenus(params: Record<string, any>) {
  * @returns
  */
 export function getSiteInfo() {
-  return request.get('auth/site')
+    return request.get('auth/site')
 }
 
 /**
@@ -36,12 +37,12 @@ export function getSiteInfo() {
  * @returns
  */
 export function getLoginConfig() {
-  return request.get('login/config')
+    return request.get('login/config')
 }
 
 /**
  * 获取当前版本信息
  */
 export function getVersions() {
-  return request.get(`sys/info`)
+    return request.get(`sys/info`)
 }
diff --git a/admin/src/app/api/cloud.ts b/admin/src/app/api/cloud.ts
index a6eab887..966cdd47 100644
--- a/admin/src/app/api/cloud.ts
+++ b/admin/src/app/api/cloud.ts
@@ -4,33 +4,33 @@ import request from '@/utils/request'
  * 云编译
  */
 export function cloudBuild() {
-  return request.post('niucloud/build', {})
+    return request.post('niucloud/build', {})
 }
 
 /**
  * 获取云编译任务
  */
 export function getCloudBuildTask() {
-  return request.get('niucloud/build')
+    return request.get('niucloud/build')
 }
 
 /**
  * 云编译前检测
  */
 export function getCloudBuildLog() {
-  return request.get('niucloud/build/log')
+    return request.get('niucloud/build/log')
 }
 
 /**
  * 清除
  */
 export function clearCloudBuildTask() {
-  return request.post('niucloud/build/clear')
+    return request.post('niucloud/build/clear')
 }
 
 /**
  * 云编译前检测
  */
 export function preBuildCheck() {
-  return request.get('niucloud/build/check')
+    return request.get('niucloud/build/check')
 }
diff --git a/admin/src/app/api/departments.ts b/admin/src/app/api/departments.ts
index 8a1b0f73..0bc81e01 100644
--- a/admin/src/app/api/departments.ts
+++ b/admin/src/app/api/departments.ts
@@ -1,7 +1,5 @@
 import request from '@/utils/request'
 
-
-
 // USER_CODE_BEGIN -- departments
 /**
  * 获取部门列表
diff --git a/admin/src/app/api/dict.ts b/admin/src/app/api/dict.ts
index 11b2f169..76952208 100644
--- a/admin/src/app/api/dict.ts
+++ b/admin/src/app/api/dict.ts
@@ -6,7 +6,7 @@ import request from '@/utils/request'
  * @returns
  */
 export function getDictList(params: Record<string, any>) {
-  return request.get(`dict/dict`, { params })
+    return request.get(`dict/dict`, {params})
 }
 
 /**
@@ -15,7 +15,7 @@ export function getDictList(params: Record<string, any>) {
  * @returns
  */
 export function getDictInfo(id: number) {
-  return request.get(`dict/dict/${id}`)
+    return request.get(`dict/dict/${id}`);
 }
 
 /**
@@ -24,10 +24,7 @@ export function getDictInfo(id: number) {
  * @returns
  */
 export function addDict(params: Record<string, any>) {
-  return request.post('dict/dict', params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.post('dict/dict', params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -36,10 +33,7 @@ export function addDict(params: Record<string, any>) {
  * @returns
  */
 export function addDictData(params: Record<string, any>) {
-  return request.put(`dict/dict/${params.id}`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`dict/dict/${params.id}`, params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -48,10 +42,7 @@ export function addDictData(params: Record<string, any>) {
  * @returns
  */
 export function editDict(params: Record<string, any>) {
-  return request.put(`dict/dict/${params.id}`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`dict/dict/${params.id}`, params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -60,10 +51,7 @@ export function editDict(params: Record<string, any>) {
  * @returns
  */
 export function deleteDict(id: number) {
-  return request.delete(`dict/dict/${id}`, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.delete(`dict/dict/${id}`, { showErrorMessage: true, showSuccessMessage: true })
 }
 /**
  * 编辑数据字典内容
@@ -71,18 +59,15 @@ export function deleteDict(id: number) {
  * @param params
  * @returns
  */
-export function setDictData(id: number, params: Record<string, any>) {
-  return request.put(`dict/dictionary/${id}`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+export function setDictData(id:number,params: Record<string, any>) {
+    return request.put(`dict/dictionary/${id}`, params, { showErrorMessage: true,showSuccessMessage: true })
 }
 /**
  * 获取数据字典列表全部
  * @returns
  */
 export function getDictAll() {
-  return request.get(`dict/all`)
+    return request.get(`dict/all`)
 }
 
 /**
@@ -91,5 +76,6 @@ export function getDictAll() {
  * @returns
  */
 export function useDictionary(type: string) {
-  return request.get(`dict/dictionary/type/${type}`)
+    return request.get(`dict/dictionary/type/${type}`)
 }
+
diff --git a/admin/src/app/api/diy.ts b/admin/src/app/api/diy.ts
index 61efcdc3..9398e14a 100644
--- a/admin/src/app/api/diy.ts
+++ b/admin/src/app/api/diy.ts
@@ -8,7 +8,7 @@ import request from '@/utils/request'
  * @returns
  */
 export function getDiyPageList(params: Record<string, any>) {
-  return request.get(`diy/diy`, { params })
+	return request.get(`diy/diy`, {params})
 }
 
 /**
@@ -17,7 +17,7 @@ export function getDiyPageList(params: Record<string, any>) {
  * @returns
  */
 export function getDiyPageListByCarouselSearch(params: Record<string, any>) {
-  return request.get(`diy/carousel_search`, { params })
+	return request.get(`diy/carousel_search`, {params})
 }
 
 /**
@@ -26,7 +26,7 @@ export function getDiyPageListByCarouselSearch(params: Record<string, any>) {
  * @returns
  */
 export function getDiyList(params: Record<string, any>) {
-  return request.get(`diy/list`, { params })
+	return request.get(`diy/list`, {params})
 }
 
 /**
@@ -35,7 +35,7 @@ export function getDiyList(params: Record<string, any>) {
  * @returns
  */
 export function getDiyPageInfo(id: number) {
-  return request.get(`diy/diy/${id}`)
+	return request.get(`diy/diy/${id}`);
 }
 
 /**
@@ -44,7 +44,7 @@ export function getDiyPageInfo(id: number) {
  * @returns
  */
 export function addDiyPage(params: Record<string, any>) {
-  return request.post('diy/diy', params, { showSuccessMessage: true })
+	return request.post('diy/diy', params, {showSuccessMessage: true})
 }
 
 /**
@@ -52,9 +52,7 @@ export function addDiyPage(params: Record<string, any>) {
  * @param params
  */
 export function editDiyPage(params: Record<string, any>) {
-  return request.put(`diy/diy/${params.id}`, params, {
-    showSuccessMessage: true,
-  })
+	return request.put(`diy/diy/${params.id}`, params, {showSuccessMessage: true})
 }
 
 /**
@@ -62,9 +60,7 @@ export function editDiyPage(params: Record<string, any>) {
  * @param params
  */
 export function setUseDiyPage(params: Record<string, any>) {
-  return request.put(`diy/use/${params.id}`, params, {
-    showSuccessMessage: true,
-  })
+	return request.put(`diy/use/${params.id}`, params, {showSuccessMessage: true})
 }
 
 /**
@@ -72,7 +68,7 @@ export function setUseDiyPage(params: Record<string, any>) {
  * @param params
  */
 export function editDiyPageShare(params: Record<string, any>) {
-  return request.put(`diy/diy/share`, params, { showSuccessMessage: true })
+	return request.put(`diy/diy/share`, params, {showSuccessMessage: true})
 }
 
 /**
@@ -81,35 +77,35 @@ export function editDiyPageShare(params: Record<string, any>) {
  * @returns
  */
 export function deleteDiyPage(id: number) {
-  return request.delete(`diy/diy/${id}`, { showSuccessMessage: true })
+	return request.delete(`diy/diy/${id}`, {showSuccessMessage: true})
 }
 
 /**
  * 获取自定义页面初始化数据
  */
 export function initPage(params: Record<string, any>) {
-  return request.get(`diy/init`, { params })
+	return request.get(`diy/init`, {params})
 }
 
 /**
  * 获取自定义链接列表
  */
 export function getLink(params: Record<string, any>) {
-  return request.get(`diy/link`, { params })
+	return request.get(`diy/link`, {params})
 }
 
 /**
  * 获取底部导航列表
  */
 export function getDiyBottomList(params: Record<string, any>) {
-  return request.get(`diy/bottom`, { params })
+	return request.get(`diy/bottom`, {params})
 }
 
 /**
  * 获取底部导航数据
  */
 export function getDiyBottomConfig(params: Record<string, any>) {
-  return request.get(`diy/bottom/config`, { params })
+	return request.get(`diy/bottom/config`, {params})
 }
 
 /**
@@ -118,21 +114,21 @@ export function getDiyBottomConfig(params: Record<string, any>) {
  * @returns
  */
 export function setDiyBottomConfig(params: Record<string, any>) {
-  return request.post('diy/bottom', params, { showSuccessMessage: true })
+	return request.post('diy/bottom', params, {showSuccessMessage: true})
 }
 
 /**
  * 获取页面模板类型
  */
 export function getDiyTemplate(params: Record<string, any>) {
-  return request.get(`diy/template`, { params })
+	return request.get(`diy/template`, {params})
 }
 
 /**
  * 获取模板页面列表
  */
 export function getDiyTemplatePages(params: Record<string, any>) {
-  return request.get(`diy/template/pages`, { params })
+	return request.get(`diy/template/pages`, {params})
 }
 
 /**
@@ -141,7 +137,7 @@ export function getDiyTemplatePages(params: Record<string, any>) {
  * @returns
  */
 export function getDiyRouteList(params: Record<string, any>) {
-  return request.get(`diy/route`, { params })
+	return request.get(`diy/route`, {params})
 }
 
 /**
@@ -149,7 +145,7 @@ export function getDiyRouteList(params: Record<string, any>) {
  * @returns
  */
 export function getDiyRouteAppList() {
-  return request.get(`diy/route/apps`)
+	return request.get(`diy/route/apps`)
 }
 
 /**
@@ -157,7 +153,7 @@ export function getDiyRouteAppList() {
  * @param params
  */
 export function getDiyRouteInfo(params: Record<string, any>) {
-  return request.get(`diy/route/info`, { params })
+	return request.get(`diy/route/info`, {params});
 }
 
 /**
@@ -165,7 +161,7 @@ export function getDiyRouteInfo(params: Record<string, any>) {
  * @param params
  */
 export function editDiyRouteShare(params: Record<string, any>) {
-  return request.put(`diy/route/share`, params, { showSuccessMessage: true })
+	return request.put(`diy/route/share`, params, {showSuccessMessage: true})
 }
 
 /**
@@ -174,7 +170,7 @@ export function editDiyRouteShare(params: Record<string, any>) {
  * @returns
  */
 export function getDecoratePage(params: Record<string, any>) {
-  return request.get(`diy/decorate`, { params })
+	return request.get(`diy/decorate`, {params})
 }
 
 /**
@@ -183,7 +179,7 @@ export function getDecoratePage(params: Record<string, any>) {
  * @returns
  */
 export function changeTemplate(params: Record<string, any>) {
-  return request.put(`diy/change`, params, { showSuccessMessage: true })
+	return request.put(`diy/change`, params, {showSuccessMessage: true})
 }
 
 /**
@@ -192,7 +188,7 @@ export function changeTemplate(params: Record<string, any>) {
  * @returns
  */
 export function getApps(params: Record<string, any>) {
-  return request.get(`diy/apps`)
+	return request.get(`diy/apps`)
 }
 
 /**
@@ -200,31 +196,34 @@ export function getApps(params: Record<string, any>) {
  * @param params
  */
 export function copyDiy(params: Record<string, any>) {
-  return request.post(`diy/copy`, params, { showSuccessMessage: true })
+    return request.post(`diy/copy`, params, { showSuccessMessage: true })
 }
 
 /***************************************************** 主题风格 ****************************************************/
 
+
 /**
  * 获取默认主题配色
  * @param params
  */
 export function getDefaultTheme(params: Record<string, any>) {
-  return request.get(`diy/theme/color`, { params })
+    return request.get(`diy/theme/color`, {params})
 }
 
+
 /**
  * 获取自定义主题配色
  * @param params
  */
 export function getDiyTheme(params: Record<string, any>) {
-  return request.get(`diy/theme`, { params })
+    return request.get(`diy/theme`, {params})
 }
 
+
 /**
- * 设置主题配色
+ * 设置主题配色 
  * @param params
  */
 export function setDiyTheme(params: Record<string, any>) {
-  return request.post(`diy/theme`, params, { showSuccessMessage: true })
-}
+    return request.post(`diy/theme`, params, { showSuccessMessage: true })
+}
\ No newline at end of file
diff --git a/admin/src/app/api/diy_form.ts b/admin/src/app/api/diy_form.ts
index f04ee182..b1629b40 100644
--- a/admin/src/app/api/diy_form.ts
+++ b/admin/src/app/api/diy_form.ts
@@ -8,7 +8,7 @@ import request from '@/utils/request'
  * @returns
  */
 export function getDiyFormPageList(params: Record<string, any>) {
-  return request.get(`diy/form`, { params })
+    return request.get(`diy/form`, { params })
 }
 
 /**
@@ -17,7 +17,7 @@ export function getDiyFormPageList(params: Record<string, any>) {
  * @returns
  */
 export function getDiyFormList(params: Record<string, any>) {
-  return request.get(`diy/form/list`, { params })
+    return request.get(`diy/form/list`, { params })
 }
 
 /**
@@ -26,7 +26,7 @@ export function getDiyFormList(params: Record<string, any>) {
  * @returns
  */
 export function getDiyFormInfo(form_id: number) {
-  return request.get(`diy/form/${form_id}`)
+    return request.get(`diy/form/${ form_id }`);
 }
 
 /**
@@ -35,7 +35,7 @@ export function getDiyFormInfo(form_id: number) {
  * @returns
  */
 export function addDiyForm(params: Record<string, any>) {
-  return request.post('diy/form', params, { showSuccessMessage: true })
+    return request.post('diy/form', params, { showSuccessMessage: true })
 }
 
 /**
@@ -43,9 +43,7 @@ export function addDiyForm(params: Record<string, any>) {
  * @param params
  */
 export function editDiyForm(params: Record<string, any>) {
-  return request.put(`diy/form/${params.form_id}`, params, {
-    showSuccessMessage: true,
-  })
+    return request.put(`diy/form/${ params.form_id }`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -53,7 +51,7 @@ export function editDiyForm(params: Record<string, any>) {
  * @param params
  */
 export function editDiyFormShare(params: Record<string, any>) {
-  return request.put(`diy/form/share`, params, { showSuccessMessage: true })
+    return request.put(`diy/form/share`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -62,14 +60,14 @@ export function editDiyFormShare(params: Record<string, any>) {
  * @returns
  */
 export function deleteDiyForm(params: Record<string, any>) {
-  return request.put(`diy/form/delete`, params, { showSuccessMessage: true })
+    return request.put(`diy/form/delete`, params, { showSuccessMessage: true })
 }
 
 /**
  * 获取万能表单初始化数据
  */
 export function initPage(params: Record<string, any>) {
-  return request.get(`diy/form/init`, { params })
+    return request.get(`diy/form/init`, { params })
 }
 
 /**
@@ -78,7 +76,7 @@ export function initPage(params: Record<string, any>) {
  * @returns
  */
 export function getDiyFormQrcode(params: Record<string, any>) {
-  return request.get(`diy/form/qrcode`, { params })
+    return request.get(`diy/form/qrcode`, { params })
 }
 
 /**
@@ -87,7 +85,7 @@ export function getDiyFormQrcode(params: Record<string, any>) {
  * @returns
  */
 export function getDiyFormFieldsList(params: Record<string, any>) {
-  return request.get(`diy/form/fields/list`, { params })
+    return request.get(`diy/form/fields/list`, { params })
 }
 
 /**
@@ -96,21 +94,21 @@ export function getDiyFormFieldsList(params: Record<string, any>) {
  * @returns
  */
 export function getDiyFormFieldStat(params: Record<string, any>) {
-  return request.get(`diy/form/records/field/stat`, { params })
+    return request.get(`diy/form/records/field/stat`, { params })
 }
 
 /**
  * 获取页面模板类型
  */
 export function getDiyTemplate(params: Record<string, any>) {
-  return request.get(`diy/template`, { params })
+    return request.get(`diy/template`, { params })
 }
 
 /**
  * 获取模板页面列表
  */
 export function getDiyTemplatePages(params: Record<string, any>) {
-  return request.get(`diy/form/template`, { params })
+    return request.get(`diy/form/template`, { params })
 }
 
 /**
@@ -119,10 +117,10 @@ export function getDiyTemplatePages(params: Record<string, any>) {
  * @returns
  */
 export function editFormStatus(params: Record<string, any>) {
-  return request.put(`diy/form/status`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`diy/form/status`, params, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
 }
 
 /**
@@ -131,7 +129,7 @@ export function editFormStatus(params: Record<string, any>) {
  * @returns
  */
 export function getApps(params: Record<string, any>) {
-  return request.get(`diy/apps`)
+    return request.get(`diy/apps`)
 }
 
 /**
@@ -139,7 +137,7 @@ export function getApps(params: Record<string, any>) {
  * @param params
  */
 export function copyDiy(params: Record<string, any>) {
-  return request.post(`diy/form/copy`, params, { showSuccessMessage: true })
+    return request.post(`diy/form/copy`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -148,7 +146,7 @@ export function copyDiy(params: Record<string, any>) {
  * @returns
  */
 export function getFormType(params: Record<string, any>) {
-  return request.get(`diy/form/type`)
+    return request.get(`diy/form/type`)
 }
 
 /**
@@ -157,7 +155,7 @@ export function getFormType(params: Record<string, any>) {
  * @returns
  */
 export function getFormWriteConfig(form_id: any) {
-  return request.get(`diy/form/write/${form_id}`)
+    return request.get(`diy/form/write/${ form_id }`)
 }
 
 /**
@@ -165,7 +163,7 @@ export function getFormWriteConfig(form_id: any) {
  * @param params
  */
 export function editDiyFormWriteConfig(params: Record<string, any>) {
-  return request.put(`diy/form/write`, params, { showSuccessMessage: true })
+    return request.put(`diy/form/write`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -174,7 +172,7 @@ export function editDiyFormWriteConfig(params: Record<string, any>) {
  * @returns
  */
 export function getFormSubmitConfig(form_id: any) {
-  return request.get(`diy/form/submit/${form_id}`)
+    return request.get(`diy/form/submit/${ form_id }`)
 }
 
 /**
@@ -182,7 +180,7 @@ export function getFormSubmitConfig(form_id: any) {
  * @param params
  */
 export function editDiyFormSubmitConfig(params: Record<string, any>) {
-  return request.put(`diy/form/submit`, params, { showSuccessMessage: true })
+    return request.put(`diy/form/submit`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -191,7 +189,7 @@ export function editDiyFormSubmitConfig(params: Record<string, any>) {
  * @returns
  */
 export function getFormRecords(params: Record<string, any>) {
-  return request.get(`diy/form/records`, { params })
+    return request.get(`diy/form/records`, { params })
 }
 
 /**
@@ -200,7 +198,7 @@ export function getFormRecords(params: Record<string, any>) {
  * @returns
  */
 export function getFormRecordsInfo(id: number) {
-  return request.get(`diy/form/records/${id}`)
+    return request.get(`diy/form/records/${ id }`);
 }
 
 /**
@@ -209,9 +207,7 @@ export function getFormRecordsInfo(id: number) {
  * @returns
  */
 export function deleteFormRecords(params: Record<string, any>) {
-  return request.put(`diy/form/records/delete`, params, {
-    showSuccessMessage: true,
-  })
+    return request.put(`diy/form/records/delete`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -220,7 +216,7 @@ export function deleteFormRecords(params: Record<string, any>) {
  * @returns
  */
 export function getFormRecordsMember(params: Record<string, any>) {
-  return request.get(`diy/form/records/member/stat`, { params })
+    return request.get(`diy/form/records/member/stat`, { params })
 }
 
 /**
@@ -228,5 +224,5 @@ export function getFormRecordsMember(params: Record<string, any>) {
  * @param params
  */
 export function copyForm(params: Record<string, any>) {
-  return request.post(`diy/form/copy`, params, { showSuccessMessage: true })
-}
+    return request.post(`diy/form/copy`, params, { showSuccessMessage: true })
+}
\ No newline at end of file
diff --git a/admin/src/app/api/future_ontent.ts b/admin/src/app/api/future_ontent.ts
new file mode 100644
index 00000000..736358e2
--- /dev/null
+++ b/admin/src/app/api/future_ontent.ts
@@ -0,0 +1,40 @@
+import request from '@/utils/request'
+// USER_CODE_BEGIN -- lesson_course_teaching
+
+export function getPublicLibraryList(params: Record<string, any>) {
+    return request.get(`lesson_course_teaching/public_library`, {params})
+}
+
+
+export function addPublicLibraryList(params: Record<string, any>) {
+    return request.post('lesson_course_teaching/public_library', params, { showErrorMessage: true, showSuccessMessage: true })
+}
+
+
+export function editPublicLibraryList(params: Record<string, any>) {
+    return request.put(`lesson_course_teaching/public_library/${params.id}`, params, { showErrorMessage: true, showSuccessMessage: true })
+}
+
+/**
+ * 获取教研管理详情
+ * @param id 教研管理id
+ * @returns
+ */
+export function getLessonCourseTeachingInfo(id: number) {
+    return request.get(`lesson_course_teaching/lesson_course_teaching/${id}`);
+}
+
+/**
+ * 删除教研管理
+ * @param id
+ * @returns
+ */
+export function deleteLessonCourseTeaching(id: number) {
+    return request.delete(`lesson_course_teaching/lesson_course_teaching/${id}`, { showErrorMessage: true, showSuccessMessage: true })
+}
+
+export function getWithPersonnelDataList(params: Record<string,any>){
+    return request.get('lesson_course_teaching/personnel_data_all', {params})
+}
+
+// USER_CODE_END -- lesson_course_teaching
diff --git a/admin/src/app/api/h5.ts b/admin/src/app/api/h5.ts
index 8ec73496..b9a766f0 100644
--- a/admin/src/app/api/h5.ts
+++ b/admin/src/app/api/h5.ts
@@ -5,7 +5,7 @@ import request from '@/utils/request'
  * @returns
  */
 export function getH5Config() {
-  return request.get('channel/h5/config')
+    return request.get('channel/h5/config')
 }
 
 /**
@@ -14,5 +14,5 @@ export function getH5Config() {
  * @returns
  */
 export function setH5Config(params: Record<string, any>) {
-  return request.put('channel/h5/config', params, { showSuccessMessage: true })
+    return request.put('channel/h5/config', params, {showSuccessMessage: true})
 }
diff --git a/admin/src/app/api/instructional_material.ts b/admin/src/app/api/instructional_material.ts
new file mode 100644
index 00000000..aad30bbb
--- /dev/null
+++ b/admin/src/app/api/instructional_material.ts
@@ -0,0 +1,140 @@
+import request from '@/utils/request'
+// USER_CODE_BEGIN -- lesson_course_teaching
+/**
+ * 获取热身动作库列表
+ * @param params
+ * @returns
+ */
+export function getActionLibraryList(params: Record<string, any>) {
+    return request.get(`lesson_course_teaching/action_library`, {params})
+}
+
+/**
+ * 添加热身动作库
+ * @param params
+ * @returns
+ */
+export function addActionLibrary(params: Record<string, any>) {
+    return request.post('lesson_course_teaching/action_library', params, { showErrorMessage: true, showSuccessMessage: true })
+}
+
+/**
+ * 编辑热身动作库
+ * @param id
+ * @param params
+ * @returns
+ */
+export function editActionLibrary(params: Record<string, any>) {
+    return request.put(`lesson_course_teaching/action_library/${params.id}`, params, { showErrorMessage: true, showSuccessMessage: true })
+}
+
+/**
+ * 获取体能动作库列表
+ * @param params
+ * @returns
+ */
+export function getFitnessLibraryList(params: Record<string, any>) {
+    return request.get(`lesson_course_teaching/fitness_library`, {params})
+}
+
+/**
+ * 添加体能动作库
+ * @param params
+ * @returns
+ */
+export function addFitnessLibrary(params: Record<string, any>) {
+    return request.post('lesson_course_teaching/fitness_library', params, { showErrorMessage: true, showSuccessMessage: true })
+}
+
+/**
+ * 编辑体能动作库
+ * @param id
+ * @param params
+ * @returns
+ */
+export function editFitnessLibrary(params: Record<string, any>) {
+    return request.put(`lesson_course_teaching/fitness_library/${params.id}`, params, { showErrorMessage: true, showSuccessMessage: true })
+}
+
+/**
+ * 获取趣味游戏库列表
+ * @param params
+ * @returns
+ */
+export function getGamesLibraryList(params: Record<string, any>) {
+    return request.get(`lesson_course_teaching/games_library`, {params})
+}
+
+/**
+ * 添加趣味游戏库
+ * @param params
+ * @returns
+ */
+export function addGamesLibrary(params: Record<string, any>) {
+    return request.post('lesson_course_teaching/games_library', params, { showErrorMessage: true, showSuccessMessage: true })
+}
+
+/**
+ * 编辑趣味游戏库
+ * @param id
+ * @param params
+ * @returns
+ */
+export function editGamesLibrary(params: Record<string, any>) {
+    return request.put(`lesson_course_teaching/games_library/${params.id}`, params, { showErrorMessage: true, showSuccessMessage: true })
+}
+
+/**
+ * 获取趣味游戏库列表
+ * @param params
+ * @returns
+ */
+export function getRelaxationLibraryList(params: Record<string, any>) {
+    return request.get(`lesson_course_teaching/relaxation_library`, {params})
+}
+
+/**
+ * 添加趣味游戏库
+ * @param params
+ * @returns
+ */
+export function addRelaxationLibrary(params: Record<string, any>) {
+    return request.post('lesson_course_teaching/relaxation_library', params, { showErrorMessage: true, showSuccessMessage: true })
+}
+
+/**
+ * 编辑趣味游戏库
+ * @param id
+ * @param params
+ * @returns
+ */
+export function editRelaxationLibrary(params: Record<string, any>) {
+    return request.put(`lesson_course_teaching/relaxation_library/${params.id}`, params, { showErrorMessage: true, showSuccessMessage: true })
+}
+
+
+
+
+/**
+ * 获取教研管理详情
+ * @param id 教研管理id
+ * @returns
+ */
+export function getLessonCourseTeachingInfo(id: number) {
+    return request.get(`lesson_course_teaching/lesson_course_teaching/${id}`);
+}
+
+/**
+ * 删除教研管理
+ * @param id
+ * @returns
+ */
+export function deleteLessonCourseTeaching(id: number) {
+    return request.delete(`lesson_course_teaching/lesson_course_teaching/${id}`, { showErrorMessage: true, showSuccessMessage: true })
+}
+
+export function getWithPersonnelDataList(params: Record<string,any>){
+    return request.get('lesson_course_teaching/personnel_data_all', {params})
+}
+
+// USER_CODE_END -- lesson_course_teaching
diff --git a/admin/src/app/api/lesson_course_teaching.ts b/admin/src/app/api/lesson_course_teaching.ts
new file mode 100644
index 00000000..47a54c9d
--- /dev/null
+++ b/admin/src/app/api/lesson_course_teaching.ts
@@ -0,0 +1,249 @@
+import request from '@/utils/request'
+// USER_CODE_BEGIN -- lesson_course_teaching
+/**
+ * 获取课程教学大纲列表
+ * @param params
+ * @returns
+ */
+export function getLessonCourseTeachingList(params: Record<string, any>) {
+    return request.get(`lesson_course_teaching/lesson_course_teaching`, {params})
+}
+
+/**
+ * 添加课程教学大纲
+ * @param params
+ * @returns
+ */
+export function addLessonCourseTeaching(params: Record<string, any>) {
+    return request.post('lesson_course_teaching/lesson_course_teaching', params, { showErrorMessage: true, showSuccessMessage: true })
+}
+
+/**
+ * 编辑课程教学大纲
+ * @param id
+ * @param params
+ * @returns
+ */
+export function editLessonCourseTeaching(params: Record<string, any>) {
+    return request.put(`lesson_course_teaching/lesson_course_teaching/${params.id}`, params, { showErrorMessage: true, showSuccessMessage: true })
+}
+
+/**
+ * 获取跳绳教案库列表
+ * @param params
+ * @returns
+ */
+export function getJumpLessonLibraryList(params: Record<string, any>) {
+    return request.get(`lesson_course_teaching/jump_lesson_library`, {params})
+}
+
+/**
+ * 添加跳绳教案库
+ * @param params
+ * @returns
+ */
+export function addJumpLessonLibrary(params: Record<string, any>) {
+    return request.post('lesson_course_teaching/jump_lesson_library', params, { showErrorMessage: true, showSuccessMessage: true })
+}
+
+/**
+ * 编辑跳绳教案库
+ * @param id
+ * @param params
+ * @returns
+ */
+export function editJumpLessonLibrary(params: Record<string, any>) {
+    return request.put(`lesson_course_teaching/jump_lesson_library/${params.id}`, params, { showErrorMessage: true, showSuccessMessage: true })
+}
+
+/**
+ * 获取增高教案库列表
+ * @param params
+ * @returns
+ */
+export function getEnTeachingLibraryList(params: Record<string, any>) {
+    return request.get(`lesson_course_teaching/en_teaching_library`, {params})
+}
+
+/**
+ * 添加增高教案库
+ * @param params
+ * @returns
+ */
+export function addEnTeachingLibrary(params: Record<string, any>) {
+    return request.post('lesson_course_teaching/en_teaching_library', params, { showErrorMessage: true, showSuccessMessage: true })
+}
+
+/**
+ * 编辑增高教案库
+ * @param id
+ * @param params
+ * @returns
+ */
+export function editEnTeachingLibrary(params: Record<string, any>) {
+    return request.put(`lesson_course_teaching/en_teaching_library/${params.id}`, params, { showErrorMessage: true, showSuccessMessage: true })
+}
+
+/**
+ * 获取篮球教案库列表
+ * @param params
+ * @returns
+ */
+export function getBasketballTeachingLibraryList(params: Record<string, any>) {
+    return request.get(`lesson_course_teaching/basketball_teaching_library`, {params})
+}
+
+/**
+ * 添加篮球教案库
+ * @param params
+ * @returns
+ */
+export function addBasketballTeachingLibrary(params: Record<string, any>) {
+    return request.post('lesson_course_teaching/basketball_teaching_library', params, { showErrorMessage: true, showSuccessMessage: true })
+}
+
+/**
+ * 编辑篮球教案库
+ * @param id
+ * @param params
+ * @returns
+ */
+export function editBasketballTeachingLibrary(params: Record<string, any>) {
+    return request.put(`lesson_course_teaching/basketball_teaching_library/${params.id}`, params, { showErrorMessage: true, showSuccessMessage: true })
+}
+
+/**
+ * 获取强化教案库列表
+ * @param params
+ * @returns
+ */
+export function getStrengTeachingLibraryList(params: Record<string, any>) {
+    return request.get(`lesson_course_teaching/streng_teaching_library`, {params})
+}
+
+/**
+ * 添加强化教案库
+ * @param params
+ * @returns
+ */
+export function addStrengTeachingLibrary(params: Record<string, any>) {
+    return request.post('lesson_course_teaching/streng_teaching_library', params, { showErrorMessage: true, showSuccessMessage: true })
+}
+
+/**
+ * 编辑强化教案库
+ * @param id
+ * @param params
+ * @returns
+ */
+export function editStrengTeachingLibrary(params: Record<string, any>) {
+    return request.put(`lesson_course_teaching/streng_teaching_library/${params.id}`, params, { showErrorMessage: true, showSuccessMessage: true })
+}
+
+/**
+ * 获取空中忍者教案库列表
+ * @param params
+ * @returns
+ */
+export function getNinjaTeachingLibraryList(params: Record<string, any>) {
+    return request.get(`lesson_course_teaching/ninja_teaching_library`, {params})
+}
+
+/**
+ * 添加空中忍者教案库
+ * @param params
+ * @returns
+ */
+export function addNinjaTeachingLibrary(params: Record<string, any>) {
+    return request.post('lesson_course_teaching/ninja_teaching_library', params, { showErrorMessage: true, showSuccessMessage: true })
+}
+
+/**
+ * 编辑空中忍者教案库
+ * @param id
+ * @param params
+ * @returns
+ */
+export function editNinjaTeachingLibrary(params: Record<string, any>) {
+    return request.put(`lesson_course_teaching/ninja_teaching_library/${params.id}`, params, { showErrorMessage: true, showSuccessMessage: true })
+}
+
+/**
+ * 获取少儿安防教案库列表
+ * @param params
+ * @returns
+ */
+export function getSecurityTeachingLibraryList(params: Record<string, any>) {
+    return request.get(`lesson_course_teaching/security_teaching_library`, {params})
+}
+
+/**
+ * 添加少儿安防教案库
+ * @param params
+ * @returns
+ */
+export function addSecurityTeachingLibrary(params: Record<string, any>) {
+    return request.post('lesson_course_teaching/security_teaching_library', params, { showErrorMessage: true, showSuccessMessage: true })
+}
+
+/**
+ * 编辑少儿安防教案库
+ * @param id
+ * @param params
+ * @returns
+ */
+export function editSecurityTeachingLibrary(params: Record<string, any>) {
+    return request.put(`lesson_course_teaching/security_teaching_library/${params.id}`, params, { showErrorMessage: true, showSuccessMessage: true })
+}
+
+/**
+ * 获取体能教案库列表
+ * @param params
+ * @returns
+ */
+export function getPhysicalTeachingLibraryList(params: Record<string, any>) {
+    return request.get(`lesson_course_teaching/physical_teaching_library`, {params})
+}
+
+/**
+ * 添加体能教案库
+ * @param params
+ * @returns
+ */
+export function addPhysicalTeachingLibrary(params: Record<string, any>) {
+    return request.post('lesson_course_teaching/physical_teaching_library', params, { showErrorMessage: true, showSuccessMessage: true })
+}
+
+/**
+ * 编辑体能教案库
+ * @param id
+ * @param params
+ * @returns
+ */
+export function editPhysicalTeachingLibrary(params: Record<string, any>) {
+    return request.put(`lesson_course_teaching/physical_teaching_library/${params.id}`, params, { showErrorMessage: true, showSuccessMessage: true })
+}
+
+/**
+ * 获取教研管理详情
+ * @param id 教研管理id
+ * @returns
+ */
+export function getLessonCourseTeachingInfo(id: number) {
+    return request.get(`lesson_course_teaching/lesson_course_teaching/${id}`);
+}
+
+/**
+ * 删除教研管理
+ * @param id
+ * @returns
+ */
+export function deleteLessonCourseTeaching(id: number) {
+    return request.delete(`lesson_course_teaching/lesson_course_teaching/${id}`, { showErrorMessage: true, showSuccessMessage: true })
+}
+
+export function getWithPersonnelDataList(params: Record<string,any>){
+    return request.get('lesson_course_teaching/personnel_data_all', {params})
+}
+
+// USER_CODE_END -- lesson_course_teaching
diff --git a/admin/src/app/api/member.ts b/admin/src/app/api/member.ts
index be0e99ee..7ac2ba2c 100644
--- a/admin/src/app/api/member.ts
+++ b/admin/src/app/api/member.ts
@@ -1,5 +1,6 @@
 import request from '@/utils/request'
 
+
 /***************************************************** 会员管理 ****************************************************/
 
 /**
@@ -8,7 +9,7 @@ import request from '@/utils/request'
  * @returns
  */
 export function getMemberList(params: Record<string, any>) {
-  return request.get(`member/member`, { params })
+    return request.get(`member/member`, { params })
 }
 
 /**
@@ -17,7 +18,7 @@ export function getMemberList(params: Record<string, any>) {
  * @returns
  */
 export function getMemberInfo(id: number) {
-  return request.get(`member/member/${id}`)
+    return request.get(`member/member/${id}`);
 }
 
 /**
@@ -25,7 +26,7 @@ export function getMemberInfo(id: number) {
  * @returns
  */
 export function getMemberNo() {
-  return request.get(`member/memberno`)
+    return request.get(`member/memberno`);
 }
 
 /**
@@ -34,7 +35,7 @@ export function getMemberNo() {
  * @returns
  */
 export function addMember(params: Record<string, any>) {
-  return request.post(`member/member`, params, { showSuccessMessage: true })
+    return request.post(`member/member`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -43,7 +44,7 @@ export function addMember(params: Record<string, any>) {
  * @returns
  */
 export function getRegisterType(params: Record<string, any>) {
-  return request.get(`member/registertype`, params)
+    return request.get(`member/registertype`, params)
 }
 
 /**
@@ -52,7 +53,7 @@ export function getRegisterType(params: Record<string, any>) {
  * @returns
  */
 export function getRegisterChannelType(params: Record<string, any>) {
-  return request.get(`member/register/channel`, params)
+    return request.get(`member/register/channel`, params)
 }
 
 /**
@@ -60,9 +61,7 @@ export function getRegisterChannelType(params: Record<string, any>) {
  * @param member_id
  */
 export function deleteMember(member_id: number) {
-  return request.delete(`member/member/${member_id}`, {
-    showSuccessMessage: true,
-  })
+    return request.delete(`member/member/${member_id}`, { showSuccessMessage: true })
 }
 
 /***************************************************** 会员标签 ****************************************************/
@@ -73,7 +72,7 @@ export function deleteMember(member_id: number) {
  * @returns
  */
 export function getMemberLabelList(params: Record<string, any>) {
-  return request.get(`member/label`, { params })
+    return request.get(`member/label`, { params })
 }
 
 /**
@@ -82,7 +81,7 @@ export function getMemberLabelList(params: Record<string, any>) {
  * @returns
  */
 export function getMemberLabelInfo(label_id: number) {
-  return request.get(`member/label/${label_id}`)
+    return request.get(`member/label/${label_id}`);
 }
 
 /**
@@ -91,7 +90,7 @@ export function getMemberLabelInfo(label_id: number) {
  * @returns
  */
 export function addMemberLabel(params: Record<string, any>) {
-  return request.post('member/label', params, { showSuccessMessage: true })
+    return request.post('member/label', params, { showSuccessMessage: true })
 }
 
 /**
@@ -99,9 +98,7 @@ export function addMemberLabel(params: Record<string, any>) {
  * @param params
  */
 export function updateMemberLabel(params: Record<string, any>) {
-  return request.put(`member/label/${params.label_id}`, params, {
-    showSuccessMessage: true,
-  })
+    return request.put(`member/label/${params.label_id}`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -110,16 +107,14 @@ export function updateMemberLabel(params: Record<string, any>) {
  * @returns
  */
 export function deleteMemberLabel(label_id: number) {
-  return request.delete(`member/label/${label_id}`, {
-    showSuccessMessage: true,
-  })
+    return request.delete(`member/label/${label_id}`, { showSuccessMessage: true })
 }
 
 /**
  * 获取全部会员标签
  */
 export function getMemberLabelAll() {
-  return request.get(`member/label/all`)
+    return request.get(`member/label/all`);
 }
 
 /**
@@ -127,15 +122,12 @@ export function getMemberLabelAll() {
  * @param params
  */
 export function editMemberDetail(params: Record<string, any>) {
-  return request.put(
-    `member/member/modify/${params.member_id}/${params.field}`,
-    params,
-    { showSuccessMessage: true }
-  )
+    return request.put(`member/member/modify/${params.member_id}/${params.field}`, params, { showSuccessMessage: true })
 }
 
 /***************************************************** 会员零钱 ****************************************************/
 
+
 /***************************************************** 会员账户 ****************************************************/
 
 /**
@@ -143,7 +135,7 @@ export function editMemberDetail(params: Record<string, any>) {
  * @param change_type
  */
 export function getChangeTypeList(change_type: string) {
-  return request.get(`member/account/change_type/${change_type}`)
+    return request.get(`member/account/change_type/${change_type}`)
 }
 
 /**
@@ -152,7 +144,7 @@ export function getChangeTypeList(change_type: string) {
  * @returns
  */
 export function getPointList(params: Record<string, any>) {
-  return request.get(`member/account/point`, { params })
+    return request.get(`member/account/point`, { params })
 }
 
 /**
@@ -161,7 +153,7 @@ export function getPointList(params: Record<string, any>) {
  * @returns
  */
 export function getGrowthList(params: Record<string, any>) {
-  return request.get(`member/account/growth`, { params })
+    return request.get(`member/account/growth`, { params })
 }
 
 /**
@@ -170,7 +162,7 @@ export function getGrowthList(params: Record<string, any>) {
  * @returns
  */
 export function getBalanceList(params: Record<string, any>) {
-  return request.get(`member/account/balance`, { params })
+    return request.get(`member/account/balance`, { params })
 }
 
 /**
@@ -179,7 +171,7 @@ export function getBalanceList(params: Record<string, any>) {
  * @returns
  */
 export function getMoneyList(params: Record<string, any>) {
-  return request.get(`member/account/money`, { params })
+    return request.get(`member/account/money`, { params })
 }
 
 /**
@@ -188,7 +180,7 @@ export function getMoneyList(params: Record<string, any>) {
  * @returns
  */
 export function getCommissionList(params: Record<string, any>) {
-  return request.get(`member/account/commission`, { params })
+    return request.get(`member/account/commission`, { params })
 }
 
 /**
@@ -197,9 +189,7 @@ export function getCommissionList(params: Record<string, any>) {
  * @returns
  */
 export function adjustPoint(params: Record<string, any>) {
-  return request.post(`member/account/point`, params, {
-    showSuccessMessage: true,
-  })
+    return request.post(`member/account/point`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -208,9 +198,7 @@ export function adjustPoint(params: Record<string, any>) {
  * @returns
  */
 export function adjustBalance(params: Record<string, any>) {
-  return request.post(`member/account/balance`, params, {
-    showSuccessMessage: true,
-  })
+    return request.post(`member/account/balance`, params, { showSuccessMessage: true })
 }
 
 /***************************************************** 会员相关设置 ****************************************************/
@@ -219,7 +207,7 @@ export function adjustBalance(params: Record<string, any>) {
  * 获取登录设置
  */
 export function getLoginConfig() {
-  return request.get(`member/config/login`)
+    return request.get(`member/config/login`)
 }
 
 /**
@@ -228,16 +216,14 @@ export function getLoginConfig() {
  * @returns
  */
 export function setLoginConfig(params: Record<string, any>) {
-  return request.post(`member/config/login`, params, {
-    showSuccessMessage: true,
-  })
+    return request.post(`member/config/login`, params, { showSuccessMessage: true })
 }
 
 /**
  * 获取会员设置
  */
 export function getMemberConfig() {
-  return request.get(`member/config/member`)
+    return request.get(`member/config/member`)
 }
 
 /**
@@ -246,9 +232,7 @@ export function getMemberConfig() {
  * @returns
  */
 export function setMemberConfig(params: Record<string, any>) {
-  return request.post(`member/config/member`, params, {
-    showSuccessMessage: true,
-  })
+    return request.post(`member/config/member`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -257,16 +241,14 @@ export function setMemberConfig(params: Record<string, any>) {
  * @returns
  */
 export function setGrowthRuleConfig(params: Record<string, any>) {
-  return request.post(`member/config/growth_rule`, params, {
-    showSuccessMessage: true,
-  })
+    return request.post(`member/config/growth_rule`, params, { showSuccessMessage: true })
 }
 
 /**
  * 获取成长值规则设置
  */
 export function getGrowthRuleConfig() {
-  return request.get(`member/config/growth_rule`)
+    return request.get(`member/config/growth_rule`)
 }
 
 /**
@@ -275,32 +257,31 @@ export function getGrowthRuleConfig() {
  * @returns
  */
 export function setPointRuleConfig(params: Record<string, any>) {
-  return request.post(`member/config/point_rule`, params, {
-    showSuccessMessage: true,
-  })
+    return request.post(`member/config/point_rule`, params, { showSuccessMessage: true })
 }
 
 /**
  * 获取积分规则设置
  */
 export function getPointRuleConfig() {
-  return request.get(`member/config/point_rule`)
+    return request.get(`member/config/point_rule`)
 }
 
 /**
  * 获取会员转账方式
  */
 export function getTransfertype() {
-  return request.get(`member/cash_out/transfertype`)
+    return request.get(`member/cash_out/transfertype`)
 }
 
+
 /**
  * 佣金统计
  * @param params
  * @returns
  */
 export function getCommissionSum(params: Record<string, any>) {
-  return request.get(`member/account/sum_commission`, { params })
+    return request.get(`member/account/sum_commission`, { params })
 }
 
 /**
@@ -309,7 +290,7 @@ export function getCommissionSum(params: Record<string, any>) {
  * @returns
  */
 export function getPointSum(params: Record<string, any>) {
-  return request.get(`member/account/sum_point`, { params })
+    return request.get(`member/account/sum_point`, { params })
 }
 
 /**
@@ -318,30 +299,31 @@ export function getPointSum(params: Record<string, any>) {
  * @returns
  */
 export function getBalanceSum(params: Record<string, any>) {
-  return request.get(`member/account/sum_balance`, { params })
+    return request.get(`member/account/sum_balance`, { params })
 }
 
 /**
  * 余额类型
  */
 export function getBalanceStatus() {
-  return request.get(`member/account/type`)
+    return request.get(`member/account/type`)
 }
 
 /**
  * 获取余额变动类型
  */
 export function getAccountType(params: Record<string, any>) {
-  return request.get(`member/account/change_type/${params.account_type}`)
+    return request.get(`member/account/change_type/${params.account_type}`)
 }
 
+
 /***************************************************** 会员提现 ****************************************************/
 
 /**
  * 获取提现设置
  */
 export function getCashOutConfig() {
-  return request.get(`member/config/cash_out`)
+    return request.get(`member/config/cash_out`)
 }
 
 /**
@@ -350,9 +332,7 @@ export function getCashOutConfig() {
  * @returns
  */
 export function setCashOutConfig(params: Record<string, any>) {
-  return request.post(`member/config/cash_out`, params, {
-    showSuccessMessage: true,
-  })
+    return request.post(`member/config/cash_out`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -361,7 +341,7 @@ export function setCashOutConfig(params: Record<string, any>) {
  * @returns
  */
 export function getCashOutList(params: Record<string, any>) {
-  return request.get(`member/cash_out`, { params })
+    return request.get(`member/cash_out`, { params })
 }
 
 /**
@@ -369,7 +349,7 @@ export function getCashOutList(params: Record<string, any>) {
  * @param id
  */
 export function getCashOutDetail(id: number) {
-  return request.get(`member/cash_out/${id}`, {})
+    return request.get(`member/cash_out/${id}`, {})
 }
 
 /**
@@ -377,11 +357,7 @@ export function getCashOutDetail(id: number) {
  * @param params
  */
 export function memberAudit(params: Record<string, any>) {
-  return request.put(
-    `member/cash_out/audit/${params.id}/${params.action}`,
-    params,
-    { showSuccessMessage: true }
-  )
+    return request.put(`member/cash_out/audit/${params.id}/${params.action}`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -389,9 +365,7 @@ export function memberAudit(params: Record<string, any>) {
  * @param params
  */
 export function memberTransfer(params: Record<string, any>) {
-  return request.put(`member/cash_out/transfer/${params.id}`, params, {
-    showSuccessMessage: true,
-  })
+    return request.put(`member/cash_out/transfer/${params.id}`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -399,20 +373,14 @@ export function memberTransfer(params: Record<string, any>) {
  * @param params
  */
 export function memberRemark(params: Record<string, any>) {
-  return request.put(`member/cash_out/remark/${params.id}`, params, {
-    showSuccessMessage: true,
-  })
+    return request.put(`member/cash_out/remark/${params.id}`, params, { showSuccessMessage: true })
 }
 /**
  * 检查打款进度
  * @param params
  */
 export function memberCheck(id: number) {
-  return request.put(
-    `member/cash_out/check/${id}`,
-    {},
-    { showSuccessMessage: true }
-  )
+    return request.put(`member/cash_out/check/${id}`, {}, { showSuccessMessage: true })
 }
 
 /**
@@ -420,16 +388,14 @@ export function memberCheck(id: number) {
  * @param params
  */
 export function editMemberStatus(params: Record<string, any>) {
-  return request.put(`member/setstatus/${params.status}`, params, {
-    showSuccessMessage: true,
-  })
+    return request.put(`member/setstatus/${params.status}`, params, { showSuccessMessage: true })
 }
 
 /**
  * 会员提现状态
  */
 export function getCashOutStatusList() {
-  return request.get(`member/cash_out/status`)
+    return request.get(`member/cash_out/status`)
 }
 
 /**
@@ -437,7 +403,7 @@ export function getCashOutStatusList() {
  * @returns
  */
 export function getCashOutStat() {
-  return request.get(`member/cash_out/stat`)
+    return request.get(`member/cash_out/stat`)
 }
 
 /**
@@ -445,7 +411,7 @@ export function getCashOutStat() {
  * @returns
  */
 export function getBenefitsDict() {
-  return request.get(`member/dict/benefits`)
+    return request.get(`member/dict/benefits`)
 }
 
 /**
@@ -453,7 +419,7 @@ export function getBenefitsDict() {
  * @returns
  */
 export function getGiftDict() {
-  return request.get(`member/dict/gift`)
+    return request.get(`member/dict/gift`)
 }
 
 /**
@@ -461,7 +427,7 @@ export function getGiftDict() {
  * @returns
  */
 export function getGrowthRuleDict() {
-  return request.get(`member/dict/growth_rule`)
+    return request.get(`member/dict/growth_rule`)
 }
 
 /**
@@ -469,7 +435,7 @@ export function getGrowthRuleDict() {
  * @returns
  */
 export function getPointRuleDict() {
-  return request.get(`member/dict/point_rule`)
+    return request.get(`member/dict/point_rule`)
 }
 /***************************************************** 会员等级 ****************************************************/
 
@@ -479,7 +445,7 @@ export function getPointRuleDict() {
  * @returns
  */
 export function getMemberLevelPageList(params: Record<string, any>) {
-  return request.get(`member/level`, { params })
+    return request.get(`member/level`, { params })
 }
 
 /**
@@ -488,7 +454,7 @@ export function getMemberLevelPageList(params: Record<string, any>) {
  * @returns
  */
 export function getMemberLevelInfo(level_id: number) {
-  return request.get(`member/level/${level_id}`)
+    return request.get(`member/level/${level_id}`);
 }
 
 /**
@@ -497,7 +463,7 @@ export function getMemberLevelInfo(level_id: number) {
  * @returns
  */
 export function addMemberLevel(params: Record<string, any>) {
-  return request.post('member/level', params, { showSuccessMessage: true })
+    return request.post('member/level', params, { showSuccessMessage: true })
 }
 
 /**
@@ -505,9 +471,7 @@ export function addMemberLevel(params: Record<string, any>) {
  * @param params
  */
 export function updateMemberLevel(params: Record<string, any>) {
-  return request.put(`member/level/${params.level_id}`, params, {
-    showSuccessMessage: true,
-  })
+    return request.put(`member/level/${params.level_id}`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -516,16 +480,14 @@ export function updateMemberLevel(params: Record<string, any>) {
  * @returns
  */
 export function deleteMemberLevel(level_id: number) {
-  return request.delete(`member/level/${level_id}`, {
-    showSuccessMessage: true,
-  })
+    return request.delete(`member/level/${level_id}`, { showSuccessMessage: true })
 }
 
 /**
  * 获取全部会员等级
  */
 export function getMemberLevelAll() {
-  return request.get(`member/level/all`)
+    return request.get(`member/level/all`);
 }
 
 /***************************************************** 签到设置 ****************************************************/
@@ -534,21 +496,21 @@ export function getMemberLevelAll() {
  * 获取会员权益内容
  */
 export function getMemberBenefitsContent() {
-  return request.get(`member/benefits/content`)
+    return request.get(`member/benefits/content`);
 }
 
 /**
  * 获取会员礼包内容
  */
 export function getMemberGiftsContent(params: Record<string, any>) {
-  return request.get(`member/gifts/content`, { params })
+    return request.get(`member/gifts/content`, { params });
 }
 
 /**
  * 获取签到设置
  */
 export function getSignConfig() {
-  return request.get(`member/sign/config`)
+    return request.get(`member/sign/config`)
 }
 
 /**
@@ -557,14 +519,14 @@ export function getSignConfig() {
  * @returns
  */
 export function setSignConfig(params: Record<string, any>) {
-  return request.put(`member/sign/config`, params, { showSuccessMessage: true })
+    return request.put(`member/sign/config`, params, { showSuccessMessage: true })
 }
 
 /**
  * 获取会员签到记录
  */
 export function getMemberSignList(params: Record<string, any>) {
-  return request.get(`member/sign`, { params })
+    return request.get(`member/sign`, { params });
 }
 
 /***************************************************** 地址管理 ****************************************************/
@@ -573,19 +535,19 @@ export function getMemberSignList(params: Record<string, any>) {
  * 获取收货地址
  */
 export function getMemberAddress(params: Record<string, any>) {
-  return request.get(`member/address`, { params })
+    return request.get(`member/address`, { params });
 }
 
 /**
- * 添加收货地址
+ * 添加收货地址 
  */
 export function addMemberAddress(params: Record<string, any>) {
-  return request.post(`member/address`, params)
+    return request.post(`member/address`, params);
 }
 
 /**
  * 编辑收货地址
  */
 export function editMemberAddress(params: Record<string, any>) {
-  return request.put(`member/address`, params)
-}
+    return request.put(`member/address`, params);
+}
\ No newline at end of file
diff --git a/admin/src/app/api/module.ts b/admin/src/app/api/module.ts
index 9baf371e..26b13b73 100644
--- a/admin/src/app/api/module.ts
+++ b/admin/src/app/api/module.ts
@@ -4,21 +4,21 @@ import request from '@/utils/request'
  * 获取授权信息
  */
 export function getAuthInfo() {
-  return request.get('niucloud/authinfo', { showErrorMessage: false })
+    return request.get('niucloud/authinfo', { showErrorMessage: false })
 }
 
 /**
  * 设置 授权配置
  */
 export function setAuthInfo(params: Record<string, any>) {
-  return request.post('niucloud/authinfo', params, { showSuccessMessage: true })
+    return request.post('niucloud/authinfo', params, {showSuccessMessage: true})
 }
 
 /**
  * 获取 授权配置
  */
 export function getAdminAuthInfo() {
-  return request.get('niucloud/admin/authinfo')
+    return request.get('niucloud/admin/authinfo')
 }
 
 /**
@@ -26,7 +26,7 @@ export function getAdminAuthInfo() {
  * @returns
  */
 export function getModule() {
-  return request.get('niucloud/module')
+    return request.get('niucloud/module')
 }
 
 /**
@@ -34,7 +34,7 @@ export function getModule() {
  * @returns
  */
 export function getModuleVersion() {
-  return request.get(`niucloud/module`)
+    return request.get(`niucloud/module`)
 }
 
 /**
@@ -43,9 +43,7 @@ export function getModuleVersion() {
  * @returns
  */
 export function downloadVersion(params: Record<string, any>) {
-  return request.post(`addon/download/${params.addon}`, params, {
-    showSuccessMessage: true,
-  })
+    return request.post(`addon/download/${params.addon}`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -53,7 +51,7 @@ export function downloadVersion(params: Record<string, any>) {
  * @returns
  */
 export function getFrameworkNewVersion() {
-  return request.get(`niucloud/framework/newversion`)
+    return request.get(`niucloud/framework/newversion`)
 }
 
 /**
@@ -61,5 +59,5 @@ export function getFrameworkNewVersion() {
  * @returns
  */
 export function getFrameworkVersionList() {
-  return request.get(`niucloud/framework/version/list`)
+    return request.get(`niucloud/framework/version/list`)
 }
diff --git a/admin/src/app/api/notice.ts b/admin/src/app/api/notice.ts
index 41650442..8f1a173e 100644
--- a/admin/src/app/api/notice.ts
+++ b/admin/src/app/api/notice.ts
@@ -7,7 +7,7 @@ import request from '@/utils/request'
  * @returns
  */
 export function getNoticeList(params: any) {
-  return request.get('notice/notice', { params })
+    return request.get('notice/notice', {params})
 }
 
 /**
@@ -16,7 +16,7 @@ export function getNoticeList(params: any) {
  * @returns
  */
 export function getNoticeLog(params: any) {
-  return request.get(`notice/log`, { params })
+    return request.get(`notice/log`, {params})
 }
 
 /**
@@ -25,7 +25,7 @@ export function getNoticeLog(params: any) {
  * @returns
  */
 export function getNoticeInfo(key: string) {
-  return request.get(`notice/notice/${key}`)
+    return request.get(`notice/notice/${key}`)
 }
 
 /**
@@ -34,9 +34,7 @@ export function getNoticeInfo(key: string) {
  * @returns
  */
 export function editNoticeStatus(params: Record<string, any>) {
-  return request.post(`notice/notice/editstatus`, params, {
-    showSuccessMessage: true,
-  })
+    return request.post(`notice/notice/editstatus`, params, {showSuccessMessage: true})
 }
 
 /**
@@ -45,9 +43,7 @@ export function editNoticeStatus(params: Record<string, any>) {
  * @returns
  */
 export function editNotice(params: Record<string, any>) {
-  return request.post(`notice/notice/edit`, params, {
-    showSuccessMessage: true,
-  })
+    return request.post(`notice/notice/edit`, params, {showSuccessMessage: true})
 }
 
 /**
@@ -55,7 +51,7 @@ export function editNotice(params: Record<string, any>) {
  * @returns
  */
 export function getSmsList() {
-  return request.get('notice/notice/sms')
+    return request.get('notice/notice/sms')
 }
 
 /**
@@ -64,7 +60,7 @@ export function getSmsList() {
  * @returns
  */
 export function getSmsInfo(sms_type: string) {
-  return request.get(`notice/notice/sms/${sms_type}`)
+    return request.get(`notice/notice/sms/${sms_type}`,)
 }
 
 /**
@@ -72,9 +68,7 @@ export function getSmsInfo(sms_type: string) {
  * @param params
  */
 export function editSms(params: Record<string, any>) {
-  return request.put(`notice/notice/sms/${params.sms_type}`, params, {
-    showSuccessMessage: true,
-  })
+    return request.put(`notice/notice/sms/${params.sms_type}`, params, {showSuccessMessage: true})
 }
 
 /**
@@ -82,5 +76,5 @@ export function editSms(params: Record<string, any>) {
  * @param params
  */
 export function getSmsLog(params: Record<string, any>) {
-  return request.get(`notice/sms/log`, { params })
+    return request.get(`notice/sms/log`, { params })
 }
diff --git a/admin/src/app/api/pay.ts b/admin/src/app/api/pay.ts
index 18177c47..8b48e0e3 100644
--- a/admin/src/app/api/pay.ts
+++ b/admin/src/app/api/pay.ts
@@ -8,7 +8,7 @@ import request from '@/utils/request'
  * @returns
  */
 export function getAccountList(params: Record<string, any>) {
-  return request.get(`pay/account`, { params })
+    return request.get(`pay/account`, {params})
 }
 
 /**
@@ -16,7 +16,7 @@ export function getAccountList(params: Record<string, any>) {
  * @param id
  */
 export function getAccountInfo(id: number) {
-  return request.get(`pay/account/${id}`)
+    return request.get(`pay/account/${id}`)
 }
 
 /**
@@ -24,7 +24,7 @@ export function getAccountInfo(id: number) {
  * @returns
  */
 export function getAccountStat() {
-  return request.get(`pay/account/stat`)
+    return request.get(`pay/account/stat`)
 }
 
 /**
@@ -32,7 +32,7 @@ export function getAccountStat() {
  * @returns
  */
 export function getAccountType() {
-  return request.get(`pay/account/type`)
+    return request.get(`pay/account/type`)
 }
 
 /***************************************************** 退款信息 **************************************************/
@@ -43,7 +43,7 @@ export function getAccountType() {
  * @returns
  */
 export function getPayRefundPages(params: Record<string, any>) {
-  return request.get(`pay/refund`, { params })
+    return request.get(`pay/refund`, {params})
 }
 
 /**
@@ -51,14 +51,14 @@ export function getPayRefundPages(params: Record<string, any>) {
  * @param refund_no
  */
 export function getPayRefundInfo(refund_no: string) {
-  return request.get(`pay/refund/${refund_no}`)
+    return request.get(`pay/refund/${refund_no}`)
 }
 
 /**
  * 退款方式
  */
 export function getRefundType() {
-  return request.get(`pay/refund/type`)
+    return request.get(`pay/refund/type`)
 }
 
 /**
@@ -66,30 +66,28 @@ export function getRefundType() {
  * @param params
  */
 export function getRefundTransfer(params: Record<string, any>) {
-  return request.post(`pay/refund/transfer`, params, {
-    showSuccessMessage: true,
-  })
+    return request.post(`pay/refund/transfer`, params, {showSuccessMessage: true})
 }
 
 /**
  * 全部支付方式
  */
 export function getAllPayType() {
-  return request.get(`pay/type/all`)
+    return request.get(`pay/type/all`)
 }
 
 /**
  * 支付列表
  */
 export function getPayList() {
-  return request.get(`pay/type/list`)
+    return request.get(`pay/type/list`)
 }
 
 /**
  * 支付
  */
 export function pay(params: Record<string, any>) {
-  return request.post(`pay`, params)
+    return request.post(`pay`, params)
 }
 
 /**
@@ -98,12 +96,6 @@ export function pay(params: Record<string, any>) {
  * @param tradeId
  * @param channel
  */
-export function getFriendsPay(
-  tradeType: string,
-  tradeId: number,
-  channel: string
-) {
-  return request.get(`pay/friendspay/info/${tradeType}/${tradeId}/${channel}`, {
-    showErrorMessage: false,
-  })
+export function getFriendsPay(tradeType : string, tradeId : number, channel: string) {
+   return request.get(`pay/friendspay/info/${tradeType}/${tradeId}/${channel}`, { showErrorMessage: false })
 }
diff --git a/admin/src/app/api/pc.ts b/admin/src/app/api/pc.ts
index fa994de9..5237a705 100644
--- a/admin/src/app/api/pc.ts
+++ b/admin/src/app/api/pc.ts
@@ -5,7 +5,7 @@ import request from '@/utils/request'
  * @returns
  */
 export function getPcConfig() {
-  return request.get('channel/pc/config')
+    return request.get('channel/pc/config')
 }
 
 /**
@@ -14,5 +14,5 @@ export function getPcConfig() {
  * @returns
  */
 export function setPcConfig(params: Record<string, any>) {
-  return request.put('channel/pc/config', params, { showSuccessMessage: true })
+    return request.put('channel/pc/config', params, {showSuccessMessage: true})
 }
diff --git a/admin/src/app/api/personal.ts b/admin/src/app/api/personal.ts
index e30e02ce..105925f9 100644
--- a/admin/src/app/api/personal.ts
+++ b/admin/src/app/api/personal.ts
@@ -5,7 +5,7 @@ import request from '@/utils/request'
  * @returns
  */
 export function getUserInfo() {
-  return request.get(`auth/get`)
+    return request.get(`auth/get`)
 }
 
 /**
@@ -13,5 +13,6 @@ export function getUserInfo() {
  * @returns
  */
 export function setUserInfo(params: Record<string, any>) {
-  return request.put(`auth/edit`, params, { showSuccessMessage: true })
+    return request.put(`auth/edit`, params, {showSuccessMessage: true});
 }
+
diff --git a/admin/src/app/api/poster.ts b/admin/src/app/api/poster.ts
index 37e83677..21d51fd4 100644
--- a/admin/src/app/api/poster.ts
+++ b/admin/src/app/api/poster.ts
@@ -6,7 +6,7 @@ import request from '@/utils/request'
  * @returns
  */
 export function getPosterPageList(params: Record<string, any>) {
-  return request.get(`sys/poster`, { params })
+    return request.get(`sys/poster`, {params})
 }
 
 /**
@@ -15,7 +15,7 @@ export function getPosterPageList(params: Record<string, any>) {
  * @returns
  */
 export function getPosterList(params: Record<string, any>) {
-  return request.get(`sys/poster/list`, { params })
+    return request.get(`sys/poster/list`, {params})
 }
 
 /**
@@ -24,7 +24,7 @@ export function getPosterList(params: Record<string, any>) {
  * @returns
  */
 export function getPosterInfo(id: number) {
-  return request.get(`sys/poster/${id}`)
+    return request.get(`sys/poster/${id}`);
 }
 
 /**
@@ -33,10 +33,7 @@ export function getPosterInfo(id: number) {
  * @returns
  */
 export function addPoster(params: Record<string, any>) {
-  return request.post('sys/poster', params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.post('sys/poster', params, {showErrorMessage: true, showSuccessMessage: true})
 }
 
 /**
@@ -45,10 +42,10 @@ export function addPoster(params: Record<string, any>) {
  * @returns
  */
 export function editPoster(params: Record<string, any>) {
-  return request.put(`sys/poster/${params.id}`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`sys/poster/${params.id}`, params, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
 }
 
 /**
@@ -57,10 +54,7 @@ export function editPoster(params: Record<string, any>) {
  * @returns
  */
 export function deletePoster(id: number) {
-  return request.delete(`sys/poster/${id}`, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.delete(`sys/poster/${id}`, {showErrorMessage: true, showSuccessMessage: true})
 }
 
 /**
@@ -68,7 +62,7 @@ export function deletePoster(id: number) {
  * @param params
  */
 export function modifyPosterStatus(params: Record<string, any>) {
-  return request.put(`sys/poster/status`, params, { showSuccessMessage: true })
+    return request.put(`sys/poster/status`, params, {showSuccessMessage: true})
 }
 
 /**
@@ -76,7 +70,7 @@ export function modifyPosterStatus(params: Record<string, any>) {
  * @param params
  */
 export function modifyPosterDefault(params: Record<string, any>) {
-  return request.put(`sys/poster/default`, params, { showSuccessMessage: true })
+    return request.put(`sys/poster/default`, params, {showSuccessMessage: true})
 }
 
 /**
@@ -85,7 +79,7 @@ export function modifyPosterDefault(params: Record<string, any>) {
  * @returns
  */
 export function getPosterType(params: Record<string, any>) {
-  return request.get(`sys/poster/type`, { params })
+    return request.get(`sys/poster/type`, {params})
 }
 
 /**
@@ -94,21 +88,21 @@ export function getPosterType(params: Record<string, any>) {
  * @returns
  */
 export function getPosterTemplate(params: Record<string, any>) {
-  return request.get(`sys/poster/template`, { params })
+    return request.get(`sys/poster/template`, {params})
 }
 
 /**
  * 获取自定义海报初始化数据
  */
 export function initPoster(params: Record<string, any>) {
-  return request.get(`sys/poster/init`, { params })
+    return request.get(`sys/poster/init`, {params})
 }
 
 /**
  * 获取自定义海报预览
  */
 export function getPreviewPoster(params: Record<string, any>) {
-  return request.get(`sys/poster/preview`, { params })
+    return request.get(`sys/poster/preview`, {params})
 }
 
 /**
@@ -117,5 +111,5 @@ export function getPreviewPoster(params: Record<string, any>) {
  * @returns
  */
 export function getPosterGenerate(params: Record<string, any>) {
-  return request.get(`sys/poster/generate`, { params, showErrorMessage: false })
-}
+    return request.get(`sys/poster/generate`, {params, showErrorMessage: false})
+}
\ No newline at end of file
diff --git a/admin/src/app/api/printer.ts b/admin/src/app/api/printer.ts
index dd7cdc9d..eccf6213 100644
--- a/admin/src/app/api/printer.ts
+++ b/admin/src/app/api/printer.ts
@@ -6,7 +6,7 @@ import request from '@/utils/request'
  * @returns
  */
 export function getPrinterPageList(params: Record<string, any>) {
-  return request.get(`sys/printer`, { params })
+    return request.get(`sys/printer`, { params })
 }
 
 /**
@@ -15,7 +15,7 @@ export function getPrinterPageList(params: Record<string, any>) {
  * @returns
  */
 export function getPrinterList(params: Record<string, any>) {
-  return request.get(`sys/printer/list`, { params })
+    return request.get(`sys/printer/list`, { params })
 }
 
 /**
@@ -24,7 +24,7 @@ export function getPrinterList(params: Record<string, any>) {
  * @returns
  */
 export function getPrinterInfo(printer_id: number) {
-  return request.get(`sys/printer/${printer_id}`)
+    return request.get(`sys/printer/${ printer_id }`);
 }
 
 /**
@@ -33,10 +33,7 @@ export function getPrinterInfo(printer_id: number) {
  * @returns
  */
 export function addPrinter(params: Record<string, any>) {
-  return request.post('sys/printer', params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.post('sys/printer', params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -45,10 +42,10 @@ export function addPrinter(params: Record<string, any>) {
  * @returns
  */
 export function editPrinter(params: Record<string, any>) {
-  return request.put(`sys/printer/${params.printer_id}`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`sys/printer/${ params.printer_id }`, params, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
 }
 
 /**
@@ -57,10 +54,10 @@ export function editPrinter(params: Record<string, any>) {
  * @returns
  */
 export function modifyPrinterStatus(params: Record<string, any>) {
-  return request.put(`sys/printer/status`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`sys/printer/status`, params, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
 }
 
 /**
@@ -69,10 +66,10 @@ export function modifyPrinterStatus(params: Record<string, any>) {
  * @returns
  */
 export function deletePrinter(printer_id: number) {
-  return request.delete(`sys/printer/${printer_id}`, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.delete(`sys/printer/${ printer_id }`, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
 }
 
 /**
@@ -81,7 +78,7 @@ export function deletePrinter(printer_id: number) {
  * @returns
  */
 export function getPrinterTemplatePageList(params: Record<string, any>) {
-  return request.get(`sys/printer/template`, { params })
+    return request.get(`sys/printer/template`, { params })
 }
 
 /**
@@ -90,7 +87,7 @@ export function getPrinterTemplatePageList(params: Record<string, any>) {
  * @returns
  */
 export function getPrinterTemplateList(params: Record<string, any>) {
-  return request.get(`sys/printer/template/list`, { params })
+    return request.get(`sys/printer/template/list`, { params })
 }
 
 /**
@@ -99,7 +96,7 @@ export function getPrinterTemplateList(params: Record<string, any>) {
  * @returns
  */
 export function getPrinterTemplateInfo(template_id: number) {
-  return request.get(`sys/printer/template/${template_id}`)
+    return request.get(`sys/printer/template/${ template_id }`);
 }
 
 /**
@@ -108,10 +105,10 @@ export function getPrinterTemplateInfo(template_id: number) {
  * @returns
  */
 export function addPrinterTemplate(params: Record<string, any>) {
-  return request.post('sys/printer/template', params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.post('sys/printer/template', params, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
 }
 
 /**
@@ -120,10 +117,10 @@ export function addPrinterTemplate(params: Record<string, any>) {
  * @returns
  */
 export function editPrinterTemplate(params: Record<string, any>) {
-  return request.put(`sys/printer/template/${params.template_id}`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`sys/printer/template/${ params.template_id }`, params, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
 }
 
 /**
@@ -132,10 +129,10 @@ export function editPrinterTemplate(params: Record<string, any>) {
  * @returns
  */
 export function deletePrinterTemplate(template_id: number) {
-  return request.delete(`sys/printer/template/${template_id}`, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.delete(`sys/printer/template/${ template_id }`, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
 }
 
 /**
@@ -144,7 +141,7 @@ export function deletePrinterTemplate(template_id: number) {
  * @returns
  */
 export function getPrinterType(params: Record<string, any>) {
-  return request.get(`sys/printer/type`, { params })
+    return request.get(`sys/printer/type`, { params })
 }
 
 /**
@@ -153,7 +150,7 @@ export function getPrinterType(params: Record<string, any>) {
  * @returns
  */
 export function getPrinterBrand(params: Record<string, any>) {
-  return request.get(`sys/printer/brand`, { params })
+    return request.get(`sys/printer/brand`, { params })
 }
 
 /**
@@ -162,14 +159,10 @@ export function getPrinterBrand(params: Record<string, any>) {
  * @returns
  */
 export function refreshPrinterToken(printer_id: number) {
-  return request.put(
-    `sys/printer/refreshtoken/${printer_id}`,
-    {},
-    {
-      showErrorMessage: true,
-      showSuccessMessage: true,
-    }
-  )
+    return request.put(`sys/printer/refreshtoken/${ printer_id }`,{},{
+        showErrorMessage: true,
+        showSuccessMessage: true
+    });
 }
 
 /**
@@ -178,11 +171,7 @@ export function refreshPrinterToken(printer_id: number) {
  * @returns
  */
 export function testPrint(printer_id: number) {
-  return request.put(
-    `sys/printer/testprint/${printer_id}`,
-    {},
-    { showErrorMessage: true, showSuccessMessage: true }
-  )
+    return request.put(`sys/printer/testprint/${ printer_id }`, {},{ showErrorMessage: true, showSuccessMessage: true });
 }
 
 /**
@@ -191,8 +180,5 @@ export function testPrint(printer_id: number) {
  * @returns
  */
 export function printTicket(params: Record<string, any>) {
-  return request.post('sys/printer/printticket', params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
-}
+    return request.post('sys/printer/printticket', params, { showErrorMessage: true, showSuccessMessage: true })
+}
\ No newline at end of file
diff --git a/admin/src/app/api/sys.ts b/admin/src/app/api/sys.ts
index b15605d7..285cc133 100644
--- a/admin/src/app/api/sys.ts
+++ b/admin/src/app/api/sys.ts
@@ -7,7 +7,7 @@ import request from '@/utils/request'
  * @returns
  */
 export function getInfo() {
-  return request.get('sys/role')
+    return request.get('sys/role')
 }
 
 /**
@@ -15,7 +15,7 @@ export function getInfo() {
  * @returns
  */
 export function getUrl() {
-  return request.get('sys/url')
+    return request.get('sys/url')
 }
 
 /***************************************************** 用户组 ****************************************************/
@@ -25,7 +25,7 @@ export function getUrl() {
  * @returns
  */
 export function getRoleList(params: Record<string, any>) {
-  return request.get('sys/role', { params })
+    return request.get('sys/role', { params })
 }
 
 /**
@@ -33,7 +33,7 @@ export function getRoleList(params: Record<string, any>) {
  * @param roleId
  */
 export function getRoleInfo(roleId: number) {
-  return request.get(`sys/role/${roleId}`)
+    return request.get(`sys/role/${ roleId }`)
 }
 
 /**
@@ -42,7 +42,7 @@ export function getRoleInfo(roleId: number) {
  * @returns
  */
 export function addRole(params: Record<string, any>) {
-  return request.post(`sys/role`, params, { showSuccessMessage: true })
+    return request.post(`sys/role`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -50,9 +50,7 @@ export function addRole(params: Record<string, any>) {
  * @param params
  */
 export function editRole(params: Record<string, any>) {
-  return request.put(`sys/role/${params.role_id}`, params, {
-    showSuccessMessage: true,
-  })
+    return request.put(`sys/role/${ params.role_id }`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -60,7 +58,7 @@ export function editRole(params: Record<string, any>) {
  * @param roleId
  */
 export function deleteRole(roleId: number) {
-  return request.delete(`sys/role/${roleId}`, { showSuccessMessage: true })
+    return request.delete(`sys/role/${ roleId }`, { showSuccessMessage: true })
 }
 
 /**
@@ -68,7 +66,7 @@ export function deleteRole(roleId: number) {
  * @returns
  */
 export function allRole() {
-  return request.get('sys/role/all')
+    return request.get('sys/role/all')
 }
 
 /***************************************************** 全部菜单 ****************************************************/
@@ -78,7 +76,7 @@ export function allRole() {
  * @returns
  */
 export function getMenus() {
-  return request.get(`sys/menu`)
+    return request.get(`sys/menu`)
 }
 
 /**
@@ -86,7 +84,7 @@ export function getMenus() {
  * @param menu_key
  */
 export function getMenuInfo(menu_key: string) {
-  return request.get(`sys/menu/info/${menu_key}`)
+    return request.get(`sys/menu/info/${ menu_key }`);
 }
 
 /**
@@ -95,7 +93,7 @@ export function getMenuInfo(menu_key: string) {
  * @returns
  */
 export function addMenu(params: Record<string, any>) {
-  return request.post('sys/menu', params, { showSuccessMessage: true })
+    return request.post('sys/menu', params, { showSuccessMessage: true })
 }
 
 /**
@@ -103,9 +101,7 @@ export function addMenu(params: Record<string, any>) {
  * @param params
  */
 export function editMenu(params: Record<string, any>) {
-  return request.put(`sys/menu/${params.menu_key}`, params, {
-    showSuccessMessage: true,
-  })
+    return request.put(`sys/menu/${ params.menu_key }`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -113,7 +109,7 @@ export function editMenu(params: Record<string, any>) {
  * @param menu_key
  */
 export function deleteMenu(menu_key: string) {
-  return request.delete(`sys/menu/${menu_key}`, { showSuccessMessage: true })
+    return request.delete(`sys/menu/${ menu_key }`, { showSuccessMessage: true })
 }
 
 /**
@@ -121,7 +117,7 @@ export function deleteMenu(menu_key: string) {
  *
  */
 export function getSystemMenu(params: Record<string, any> = {}) {
-  return request.get(`sys/menu/system_menu`, { params })
+    return request.get(`sys/menu/system_menu`, { params })
 }
 
 /**
@@ -129,7 +125,7 @@ export function getSystemMenu(params: Record<string, any> = {}) {
  *
  */
 export function getAddonMenu(key: any) {
-  return request.get(`sys/menu/addon_menu/${key}`)
+    return request.get(`sys/menu/addon_menu/${ key }`)
 }
 
 /**
@@ -137,7 +133,7 @@ export function getAddonMenu(key: any) {
  * @param key
  */
 export function getMenuByTypeDir(key: any = 'system') {
-  return request.get(`sys/menu/dir/${key}`)
+    return request.get(`sys/menu/dir/${ key }`)
 }
 
 /***************************************************** 设置 ****************************************************/
@@ -147,7 +143,7 @@ export function getMenuByTypeDir(key: any = 'system') {
  * @returns
  */
 export function getWebsite() {
-  return request.get('sys/config/website')
+    return request.get('sys/config/website')
 }
 
 /**
@@ -155,7 +151,7 @@ export function getWebsite() {
  * @returns
  */
 export function getWebConfig() {
-  return request.get('sys/web/website')
+    return request.get('sys/web/website')
 }
 
 /**
@@ -163,7 +159,7 @@ export function getWebConfig() {
  * @returns
  */
 export function getWebCopyright() {
-  return request.get('sys/web/copyright')
+    return request.get('sys/web/copyright')
 }
 
 /**
@@ -172,7 +168,7 @@ export function getWebCopyright() {
  * @returns
  */
 export function setWebsite(params: Record<string, any>) {
-  return request.put(`sys/config/website`, params, { showSuccessMessage: true })
+    return request.put(`sys/config/website`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -180,7 +176,7 @@ export function setWebsite(params: Record<string, any>) {
  * @returns
  */
 export function getCopyright() {
-  return request.get('sys/config/copyright')
+    return request.get('sys/config/copyright')
 }
 
 /**
@@ -188,7 +184,7 @@ export function getCopyright() {
  * @returns
  */
 export function getService() {
-  return request.get('sys/config/service')
+    return request.get('sys/config/service')
 }
 
 /**
@@ -197,9 +193,7 @@ export function getService() {
  * @returns
  */
 export function setCopyright(params: Record<string, any>) {
-  return request.put(`sys/config/copyright`, params, {
-    showSuccessMessage: true,
-  })
+    return request.put(`sys/config/copyright`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -208,7 +202,7 @@ export function setCopyright(params: Record<string, any>) {
  * @returns
  */
 export function getAttachmentCategoryList(params: Record<string, any>) {
-  return request.get(`sys/attachment/category`, { params })
+    return request.get(`sys/attachment/category`, { params })
 }
 
 /**
@@ -216,9 +210,7 @@ export function getAttachmentCategoryList(params: Record<string, any>) {
  * @param params
  */
 export function addAttachmentCategory(params: Record<string, any>) {
-  return request.post(`sys/attachment/category`, params, {
-    showSuccessMessage: true,
-  })
+    return request.post(`sys/attachment/category`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -227,9 +219,7 @@ export function addAttachmentCategory(params: Record<string, any>) {
  * @returns
  */
 export function editAttachmentCategory(params: Record<string, any>) {
-  return request.put(`sys/attachment/category/${params.id}`, params, {
-    showSuccessMessage: true,
-  })
+    return request.put(`sys/attachment/category/${ params.id }`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -238,9 +228,7 @@ export function editAttachmentCategory(params: Record<string, any>) {
  * @returns
  */
 export function deleteAttachmentCategory(id: number) {
-  return request.delete(`sys/attachment/category/${id}`, {
-    showSuccessMessage: true,
-  })
+    return request.delete(`sys/attachment/category/${ id }`, { showSuccessMessage: true })
 }
 
 /**
@@ -249,7 +237,7 @@ export function deleteAttachmentCategory(id: number) {
  * @returns
  */
 export function getAttachmentList(params: Record<string, any>) {
-  return request.get(`sys/attachment`, { params })
+    return request.get(`sys/attachment`, { params })
 }
 
 /**
@@ -258,10 +246,7 @@ export function getAttachmentList(params: Record<string, any>) {
  * @returns
  */
 export function deleteAttachment(params: Record<string, any>) {
-  return request.delete(`sys/attachment/del`, {
-    data: params,
-    showSuccessMessage: true,
-  })
+    return request.delete(`sys/attachment/del`, { data: params, showSuccessMessage: true })
 }
 
 /**
@@ -270,7 +255,7 @@ export function deleteAttachment(params: Record<string, any>) {
  * @returns
  */
 export function moveAttachment(params: Record<string, any>) {
-  return request.put(`sys/attachment/batchmove`, params)
+    return request.put(`sys/attachment/batchmove`, params)
 }
 
 /**
@@ -279,7 +264,7 @@ export function moveAttachment(params: Record<string, any>) {
  * @returns
  */
 export function getIconCategoryList(params: Record<string, any>) {
-  return request.get(`sys/attachment/icon_category`, { params })
+    return request.get(`sys/attachment/icon_category`, { params })
 }
 
 /**
@@ -288,7 +273,7 @@ export function getIconCategoryList(params: Record<string, any>) {
  * @returns
  */
 export function getIconList(params: Record<string, any>) {
-  return request.get(`sys/attachment/icon`, { params })
+    return request.get(`sys/attachment/icon`, { params })
 }
 
 /**
@@ -296,7 +281,7 @@ export function getIconList(params: Record<string, any>) {
  * @returns
  */
 export function getEnv() {
-  return request.get(`sys/env`)
+    return request.get(`sys/env`)
 }
 
 /***************************************************** 地址管理 ****************************************************/
@@ -306,7 +291,7 @@ export function getEnv() {
  * @param pid
  */
 export function getAreaListByPid(pid: number = 0) {
-  return request.get(`sys/area/list_by_pid/${pid}`)
+    return request.get(`sys/area/list_by_pid/${ pid }`)
 }
 
 /**
@@ -314,21 +299,21 @@ export function getAreaListByPid(pid: number = 0) {
  * @param level
  */
 export function getAreatree(level: number = 1) {
-  return request.get(`sys/area/tree/${level}`)
+    return request.get(`sys/area/tree/${ level }`)
 }
 
 /**
  * 获取地址信息
  */
 export function getAddressInfo(params: any) {
-  return request.get(`sys/area/get_info`, { params })
+    return request.get(`sys/area/get_info`, { params })
 }
 
 /**
  * 获取地址信息
  */
 export function getContraryAddress(params: any) {
-  return request.get(`sys/area/contrary`, { params })
+    return request.get(`sys/area/contrary`, { params })
 }
 
 /**
@@ -336,7 +321,7 @@ export function getContraryAddress(params: any) {
  * @param code
  */
 export function getAreaByCode(code: number | string) {
-  return request.get(`sys/area/code/${code}`)
+    return request.get(`sys/area/code/${ code }`)
 }
 
 /***************************************************** 存储设置 ****************************************************/
@@ -345,7 +330,7 @@ export function getAreaByCode(code: number | string) {
  * 获取存储配置列表
  */
 export function getStorageList() {
-  return request.get(`sys/storage`)
+    return request.get(`sys/storage`)
 }
 
 /**
@@ -353,7 +338,7 @@ export function getStorageList() {
  * @param type
  */
 export function getStorageInfo(type: string) {
-  return request.get(`sys/storage/${type}`)
+    return request.get(`sys/storage/${ type }`)
 }
 
 /**
@@ -362,9 +347,7 @@ export function getStorageInfo(type: string) {
  * @returns
  */
 export function editStorage(params: Record<string, any>) {
-  return request.put(`sys/storage/${params.storage_type}`, params, {
-    showSuccessMessage: true,
-  })
+    return request.put(`sys/storage/${ params.storage_type }`, params, { showSuccessMessage: true })
 }
 
 /***************************************************** 支付设置 ****************************************************/
@@ -374,7 +357,7 @@ export function editStorage(params: Record<string, any>) {
  * @returns
  */
 export function getPayConfig(type: string) {
-  return request.get(`pay/config/${type}`)
+    return request.get(`pay/config/${ type }`)
 }
 
 /**
@@ -382,9 +365,7 @@ export function getPayConfig(type: string) {
  * @returns
  */
 export function setPayConfig(params: Record<string, any>) {
-  return request.put(`pay/config/${params.type}`, params, {
-    showSuccessMessage: true,
-  })
+    return request.put(`pay/config/${ params.type }`, params, { showSuccessMessage: true });
 }
 
 /**
@@ -392,7 +373,7 @@ export function setPayConfig(params: Record<string, any>) {
  * @returns
  */
 export function getPayList() {
-  return request.get(`pay/lists`)
+    return request.get(`pay/lists`)
 }
 
 /***************************************************** 打款设置 ****************************************************/
@@ -401,7 +382,7 @@ export function getPayList() {
  * @param channel
  */
 export function getTransferInfo(channel: string) {
-  return request.get(`pay/channel/lists/${channel}`)
+    return request.get(`pay/channel/lists/${ channel }`)
 }
 
 /**
@@ -410,9 +391,7 @@ export function getTransferInfo(channel: string) {
  * @returns
  */
 export function setTransferInfo(params: Record<string, any>) {
-  return request.post(`pay/channel/set/transfer`, params, {
-    showSuccessMessage: true,
-  })
+    return request.post(`pay/channel/set/transfer`, params, { showSuccessMessage: true })
 }
 
 /***************************************************** 定时任务 ****************************************************/
@@ -422,7 +401,7 @@ export function setTransferInfo(params: Record<string, any>) {
  * @returns
  */
 export function getCronList(params: any) {
-  return request.get(`sys/schedule/list`, { params })
+    return request.get(`sys/schedule/list`, { params })
 }
 
 /**
@@ -430,7 +409,7 @@ export function getCronList(params: any) {
  * @returns
  */
 export function getCronInfo(id: string) {
-  return request.get(`sys/cron/${id}`)
+    return request.get(`sys/cron/${ id }`);
 }
 
 /**
@@ -438,7 +417,7 @@ export function getCronInfo(id: string) {
  * @returns
  */
 export function getCronTemplate() {
-  return request.get(`sys/schedule/template`)
+    return request.get(`sys/schedule/template`)
 }
 
 /**
@@ -446,7 +425,7 @@ export function getCronTemplate() {
  * @returns
  */
 export function getCronDateType() {
-  return request.get(`sys/schedule/datetype`)
+    return request.get(`sys/schedule/datetype`)
 }
 
 /**
@@ -454,7 +433,7 @@ export function getCronDateType() {
  * @returns
  */
 export function getWeek() {
-  return request.get(`sys/date/week`)
+    return request.get(`sys/date/week`)
 }
 
 /**
@@ -462,7 +441,7 @@ export function getWeek() {
  * @returns
  */
 export function addCron(params: Record<string, any>) {
-  return request.post(`sys/schedule`, params, { showSuccessMessage: true })
+    return request.post(`sys/schedule`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -470,9 +449,7 @@ export function addCron(params: Record<string, any>) {
  * @returns
  */
 export function editCron(params: Record<string, any>) {
-  return request.put(`sys/schedule/${params.id}`, params, {
-    showSuccessMessage: true,
-  })
+    return request.put(`sys/schedule/${ params.id }`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -480,7 +457,7 @@ export function editCron(params: Record<string, any>) {
  * @returns
  */
 export function deleteCron(id: string) {
-  return request.delete(`sys/schedule/${id}`, { showSuccessMessage: true })
+    return request.delete(`sys/schedule/${ id }`, { showSuccessMessage: true })
 }
 
 /**
@@ -488,18 +465,19 @@ export function deleteCron(id: string) {
  * @returns
  */
 export function doCron(params: Record<string, any>) {
-  return request.put(`sys/schedule/do/${params.id}`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`sys/schedule/do/${ params.id }`, params, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
 }
 
+
 /**
  * 获取任务日志列表
  * @returns
  */
 export function getCronLogList(params: any) {
-  return request.get(`sys/schedule/log/list`, { params })
+    return request.get(`sys/schedule/log/list`, { params })
 }
 
 /**
@@ -507,9 +485,7 @@ export function getCronLogList(params: any) {
  * @returns
  */
 export function deleteCronLog(params: Record<string, any>) {
-  return request.put(`sys/schedule/log/delete`, params, {
-    showSuccessMessage: true,
-  })
+    return request.put(`sys/schedule/log/delete`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -517,9 +493,7 @@ export function deleteCronLog(params: Record<string, any>) {
  * @returns
  */
 export function clearCronLog(params: Record<string, any>) {
-  return request.put(`sys/schedule/log/clear`, params, {
-    showSuccessMessage: true,
-  })
+    return request.put(`sys/schedule/log/clear`, params, { showSuccessMessage: true })
 }
 
 /***************************************************** 协议管理 ****************************************************/
@@ -529,7 +503,7 @@ export function clearCronLog(params: Record<string, any>) {
  * @returns
  */
 export function getAgreementList() {
-  return request.get(`sys/agreement`)
+    return request.get(`sys/agreement`)
 }
 
 /**
@@ -537,7 +511,7 @@ export function getAgreementList() {
  * @returns
  */
 export function getAgreementInfo(key: string) {
-  return request.get(`sys/agreement/${key}`)
+    return request.get(`sys/agreement/${ key }`);
 }
 
 /**
@@ -545,9 +519,7 @@ export function getAgreementInfo(key: string) {
  * @returns
  */
 export function editAgreement(params: Record<string, any>) {
-  return request.put(`sys/agreement/${params.key}`, params, {
-    showSuccessMessage: true,
-  })
+    return request.put(`sys/agreement/${ params.key }`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -555,7 +527,7 @@ export function editAgreement(params: Record<string, any>) {
  * @returns
  */
 export function getChannelType() {
-  return request.get(`sys/channel`)
+    return request.get(`sys/channel`);
 }
 
 /**
@@ -563,7 +535,7 @@ export function getChannelType() {
  * @returns
  */
 export function getSceneDomain() {
-  return request.get(`sys/scene_domain`)
+    return request.get(`sys/scene_domain`);
 }
 
 /***************************************************** 登录注册配置 ****************************************************/
@@ -572,7 +544,7 @@ export function getSceneDomain() {
  * 管理端登录注册配置
  */
 export function getConfigLogin() {
-  return request.get(`sys/config/login`)
+    return request.get(`sys/config/login`)
 }
 
 /**
@@ -581,23 +553,21 @@ export function getConfigLogin() {
  * @returns
  */
 export function setConfigLogin(params: Record<string, any>) {
-  return request.put(`sys/config/login`, params, { showSuccessMessage: true })
+    return request.put(`sys/config/login`, params, { showSuccessMessage: true })
 }
 
 /**
  * 获取支付设置
  */
 export function getPayConfigList() {
-  return request.get(`pay/channel/lists`)
+    return request.get(`pay/channel/lists`)
 }
 
 /**
  * 设置支付配置
  */
 export function setPatConfig(params: Record<string, any>) {
-  return request.post(`pay/channel/set/all`, params, {
-    showSuccessMessage: true,
-  })
+    return request.post(`pay/channel/set/all`, params, { showSuccessMessage: true })
 }
 
 /***************************************************** 刷新菜单 ****************************************************/
@@ -605,14 +575,14 @@ export function setPatConfig(params: Record<string, any>) {
  * 刷新菜单
  */
 export function menuRefresh(params: Record<string, any>) {
-  return request.post(`sys/menu/refresh`, {})
+    return request.post(`sys/menu/refresh`, {})
 }
 
 /**
  * 清理数据字段缓存
  */
 export function clearSchemaCache(params: Record<string, any>) {
-  return request.post(`sys/schema/clear`, {}, { showSuccessMessage: true })
+    return request.post(`sys/schema/clear`, {}, { showSuccessMessage: true })
 }
 
 /***************************************************** 获取应用 ****************************************************/
@@ -620,7 +590,7 @@ export function clearSchemaCache(params: Record<string, any>) {
  * 获取应用
  */
 export function getAppMange() {
-  return request.get(`sys/applist`)
+    return request.get(`sys/applist`)
 }
 
 /***************************************************** 地图设置 ****************************************************/
@@ -629,21 +599,21 @@ export function getAppMange() {
  * 设置地图key
  */
 export function setMap(params: Record<string, any>) {
-  return request.put(`sys/config/map`, params, { showSuccessMessage: true })
+    return request.put(`sys/config/map`, params, { showSuccessMessage: true })
 }
 
 /**
  * 获取地图配置
  */
 export function getMap() {
-  return request.get(`sys/config/map`)
+    return request.get(`sys/config/map`)
 }
 
 /**
  * 获取支付待审核记录
  */
 export function getPayAuditList(params: Record<string, any>) {
-  return request.get('pay/audit', { params })
+    return request.get('pay/audit', { params })
 }
 
 /**
@@ -651,7 +621,7 @@ export function getPayAuditList(params: Record<string, any>) {
  * @returns
  */
 export function payAuditPass(outTradeNo: string) {
-  return request.put(`pay/pass/${outTradeNo}`, {}, { showSuccessMessage: true })
+    return request.put(`pay/pass/${ outTradeNo }`, {}, { showSuccessMessage: true })
 }
 
 /**
@@ -659,23 +629,21 @@ export function payAuditPass(outTradeNo: string) {
  * @returns
  */
 export function payAuditRefuse(params: Record<string, any>) {
-  return request.put(`pay/refuse/${params.out_trade_no}`, params, {
-    showSuccessMessage: true,
-  })
+    return request.put(`pay/refuse/${ params.out_trade_no }`, params, { showSuccessMessage: true })
 }
 
 /**
  * 获取支付单据详情
  */
 export function getPayDetail(id: number) {
-  return request.get(`pay/detail/${id}`)
+    return request.get(`pay/detail/${ id }`)
 }
 
 /**
  * 获取应用列表
  */
 export function getAddonList() {
-  return request.get(`app/getAddonList`)
+    return request.get(`app/getAddonList`)
 }
 
 /**
@@ -683,7 +651,7 @@ export function getAddonList() {
  * @returns
  */
 export function getDeveloperToken() {
-  return request.get('sys/config/developer_token')
+    return request.get('sys/config/developer_token')
 }
 
 /**
@@ -692,9 +660,7 @@ export function getDeveloperToken() {
  * @returns
  */
 export function setDeveloperToken(params: Record<string, any>) {
-  return request.put(`sys/config/developer_token`, params, {
-    showSuccessMessage: true,
-  })
+    return request.put(`sys/config/developer_token`, params, { showSuccessMessage: true })
 }
 
 /***************************************************** 报表导出 ****************************************************/
@@ -704,7 +670,7 @@ export function setDeveloperToken(params: Record<string, any>) {
  * @returns
  */
 export function getExportList(params: Record<string, any>) {
-  return request.get(`sys/export`, { params })
+    return request.get(`sys/export`, { params })
 }
 
 /**
@@ -712,7 +678,7 @@ export function getExportList(params: Record<string, any>) {
  * @returns
  */
 export function getExportStatusList() {
-  return request.get('sys/export/status')
+    return request.get('sys/export/status')
 }
 
 /**
@@ -720,7 +686,7 @@ export function getExportStatusList() {
  * @returns
  */
 export function getExportKeyList() {
-  return request.get('sys/export/type')
+    return request.get('sys/export/type')
 }
 
 /**
@@ -728,7 +694,7 @@ export function getExportKeyList() {
  * @returns
  */
 export function exportData(type: string, params: Record<string, any>) {
-  return request.get(`sys/export/${type}`, { params })
+    return request.get(`sys/export/${ type }`, { params })
 }
 
 /**
@@ -736,7 +702,7 @@ export function exportData(type: string, params: Record<string, any>) {
  * @returns
  */
 export function exportDataCheck(type: string, params: Record<string, any>) {
-  return request.get(`sys/export/check/${type}`, { params })
+    return request.get(`sys/export/check/${ type }`, { params })
 }
 
 /**
@@ -744,7 +710,7 @@ export function exportDataCheck(type: string, params: Record<string, any>) {
  * @param id
  */
 export function deleteExport(id: number) {
-  return request.delete(`sys/export/${id}`, { showSuccessMessage: true })
+    return request.delete(`sys/export/${ id }`, { showSuccessMessage: true })
 }
 
 /**
@@ -752,15 +718,5 @@ export function deleteExport(id: number) {
  * @returns
  */
 export function getInstallConfig() {
-  return request.get('sys/install/config')
-}
-
-//业绩配置
-
-export function getYjpzConfig() {
-  return request.get('sys/get_yjpz_config')
-}
-
-export function yjpzConfig(params: Record<string, any>) {
-  return request.post(`sys/yjpz_config`, params)
+    return request.get('sys/install/config')
 }
diff --git a/admin/src/app/api/tools.ts b/admin/src/app/api/tools.ts
index d396aa29..fb0872a2 100644
--- a/admin/src/app/api/tools.ts
+++ b/admin/src/app/api/tools.ts
@@ -6,7 +6,7 @@ import request from '@/utils/request'
  * @returns
  */
 export function getAddonDevelop(params: Record<string, any>) {
-  return request.get(`addon_develop`, { params })
+    return request.get(`addon_develop`, {params});
 }
 
 /**
@@ -14,7 +14,7 @@ export function getAddonDevelop(params: Record<string, any>) {
  * @returns
  */
 export function getAddontype() {
-  return request.get(`addontype`)
+    return request.get(`addontype`);
 }
 
 /**
@@ -22,7 +22,7 @@ export function getAddontype() {
  * @returns
  */
 export function getAddonDevelopInfo(key: any) {
-  return request.get(`addon_develop/${key}`)
+    return request.get(`addon_develop/${key}`)
 }
 
 /**
@@ -30,7 +30,7 @@ export function getAddonDevelopInfo(key: any) {
  * @returns
  */
 export function getAddonDevelopCheck(key: any) {
-  return request.get(`addon_develop/check/${key}`)
+    return request.get(`addon_develop/check/${key}`)
 }
 
 /**
@@ -38,7 +38,7 @@ export function getAddonDevelopCheck(key: any) {
  * @returns
  */
 export function getAddonKeyBlackList() {
-  return request.get('addon_develop/key/blacklist')
+    return request.get('addon_develop/key/blacklist')
 }
 
 /**
@@ -48,7 +48,7 @@ export function getAddonKeyBlackList() {
  * @returns
  */
 export function addAddonDevelop(key: any, params: Record<string, any>) {
-  return request.post(`addon_develop/${key}`, params)
+    return request.post(`addon_develop/${key}`, params)
 }
 
 /**
@@ -58,7 +58,7 @@ export function addAddonDevelop(key: any, params: Record<string, any>) {
  * @returns
  */
 export function editAddonDevelop(key: any, params: Record<string, any>) {
-  return request.put(`addon_develop/${key}`, params)
+    return request.put(`addon_develop/${key}`, params)
 }
 
 /**
@@ -67,7 +67,7 @@ export function editAddonDevelop(key: any, params: Record<string, any>) {
  * @returns
  */
 export function deleteAddonDevelop(key: any) {
-  return request.delete(`addon_develop/${key}`, { showSuccessMessage: true })
+    return request.delete(`addon_develop/${key}`, {showSuccessMessage: true})
 }
 
 /**
@@ -75,7 +75,7 @@ export function deleteAddonDevelop(key: any) {
  * @returns
  */
 export function addonDevelopBuild(key: any) {
-  return request.post(`addon_develop/build/${key}`)
+    return request.post(`addon_develop/build/${key}`)
 }
 
 /**
@@ -83,7 +83,7 @@ export function addonDevelopBuild(key: any) {
  * @returns
  */
 export function addonDevelopDownload(key: any) {
-  return request.post(`addon_develop/download/${key}`, {})
+    return request.post(`addon_develop/download/${key}`, {})
 }
 /***************************************************** 代码生成 ****************************************************/
 
@@ -93,7 +93,7 @@ export function addonDevelopDownload(key: any) {
  * @returns
  */
 export function getGenerateTableList(params: Record<string, any>) {
-  return request.get(`generator/generator`, { params })
+    return request.get(`generator/generator`, {params})
 }
 
 /**
@@ -102,7 +102,7 @@ export function getGenerateTableList(params: Record<string, any>) {
  * @returns
  */
 export function getGenerateTableInfo(id: number) {
-  return request.get(`generator/generator/${id}`)
+    return request.get(`generator/generator/${id}`);
 }
 
 /**
@@ -111,9 +111,7 @@ export function getGenerateTableInfo(id: number) {
  * @returns
  */
 export function addGenerateTable(params: Record<string, any>) {
-  return request.post('generator/generator', params, {
-    showSuccessMessage: true,
-  })
+    return request.post('generator/generator', params, {showSuccessMessage: true})
 }
 
 /**
@@ -121,9 +119,7 @@ export function addGenerateTable(params: Record<string, any>) {
  * @param params
  */
 export function editGenerateTable(params: Record<string, any>) {
-  return request.put(`generator/generator/${params.id}`, params, {
-    showSuccessMessage: true,
-  })
+    return request.put(`generator/generator/${params.id}`, params, {showSuccessMessage: true})
 }
 
 /**
@@ -132,9 +128,7 @@ export function editGenerateTable(params: Record<string, any>) {
  * @returns
  */
 export function deleteGenerateTable(id: number) {
-  return request.delete(`generator/generator/${id}`, {
-    showSuccessMessage: true,
-  })
+    return request.delete(`generator/generator/${id}`, {showSuccessMessage: true})
 }
 
 /**
@@ -143,7 +137,7 @@ export function deleteGenerateTable(id: number) {
  * @returns
  */
 export function generateCreate(params: Record<string, any>) {
-  return request.post(`generator/download`, params)
+    return request.post(`generator/download`, params)
 }
 
 /**
@@ -152,47 +146,47 @@ export function generateCreate(params: Record<string, any>) {
  * @returns
  */
 export function generatePreview(id: number) {
-  return request.get(`generator/preview/${id}`)
+    return request.get(`generator/preview/${id}`)
 }
 
 /**
  * 数据表
  */
 export function generateTable() {
-  return request.get(`generator/table`)
+    return request.get(`generator/table`)
 }
 
 /**
  * 获取服务器环境配置
  */
 export function getSystem() {
-  return request.get(`sys/system`)
+    return request.get(`sys/system`)
 }
 
 /**
  * 获取全部模型
  */
 export function getGeneratorAllModel(params: any) {
-  return request.get(`generator/all_model`, { params })
+    return request.get(`generator/all_model`, {params})
 }
 
 /**
  * 获取 表字段
  */
 export function getGeneratorTableColumn(params: any) {
-  return request.get(`generator/table_column`, { params })
+    return request.get(`generator/table_column`, {params})
 }
 
 /**
  * 同步校验
  */
 export function generatorCheckFile(params: Record<string, any>) {
-  return request.get(`generator/check_file`, { params })
+    return request.get(`generator/check_file`, {params})
 }
 
 /**
  * 根据模型获取表字段
  */
 export function getGeneratorModelTableColumn(params: any) {
-  return request.get(`generator/model_table_column`, { params })
+    return request.get(`generator/model_table_column`, {params})
 }
diff --git a/admin/src/app/api/upgrade.ts b/admin/src/app/api/upgrade.ts
index b2e67c03..ed2f93fb 100644
--- a/admin/src/app/api/upgrade.ts
+++ b/admin/src/app/api/upgrade.ts
@@ -1,18 +1,19 @@
 import request from '@/utils/request'
 
+
 /**
  * 获取更新内容
  * @param addon
  */
 export function getUpgradeContent(addon: string = '') {
-  return request.get(addon ? `upgrade/${addon}` : 'upgrade')
+    return request.get(addon ? `upgrade/${addon}` : 'upgrade')
 }
 
 /**
  * 获取升级任务
  */
 export function getUpgradeTask() {
-  return request.get('upgrade/task')
+    return request.get('upgrade/task')
 }
 
 /**
@@ -20,26 +21,26 @@ export function getUpgradeTask() {
  * @param addon
  */
 export function upgradeAddon(addon: string = '') {
-  return request.post(addon ? `upgrade/${addon}` : 'upgrade')
+    return request.post(addon ? `upgrade/${addon}` : 'upgrade')
 }
 
 /**
  * 执行升级
  */
 export function executeUpgrade() {
-  return request.post('upgrade/execute', {})
+    return request.post('upgrade/execute', {})
 }
 
 /**
  * 升级前检测
  */
 export function preUpgradeCheck(addon: string = '') {
-  return request.get(addon ? `upgrade/check/${addon}` : 'upgrade/check')
+    return request.get(addon ? `upgrade/check/${addon}` : 'upgrade/check')
 }
 
 /**
  * 清除
  */
 export function clearUpgradeTask() {
-  return request.post('upgrade/clear')
+    return request.post('upgrade/clear')
 }
diff --git a/admin/src/app/api/user.ts b/admin/src/app/api/user.ts
index a30d26eb..1fc36a53 100644
--- a/admin/src/app/api/user.ts
+++ b/admin/src/app/api/user.ts
@@ -10,7 +10,7 @@ import request from '@/utils/request'
  * @returns
  */
 export function getUserList(params: Record<string, any>) {
-  return request.get(`user`, { params })
+    return request.get(`user`, { params })
 }
 
 /**
@@ -19,7 +19,7 @@ export function getUserList(params: Record<string, any>) {
  * @returns
  */
 export function getUserInfo(uid: number) {
-  return request.get(`user/${uid}`)
+    return request.get(`user/${ uid }`);
 }
 
 /**
@@ -28,7 +28,7 @@ export function getUserInfo(uid: number) {
  * @returns
  */
 export function addUser(params: Record<string, any>) {
-  return request.post('user', params, { showSuccessMessage: true })
+    return request.post('user', params, { showSuccessMessage: true })
 }
 
 /**
@@ -37,7 +37,7 @@ export function addUser(params: Record<string, any>) {
  * @returns
  */
 export function getAllUserList(params: Record<string, any>) {
-  return request.get(`user/user_all`, { params })
+    return request.get(`user/user_all`, { params })
 }
 
 /**
@@ -45,21 +45,21 @@ export function getAllUserList(params: Record<string, any>) {
  * @param params
  */
 export function editUser(params: Record<string, any>) {
-  return request.put(`user/${params.uid}`, params, { showSuccessMessage: true })
+    return request.put(`user/${ params.uid }`, params, { showSuccessMessage: true })
 }
 
 /**
  * 锁定用户
  */
 export function lockUser(uid: number) {
-  return request.put(`user/lock/${uid}`, {}, { showSuccessMessage: true })
+    return request.put(`user/lock/${ uid }`, {}, { showSuccessMessage: true })
 }
 
 /**
  * 解除用户锁定
  */
 export function unlockUser(uid: number) {
-  return request.put(`user/unlock/${uid}`, {}, { showSuccessMessage: true })
+    return request.put(`user/unlock/${ uid }`, {}, { showSuccessMessage: true })
 }
 
 /***************************************************** 操作日志 **************************************************/
@@ -70,7 +70,7 @@ export function unlockUser(uid: number) {
  * @returns
  */
 export function getLogList(params: Record<string, any>) {
-  return request.get(`user/userlog`, { params })
+    return request.get(`user/userlog`, { params })
 }
 
 /**
@@ -78,5 +78,5 @@ export function getLogList(params: Record<string, any>) {
  * @param id
  */
 export function getLogInfo(id: number) {
-  return request.get(`user/userlog/${id}`)
+    return request.get(`user/userlog/${ id }`)
 }
diff --git a/admin/src/app/api/verify.ts b/admin/src/app/api/verify.ts
index 898194e7..16af8741 100644
--- a/admin/src/app/api/verify.ts
+++ b/admin/src/app/api/verify.ts
@@ -1,5 +1,6 @@
 import request from '@/utils/request'
 
+
 /***************************************************** 核销 ****************************************************/
 
 /**
@@ -8,7 +9,7 @@ import request from '@/utils/request'
  * @returns
  */
 export function getVerifyRecord(params: Record<string, any>) {
-  return request.get(`verify/verify/record`, { params })
+    return request.get(`verify/verify/record`, { params })
 }
 
 /**
@@ -17,7 +18,7 @@ export function getVerifyRecord(params: Record<string, any>) {
  * @returns
  */
 export function getVerifyDetail(verifyCode: string) {
-  return request.get(`verify/verify/${verifyCode}`)
+    return request.get(`verify/verify/${verifyCode}`)
 }
 
 /***************************************************** 核销员 ****************************************************/
@@ -28,7 +29,7 @@ export function getVerifyDetail(verifyCode: string) {
  * @returns
  */
 export function getVerifierList(params: Record<string, any>) {
-  return request.get(`verify/verifier`, { params })
+    return request.get(`verify/verifier`, { params })
 }
 
 /**
@@ -36,15 +37,16 @@ export function getVerifierList(params: Record<string, any>) {
  * @returns
  */
 export function getVerifierSelect() {
-  return request.get(`verify/verifier/select`)
+    return request.get(`verify/verifier/select`)
 }
 
+
 /**
  * 获取核销类型列表
  * @returns
  */
 export function getVerifyTypeList() {
-  return request.get(`verify/verifier/type`)
+    return request.get(`verify/verifier/type`)
 }
 
 /**
@@ -53,7 +55,7 @@ export function getVerifyTypeList() {
  * @returns
  */
 export function addVerifier(params: Record<string, any>) {
-  return request.post('verify/verifier', params, { showSuccessMessage: true })
+    return request.post('verify/verifier', params, { showSuccessMessage: true })
 }
 
 /**
@@ -62,5 +64,5 @@ export function addVerifier(params: Record<string, any>) {
  * @returns
  */
 export function deleteVerifier(id: number) {
-  return request.delete(`verify/verifier/${id}`, { showSuccessMessage: true })
-}
+    return request.delete(`verify/verifier/${id}`, { showSuccessMessage: true })
+}
\ No newline at end of file
diff --git a/admin/src/app/api/weapp.ts b/admin/src/app/api/weapp.ts
index 6a1bb7c0..23561176 100644
--- a/admin/src/app/api/weapp.ts
+++ b/admin/src/app/api/weapp.ts
@@ -5,7 +5,7 @@ import request from '@/utils/request'
  * @returns
  */
 export function getWeappConfig() {
-  return request.get('weapp/config')
+    return request.get('weapp/config')
 }
 
 /**
@@ -14,7 +14,7 @@ export function getWeappConfig() {
  * @returns
  */
 export function setWeappConfig(params: Record<string, any>) {
-  return request.put('weapp/config', params, { showSuccessMessage: true })
+    return request.put('weapp/config', params, { showSuccessMessage: true })
 }
 
 /**
@@ -22,7 +22,7 @@ export function setWeappConfig(params: Record<string, any>) {
  * @returns
  */
 export function getTemplateList() {
-  return request.get('weapp/template')
+    return request.get('weapp/template')
 }
 
 /**
@@ -31,9 +31,7 @@ export function getTemplateList() {
  * @returns
  */
 export function getBatchAcquisition(params: Record<string, any>) {
-  return request.put('weapp/template/sync', params, {
-    showSuccessMessage: true,
-  })
+    return request.put('weapp/template/sync', params, { showSuccessMessage: true })
 }
 /**
  * 添加微信小程序版本
@@ -41,7 +39,7 @@ export function getBatchAcquisition(params: Record<string, any>) {
  * @returns
  */
 export function setWeappVersion(params: Record<string, any>) {
-  return request.post('weapp/version', params, { showSuccessMessage: true })
+    return request.post('weapp/version', params, { showSuccessMessage: true })
 }
 
 /**
@@ -49,7 +47,7 @@ export function setWeappVersion(params: Record<string, any>) {
  * @returns
  */
 export function getWeappPreview() {
-  return request.get('weapp/preview')
+    return request.get('weapp/preview')
 }
 
 /**
@@ -58,16 +56,16 @@ export function getWeappPreview() {
  * @returns
  */
 export function getWeappVersionList(params: Record<string, any>) {
-  return request.get('weapp/version', { params })
+    return request.get('weapp/version', { params })
 }
 
 /**
  * 获取微信小程序上传日志
- * @param key
- * @returns
+ * @param key 
+ * @returns 
  */
 export function getWeappUploadLog(key: string) {
-  return request.get(`weapp/upload/${key}`)
+    return request.get(`weapp/upload/${key}`)
 }
 
 /***************************************************** 管理端 ****************************************************/
@@ -78,7 +76,7 @@ export function getWeappUploadLog(key: string) {
  * @returns
  */
 export function uploadVersion(params: Record<string, any>) {
-  return request.put('applet/upload', params, { showSuccessMessage: true })
+    return request.put('applet/upload', params, { showSuccessMessage: true })
 }
 
 /**
@@ -87,7 +85,7 @@ export function uploadVersion(params: Record<string, any>) {
  * @returns
  */
 export function addVersion(params: Record<string, any>) {
-  return request.post('applet/version', params, { showSuccessMessage: true })
+    return request.post('applet/version', params, { showSuccessMessage: true })
 }
 
 /**
@@ -96,7 +94,7 @@ export function addVersion(params: Record<string, any>) {
  * @returns
  */
 export function getVersionList(params: Record<string, any>) {
-  return request.get('applet/version', { params })
+    return request.get('applet/version', { params })
 }
 
 /**
@@ -105,7 +103,7 @@ export function getVersionList(params: Record<string, any>) {
  * @returns
  */
 export function getVersionInfo(id: string) {
-  return request.get(`applet/version/${id}`)
+    return request.get(`applet/version/${id}`)
 }
 
 /**
@@ -114,9 +112,7 @@ export function getVersionInfo(id: string) {
  * @returns
  */
 export function editVersion(params: Record<string, any>) {
-  return request.put(`applet/version/${params.id}`, params, {
-    showSuccessMessage: true,
-  })
+    return request.put(`applet/version/${params.id}`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -125,7 +121,7 @@ export function editVersion(params: Record<string, any>) {
  * @returns
  */
 export function deleteVersion(id: string) {
-  return request.delete(`applet/version/${id}`)
+    return request.delete(`applet/version/${id}`)
 }
 
 /**
@@ -133,5 +129,5 @@ export function deleteVersion(id: string) {
  * @returns
  */
 export function getIsTradeManaged() {
-  return request.get('weapp/delivery/getIsTradeManaged')
-}
+    return request.get('weapp/delivery/getIsTradeManaged')
+}
\ No newline at end of file
diff --git a/admin/src/app/api/web.ts b/admin/src/app/api/web.ts
index d97b4065..648938be 100644
--- a/admin/src/app/api/web.ts
+++ b/admin/src/app/api/web.ts
@@ -6,7 +6,7 @@ import request from '@/utils/request'
  * @returns
  */
 export function getNavList(params: Record<string, any>) {
-  return request.get(`web/nav`, { params })
+    return request.get(`web/nav`, {params})
 }
 
 /**
@@ -15,7 +15,7 @@ export function getNavList(params: Record<string, any>) {
  * @returns
  */
 export function getNavInfo(id: number) {
-  return request.get(`web/nav/${id}`)
+    return request.get(`web/nav/${id}`);
 }
 
 /**
@@ -24,10 +24,7 @@ export function getNavInfo(id: number) {
  * @returns
  */
 export function addNav(params: Record<string, any>) {
-  return request.post('web/nav', params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.post('web/nav', params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -36,20 +33,14 @@ export function addNav(params: Record<string, any>) {
  * @returns
  */
 export function editNav(params: Record<string, any>) {
-  return request.put(`web/nav/${params.id}`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`web/nav/${params.id}`, params, { showErrorMessage: true, showSuccessMessage: true })
 }
 /**
  * 编辑友情链接排序
  * @param params
  */
 export function editNavSort(params: Record<string, any>) {
-  return request.put(`web/nav/sort`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`web/nav/sort`, params, { showErrorMessage: true, showSuccessMessage: true })
 }
 /**
  * 删除PC导航管理
@@ -57,10 +48,7 @@ export function editNavSort(params: Record<string, any>) {
  * @returns
  */
 export function deleteNav(id: number) {
-  return request.delete(`web/nav/${id}`, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.delete(`web/nav/${id}`, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -68,7 +56,7 @@ export function deleteNav(id: number) {
  * @param params
  */
 export function getLink(params: Record<string, any>) {
-  return request.get(`web/link`, { params })
+    return request.get(`web/link`, { params })
 }
 
 /**
@@ -77,7 +65,7 @@ export function getLink(params: Record<string, any>) {
  * @returns
  */
 export function getFriendlyLinkList(params: Record<string, any>) {
-  return request.get(`web/friendly_link`, { params })
+    return request.get(`web/friendly_link`, {params})
 }
 
 /**
@@ -86,7 +74,7 @@ export function getFriendlyLinkList(params: Record<string, any>) {
  * @returns
  */
 export function getFriendlyLinkInfo(id: number) {
-  return request.get(`web/friendly_link/${id}`)
+    return request.get(`web/friendly_link/${id}`);
 }
 
 /**
@@ -95,10 +83,7 @@ export function getFriendlyLinkInfo(id: number) {
  * @returns
  */
 export function addFriendlyLink(params: Record<string, any>) {
-  return request.post('web/friendly_link', params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.post('web/friendly_link', params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -107,10 +92,7 @@ export function addFriendlyLink(params: Record<string, any>) {
  * @returns
  */
 export function editFriendlyLink(params: Record<string, any>) {
-  return request.put(`web/friendly_link/${params.id}`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`web/friendly_link/${params.id}`, params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -119,10 +101,7 @@ export function editFriendlyLink(params: Record<string, any>) {
  * @returns
  */
 export function deleteFriendlyLink(id: number) {
-  return request.delete(`web/friendly_link/${id}`, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.delete(`web/friendly_link/${id}`, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -130,10 +109,7 @@ export function deleteFriendlyLink(id: number) {
  * @param params
  */
 export function editFriendlyLinkSort(params: Record<string, any>) {
-  return request.put(`web/friendly_link/sort`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`web/friendly_link/sort`, params, { showErrorMessage: true, showSuccessMessage: true })
 }
 /**
  * 获取广告位列表
@@ -141,7 +117,7 @@ export function editFriendlyLinkSort(params: Record<string, any>) {
  * @returns
  */
 export function getAvdPositionList(params: Record<string, any>) {
-  return request.get(`web/adv_position`, { params })
+    return request.get(`web/adv_position`, { params })
 }
 
 /**
@@ -150,7 +126,7 @@ export function getAvdPositionList(params: Record<string, any>) {
  * @returns
  */
 export function getAdvList(params: Record<string, any>) {
-  return request.get(`web/adv`, { params })
+    return request.get(`web/adv`, { params })
 }
 
 /**
@@ -159,7 +135,7 @@ export function getAdvList(params: Record<string, any>) {
  * @returns
  */
 export function deleteAdv(id: number) {
-  return request.delete(`web/adv/${id}`, { showSuccessMessage: true })
+    return request.delete(`web/adv/${ id }`, { showSuccessMessage: true })
 }
 
 /**
@@ -168,10 +144,7 @@ export function deleteAdv(id: number) {
  * @returns
  */
 export function addAdv(params: Record<string, any>) {
-  return request.post('web/adv', params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.post('web/adv', params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -180,10 +153,7 @@ export function addAdv(params: Record<string, any>) {
  * @returns
  */
 export function editAdv(params: Record<string, any>) {
-  return request.put(`web/adv/${params.adv_id}`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`web/adv/${ params.adv_id }`, params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -191,10 +161,7 @@ export function editAdv(params: Record<string, any>) {
  * @param params
  */
 export function editAdvSort(params: Record<string, any>) {
-  return request.put(`web/adv/sort`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`web/adv/sort`, params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -203,5 +170,5 @@ export function editAdvSort(params: Record<string, any>) {
  * @returns
  */
 export function getAdvInfo(id: number) {
-  return request.get(`web/adv/${id}`)
+    return request.get(`web/adv/${ id }`);
 }
diff --git a/admin/src/app/api/wechat.ts b/admin/src/app/api/wechat.ts
index 0205beb6..33647665 100644
--- a/admin/src/app/api/wechat.ts
+++ b/admin/src/app/api/wechat.ts
@@ -5,14 +5,14 @@ import request from '@/utils/request'
  * @returns
  */
 export function getWechatConfig() {
-  return request.get('wechat/config')
+    return request.get('wechat/config')
 }
 
 /**
  * 微信配置所需的静态信息
  */
 export function getWechatStatic() {
-  return request.get('wechat/static')
+    return request.get('wechat/static');
 }
 
 /**
@@ -21,7 +21,7 @@ export function getWechatStatic() {
  * @returns
  */
 export function editWechatConfig(params: Record<string, any>) {
-  return request.put('wechat/config', params, { showSuccessMessage: true })
+    return request.put('wechat/config', params, {showSuccessMessage: true})
 }
 
 /**
@@ -29,7 +29,7 @@ export function editWechatConfig(params: Record<string, any>) {
  * @returns
  */
 export function getWechatMenu() {
-  return request.get('wechat/menu')
+    return request.get('wechat/menu')
 }
 
 /**
@@ -38,7 +38,7 @@ export function getWechatMenu() {
  * @returns
  */
 export function editWechatMenu(params: Record<string, any>) {
-  return request.put('wechat/menu', params, { showSuccessMessage: true })
+    return request.put('wechat/menu', params, {showSuccessMessage: true})
 }
 
 /**
@@ -46,7 +46,7 @@ export function editWechatMenu(params: Record<string, any>) {
  * @returns
  */
 export function getTemplateList() {
-  return request.get('wechat/template')
+    return request.get('wechat/template')
 }
 
 /**
@@ -55,34 +55,28 @@ export function getTemplateList() {
  * @returns
  */
 export function getBatchAcquisition(params: Record<string, any>) {
-  return request.put('wechat/template/sync', params, {
-    showSuccessMessage: true,
-  })
+    return request.put('wechat/template/sync', params, {showSuccessMessage: true})
 }
 
 /**
  * 查询关键字回复列表
  */
 export function getKeywordsReplyList(params: Record<string, any>) {
-  return request.get('wechat/reply/keywords', { params })
+    return request.get('wechat/reply/keywords', { params })
 }
 
 /**
  * 修改关键字回复
  */
 export function editKeywordsReply(params: Record<string, any>) {
-  return request.put(`wechat/reply/keywords/${params.id}`, params, {
-    showSuccessMessage: true,
-  })
+    return request.put(`wechat/reply/keywords/${params.id}`, params, { showSuccessMessage: true })
 }
 
 /**
  * 修改关键字回复
  */
 export function addKeywordsReply(params: Record<string, any>) {
-  return request.post('wechat/reply/keywords', params, {
-    showSuccessMessage: true,
-  })
+    return request.post('wechat/reply/keywords', params, { showSuccessMessage: true })
 }
 
 /**
@@ -90,23 +84,21 @@ export function addKeywordsReply(params: Record<string, any>) {
  * @param id
  */
 export function getKeywordsReplyInfo(id: number) {
-  return request.get(`wechat/reply/keywords/${id}`)
+    return request.get(`wechat/reply/keywords/${id}`)
 }
 
 /**
  * 修改关键字回复
  */
 export function delKeywordsReply(id: number) {
-  return request.delete(`wechat/reply/keywords/${id}`, {
-    showSuccessMessage: true,
-  })
+    return request.delete(`wechat/reply/keywords/${id}`, { showSuccessMessage: true })
 }
 
 /**
  * 获取默认回复
  */
 export function getDefaultReply() {
-  return request.get('wechat/reply/default')
+    return request.get('wechat/reply/default')
 }
 
 /**
@@ -114,37 +106,33 @@ export function getDefaultReply() {
  * @param params
  */
 export function setDefaultReply(params: Record<string, any>) {
-  return request.put('wechat/reply/default', params, {
-    showSuccessMessage: true,
-  })
+    return request.put('wechat/reply/default', params, { showSuccessMessage: true })
 }
 
 /**
  * 获取关注回复
  */
 export function getSubscribeReply() {
-  return request.get('wechat/reply/subscribe')
+    return request.get('wechat/reply/subscribe')
 }
 
 /**
  * 设置关注回复
  */
 export function setSubscribeReply(params: Record<string, any>) {
-  return request.put('wechat/reply/subscribe', params, {
-    showSuccessMessage: true,
-  })
+    return request.put('wechat/reply/subscribe', params, { showSuccessMessage: true })
 }
 
 /**
  * 查询素材列表
  */
 export function getMediaList(params: Record<string, any>) {
-  return request.get('wechat/media', { params })
+    return request.get('wechat/media', { params })
 }
 
 /**
  * 同步素材库
  */
 export function syncNews() {
-  return request.get('wechat/sync/news')
+    return request.get('wechat/sync/news')
 }
diff --git a/admin/src/app/components/cloud-build/index.vue b/admin/src/app/components/cloud-build/index.vue
index 9dd509d9..00f99c78 100644
--- a/admin/src/app/components/cloud-build/index.vue
+++ b/admin/src/app/components/cloud-build/index.vue
@@ -1,119 +1,82 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="t('cloudbuild.title')"
-    width="850px"
-    :close-on-click-modal="false"
-    :close-on-press-escape="false"
-    :before-close="dialogClose"
-  >
-    <div v-if="active == 'build'" class="h-[60vh]" v-loading="loading">
-      <div
-        class="h-[60vh] flex flex-col"
-        v-if="cloudBuildCheck && !cloudBuildTask"
-      >
-        <el-scrollbar>
-          <div class="bg-[#fff] my-3" v-if="cloudBuildCheck.dir">
-            <p class="pt-[20px] pl-[20px]">
-              {{ t('cloudbuild.dirPermission') }}
-            </p>
-            <div class="px-[20px] pt-[10px] text-[14px] el-table">
-              <el-row class="py-[10px] items table-head-bg pl-[15px] mb-[10px]">
-                <el-col :span="12">
-                  <span>{{ t('cloudbuild.path') }}</span>
-                </el-col>
-                <el-col :span="6">
-                  <span>{{ t('cloudbuild.demand') }}</span>
-                </el-col>
-                <el-col :span="6">
-                  <span>{{ t('status') }}</span>
-                </el-col>
-              </el-row>
-              <el-row
-                class="pb-[10px] items pl-[15px]"
-                v-for="item in cloudBuildCheck.dir.is_readable"
-              >
-                <el-col :span="12">
-                  <span>{{ item.dir }}</span>
-                </el-col>
-                <el-col :span="6">
-                  <span>{{ t('cloudbuild.readable') }}</span>
-                </el-col>
-                <el-col :span="6">
-                  <span v-if="item.status"
-                    ><el-icon color="green"><Select /></el-icon
-                  ></span>
-                  <span v-else>
-                    <el-icon color="red">
-                      <CloseBold />
-                    </el-icon>
-                  </span>
-                </el-col>
-              </el-row>
-              <el-row
-                class="pb-[10px] items pl-[15px]"
-                v-for="item in cloudBuildCheck.dir.is_write"
-              >
-                <el-col :span="12">
-                  <span>{{ item.dir }}</span>
-                </el-col>
-                <el-col :span="6">
-                  <span>{{ t('cloudbuild.write') }}</span>
-                </el-col>
-                <el-col :span="6">
-                  <span v-if="item.status"
-                    ><el-icon color="green"><Select /></el-icon
-                  ></span>
-                  <span v-else>
-                    <el-icon color="red">
-                      <CloseBold />
-                    </el-icon>
-                  </span>
-                </el-col>
-              </el-row>
+    <el-dialog v-model="showDialog" :title="t('cloudbuild.title')" width="850px" :close-on-click-modal="false" :close-on-press-escape="false" :before-close="dialogClose">
+
+        <div v-if="active == 'build'" class="h-[60vh]" v-loading="loading">
+            <div class="h-[60vh] flex flex-col" v-if="cloudBuildCheck && !cloudBuildTask">
+                <el-scrollbar>
+                    <div class="bg-[#fff] my-3" v-if="cloudBuildCheck.dir">
+                        <p class="pt-[20px] pl-[20px] ">{{ t('cloudbuild.dirPermission') }}</p>
+                        <div class="px-[20px] pt-[10px] text-[14px] el-table">
+                            <el-row class="py-[10px] items table-head-bg pl-[15px] mb-[10px]">
+                                <el-col :span="12">
+                                    <span>{{ t('cloudbuild.path') }}</span>
+                                </el-col>
+                                <el-col :span="6">
+                                    <span>{{ t('cloudbuild.demand') }}</span>
+                                </el-col>
+                                <el-col :span="6">
+                                    <span>{{ t('status') }}</span>
+                                </el-col>
+                            </el-row>
+                            <el-row class="pb-[10px] items pl-[15px]" v-for="item in cloudBuildCheck.dir.is_readable">
+                                <el-col :span="12">
+                                    <span>{{ item.dir }}</span>
+                                </el-col>
+                                <el-col :span="6">
+                                    <span>{{ t('cloudbuild.readable') }}</span>
+                                </el-col>
+                                <el-col :span="6">
+                                    <span v-if="item.status"><el-icon color="green"><Select /></el-icon></span>
+                                    <span v-else>
+                                            <el-icon color="red">
+                                                <CloseBold />
+                                            </el-icon>
+                                        </span>
+                                </el-col>
+                            </el-row>
+                            <el-row class="pb-[10px] items pl-[15px]" v-for="item in cloudBuildCheck.dir.is_write">
+                                <el-col :span="12">
+                                    <span>{{ item.dir }}</span>
+                                </el-col>
+                                <el-col :span="6">
+                                    <span>{{ t('cloudbuild.write') }}</span>
+                                </el-col>
+                                <el-col :span="6">
+                                    <span v-if="item.status"><el-icon color="green"><Select /></el-icon></span>
+                                    <span v-else>
+                                        <el-icon color="red">
+                                            <CloseBold />
+                                        </el-icon>
+                                    </span>
+                                </el-col>
+                            </el-row>
+                        </div>
+                    </div>
+                </el-scrollbar>
+            </div>
+            <div class="h-[60vh]" v-show="cloudBuildTask">
+                <terminal ref="terminalRef" context="" :init-log="null" :show-header="false" :show-log-time="true" @exec-cmd="onExecCmd"/>
             </div>
-          </div>
-        </el-scrollbar>
-      </div>
-      <div class="h-[60vh]" v-show="cloudBuildTask">
-        <terminal
-          ref="terminalRef"
-          context=""
-          :init-log="null"
-          :show-header="false"
-          :show-log-time="true"
-          @exec-cmd="onExecCmd"
-        />
-      </div>
-    </div>
+        </div>
 
-    <div v-if="active == 'complete'">
-      <div class="h-[60vh] flex flex-col">
-        <div class="flex-1 h-0">
-          <el-result
-            icon="success"
-            :title="t('cloudbuild.cloudbuildSuccess')"
-          ></el-result>
+        <div v-if="active == 'complete'">
+            <div class="h-[60vh] flex flex-col">
+                <div class="flex-1 h-0">
+                    <el-result icon="success" :title="t('cloudbuild.cloudbuildSuccess')"></el-result>
+                </div>
+            </div>
         </div>
-      </div>
-    </div>
-  </el-dialog>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
 import { ref, h, watch } from 'vue'
 import { t } from '@/lang'
-import {
-  getCloudBuildLog,
-  getCloudBuildTask,
-  cloudBuild,
-  clearCloudBuildTask,
-  preBuildCheck,
-} from '@/app/api/cloud'
+import { getCloudBuildLog, getCloudBuildTask, cloudBuild, clearCloudBuildTask, preBuildCheck } from '@/app/api/cloud'
 import { Terminal, TerminalFlash } from 'vue-web-terminal'
 import 'vue-web-terminal/lib/theme/dark.css'
-import { AnyObject } from '@/types/global'
-import { ElNotification, ElMessageBox } from 'element-plus'
+import { AnyObject } from "@/types/global"
+import { ElNotification, ElMessageBox } from "element-plus"
 
 const showDialog = ref<boolean>(false)
 const cloudBuildTask = ref<null | AnyObject>(null)
@@ -128,129 +91,112 @@ let cloudBuildLog = []
  * 查询升级任务
  */
 const getCloudBuildTaskFn = () => {
-  getCloudBuildTask()
-    .then(({ data }) => {
-      if (!data) return
+    getCloudBuildTask().then(({ data }) => {
+        if (!data) return
 
-      cloudBuildTask.value = data
+        cloudBuildTask.value = data
 
-      if (!showDialog.value) {
-        showElNotification()
-      }
-    })
-    .catch()
+        if (!showDialog.value) {
+            showElNotification()
+        }
+    }).catch()
 }
 getCloudBuildTaskFn()
 
 const getCloudBuildLogFn = () => {
-  getCloudBuildLog()
-    .then((res) => {
-      if (!res.data) {
-        if (showDialog.value && cloudBuildLog.length) {
-          active.value = 'complete'
-          terminalRef.value.execute('clear')
-          clearCloudBuildTask()
+    getCloudBuildLog().then(res => {
+        if (!res.data) {
+            if (showDialog.value && cloudBuildLog.length) {
+                active.value = 'complete'
+                terminalRef.value.execute('clear')
+                clearCloudBuildTask()
+            }
+            notificationEl && notificationEl.close()
+            cloudBuildTask.value = null
+            return
         }
-        notificationEl && notificationEl.close()
-        cloudBuildTask.value = null
-        return
-      }
 
-      const data = res.data.data ?? []
-      let error = ''
+        const data = res.data.data ?? [];
+        let error = ''
 
-      if (data[0] && data[0].length && showDialog.value) {
-        if (cloudBuildLog.length == 0) {
-          terminalRef.value.execute('clear')
-          terminalRef.value.execute('开始编译')
-        }
+        if (data[0] && data[0].length && showDialog.value) {
+            if (cloudBuildLog.length == 0) {
+                terminalRef.value.execute('clear')
+                terminalRef.value.execute('开始编译')
+            }
 
-        data[0].forEach((item) => {
-          if (!cloudBuildLog.includes(item.action)) {
-            terminalRef.value.pushMessage({
-              content: `正在执行：${item.action}`,
-            })
-            cloudBuildLog.push(item.action)
+            data[0].forEach(item => {
+                if (!cloudBuildLog.includes(item.action)) {
+                    terminalRef.value.pushMessage({ content: `正在执行：${item.action}` })
+                    cloudBuildLog.push(item.action)
 
-            if (item.code == 0) {
-              error = item.msg
-              terminalRef.value.pushMessage({
-                content: item.msg,
-                class: 'error',
-              })
-            }
-          }
-        })
-      }
+                    if (item.code == 0) {
+                        error = item.msg
+                        terminalRef.value.pushMessage({ content: item.msg, class: 'error' })
+                    }
+                }
+            })
+        }
 
-      if (error) return
+        if (error) return
 
-      setTimeout(() => {
-        getCloudBuildLogFn()
-      }, 2000)
-    })
-    .catch()
+        setTimeout(() => {
+            getCloudBuildLogFn()
+        }, 2000)
+    }).catch()
 }
 
-let notificationEl: any = null
+let notificationEl : any = null
 /**
  * 升级中任务提示
  */
 const showElNotification = () => {
-  notificationEl = ElNotification.success({
-    title: t('warning'),
-    dangerouslyUseHTMLString: true,
-    message: h('div', {}, [
-      t('cloudbuild.executingTips'),
-      h(
-        'span',
-        { class: 'text-primary cursor-pointer', onClick: elNotificationClick },
-        [t('cloudbuild.clickView')]
-      ),
-    ]),
-    duration: 0,
-    showClose: false,
-  })
+    notificationEl = ElNotification.success({
+        title: t('warning'),
+        dangerouslyUseHTMLString: true,
+        message: h('div', {}, [
+            t('cloudbuild.executingTips'),
+            h('span', { class: 'text-primary cursor-pointer', onClick: elNotificationClick }, [t('cloudbuild.clickView')])
+        ]),
+        duration: 0,
+        showClose: false
+    })
 }
 
 const elNotificationClick = () => {
-  showDialog.value = true
-  active.value = 'build'
-  getCloudBuildLogFn()
+    showDialog.value = true
+    active.value = 'build'
+    getCloudBuildLogFn()
 }
 
 const open = async () => {
-  loading.value = true
-  active.value = 'build'
+    loading.value = true
+    active.value = 'build'
 
-  if (cloudBuildTask.value) {
-    showDialog.value = true
-    loading.value = false
-    getCloudBuildLogFn()
-    return
-  }
+    if (cloudBuildTask.value) {
+        showDialog.value = true
+        loading.value = false
+        getCloudBuildLogFn()
+        return
+    }
 
-  preBuildCheck()
-    .then(async ({ data }) => {
-      if (data.is_pass) {
-        cloudBuild()
-          .then(({ data }) => {
-            loading.value = false
-            cloudBuildTask.value = data
-            showDialog.value = true
-            getCloudBuildLogFn()
-          })
-          .catch(() => {
-            showDialog.value = false
+    preBuildCheck().then(async ({ data }) => {
+        if (data.is_pass) {
+            cloudBuild().then(({ data }) => {
+                loading.value = false
+                cloudBuildTask.value = data
+                showDialog.value = true
+                getCloudBuildLogFn()
+            }).catch(() => {
+                showDialog.value = false
+                loading.value = false
+            })
+        } else {
             loading.value = false
-          })
-      } else {
-        loading.value = false
-        cloudBuildCheck.value = data
-      }
-    })
-    .catch(() => {
-      showDialog.value = false
+            cloudBuildCheck.value = data
+        }
+    }).catch(() => {
+        showDialog.value = false
     })
 }
 
@@ -260,69 +206,68 @@ const open = async () => {
 let flashInterval: null | number = null
 const terminalFlash = new TerminalFlash()
 const onExecCmd = (key, command, success, failed, name) => {
-  if (command == '开始编译') {
-    success(terminalFlash)
-    const frames = makeIterator(['/', '——', '\\', '|'])
-    flashInterval = setInterval(() => {
-      terminalFlash.flush('> ' + frames.next().value)
-    }, 150)
-  }
+    if (command == '开始编译') {
+        success(terminalFlash)
+        const frames = makeIterator(['/', '——', '\\', '|'])
+        flashInterval = setInterval(() => {
+            terminalFlash.flush('> ' + frames.next().value)
+        }, 150)
+    }
 }
 
 const makeIterator = (array: string[]) => {
-  var nextIndex = 0
-  return {
-    next() {
-      if (nextIndex + 1 == array.length) {
-        nextIndex = 0
-      }
-      return { value: array[nextIndex++] }
-    },
-  }
+    var nextIndex = 0
+    return {
+        next() {
+            if ((nextIndex + 1) == array.length) {
+                nextIndex = 0
+            }
+            return { value: array[nextIndex++] }
+        }
+    }
 }
 
 const dialogClose = (done: () => {}) => {
-  if (active.value == 'build' && cloudBuildTask.value) {
-    ElMessageBox.confirm(t('cloudbuild.showDialogCloseTips'), t('warning'), {
-      confirmButtonText: t('confirm'),
-      cancelButtonText: t('cancel'),
-      type: 'warning',
-    })
-      .then(() => {
-        terminalRef.value.execute('clear')
+    if (active.value == 'build' && cloudBuildTask.value) {
+        ElMessageBox.confirm(
+            t('cloudbuild.showDialogCloseTips'),
+            t('warning'),
+            {
+                confirmButtonText: t('confirm'),
+                cancelButtonText: t('cancel'),
+                type: 'warning'
+            }
+        ).then(() => {
+            terminalRef.value.execute('clear')
+            done()
+        }).catch(() => { })
+    } else {
         done()
-      })
-      .catch(() => {})
-  } else {
-    done()
-  }
+    }
 }
 
-watch(
-  () => showDialog.value,
-  () => {
+watch(() => showDialog.value, () => {
     if (!showDialog.value) {
-      cloudBuildTask.value = null
-      active.value = 'build'
-      cloudBuildLog = []
-      flashInterval && clearInterval(flashInterval)
-      clearCloudBuildTask()
+        cloudBuildTask.value = null
+        active.value = 'build'
+        cloudBuildLog = []
+        flashInterval && clearInterval(flashInterval)
+        clearCloudBuildTask()
     }
-  }
-)
+})
 
 defineExpose({
-  open,
-  cloudBuildTask,
-  loading,
+    open,
+    cloudBuildTask,
+    loading
 })
 </script>
 
 <style lang="scss" scoped>
 .table-head-bg {
-  background-color: var(--el-table-header-bg-color);
+    background-color: var(--el-table-header-bg-color);
 }
 :deep(.terminal .t-log-box span) {
-  white-space: pre-wrap;
+    white-space: pre-wrap;
 }
 </style>
diff --git a/admin/src/app/components/upgrade/index.vue b/admin/src/app/components/upgrade/index.vue
index 7359429b..fb201978 100644
--- a/admin/src/app/components/upgrade/index.vue
+++ b/admin/src/app/components/upgrade/index.vue
@@ -1,186 +1,114 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="t('upgrade.title')"
-    width="850px"
-    :close-on-click-modal="false"
-    :close-on-press-escape="false"
-    :before-close="dialogClose"
-  >
-    <div v-show="active == 'content'">
-      <div class="h-[60vh] flex flex-col" v-if="upgradeContent">
-        <div class="text-lg">
-          本次升级将从<span class="font-bold">{{ upgradeContent.version }}</span
-          >升级到<span class="font-bold">{{
-            upgradeContent.upgrade_version
-          }}</span
-          >版本
-        </div>
-        <div
-          class="mt-[10px]"
-          v-if="upgradeContent.upgrade_version != upgradeContent.last_version"
-        >
-          <el-alert type="info" show-icon>
-            <template #title>
-              当前最新版本为{{ upgradeContent.last_version }}，您的服务{{
-                upgradeContent.expire_time
-                  ? `已于${upgradeContent.expire_time}到期`
-                  : '长期有效'
-              }}。如需升级到最新版可在<a
-                class="text-primary"
-                href="https://www.niucloud.com"
-                target="_blank"
-                >niucloud-admin官网</a
-              >购买相关服务后再进行升级
-            </template>
-          </el-alert>
-        </div>
-        <el-scrollbar class="flex-1 h-0 mt-[20px]">
-          <div
-            class="mt-[20px]"
-            v-for="(item, index) in upgradeContent.version_list"
-            :key="index"
-          >
-            <div class="font-bold text-lg">{{ item.version_no }}</div>
-            <div class="mt-[5px]" v-if="item.release_time">
-              {{ item.release_time }}
-            </div>
-            <div
-              class="mt-[10px] p-[10px] rounded bg-[#f4f4f5] whitespace-pre-wrap !break-all"
-              v-if="item.upgrade_log"
-              v-html="item.upgrade_log"
-            ></div>
-          </div>
-        </el-scrollbar>
-      </div>
-      <div class="flex justify-end" v-if="upgradeContent.version_list.length">
-        <el-button type="primary" @click="handleUpgrade" :loading="uploading">{{
-          t('upgrade.upgradeButton')
-        }}</el-button>
-      </div>
-    </div>
+    <el-dialog v-model="showDialog" :title="t('upgrade.title')" width="850px" :close-on-click-modal="false" :close-on-press-escape="false" :before-close="dialogClose">
+
+        <div v-show="active == 'content'">
 
-    <div v-show="active == 'upgrade'">
-      <div class="h-[60vh] flex flex-col" v-if="upgradeCheck && !upgradeTask">
-        <el-scrollbar>
-          <div class="bg-[#fff] my-3" v-if="upgradeCheck.dir">
-            <p class="pt-[20px] pl-[20px]">{{ t('upgrade.dirPermission') }}</p>
-            <div class="px-[20px] pt-[10px] text-[14px] el-table">
-              <el-row class="py-[10px] items table-head-bg pl-[15px] mb-[10px]">
-                <el-col :span="12">
-                  <span>{{ t('upgrade.path') }}</span>
-                </el-col>
-                <el-col :span="6">
-                  <span>{{ t('upgrade.demand') }}</span>
-                </el-col>
-                <el-col :span="6">
-                  <span>{{ t('status') }}</span>
-                </el-col>
-              </el-row>
-              <el-row
-                class="pb-[10px] items pl-[15px]"
-                v-for="item in upgradeCheck.dir.is_readable"
-              >
-                <el-col :span="12">
-                  <span>{{ item.dir }}</span>
-                </el-col>
-                <el-col :span="6">
-                  <span>{{ t('upgrade.readable') }}</span>
-                </el-col>
-                <el-col :span="6">
-                  <span v-if="item.status"
-                    ><el-icon color="green"><Select /></el-icon
-                  ></span>
-                  <span v-else>
-                    <el-icon color="red">
-                      <CloseBold />
-                    </el-icon>
-                  </span>
-                </el-col>
-              </el-row>
-              <el-row
-                class="pb-[10px] items pl-[15px]"
-                v-for="item in upgradeCheck.dir.is_write"
-              >
-                <el-col :span="12">
-                  <span>{{ item.dir }}</span>
-                </el-col>
-                <el-col :span="6">
-                  <span>{{ t('upgrade.write') }}</span>
-                </el-col>
-                <el-col :span="6">
-                  <span v-if="item.status"
-                    ><el-icon color="green"><Select /></el-icon
-                  ></span>
-                  <span v-else>
-                    <el-icon color="red">
-                      <CloseBold />
-                    </el-icon>
-                  </span>
-                </el-col>
-              </el-row>
+            <div class="h-[60vh] flex flex-col" v-if="upgradeContent">
+                <div class="text-lg">
+                    本次升级将从<span class="font-bold">{{ upgradeContent.version }}</span>升级到<span class="font-bold">{{ upgradeContent.upgrade_version }}</span>版本
+                </div>
+                <div class="mt-[10px]" v-if="upgradeContent.upgrade_version != upgradeContent.last_version">
+                    <el-alert type="info" show-icon>
+                        <template #title>
+                            当前最新版本为{{ upgradeContent.last_version }}，您的服务{{ upgradeContent.expire_time ? `已于${upgradeContent.expire_time}到期` : '长期有效' }}。如需升级到最新版可在<a class="text-primary" href="https://www.niucloud.com" target="_blank">niucloud-admin官网</a>购买相关服务后再进行升级
+                        </template>
+                    </el-alert>
+                </div>
+                <el-scrollbar class="flex-1 h-0 mt-[20px]">
+                    <div class="mt-[20px]" v-for="(item, index) in upgradeContent.version_list" :key="index">
+                        <div class="font-bold text-lg">{{ item.version_no }}</div>
+                        <div class="mt-[5px]" v-if="item.release_time">{{ item.release_time }}</div>
+                        <div class="mt-[10px] p-[10px] rounded bg-[#f4f4f5] whitespace-pre-wrap !break-all" v-if="item.upgrade_log" v-html="item.upgrade_log"></div>
+                    </div>
+                </el-scrollbar>
             </div>
-          </div>
-        </el-scrollbar>
-      </div>
-      <div class="h-[60vh]" v-show="upgradeTask">
-        <terminal
-          ref="terminalRef"
-          :context="upgradeTask ? upgradeTask.upgrade.app_key : ''"
-          :init-log="null"
-          :show-header="false"
-          :show-log-time="true"
-          @exec-cmd="onExecCmd"
-        />
-      </div>
-    </div>
+            <div class="flex justify-end" v-if="upgradeContent.version_list.length">
+                <el-button type="primary" @click="handleUpgrade" :loading="uploading">{{ t('upgrade.upgradeButton') }}</el-button>
+            </div>
+        </div>
 
-    <div v-show="active == 'complete'">
-      <div class="h-[60vh] flex flex-col">
-        <div class="flex-1 h-0">
-          <el-result
-            icon="success"
-            :title="t('upgrade.upgradeSuccess')"
-          ></el-result>
-          <el-alert
-            :title="t('upgrade.upgradeCompleteTips')"
-            type="error"
-            :closable="false"
-          />
+        <div v-show="active == 'upgrade'">
+            <div class="h-[60vh] flex flex-col" v-if="upgradeCheck && !upgradeTask">
+                <el-scrollbar>
+                    <div class="bg-[#fff] my-3" v-if="upgradeCheck.dir">
+                        <p class="pt-[20px] pl-[20px] ">{{ t('upgrade.dirPermission') }}</p>
+                        <div class="px-[20px] pt-[10px] text-[14px] el-table">
+                            <el-row class="py-[10px] items table-head-bg pl-[15px] mb-[10px]">
+                                <el-col :span="12">
+                                    <span>{{ t('upgrade.path') }}</span>
+                                </el-col>
+                                <el-col :span="6">
+                                    <span>{{ t('upgrade.demand') }}</span>
+                                </el-col>
+                                <el-col :span="6">
+                                    <span>{{ t('status') }}</span>
+                                </el-col>
+                            </el-row>
+                            <el-row class="pb-[10px] items pl-[15px]" v-for="item in upgradeCheck.dir.is_readable">
+                                <el-col :span="12">
+                                    <span>{{ item.dir }}</span>
+                                </el-col>
+                                <el-col :span="6">
+                                    <span>{{ t('upgrade.readable') }}</span>
+                                </el-col>
+                                <el-col :span="6">
+                                    <span v-if="item.status"><el-icon color="green"><Select /></el-icon></span>
+                                    <span v-else>
+                                        <el-icon color="red">
+                                            <CloseBold />
+                                        </el-icon>
+                                    </span>
+                                </el-col>
+                            </el-row>
+                            <el-row class="pb-[10px] items pl-[15px]" v-for="item in upgradeCheck.dir.is_write">
+                                <el-col :span="12">
+                                    <span>{{ item.dir }}</span>
+                                </el-col>
+                                <el-col :span="6">
+                                    <span>{{ t('upgrade.write') }}</span>
+                                </el-col>
+                                <el-col :span="6">
+                                    <span v-if="item.status"><el-icon color="green"><Select /></el-icon></span>
+                                    <span v-else>
+                                        <el-icon color="red">
+                                            <CloseBold />
+                                        </el-icon>
+                                    </span>
+                                </el-col>
+                            </el-row>
+                        </div>
+                    </div>
+                </el-scrollbar>
+            </div>
+            <div class="h-[60vh]" v-show="upgradeTask">
+                <terminal ref="terminalRef" :context="upgradeTask ? upgradeTask.upgrade.app_key : ''" :init-log="null" :show-header="false" :show-log-time="true" @exec-cmd="onExecCmd"/>
+            </div>
         </div>
-        <div class="flex justify-end">
-          <el-button type="default" @click="showDialog = false">{{
-            t('upgrade.localBuild')
-          }}</el-button>
-          <el-button type="primary" @click="handleCloudBuild">{{
-            t('upgrade.cloudBuild')
-          }}</el-button>
+
+        <div v-show="active == 'complete'">
+            <div class="h-[60vh] flex flex-col">
+                <div class="flex-1 h-0">
+                    <el-result icon="success" :title="t('upgrade.upgradeSuccess')"></el-result>
+                    <el-alert :title="t('upgrade.upgradeCompleteTips')" type="error" :closable="false" />
+                </div>
+                <div class="flex justify-end">
+                    <el-button type="default" @click="showDialog = false">{{ t('upgrade.localBuild') }}</el-button>
+                    <el-button type="primary" @click="handleCloudBuild">{{ t('upgrade.cloudBuild') }}</el-button>
+                </div>
+            </div>
         </div>
-      </div>
-    </div>
-  </el-dialog>
+    </el-dialog>
 
-  <el-dialog
-    v-model="upgradeTipsShowDialog"
-    :title="t('warning')"
-    width="500px"
-    draggable
-  >
-    <span v-html="t('upgrade.upgradeTips')"></span>
-    <template #footer>
-      <div class="flex justify-end">
-        <el-button @click="upgradeTipsConfirm(true)" type="primary">{{
-          t('upgrade.knownToKnow')
-        }}</el-button>
-        <el-button @click="upgradeTipsConfirm()" type="primary" plain>{{
-          t('upgrade.upgradeButton')
-        }}</el-button>
-        <el-button @click="upgradeTipsShowDialog = false">{{
-          t('cancel')
-        }}</el-button>
-      </div>
-    </template>
-  </el-dialog>
+    <el-dialog v-model="upgradeTipsShowDialog" :title="t('warning')" width="500px" draggable>
+        <span v-html="t('upgrade.upgradeTips')"></span>
+        <template #footer>
+            <div class="flex justify-end">
+                <el-button @click="upgradeTipsConfirm(true)" type="primary">{{ t('upgrade.knownToKnow') }}</el-button>
+                <el-button @click="upgradeTipsConfirm()" type="primary" plain>{{ t('upgrade.upgradeButton') }}</el-button>
+                <el-button @click="upgradeTipsShowDialog = false">{{ t('cancel') }}</el-button>
+            </div>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -188,14 +116,7 @@ import { ref, h, watch } from 'vue'
 import { t } from '@/lang'
 import { getVersions } from '@/app/api/auth'
 import { getFrameworkNewVersion } from '@/app/api/module'
-import {
-  getUpgradeContent,
-  getUpgradeTask,
-  upgradeAddon,
-  executeUpgrade,
-  preUpgradeCheck,
-  clearUpgradeTask,
-} from '@/app/api/upgrade'
+import { getUpgradeContent, getUpgradeTask, upgradeAddon, executeUpgrade, preUpgradeCheck, clearUpgradeTask } from '@/app/api/upgrade'
 import { Terminal, TerminalFlash } from 'vue-web-terminal'
 import 'vue-web-terminal/lib/theme/dark.css'
 import { AnyObject } from '@/types/global'
@@ -218,149 +139,132 @@ let errorLog: any = []
  * 查询升级任务
  */
 const getUpgradeTaskFn = () => {
-  getUpgradeTask()
-    .then(({ data }) => {
-      if (!data) return
+    getUpgradeTask().then(({ data }) => {
+        if (!data) return
 
-      // 检测有没有正在进行中的升级任务
-      if (!showDialog.value) {
-        showElNotification()
-        return
-      }
-      if (!upgradeTask.value) {
-        terminalRef.value.execute('clear')
-        terminalRef.value.execute('开始升级')
-      }
-      data.log.forEach((item) => {
-        if (!upgradeLog.includes(item)) {
-          terminalRef.value.pushMessage({ content: `正在执行：${item}` })
-          upgradeLog.push(item)
+        // 检测有没有正在进行中的升级任务
+        if (!showDialog.value) {
+            showElNotification()
+            return
+        }
+        if (!upgradeTask.value) {
+            terminalRef.value.execute('clear')
+            terminalRef.value.execute('开始升级')
         }
-      })
-      // 安装失败
-      if (data.error) {
-        data.error.forEach((item) => {
-          if (!errorLog.includes(item)) {
-            terminalRef.value.pushMessage({ content: item, class: 'error' })
-            errorLog.push(item)
-          }
+        data.log.forEach(item => {
+            if (!upgradeLog.includes(item)) {
+                terminalRef.value.pushMessage({content: `正在执行：${item}`})
+                upgradeLog.push(item)
+            }
         })
-      }
-      // 恢复完毕
-      if (data.step == 'restoreComplete') {
-        return
-      }
-      // 升级完成
-      if (data.step == 'upgradeComplete') {
-        active.value = 'complete'
-        notificationEl && notificationEl.close()
-        emits('complete')
-        clearUpgradeTask()
-        return
-      }
-      upgradeTask.value = data
-      executeUpgradeFn()
-    })
-    .catch()
+        // 安装失败
+        if (data.error) {
+            data.error.forEach(item => {
+                if (!errorLog.includes(item)) {
+                    terminalRef.value.pushMessage({ content: item, class: 'error' })
+                    errorLog.push(item)
+                }
+            })
+        }
+        // 恢复完毕
+        if (data.step == 'restoreComplete') {
+            return
+        }
+        // 升级完成
+        if (data.step == 'upgradeComplete') {
+            active.value = 'complete'
+            notificationEl && notificationEl.close()
+            emits('complete')
+            clearUpgradeTask()
+            return
+        }
+        upgradeTask.value = data
+        executeUpgradeFn()
+    }).catch()
 }
 getUpgradeTaskFn()
 
 const executeUpgradeFn = () => {
-  executeUpgrade()
-    .then(() => {
-      getUpgradeTaskFn()
-    })
-    .catch()
+    executeUpgrade().then(() => {
+        getUpgradeTaskFn()
+    }).catch()
 }
 
-let notificationEl: any = null
+let notificationEl : any = null
 /**
  * 升级中任务提示
  */
 const showElNotification = () => {
-  notificationEl = ElNotification.success({
-    title: t('warning'),
-    dangerouslyUseHTMLString: true,
-    message: h('div', {}, [
-      t('upgrade.upgradingTips'),
-      h(
-        'span',
-        { class: 'text-primary cursor-pointer', onClick: elNotificationClick },
-        [t('upgrade.clickView')]
-      ),
-    ]),
-    duration: 0,
-    showClose: false,
-  })
+    notificationEl = ElNotification.success({
+        title: t('warning'),
+        dangerouslyUseHTMLString: true,
+        message: h('div', {}, [
+            t('upgrade.upgradingTips'),
+            h('span', { class: 'text-primary cursor-pointer', onClick: elNotificationClick }, [t('upgrade.clickView')])
+        ]),
+        duration: 0,
+        showClose: false
+    })
 }
 
 const elNotificationClick = () => {
-  showDialog.value = true
-  active.value = 'upgrade'
-  getUpgradeTaskFn()
-  notificationEl && notificationEl.close()
+    showDialog.value = true
+    active.value = 'upgrade'
+    getUpgradeTaskFn()
+    notificationEl && notificationEl.close()
 }
 
 const frameworkVersion = ref('')
-getVersions().then((res) => {
-  frameworkVersion.value = res.data.version.version
+getVersions().then(res => {
+    frameworkVersion.value = res.data.version.version
 })
-const newFrameworkVersion = ref('')
+const newFrameworkVersion = ref("")
 getFrameworkNewVersion().then(({ data }) => {
-  newFrameworkVersion.value = data.last_version
+    newFrameworkVersion.value = data.last_version
 })
 
 /**
  * 执行升级
  */
 const handleUpgrade = async () => {
-  if (uploading.value) return
-  uploading.value = true
+    if (uploading.value) return
+    uploading.value = true
 
-  const appKey =
-    upgradeContent.value?.app.app_key != 'niucloud-admin'
-      ? upgradeContent.value?.app.app_key
-      : ''
+    const appKey = upgradeContent.value?.app.app_key != 'niucloud-admin' ? upgradeContent.value?.app.app_key : ''
 
-  await preUpgradeCheck(appKey)
-    .then(async ({ data }) => {
-      if (data.is_pass) {
-        await upgradeAddon(appKey)
-          .then(() => {
-            getUpgradeTaskFn()
-          })
-          .catch(() => {
-            uploading.value = false
-          })
-      } else {
-        upgradeCheck.value = data
-      }
-    })
-    .catch()
+    await preUpgradeCheck(appKey).then(async({ data }) => {
+        if (data.is_pass) {
+            await upgradeAddon(appKey).then(() => {
+                getUpgradeTaskFn()
+            }).catch(() => {
+                uploading.value = false
+            })
+        } else {
+            upgradeCheck.value = data
+        }
+    }).catch()
 
-  if (uploading.value) active.value = 'upgrade'
+    if (uploading.value) active.value = 'upgrade'
 }
 
 const open = (addonKey: string = '') => {
-  if (upgradeTask.value) {
-    ElMessage({ message: '已有正在执行中的升级任务', type: 'error' })
-    showDialog.value = true
-  } else {
-    if (addonKey && frameworkVersion.value != newFrameworkVersion.value) {
-      ElMessage({ message: '存在新版本框架，请先升级框架', type: 'error' })
-      return
-    }
-    getUpgradeContent(addonKey)
-      .then(({ data }) => {
-        upgradeContent.value = data
-        if (Storage.get('upgradeTipsLock')) {
-          showDialog.value = true
-        } else {
-          upgradeTipsShowDialog.value = true
+    if (upgradeTask.value) {
+        ElMessage({ message: '已有正在执行中的升级任务', type: 'error' })
+        showDialog.value = true
+    } else {
+        if (addonKey && frameworkVersion.value != newFrameworkVersion.value) {
+            ElMessage({ message: '存在新版本框架，请先升级框架', type: 'error' })
+            return
         }
-      })
-      .catch()
-  }
+        getUpgradeContent(addonKey).then(({ data }) => {
+            upgradeContent.value = data
+            if (Storage.get('upgradeTipsLock')) {
+                showDialog.value = true
+            } else {
+                upgradeTipsShowDialog.value = true
+            }
+        }).catch()
+    }
 }
 
 /**
@@ -369,92 +273,85 @@ const open = (addonKey: string = '') => {
 let flashInterval: any = null
 const terminalFlash = new TerminalFlash()
 const onExecCmd = (key, command, success, failed, name) => {
-  if (command == '开始升级') {
-    success(terminalFlash)
-    const frames = makeIterator(['/', '——', '\\', '|'])
-    flashInterval = setInterval(() => {
-      terminalFlash.flush('> ' + frames.next().value)
-    }, 150)
-  }
+    if (command == '开始升级') {
+        success(terminalFlash)
+        const frames = makeIterator(['/', '——', '\\', '|'])
+        flashInterval = setInterval(() => {
+            terminalFlash.flush('> ' + frames.next().value)
+        }, 150)
+    }
 }
 
 const makeIterator = (array: string[]) => {
-  var nextIndex = 0
-  return {
-    next() {
-      if (nextIndex + 1 == array.length) {
-        nextIndex = 0
-      }
-      return { value: array[nextIndex++] }
-    },
-  }
+    var nextIndex = 0
+    return {
+        next() {
+            if ((nextIndex + 1) == array.length) {
+                nextIndex = 0
+            }
+            return { value: array[nextIndex++] }
+        }
+    }
 }
 
 const dialogClose = (done: () => {}) => {
-  if (
-    active.value == 'upgrade' &&
-    upgradeTask.value &&
-    !upgradeTask.value.error
-  ) {
-    ElMessageBox.confirm(t('upgrade.showDialogCloseTips'), t('warning'), {
-      confirmButtonText: t('confirm'),
-      cancelButtonText: t('cancel'),
-      type: 'warning',
-    })
-      .then(() => {
+    if (active.value == 'upgrade' && upgradeTask.value && !upgradeTask.value.error) {
+        ElMessageBox.confirm(
+            t('upgrade.showDialogCloseTips'),
+            t('warning'),
+            {
+                confirmButtonText: t('confirm'),
+                cancelButtonText: t('cancel'),
+                type: 'warning'
+            }
+        ).then(() => {
+            done()
+        }).catch(() => { })
+    } else {
         done()
-      })
-      .catch(() => {})
-  } else {
-    done()
-  }
+    }
 }
 
-watch(
-  () => showDialog.value,
-  () => {
+watch(() => showDialog.value, () => {
     if (!showDialog.value) {
-      clearUpgradeTaskFn()
+        clearUpgradeTaskFn()
     }
-  }
-)
+})
 
 const clearUpgradeTaskFn = () => {
-  active.value = 'content'
-  uploading.value = false
-  upgradeTask.value = null
-  upgradeLog = []
-  errorLog = []
-  flashInterval && clearInterval(flashInterval)
-  clearUpgradeTask()
-    .then(() => {})
-    .catch()
+    active.value = 'content'
+    uploading.value = false
+    upgradeTask.value = null
+    upgradeLog = []
+    errorLog = []
+    flashInterval && clearInterval(flashInterval)
+    clearUpgradeTask().then(() => {}).catch()
 }
 
 /**
  * 云编译
  */
 const handleCloudBuild = () => {
-  showDialog.value = false
-  emits('cloudbuild')
+    showDialog.value = false
+    emits('cloudbuild')
 }
 
 const upgradeTipsConfirm = (isLock: boolean = false) => {
-  isLock && Storage.set({ key: 'upgradeTipsLock', data: isLock })
-  upgradeTipsShowDialog.value = false
-  !isLock && (showDialog.value = true)
+    isLock && Storage.set({ key: 'upgradeTipsLock', data: isLock })
+    upgradeTipsShowDialog.value = false
+    !isLock && (showDialog.value = true)
 }
 
 defineExpose({
-  open,
+    open
 })
 </script>
 
 <style lang="scss" scoped>
 .table-head-bg {
-  background-color: var(--el-table-header-bg-color);
+    background-color: var(--el-table-header-bg-color);
 }
 :deep(.terminal .t-log-box span) {
-  white-space: pre-wrap;
+    white-space: pre-wrap;
 }
 </style>
diff --git a/admin/src/app/components/user-info-edit/index.vue b/admin/src/app/components/user-info-edit/index.vue
index 2b53cb9b..a65159fd 100644
--- a/admin/src/app/components/user-info-edit/index.vue
+++ b/admin/src/app/components/user-info-edit/index.vue
@@ -1,43 +1,23 @@
 <template>
-  <el-dialog v-model="dialogVisible" :title="t('accountSettings')" width="500">
-    <el-form
-      :model="saveInfo"
-      label-width="90px"
-      ref="formRef"
-      class="page-form"
-    >
-      <el-form-item :label="t('headImg')">
-        <upload-image
-          v-model="saveInfo.head_img"
-          :limit="1"
-          :type="'avatar'"
-          imageFit="cover"
-        />
-      </el-form-item>
-      <el-form-item :label="t('userName')">
-        <span>{{ saveInfo.username }}</span>
-      </el-form-item>
-      <el-form-item :label="t('realName')">
-        <el-input
-          v-model.trim="saveInfo.real_name"
-          :placeholder="t('realNamePlaceholder')"
-          clearable
-          class="input-width"
-        />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <div class="flex justify-end">
-        <el-button
-          type="primary"
-          @click="submitForm(formRef)"
-          :loading="loading"
-          >{{ t('save') }}</el-button
-        >
-        <el-button @click="dialogVisible = false">{{ t('cancel') }}</el-button>
-      </div>
-    </template>
-  </el-dialog>
+    <el-dialog v-model="dialogVisible" :title="t('accountSettings')" width="500">
+        <el-form :model="saveInfo" label-width="90px" ref="formRef" class="page-form">
+            <el-form-item :label="t('headImg')">
+                <upload-image v-model="saveInfo.head_img" :limit="1" :type="'avatar'" imageFit="cover" />
+            </el-form-item>
+            <el-form-item :label="t('userName')">
+                <span>{{saveInfo.username}}</span>
+            </el-form-item>
+            <el-form-item :label="t('realName')">
+                <el-input v-model.trim="saveInfo.real_name" :placeholder="t('realNamePlaceholder')" clearable class="input-width" />
+            </el-form-item>
+        </el-form>
+        <template #footer>
+        <div class="flex justify-end">
+            <el-button type="primary" @click="submitForm(formRef)" :loading="loading">{{ t('save') }}</el-button>
+            <el-button @click="dialogVisible = false">{{ t('cancel') }}</el-button>
+        </div>
+        </template>
+    </el-dialog>
 </template>
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
@@ -59,42 +39,41 @@ const dialogVisible = ref(false)
  * 获取用户信息
  */
 const getUserInfoFn = () => {
-  getUserInfo().then((res) => {
-    loading.value = false
-    const data = res.data
-    saveInfo.head_img = data.head_img
-    saveInfo.real_name = data.real_name
-    saveInfo.username = data.username
-  })
+    getUserInfo().then(res => {
+        loading.value = false
+        const data = res.data
+        saveInfo.head_img = data.head_img
+        saveInfo.real_name = data.real_name
+        saveInfo.username = data.username
+    })
 }
 getUserInfoFn()
-const open = () => {
-  dialogVisible.value = true
-  getUserInfoFn()
+const open = ()=>{
+    dialogVisible.value = true
+    getUserInfoFn()
 }
 const submitForm = (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  formEl.validate((valid) => {
-    if (valid) {
-      loading.value = true
-      setUserInfo(saveInfo)
-        .then((res: any) => {
-          loading.value = false
-          dialogVisible.value = false
-          let data: any = deepClone(userStore.userInfo)
-          data.head_img = saveInfo.head_img
-          userStore.setUserInfo(data)
-        })
-        .catch(() => {
-          loading.value = false
-        })
-    } else {
-      return false
-    }
-  })
+    if (loading.value || !formEl) return
+    formEl.validate((valid) => {
+        if (valid) {
+            loading.value = true
+            setUserInfo(saveInfo).then((res: any) => {
+                loading.value = false
+                dialogVisible.value = false
+                let data: any = deepClone(userStore.userInfo)
+                data.head_img = saveInfo.head_img
+                userStore.setUserInfo(data)
+            }).catch(() => {
+                loading.value = false
+            })
+        } else {
+            return false
+        }
+    })
 }
 defineExpose({
-  open,
+    open
 })
 </script>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
diff --git a/admin/src/app/lang/en/403.json b/admin/src/app/lang/en/403.json
index c22bb6a7..7bd9b157 100644
--- a/admin/src/app/lang/en/403.json
+++ b/admin/src/app/lang/en/403.json
@@ -1,3 +1,3 @@
 {
-  "tips": "Your account permissions are insufficient. Please contact the administrator to add permissions!"
-}
+    "tips": "Your account permissions are insufficient. Please contact the administrator to add permissions!"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/en/auth.menu.json b/admin/src/app/lang/en/auth.menu.json
index 9c50b5bf..c7295935 100644
--- a/admin/src/app/lang/en/auth.menu.json
+++ b/admin/src/app/lang/en/auth.menu.json
@@ -1,21 +1,21 @@
 {
-  "menuName": "Menu name",
-  "menuType": "Type",
-  "authId": "Permission ID",
-  "menuTypeDir": "Dir",
-  "menuTypeMenu": "Menu",
-  "menuTypeButton": "Button",
-  "menuDeleteTips": "Are you sure you want to delete this menu?",
-  "addMenu": "Add menu",
-  "updateMenu": "Update menu",
-  "routePath": "Route path",
-  "viewPath": "Component path",
-  "parentMenu": "Parent menu",
-  "menuIcon": "Menu Icon",
-  "menuNamePlaceholder": "Please enter a menu name",
-  "routePathPlaceholder": "Please enter routing path",
-  "viewPathPlaceholder": "Please enter the component path",
-  "authIdPlaceholder": "Please enter Permission id",
-  "selectIconPlaceholder": "Please select the menu icon",
-  "topLevel": "top-level"
-}
+    "menuName": "Menu name",
+    "menuType": "Type",
+    "authId": "Permission ID",
+    "menuTypeDir": "Dir",
+    "menuTypeMenu": "Menu",
+    "menuTypeButton": "Button",
+    "menuDeleteTips": "Are you sure you want to delete this menu?",
+    "addMenu": "Add menu",
+    "updateMenu": "Update menu",
+    "routePath": "Route path",
+    "viewPath": "Component path",
+    "parentMenu": "Parent menu",
+    "menuIcon": "Menu Icon",
+    "menuNamePlaceholder": "Please enter a menu name",
+    "routePathPlaceholder": "Please enter routing path",
+    "viewPathPlaceholder": "Please enter the component path",
+    "authIdPlaceholder": "Please enter Permission id",
+    "selectIconPlaceholder": "Please select the menu icon",
+    "topLevel": "top-level"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/en/index.json b/admin/src/app/lang/en/index.json
index 91d40a7d..a2ad72cf 100644
--- a/admin/src/app/lang/en/index.json
+++ b/admin/src/app/lang/en/index.json
@@ -1,25 +1,25 @@
 {
-  "todayData": "today's data",
-  "memberNumb": "number of member",
-  "numberOfSites": "number of sites",
-  "numberOfVisitors": "number of visitors",
-  "commonlyUsedFunction": "commonly used function",
-  "articleList": "article list",
-  "memberManagement": "member management",
-  "balanceAccount": "balance account",
-  "administrator": "administrator",
-  "WebDecoration": "website decoration",
-  "accessMessage": "access message",
-  "memberDistribution": "membership distribution",
-  "systemInfo": "system environment",
-  "os": "os",
-  "phpVersions": "php version number",
-  "productionEnvironment": "production environment",
-  "versionsInfo": "version information",
-  "versions": "current version",
-  "frame": "framework based",
-  "channel": "access channel",
-  "serviceSupport": "service support",
-  "officialWbsite": "official website",
-  "pageView": "page view"
-}
+    "todayData": "today's data",
+    "memberNumb": "number of member",
+    "numberOfSites": "number of sites",
+    "numberOfVisitors": "number of visitors",
+    "commonlyUsedFunction": "commonly used function",
+    "articleList": "article list",
+    "memberManagement": "member management",
+    "balanceAccount": "balance account",
+    "administrator": "administrator",
+    "WebDecoration": "website decoration",
+    "accessMessage": "access message",
+    "memberDistribution": "membership distribution",
+    "systemInfo": "system environment",
+    "os": "os",
+    "phpVersions": "php version number",
+    "productionEnvironment": "production environment",
+    "versionsInfo": "version information",
+    "versions": "current version",
+    "frame": "framework based",
+    "channel": "access channel",
+    "serviceSupport": "service support",
+    "officialWbsite": "official website",
+    "pageView": "page view"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/en/login.json b/admin/src/app/lang/en/login.json
index 9ad18c9d..1db5f73b 100644
--- a/admin/src/app/lang/en/login.json
+++ b/admin/src/app/lang/en/login.json
@@ -1,7 +1,7 @@
 {
-  "title": "Niucloud Vite Management side",
-  "login": "Login",
-  "logging": "Logging",
-  "userPlaceholder": "Please enter your account number",
-  "passwordPlaceholder": "Please enter your password"
-}
+    "title": "Niucloud Vite Management side",
+    "login": "Login",
+    "logging": "Logging",
+    "userPlaceholder": "Please enter your account number",
+    "passwordPlaceholder": "Please enter your password"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/en/member.member.json b/admin/src/app/lang/en/member.member.json
index 30302e5f..685eea52 100644
--- a/admin/src/app/lang/en/member.member.json
+++ b/admin/src/app/lang/en/member.member.json
@@ -1,25 +1,26 @@
 {
-  "channel": "logon mode",
-  "nickname": "Name of member",
-  "mobile": "mobile",
-  "createTime": "creation time",
-  "updateTime": "Update time",
-  "addMember": "add member",
-  "updateMember": "edit member",
-  "nickNamePlaceholder": "Please enter the member name",
-  "mobilePlaceholder": "Please enter your mobile phone number",
-  "channelPlaceholder": "Please select a registration type",
-  "memberDeleteTips": "Are you sure you want to delete this member?",
-  "detail": "detail",
-  "edit": "edit",
-  "startDate": "start time",
-  "endDate": "end time",
-  "essentialInfo": "essential information",
-  "accountInfo": "account information",
-  "registeredSource": "registered source",
-  "memberLabel": "Member label",
-  "urserName": "user name",
-  "point": "point",
-  "balance": "balance",
-  "growth": "growth"
-}
+      "channel":"logon mode",
+      "nickname":"Name of member",
+      "mobile":"mobile",
+      "createTime":"creation time",
+      "updateTime":"Update time",
+      "addMember":"add member",
+      "updateMember":"edit member",
+      "nickNamePlaceholder":"Please enter the member name",
+      "mobilePlaceholder":"Please enter your mobile phone number",
+      "channelPlaceholder":"Please select a registration type",
+      "memberDeleteTips" : "Are you sure you want to delete this member?",
+      "detail": "detail",
+      "edit": "edit",
+      "startDate": "start time",
+      "endDate": "end time",
+      "essentialInfo": "essential information",
+      "accountInfo": "account information",
+      "registeredSource": "registered source",
+      "memberLabel": "Member label",
+      "urserName": "user name",
+      "point": "point",
+      "balance": "balance",
+      "growth": "growth"
+
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/en/user.center.json b/admin/src/app/lang/en/user.center.json
index ac0fba0e..f392b6f5 100644
--- a/admin/src/app/lang/en/user.center.json
+++ b/admin/src/app/lang/en/user.center.json
@@ -1,14 +1,14 @@
 {
-  "headImg": "head",
-  "realName": "name",
-  "originalPassword": "original password",
-  "password": "new password",
-  "passwordCopy": "confirm password",
-  "passwordTip": "This parameter is mandatory when changing the password. Leave a blank if you do not change the password",
-  "realNamePlaceholder": "Please enter the user name",
-  "headImgPlaceholder": "Please enter the user profile picture",
-  "originalPasswordPlaceholder": "Please enter the original password",
-  "passwordPlaceholder": "Please enter a new password",
-  "save": "save",
-  "cancel": "cancel"
-}
+    "headImg": "head",
+    "realName": "name",
+    "originalPassword": "original password",
+    "password": "new password",
+    "passwordCopy": "confirm password",
+    "passwordTip": "This parameter is mandatory when changing the password. Leave a blank if you do not change the password",
+    "realNamePlaceholder": "Please enter the user name",
+    "headImgPlaceholder": "Please enter the user profile picture",
+    "originalPasswordPlaceholder": "Please enter the original password",
+    "passwordPlaceholder": "Please enter a new password",
+    "save": "save",
+    "cancel": "cancel"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/403.json b/admin/src/app/lang/zh-cn/403.json
index 4f362c2f..237b2563 100644
--- a/admin/src/app/lang/zh-cn/403.json
+++ b/admin/src/app/lang/zh-cn/403.json
@@ -1,3 +1,3 @@
 {
-  "tips": "您的账号权限不足，请联系管理员添加权限！"
-}
+    "tips": "您的账号权限不足，请联系管理员添加权限！"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/app.authorize.json b/admin/src/app/lang/zh-cn/app.authorize.json
index b4c89a70..5337560c 100644
--- a/admin/src/app/lang/zh-cn/app.authorize.json
+++ b/admin/src/app/lang/zh-cn/app.authorize.json
@@ -1,19 +1,19 @@
 {
-  "companyName": "授权主体",
-  "siteAddress": "授权域名",
-  "contactName": "授权联系人",
-  "authCode": "授权码",
-  "authSecret": "授权秘钥",
-  "createTime": "授权时间",
-  "expireTime": "到期时间",
-  "authApp": "授权应用",
-  "authAppKey": "应用标识",
-  "siteAddressTips": "授权域名不匹配",
-  "authCodePlaceholder": "请输入授权码",
-  "authSecretPlaceholder": "请输入授权秘钥",
-  "updateCode": "重新绑定",
-  "notHaveAuth": "还没有授权？去购买",
-  "authInfoTips": "授权码和授权秘钥可在Niucloud官网我的授权 授权详情中查看",
-  "cloudBuildTips": "是否要进行云编译该操作可能会影响到正在访问的客户是否要继续操作？",
-  "versionTips": "已经升级到最新版本"
+	"companyName": "授权主体",
+	"siteAddress": "授权域名",
+	"contactName": "授权联系人",
+	"authCode": "授权码",
+	"authSecret": "授权秘钥",
+	"createTime": "授权时间",
+	"expireTime": "到期时间",
+	"authApp": "授权应用",
+	"authAppKey": "应用标识",
+	"siteAddressTips": "授权域名不匹配",
+	"authCodePlaceholder": "请输入授权码",
+	"authSecretPlaceholder": "请输入授权秘钥",
+	"updateCode": "重新绑定",
+	"notHaveAuth": "还没有授权？去购买",
+	"authInfoTips": "授权码和授权秘钥可在Niucloud官网我的授权 授权详情中查看",
+	"cloudBuildTips": "是否要进行云编译该操作可能会影响到正在访问的客户是否要继续操作？",
+	"versionTips":"已经升级到最新版本"
 }
diff --git a/admin/src/app/lang/zh-cn/app.index.json b/admin/src/app/lang/zh-cn/app.index.json
index 6a25d87b..d48f7509 100644
--- a/admin/src/app/lang/zh-cn/app.index.json
+++ b/admin/src/app/lang/zh-cn/app.index.json
@@ -1,5 +1,5 @@
 {
-  "appName": "应用名称",
-  "appNamePlaceholder": "请输入应用名称",
-  "emptyAppData": "暂无应用"
-}
+    "appName": "应用名称",
+    "appNamePlaceholder": "请输入应用名称",
+    "emptyAppData": "暂无应用"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/app.store.json b/admin/src/app/lang/zh-cn/app.store.json
index 081358d3..16bdb995 100644
--- a/admin/src/app/lang/zh-cn/app.store.json
+++ b/admin/src/app/lang/zh-cn/app.store.json
@@ -1,67 +1,67 @@
 {
-  "search": "搜索应用名称",
-  "appName": "应用名/版本信息",
-  "introduction": "简介",
-  "type": "类型",
-  "app": "应用",
-  "addon": "插件",
-  "noPlug": "暂无应用",
-  "install": "安装",
-  "unload": "卸载",
-  "installLabel": "已安装",
-  "uninstalledLabel": "未安装",
-  "version": "版本",
-  "title": "名称",
-  "desc": "简介",
-  "plugDetail": "插件信息",
-  "author": "作者",
-  "detail": "详情",
-  "addonInstall": "插件安装",
-  "dirPermission": "目录读写权限",
-  "path": "路径",
-  "demand": "要求",
-  "readable": "可读",
-  "write": "可写",
-  "packageManageTool": "包管理工具",
-  "name": "名称",
-  "addonInstallSuccess": "插件安装成功",
-  "envCheck": "环境检查",
-  "installProgress": "安装进度",
-  "installComplete": "安装完成",
-  "localAppText": "插件管理",
-  "marketAppText": "官方市场",
-  "installShowDialogCloseTips": "安装任务尚未完成，关闭将取消安装任务，是否要继续关闭？",
-  "marketDevelopMessage": "官方市场正在开发中！",
-  "jobError": "任务队列未启动 请在服务端源码部署目录打开终端执行 php think queue:listen",
-  "conflictFiles": "冲突文件",
-  "process": "启动进程",
-  "open": "开启",
-  "down": "下载",
-  "addonVersion": "插件版本",
-  "versionCode": "版本号",
-  "createTime": "发布时间",
-  "buyLabel": "已购买",
-  "installTips": "安装后需手动更新插件引用的依赖和编译各个端口的前端源码",
-  "localInstall": "本地安装",
-  "cloudInstall": "一键云安装",
-  "cloudInstallTips": "云安装可实现一键安装，安装后无需手动更新依赖和编译前端源码",
-  "installingTips": "有插件正在安装中请等待安装完成之后再进行其他操作，点击查看",
-  "installPercent": "安装进度",
-  "downloading": "下载中",
-  "authTips": "云安装需先绑定授权码，如果已有授权请先进行绑定，没有授权可到niucloud官网购买云服务之后再进行操作",
-  "toBind": "绑定授权",
-  "toNiucloud": "去niucloud官网",
-  "descriptionLeft": "暂无任何应用，马上去",
-  "link": "官方应用市场",
-  "descriptionRight": "逛逛",
-  "installed-empty": "暂未安装任何应用，请先安装",
-  "siteAddressTips": "授权域名不匹配",
-  "authCodePlaceholder": "请输入授权码",
-  "authSecretPlaceholder": "请输入授权秘钥",
-  "updateCode": "重新绑定",
-  "notHaveAuth": "还没有授权？去购买",
-  "authInfoTips": "授权码和授权秘钥可在Niucloud官网我的授权 授权详情中查看",
-  "addonUninstall": "插件卸载",
-  "appIdentification": "应用标识",
-  "tipText": "标识指开发应用或插件的文件夹名称"
+	"search":"搜索应用名称",
+	"appName":"应用名/版本信息",
+	"introduction":"简介",
+	"type":"类型",
+	"app":"应用",
+	"addon":"插件",
+	"noPlug":"暂无应用",
+	"install":"安装",
+	"unload":"卸载",
+	"installLabel":"已安装",
+	"uninstalledLabel":"未安装",
+	"version":"版本",
+	"title":"名称",
+	"desc":"简介",
+	"plugDetail": "插件信息",
+	"author":  "作者",
+	"detail":"详情",
+	"addonInstall": "插件安装",
+	"dirPermission": "目录读写权限",
+	"path": "路径",
+	"demand": "要求",
+	"readable": "可读",
+	"write": "可写",
+	"packageManageTool": "包管理工具",
+	"name": "名称",
+	"addonInstallSuccess": "插件安装成功",
+	"envCheck": "环境检查",
+	"installProgress": "安装进度",
+	"installComplete": "安装完成",
+	"localAppText":"插件管理",
+	"marketAppText":"官方市场",
+	"installShowDialogCloseTips": "安装任务尚未完成，关闭将取消安装任务，是否要继续关闭？",
+	"marketDevelopMessage":"官方市场正在开发中！",
+	"jobError": "任务队列未启动 请在服务端源码部署目录打开终端执行 php think queue:listen",
+	"conflictFiles": "冲突文件",
+	"process": "启动进程",
+	"open": "开启",
+	"down": "下载",
+	"addonVersion": "插件版本",
+	"versionCode": "版本号",
+	"createTime": "发布时间",
+	"buyLabel": "已购买",
+	"installTips": "安装后需手动更新插件引用的依赖和编译各个端口的前端源码",
+	"localInstall":"本地安装",
+	"cloudInstall": "一键云安装",
+	"cloudInstallTips": "云安装可实现一键安装，安装后无需手动更新依赖和编译前端源码",
+	"installingTips": "有插件正在安装中请等待安装完成之后再进行其他操作，点击查看",
+	"installPercent": "安装进度",
+	"downloading": "下载中",
+	"authTips": "云安装需先绑定授权码，如果已有授权请先进行绑定，没有授权可到niucloud官网购买云服务之后再进行操作",
+	"toBind": "绑定授权",
+	"toNiucloud": "去niucloud官网",
+	"descriptionLeft": "暂无任何应用，马上去",
+	"link": "官方应用市场",
+	"descriptionRight": "逛逛",
+	"installed-empty": "暂未安装任何应用，请先安装",
+	"siteAddressTips": "授权域名不匹配",
+	"authCodePlaceholder": "请输入授权码",
+	"authSecretPlaceholder": "请输入授权秘钥",
+	"updateCode": "重新绑定",
+	"notHaveAuth": "还没有授权？去购买",
+	"authInfoTips": "授权码和授权秘钥可在Niucloud官网我的授权 授权详情中查看",
+	"addonUninstall": "插件卸载",
+	"appIdentification":"应用标识",
+	"tipText":"标识指开发应用或插件的文件夹名称"
 }
diff --git a/admin/src/app/lang/zh-cn/auth.log.json b/admin/src/app/lang/zh-cn/auth.log.json
index 606ae8e3..65ec54ae 100644
--- a/admin/src/app/lang/zh-cn/auth.log.json
+++ b/admin/src/app/lang/zh-cn/auth.log.json
@@ -1,19 +1,19 @@
 {
-  "ip": "登录IP",
-  "username": "管理员姓名",
-  "url": "链接",
-  "detail": "详情",
-  "params": "参数",
-  "type": "请求方式",
-  "createTime": "操作时间",
-  "ipPlaceholder": "请输入登录IP",
-  "uidPlaceholder": "请输入管理员id",
-  "usernamePlaceholder": "请输入管理员姓名",
-  "urlPlaceholder": "请输入链接",
-  "paramsPlaceholder": "请输入参数",
-  "typePlaceholder": "请输入请求方式",
-  "createTimePlaceholder": "请输入操作时间",
-  "addSysUserLog": "添加管理员操作记录表",
-  "updateSysUserLog": "编辑管理员操作记录表",
-  "sys_user_logDeleteTips": "确定要删除该管理员操作记录表吗？"
-}
+    "ip":"登录IP",
+    "username":"管理员姓名",
+    "url":"链接",
+    "detail": "详情",
+    "params":"参数",
+    "type":"请求方式",
+    "createTime":"操作时间",
+    "ipPlaceholder":"请输入登录IP",
+    "uidPlaceholder":"请输入管理员id",
+    "usernamePlaceholder":"请输入管理员姓名",
+    "urlPlaceholder":"请输入链接",
+    "paramsPlaceholder":"请输入参数",
+    "typePlaceholder":"请输入请求方式",
+    "createTimePlaceholder":"请输入操作时间",
+    "addSysUserLog":"添加管理员操作记录表",
+    "updateSysUserLog":"编辑管理员操作记录表",
+    "sys_user_logDeleteTips":"确定要删除该管理员操作记录表吗？"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/auth.menu.json b/admin/src/app/lang/zh-cn/auth.menu.json
index 917a388f..730c9aa4 100644
--- a/admin/src/app/lang/zh-cn/auth.menu.json
+++ b/admin/src/app/lang/zh-cn/auth.menu.json
@@ -1,33 +1,33 @@
 {
-  "menuName": "菜单名称",
-  "menuType": "类型",
-  "authId": "api路径",
-  "menuTypeDir": "目录",
-  "menuTypeMenu": "菜单",
-  "menuTypeButton": "按钮",
-  "menuDeleteTips": "删除菜单会删除当前菜单以及该菜单下所有子菜单，是否确认删除？",
-  "initializeMenu": "重置菜单",
-  "initializeMenuTipsOne": "重置菜单会将应用或插件的dict目录下的菜单配置文件中，菜单配置更新到数据库一般用做开发者修改了dict菜单配置文件后，同步到数据库操作。",
-  "initializeMenuTipsTwo": "如果用户手动调整过以下菜单项，通常允许进行本项操作，操作会重置为原始菜单。 请谨慎使用!",
-  "addMenu": "添加菜单",
-  "updateMenu": "编辑菜单",
-  "routePath": "路由路径",
-  "viewPath": "组件路径",
-  "addon": "选择应用",
-  "parentMenu": "父级菜单",
-  "menuIcon": "菜单图标",
-  "sort": "权重",
-  "menuKey": "权限标识",
-  "menuNamePlaceholder": "请输入菜单名称",
-  "menuKeyPlaceholder": "请输入权限标识",
-  "menuKeyValidata": "菜单标识只能使用字母数字下划线并且开头不能为数字",
-  "routePathPlaceholder": "请输入路由路径",
-  "viewPathPlaceholder": "请输入组件路径",
-  "authIdPlaceholder": "请输入api路径",
-  "selectIconPlaceholder": "请选择菜单图标",
-  "topLevel": "顶级",
-  "menuShortName": "菜单短标题",
-  "menuShortNamePlaceholder": "请输入菜单短标题",
-  "system": "系统菜单",
-  "application": "应用菜单"
+    "menuName": "菜单名称",
+    "menuType": "类型",
+    "authId": "api路径",
+    "menuTypeDir": "目录",
+    "menuTypeMenu": "菜单",
+    "menuTypeButton": "按钮",
+    "menuDeleteTips": "删除菜单会删除当前菜单以及该菜单下所有子菜单，是否确认删除？",
+    "initializeMenu":"重置菜单",
+    "initializeMenuTipsOne":"重置菜单会将应用或插件的dict目录下的菜单配置文件中，菜单配置更新到数据库一般用做开发者修改了dict菜单配置文件后，同步到数据库操作。",
+    "initializeMenuTipsTwo":"如果用户手动调整过以下菜单项，通常允许进行本项操作，操作会重置为原始菜单。 请谨慎使用!",
+    "addMenu": "添加菜单",
+    "updateMenu": "编辑菜单",
+    "routePath": "路由路径",
+    "viewPath": "组件路径",
+    "addon":"选择应用",
+    "parentMenu": "父级菜单",
+    "menuIcon": "菜单图标",
+    "sort":"权重",
+    "menuKey":"权限标识",
+    "menuNamePlaceholder": "请输入菜单名称",
+    "menuKeyPlaceholder": "请输入权限标识",
+    "menuKeyValidata":"菜单标识只能使用字母数字下划线并且开头不能为数字",
+    "routePathPlaceholder": "请输入路由路径",
+    "viewPathPlaceholder": "请输入组件路径",
+    "authIdPlaceholder": "请输入api路径",
+    "selectIconPlaceholder": "请选择菜单图标",
+    "topLevel": "顶级",
+    "menuShortName":"菜单短标题",
+    "menuShortNamePlaceholder":"请输入菜单短标题",
+    "system":"系统菜单",
+    "application":"应用菜单"
 }
diff --git a/admin/src/app/lang/zh-cn/auth.role.json b/admin/src/app/lang/zh-cn/auth.role.json
index b466f896..68de8088 100644
--- a/admin/src/app/lang/zh-cn/auth.role.json
+++ b/admin/src/app/lang/zh-cn/auth.role.json
@@ -1,11 +1,11 @@
 {
-  "addRole": "新增角色",
-  "updateRole": "编辑角色",
-  "roleName": "角色名称",
-  "roleDeleteTips": "确定要删除该角色吗？",
-  "roleNamePlaceholder": "请输入角色名称",
-  "rulesPlaceholder": "请选择权限",
-  "checkStrictly": "父子级不关联",
-  "permission": "权限",
-  "foldText": "展开/折叠"
-}
+    "addRole": "新增角色",
+    "updateRole": "编辑角色",
+    "roleName": "角色名称",
+    "roleDeleteTips": "确定要删除该角色吗？",
+    "roleNamePlaceholder": "请输入角色名称",
+    "rulesPlaceholder": "请选择权限",
+    "checkStrictly": "父子级不关联",
+    "permission": "权限",
+    "foldText":"展开/折叠"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/auth.user.json b/admin/src/app/lang/zh-cn/auth.user.json
index 9399977e..d416af6e 100644
--- a/admin/src/app/lang/zh-cn/auth.user.json
+++ b/admin/src/app/lang/zh-cn/auth.user.json
@@ -1,33 +1,33 @@
 {
-  "addUser": "新增管理员",
-  "updateUser": "编辑管理员",
-  "userRealName": "姓名",
-  "lastLoginTime": "最后登录时间",
-  "lastLoginIP": "最后登录IP",
-  "accountNumberPlaceholder": "请输入账号",
-  "passwordPlaceholder": "请输入密码",
-  "confirmPasswordPlaceholder": "请再次确认密码",
-  "userRealNamePlaceholder": "请输入姓名",
-  "confirmPasswordError": "两次输入的密码不一致",
-  "userRoleName": "角色",
-  "administrator": "超级管理员",
-  "userRolePlaceholder": "请选择角色",
-  "lock": "锁定",
-  "unlock": "解锁",
-  "status": "用户状态",
-  "statusUnlock": "正常",
-  "statusLock": "锁定",
-  "adminDisabled": "超级管理员不可编辑",
-  "userUnlockTips": "确定要解锁该管理员吗？",
-  "userLockTips": "确定要锁定该管理员吗？",
-  "userType": "用户类型",
-  "adminAdministrators": "平台管理员",
-  "siteAdministrators": "站点管理员",
-  "userTypePlaceholder": "请选择用户类型",
-  "siteAdministratorsDisabled": "站点管理员不可编辑",
-  "manager": "用户",
-  "managerPlaceholder": "请选择用户",
-  "managerTips": "选择或者新增用户作为管理员",
-  "newAddManager": "新增用户",
-  "userDeleteTips": "是否要删除该管理员？"
+    "addUser": "新增管理员",
+    "updateUser": "编辑管理员",
+    "userRealName": "姓名",
+    "lastLoginTime": "最后登录时间",
+    "lastLoginIP": "最后登录IP",
+    "accountNumberPlaceholder": "请输入账号",
+    "passwordPlaceholder": "请输入密码",
+    "confirmPasswordPlaceholder": "请再次确认密码",
+    "userRealNamePlaceholder": "请输入姓名",
+    "confirmPasswordError": "两次输入的密码不一致",
+    "userRoleName": "角色",
+    "administrator":"超级管理员",
+    "userRolePlaceholder": "请选择角色",
+    "lock":"锁定",
+    "unlock":"解锁",
+    "status":"用户状态",
+    "statusUnlock":"正常",
+    "statusLock":"锁定",
+    "adminDisabled":"超级管理员不可编辑",
+    "userUnlockTips":"确定要解锁该管理员吗？",
+    "userLockTips":"确定要锁定该管理员吗？",
+	"userType": "用户类型",
+	"adminAdministrators": "平台管理员",
+	"siteAdministrators": "站点管理员",
+	"userTypePlaceholder": "请选择用户类型",
+	"siteAdministratorsDisabled": "站点管理员不可编辑",
+    "manager": "用户",
+    "managerPlaceholder": "请选择用户",
+    "managerTips": "选择或者新增用户作为管理员",
+    "newAddManager": "新增用户",
+    "userDeleteTips": "是否要删除该管理员？"
 }
diff --git a/admin/src/app/lang/zh-cn/channel.aliapp.access.json b/admin/src/app/lang/zh-cn/channel.aliapp.access.json
index c8db6758..ac6c3c96 100644
--- a/admin/src/app/lang/zh-cn/channel.aliapp.access.json
+++ b/admin/src/app/lang/zh-cn/channel.aliapp.access.json
@@ -1,23 +1,23 @@
 {
-  "weappAccessFlow": "接入流程",
-  "title": "支付宝小程序",
-  "weappInlet": "支付宝小程序接入流程",
-  "weappAttestation": "支付宝小程序认证",
-  "weappAttest": "点击注册打开支付宝小程序官方,注册支付宝小程序后点击企业认证，申请之后等待支付宝官方审核",
-  "clickAccess": "点击注册",
-  "clickAccess2": "扫描二维码进入支付宝小程序",
-  "clickAccess3": "没有小程序马上注册",
-  "weappSetting": "支付宝小程序配置",
-  "weappSettingBtn": "点击配置支付宝小程序",
-  "uploadVersion": "上传小程序",
-  "emplace": "支付宝小程序认证之后按照官方提供的手册进行配置",
-  "settingInfo": "配置信息",
-  "releaseCourse": "版本管理中存放上传的支付宝小程序历更版本，通过uniapp版本编译小程序然后打包上传提交",
-  "completeAccess": "提交审核",
-  "wechatAccess": "提交uniapp对应版本，可以通过支付宝小程序查看版本的审核进度，审核成功后就可以使用了",
-  "wechatAccessBtn": "查看审核进度",
-  "wechatSet": "小程序配置",
-  "subscribeMessage": "订阅消息",
-  "weappRelease": "版本管理",
-  "alert": "您正在体验通用版小程序，不发布你将不可用"
-}
+	"weappAccessFlow": "接入流程",
+	"title": "支付宝小程序",
+	"weappInlet": "支付宝小程序接入流程",
+	"weappAttestation": "支付宝小程序认证",
+	"weappAttest": "点击注册打开支付宝小程序官方,注册支付宝小程序后点击企业认证，申请之后等待支付宝官方审核",
+	"clickAccess": "点击注册",
+	"clickAccess2":"扫描二维码进入支付宝小程序",
+	"clickAccess3": "没有小程序马上注册",
+	"weappSetting": "支付宝小程序配置",
+	"weappSettingBtn": "点击配置支付宝小程序",
+	"uploadVersion": "上传小程序",
+	"emplace": "支付宝小程序认证之后按照官方提供的手册进行配置",
+	"settingInfo": "配置信息",
+	"releaseCourse": "版本管理中存放上传的支付宝小程序历更版本，通过uniapp版本编译小程序然后打包上传提交",
+	"completeAccess": "提交审核",
+	"wechatAccess": "提交uniapp对应版本，可以通过支付宝小程序查看版本的审核进度，审核成功后就可以使用了",
+	"wechatAccessBtn": "查看审核进度",
+	"wechatSet": "小程序配置",
+	"subscribeMessage": "订阅消息",
+	"weappRelease": "版本管理",
+	"alert":"您正在体验通用版小程序，不发布你将不可用"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/channel.aliapp.config.json b/admin/src/app/lang/zh-cn/channel.aliapp.config.json
index 9167d344..2ea7d768 100644
--- a/admin/src/app/lang/zh-cn/channel.aliapp.config.json
+++ b/admin/src/app/lang/zh-cn/channel.aliapp.config.json
@@ -1,33 +1,34 @@
 {
-  "aliappSet": "小程序设置",
-  "aliappName": "小程序名称",
-  "aliappOriginal": "APPID",
-  "aliappQrcode": "小程序二维码",
-  "aliappQrcodeTips": "建议尺寸上传430px*430px宽高的二维码",
-  "aliappAppid": "应用私钥",
-  "aliappAppsecret": "开发者密码",
-  "downloadUrl": "downloadFile合法域名",
-  "aliappInfo": "小程序信息",
-  "aliappDevelopInfo": "开发设置",
-  "theServerSetting": "接口内容加密设置",
-  "functionSetting": "服务器配置信息",
-  "encryptionType": "消息加解密方式",
-  "compatibleMode": "兼容模式",
-  "safeMode": "安全模式（推荐）",
-  "aliappNamePlaceholder": "请输入小程序名称",
-  "aliappOriginalPlaceholder": "请输入APPID",
-  "appidPlaceholder": "请输入应用私钥",
-  "tokenPlaceholder": "请输入Token",
-  "encodingAesKeyPlaceholder": "请输入EncodingAESKey",
-  "countersignType": "接口加签方式",
-  "certificate": "证书",
-  "publicKey": "应用公钥证书",
-  "alipayPublicKey": "支付宝公钥证书",
-  "alipayWithCrt": "支付宝根证书",
-  "publicKeyTips": "上传appCertPublicKey_***.crt文件",
-  "alipayPublicKeyTips": "上传alipayCertPublicKey_RSA2.crt文件",
-  "alipayWithCrtTips": "上传alipayRootCert.crt文件",
-  "AESKey": "AES秘钥",
-  "serveWhiteList": "服务器域名白名单",
-  "AESKeyPlaceholder": "请输入AES秘钥"
-}
+    "aliappSet": "小程序设置",
+    "aliappName": "小程序名称",
+    "aliappOriginal": "APPID",
+    "aliappQrcode": "小程序二维码",
+    "aliappQrcodeTips": "建议尺寸上传430px*430px宽高的二维码",
+    "aliappAppid": "应用私钥",
+    "aliappAppsecret": "开发者密码",
+    "downloadUrl": "downloadFile合法域名",
+    "aliappInfo": "小程序信息",
+    "aliappDevelopInfo": "开发设置",
+    "theServerSetting": "接口内容加密设置",
+    "functionSetting": "服务器配置信息",
+    "encryptionType": "消息加解密方式",
+    "compatibleMode": "兼容模式",
+    "safeMode": "安全模式（推荐）",
+    "aliappNamePlaceholder": "请输入小程序名称",
+    "aliappOriginalPlaceholder": "请输入APPID",
+    "appidPlaceholder": "请输入应用私钥",
+    "tokenPlaceholder": "请输入Token",
+    "encodingAesKeyPlaceholder": "请输入EncodingAESKey",
+    "countersignType": "接口加签方式",
+    "certificate": "证书",
+    "publicKey": "应用公钥证书",
+    "alipayPublicKey": "支付宝公钥证书",
+    "alipayWithCrt": "支付宝根证书",
+    "publicKeyTips": "上传appCertPublicKey_***.crt文件",
+    "alipayPublicKeyTips": "上传alipayCertPublicKey_RSA2.crt文件",
+    "alipayWithCrtTips": "上传alipayRootCert.crt文件",
+    "AESKey": "AES秘钥",
+    "serveWhiteList": "服务器域名白名单",
+    "AESKeyPlaceholder": "请输入AES秘钥"
+    
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/channel.aliapp.course.json b/admin/src/app/lang/zh-cn/channel.aliapp.course.json
index 61a0930b..d63cf9bb 100644
--- a/admin/src/app/lang/zh-cn/channel.aliapp.course.json
+++ b/admin/src/app/lang/zh-cn/channel.aliapp.course.json
@@ -1,10 +1,10 @@
 {
-  "alipayCourseTipsOne1": "登录",
-  "alipayCourseTipsOne2": "支付宝开放平台open.alipay.com",
-  "alipayCourseTipsOne3": "选择小程序应用，没有需先创建。点击进入小程序",
-  "alipayCourseTipsTwo1": "先在小程序内进行产品绑定和开发配置， 绑定下图内这些产品",
-  "alipayCourseTipsTwo2": "获取会员手机号需进行申请",
-  "alipayCourseTipsThree1": "配置开发配置，配置接口加签方式，接口加签方式选择证书",
-  "alipayCourseTipsThree2": "配置接口内容加密方式",
-  "alipayCourseTipsThree3": "配置服务器域名白名单可在商城后台支付宝配置中复制"
-}
+	"alipayCourseTipsOne1": "登录",
+    "alipayCourseTipsOne2": "支付宝开放平台open.alipay.com",
+	"alipayCourseTipsOne3": "选择小程序应用，没有需先创建。点击进入小程序",
+	"alipayCourseTipsTwo1": "先在小程序内进行产品绑定和开发配置， 绑定下图内这些产品",
+	"alipayCourseTipsTwo2": "获取会员手机号需进行申请",
+	"alipayCourseTipsThree1": "配置开发配置，配置接口加签方式，接口加签方式选择证书",
+	"alipayCourseTipsThree2": "配置接口内容加密方式",
+	"alipayCourseTipsThree3": "配置服务器域名白名单可在商城后台支付宝配置中复制"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/channel.h5.config.json b/admin/src/app/lang/zh-cn/channel.h5.config.json
index f31c25b5..0b389858 100644
--- a/admin/src/app/lang/zh-cn/channel.h5.config.json
+++ b/admin/src/app/lang/zh-cn/channel.h5.config.json
@@ -1,6 +1,7 @@
 {
-  "isOpen": "是否开启",
-  "h5DomainName": "h5域名",
-  "clickVisit": "点击访问",
-  "H5Info": "h5配置信息"
-}
+    "isOpen": "是否开启",
+    "h5DomainName": "h5域名",
+    "clickVisit": "点击访问",
+    "H5Info": "h5配置信息"
+    
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/channel.pc.config.json b/admin/src/app/lang/zh-cn/channel.pc.config.json
index 567a9d4c..7bd4090f 100644
--- a/admin/src/app/lang/zh-cn/channel.pc.config.json
+++ b/admin/src/app/lang/zh-cn/channel.pc.config.json
@@ -1,9 +1,9 @@
 {
-  "pcInfo": "电脑端信息",
-  "preview": "预览图",
-  "copy": "复制",
-  "clickVisit": "点击访问",
-  "pCDomainName": "pc域名",
-  "newInfo": "最新消息",
-  "isOpen": "是否开启"
+    "pcInfo": "电脑端信息",
+    "preview": "预览图",
+    "copy": "复制",
+    "clickVisit": "点击访问",
+    "pCDomainName": "pc域名",
+    "newInfo": "最新消息",
+    "isOpen": "是否开启"
 }
diff --git a/admin/src/app/lang/zh-cn/channel.weapp.access.json b/admin/src/app/lang/zh-cn/channel.weapp.access.json
index 8b7c3303..afc70cae 100644
--- a/admin/src/app/lang/zh-cn/channel.weapp.access.json
+++ b/admin/src/app/lang/zh-cn/channel.weapp.access.json
@@ -1,27 +1,27 @@
 {
-  "weappAccessFlow": "接入流程",
-  "title": "微信小程序",
-  "weappInlet": "微信小程序接入流程",
-  "weappAttestation": "微信小程序认证",
-  "weappAttest": "点击注册打开微信小程序官方,注册微信小程序后点击企业认证，申请之后等待微信官方审核",
-  "clickAccess": "点击注册",
-  "clickAccess2": "扫描二维码进入小程序",
-  "clickAccess3": "没有小程序马上注册",
-  "weappSetting": "微信小程序配置",
-  "weappSettingBtn": "点击配置微信小程序",
-  "uploadVersion": "上传小程序",
-  "emplace": "微信小程序认证之后按照官方提供的手册进行配置",
-  "settingInfo": "配置信息",
-  "releaseCourse": "版本管理中存放上传的微信小程序历更版本，通过uniapp版本编译小程序然后打包上传提交",
-  "completeAccess": "提交审核",
-  "wechatAccess": "提交uniapp对应版本，可以通过微信小程序查看版本的审核进度，审核成功后就可以使用了",
-  "wechatAccessBtn": "查看审核进度",
-  "wechatSet": "小程序配置",
-  "subscribeMessage": "订阅消息",
-  "weappRelease": "版本管理",
-  "alert": "您正在体验通用版小程序，不发布你将不可用",
-  "authWeapp": "授权绑定微信小程序",
-  "clickSetting": "点击配置微信小程序",
-  "seeConfig": "查看配置",
-  "refreshAuth": "重新授权"
+	"weappAccessFlow": "接入流程",
+	"title": "微信小程序",
+	"weappInlet": "微信小程序接入流程",
+	"weappAttestation": "微信小程序认证",
+	"weappAttest": "点击注册打开微信小程序官方,注册微信小程序后点击企业认证，申请之后等待微信官方审核",
+	"clickAccess": "点击注册",
+	"clickAccess2": "扫描二维码进入小程序",
+	"clickAccess3": "没有小程序马上注册",
+	"weappSetting": "微信小程序配置",
+	"weappSettingBtn": "点击配置微信小程序",
+	"uploadVersion": "上传小程序",
+	"emplace": "微信小程序认证之后按照官方提供的手册进行配置",
+	"settingInfo": "配置信息",
+	"releaseCourse": "版本管理中存放上传的微信小程序历更版本，通过uniapp版本编译小程序然后打包上传提交",
+	"completeAccess": "提交审核",
+	"wechatAccess": "提交uniapp对应版本，可以通过微信小程序查看版本的审核进度，审核成功后就可以使用了",
+	"wechatAccessBtn": "查看审核进度",
+	"wechatSet": "小程序配置",
+	"subscribeMessage": "订阅消息",
+	"weappRelease": "版本管理",
+	"alert":"您正在体验通用版小程序，不发布你将不可用",
+	"authWeapp": "授权绑定微信小程序",
+	"clickSetting": "点击配置微信小程序",
+	"seeConfig": "查看配置",
+	"refreshAuth": "重新授权"
 }
diff --git a/admin/src/app/lang/zh-cn/channel.weapp.code.json b/admin/src/app/lang/zh-cn/channel.weapp.code.json
index 37d28b75..1038dfac 100644
--- a/admin/src/app/lang/zh-cn/channel.weapp.code.json
+++ b/admin/src/app/lang/zh-cn/channel.weapp.code.json
@@ -1,46 +1,46 @@
 {
-  "operatePrompt": "操作提示",
-  "operatePromptTipsOne": "下载之后需使用微信开发者工具上传代码，微信开发者工具下载地址",
-  "operatePromptTipsTwo": "上传之后登录微信公众平台，在版本管理中选择刚上传的版本提交审核，审核通过之后即可发布小程序。",
-  "weappName": "小程序名称",
-  "weappId": "小程序ID",
-  "weappOriginalId": "小程序原始ID",
-  "weappInfo": "小程序信息",
-  "versionCode": "小程序代码",
-  "version": "版本",
-  "down": "下载",
-  "codeDown": "代码下载",
-  "downWeappCode": "下载代码",
-  "weappTips": "请先完善小程序配置",
-  "codeDownOneTips": "下载小程序代码包",
-  "codeDownTwoDesc": "上传代码",
-  "codeDownTwoTips": "下载完成之后，使用微信开发工具进行上传",
-  "codeDownThreeDesc": "发布小程序",
-  "codeDownThreeTips": "上传之后提交审核，审核通过发布小程序",
-  "weappVersion": "小程序版本",
-  "close": "关闭",
-  "code": "版本号",
-  "codePlaceholder": "请输入版本号",
-  "path": "小程序代码",
-  "pathPlaceholder": "请上传小程序代码",
-  "content": "版本说明",
-  "weappAccessFlow": "接入流程",
-  "subscribeMessage": "订阅消息",
-  "weappRelease": "版本管理",
-  "contentPlaceholder": "请输入版本说明",
-  "uploadingTips": "小程序代码上传中",
-  "status": "状态",
-  "preview": "预览",
-  "authTips": "上传代码需先绑定授权码，如果已有授权请先进行绑定，没有授权可到niucloud官网购买云服务之后再进行操作",
-  "toBind": "绑定授权",
-  "toNiucloud": "去niucloud官网",
-  "failReason": "失败原因",
-  "toSetting": "去配置",
-  "cloudRelease": "一键云端发布",
-  "localRelease": "本地发布",
-  "localInsertTips": "请先将uni-app编译成微信小程序，然后使用微信开发者工具进行上传",
-  "uploadSuccessTips": "小程序上传成功后还需到<a href='https://mp.weixin.qq.com/' target='_blank' class='text-primary'>微信公众平台</a>提交审核，审核通过后发布才算正式上线。",
-  "knownToKnow": "我已知晓，不需要再次提示",
-  "siteAuthTips": "上传代码需先绑定授权码，请联系平台管理员进行绑定",
-  "againUpload": "重新上传"
+	"operatePrompt": "操作提示",
+	"operatePromptTipsOne": "下载之后需使用微信开发者工具上传代码，微信开发者工具下载地址",
+	"operatePromptTipsTwo": "上传之后登录微信公众平台，在版本管理中选择刚上传的版本提交审核，审核通过之后即可发布小程序。",
+	"weappName": "小程序名称",
+	"weappId": "小程序ID",
+	"weappOriginalId": "小程序原始ID",
+	"weappInfo": "小程序信息",
+	"versionCode": "小程序代码",
+	"version": "版本",
+	"down": "下载",
+	"codeDown": "代码下载",
+	"downWeappCode": "下载代码",
+	"weappTips": "请先完善小程序配置",
+	"codeDownOneTips": "下载小程序代码包",
+	"codeDownTwoDesc": "上传代码",
+	"codeDownTwoTips": "下载完成之后，使用微信开发工具进行上传",
+	"codeDownThreeDesc": "发布小程序",
+	"codeDownThreeTips": "上传之后提交审核，审核通过发布小程序",
+	"weappVersion": "小程序版本",
+	"close": "关闭",
+	"code":"版本号",
+	"codePlaceholder":"请输入版本号",
+	"path":"小程序代码",
+	"pathPlaceholder":"请上传小程序代码",
+	"content":"版本说明",
+	"weappAccessFlow": "接入流程",
+    "subscribeMessage": "订阅消息",
+    "weappRelease": "版本管理",
+	"contentPlaceholder":"请输入版本说明",
+	"uploadingTips": "小程序代码上传中",
+	"status": "状态",
+	"preview": "预览",
+	"authTips": "上传代码需先绑定授权码，如果已有授权请先进行绑定，没有授权可到niucloud官网购买云服务之后再进行操作",
+	"toBind": "绑定授权",
+	"toNiucloud": "去niucloud官网",
+	"failReason": "失败原因",
+	"toSetting": "去配置",
+	"cloudRelease": "一键云端发布",
+	"localRelease": "本地发布",
+	"localInsertTips": "请先将uni-app编译成微信小程序，然后使用微信开发者工具进行上传",
+	"uploadSuccessTips": "小程序上传成功后还需到<a href='https://mp.weixin.qq.com/' target='_blank' class='text-primary'>微信公众平台</a>提交审核，审核通过后发布才算正式上线。",
+	"knownToKnow": "我已知晓，不需要再次提示",
+	"siteAuthTips": "上传代码需先绑定授权码，请联系平台管理员进行绑定",
+	"againUpload": "重新上传"
 }
diff --git a/admin/src/app/lang/zh-cn/channel.weapp.config.json b/admin/src/app/lang/zh-cn/channel.weapp.config.json
index 504b6341..cbc53179 100644
--- a/admin/src/app/lang/zh-cn/channel.weapp.config.json
+++ b/admin/src/app/lang/zh-cn/channel.weapp.config.json
@@ -1,38 +1,38 @@
 {
-  "weappName": "小程序名称",
-  "weappOriginal": "小程序原始ID",
-  "weappQrcode": "小程序二维码",
-  "weappQrcodeTips": "建议尺寸上传430px*430px宽高的二维码",
-  "weappAppid": "AppID(小程序ID)",
-  "weappAppidTips": "AppID是小程序开发识别码，配合AppSecret可调用小程序的接口能力。",
-  "weappAppsecret": "AppSecret(小程序密钥)",
-  "weappAppsecretTips": "AppSecret是校验小程序开发者身份的密钥，具有极高的安全性",
-  "businessDomain": "业务域名",
-  "requestUrl": "request合法域名",
-  "socketUrl": "socket合法域名",
-  "uploadUrl": "uploadFile合法域名",
-  "downloadUrl": "downloadFile合法域名",
-  "weappInfo": "小程序信息",
-  "weappDevelopInfo": "小程序开发信息",
-  "theServerSetting": "消息推送配置",
-  "functionSetting": "服务器域名设置",
-  "tokenTips": "必须为英文或数字，长度为3-32字符。",
-  "encodingAESKeyTips": "消息加密密钥由43位字符组成，可随机修改，字符范围为A-Z，a-z，0-9。",
-  "encryptionType": "消息加解密方式",
-  "cleartextMode": "明文模式",
-  "compatibleMode": "兼容模式",
-  "safeMode": "安全模式（推荐）",
-  "weappNamePlaceholder": "请输入小程序名称",
-  "weappOriginalPlaceholder": "请输入小程序原始ID",
-  "appidPlaceholder": "请输入开发者ID",
-  "appSecretPlaceholder": "请输入开发者密码",
-  "tokenPlaceholder": "请输入Token",
-  "encodingAesKeyPlaceholder": "请输入EncodingAESKey",
-  "cleartextModeTips": "明文模式下，不使用消息体加解密功能，安全系数较低",
-  "compatibleModeTips": "兼容模式下，明文、密文将共存，方便开发者调试和维护",
-  "safeModeTips": "安全模式下，消息包为纯密文，需要开发者加密和解密，安全系数高",
-  "weappUpload": "小程序代码上传",
-  "uploadKey": "上传密钥",
-  "uploadKeyTips": "配置之后可实现在线上传小程序版本",
-  "uploadIpTips": "如果小程序代码上传开启了ip白名单设置，在ip白名单中添加ip："
-}
+    "weappName": "小程序名称",
+    "weappOriginal": "小程序原始ID",
+    "weappQrcode": "小程序二维码",
+    "weappQrcodeTips": "建议尺寸上传430px*430px宽高的二维码",
+    "weappAppid": "AppID(小程序ID)",
+    "weappAppidTips": "AppID是小程序开发识别码，配合AppSecret可调用小程序的接口能力。",
+    "weappAppsecret": "AppSecret(小程序密钥)",
+    "weappAppsecretTips": "AppSecret是校验小程序开发者身份的密钥，具有极高的安全性",
+    "businessDomain": "业务域名",
+    "requestUrl": "request合法域名",
+    "socketUrl": "socket合法域名",
+    "uploadUrl": "uploadFile合法域名",
+    "downloadUrl": "downloadFile合法域名",
+    "weappInfo": "小程序信息",
+    "weappDevelopInfo": "小程序开发信息",
+    "theServerSetting": "消息推送配置",
+    "functionSetting": "服务器域名设置",
+    "tokenTips": "必须为英文或数字，长度为3-32字符。",
+    "encodingAESKeyTips": "消息加密密钥由43位字符组成，可随机修改，字符范围为A-Z，a-z，0-9。",
+    "encryptionType": "消息加解密方式",
+    "cleartextMode": "明文模式",
+    "compatibleMode": "兼容模式",
+    "safeMode": "安全模式（推荐）",
+    "weappNamePlaceholder": "请输入小程序名称",
+    "weappOriginalPlaceholder": "请输入小程序原始ID",
+    "appidPlaceholder": "请输入开发者ID",
+    "appSecretPlaceholder": "请输入开发者密码",
+    "tokenPlaceholder": "请输入Token",
+    "encodingAesKeyPlaceholder": "请输入EncodingAESKey",
+    "cleartextModeTips": "明文模式下，不使用消息体加解密功能，安全系数较低",
+    "compatibleModeTips": "兼容模式下，明文、密文将共存，方便开发者调试和维护",
+    "safeModeTips": "安全模式下，消息包为纯密文，需要开发者加密和解密，安全系数高",
+    "weappUpload": "小程序代码上传",
+    "uploadKey": "上传密钥",
+    "uploadKeyTips": "配置之后可实现在线上传小程序版本",
+    "uploadIpTips": "如果小程序代码上传开启了ip白名单设置，在ip白名单中添加ip："
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/channel.weapp.course.json b/admin/src/app/lang/zh-cn/channel.weapp.course.json
index 779535b5..ed02d562 100644
--- a/admin/src/app/lang/zh-cn/channel.weapp.course.json
+++ b/admin/src/app/lang/zh-cn/channel.weapp.course.json
@@ -1,10 +1,10 @@
 {
-  "writingTipsOne1": "登录--",
-  "writingTipsOne2": "微信公众平台mp.weixin.qq.com",
-  "writingTipsOne3": "基本配置中，找到【设置--基本设置】,查看小程序是否认证，没有认证需要先进行认证",
-  "writingTipsTwo1": "再在【开发-开发管理-开发设置】中，配置开发者ID 里面的【IP白名单】，修改后保存。",
-  "writingTipsThree1": "在【开发-开发管理-开发设置】中，配置",
-  "writingTipsThree2": "request合法域名/ socket合法域名/ uploadFile合法域名/ downloadFile合法域名/ udp合法域名",
-  "writingTipsFour1": "在【开发-开发管理-开发设置】中，将",
-  "writingTipsFour2": "对应填写至服务器配置"
-}
+	"writingTipsOne1": "登录--",
+	"writingTipsOne2": "微信公众平台mp.weixin.qq.com",
+	"writingTipsOne3": "基本配置中，找到【设置--基本设置】,查看小程序是否认证，没有认证需要先进行认证",
+	"writingTipsTwo1": "再在【开发-开发管理-开发设置】中，配置开发者ID 里面的【IP白名单】，修改后保存。",
+	"writingTipsThree1": "在【开发-开发管理-开发设置】中，配置",
+	"writingTipsThree2": "request合法域名/ socket合法域名/ uploadFile合法域名/ downloadFile合法域名/ udp合法域名",
+	"writingTipsFour1": "在【开发-开发管理-开发设置】中，将",
+	"writingTipsFour2": "对应填写至服务器配置"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/channel.weapp.template.json b/admin/src/app/lang/zh-cn/channel.weapp.template.json
index 9bff9349..7c04e1c4 100644
--- a/admin/src/app/lang/zh-cn/channel.weapp.template.json
+++ b/admin/src/app/lang/zh-cn/channel.weapp.template.json
@@ -1,22 +1,22 @@
 {
-  "name": "类型",
-  "response": "回复内容",
-  "isStart": "是否启用",
-  "serialNumber": "编号",
-  "operation": "操作",
-  "operationTip": "温馨提示",
-  "operationTipOne": "请在小程序的服务类目中添加类目：一级类目：商业服务 二级类目：软件/建站/技术开发",
-  "operationTipTwo": "小程序最多支持50个消息模板获取时请注意小程序剩余模板数量是否充足",
-  "buyerNews": "买家消息",
-  "sellerMessage": "卖家消息",
-  "started": "启用",
-  "closed": "禁用",
-  "close": "关闭",
-  "open": "开启",
-  "regain": "重新获取",
-  "weappAccessFlow": "接入流程",
-  "subscribeMessage": "订阅消息",
-  "weappRelease": "版本管理",
-  "batchAcquisition": "一键获取",
-  "addon": "所属应用"
+    "name": "类型",
+    "response": "回复内容",
+    "isStart": "是否启用",
+    "serialNumber": "编号",
+    "operation": "操作",
+    "operationTip": "温馨提示",
+    "operationTipOne": "请在小程序的服务类目中添加类目：一级类目：商业服务 二级类目：软件/建站/技术开发",
+    "operationTipTwo": "小程序最多支持50个消息模板获取时请注意小程序剩余模板数量是否充足",
+    "buyerNews": "买家消息",
+    "sellerMessage": "卖家消息",
+    "started": "启用",
+    "closed": "禁用",
+    "close": "关闭",
+    "open": "开启",
+    "regain": "重新获取",
+    "weappAccessFlow": "接入流程",
+    "subscribeMessage": "订阅消息",
+    "weappRelease": "版本管理",
+    "batchAcquisition": "一键获取",
+    "addon": "所属应用"
 }
diff --git a/admin/src/app/lang/zh-cn/channel.wechat.access.json b/admin/src/app/lang/zh-cn/channel.wechat.access.json
index b2ff16c7..ac91b2ec 100644
--- a/admin/src/app/lang/zh-cn/channel.wechat.access.json
+++ b/admin/src/app/lang/zh-cn/channel.wechat.access.json
@@ -1,24 +1,24 @@
 {
-  "wechatAccessFlow": "接入流程",
-  "title": "微信公众号",
-  "wechatInlet": "微信公众号接入流程",
-  "wechatAttestation": "微信公众号认证",
-  "wechatAttestation1": "点击接入打开微信公众号官方,注册微信公众号后申请服务号认证，申请之后等待微信官方审核",
-  "clickAccess": "点击接入",
-  "wechatSetting": "微信公众号配置",
-  "wechatSetting1": "微信公众号认证之后配置微信公众号连接，具体查看配置与发布教程",
-  "settingInfo": "点击配置微信公众号",
-  "wechatAccess": "微信公众号发布",
-  "releaseCourse": "发布教程",
-  "completeAccess": "完成接入",
-  "wechatSet": "公众号配置",
-  "customMenu": "自定义菜单",
-  "wechatAccessBtn": "查看审核进度",
-  "clickAccess2": "扫描二维码进入微信公众号",
-  "wechatTemplate": "模板消息",
-  "reply": "自动回复",
-  "authWechat": "授权绑定微信公众号",
-  "clickSetting": "点击配置微信公众号",
-  "seeConfig": "查看配置",
-  "refreshAuth": "重新授权"
+	"wechatAccessFlow": "接入流程",
+	"title": "微信公众号",
+	"wechatInlet": "微信公众号接入流程",
+	"wechatAttestation": "微信公众号认证",
+	"wechatAttestation1": "点击接入打开微信公众号官方,注册微信公众号后申请服务号认证，申请之后等待微信官方审核",
+	"clickAccess": "点击接入",
+	"wechatSetting": "微信公众号配置",
+	"wechatSetting1": "微信公众号认证之后配置微信公众号连接，具体查看配置与发布教程",
+	"settingInfo": "点击配置微信公众号",
+	"wechatAccess": "微信公众号发布",
+	"releaseCourse": "发布教程",
+	"completeAccess": "完成接入",
+	"wechatSet": "公众号配置",
+	"customMenu": "自定义菜单",
+	"wechatAccessBtn": "查看审核进度",
+	"clickAccess2":"扫描二维码进入微信公众号",
+	"wechatTemplate": "模板消息",
+	"reply": "自动回复",
+	"authWechat": "授权绑定微信公众号",
+	"clickSetting": "点击配置微信公众号",
+	"seeConfig": "查看配置",
+	"refreshAuth": "重新授权"
 }
diff --git a/admin/src/app/lang/zh-cn/channel.wechat.config.json b/admin/src/app/lang/zh-cn/channel.wechat.config.json
index f98744f1..a86663f9 100644
--- a/admin/src/app/lang/zh-cn/channel.wechat.config.json
+++ b/admin/src/app/lang/zh-cn/channel.wechat.config.json
@@ -1,33 +1,33 @@
 {
-  "wechatName": "公众号名称",
-  "wechatOriginal": "公众号原始ID",
-  "wechatQrcode": "公众号二维码",
-  "wechatQrcodeTips": "建议尺寸上传430px*430px宽高的二维码",
-  "wechatAppid": "开发者ID",
-  "wechatAppidTips": "开发者ID是公众号开发识别码，配合开发者密码可调用公众号的接口能力。",
-  "wechatAppsecret": "开发者密码",
-  "wechatAppsecretTips": "开发者密码是校验公众号开发者身份的密码，具有极高的安全性",
-  "businessDomain": "业务域名",
-  "jsSecureDomain": "JS接口安全域名",
-  "webAuthDomain": "网页授权域名",
-  "wechatInfo": "公众号信息",
-  "wechatDevelopInfo": "公众号开发信息",
-  "theServerSetting": "消息推送配置",
-  "functionSetting": "功能设置",
-  "functionSettingTips": "在微信公众平台中，点击 设置与开发>公众号设置>功能设置，设置业务域名 JS接口安全域名 网页授权域名",
-  "tokenTips": "必须为英文或数字，长度为3-32字符。",
-  "encodingAESKeyTips": "消息加密密钥由43位字符组成，可随机修改，字符范围为A-Z，a-z，0-9。",
-  "encryptionType": "消息加解密方式",
-  "cleartextMode": "明文模式",
-  "compatibleMode": "兼容模式",
-  "safeMode": "安全模式（推荐）",
-  "wechatNamePlaceholder": "请输入公众号名称",
-  "wechatOriginalPlaceholder": "请输入公众号原始ID",
-  "appidPlaceholder": "请输入开发者ID",
-  "appSecretPlaceholder": "请输入开发者密码",
-  "tokenPlaceholder": "请输入Token",
-  "encodingAesKeyPlaceholder": "请输入EncodingAESKey",
-  "cleartextModeTips": "明文模式下，不使用消息体加解密功能，安全系数较低",
-  "compatibleModeTips": "兼容模式下，明文、密文将共存，方便开发者调试和维护",
-  "safeModeTips": "安全模式下，消息包为纯密文，需要开发者加密和解密，安全系数高"
-}
+    "wechatName": "公众号名称",
+    "wechatOriginal": "公众号原始ID",
+    "wechatQrcode": "公众号二维码",
+    "wechatQrcodeTips": "建议尺寸上传430px*430px宽高的二维码",
+    "wechatAppid": "开发者ID",
+    "wechatAppidTips": "开发者ID是公众号开发识别码，配合开发者密码可调用公众号的接口能力。",
+    "wechatAppsecret": "开发者密码",
+    "wechatAppsecretTips": "开发者密码是校验公众号开发者身份的密码，具有极高的安全性",
+    "businessDomain": "业务域名",
+    "jsSecureDomain": "JS接口安全域名",
+    "webAuthDomain": "网页授权域名",
+    "wechatInfo": "公众号信息",
+    "wechatDevelopInfo": "公众号开发信息",
+    "theServerSetting": "消息推送配置",
+    "functionSetting": "功能设置",
+    "functionSettingTips" : "在微信公众平台中，点击 设置与开发>公众号设置>功能设置，设置业务域名 JS接口安全域名 网页授权域名",
+    "tokenTips": "必须为英文或数字，长度为3-32字符。",
+    "encodingAESKeyTips": "消息加密密钥由43位字符组成，可随机修改，字符范围为A-Z，a-z，0-9。",
+    "encryptionType": "消息加解密方式",
+    "cleartextMode": "明文模式",
+    "compatibleMode": "兼容模式",
+    "safeMode": "安全模式（推荐）",
+    "wechatNamePlaceholder": "请输入公众号名称",
+    "wechatOriginalPlaceholder": "请输入公众号原始ID",
+    "appidPlaceholder": "请输入开发者ID",
+    "appSecretPlaceholder": "请输入开发者密码",
+    "tokenPlaceholder": "请输入Token",
+    "encodingAesKeyPlaceholder": "请输入EncodingAESKey",
+    "cleartextModeTips": "明文模式下，不使用消息体加解密功能，安全系数较低",
+    "compatibleModeTips": "兼容模式下，明文、密文将共存，方便开发者调试和维护",
+    "safeModeTips": "安全模式下，消息包为纯密文，需要开发者加密和解密，安全系数高"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/channel.wechat.course.json b/admin/src/app/lang/zh-cn/channel.wechat.course.json
index bea5838c..75d182bf 100644
--- a/admin/src/app/lang/zh-cn/channel.wechat.course.json
+++ b/admin/src/app/lang/zh-cn/channel.wechat.course.json
@@ -1,10 +1,10 @@
 {
-  "writingTipsOne1": "登录",
-  "writingTipsOne2": "微信公众平台mp.weixin.qq.com",
-  "writingTipsOne3": "基本配置中，找到【服务器配置--修改配置】, 将",
-  "writingTipsOne4": "对应填写至服务器配置",
-  "writingTipsOne5": "填写完成之后提交。返回服务器配置，点击【启用】, 启用服务器配置。",
-  "writingTipsTwo1": "再在基本配置中，选择【IP白名单】，修改后保存。",
-  "writingTipsThree1": "进入【设置-公众号设置】，选择【功能设置】，",
-  "writingTipsThree2": "依次配置业务域名/ JS接口安全域名/网页授权域名"
-}
+	"writingTipsOne1": "登录",
+	"writingTipsOne2": "微信公众平台mp.weixin.qq.com",
+	"writingTipsOne3": "基本配置中，找到【服务器配置--修改配置】, 将",
+	"writingTipsOne4": "对应填写至服务器配置",
+	"writingTipsOne5": "填写完成之后提交。返回服务器配置，点击【启用】, 启用服务器配置。",
+	"writingTipsTwo1": "再在基本配置中，选择【IP白名单】，修改后保存。",
+	"writingTipsThree1": "进入【设置-公众号设置】，选择【功能设置】，",
+	"writingTipsThree2": "依次配置业务域名/ JS接口安全域名/网页授权域名"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/channel.wechat.keyword_reply_edit.json b/admin/src/app/lang/zh-cn/channel.wechat.keyword_reply_edit.json
index 5654c1dd..8d373784 100644
--- a/admin/src/app/lang/zh-cn/channel.wechat.keyword_reply_edit.json
+++ b/admin/src/app/lang/zh-cn/channel.wechat.keyword_reply_edit.json
@@ -1,15 +1,15 @@
 {
-  "ruleName": "规则名称",
-  "ruleNameTips": "规则名不能为空且最多60个字",
-  "ruleNamePlaceholder": "请输入规则名称",
-  "keywordPlaceholder": "请输入关键字",
-  "contentPlaceholder": "请选择回复内容",
-  "allMatching": "全匹配",
-  "fuzzyMatching": "模糊匹配",
-  "keyword": "关键字",
-  "content": "回复内容",
-  "replyMethod": "回复方式",
-  "replyMethodAll": "全部回复",
-  "replyMethodRand": "随机回复一条",
-  "addReplyContent": "添加回复内容"
+	"ruleName": "规则名称",
+	"ruleNameTips": "规则名不能为空且最多60个字",
+	"ruleNamePlaceholder": "请输入规则名称",
+	"keywordPlaceholder": "请输入关键字",
+	"contentPlaceholder": "请选择回复内容",
+	"allMatching": "全匹配",
+	"fuzzyMatching": "模糊匹配",
+	"keyword": "关键字",
+	"content": "回复内容",
+	"replyMethod": "回复方式",
+	"replyMethodAll": "全部回复",
+	"replyMethodRand": "随机回复一条",
+	"addReplyContent": "添加回复内容"
 }
diff --git a/admin/src/app/lang/zh-cn/channel.wechat.menu.json b/admin/src/app/lang/zh-cn/channel.wechat.menu.json
index 42373d3d..9af2c623 100644
--- a/admin/src/app/lang/zh-cn/channel.wechat.menu.json
+++ b/admin/src/app/lang/zh-cn/channel.wechat.menu.json
@@ -1,25 +1,25 @@
 {
-  "menuNameInfo": "菜单信息",
-  "subMenuNameInfo": "子菜单信息",
-  "menuNameTips": "仅支持中英文和数字，字数不超过4个汉字或8个字母。",
-  "subMenuNameTips": "仅支持中英文和数字，字数不超过8个汉字或16个字母。",
-  "menuName": "名称",
-  "deleteMemu": "删除菜单",
-  "deleteMemuTips": "删除后，菜单下设置的内容全部将被删除",
-  "messageType": "消息类型",
-  "skipWebpage": "跳转网页",
-  "skipWeapp": "跳转小程序",
-  "webpageUrl": "网页链接",
-  "weappAppid": "小程序Appid",
-  "weappPage": "小程序页面路径",
-  "menuNamePlaceholder": "请输入菜单名称",
-  "webpageUrlPlaceholder": "请输入网页链接",
-  "weappAppidPlaceholder": "请输入小程序Appid",
-  "weappPagePlaceholder": "请输入小程序页面路径",
-  "wechatAccessFlow": "接入流程",
-  "customMenu": "自定义菜单",
-  "wechatTemplate": "模板消息",
-  "menusEmptyTips": "空菜单，不能保存与发布。",
-  "reply": "自动回复",
-  "menuUrlErrorTips": "请输入完整的网页链接，如https://www.baidu.com"
+    "menuNameInfo": "菜单信息",
+    "subMenuNameInfo": "子菜单信息",
+    "menuNameTips": "仅支持中英文和数字，字数不超过4个汉字或8个字母。",
+    "subMenuNameTips": "仅支持中英文和数字，字数不超过8个汉字或16个字母。",
+    "menuName": "名称",
+    "deleteMemu": "删除菜单",
+    "deleteMemuTips": "删除后，菜单下设置的内容全部将被删除",
+    "messageType": "消息类型",
+    "skipWebpage": "跳转网页",
+    "skipWeapp": "跳转小程序",
+    "webpageUrl": "网页链接",
+    "weappAppid": "小程序Appid",
+    "weappPage": "小程序页面路径",
+    "menuNamePlaceholder": "请输入菜单名称",
+    "webpageUrlPlaceholder": "请输入网页链接",
+    "weappAppidPlaceholder": "请输入小程序Appid",
+    "weappPagePlaceholder": "请输入小程序页面路径",
+    "wechatAccessFlow": "接入流程",
+    "customMenu": "自定义菜单",
+    "wechatTemplate": "模板消息",
+    "menusEmptyTips": "空菜单，不能保存与发布。",
+    "reply": "自动回复",
+    "menuUrlErrorTips": "请输入完整的网页链接，如https://www.baidu.com"
 }
diff --git a/admin/src/app/lang/zh-cn/channel.wechat.reply.json b/admin/src/app/lang/zh-cn/channel.wechat.reply.json
index fc0d39c7..2ef2c6c7 100644
--- a/admin/src/app/lang/zh-cn/channel.wechat.reply.json
+++ b/admin/src/app/lang/zh-cn/channel.wechat.reply.json
@@ -1,12 +1,12 @@
 {
-  "title": "自动回复",
-  "wechatAccessFlow": "接入流程",
-  "wechatSet": "公众号配置",
-  "customMenu": "自定义菜单",
-  "wechatTemplate": "模板消息",
-  "reply": "自动回复",
-  "keywordReply": "关键词回复",
-  "defaultReply": "默认回复",
-  "subscribeReply": "关注回复",
-  "replyDeleteTips": "确定要删除该条回复吗？"
+	"title": "自动回复",
+	"wechatAccessFlow": "接入流程",
+	"wechatSet": "公众号配置",
+	"customMenu": "自定义菜单",
+	"wechatTemplate": "模板消息",
+	"reply": "自动回复",
+	"keywordReply": "关键词回复",
+	"defaultReply": "默认回复",
+	"subscribeReply": "关注回复",
+	"replyDeleteTips": "确定要删除该条回复吗？"
 }
diff --git a/admin/src/app/lang/zh-cn/children_like.children_like.json b/admin/src/app/lang/zh-cn/children_like.children_like.json
new file mode 100644
index 00000000..7cb9540a
--- /dev/null
+++ b/admin/src/app/lang/zh-cn/children_like.children_like.json
@@ -0,0 +1,27 @@
+{
+      "title":"课程标题",
+      "titlePlaceholder":"请输入课程标题",
+      "image":"预览图",
+      "imagePlaceholder":"请输入预览图",
+      "type":"素材类型",
+      "typePlaceholder":"请输入素材类型",
+      "content":"课程内容",
+      "contentPlaceholder":"请输入课程内容",
+      "status":"状态",
+      "statusPlaceholder":"请输入状态",
+      "createTime":"创建时间",
+      "createTimePlaceholder":"请输入创建时间",
+      "updateTime":"修改时间",
+      "updateTimePlaceholder":"请输入修改时间",
+      "userPermission":"用户权限",
+      "userPermissionPlaceholder":"请输入用户权限",
+      "addLessonCourseTeaching":"添加互动游戏",
+      "updateLessonCourseTeaching":"编辑互动游戏",
+      "lessonCourseTeachingDeleteTips":"确定要删除该数据吗？",
+      "startDate":"请选择开始时间",
+      "endDate":"请选择结束时间",
+      "addJumpLessonLibrary":"添加套圈游戏",
+      "updateJumpLessonLibrary":"编辑套圈游戏",
+      "addEnTeachingLibrary":"添加鼓励方式",
+      "editEnTeachingLibrary":"编辑鼓励方式"
+}
diff --git a/admin/src/app/lang/zh-cn/decorate.preview.json b/admin/src/app/lang/zh-cn/decorate.preview.json
index c82b1247..b706dee1 100644
--- a/admin/src/app/lang/zh-cn/decorate.preview.json
+++ b/admin/src/app/lang/zh-cn/decorate.preview.json
@@ -9,4 +9,4 @@
   "developTitle": "开发环境配置",
   "wapDomain": "wap域名（WAP_DOMAIN）",
   "wapDomainPlaceholder": "请输入wap域名"
-}
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/departments.departments.json b/admin/src/app/lang/zh-cn/departments.departments.json
index 2ec66514..a2040d42 100644
--- a/admin/src/app/lang/zh-cn/departments.departments.json
+++ b/admin/src/app/lang/zh-cn/departments.departments.json
@@ -5,6 +5,8 @@
       "departmentNamePlaceholder":"请输入部门名称",
       "parentDepartmentId":"上级部门ID",
       "parentDepartmentIdPlaceholder":"全部",
+      "createdAt":"创建时间",
+      "updatedAt":"修改时间",
       "addDepartments":"添加部门",
       "updateDepartments":"编辑部门",
       "departmentsDeleteTips":"确定要删除该数据吗？",
diff --git a/admin/src/app/lang/zh-cn/dict.list.json b/admin/src/app/lang/zh-cn/dict.list.json
index 9579dfd5..15fb037a 100644
--- a/admin/src/app/lang/zh-cn/dict.list.json
+++ b/admin/src/app/lang/zh-cn/dict.list.json
@@ -1,24 +1,24 @@
 {
-  "name": "字典名称",
-  "namePlaceholder": "请输入字典名称",
-  "key": "字典关键词",
-  "keyPlaceholder": "请输入字典关键词",
-  "data": "字典数据",
-  "dataPlaceholder": "请输入字典数据",
-  "memo": "备注",
-  "memoPlaceholder": "请输入备注",
-  "addDict": "添加数据字典",
-  "updateDict": "编辑数据字典",
-  "dictDeleteTips": "确定要删除该数据吗？",
-  "dictData": "数据管理",
-  "addDictData": "添加数据",
-  "editDictData": "编辑数据",
-  "dataName": "数据名称",
-  "dataNamePlaceholder": "请输入数据名称",
-  "dataValue": "数据值",
-  "dataValuePlaceholder": "请输入数据值",
-  "sortPlaceholder": "数值越大越排前",
-  "momePlaceholder": "请输入备注",
-  "createTime": "创建时间",
-  "keyFormatTips": "关键字只允许输入字母和下划线"
+      "name":"字典名称",
+      "namePlaceholder":"请输入字典名称",
+      "key":"字典关键词",
+      "keyPlaceholder":"请输入字典关键词",
+      "data":"字典数据",
+      "dataPlaceholder":"请输入字典数据",
+      "memo":"备注",
+      "memoPlaceholder":"请输入备注",
+      "addDict":"添加数据字典",
+      "updateDict":"编辑数据字典",
+      "dictDeleteTips":"确定要删除该数据吗？",
+      "dictData":"数据管理",
+      "addDictData":"添加数据",
+      "editDictData":"编辑数据",
+      "dataName":"数据名称",
+      "dataNamePlaceholder":"请输入数据名称",
+      "dataValue":"数据值",
+      "dataValuePlaceholder":"请输入数据值",
+      "sortPlaceholder":"数值越大越排前",
+      "momePlaceholder":"请输入备注",
+      "createTime":"创建时间",
+      "keyFormatTips": "关键字只允许输入字母和下划线"
 }
diff --git a/admin/src/app/lang/zh-cn/diy.list.json b/admin/src/app/lang/zh-cn/diy.list.json
index 5e6325a2..3e0ea985 100644
--- a/admin/src/app/lang/zh-cn/diy.list.json
+++ b/admin/src/app/lang/zh-cn/diy.list.json
@@ -32,4 +32,4 @@
   "shareDesc": "分享描述",
   "shareDescPlaceholder": "请输入分享描述",
   "shareImageUrl": "分享图片"
-}
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/diy.preview.json b/admin/src/app/lang/zh-cn/diy.preview.json
index 2d114382..b69d5ecd 100644
--- a/admin/src/app/lang/zh-cn/diy.preview.json
+++ b/admin/src/app/lang/zh-cn/diy.preview.json
@@ -10,4 +10,4 @@
   "developTitle": "开发环境配置",
   "wapDomain": "wap域名（WAP_DOMAIN）",
   "wapDomainPlaceholder": "请输入wap域名"
-}
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/diy.route.json b/admin/src/app/lang/zh-cn/diy.route.json
index 070c1ece..a1326c98 100644
--- a/admin/src/app/lang/zh-cn/diy.route.json
+++ b/admin/src/app/lang/zh-cn/diy.route.json
@@ -19,4 +19,4 @@
   "shareDesc": "分享描述",
   "shareDescPlaceholder": "请输入分享描述",
   "shareImageUrl": "分享图片"
-}
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/diy.tabbar.json b/admin/src/app/lang/zh-cn/diy.tabbar.json
index 9c517e6e..d0666fd1 100644
--- a/admin/src/app/lang/zh-cn/diy.tabbar.json
+++ b/admin/src/app/lang/zh-cn/diy.tabbar.json
@@ -4,4 +4,4 @@
   "type": "插件类型",
   "app": "应用",
   "addon": "插件"
-}
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/diy.tabbar_edit.json b/admin/src/app/lang/zh-cn/diy.tabbar_edit.json
index d8141563..80526f11 100644
--- a/admin/src/app/lang/zh-cn/diy.tabbar_edit.json
+++ b/admin/src/app/lang/zh-cn/diy.tabbar_edit.json
@@ -27,4 +27,4 @@
   "bottomNavHint": "设置至少添加2个导航，最多添加5个导航",
   "uploadImgUnselected": "未选中",
   "uploadImgSelected": "选中"
-}
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/diy_form.edit.json b/admin/src/app/lang/zh-cn/diy_form.edit.json
index 26f9c3ab..145c9ffe 100644
--- a/admin/src/app/lang/zh-cn/diy_form.edit.json
+++ b/admin/src/app/lang/zh-cn/diy_form.edit.json
@@ -346,47 +346,49 @@
   "currentTime": "当天时间",
   "diyTime": "指定时间",
 
-  "preventDuplication": "内容防重复",
-  "preventDuplicationTipsOne": "该组件填写的内容不能与已提交的数据重复。",
-  "preventDuplicationTipsTwo": "极端情况下可能存在延时导致限制失效。",
-  "privacyProtection": "隐私保护",
-  "privacyProtectionTipsOne": "会自动将提交的个人信息做加密展示。",
-  "privacyProtectionTipsTwo": "适用于公开展示收集的数据且不暴露用户隐私。",
-  "privacyProtectionTipsThree": "提交后自动隐藏中间11位数字，仅管理员可查看",
-  "privacyProtectionTipsFour": "提交后自动隐藏文本，仅管理员可查看",
-  "privacyProtectionTipsFive": "提交后自动隐藏中间5位数字，仅管理员可查看",
+  "preventDuplication":"内容防重复",
+  "preventDuplicationTipsOne":"该组件填写的内容不能与已提交的数据重复。",
+  "preventDuplicationTipsTwo":"极端情况下可能存在延时导致限制失效。",
+  "privacyProtection":"隐私保护",
+  "privacyProtectionTipsOne":"会自动将提交的个人信息做加密展示。",
+  "privacyProtectionTipsTwo":"适用于公开展示收集的数据且不暴露用户隐私。",
+  "privacyProtectionTipsThree":"提交后自动隐藏中间11位数字，仅管理员可查看",
+  "privacyProtectionTipsFour":"提交后自动隐藏文本，仅管理员可查看",
+  "privacyProtectionTipsFive":"提交后自动隐藏中间5位数字，仅管理员可查看",
 
-  "imageLimit": "限制数量",
-  "imageLimitPlaceholder": "请输入限制数量",
-  "imageLimitErrorTips": "限制数量格式输入错误",
-  "imageLimitErrorTipsTwo": "限制数量不能小于0",
-  "imageLimitErrorTipsThree": "限制数量必须大于0",
-  "imafeLimitErrorTipsFour": "限制数量最大不能超过20",
+  "imageLimit":"限制数量",
+  "imageLimitPlaceholder":"请输入限制数量",
+  "imageLimitErrorTips":"限制数量格式输入错误",
+  "imageLimitErrorTipsTwo":"限制数量不能小于0",
+  "imageLimitErrorTipsThree":"限制数量必须大于0",
+  "imafeLimitErrorTipsFour":"限制数量最大不能超过20",
 
-  "defaultValueTips": "设置后，默认值会自动填充到输入框，填表人可在此基础上进行修改。",
-  "defaultErrorTips": "默认值格式输入错误",
-  "defaultMustZeroTips": "默认值不能小于0",
+  "defaultValueTips":"设置后，默认值会自动填充到输入框，填表人可在此基础上进行修改。",
+  "defaultErrorTips":"默认值格式输入错误",
+  "defaultMustZeroTips":"默认值不能小于0",
 
-  "access": "获取方式",
-  "authorizeWeChatLocation": "授权微信定位",
-  "manuallySelectPositioning": "手动选择定位",
+  "access":"获取方式",
+  "authorizeWeChatLocation":"授权微信定位",
+  "manuallySelectPositioning":"手动选择定位",
 
-  "unit": "单位",
-  "unitPlaceholder": "请输入单位",
+  "unit":"单位",
+  "unitPlaceholder":"请输入单位",
+
+  "followContent":"跟随内容",
+  "hoverScreenBottom":"悬浮屏幕底部",
+  "btnTips":"当表单内容多时，只有滚动页面至最底部才会显示提交按钮",
+  "btnTipsTwo":"当表单内容多时，滚动页面至最底部时，提交按钮会自动按钮悬浮在屏幕底部，方便填表人快速提交显示在屏幕底部",
+  "btnTipsThree":"若前端以嵌入形式调用表单，提交按钮组件将不显示，相关业务由该页面负责处理",
+  "submitBtn":"提交按钮",
+  "submitBtnName":"按钮名称",
+  "btnNamePlaceholder":"请输入按钮名称",
+  "submitBtnNamePlaceholder":"请输入提交按钮名称",
+  "resetBtn":"重置按钮",
+  "btnStyle":"按钮样式",
+  "resetBtnNamePlaceholder":"请输入重置按钮名称",
+
+  "rowCount":"显示行数",
+  "rowCountPlaceholder":"请输入显示行数"
 
-  "followContent": "跟随内容",
-  "hoverScreenBottom": "悬浮屏幕底部",
-  "btnTips": "当表单内容多时，只有滚动页面至最底部才会显示提交按钮",
-  "btnTipsTwo": "当表单内容多时，滚动页面至最底部时，提交按钮会自动按钮悬浮在屏幕底部，方便填表人快速提交显示在屏幕底部",
-  "btnTipsThree": "若前端以嵌入形式调用表单，提交按钮组件将不显示，相关业务由该页面负责处理",
-  "submitBtn": "提交按钮",
-  "submitBtnName": "按钮名称",
-  "btnNamePlaceholder": "请输入按钮名称",
-  "submitBtnNamePlaceholder": "请输入提交按钮名称",
-  "resetBtn": "重置按钮",
-  "btnStyle": "按钮样式",
-  "resetBtnNamePlaceholder": "请输入重置按钮名称",
 
-  "rowCount": "显示行数",
-  "rowCountPlaceholder": "请输入显示行数"
 }
diff --git a/admin/src/app/lang/zh-cn/diy_form.list.json b/admin/src/app/lang/zh-cn/diy_form.list.json
index 4adb0ad9..9741d38c 100644
--- a/admin/src/app/lang/zh-cn/diy_form.list.json
+++ b/admin/src/app/lang/zh-cn/diy_form.list.json
@@ -46,80 +46,81 @@
   "batchDeletion": "批量删除",
   "batchEmptySelectedFormsTips": "请选择要删除的表单",
   "batchFormsDeleteTips": "确定要删除选中的表单吗？",
-  "promotion": "推广",
-  "submirSuccess": "提交成功页",
-  "writeSet": "填写设置",
-  "export": "导出",
-  "detail": "详情",
-  "more": "更多",
+  "promotion":"推广",
+  "submirSuccess":"提交成功页",
+  "writeSet":"填写设置",
+  "export":"导出",
+  "detail":"详情",
+  "more":"更多",
 
-  "formPromotion": "表单推广",
-  "promoteUrl": "推广链接",
-  "downLoadQRCode": "下载二维码",
-  "configureFailed": "配置失败",
+  "formPromotion":"表单推广",
+  "promoteUrl":"推广链接",
+  "downLoadQRCode":"下载二维码",
+  "configureFailed":"配置失败",
 
-  "writeSuccess": "填写成功",
-  "viewFillingDetails": "查看填写详情",
-  "finish": "完成",
-  "finishTips": "点击后进入首页",
-  "back": "返回",
-  "backTips": "点击后返回表单",
-  "afterSubmission": "填表人提交后",
-  "displayTextMessages": "显示文字消息",
-  "displayTextMessagesTips": "提交后页面显示文字信息。",
-  "promptText": "提示文字",
-  "defaultPrompt": "默认提示",
-  "defaultPromptTips": "将显示： 填写成功",
-  "diyPrompt": "自定义提示",
-  "tipsTextPlaceholder": "感谢你的填写",
-  "subsequentPperationButtons": "后续操作按钮",
+  "writeSuccess":"填写成功",
+  "viewFillingDetails":"查看填写详情",
+  "finish":"完成",
+  "finishTips":"点击后进入首页",
+  "back":"返回",
+  "backTips":"点击后返回表单",
+  "afterSubmission":"填表人提交后",
+  "displayTextMessages":"显示文字消息",
+  "displayTextMessagesTips":"提交后页面显示文字信息。",
+  "promptText":"提示文字",
+  "defaultPrompt":"默认提示",
+  "defaultPromptTips":"将显示： 填写成功",
+  "diyPrompt":"自定义提示",
+  "tipsTextPlaceholder":"感谢你的填写",
+  "subsequentPperationButtons":"后续操作按钮",
 
-  "validityPeriodOfVoucher": "凭证有效期",
-  "noLimit": "不限制",
-  "specifyTime": "设置固定有效期",
-  "specifyTimeTips": "每条记录的凭证有效期都是一样的，例如：会议凭证可设置有效期为会议举行时间。",
-  "submissionTime": "按提交时间设置有效期",
-  "submissionTimeTips": "每条记录的凭证有效期按照提交时间来计算，例如：优惠凭证的有效期可以设置为领取后3天内有效。",
-  "afterSubmissionRecords": "提交记录后",
-  "effective": "有效",
+  "validityPeriodOfVoucher":"凭证有效期",
+  "noLimit":"不限制",
+  "specifyTime":"设置固定有效期",
+  "specifyTimeTips":"每条记录的凭证有效期都是一样的，例如：会议凭证可设置有效期为会议举行时间。",
+  "submissionTime":"按提交时间设置有效期",
+  "submissionTimeTips":"每条记录的凭证有效期按照提交时间来计算，例如：优惠凭证的有效期可以设置为领取后3天内有效。",
+  "afterSubmissionRecords":"提交记录后",
+  "effective":"有效",
 
-  "voucherStyle": "凭证样式",
-  "titleAboveTheCode": "码上方标题",
-  "titleAboveTheCodePlaceholder": "请妥善保存你的核销凭证",
-  "contentAboveTheCode": "码上方内容",
-  "contentAboveTheCodePlaceholder": "请输入码上方内容",
-  "addLinefeeds": "添加换行符",
-  "addFields": "添加字段",
-  "contentBelowTheCode": "码下方内容",
-  "submissionRecordTime": "展示提交记录时间",
-  "currentTime": "展示当前时间",
-  "currentTimeTips": "会以秒进行跳动，可起到防作假的功能",
-  "voucherDeadline": "展示凭证截止时间",
-  "saveVoucher": "支持填表人保存凭证",
-  "dispalyPromptText": "展示提示文字",
+  "voucherStyle":"凭证样式",
+  "titleAboveTheCode":"码上方标题",
+  "titleAboveTheCodePlaceholder":"请妥善保存你的核销凭证",
+  "contentAboveTheCode":"码上方内容",
+  "contentAboveTheCodePlaceholder":"请输入码上方内容",
+  "addLinefeeds":"添加换行符",
+  "addFields":"添加字段",
+  "contentBelowTheCode":"码下方内容",
+  "submissionRecordTime":"展示提交记录时间",
+  "currentTime":"展示当前时间",
+  "currentTimeTips":"会以秒进行跳动，可起到防作假的功能",
+  "voucherDeadline":"展示凭证截止时间",
+  "saveVoucher":"支持填表人保存凭证",
+  "dispalyPromptText":"展示提示文字",
 
-  "diy": "自定义",
-  "apieceFillQuantity": "每人可填写次数",
-  "fillQuantityTotal": "表单可填写总数",
-  "writeTips": "填写限制的校验在极端情况下可能存在延时，从而导致限制失效，不建议商品限时抢购等场景使用该功能",
-  "fillInTheTimePeriod": "可填写时间段",
-  "setSpecifyTime": "设置开始/停止时间",
-  "openDayTime": "设置每日开启时间",
-  "timeLimitRuleOne": "开始/停止时间不能为空",
-  "timeLimitRuleTwo": "开启时间不能为空",
-  "timeLimitRuleThree": "开始时间不能等于结束时间",
-  "numCannotNull": "次数不能为空",
+  "diy":"自定义",
+  "apieceFillQuantity":"每人可填写次数",
+  "fillQuantityTotal":"表单可填写总数",
+  "writeTips":"填写限制的校验在极端情况下可能存在延时，从而导致限制失效，不建议商品限时抢购等场景使用该功能",
+  "fillInTheTimePeriod":"可填写时间段",
+  "setSpecifyTime":"设置开始/停止时间",
+  "openDayTime":"设置每日开启时间",
+  "timeLimitRuleOne":"开始/停止时间不能为空",
+  "timeLimitRuleTwo":"开启时间不能为空",
+  "timeLimitRuleThree":"开始时间不能等于结束时间",
+  "numCannotNull":"次数不能为空",
 
-  "dataAndStatistics": "数据与统计",
-  "detailData": "明细数据",
-  "fillInFormPerson": "填表人",
-  "fillInFormPersonplaceholder": "请输入填表人",
-  "fillInFormDate": "填表时间",
-  "fillInFormPersonInfo": "填表人信息",
-  "fillInFormPersonStatics": "填表人统计",
-  "fillInFormTotal": "总计(表单填写数)",
-  "fieldStatistics": "字段统计",
-  "viewInformation": "查看信息",
+  "dataAndStatistics":"数据与统计",
+  "detailData":"明细数据",
+  "fillInFormPerson":"填表人",
+  "fillInFormPersonplaceholder":"请输入填表人",
+  "fillInFormDate":"填表时间",
+  "fillInFormPersonInfo":"填表人信息",
+  "fillInFormPersonStatics":"填表人统计",
+  "fillInFormTotal":"总计(表单填写数)",
+  "fieldStatistics":"字段统计",
+  "viewInformation":"查看信息",
+
+  "deleteTips":"确定删除该条数据吗"
 
-  "deleteTips": "确定删除该条数据吗"
 }
diff --git a/admin/src/app/lang/zh-cn/finance.account.json b/admin/src/app/lang/zh-cn/finance.account.json
index d77f14e4..30391806 100644
--- a/admin/src/app/lang/zh-cn/finance.account.json
+++ b/admin/src/app/lang/zh-cn/finance.account.json
@@ -1,27 +1,27 @@
 {
-  "id": "主键",
-  "accountDetail": "账单详情",
-  "detail": "详情",
-  "type": "账单类型",
-  "money": "账单金额",
-  "moneyPlaceholder": "请输入账单金额",
-  "tradeNo": "账单编号",
-  "tradeNoPlaceholder": "请输入账单编号",
-  "createTime": "账单日期",
-  "totalPay": "累计收款（元）",
-  "totalRefund": "累计退款（元）",
-  "totalTransfer": "累计转账（元）",
-  "accountType": "请选择账单类型",
-  "startDate": "开始时间",
-  "endDate": "结束时间",
-  "transferNo": "转账单号",
-  "transferTime": "转账时间",
-  "transferType": "转账类型",
-  "transferMoney": "转账金额",
-  "transferRemark": "转账说明",
-  "outTradeNo": "单号",
-  "refundMoney": "退款金额",
-  "failReason": "退款说明",
-  "body": "说明",
-  "all": "全部"
+    "id":"主键",
+    "accountDetail":"账单详情",
+    "detail":"详情",
+    "type":"账单类型",
+    "money":"账单金额",
+    "moneyPlaceholder":"请输入账单金额",
+    "tradeNo":"账单编号",
+    "tradeNoPlaceholder":"请输入账单编号",
+    "createTime":"账单日期",
+    "totalPay":"累计收款（元）",
+    "totalRefund":"累计退款（元）",
+    "totalTransfer":"累计转账（元）",
+	"accountType": "请选择账单类型",
+	"startDate": "开始时间",
+	"endDate": "结束时间",
+	"transferNo" : "转账单号",
+	"transferTime": "转账时间",
+	"transferType": "转账类型",
+	"transferMoney": "转账金额",
+	"transferRemark": "转账说明",
+	"outTradeNo": "单号",
+	"refundMoney": "退款金额",
+	"failReason": "退款说明",
+	"body": "说明",
+	"all": "全部"
 }
diff --git a/admin/src/app/lang/zh-cn/finance.cash_out.json b/admin/src/app/lang/zh-cn/finance.cash_out.json
index eccfc2cb..46d5a053 100644
--- a/admin/src/app/lang/zh-cn/finance.cash_out.json
+++ b/admin/src/app/lang/zh-cn/finance.cash_out.json
@@ -1,64 +1,64 @@
 {
-  "orderNo": "订单编号",
-  "orderStatus": "订单状态",
-  "orderNoPlaceholder": "请输入订单编号",
-  "createTime": "创建时间",
-  "rechargeMoney": "充值金额",
-  "totalTransfered": "累计提现（元）",
-  "totalCashOuting": "提现中（元）",
-  "transfered": "累计提现",
-  "cashOuting": "提现中",
-  "orderMoney": "订单金额",
-  "member": "买家",
-  "orderFromName": "订单来源",
-  "payTypeName": "支付方式",
-  "startDate": "开始时间",
-  "endDate": "结束时间",
-  "namePlaceholder": "请选择",
-  "applyTime": "申请时间",
-  "cashOutStatus": "提现状态",
-  "actualTransferAmount": "实际转账金额",
-  "cashOutCommission": "提现手续费",
-  "applicationForWithdrawalAmount": "申请提现金额",
-  "cashOutMethod": "提现方式",
-  "cashOutAccountType": "会员账户",
-  "memberInfo": "会员信息",
-  "toBeReviewed": "待审核",
-  "toBeTransferred": "待转账",
-  "transferred": "已转账",
-  "turnDown": "拒绝",
-  "transfer": "转账",
-  "detail": "详情",
-  "auditFailure": "审核失败",
-  "successfulAudit": "审核成功",
-  "rejectionAudit": "拒绝审核",
-  "reasonsRefusal": "拒绝理由",
-  "reasonsRefusalPlaceholder": "请输入拒绝理由",
-  "isTransfer": "是否确认转账",
-  "nickname": "会员名称",
-  "headimg": "会员头像",
-  "cashOutDetail": "提现详情",
-  "cashOutMoney": "转账金额",
-  "auditTime": "审核时间",
-  "transferTime": "转账时间",
-  "memberInfoPlaceholder": "请输入会员名称/会员昵称/手机号",
-  "cashOutNumber": "提现单号",
-  "cashOutNumberPlaceholder": "请输入提现单号",
-  "alipayAccount": "支付宝账号",
-  "bankName": "银行名称",
-  "bankAccount": "银行卡号",
-  "cashOutInfo": "收款方信息",
-  "transferCode": "收款码",
-  "realname": "真实姓名",
-  "account": "账号",
-  "bankRealname": "持卡人姓名",
-  "remark": "备注",
-  "remarkPlaceholder": "请输入备注",
-  "passAudit": "通过审核",
-  "transferVoucher": "转账凭证",
-  "transferVoucherPlaceholder": "请上传转账凭证",
-  "transferRemark": "转账补充说明",
-  "transferRemarkPlaceholder": "请输入转账补充说明",
-  "notes": "备注",
-  "check": "检查打款进度"
+	"orderNo": "订单编号",
+	"orderStatus": "订单状态",
+	"orderNoPlaceholder": "请输入订单编号",
+	"createTime": "创建时间",
+	"rechargeMoney": "充值金额",
+	"totalTransfered": "累计提现（元）",
+	"totalCashOuting": "提现中（元）",
+	"transfered": "累计提现",
+	"cashOuting": "提现中",
+	"orderMoney": "订单金额",
+	"member": "买家",
+	"orderFromName": "订单来源",
+	"payTypeName": "支付方式",
+	"startDate": "开始时间",
+	"endDate": "结束时间",
+	"namePlaceholder": "请选择",
+	"applyTime": "申请时间",
+	"cashOutStatus": "提现状态",
+	"actualTransferAmount": "实际转账金额",
+	"cashOutCommission": "提现手续费",
+	"applicationForWithdrawalAmount": "申请提现金额",
+	"cashOutMethod": "提现方式",
+	"cashOutAccountType": "会员账户",
+	"memberInfo": "会员信息",
+	"toBeReviewed": "待审核",
+	"toBeTransferred": "待转账",
+	"transferred": "已转账",
+	"turnDown": "拒绝",
+	"transfer": "转账",
+	"detail": "详情",
+	"auditFailure": "审核失败",
+	"successfulAudit": "审核成功",
+	"rejectionAudit": "拒绝审核",
+	"reasonsRefusal": "拒绝理由",
+	"reasonsRefusalPlaceholder": "请输入拒绝理由",
+	"isTransfer": "是否确认转账",
+	"nickname": "会员名称",
+	"headimg": "会员头像",
+	"cashOutDetail": "提现详情",
+	"cashOutMoney": "转账金额",
+	"auditTime": "审核时间",
+	"transferTime": "转账时间",
+	"memberInfoPlaceholder": "请输入会员名称/会员昵称/手机号",
+	"cashOutNumber": "提现单号",
+	"cashOutNumberPlaceholder": "请输入提现单号",
+	"alipayAccount": "支付宝账号",
+	"bankName": "银行名称",
+	"bankAccount": "银行卡号",
+	"cashOutInfo":"收款方信息",
+	"transferCode":"收款码",
+	"realname":"真实姓名",
+	"account":"账号",
+	"bankRealname":"持卡人姓名",
+	"remark":"备注",
+	"remarkPlaceholder":"请输入备注",
+	"passAudit":"通过审核",
+	"transferVoucher":"转账凭证",
+	"transferVoucherPlaceholder":"请上传转账凭证",
+	"transferRemark":"转账补充说明",
+	"transferRemarkPlaceholder":"请输入转账补充说明",
+	"notes":"备注",
+	"check":"检查打款进度"
 }
diff --git a/admin/src/app/lang/zh-cn/finance.offlinepay.json b/admin/src/app/lang/zh-cn/finance.offlinepay.json
index 8953ac8a..edfd9115 100644
--- a/admin/src/app/lang/zh-cn/finance.offlinepay.json
+++ b/admin/src/app/lang/zh-cn/finance.offlinepay.json
@@ -1,18 +1,18 @@
 {
-  "money": "支付金额",
-  "outTradeNo": "交易流水号",
-  "voucher": "支付凭证",
-  "body": "支付内容",
-  "pass": "通过",
-  "refuse": "拒绝",
-  "refuseReason": "拒绝原因",
-  "passTips": "确认要通过该支付单据吗？",
-  "startDate": "开始时间",
-  "endDate": "结束时间",
-  "outTradeNoPlaceholder": "请输入交易流水号",
-  "detail": "详情",
-  "waitAudit": "待审核",
-  "passed": "已通过",
-  "notPass": "未通过",
-  "all": "全部"
+    "money":"支付金额",
+    "outTradeNo": "交易流水号",
+    "voucher": "支付凭证",
+    "body": "支付内容",
+    "pass": "通过",
+    "refuse": "拒绝",
+    "refuseReason": "拒绝原因",
+    "passTips": "确认要通过该支付单据吗？",
+    "startDate": "开始时间",
+	"endDate": "结束时间",
+    "outTradeNoPlaceholder":"请输入交易流水号",
+    "detail": "详情",
+    "waitAudit": "待审核",
+    "passed": "已通过",
+    "notPass": "未通过",
+    "all": "全部"
 }
diff --git a/admin/src/app/lang/zh-cn/finance.pay_detail.json b/admin/src/app/lang/zh-cn/finance.pay_detail.json
index c4d46cd2..9af723cb 100644
--- a/admin/src/app/lang/zh-cn/finance.pay_detail.json
+++ b/admin/src/app/lang/zh-cn/finance.pay_detail.json
@@ -1,18 +1,18 @@
 {
-  "pass": "通过",
-  "refuse": "拒绝",
-  "refuseReason": "拒绝原因",
-  "passTips": "确认要通过该支付单据吗？",
-  "outTradeNo": "交易单号",
-  "createTime": "交易时间",
-  "money": "交易金额",
-  "body": "交易内容",
-  "channel": "支付场景",
-  "payStatus": "支付状态",
-  "payType": "支付方式",
-  "payTime": "支付时间",
-  "failTime": "失败时间",
-  "failReason": "失败原因",
-  "voucher": "支付凭证",
-  "auditVoucher": "审核支付凭证"
+    "pass": "通过",
+    "refuse": "拒绝",
+    "refuseReason": "拒绝原因",
+    "passTips": "确认要通过该支付单据吗？",
+    "outTradeNo": "交易单号",
+    "createTime": "交易时间",
+    "money": "交易金额",
+    "body": "交易内容",
+    "channel": "支付场景",
+    "payStatus": "支付状态",
+    "payType": "支付方式",
+    "payTime": "支付时间",
+    "failTime": "失败时间",
+    "failReason": "失败原因",
+    "voucher": "支付凭证",
+    "auditVoucher": "审核支付凭证"
 }
diff --git a/admin/src/app/lang/zh-cn/finance.pay_refund.json b/admin/src/app/lang/zh-cn/finance.pay_refund.json
index 987b9a7d..df399cbf 100644
--- a/admin/src/app/lang/zh-cn/finance.pay_refund.json
+++ b/admin/src/app/lang/zh-cn/finance.pay_refund.json
@@ -1,16 +1,16 @@
 {
-  "refundNo": "退款编号",
-  "refundMoney": "退款金额",
-  "payType": "支付类型",
-  "status": "退款状态",
-  "createTime": "申请时间",
-  "refundNoPlaceholder": "请输入退款编号",
-  "startDate": "开始时间",
-  "endDate": "结束时间",
-  "outTradeNo": "交易流水号",
-  "refundTypeName": "退款方式",
-  "statusName": "退款状态",
-  "transfer": "转账",
-  "transferType": "转账方式",
-  "voucher": "凭证"
-}
+	"refundNo": "退款编号",
+	"refundMoney": "退款金额",
+	"payType": "支付类型",
+	"status": "退款状态",
+	"createTime": "申请时间",
+	"refundNoPlaceholder": "请输入退款编号",
+	"startDate": "开始时间",
+    "endDate": "结束时间",
+	"outTradeNo": "交易流水号",
+	"refundTypeName": "退款方式",
+	"statusName": "退款状态",
+	"transfer": "转账",
+	"transferType": "转账方式",
+	"voucher": "凭证"
+}	
diff --git a/admin/src/app/lang/zh-cn/finance.refund_detail.json b/admin/src/app/lang/zh-cn/finance.refund_detail.json
index 987b9a7d..a3c072a5 100644
--- a/admin/src/app/lang/zh-cn/finance.refund_detail.json
+++ b/admin/src/app/lang/zh-cn/finance.refund_detail.json
@@ -1,16 +1,16 @@
 {
-  "refundNo": "退款编号",
-  "refundMoney": "退款金额",
-  "payType": "支付类型",
-  "status": "退款状态",
-  "createTime": "申请时间",
-  "refundNoPlaceholder": "请输入退款编号",
-  "startDate": "开始时间",
-  "endDate": "结束时间",
-  "outTradeNo": "交易流水号",
-  "refundTypeName": "退款方式",
-  "statusName": "退款状态",
-  "transfer": "转账",
-  "transferType": "转账方式",
-  "voucher": "凭证"
-}
+	"refundNo": "退款编号",
+	"refundMoney": "退款金额",
+	"payType": "支付类型",
+	"status": "退款状态",
+	"createTime": "申请时间",
+	"refundNoPlaceholder": "请输入退款编号",
+	"startDate": "开始时间",
+	"endDate": "结束时间",
+	"outTradeNo": "交易流水号",
+	"refundTypeName": "退款方式",
+	"statusName": "退款状态",
+	"transfer": "转账",
+	"transferType": "转账方式",
+	"voucher": "凭证"
+}	
diff --git a/admin/src/app/lang/zh-cn/future_ontent.future_ontent.json b/admin/src/app/lang/zh-cn/future_ontent.future_ontent.json
new file mode 100644
index 00000000..93d37a7b
--- /dev/null
+++ b/admin/src/app/lang/zh-cn/future_ontent.future_ontent.json
@@ -0,0 +1,27 @@
+{
+      "title":"课程标题",
+      "titlePlaceholder":"请输入课程标题",
+      "image":"预览图",
+      "imagePlaceholder":"请输入预览图",
+      "type":"素材类型",
+      "typePlaceholder":"请输入素材类型",
+      "content":"课程内容",
+      "contentPlaceholder":"请输入课程内容",
+      "status":"状态",
+      "statusPlaceholder":"请输入状态",
+      "createTime":"创建时间",
+      "createTimePlaceholder":"请输入创建时间",
+      "updateTime":"修改时间",
+      "updateTimePlaceholder":"请输入修改时间",
+      "userPermission":"用户权限",
+      "userPermissionPlaceholder":"请输入用户权限",
+      "addLessonCourseTeaching":"添加训练内容",
+      "updateLessonCourseTeaching":"编辑训练内容",
+      "lessonCourseTeachingDeleteTips":"确定要删除该数据吗？",
+      "startDate":"请选择开始时间",
+      "endDate":"请选择结束时间",
+      "addJumpLessonLibrary":"添加训练视频",
+      "updateJumpLessonLibrary":"编辑训练视频",
+      "addEnTeachingLibrary":"添加课后作业",
+      "editEnTeachingLibrary":"编辑课后作业"
+}
diff --git a/admin/src/app/lang/zh-cn/index.app_manage.json b/admin/src/app/lang/zh-cn/index.app_manage.json
index f7843cd9..43119f8b 100644
--- a/admin/src/app/lang/zh-cn/index.app_manage.json
+++ b/admin/src/app/lang/zh-cn/index.app_manage.json
@@ -5,6 +5,6 @@
   "descriptionRight": "安装使用",
   "niucloud": "Niucloud官网",
   "appStore": "安装应用",
-  "versionInfo": "版本信息:",
-  "currentVersion": "当前版本"
-}
+  "versionInfo":"版本信息:",
+  "currentVersion":"当前版本"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/index.index.json b/admin/src/app/lang/zh-cn/index.index.json
index 5925f5db..2c7889e4 100644
--- a/admin/src/app/lang/zh-cn/index.index.json
+++ b/admin/src/app/lang/zh-cn/index.index.json
@@ -1,53 +1,53 @@
 {
-  "dataSummarize": "数据概况",
-  "todayData": "今日数据",
-  "memberNumb": "新增会员数",
-  "orderMoney": "订单金额",
-  "numberOfSites": "站点数量",
-  "numberOfVisitors": "今日访客数",
-  "commonlyUsedFunction": "常用功能",
-  "articleList": "文章列表",
-  "memberManagement": "会员管理",
-  "balanceAccount": "余额账户",
-  "administrator": "站点用户",
-  "WebDecoration": "网站装修",
-  "accessMessage": "访问消息",
-  "memberDistribution": "会员分布",
-  "systemInfo": "系统环境",
-  "os": "操作系统:",
-  "phpVersions": "PHP版本号:",
-  "productionEnvironment": "生产环境:",
-  "versionsInfo": "版本信息",
-  "versions": "当前版本",
-  "frame": "基于框架",
-  "channel": "获取渠道",
-  "serviceSupport": "官方客服",
-  "officialWbsite": "官网",
-  "pageView": "访问量",
-  "siteInfo": "站点信息",
-  "siteName": "站点名称",
-  "groupName": "站点套餐",
-  "expireTime": "过期时间",
-  "permanent": "永久",
-  "statusName": "站点状态",
-  "newSiteSum": "新增站点数",
-  "total": "总计",
-  "newMemberSum": "新增用户数",
-  "siteList": "站点列表",
-  "sitePackage": "站点套餐",
-  "newSite": "新增站点",
-  "appMarketplace": "应用市场",
-  "siteDistribution": "站点分布",
-  "addUser": "新增用户",
-  "normalSiteSum": "正常站点（个）",
-  "weekExpireSiteCount": "即将到期站点(个)",
-  "expireSiteSum": "过期站点（个）",
-  "noInstallAppSun": "未安装应用（个）",
-  "installAppSun": "已安装应用（个）",
-  "officialAccount": "Niucloud官方公众号",
-  "officialAccountDesc": "微信扫码关注",
-  "WeCom": "客服二维码",
-  "WeComDesc": "扫码联系客服",
-  "tel": "服务热线：",
-  "newVersion": "最新版本"
+	"dataSummarize": "数据概况",
+    "todayData": "今日数据",
+    "memberNumb": "新增会员数",
+    "orderMoney": "订单金额",
+    "numberOfSites": "站点数量",
+    "numberOfVisitors": "今日访客数",
+    "commonlyUsedFunction": "常用功能",
+    "articleList": "文章列表",
+    "memberManagement": "会员管理",
+    "balanceAccount": "余额账户",
+    "administrator": "站点用户",
+    "WebDecoration": "网站装修",
+    "accessMessage": "访问消息",
+    "memberDistribution": "会员分布",
+    "systemInfo": "系统环境",
+    "os": "操作系统:",
+    "phpVersions": "PHP版本号:",
+    "productionEnvironment": "生产环境:",
+    "versionsInfo": "版本信息",
+    "versions": "当前版本",
+    "frame": "基于框架",
+    "channel": "获取渠道",
+    "serviceSupport": "官方客服",
+    "officialWbsite": "官网",
+    "pageView": "访问量",
+    "siteInfo":"站点信息",
+    "siteName":"站点名称",
+    "groupName":"站点套餐",
+    "expireTime":"过期时间",
+    "permanent":"永久",
+    "statusName":"站点状态",
+	"newSiteSum": "新增站点数",
+	"total": "总计",
+	"newMemberSum": "新增用户数",
+	"siteList": "站点列表",
+	"sitePackage": "站点套餐",
+	"newSite": "新增站点",
+	"appMarketplace": "应用市场",
+	"siteDistribution": "站点分布",
+	"addUser": "新增用户",
+	"normalSiteSum": "正常站点（个）",
+    "weekExpireSiteCount":"即将到期站点(个)",
+	"expireSiteSum": "过期站点（个）",
+	"noInstallAppSun": "未安装应用（个）",
+	"installAppSun": "已安装应用（个）",
+	"officialAccount": "Niucloud官方公众号",
+	"officialAccountDesc": "微信扫码关注",
+	"WeCom": "客服二维码",
+	"WeComDesc": "扫码联系客服",
+	"tel": "服务热线：",
+    "newVersion": "最新版本"
 }
diff --git a/admin/src/app/lang/zh-cn/index.preview.json b/admin/src/app/lang/zh-cn/index.preview.json
index c82b1247..b706dee1 100644
--- a/admin/src/app/lang/zh-cn/index.preview.json
+++ b/admin/src/app/lang/zh-cn/index.preview.json
@@ -9,4 +9,4 @@
   "developTitle": "开发环境配置",
   "wapDomain": "wap域名（WAP_DOMAIN）",
   "wapDomainPlaceholder": "请输入wap域名"
-}
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/index.site_index.json b/admin/src/app/lang/zh-cn/index.site_index.json
index 5c30985a..8c5a36f7 100644
--- a/admin/src/app/lang/zh-cn/index.site_index.json
+++ b/admin/src/app/lang/zh-cn/index.site_index.json
@@ -1,67 +1,67 @@
 {
-  "todayData": "实时概况",
-  "memberNumb": "新增会员数（人）",
-  "orderMoney": "订单金额（元）",
-  "numberOfSites": "站点数量",
-  "numberOfVisitors": "今日访客数（人）",
-  "commonlyUsedFunction": "常用功能",
-  "articleList": "文章列表",
-  "memberManagement": "会员管理",
-  "balanceAccount": "余额账户",
-  "administrator": "管理员",
-  "WebDecoration": "网站装修",
-  "accessMessage": "访问消息",
-  "memberDistribution": "会员分布",
-  "systemInfo": "系统环境",
-  "os": "操作系统",
-  "phpVersions": "PHP版本号",
-  "productionEnvironment": "生产环境",
-  "versionsInfo": "版本信息",
-  "versions": "当前版本",
-  "frame": "基于框架",
-  "channel": "获取渠道",
-  "serviceSupport": "服务支持",
-  "officialWbsite": "官网",
-  "pageView": "访客数（人）",
-  "siteInfo": "站点信息",
-  "siteName": "站点名称",
-  "groupName": "站点套餐",
-  "expireTime": "过期时间",
-  "permanent": "永久",
-  "statusName": "站点状态",
-  "orderNumber": "订单数（笔）",
-  "wechatCode": "公众号二维码",
-  "wechatCodeDesc": "微信扫码关注",
-  "enterpriseWechatCode": "客服二维码",
-  "enterpriseWechatCodeDesc": "扫码联系客服",
-  "tel": "服务热线：",
-  "message": "请联系客服",
-  "messageTitle": "提示",
-  "accumulative": "累计",
-  "officialAccount": "Niucloud官方公众号",
-  "officialAccountDesc": "微信扫码关注",
-  "WeCom": "添加企业微信群",
-  "path": "地址",
-  "menuName": "名称",
-  "menuNamePlaceholder": "模版名称",
-  "menuBgColor": "背景颜色",
-  "menuImg": "选择图标",
-  "menuDesc": "描述",
-  "addShortcutMenu": "添加快捷模版",
-  "appTemplate": "应用模块",
-  "siteType": "站点类型",
-  "periodTime": "有效期",
-  "renew": "续费",
-  "selectModel": "选择模块",
-  "addMenu": "添加模块",
-  "shortcutLink": "模版",
-  "emptyMenu": "暂无快捷模块",
-  "select": "选择",
-  "custom": "自定义",
-  "accessSite": "访问站点",
-  "pathSelect": "选择模块",
-  "bgColorPlaceholder": "请选择背景色",
-  "iconPlaceholder": "请选择图标",
-  "pathPlaceholder": "请选择链接",
-  "descPlaceholder": "输入描述语…"
-}
+    "todayData": "实时概况",
+    "memberNumb": "新增会员数（人）",
+    "orderMoney": "订单金额（元）",
+    "numberOfSites": "站点数量",
+    "numberOfVisitors": "今日访客数（人）",
+    "commonlyUsedFunction": "常用功能",
+    "articleList": "文章列表",
+    "memberManagement": "会员管理",
+    "balanceAccount": "余额账户",
+    "administrator": "管理员",
+    "WebDecoration": "网站装修",
+    "accessMessage": "访问消息",
+    "memberDistribution": "会员分布",
+    "systemInfo": "系统环境",
+    "os": "操作系统",
+    "phpVersions": "PHP版本号",
+    "productionEnvironment": "生产环境",
+    "versionsInfo": "版本信息",
+    "versions": "当前版本",
+    "frame": "基于框架",
+    "channel": "获取渠道",
+    "serviceSupport": "服务支持",
+    "officialWbsite": "官网",
+    "pageView": "访客数（人）",
+    "siteInfo":"站点信息",
+    "siteName":"站点名称",
+    "groupName":"站点套餐",
+    "expireTime":"过期时间",
+    "permanent":"永久",
+    "statusName":"站点状态",
+	"orderNumber": "订单数（笔）",
+	"wechatCode": "公众号二维码",
+	"wechatCodeDesc": "微信扫码关注",
+	"enterpriseWechatCode": "客服二维码",
+	"enterpriseWechatCodeDesc": "扫码联系客服",
+	"tel": "服务热线：",
+	"message": "请联系客服",
+	"messageTitle": "提示",
+	"accumulative":"累计",
+	"officialAccount": "Niucloud官方公众号",
+	"officialAccountDesc": "微信扫码关注",
+	"WeCom": "添加企业微信群",
+	"path": "地址",
+	"menuName": "名称",
+	"menuNamePlaceholder": "模版名称",
+	"menuBgColor": "背景颜色",
+	"menuImg": "选择图标",
+	"menuDesc": "描述",
+	"addShortcutMenu": "添加快捷模版",
+	"appTemplate": "应用模块",
+	"siteType": "站点类型",
+	"periodTime": "有效期",
+	"renew": "续费",
+	"selectModel": "选择模块",
+	"addMenu": "添加模块",
+	"shortcutLink": "模版",
+	"emptyMenu": "暂无快捷模块",
+	"select": "选择",
+	"custom": "自定义",
+	"accessSite": "访问站点",
+	"pathSelect": "选择模块",
+	"bgColorPlaceholder": "请选择背景色",
+	"iconPlaceholder": "请选择图标",
+	"pathPlaceholder": "请选择链接",
+	"descPlaceholder": "输入描述语…"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/index.store.json b/admin/src/app/lang/zh-cn/index.store.json
index 04f01165..906a50b0 100644
--- a/admin/src/app/lang/zh-cn/index.store.json
+++ b/admin/src/app/lang/zh-cn/index.store.json
@@ -1,76 +1,76 @@
 {
-  "search": "搜索应用名称",
-  "appName": "应用名/版本信息",
-  "introduction": "简介",
-  "type": "类型",
-  "app": "应用",
-  "addon": "插件",
-  "noPlug": "暂无应用",
-  "install": "安装",
-  "unload": "卸载",
-  "installLabel": "已安装",
-  "uninstalledLabel": "未安装",
-  "version": "版本",
-  "title": "名称",
-  "desc": "简介",
-  "plugDetail": "插件信息",
-  "author": "作者",
-  "detail": "详情",
-  "addonInstall": "插件安装",
-  "dirPermission": "目录读写权限",
-  "path": "路径",
-  "demand": "要求",
-  "readable": "可读",
-  "write": "可写",
-  "packageManageTool": "包管理工具",
-  "name": "名称",
-  "addonInstallSuccess": "插件安装成功",
-  "envCheck": "环境检查",
-  "installProgress": "安装进度",
-  "installComplete": "安装完成",
-  "localAppText": "插件管理",
-  "marketAppText": "官方市场",
-  "installShowDialogCloseTips": "安装任务尚未完成，关闭将取消安装任务，是否要继续关闭？",
-  "marketDevelopMessage": "官方市场正在开发中！",
-  "jobError": "任务队列未启动 请在服务端源码部署目录打开终端执行 php think queue:listen",
-  "conflictFiles": "冲突文件",
-  "process": "启动进程",
-  "open": "开启",
-  "down": "下载",
-  "installDown": "未安装(重新下载)",
-  "unloadDown": "已安装(重新下载)",
-  "addonVersion": "插件版本",
-  "versionCode": "版本号",
-  "createTime": "发布时间",
-  "buyLabel": "已购买",
-  "installTips": "安装后需手动更新插件引用的依赖和编译各个端口的前端源码",
-  "localInstall": "本地安装",
-  "cloudInstall": "一键云安装",
-  "cloudInstallTips": "云安装可实现一键安装，安装后无需手动更新依赖和编译前端源码",
-  "installingTips": "有插件正在安装中请等待安装完成之后再进行其他操作，点击查看",
-  "installPercent": "安装进度",
-  "downloading": "下载中",
-  "authTips": "云安装需先绑定授权码，如果已有授权请先进行绑定，没有授权可到niucloud官网购买云服务之后再进行操作",
-  "toBind": "绑定授权",
-  "toNiucloud": "去niucloud官网",
-  "descriptionLeft": "暂无任何应用，马上去",
-  "buyDescriptionLeft": "您还没有购买过应用，马上去",
-  "link": "官方应用市场",
-  "descriptionRight": "逛逛",
-  "installed-empty": "暂未安装任何应用",
-  "siteAddressTips": "授权域名不匹配",
-  "authCodePlaceholder": "请输入授权码",
-  "authSecretPlaceholder": "请输入授权秘钥",
-  "updateCode": "重新绑定",
-  "notHaveAuth": "还没有授权？去购买",
-  "authInfoTips": "授权码和授权秘钥可在Niucloud官网我的授权 授权详情中查看",
-  "addonUninstall": "插件卸载",
-  "appIdentification": "应用标识",
-  "tipText": "标识指开发应用或插件的文件夹名称",
-  "uninstallTips": "是否要卸载该插件？",
-  "upgrade": "升级",
-  "newVersion": "最新版本",
-  "cloudBuild": "云编译",
-  "cloudBuildTips": "是否要进行云编译该操作可能会影响到正在访问的客户是否要继续操作？",
-  "deleteAddonTips": "删除插件会把插件目录连同文件全部删除，确定要删除吗？"
+	"search":"搜索应用名称",
+	"appName":"应用名/版本信息",
+	"introduction":"简介",
+	"type":"类型",
+	"app":"应用",
+	"addon":"插件",
+	"noPlug":"暂无应用",
+	"install":"安装",
+	"unload":"卸载",
+	"installLabel":"已安装",
+	"uninstalledLabel":"未安装",
+	"version":"版本",
+	"title":"名称",
+	"desc":"简介",
+	"plugDetail": "插件信息",
+	"author":  "作者",
+	"detail":"详情",
+	"addonInstall": "插件安装",
+	"dirPermission": "目录读写权限",
+	"path": "路径",
+	"demand": "要求",
+	"readable": "可读",
+	"write": "可写",
+	"packageManageTool": "包管理工具",
+	"name": "名称",
+	"addonInstallSuccess": "插件安装成功",
+	"envCheck": "环境检查",
+	"installProgress": "安装进度",
+	"installComplete": "安装完成",
+	"localAppText":"插件管理",
+	"marketAppText":"官方市场",
+	"installShowDialogCloseTips": "安装任务尚未完成，关闭将取消安装任务，是否要继续关闭？",
+	"marketDevelopMessage":"官方市场正在开发中！",
+	"jobError": "任务队列未启动 请在服务端源码部署目录打开终端执行 php think queue:listen",
+	"conflictFiles": "冲突文件",
+	"process": "启动进程",
+	"open": "开启",
+	"down": "下载",
+	"installDown":"未安装(重新下载)",
+	"unloadDown":"已安装(重新下载)",
+	"addonVersion": "插件版本",
+	"versionCode": "版本号",
+	"createTime": "发布时间",
+	"buyLabel": "已购买",
+	"installTips": "安装后需手动更新插件引用的依赖和编译各个端口的前端源码",
+	"localInstall":"本地安装",
+	"cloudInstall": "一键云安装",
+	"cloudInstallTips": "云安装可实现一键安装，安装后无需手动更新依赖和编译前端源码",
+	"installingTips": "有插件正在安装中请等待安装完成之后再进行其他操作，点击查看",
+	"installPercent": "安装进度",
+	"downloading": "下载中",
+	"authTips": "云安装需先绑定授权码，如果已有授权请先进行绑定，没有授权可到niucloud官网购买云服务之后再进行操作",
+	"toBind": "绑定授权",
+	"toNiucloud": "去niucloud官网",
+	"descriptionLeft": "暂无任何应用，马上去",
+	"buyDescriptionLeft": "您还没有购买过应用，马上去",
+	"link": "官方应用市场",
+	"descriptionRight": "逛逛",
+	"installed-empty": "暂未安装任何应用",
+	"siteAddressTips": "授权域名不匹配",
+	"authCodePlaceholder": "请输入授权码",
+	"authSecretPlaceholder": "请输入授权秘钥",
+	"updateCode": "重新绑定",
+	"notHaveAuth": "还没有授权？去购买",
+	"authInfoTips": "授权码和授权秘钥可在Niucloud官网我的授权 授权详情中查看",
+	"addonUninstall": "插件卸载",
+	"appIdentification":"应用标识",
+	"tipText":"标识指开发应用或插件的文件夹名称",
+	"uninstallTips": "是否要卸载该插件？",
+	"upgrade": "升级",
+	"newVersion": "最新版本",
+	"cloudBuild": "云编译",
+	"cloudBuildTips": "是否要进行云编译该操作可能会影响到正在访问的客户是否要继续操作？",
+	"deleteAddonTips": "删除插件会把插件目录连同文件全部删除，确定要删除吗？"
 }
diff --git a/admin/src/app/lang/zh-cn/instructional_material.instructional_material.json b/admin/src/app/lang/zh-cn/instructional_material.instructional_material.json
new file mode 100644
index 00000000..c2fb9190
--- /dev/null
+++ b/admin/src/app/lang/zh-cn/instructional_material.instructional_material.json
@@ -0,0 +1,30 @@
+{
+      "title":"课程标题",
+      "titlePlaceholder":"请输入课程标题",
+      "image":"预览图",
+      "imagePlaceholder":"请输入预览图",
+      "type":"素材类型",
+      "typePlaceholder":"请输入素材类型",
+      "content":"课程内容",
+      "contentPlaceholder":"请输入课程内容",
+      "status":"状态",
+      "statusPlaceholder":"请输入状态",
+      "createTime":"创建时间",
+      "createTimePlaceholder":"请输入创建时间",
+      "updateTime":"修改时间",
+      "updateTimePlaceholder":"请输入修改时间",
+      "userPermission":"用户权限",
+      "userPermissionPlaceholder":"请输入用户权限",
+      "lessonCourseTeachingDeleteTips":"确定要删除该数据吗？",
+      "startDate":"请选择开始时间",
+      "endDate":"请选择结束时间",
+      "addActionLibrary":"添加热身动作库",
+      "updateActionLibrary":"编辑热身动作库",
+      "addJumpLessonLibrary":"添加体能动作库",
+      "updateJumpLessonLibrary":"编辑体能动作库",
+      "addEnTeachingLibrary":"添加趣味游戏库",
+      "editEnTeachingLibrary":"编辑趣味游戏库",
+      "addBasketballTeachingLibrary":"添加放松动作库",
+      "editBasketballTeachingLibrary":"编辑放松动作库"
+}
+
diff --git a/admin/src/app/lang/zh-cn/lesson_course_teaching.lesson_course_teaching.json b/admin/src/app/lang/zh-cn/lesson_course_teaching.lesson_course_teaching.json
new file mode 100644
index 00000000..9dce4991
--- /dev/null
+++ b/admin/src/app/lang/zh-cn/lesson_course_teaching.lesson_course_teaching.json
@@ -0,0 +1,37 @@
+{
+      "title":"课程标题",
+      "titlePlaceholder":"请输入课程标题",
+      "image":"预览图",
+      "imagePlaceholder":"请输入预览图",
+      "type":"素材类型",
+      "typePlaceholder":"请输入素材类型",
+      "content":"课程内容",
+      "contentPlaceholder":"请输入课程内容",
+      "status":"状态",
+      "statusPlaceholder":"请输入状态",
+      "createTime":"创建时间",
+      "createTimePlaceholder":"请输入创建时间",
+      "updateTime":"修改时间",
+      "updateTimePlaceholder":"请输入修改时间",
+      "userPermission":"用户权限",
+      "userPermissionPlaceholder":"请输入用户权限",
+      "addLessonCourseTeaching":"添加课程教学大纲",
+      "updateLessonCourseTeaching":"编辑课程教学大纲",
+      "lessonCourseTeachingDeleteTips":"确定要删除该数据吗？",
+      "startDate":"请选择开始时间",
+      "endDate":"请选择结束时间",
+      "addJumpLessonLibrary":"添加跳绳教案库",
+      "updateJumpLessonLibrary":"编辑跳绳教案库",
+      "addEnTeachingLibrary":"添加增高教案库",
+      "editEnTeachingLibrary":"编辑增高教案库",
+      "addBasketballTeachingLibrary":"添加篮球教案库",
+      "editBasketballTeachingLibrary":"编辑篮球教案库",
+      "addStrengthenTeachingLibrary":"添加强化教案库",
+      "editStrengthenTeachingLibrary":"编辑强化教案库",
+      "addNinjaTeachingLibrary":"添加空中忍者教案库",
+      "editNinjaTeachingLibrary":"编辑空中忍者教案库",
+      "addSecurityTeachingLibrary":"添加少儿安防教案库",
+      "editSecurityTeachingLibrary":"编辑少儿安防教案库",
+      "addPhysicalTeachingLibrary":"添加体能教案库",
+      "editPhysicalTeachingLibrary":"编辑体能教案库"
+}
diff --git a/admin/src/app/lang/zh-cn/login.json b/admin/src/app/lang/zh-cn/login.json
index dff06819..fb0719d1 100644
--- a/admin/src/app/lang/zh-cn/login.json
+++ b/admin/src/app/lang/zh-cn/login.json
@@ -1,11 +1,11 @@
 {
-  "siteTitle": "NIUCLOUD-ADMIN",
-  "logging": "登录中",
-  "platform": "管理端",
-  "login": "登录",
-  "siteLogin": "站点登录",
-  "adminLogin": "平台登录",
-  "userPlaceholder": "请输入您的账号",
-  "passwordPlaceholder": "请输入您的密码",
-  "manageAdminFramework": "管理系统后台框架"
-}
+    "siteTitle": "NIUCLOUD-ADMIN",
+    "logging": "登录中",
+    "platform": "管理端",
+    "login" : "登录",
+    "siteLogin": "站点登录",
+    "adminLogin": "平台登录",
+    "userPlaceholder": "请输入您的账号",
+    "passwordPlaceholder": "请输入您的密码",
+	"manageAdminFramework": "管理系统后台框架"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/marketing.sign_config.json b/admin/src/app/lang/zh-cn/marketing.sign_config.json
index 40f8cb01..7f2ff7ae 100644
--- a/admin/src/app/lang/zh-cn/marketing.sign_config.json
+++ b/admin/src/app/lang/zh-cn/marketing.sign_config.json
@@ -1,41 +1,41 @@
 {
-  "signSet": "签到设置",
-  "signList": "签到记录",
-  "isUse": "是否启用",
-  "signPeriod": "签到周期",
-  "signPeriodTip": "请输入签到周期",
-  "signPeriodLimitTips": "签到周期格式错误",
-  "signPeriodMustZeroTips": "签到周期为2-365天",
-  "calendarSign": "日历签到",
-  "periodSign": "周期签到",
-  "daySignAward": "日签奖励",
-  "daySignAwardPlaceholder": "请选择日签奖励",
-  "continueSignAward": "连签奖励",
-  "calendarSignTip": "用户根据日期进行打卡，连续签到一定天数可即可获得连签奖励。",
-  "periodSignTip": "用户在规定的周期内完成签到可以获得奖励;一个周期结束后将进入下一个循环周期。",
-  "daySignAwardTip": "用户每日签到可以获得的奖励",
-  "continueSignAwardTipTop": "超过固定周期天数的奖励将不向用户展示和发放",
-  "continueSignAwardTipBottom": "若用户已经达到新增的连签条件，则不补发连奖励(例:新增连签3天获得赠品，若已有用户连签超过3天，则不补发赠品)",
-  "set": "设置",
-  "modify": "修改",
-  "add": "+新增连签奖励",
-  "signRule": "签到规则",
-  "daySignTitle": "设置日签奖励",
-  "continueSignTitle": "设置连续奖励",
-  "ruleExplain": "规则说明",
-  "ruleExplainTip": "请输入规则说明",
-  "ruleExplainDefault": "1.每日签到可以获得日签奖励，连续签到可以获得连签奖励；\n2.每日最多可签到1次，断签则会重新计算连签天数；\n3.活动以及奖励最终解释权归商家所有。",
-  "useDefaultExplain": "使用默认说明",
-  "continueSign": "连签天数",
-  "continueSignFormatError": "连签天数格式错误",
-  "continueSignBerweenDays": "连签天数为2-365天",
-  "receiveLimit": "领取限制",
-  "noLimit": "不限制",
-  "everyOneLimit": "每人限领",
-  "time": "次",
-  "day": "天",
-  "continueSignPlaceholder": "请输入连签天数",
-  "receiveNumPlaceholder": "请输入限领次数",
-  "receiveNumFormatError": "限领次数格式错误",
-  "receiveNumMustGreaterThanZeroTip": "限领次数不能小于等于0"
-}
+	"signSet": "签到设置",
+	"signList": "签到记录",
+	"isUse": "是否启用",
+	"signPeriod": "签到周期",
+	"signPeriodTip": "请输入签到周期",
+    "signPeriodLimitTips": "签到周期格式错误",
+    "signPeriodMustZeroTips": "签到周期为2-365天",
+	"calendarSign": "日历签到",
+	"periodSign": "周期签到",
+	"daySignAward": "日签奖励",
+	"daySignAwardPlaceholder": "请选择日签奖励",
+	"continueSignAward": "连签奖励",
+	"calendarSignTip": "用户根据日期进行打卡，连续签到一定天数可即可获得连签奖励。",
+	"periodSignTip": "用户在规定的周期内完成签到可以获得奖励;一个周期结束后将进入下一个循环周期。",
+	"daySignAwardTip": "用户每日签到可以获得的奖励",
+	"continueSignAwardTipTop": "超过固定周期天数的奖励将不向用户展示和发放",
+	"continueSignAwardTipBottom": "若用户已经达到新增的连签条件，则不补发连奖励(例:新增连签3天获得赠品，若已有用户连签超过3天，则不补发赠品)",
+	"set": "设置",
+	"modify": "修改",
+	"add": "+新增连签奖励",
+	"signRule": "签到规则",
+	"daySignTitle": "设置日签奖励",
+	"continueSignTitle": "设置连续奖励",
+	"ruleExplain": "规则说明",
+	"ruleExplainTip": "请输入规则说明",
+	"ruleExplainDefault": "1.每日签到可以获得日签奖励，连续签到可以获得连签奖励；\n2.每日最多可签到1次，断签则会重新计算连签天数；\n3.活动以及奖励最终解释权归商家所有。",
+	"useDefaultExplain": "使用默认说明",
+	"continueSign": "连签天数",
+	"continueSignFormatError": "连签天数格式错误",
+	"continueSignBerweenDays": "连签天数为2-365天",
+	"receiveLimit": "领取限制",
+	"noLimit": "不限制",
+	"everyOneLimit": "每人限领",
+	"time": "次",
+	"day": "天",
+	"continueSignPlaceholder":"请输入连签天数",
+	"receiveNumPlaceholder":"请输入限领次数",
+	"receiveNumFormatError":"限领次数格式错误",
+	"receiveNumMustGreaterThanZeroTip":"限领次数不能小于等于0"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/marketing.sign_list.json b/admin/src/app/lang/zh-cn/marketing.sign_list.json
index 34fd26c9..ae5384ed 100644
--- a/admin/src/app/lang/zh-cn/marketing.sign_list.json
+++ b/admin/src/app/lang/zh-cn/marketing.sign_list.json
@@ -1,15 +1,15 @@
 {
-  "memberId": "会员编号",
-  "memberInfoPlaceholder": "请输入会员信息",
-  "memberInfo": "会员信息",
-  "mobile": "手机号码",
-  "nickName": "会员昵称",
-  "headimg": "会员头像",
-  "createTime": "签到时间",
-  "days": "连续签到",
-  "day": "天",
-  "dayAward": "日签奖励",
-  "continueAward": "连签奖励",
-  "startDate": "开始时间",
-  "endDate": "结束时间"
-}
+    "memberId":"会员编号",
+	"memberInfoPlaceholder":"请输入会员信息",
+	"memberInfo":"会员信息",
+	"mobile":"手机号码",
+    "nickName":"会员昵称",
+    "headimg":"会员头像",
+	"createTime":"签到时间",
+	"days":"连续签到",
+	"day":"天",
+	"dayAward":"日签奖励",
+	"continueAward":"连签奖励",
+	"startDate":"开始时间",
+	"endDate":"结束时间"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/marketing.verifier.json b/admin/src/app/lang/zh-cn/marketing.verifier.json
index 19210d16..732d6361 100644
--- a/admin/src/app/lang/zh-cn/marketing.verifier.json
+++ b/admin/src/app/lang/zh-cn/marketing.verifier.json
@@ -1,31 +1,31 @@
 {
-  "hotelVerify": "订单核销",
-  "verifyRecord": "核销记录",
-  "verifyTime": "核销时间",
-  "orderNo": "订单编号",
-  "orderNoPlaceholder": "请输入订单编号",
-  "OrderInfo": "订单信息",
-  "buyerInfo": "购买人信息",
-  "verifyCode": "核销码",
-  "verifyCodePlaceholder": "请输入核销码",
-  "verifyer": "核销人",
-  "startDate": "开始时间",
-  "endDate": "结束时间",
-  "mobile": "联系方式",
-  "searchValueEmptyTips": "请输入搜索内容",
-  "verify": "核销",
-  "buyInfo": "预订信息",
-  "orderRefunding": "该订单正在维权中不能进行核销",
-  "verifyTips": "是否要核销该订单？",
-  "toOrder": "查看订单",
-  "verifyType": "核销类型",
-  "verifyTypePlaceholder": "请选择核销类型",
-  "verifier": "核销员",
-  "createTime": "添加时间",
-  "addVerifier": "添加核销员",
-  "verifierDeleteTips": "确定要删除该核销员吗？",
-  "memberInfo": "会员信息",
-  "memberIdPlaceholder": "请选择会员",
-  "member": "会员",
-  "searchPlaceholder": "请输入会员昵称搜索"
-}
+    "hotelVerify": "订单核销",
+    "verifyRecord": "核销记录",
+    "verifyTime": "核销时间",
+    "orderNo": "订单编号",
+	"orderNoPlaceholder": "请输入订单编号",
+    "OrderInfo": "订单信息",
+    "buyerInfo": "购买人信息",
+    "verifyCode": "核销码",
+    "verifyCodePlaceholder": "请输入核销码",
+    "verifyer": "核销人",
+    "startDate": "开始时间",
+	"endDate": "结束时间",
+    "mobile": "联系方式",
+    "searchValueEmptyTips": "请输入搜索内容",
+    "verify": "核销",
+    "buyInfo": "预订信息",
+    "orderRefunding": "该订单正在维权中不能进行核销",
+    "verifyTips": "是否要核销该订单？",
+    "toOrder": "查看订单",
+    "verifyType": "核销类型",
+    "verifyTypePlaceholder": "请选择核销类型",
+    "verifier": "核销员",
+    "createTime":"添加时间",
+	"addVerifier":"添加核销员",
+	"verifierDeleteTips":"确定要删除该核销员吗？",
+	"memberInfo": "会员信息",
+	"memberIdPlaceholder": "请选择会员",
+	"member": "会员",
+	"searchPlaceholder": "请输入会员昵称搜索"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/marketing.verify.json b/admin/src/app/lang/zh-cn/marketing.verify.json
index f00b1f72..32798d11 100644
--- a/admin/src/app/lang/zh-cn/marketing.verify.json
+++ b/admin/src/app/lang/zh-cn/marketing.verify.json
@@ -1,32 +1,32 @@
 {
-  "hotelVerify": "订单核销",
-  "verifyRecord": "核销记录",
-  "verifyTime": "核销时间",
-  "orderNo": "订单编号",
-  "orderNoPlaceholder": "请输入订单编号",
-  "verifyInfo": "核销信息",
-  "buyerInfo": "购买人信息",
-  "verifyCode": "核销码",
-  "verifyCodePlaceholder": "请输入核销码",
-  "verifyer": "核销人",
-  "startDate": "开始时间",
-  "endDate": "结束时间",
-  "mobile": "联系方式",
-  "searchValueEmptyTips": "请输入搜索内容",
-  "verify": "核销",
-  "buyInfo": "预订信息",
-  "orderRefunding": "该订单正在维权中不能进行核销",
-  "verifyTips": "是否要核销该订单？",
-  "toOrder": "查看订单",
-  "verifyType": "核销类型",
-  "verifyTypePlaceholder": "请选择核销类型",
-  "verifier": "核销员",
-  "verifierPlaceholder": "请选择核销员",
-  "createTime": "添加时间",
-  "addVerifier": "添加核销员",
-  "verifierDeleteTips": "确定要删除该核销员吗？",
-  "memberInfo": "会员信息",
-  "memberIdPlaceholder": "请选择会员",
-  "member": "会员",
-  "searchPlaceholder": "请输入会员昵称搜索"
-}
+    "hotelVerify": "订单核销",
+    "verifyRecord": "核销记录",
+    "verifyTime": "核销时间",
+    "orderNo": "订单编号",
+	"orderNoPlaceholder": "请输入订单编号",
+    "verifyInfo": "核销信息",
+    "buyerInfo": "购买人信息",
+    "verifyCode": "核销码",
+    "verifyCodePlaceholder": "请输入核销码",
+    "verifyer": "核销人",
+    "startDate": "开始时间",
+	"endDate": "结束时间",
+    "mobile": "联系方式",
+    "searchValueEmptyTips": "请输入搜索内容",
+    "verify": "核销",
+    "buyInfo": "预订信息",
+    "orderRefunding": "该订单正在维权中不能进行核销",
+    "verifyTips": "是否要核销该订单？",
+    "toOrder": "查看订单",
+    "verifyType": "核销类型",
+    "verifyTypePlaceholder": "请选择核销类型",
+    "verifier": "核销员",
+    "verifierPlaceholder": "请选择核销员",
+    "createTime":"添加时间",
+	"addVerifier":"添加核销员",
+	"verifierDeleteTips":"确定要删除该核销员吗？",
+	"memberInfo": "会员信息",
+	"memberIdPlaceholder": "请选择会员",
+	"member": "会员",
+	"searchPlaceholder": "请输入会员昵称搜索"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/member.balance.json b/admin/src/app/lang/zh-cn/member.balance.json
index 97bf6bf6..a5758e2f 100644
--- a/admin/src/app/lang/zh-cn/member.balance.json
+++ b/admin/src/app/lang/zh-cn/member.balance.json
@@ -1,34 +1,34 @@
 {
-  "memberId": "会员编号",
-  "accountData": "变动金额",
-  "fromType": "来源/用途",
-  "balanceInfo": "余额变动详情",
-  "memberInfo": "会员信息",
-  "memo": "备注",
-  "mobile": "手机号码",
-  "nickName": "会员昵称",
-  "headimg": "会员头像",
-  "createTime": "发生时间",
-  "startDate": "开始时间",
-  "endDate": "结束时间",
-  "searchMember": "昵称/手机号",
-  "searchMemberPlaceholder": "请输入会员昵称/手机号码",
-  "memberIdPlaceholder": "请输入会员id",
-  "accountTypePlaceholder": "请输入账户类型",
-  "accountDataPlaceholder": "请输入账户数据",
-  "fromTypePlaceholder": "请输入来源类型",
-  "relatedIdPlaceholder": "请输入关联Id",
-  "createTimePlaceholder": "请输入创建时间",
-  "memoPlaceholder": "请输入备注信息",
-  "addMemberAccountLog": "添加会员账单表",
-  "updateMemberAccountLog": "编辑会员账单表",
-  "memberAccountLogDeleteTips": "确定要删除该会员账单表吗？",
-  "totalAllBalance": "余额（元）",
-  "totalBalance": "不可提现（元）",
-  "totalMoney": "可提现（元）",
-  "balance": "不可提现",
-  "money": "可提现",
-  "balanceType": "账户类型",
-  "accountSum": "剩余金额",
-  "memberInfoPlaceholder": "请输入会员编号/昵称/手机号"
-}
+    "memberId":"会员编号",
+    "accountData":"变动金额",
+    "fromType":"来源/用途",
+    "balanceInfo":"余额变动详情",
+    "memberInfo":"会员信息",
+    "memo":"备注",
+    "mobile":"手机号码",
+    "nickName":"会员昵称",
+    "headimg":"会员头像",
+    "createTime":"发生时间",
+    "startDate":"开始时间",
+    "endDate":"结束时间",
+    "searchMember":"昵称/手机号",
+    "searchMemberPlaceholder":"请输入会员昵称/手机号码",
+    "memberIdPlaceholder":"请输入会员id",
+    "accountTypePlaceholder":"请输入账户类型",
+    "accountDataPlaceholder":"请输入账户数据",
+    "fromTypePlaceholder":"请输入来源类型",
+    "relatedIdPlaceholder":"请输入关联Id",
+    "createTimePlaceholder":"请输入创建时间",
+    "memoPlaceholder":"请输入备注信息",
+    "addMemberAccountLog":"添加会员账单表",
+    "updateMemberAccountLog":"编辑会员账单表",
+    "memberAccountLogDeleteTips":"确定要删除该会员账单表吗？",
+	"totalAllBalance": "余额（元）",
+    "totalBalance": "不可提现（元）",
+    "totalMoney": "可提现（元）",
+    "balance": "不可提现",
+	"money":"可提现",
+	"balanceType":"账户类型",
+    "accountSum" : "剩余金额",
+    "memberInfoPlaceholder":"请输入会员编号/昵称/手机号"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/member.commission.json b/admin/src/app/lang/zh-cn/member.commission.json
index cf8da743..0399136d 100644
--- a/admin/src/app/lang/zh-cn/member.commission.json
+++ b/admin/src/app/lang/zh-cn/member.commission.json
@@ -1,32 +1,33 @@
 {
-  "totalCommission": "累计佣金（元）",
-  "commission": "未提现佣金（元）",
-  "withdrawnCommission": "已提现佣金（元）",
-  "cashOutingCommission": "提现中佣金（元）",
-  "accountData": "变动金额",
-  "memberId": "会员编号",
-  "accountSum": "剩余金额",
-  "fromType": "来源/用途",
-  "moneyInfo": "佣金变动详情",
-  "memo": "备注",
-  "mobile": "手机号码",
-  "nickName": "会员信息",
-  "headimg": "会员头像",
-  "createTime": "发生时间",
-  "startDate": "开始时间",
-  "endDate": "结束时间",
-  "searchMember": "昵称/手机号",
-  "searchMemberPlaceholder": "请输入会员昵称/手机号码",
-  "memberIdPlaceholder": "请输入会员id",
-  "accountTypePlaceholder": "请输入账户类型",
-  "accountDataPlaceholder": "请输入账户数据",
-  "fromTypePlaceholder": "请输入来源类型",
-  "relatedIdPlaceholder": "请输入关联Id",
-  "createTimePlaceholder": "请输入创建时间",
-  "memoPlaceholder": "请输入备注信息",
-  "addMemberAccountLog": "添加会员账单表",
-  "updateMemberAccountLog": "编辑会员账单表",
-  "member_account_logDeleteTips": "确定要删除该会员账单表吗？",
-  "memberInfo": "会员信息",
-  "memberInfoPlaceholder": "请输入会员编号/昵称/手机号"
-}
+    "totalCommission":"累计佣金（元）",
+    "commission":"未提现佣金（元）",
+    "withdrawnCommission":"已提现佣金（元）",
+    "cashOutingCommission":"提现中佣金（元）",
+    "accountData":"变动金额",
+    "memberId":"会员编号",
+    "accountSum":"剩余金额",
+    "fromType":"来源/用途",
+    "moneyInfo":"佣金变动详情",
+    "memo":"备注",
+    "mobile":"手机号码",
+    "nickName":"会员信息",
+    "headimg":"会员头像",
+    "createTime":"发生时间",
+    "startDate":"开始时间",
+    "endDate":"结束时间",
+    "searchMember":"昵称/手机号",
+    "searchMemberPlaceholder":"请输入会员昵称/手机号码",
+    "memberIdPlaceholder":"请输入会员id",
+    "accountTypePlaceholder":"请输入账户类型",
+    "accountDataPlaceholder":"请输入账户数据",
+    "fromTypePlaceholder":"请输入来源类型",
+    "relatedIdPlaceholder":"请输入关联Id",
+    "createTimePlaceholder":"请输入创建时间",
+    "memoPlaceholder":"请输入备注信息",
+    "addMemberAccountLog":"添加会员账单表",
+    "updateMemberAccountLog":"编辑会员账单表",
+    "member_account_logDeleteTips":"确定要删除该会员账单表吗？",
+    "memberInfo":"会员信息",
+    "memberInfoPlaceholder":"请输入会员编号/昵称/手机号"
+
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/member.growth.json b/admin/src/app/lang/zh-cn/member.growth.json
index a8b511d5..e930e087 100644
--- a/admin/src/app/lang/zh-cn/member.growth.json
+++ b/admin/src/app/lang/zh-cn/member.growth.json
@@ -1,31 +1,31 @@
 {
-  "accountData": "变更数值",
-  "accountSum": "变更后成长值",
-  "fromType": "来源",
-  "memberId": "会员编号",
-  "pointInfo": "积分变动详情",
-  "memo": "备注",
-  "mobile": "手机号码",
-  "nickName": "会员信息",
-  "headimg": "会员头像",
-  "createTime": "发生时间",
-  "startDate": "开始时间",
-  "endDate": "结束时间",
-  "searchMember": "昵称/手机号",
-  "searchMemberPlaceholder": "请输入会员昵称/手机号码",
-  "memberIdPlaceholder": "请输入会员id",
-  "accountTypePlaceholder": "请输入账户类型",
-  "accountDataPlaceholder": "请输入账户数据",
-  "fromTypePlaceholder": "请输入来源类型",
-  "relatedIdPlaceholder": "请输入关联Id",
-  "createTimePlaceholder": "请输入创建时间",
-  "memoPlaceholder": "请输入备注信息",
-  "addMemberAccountLog": "添加会员账单表",
-  "updateMemberAccountLog": "编辑会员账单表",
-  "member_account_logDeleteTips": "确定要删除该会员账单表吗？",
-  "memberInfo": "会员信息",
-  "memberInfoPlaceholder": "请输入会员编号/昵称/手机号",
-  "memberLevel": "会员等级",
-  "growthRule": "成长值规则",
-  "growthDetail": "成长值明细"
+    "accountData":"变更数值",
+    "accountSum":"变更后成长值",
+    "fromType":"来源",
+    "memberId":"会员编号",
+    "pointInfo":"积分变动详情",
+    "memo":"备注",
+    "mobile":"手机号码",
+    "nickName":"会员信息",
+    "headimg":"会员头像",
+    "createTime":"发生时间",
+    "startDate":"开始时间",
+    "endDate":"结束时间",
+    "searchMember":"昵称/手机号",
+    "searchMemberPlaceholder":"请输入会员昵称/手机号码",
+    "memberIdPlaceholder":"请输入会员id",
+    "accountTypePlaceholder":"请输入账户类型",
+    "accountDataPlaceholder":"请输入账户数据",
+    "fromTypePlaceholder":"请输入来源类型",
+    "relatedIdPlaceholder":"请输入关联Id",
+    "createTimePlaceholder":"请输入创建时间",
+    "memoPlaceholder":"请输入备注信息",
+    "addMemberAccountLog":"添加会员账单表",
+    "updateMemberAccountLog":"编辑会员账单表",
+    "member_account_logDeleteTips":"确定要删除该会员账单表吗？",
+    "memberInfo":"会员信息",
+    "memberInfoPlaceholder":"请输入会员编号/昵称/手机号",
+    "memberLevel": "会员等级",
+    "growthRule": "成长值规则",
+    "growthDetail": "成长值明细"
 }
diff --git a/admin/src/app/lang/zh-cn/member.label.edit.json b/admin/src/app/lang/zh-cn/member.label.edit.json
index 3c0e295e..3604c0b0 100644
--- a/admin/src/app/lang/zh-cn/member.label.edit.json
+++ b/admin/src/app/lang/zh-cn/member.label.edit.json
@@ -1,11 +1,11 @@
 {
-  "labelName": "标签名称",
-  "memo": "备注",
-  "sort": "排序",
-  "labelNamePlaceholder": "请输入标签名称",
-  "memoPlaceholder": "请输入备注",
-  "sortPlaceholder": "请输入排序",
-  "addMemberLabel": "添加会员标签",
-  "updateMemberLabel": "编辑会员标签",
-  "memberLabelDeleteTips": "确定要删除该会员标签吗？"
-}
+    "labelName":"标签名称",
+    "memo":"备注",
+    "sort":"排序",
+    "labelNamePlaceholder":"请输入标签名称",
+    "memoPlaceholder":"请输入备注",
+    "sortPlaceholder":"请输入排序",
+    "addMemberLabel":"添加会员标签",
+    "updateMemberLabel":"编辑会员标签",
+    "memberLabelDeleteTips":"确定要删除该会员标签吗？"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/member.label.json b/admin/src/app/lang/zh-cn/member.label.json
index 47771cea..0fa18f63 100644
--- a/admin/src/app/lang/zh-cn/member.label.json
+++ b/admin/src/app/lang/zh-cn/member.label.json
@@ -1,16 +1,17 @@
 {
-  "labelName": "标签名称",
-  "memberNumber": "会员数量",
-  "memo": "备注",
-  "sort": "排序",
-  "labelNamePlaceholder": "请输入标签名称",
-  "memoPlaceholder": "请输入备注",
-  "sortPlaceholder": "请输入排序",
-  "createTimePlaceholder": "请输入添加时间",
-  "updateTimePlaceholder": "请输入更新时间",
-  "addMemberLabel": "添加会员标签",
-  "updateMemberLabel": "编辑会员标签",
-  "sortVerifyOne": "排序要大于零",
-  "sortVerifyTwo": "排序不能是小数",
-  "memberLabelDeleteTips": "确定要删除该会员标签吗？"
-}
+    "labelName":"标签名称",
+    "memberNumber":"会员数量",
+    "memo":"备注",
+    "sort":"排序",
+    "labelNamePlaceholder":"请输入标签名称",
+    "memoPlaceholder":"请输入备注",
+    "sortPlaceholder":"请输入排序",
+    "createTimePlaceholder":"请输入添加时间",
+    "updateTimePlaceholder":"请输入更新时间",
+    "addMemberLabel":"添加会员标签",
+    "updateMemberLabel":"编辑会员标签",
+    "sortVerifyOne":"排序要大于零",
+    "sortVerifyTwo":"排序不能是小数",
+    "memberLabelDeleteTips":"确定要删除该会员标签吗？"
+    
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/member.level.json b/admin/src/app/lang/zh-cn/member.level.json
index 52ae3e61..cbf3e67c 100644
--- a/admin/src/app/lang/zh-cn/member.level.json
+++ b/admin/src/app/lang/zh-cn/member.level.json
@@ -1,14 +1,14 @@
 {
-  "levelName": "等级名称",
-  "memberNumber": "会员数量",
-  "memberLabelDeleteTips": "确定要删除该会员登记吗？",
-  "addMemberLevel": "添加会员等级",
-  "levelNamePlaceholder": "请输入等级名称",
-  "memberLevelDeleteTips": "确定要删除该等级吗？",
-  "growth": "等级成长值",
-  "levelBenefits": "等级权益",
-  "levelGifts": "等级礼包",
-  "memberLevel": "会员等级",
-  "growthRule": "成长值规则",
-  "growthDetail": "成长值明细"
+    "levelName":"等级名称",
+    "memberNumber":"会员数量",
+    "memberLabelDeleteTips":"确定要删除该会员登记吗？",
+    "addMemberLevel": "添加会员等级",
+    "levelNamePlaceholder": "请输入等级名称",
+    "memberLevelDeleteTips": "确定要删除该等级吗？",
+    "growth": "等级成长值",
+    "levelBenefits": "等级权益",
+    "levelGifts": "等级礼包",
+    "memberLevel": "会员等级",
+    "growthRule": "成长值规则",
+    "growthDetail": "成长值明细"
 }
diff --git a/admin/src/app/lang/zh-cn/member.level_edit.json b/admin/src/app/lang/zh-cn/member.level_edit.json
index b183f7c6..fda82f0f 100644
--- a/admin/src/app/lang/zh-cn/member.level_edit.json
+++ b/admin/src/app/lang/zh-cn/member.level_edit.json
@@ -1,25 +1,25 @@
 {
-  "basicInfo": "基础信息",
-  "levelName": "等级名称",
-  "memberNumber": "会员数量",
-  "memberLabelDeleteTips": "确定要删除该会员登记吗？",
-  "addMemberLevel": "添加会员等级",
-  "levelNamePlaceholder": "请输入等级名称",
-  "levelBenefits": "等级权益",
-  "levelGift": "等级礼包",
-  "benefits": "权益",
-  "gift": "礼包",
-  "growthPlaceholder": "请输入成长值",
-  "growth": "成长值",
-  "remark": "等级描述",
-  "remarkPlaceholder": "请输入等级描述",
-  "growthFormatError": "成长值只能为整数",
-  "growthNeedLt": "成长值需小于",
-  "growthNeedGt": "成长值需大于",
-  "growthTips": "升级到该等级需达到的最低成长值",
-  "levelStyle": "等级样式",
-  "levelImg": "等级图标",
-  "bgColor": "背景颜色",
-  "bgImg": "背景图片",
-  "borderColor": "边框颜色"
+    "basicInfo": "基础信息",
+    "levelName":"等级名称",
+    "memberNumber":"会员数量",
+    "memberLabelDeleteTips":"确定要删除该会员登记吗？",
+    "addMemberLevel": "添加会员等级",
+    "levelNamePlaceholder": "请输入等级名称",
+    "levelBenefits": "等级权益",
+    "levelGift": "等级礼包",
+    "benefits": "权益",
+    "gift": "礼包",
+    "growthPlaceholder": "请输入成长值",
+    "growth": "成长值",
+    "remark": "等级描述",
+    "remarkPlaceholder": "请输入等级描述",
+    "growthFormatError": "成长值只能为整数",
+    "growthNeedLt": "成长值需小于",
+    "growthNeedGt": "成长值需大于",
+    "growthTips": "升级到该等级需达到的最低成长值",
+    "levelStyle": "等级样式",
+    "levelImg": "等级图标",
+    "bgColor": "背景颜色",
+    "bgImg": "背景图片",
+    "borderColor": "边框颜色"
 }
diff --git a/admin/src/app/lang/zh-cn/member.member.json b/admin/src/app/lang/zh-cn/member.member.json
index aea152a8..a6e3c00c 100644
--- a/admin/src/app/lang/zh-cn/member.member.json
+++ b/admin/src/app/lang/zh-cn/member.member.json
@@ -1,81 +1,82 @@
 {
-  "registerChannel": "注册来源",
-  "nickname": "会员昵称",
-  "memberNo": "会员编号",
-  "mobile": "手机号",
-  "createTime": "注册时间",
-  "lastVisitTime": "最后访问时间",
-  "addMember": "添加会员",
-  "nickNamePlaceholder": "请输入会员昵称",
-  "mobilePlaceholder": "请输入手机号",
-  "channelPlaceholder": "请选择注册类型",
-  "memberNoPlaceholder": "请选择会员编号",
-  "memberDeleteTips": "确定要删除该会员吗？",
-  "edit": "编辑",
-  "memberDelete": "删除",
-  "adjust": "调整",
-  "startDate": "开始时间",
-  "endDate": "结束时间",
-  "essentialInfo": "基本信息",
-  "accountInfo": "账户信息",
-  "registeredSource": "注册来源",
-  "memberLabel": "会员标签",
-  "urserName": "用户名",
-  "point": "积分",
-  "balance": "余额",
-  "growth": "成长值",
-  "memo": "备注",
-  "adjustPoint": "调整积分",
-  "detaBirth": "出生日期",
-  "sex": "性别",
-  "wxUnionid": "微信unionid",
-  "weappOpenid": "微信小程序openid",
-  "wxOpenid": "微信用户openid",
-  "head": "会员头像",
-  "username": "用户名",
-  "usernamePlaceholder": "请输入用户名",
-  "password": "密码",
-  "passwordCopy": "确认密码",
-  "passwordPlaceholder": "请输入密码",
-  "doubleCipherHint": "输入的两次密码不一致",
-  "memberNoHint": "会员编号只能输入字母和数字",
-  "mobileHint": "请输入正确的手机号!",
-  "memberLabelTag": "标签",
-  "setLabel": "标签",
-  "memberLabelPlaceholder": "请选择会员标签",
-  "memberInfo": "会员信息",
-  "memberInfoPlaceholder": "请输入会员编号/昵称/手机号",
-  "lock": "锁定",
-  "normal": "正常",
-  "memberLevel": "会员等级",
-  "memberLevelPlaceholder": "请选择会员等级",
-  "adjustType": "调整类型",
-  "adjustReduceBalance": "减少余额",
-  "adjustAddBalance": "增加余额",
-  "adjustReducePoint": "减少积分",
-  "adjustAddPoint": "增加积分",
-  "adjustBalance": "调整余额",
-  "currBalance": "当前余额",
-  "currPoint": "当前积分",
-  "adjustPlaceholder": "请输入调整数量",
-  "memoPlaceholder": "请输入备注",
-  "adjustBalancePlaceholder": "请输入调整余额",
-  "adjustPointPlaceholder": "请输入调整积分",
-  "adjustBalanceMaxAccountMessage": "调整后余额需大于0",
-  "adjustPointMaxAccountMessage": "调整后积分需大于0",
-  "birthday": "出生日期",
-  "birthdayTip": "请输入出生日期",
-  "headimg": "会员头像",
-  "updateMember": "编辑会员信息",
-  "notAvailable": "暂无",
-  "girlSex": "女",
-  "manSex": "男",
-  "secrecySex": "保密",
-  "detail": "详情",
-  "accumulative": "累计",
-  "money": "可提现余额",
-  "commission": "佣金",
-  "memberNull": "未读取到会员详情信息",
-  "memberLevelUpdate": "修改等级至",
-  "memberLevelUpdateTips": "该操作只会修改会员等级不会发放等级礼包"
+    "registerChannel":"注册来源",
+    "nickname":"会员昵称",
+    "memberNo":"会员编号",
+    "mobile":"手机号",
+    "createTime":"注册时间",
+    "lastVisitTime":"最后访问时间",
+    "addMember":"添加会员",
+    "nickNamePlaceholder":"请输入会员昵称",
+    "mobilePlaceholder":"请输入手机号",
+    "channelPlaceholder":"请选择注册类型",
+    "memberNoPlaceholder":"请选择会员编号",
+    "memberDeleteTips" : "确定要删除该会员吗？",
+    "edit": "编辑",
+    "memberDelete":"删除",
+    "adjust":"调整",
+    "startDate": "开始时间",
+    "endDate": "结束时间",
+    "essentialInfo": "基本信息",
+    "accountInfo": "账户信息",
+    "registeredSource": "注册来源",
+    "memberLabel": "会员标签",
+    "urserName": "用户名",
+    "point": "积分",
+    "balance": "余额",
+    "growth": "成长值",
+    "memo":"备注",
+    "adjustPoint":"调整积分",
+    "detaBirth": "出生日期",
+    "sex": "性别",
+    "wxUnionid": "微信unionid",
+    "weappOpenid": "微信小程序openid",
+    "wxOpenid": "微信用户openid",
+    "head": "会员头像",
+    "username": "用户名",
+    "usernamePlaceholder": "请输入用户名",
+    "password": "密码",
+    "passwordCopy": "确认密码",
+    "passwordPlaceholder": "请输入密码",
+    "doubleCipherHint": "输入的两次密码不一致",
+    "memberNoHint":"会员编号只能输入字母和数字",
+    "mobileHint": "请输入正确的手机号!",
+    "memberLabelTag": "标签",
+    "setLabel": "标签",
+    "memberLabelPlaceholder": "请选择会员标签",
+    "memberInfo":"会员信息",
+    "memberInfoPlaceholder":"请输入会员编号/昵称/手机号",
+	"lock": "锁定",
+	"normal": "正常",
+    "memberLevel": "会员等级",
+    "memberLevelPlaceholder": "请选择会员等级",
+    "adjustType":"调整类型",
+    "adjustReduceBalance":"减少余额",
+    "adjustAddBalance":"增加余额",
+    "adjustReducePoint":"减少积分",
+    "adjustAddPoint":"增加积分",
+    "adjustBalance":"调整余额",
+    "currBalance":"当前余额",
+    "currPoint":"当前积分",
+    "adjustPlaceholder":"请输入调整数量",
+    "memoPlaceholder":"请输入备注",
+    "adjustBalancePlaceholder":"请输入调整余额",
+    "adjustPointPlaceholder":"请输入调整积分",
+    "adjustBalanceMaxAccountMessage":"调整后余额需大于0",
+    "adjustPointMaxAccountMessage":"调整后积分需大于0",
+    "birthday": "出生日期",
+    "birthdayTip": "请输入出生日期",
+    "headimg": "会员头像",
+    "updateMember": "编辑会员信息",
+    "notAvailable":"暂无",
+    "girlSex":"女",
+    "manSex":"男",
+    "secrecySex":"保密",
+    "detail":"详情",
+    "accumulative":"累计",
+    "money":"可提现余额",
+    "commission":"佣金",
+    "memberNull":"未读取到会员详情信息",
+    "memberLevelUpdate": "修改等级至",
+    "memberLevelUpdateTips": "该操作只会修改会员等级不会发放等级礼包"
+    
 }
diff --git a/admin/src/app/lang/zh-cn/member.member_detail.json b/admin/src/app/lang/zh-cn/member.member_detail.json
index 3c4f026c..cfcd4f5d 100644
--- a/admin/src/app/lang/zh-cn/member.member_detail.json
+++ b/admin/src/app/lang/zh-cn/member.member_detail.json
@@ -1,55 +1,55 @@
 {
-  "adjustType": "调整类型",
-  "adjustReduceBalance": "减少余额",
-  "adjustAddBalance": "增加余额",
-  "adjustReducePoint": "减少积分",
-  "adjustAddPoint": "增加积分",
-  "adjustBalance": "调整余额",
-  "memberNo": "会员编号",
-  "currBalance": "当前余额",
-  "currPoint": "当前积分",
-  "memo": "备注",
-  "adjustPlaceholder": "请输入调整数量",
-  "memoPlaceholder": "请输入备注",
-  "adjustBalancePlaceholder": "请输入调整余额",
-  "adjustPointPlaceholder": "请输入调整积分",
-  "adjustBalanceMaxAccountMessage": "调整后余额需大于0",
-  "adjustPointMaxAccountMessage": "调整后积分需大于0",
-  "birthday": "出生日期",
-  "birthdayTip": "请输入出生日期",
-  "sex": "性别",
-  "sexPlaceholder": "请选择性别",
-  "headimg": "会员头像",
-  "wxUnionid": "微信unionid",
-  "weappOpenid": "微信小程序openid",
-  "wxOpenid": "微信公众号openid",
-  "memberLabel": "会员标签",
-  "memberLabelPlaceholder": "请选择会员标签",
-  "nickNamePlaceholder": "请输入会员名称",
-  "updateMember": "编辑会员信息",
-  "notAvailable": "暂无",
-  "girlSex": "女",
-  "manSex": "男",
-  "secrecySex": "保密",
-  "essentialInfo": "基本信息",
-  "accountInfo": "账户信息",
-  "urserName": "用户名",
-  "nickname": "会员昵称",
-  "registeredSource": "注册来源",
-  "lastVisitTime": "最后登录时间",
-  "point": "积分",
-  "balance": "余额",
-  "growth": "成长值",
-  "adjust": "调整",
-  "mobile": "手机号",
-  "detail": "详情",
-  "accumulative": "累计",
-  "money": "可提现余额",
-  "adjustPoint": "调整积分",
-  "commission": "佣金",
-  "memberNull": "未读取到会员详情信息",
-  "memberLevel": "会员等级",
-  "memberLevelUpdate": "修改等级至",
-  "memberLevelUpdateTips": "该操作只会修改会员等级不会发放等级礼包",
-  "memberLevelPlaceholder": "请选择会员等级"
+    "adjustType":"调整类型",
+    "adjustReduceBalance":"减少余额",
+    "adjustAddBalance":"增加余额",
+    "adjustReducePoint":"减少积分",
+    "adjustAddPoint":"增加积分",
+    "adjustBalance":"调整余额",
+    "memberNo":"会员编号",
+    "currBalance":"当前余额",
+    "currPoint":"当前积分",
+    "memo":"备注",
+    "adjustPlaceholder":"请输入调整数量",
+    "memoPlaceholder":"请输入备注",
+    "adjustBalancePlaceholder":"请输入调整余额",
+    "adjustPointPlaceholder":"请输入调整积分",
+    "adjustBalanceMaxAccountMessage":"调整后余额需大于0",
+    "adjustPointMaxAccountMessage":"调整后积分需大于0",
+    "birthday": "出生日期",
+    "birthdayTip": "请输入出生日期",
+    "sex": "性别",
+    "sexPlaceholder": "请选择性别",
+    "headimg": "会员头像",
+    "wxUnionid": "微信unionid",
+    "weappOpenid": "微信小程序openid",
+    "wxOpenid": "微信公众号openid",
+    "memberLabel": "会员标签",
+    "memberLabelPlaceholder": "请选择会员标签",
+    "nickNamePlaceholder": "请输入会员名称",
+    "updateMember": "编辑会员信息",
+    "notAvailable":"暂无",
+    "girlSex":"女",
+    "manSex":"男",
+    "secrecySex":"保密",
+    "essentialInfo": "基本信息",
+    "accountInfo": "账户信息",
+    "urserName": "用户名",
+    "nickname":"会员昵称",
+    "registeredSource": "注册来源",
+    "lastVisitTime":"最后登录时间",
+    "point": "积分",
+    "balance": "余额",
+    "growth": "成长值",
+    "adjust":"调整",
+    "mobile":"手机号",
+    "detail":"详情",
+    "accumulative":"累计",
+    "money":"可提现余额",
+    "adjustPoint":"调整积分",
+    "commission":"佣金",
+    "memberNull":"未读取到会员详情信息",
+    "memberLevel": "会员等级",
+    "memberLevelUpdate": "修改等级至",
+    "memberLevelUpdateTips": "该操作只会修改会员等级不会发放等级礼包",
+    "memberLevelPlaceholder": "请选择会员等级"
 }
diff --git a/admin/src/app/lang/zh-cn/member.point.json b/admin/src/app/lang/zh-cn/member.point.json
index db62abf8..56a576b4 100644
--- a/admin/src/app/lang/zh-cn/member.point.json
+++ b/admin/src/app/lang/zh-cn/member.point.json
@@ -1,30 +1,30 @@
 {
-  "pointGet": "累计发放积分",
-  "pointUse": "累计使用积分",
-  "accountData": "变动积分",
-  "accountSum": "剩余积分",
-  "fromType": "来源/用途",
-  "memberId": "会员编号",
-  "pointInfo": "积分变动详情",
-  "memo": "备注",
-  "mobile": "手机号码",
-  "nickName": "会员信息",
-  "headimg": "会员头像",
-  "createTime": "发生时间",
-  "startDate": "开始时间",
-  "endDate": "结束时间",
-  "searchMember": "昵称/手机号",
-  "searchMemberPlaceholder": "请输入会员昵称/手机号码",
-  "memberIdPlaceholder": "请输入会员id",
-  "accountTypePlaceholder": "请输入账户类型",
-  "accountDataPlaceholder": "请输入账户数据",
-  "fromTypePlaceholder": "请输入来源类型",
-  "relatedIdPlaceholder": "请输入关联Id",
-  "createTimePlaceholder": "请输入创建时间",
-  "memoPlaceholder": "请输入备注信息",
-  "addMemberAccountLog": "添加会员账单表",
-  "updateMemberAccountLog": "编辑会员账单表",
-  "member_account_logDeleteTips": "确定要删除该会员账单表吗？",
-  "memberInfo": "会员信息",
-  "memberInfoPlaceholder": "请输入会员编号/昵称/手机号"
-}
+    "pointGet":"累计发放积分",
+    "pointUse":"累计使用积分",
+    "accountData":"变动积分",
+    "accountSum":"剩余积分",
+    "fromType":"来源/用途",
+    "memberId":"会员编号",
+    "pointInfo":"积分变动详情",
+    "memo":"备注",
+    "mobile":"手机号码",
+    "nickName":"会员信息",
+    "headimg":"会员头像",
+    "createTime":"发生时间",
+    "startDate":"开始时间",
+    "endDate":"结束时间",
+    "searchMember":"昵称/手机号",
+    "searchMemberPlaceholder":"请输入会员昵称/手机号码",
+    "memberIdPlaceholder":"请输入会员id",
+    "accountTypePlaceholder":"请输入账户类型",
+    "accountDataPlaceholder":"请输入账户数据",
+    "fromTypePlaceholder":"请输入来源类型",
+    "relatedIdPlaceholder":"请输入关联Id",
+    "createTimePlaceholder":"请输入创建时间",
+    "memoPlaceholder":"请输入备注信息",
+    "addMemberAccountLog":"添加会员账单表",
+    "updateMemberAccountLog":"编辑会员账单表",
+    "member_account_logDeleteTips":"确定要删除该会员账单表吗？",
+    "memberInfo":"会员信息",
+    "memberInfoPlaceholder":"请输入会员编号/昵称/手机号"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/order.recharge.detail.json b/admin/src/app/lang/zh-cn/order.recharge.detail.json
index 8f74e98c..b9399e18 100644
--- a/admin/src/app/lang/zh-cn/order.recharge.detail.json
+++ b/admin/src/app/lang/zh-cn/order.recharge.detail.json
@@ -1,19 +1,19 @@
 {
-  "orderInfo": "订单详情",
-  "orderDiscountMoney": "优惠金额",
-  "ip": "下单IP",
-  "payTime": "支付时间",
-  "remark": "商家留言",
-  "memberMessage": "买家留言",
-  "orderNo": "订单编号",
-  "orderStatus": "订单状态",
-  "orderNoPlaceholder": "请输入订单编号",
-  "createTime": "创建时间",
-  "rechargeMoney": "充值金额",
-  "orderMoney": "订单金额",
-  "member": "买家",
-  "orderFromName": "订单来源",
-  "payTypeName": "支付方式",
-  "startDate": "开始时间",
-  "endDate": "结束时间"
-}
+      "orderInfo":"订单详情",
+      "orderDiscountMoney":"优惠金额",
+      "ip":"下单IP",
+      "payTime":"支付时间",
+      "remark":"商家留言",
+      "memberMessage":"买家留言",
+      "orderNo":"订单编号",
+      "orderStatus":"订单状态",
+      "orderNoPlaceholder":"请输入订单编号",
+      "createTime":"创建时间",
+      "rechargeMoney":"充值金额",
+      "orderMoney":"订单金额",
+      "member":"买家",
+      "orderFromName":"订单来源",
+      "payTypeName":"支付方式",
+      "startDate":"开始时间",
+      "endDate":"结束时间"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/order.recharge.list.json b/admin/src/app/lang/zh-cn/order.recharge.list.json
index f76bda99..bb9e49d4 100644
--- a/admin/src/app/lang/zh-cn/order.recharge.list.json
+++ b/admin/src/app/lang/zh-cn/order.recharge.list.json
@@ -1,23 +1,23 @@
 {
-  "totalRechargeRefundMoney": "充值退款（元）",
-  "totalRechargeMoney": "充值金额（元）",
-  "rechargeRefundMoney": "充值退款",
-  "rechargeNo": "充值单号",
-  "orderStatus": "订单状态",
-  "rechargeNoPlaceholder": "请输入充值单号",
-  "createTime": "充值时间",
-  "rechargeMoney": "充值金额",
-  "orderMoney": "订单金额",
-  "member": "会员信息",
-  "orderFromName": "订单来源",
-  "payTypeName": "支付方式",
-  "startDate": "开始时间",
-  "endDate": "结束时间",
-  "namePlaceholder": "请选择",
-  "refundBtn": "退款",
-  "refundContent": "是否确认退款",
-  "payTime": "支付时间",
-  "refundStatus": "退款状态",
-  "startMoney": "起始金额",
-  "endMoney": "结束金额"
-}
+	"totalRechargeRefundMoney":"充值退款（元）",
+	"totalRechargeMoney":"充值金额（元）",
+	"rechargeRefundMoney":"充值退款",
+	"rechargeNo":"充值单号",
+	"orderStatus":"订单状态",
+	"rechargeNoPlaceholder":"请输入充值单号",
+	"createTime":"充值时间",
+	"rechargeMoney":"充值金额",
+	"orderMoney":"订单金额",
+	"member":"会员信息",
+	"orderFromName":"订单来源",
+	"payTypeName":"支付方式",
+	"startDate":"开始时间",
+	"endDate":"结束时间",
+	"namePlaceholder":"请选择",
+	"refundBtn":"退款",
+	"refundContent":"是否确认退款",
+	"payTime": "支付时间",
+	"refundStatus": "退款状态",
+	"startMoney": "起始金额",
+	"endMoney": "结束金额"
+} 
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/order.recharge.refund.json b/admin/src/app/lang/zh-cn/order.recharge.refund.json
index cc87ccb9..a02a18f7 100644
--- a/admin/src/app/lang/zh-cn/order.recharge.refund.json
+++ b/admin/src/app/lang/zh-cn/order.recharge.refund.json
@@ -1,24 +1,24 @@
 {
-  "refundNumber": "退款单号",
-  "userInfo": "用户信息",
-  "sourceNumber": "来源单号",
-  "refundAmount": "退款金额",
-  "refundTime": "退款时间",
-  "detail": "详情",
-  "statusName": "状态",
-  "memberInfo": "会员信息",
-  "refundSource": "退款来源",
-  "startDate": "开始时间",
-  "endDate": "结束时间",
-  "refundStatus": "退款状态",
-  "accumulateRefundMoney": "累计退款金额（元）",
-  "haveRefundMoney": "退款中金额（元）",
-  "refundSuccessMonry": "退款成功金额（元）",
-  "refundFailMoney": "退款失败金额（元）",
-  "memberInfoPlaceholder": "请输入会员编号/昵称/手机号",
-  "refundNumberPlaceholder": "请输入退款单号",
-  "orderNumber": "来源单号",
-  "orderNumberPlaceholder": "请输入来源单号",
-  "refundDetail": "退款详情",
-  "nickname": "会员昵称"
+      "refundNumber":"退款单号",
+      "userInfo":"用户信息",
+      "sourceNumber":"来源单号",
+      "refundAmount":"退款金额",
+      "refundTime":"退款时间",
+      "detail": "详情",
+	  "statusName": "状态",
+	  "memberInfo": "会员信息",
+	  "refundSource": "退款来源",
+	  "startDate":"开始时间",
+	  "endDate":"结束时间",
+	  "refundStatus": "退款状态",
+	  "accumulateRefundMoney": "累计退款金额（元）",
+	  "haveRefundMoney": "退款中金额（元）",
+	  "refundSuccessMonry": "退款成功金额（元）",
+	  "refundFailMoney": "退款失败金额（元）",
+	  "memberInfoPlaceholder":"请输入会员编号/昵称/手机号",
+	  "refundNumberPlaceholder":"请输入退款单号",
+	  "orderNumber": "来源单号",
+	  "orderNumberPlaceholder": "请输入来源单号",
+	  "refundDetail": "退款详情",
+	  "nickname": "会员昵称"
 }
diff --git a/admin/src/app/lang/zh-cn/physical_testing.physical_testing.json b/admin/src/app/lang/zh-cn/physical_testing.physical_testing.json
new file mode 100644
index 00000000..151ca208
--- /dev/null
+++ b/admin/src/app/lang/zh-cn/physical_testing.physical_testing.json
@@ -0,0 +1,29 @@
+{
+      "title":"课程标题",
+      "titlePlaceholder":"请输入课程标题",
+      "image":"预览图",
+      "imagePlaceholder":"请输入预览图",
+      "type":"素材类型",
+      "typePlaceholder":"请输入素材类型",
+      "content":"课程内容",
+      "contentPlaceholder":"请输入课程内容",
+      "status":"状态",
+      "statusPlaceholder":"请输入状态",
+      "createTime":"创建时间",
+      "createTimePlaceholder":"请输入创建时间",
+      "updateTime":"修改时间",
+      "updateTimePlaceholder":"请输入修改时间",
+      "userPermission":"用户权限",
+      "userPermissionPlaceholder":"请输入用户权限",
+      "addLessonCourseTeaching":"添加3-6岁体测",
+      "updateLessonCourseTeaching":"编辑3-6岁体测",
+      "lessonCourseTeachingDeleteTips":"确定要删除该数据吗？",
+      "startDate":"请选择开始时间",
+      "endDate":"请选择结束时间",
+      "addJumpLessonLibrary":"添加7+体测",
+      "updateJumpLessonLibrary":"编辑7+体测",
+      "addEnTeachingLibrary":"添加3-6岁体测讲解—解读",
+      "editEnTeachingLibrary":"编辑3-6岁体测讲解—解读",
+      "addBasketballTeachingLibrary":"添加7+岁体测讲解—解读",
+      "editBasketballTeachingLibrary":"编辑7+岁体测讲解—解读"
+}
diff --git a/admin/src/app/lang/zh-cn/poster.edit.json b/admin/src/app/lang/zh-cn/poster.edit.json
index 0f2eaf8c..58cfc82c 100644
--- a/admin/src/app/lang/zh-cn/poster.edit.json
+++ b/admin/src/app/lang/zh-cn/poster.edit.json
@@ -56,4 +56,6 @@
   "space": "字间距",
   "weight": "文字加粗",
   "imgShape": "图片形状"
-}
+  
+  
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/poster.list.json b/admin/src/app/lang/zh-cn/poster.list.json
index 16b5ffa6..ceb8ea19 100644
--- a/admin/src/app/lang/zh-cn/poster.list.json
+++ b/admin/src/app/lang/zh-cn/poster.list.json
@@ -15,4 +15,4 @@
   "diyPosterDeleteTips": "确定要删除该自定义海报吗？",
   "preview": "预览",
   "modifyDefault": "设为默认"
-}
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/printer.edit.json b/admin/src/app/lang/zh-cn/printer.edit.json
index 3f2b7000..c7163248 100644
--- a/admin/src/app/lang/zh-cn/printer.edit.json
+++ b/admin/src/app/lang/zh-cn/printer.edit.json
@@ -23,4 +23,4 @@
   "usePrintTemplate": "选择模板",
   "printNum": "打印联数",
   "printTypeEmpty": "缺少打印模板类型"
-}
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/printer.list.json b/admin/src/app/lang/zh-cn/printer.list.json
index d4092758..f4b66a64 100644
--- a/admin/src/app/lang/zh-cn/printer.list.json
+++ b/admin/src/app/lang/zh-cn/printer.list.json
@@ -16,4 +16,4 @@
   "testPrintTips": "确定测试打印吗",
   "refreshToken": "授权",
   "refreshTokenTips": "若易联云打印机在 [测试打印] 时提示 access_token过期或错误，请重新授权，是否重新授权"
-}
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/printer.template_edit.json b/admin/src/app/lang/zh-cn/printer.template_edit.json
index 7b62b560..a4972eab 100644
--- a/admin/src/app/lang/zh-cn/printer.template_edit.json
+++ b/admin/src/app/lang/zh-cn/printer.template_edit.json
@@ -8,4 +8,4 @@
   "templateEditLabel": "模板编辑",
   "preview": "预览图",
   "printTemplateEmpty": "打印模板不存在"
-}
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/printer.template_list.json b/admin/src/app/lang/zh-cn/printer.template_list.json
index 4bffdf42..bc65e6cf 100644
--- a/admin/src/app/lang/zh-cn/printer.template_list.json
+++ b/admin/src/app/lang/zh-cn/printer.template_list.json
@@ -8,4 +8,4 @@
   "createTime": "创建时间",
   "addPrinterTemplate": "添加小票打印模板",
   "printerTemplateDeleteTips": "确定要删除该数据吗？"
-}
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/professional_skills.professional_skills.json b/admin/src/app/lang/zh-cn/professional_skills.professional_skills.json
new file mode 100644
index 00000000..ff3dc10f
--- /dev/null
+++ b/admin/src/app/lang/zh-cn/professional_skills.professional_skills.json
@@ -0,0 +1,35 @@
+{
+      "title":"课程标题",
+      "titlePlaceholder":"请输入课程标题",
+      "image":"预览图",
+      "imagePlaceholder":"请输入预览图",
+      "type":"素材类型",
+      "typePlaceholder":"请输入素材类型",
+      "content":"课程内容",
+      "contentPlaceholder":"请输入课程内容",
+      "status":"状态",
+      "statusPlaceholder":"请输入状态",
+      "createTime":"创建时间",
+      "createTimePlaceholder":"请输入创建时间",
+      "updateTime":"修改时间",
+      "updateTimePlaceholder":"请输入修改时间",
+      "userPermission":"用户权限",
+      "userPermissionPlaceholder":"请输入用户权限",
+      "addLessonCourseTeaching":"添加优秀一堂课",
+      "updateLessonCourseTeaching":"编辑优秀一堂课",
+      "lessonCourseTeachingDeleteTips":"确定要删除该数据吗？",
+      "startDate":"请选择开始时间",
+      "endDate":"请选择结束时间",
+      "addJumpLessonLibrary":"添加空中忍者",
+      "updateJumpLessonLibrary":"编辑空中忍者",
+      "addEnTeachingLibrary":"添加篮球动作",
+      "editEnTeachingLibrary":"编辑篮球动作",
+      "addBasketballTeachingLibrary":"添加跳绳动作",
+      "editBasketballTeachingLibrary":"编辑跳绳动作",
+      "addStrengthenTeachingLibrary":"添加跑酷动作",
+      "editStrengthenTeachingLibrary":"编辑跑酷动作",
+      "addNinjaTeachingLibrary":"添加安防动作",
+      "editNinjaTeachingLibrary":"编辑安防动作",
+      "addSecurityTeachingLibrary":"添加标准化动作",
+      "editSecurityTeachingLibrary":"编辑标准化动作"
+}
diff --git a/admin/src/app/lang/zh-cn/setting.adminlogin.json b/admin/src/app/lang/zh-cn/setting.adminlogin.json
index 074dc7ea..35f71ff5 100644
--- a/admin/src/app/lang/zh-cn/setting.adminlogin.json
+++ b/admin/src/app/lang/zh-cn/setting.adminlogin.json
@@ -1,7 +1,7 @@
 {
-  "isCaptcha": "是否启用验证码",
-  "bgImg": "登录页广告图",
-  "admin": "平台端",
-  "adminBgImgTip": "建议上传尺寸为450*400px",
-  "siteBgImgTip": "建议上传尺寸为620*980px"
+      "isCaptcha": "是否启用验证码",
+      "bgImg": "登录页广告图",
+      "admin": "平台端",
+      "adminBgImgTip": "建议上传尺寸为450*400px",
+      "siteBgImgTip": "建议上传尺寸为620*980px"
 }
diff --git a/admin/src/app/lang/zh-cn/setting.agreement.json b/admin/src/app/lang/zh-cn/setting.agreement.json
index 90b10b38..fc4283c9 100644
--- a/admin/src/app/lang/zh-cn/setting.agreement.json
+++ b/admin/src/app/lang/zh-cn/setting.agreement.json
@@ -1,6 +1,6 @@
 {
-  "typeName": "协议类型",
-  "title": "协议标题",
-  "updateTime": "修改时间",
-  "config": "设置"
-}
+      "typeName": "协议类型",
+      "title": "协议标题",
+      "updateTime": "修改时间",
+      "config": "设置"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/setting.agreement_edit.json b/admin/src/app/lang/zh-cn/setting.agreement_edit.json
index 647cd9cc..cea2bec8 100644
--- a/admin/src/app/lang/zh-cn/setting.agreement_edit.json
+++ b/admin/src/app/lang/zh-cn/setting.agreement_edit.json
@@ -1,8 +1,8 @@
 {
-  "title": "协议标题",
-  "type": "协议类型",
-  "titlePlaceholder": "请输入协议标题",
-  "contentPlaceholder": "请填写协议内容",
-  "contentMaxTips": "协议内容字符数应在5～100000之间",
-  "content": "内容"
+      "title": "协议标题",
+      "type": "协议类型",
+      "titlePlaceholder": "请输入协议标题",
+      "contentPlaceholder": "请填写协议内容",
+      "contentMaxTips": "协议内容字符数应在5～100000之间",
+      "content": "内容"
 }
diff --git a/admin/src/app/lang/zh-cn/setting.cash_out.json b/admin/src/app/lang/zh-cn/setting.cash_out.json
index fae19efe..2baee5f7 100644
--- a/admin/src/app/lang/zh-cn/setting.cash_out.json
+++ b/admin/src/app/lang/zh-cn/setting.cash_out.json
@@ -1,21 +1,21 @@
 {
-  "isOpen": "是否开启",
-  "cashWithdrawalAmount": "最低提现金额",
-  "cashWithdrawalAmountPlaceholder": "请输入提现金额",
-  "cashWithdrawalAmountHint": "最低提现金额不能小于0.01",
-  "commissionRatio": "提现手续费比率",
-  "commissionRatioHint": "提现手续费比率不能超出0-100%的范围",
-  "commissionRatioPlaceholder": "请输入提现手续费比率",
-  "audit": "审核",
-  "transfer": "转账",
-  "transferMode": "转账方式",
-  "automaticAudit": "自动审核",
-  "manualAudit": "手动审核",
-  "automatedTransit": "自动转账",
-  "manualTransfer": "手动转账",
-  "wechat": "微信",
-  "alipay": "支付宝",
-  "minTips": "注意：微信零钱最低提现金额为0.1",
-  "transferTips": "只有微信零钱支持自动转账,微信零钱可能会遇到资金不足、超过当日转账上限等因素的情况下会导致转账失败，停留在待转账状态下，需要管理员手动在后台操作",
-  "transferModeTips": "仅有微信零钱这一种转账方式支持线上打款,其余转账方式皆只支持线下打款"
-}
+      "isOpen": "是否开启",
+      "cashWithdrawalAmount": "最低提现金额",
+      "cashWithdrawalAmountPlaceholder": "请输入提现金额",
+      "cashWithdrawalAmountHint": "最低提现金额不能小于0.01",
+      "commissionRatio": "提现手续费比率",
+      "commissionRatioHint": "提现手续费比率不能超出0-100%的范围",
+      "commissionRatioPlaceholder": "请输入提现手续费比率",
+      "audit": "审核",
+      "transfer": "转账",
+      "transferMode": "转账方式",
+      "automaticAudit": "自动审核",
+      "manualAudit": "手动审核",
+      "automatedTransit": "自动转账",
+      "manualTransfer": "手动转账",
+      "wechat": "微信",
+      "alipay": "支付宝",
+      "minTips":"注意：微信零钱最低提现金额为0.1",
+      "transferTips":"只有微信零钱支持自动转账,微信零钱可能会遇到资金不足、超过当日转账上限等因素的情况下会导致转账失败，停留在待转账状态下，需要管理员手动在后台操作",
+      "transferModeTips":"仅有微信零钱这一种转账方式支持线上打款,其余转账方式皆只支持线下打款"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/setting.copyright.json b/admin/src/app/lang/zh-cn/setting.copyright.json
index 4ea23757..5a6218b7 100644
--- a/admin/src/app/lang/zh-cn/setting.copyright.json
+++ b/admin/src/app/lang/zh-cn/setting.copyright.json
@@ -1,22 +1,23 @@
 {
-  "copyrightEdit": "基础设置",
-  "putOnRecordEdit": "备案设置",
+      "copyrightEdit":"基础设置",
+      "putOnRecordEdit":"备案设置",
 
-  "companyName": "公司名称",
-  "copyrightLink": "版权链接",
-  "copyrightDesc": "版权信息",
+      "companyName": "公司名称",
+      "copyrightLink": "版权链接",
+      "copyrightDesc": "版权信息",
 
-  "icp": "网站ICP备案号",
-  "govRecord": "网站公安备案",
-  "govUrl": "网站公安链接",
-  "marketSupervisionUrl": "市场监督管理局链接",
+      "icp": "网站ICP备案号",
+      "govRecord": "网站公安备案",
+      "govUrl": "网站公安链接",
+      "marketSupervisionUrl": "市场监督管理局链接",
 
-  "companyNamePlaceholder": "请输入公司名称",
-  "copyrightLinkPlaceholder": "请输入版权链接",
-  "copyrightDescPlaceholder": "请输入版权信息",
+      "companyNamePlaceholder": "请输入公司名称",
+      "copyrightLinkPlaceholder": "请输入版权链接",
+      "copyrightDescPlaceholder": "请输入版权信息",
 
-  "icpPlaceholder": "请输入网站ICP备案号",
-  "govRecordPlaceholder": "请输入网站公安备案",
-  "govUrlPlaceholder": "请输入网站公安链接",
-  "marketSupervisionUrlPlaceholder": "请输入市场监督管理局链接"
-}
+      "icpPlaceholder": "请输入网站ICP备案号",
+      "govRecordPlaceholder": "请输入网站公安备案",
+      "govUrlPlaceholder": "请输入网站公安链接",
+      "marketSupervisionUrlPlaceholder": "请输入市场监督管理局链接"
+      
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/setting.developer_token.json b/admin/src/app/lang/zh-cn/setting.developer_token.json
index 0b58ee78..583e3628 100644
--- a/admin/src/app/lang/zh-cn/setting.developer_token.json
+++ b/admin/src/app/lang/zh-cn/setting.developer_token.json
@@ -1,5 +1,5 @@
 {
-  "developerTokenEdit": "开发者KEY设置",
-  "tokenPlaceholder": "请输入开发者令牌",
-  "tokenTips": "开发者KEY可以在已安装的框架中设置。框架安装并配置好开发者KEY后，开发者自己开发的应用和插件，会像普通授权插件一样可以安装使用，特别是当开发者发布自己开发的插件或应用时，尚在未发布状态时，开发者也可以对其进行安装测试"
+  	"developerTokenEdit":"开发者KEY设置",
+	"tokenPlaceholder":"请输入开发者令牌",
+	"tokenTips": "开发者KEY可以在已安装的框架中设置。框架安装并配置好开发者KEY后，开发者自己开发的应用和插件，会像普通授权插件一样可以安装使用，特别是当开发者发布自己开发的插件或应用时，尚在未发布状态时，开发者也可以对其进行安装测试"
 }
diff --git a/admin/src/app/lang/zh-cn/setting.export.json b/admin/src/app/lang/zh-cn/setting.export.json
index 2b662a50..bad29bf8 100644
--- a/admin/src/app/lang/zh-cn/setting.export.json
+++ b/admin/src/app/lang/zh-cn/setting.export.json
@@ -1,15 +1,15 @@
 {
-  "exportKey": "数据类型",
-  "exportKeyPlaceholder": "请输入主题关键字",
-  "exportStatus": "导出状态",
-  "exportStatusPlaceholder": "请选择导出状态",
-  "createTime": "导出时间",
-  "id": "编号",
-  "exportNum": "导出数据数量",
-  "filePath": "文件存储路径",
-  "fileSize": "文件大小",
-  "download": "下载",
-  "exportDeleteTips": "确定要删除该导出报表吗？",
-  "startDate": "开始时间",
-  "endDate": "结束时间"
-}
+      "exportKey": "数据类型",
+      "exportKeyPlaceholder": "请输入主题关键字",
+      "exportStatus": "导出状态",
+      "exportStatusPlaceholder": "请选择导出状态",
+      "createTime": "导出时间",
+      "id": "编号",
+      "exportNum": "导出数据数量",
+      "filePath": "文件存储路径",
+      "fileSize": "文件大小",
+      "download": "下载",
+      "exportDeleteTips":"确定要删除该导出报表吗？",
+      "startDate": "开始时间",
+	"endDate": "结束时间"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/setting.growth_rule.json b/admin/src/app/lang/zh-cn/setting.growth_rule.json
index 81dbb7e4..f9f770d7 100644
--- a/admin/src/app/lang/zh-cn/setting.growth_rule.json
+++ b/admin/src/app/lang/zh-cn/setting.growth_rule.json
@@ -1,5 +1,5 @@
 {
-  "memberLevel": "会员等级",
-  "growthRule": "成长值规则",
-  "growthDetail": "成长值明细"
+	"memberLevel": "会员等级",
+	"growthRule": "成长值规则",
+	"growthDetail": "成长值明细"
 }
diff --git a/admin/src/app/lang/zh-cn/setting.layout.json b/admin/src/app/lang/zh-cn/setting.layout.json
index c51741c3..9c6f8bbf 100644
--- a/admin/src/app/lang/zh-cn/setting.layout.json
+++ b/admin/src/app/lang/zh-cn/setting.layout.json
@@ -1,9 +1,9 @@
 {
-  "app": "应用",
-  "setting": "设置",
-  "selectLayout": "选择布局",
-  "emptyData": "还没有安装应用",
-  "manyApp": "多应用",
-  "layout": "布局",
-  "themeColor": "色调"
+	"app": "应用",
+	"setting": "设置",
+	"selectLayout": "选择布局",
+	"emptyData": "还没有安装应用",
+	"manyApp": "多应用",
+	"layout": "布局",
+	"themeColor": "色调"
 }
diff --git a/admin/src/app/lang/zh-cn/setting.login.json b/admin/src/app/lang/zh-cn/setting.login.json
index 68d8b382..8cdf72a5 100644
--- a/admin/src/app/lang/zh-cn/setting.login.json
+++ b/admin/src/app/lang/zh-cn/setting.login.json
@@ -20,4 +20,4 @@
   "bgUrlPlaceholder": "建议图片尺寸：750*669像素；图片格式：jpg、png、jpeg",
   "desc": "描述",
   "descPlaceholder": "请输入描述"
-}
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/setting.map.json b/admin/src/app/lang/zh-cn/setting.map.json
index 2d8d4958..346d9fc7 100644
--- a/admin/src/app/lang/zh-cn/setting.map.json
+++ b/admin/src/app/lang/zh-cn/setting.map.json
@@ -1,11 +1,11 @@
 {
-  "clickTutorial": "查看教程",
-  "clickSecretKey": "获取密钥",
-  "isOpen": "定位开关",
-  "validTime": "定位有效期",
-  "minutes": "分钟",
-  "validTimeTips": "过期后将重新获取定位信息",
-  "validTimePlaceholder": "请输入定位有效期",
-  "validTimeFormatTips": "格式输入错误",
-  "validTimeNotZeroTips": "定位有效期不能小于5分钟"
-}
+    "clickTutorial": "查看教程",
+    "clickSecretKey": "获取密钥",
+    "isOpen": "定位开关",
+    "validTime": "定位有效期",
+    "minutes": "分钟",
+    "validTimeTips": "过期后将重新获取定位信息",
+    "validTimePlaceholder": "请输入定位有效期",
+    "validTimeFormatTips": "格式输入错误",
+    "validTimeNotZeroTips": "定位有效期不能小于5分钟"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/setting.member.json b/admin/src/app/lang/zh-cn/setting.member.json
index 946e92ba..3cc0ff61 100644
--- a/admin/src/app/lang/zh-cn/setting.member.json
+++ b/admin/src/app/lang/zh-cn/setting.member.json
@@ -1,11 +1,11 @@
 {
-  "memberNoRule": "会员编号生成规则",
-  "prefix": "编码前缀",
-  "prefixPlaceholder": "请输入编码前缀",
-  "prefixHint": "编码前缀只能为英文字母",
-  "lengthHint": "编码长度包含前缀，去除前缀最少不能低于4位,最多不能超过30位",
-  "prefixTips": "编码格式如：",
-  "length": "编码长度",
-  "lengthPlaceholder": "请输入编码长度",
-  "lengthTips": "编码长度包含前缀，去除前缀最少不能低于4位,最多不能超过30位"
-}
+	"memberNoRule": "会员编号生成规则",
+	"prefix": "编码前缀",
+	"prefixPlaceholder": "请输入编码前缀",
+	"prefixHint":"编码前缀只能为英文字母",
+	"lengthHint":"编码长度包含前缀，去除前缀最少不能低于4位,最多不能超过30位",
+	"prefixTips": "编码格式如：",
+	"length": "编码长度",
+	"lengthPlaceholder": "请输入编码长度",
+	"lengthTips": "编码长度包含前缀，去除前缀最少不能低于4位,最多不能超过30位"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/setting.notice.json b/admin/src/app/lang/zh-cn/setting.notice.json
index a3def035..2482e1d8 100644
--- a/admin/src/app/lang/zh-cn/setting.notice.json
+++ b/admin/src/app/lang/zh-cn/setting.notice.json
@@ -1,23 +1,23 @@
 {
-  "buyerNotice": "会员消息",
-  "sellerNotice": "商家消息",
-  "sms": "短信",
-  "weapp": "微信小程序",
-  "wechat": "微信公众号",
-  "noticeSetting": "消息设置",
-  "name": "模板名称",
-  "title": "场景",
-  "smsContent": "短信内容",
-  "tempKey": "模板消息ID",
-  "keywordNameList": "类目模板",
-  "first": "头部标题",
-  "remark": "尾部描述",
-  "firstPlaceholder": "请输入头部标题",
-  "remarkPlaceholder": "请输入尾部描述",
-  "content": "模板内容",
-  "weappTempKey": "模板编号",
-  "smsId": "短信模版ID",
-  "smsIdPlaceholder": "短信模版ID",
-  "noticeType": "消息类型",
-  "addon": "所属应用"
+      "buyerNotice": "会员消息",
+      "sellerNotice":"商家消息",
+      "sms":"短信",
+      "weapp":"微信小程序",
+      "wechat":"微信公众号",
+      "noticeSetting":"消息设置",
+      "name": "模板名称",
+      "title": "场景",
+      "smsContent": "短信内容",
+      "tempKey": "模板消息ID",
+      "keywordNameList": "类目模板",
+      "first": "头部标题",
+      "remark": "尾部描述",
+      "firstPlaceholder": "请输入头部标题",
+      "remarkPlaceholder": "请输入尾部描述",
+      "content": "模板内容",
+      "weappTempKey" : "模板编号",
+      "smsId":"短信模版ID",
+      "smsIdPlaceholder":"短信模版ID",
+      "noticeType":"消息类型",
+      "addon": "所属应用"
 }
diff --git a/admin/src/app/lang/zh-cn/setting.notice_records.json b/admin/src/app/lang/zh-cn/setting.notice_records.json
index b4933ab8..8c3eeda8 100644
--- a/admin/src/app/lang/zh-cn/setting.notice_records.json
+++ b/admin/src/app/lang/zh-cn/setting.notice_records.json
@@ -1,35 +1,35 @@
 {
-  "noticeKey": "消息模板",
-  "noticeKeyPlaceholder": "请选择消息模板",
-  "noticeType": "消息类型",
-  "noticeInfo": "消息详情",
-  "uid": "通知的用户id",
-  "memberId": "消息的会员id",
-  "nickname": "接收会员",
-  "receiver": "手机/OPENID",
-  "noticeData": "消息内容",
-  "isClick": "点击次数",
-  "searchReceiver": "接收人",
-  "isVisit": "访问次数",
-  "createTime": "发送时间",
-  "startDate": "开始时间",
-  "endDate": "结束时间",
-  "sms": "短信",
-  "weapp": "微信小程序",
-  "wechat": "微信公众号",
-  "noticeTypePlaceholder": "请选择消息类型",
-  "uidPlaceholder": "请输入通知的用户id",
-  "memberIdPlaceholder": "请输入消息的会员id",
-  "nicknamePlaceholder": "请输入接收人用户昵称或姓名",
-  "receiverPlaceholder": "请输入接收人手机号/openid",
-  "noticeDataPlaceholder": "请输入消息数据",
-  "isClickPlaceholder": "请输入点击次数",
-  "isVisitPlaceholder": "请输入访问次数",
-  "visitTimePlaceholder": "请输入访问时间",
-  "createTimePlaceholder": "请输入消息时间",
-  "buyerNotice": "会员消息",
-  "messageKey": "消息模版",
-  "messageInfo": "发送记录详情",
-  "smsType": "短信类型",
-  "sellerNotice": "平台消息"
-}
+	"noticeKey":"消息模板",
+	"noticeKeyPlaceholder":"请选择消息模板",
+	"noticeType":"消息类型",
+	"noticeInfo":"消息详情",
+	"uid":"通知的用户id",
+	"memberId":"消息的会员id",
+	"nickname":"接收会员",
+	"receiver":"手机/OPENID",
+	"noticeData":"消息内容",
+	"isClick":"点击次数",
+	"searchReceiver":"接收人",
+	"isVisit":"访问次数",
+	"createTime":"发送时间",
+	"startDate":"开始时间",
+	"endDate":"结束时间",
+	"sms":"短信",
+	"weapp":"微信小程序",
+	"wechat":"微信公众号",
+	"noticeTypePlaceholder":"请选择消息类型",
+	"uidPlaceholder":"请输入通知的用户id",
+	"memberIdPlaceholder":"请输入消息的会员id",
+	"nicknamePlaceholder":"请输入接收人用户昵称或姓名",
+	"receiverPlaceholder":"请输入接收人手机号/openid",
+	"noticeDataPlaceholder":"请输入消息数据",
+	"isClickPlaceholder":"请输入点击次数",
+	"isVisitPlaceholder":"请输入访问次数",
+	"visitTimePlaceholder":"请输入访问时间",
+	"createTimePlaceholder":"请输入消息时间",
+	"buyerNotice": "会员消息",
+	"messageKey":"消息模版",
+	"messageInfo":"发送记录详情",
+	"smsType":"短信类型",
+	"sellerNotice":"平台消息"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/setting.pay.json b/admin/src/app/lang/zh-cn/setting.pay.json
index 8875a8b6..8721761b 100644
--- a/admin/src/app/lang/zh-cn/setting.pay.json
+++ b/admin/src/app/lang/zh-cn/setting.pay.json
@@ -1,87 +1,87 @@
 {
-  "status": "是否启用",
-  "name": "支付类型",
-  "wechatpay": "微信支付",
-  "alipay": "支付宝支付",
-  "paydesc": "支付方式描述",
-  "wechatpayDesc": "微信支付，用户通过扫描二维码、微信内打开商品页面购买等多种方式调起微信支付模块完成支付。",
-  "alipayDesc": "支付宝网站(www.alipay.com) 是国内先进的网上支付平台。",
-  "config": "设置",
-  "updateWechat": "微信支付",
-  "updateAlipay": "支付宝支付",
-  "updateOfflinepay": "线下支付",
-  "mchId": "商户号",
-  "mchIdPlaceholder": "请输入商户号",
-  "mchIdTips": "微信支付商户号（MCHID）",
-  "mchSecretKey": "APIv3密钥",
-  "mchSecretKeyPlaceholder": "请输入APIv3密钥",
-  "mchSecretKeyTips": "微信支付商户APIv3密钥（paySignKey）",
-  "mchSecretCert": "商户私钥",
-  "mchSecretCertPlaceholder": "请上传商户私钥",
-  "mchSecretCertTips": "微信支付API证书（apiclient_key.pem）",
-  "mchPublicCertPath": "商户公钥",
-  "mchPublicCertPathPlaceholder": "请上传商户公钥",
-  "mchPublicCertPathTips": "微信支付API证书（apiclient_cert.pem）",
-  "appId": "支付宝应用ID",
-  "appIdPlaceholder": "请输入支付宝应用ID",
-  "appSecretCert": "应用私钥",
-  "appSecretCertPlaceholder": "请输入应用私钥",
-  "appPublicCertPath": "应用公钥",
-  "appPublicCertPathPlaceholder": "请上传应用公钥",
-  "alipayPublicCertPath": "支付宝公钥",
-  "alipayPublicCertPathPlaceholder": "请上传支付宝公钥",
-  "alipayRootCertPath": "支付宝根证书",
-  "alipayRootCertPathPlaceholder": "请上传支付宝根证书",
-  "appIdTips": "支付宝分配给开发者的应用ID",
-  "appPublicCertPathTips": "上传appCertPublicKey文件",
-  "alipayPublicCertPathTips": "上传alipayCertPublicKey文件",
-  "alipayRootCertPathTips": "上传alipayRootCert文件",
-  "payType": "支付方式",
-  "templateName": "配置信息",
-  "settingDefaultPay": "设置默认支付",
-  "settingDefault": "设置默认",
-  "defaultTamplate": "请选择模板",
-  "isEnable": "是否启用",
-  "onState": "开启状态",
-  "configurePaymentMethod": "请先配置该支付方式",
-  "enablePaymentMode": "请先开启该支付方式",
-  "clickConfigure": "点击配置",
-  "setConfig": "设置支付配置",
-  "open": "已开启",
-  "notOpen": "未开启",
-  "cancel": "取消",
-  "collectionName": "收款账户名称",
-  "collectionBank": "收款银行",
-  "collectionAccount": "收款账号",
-  "collectionDesc": "转账说明",
-  "collectionNamePlaceholder": "请输入收款账户名称",
-  "collectionBankPlaceholder": "请输入收款银行",
-  "collectionAccountPlaceholder": "请输入收款账号",
-  "collectionDescPlaceholder": "请输入转账说明",
-  "jsapiDir": "JSAPI支付授权目录",
-  "jsapiDirTips": "需在微信商户号>产品中心>开发配置>支付配置 支付授权目录中添加该链接",
-  "h5Domain": "H5支付域名",
-  "h5DomainTips": "需在微信商户号>产品中心>开发配置>支付配置 H5支付域名中添加该域名",
-  "nativeDomain": "Native支付回调链接",
-  "nativeDomainTips": "需在微信商户号>产品中心>开发配置>支付配置 Native支付回调链接中添加该链接",
-  "wechatpayPublicCert": "微信支付公钥",
-  "wechatpayPublicCertId": "微信支付公钥ID",
-  "updateFriendsPay": "找朋友帮忙付",
-  "friendsPaySwitch": "帮付说明",
-  "friendsPayTitle": "帮付说明标题",
-  "friendsPayTitlePlaceholder": "请输入帮付说明标题",
-  "desContent": "说明内容",
-  "friendsPayGoodsSwitch": "订单信息清单",
-  "friendsPayGoodsSwitchTips": "开启后，帮付人可以看到订单信息清单",
-  "friendsPayName": "支付方式名称",
-  "friendsPayNamePlaceholder": "请输入支付方式名称",
-  "desContentPlaceholder": "请输入说明内容",
-  "helpName": "帮付页面名称",
-  "helpNamePlaceholder": "请输入帮付页面名称",
-  "helpBtn": "帮付按钮名称",
-  "helpBtnPlaceholder": "请输入帮付按钮名称",
-  "remark": "发起帮付留言",
-  "remarkPlaceholder": "请输入留言备注",
-  "payWechatImage": "默认分享图片（公众号）",
-  "payWeappImage": "默认分享图片（小程序）"
+    "status": "是否启用",
+    "name": "支付类型",
+    "wechatpay": "微信支付",
+    "alipay": "支付宝支付",
+    "paydesc": "支付方式描述",
+    "wechatpayDesc": "微信支付，用户通过扫描二维码、微信内打开商品页面购买等多种方式调起微信支付模块完成支付。",
+    "alipayDesc": "支付宝网站(www.alipay.com) 是国内先进的网上支付平台。",
+    "config": "设置",
+    "updateWechat": "微信支付",
+    "updateAlipay": "支付宝支付",
+    "updateOfflinepay": "线下支付",
+    "mchId": "商户号",
+    "mchIdPlaceholder": "请输入商户号",
+    "mchIdTips": "微信支付商户号（MCHID）",
+    "mchSecretKey": "APIv3密钥",
+    "mchSecretKeyPlaceholder": "请输入APIv3密钥",
+    "mchSecretKeyTips": "微信支付商户APIv3密钥（paySignKey）",
+    "mchSecretCert": "商户私钥",
+    "mchSecretCertPlaceholder": "请上传商户私钥",
+    "mchSecretCertTips": "微信支付API证书（apiclient_key.pem）",
+    "mchPublicCertPath": "商户公钥",
+    "mchPublicCertPathPlaceholder": "请上传商户公钥",
+    "mchPublicCertPathTips": "微信支付API证书（apiclient_cert.pem）",
+    "appId": "支付宝应用ID",
+    "appIdPlaceholder": "请输入支付宝应用ID",
+    "appSecretCert": "应用私钥",
+    "appSecretCertPlaceholder": "请输入应用私钥",
+    "appPublicCertPath": "应用公钥",
+    "appPublicCertPathPlaceholder": "请上传应用公钥",
+    "alipayPublicCertPath": "支付宝公钥",
+    "alipayPublicCertPathPlaceholder": "请上传支付宝公钥",
+    "alipayRootCertPath": "支付宝根证书",
+    "alipayRootCertPathPlaceholder": "请上传支付宝根证书",
+    "appIdTips": "支付宝分配给开发者的应用ID",
+    "appPublicCertPathTips": "上传appCertPublicKey文件",
+    "alipayPublicCertPathTips": "上传alipayCertPublicKey文件",
+    "alipayRootCertPathTips": "上传alipayRootCert文件",
+	"payType": "支付方式",
+	"templateName": "配置信息",
+	"settingDefaultPay": "设置默认支付",
+	"settingDefault": "设置默认",
+	"defaultTamplate": "请选择模板",
+    "isEnable": "是否启用",
+    "onState": "开启状态",
+    "configurePaymentMethod": "请先配置该支付方式",
+    "enablePaymentMode": "请先开启该支付方式",
+    "clickConfigure": "点击配置",
+    "setConfig": "设置支付配置",
+    "open": "已开启",
+    "notOpen": "未开启",
+    "cancel": "取消",
+    "collectionName": "收款账户名称",
+    "collectionBank": "收款银行",
+    "collectionAccount": "收款账号",
+    "collectionDesc": "转账说明",
+    "collectionNamePlaceholder": "请输入收款账户名称",
+    "collectionBankPlaceholder": "请输入收款银行",
+    "collectionAccountPlaceholder": "请输入收款账号",
+    "collectionDescPlaceholder": "请输入转账说明",
+    "jsapiDir": "JSAPI支付授权目录",
+    "jsapiDirTips": "需在微信商户号>产品中心>开发配置>支付配置 支付授权目录中添加该链接",
+    "h5Domain": "H5支付域名",
+    "h5DomainTips": "需在微信商户号>产品中心>开发配置>支付配置 H5支付域名中添加该域名",
+    "nativeDomain": "Native支付回调链接",
+    "nativeDomainTips": "需在微信商户号>产品中心>开发配置>支付配置 Native支付回调链接中添加该链接",
+    "wechatpayPublicCert": "微信支付公钥",
+    "wechatpayPublicCertId": "微信支付公钥ID",
+    "updateFriendsPay":"找朋友帮忙付",
+    "friendsPaySwitch":"帮付说明",
+    "friendsPayTitle":"帮付说明标题",
+    "friendsPayTitlePlaceholder":"请输入帮付说明标题",
+    "desContent":"说明内容",
+    "friendsPayGoodsSwitch":"订单信息清单",
+    "friendsPayGoodsSwitchTips":"开启后，帮付人可以看到订单信息清单",
+    "friendsPayName":"支付方式名称",
+    "friendsPayNamePlaceholder":"请输入支付方式名称",
+    "desContentPlaceholder": "请输入说明内容",
+    "helpName":"帮付页面名称",
+    "helpNamePlaceholder":"请输入帮付页面名称",
+    "helpBtn":"帮付按钮名称",
+    "helpBtnPlaceholder":"请输入帮付按钮名称",
+    "remark":"发起帮付留言",
+    "remarkPlaceholder":"请输入留言备注",
+    "payWechatImage":"默认分享图片（公众号）",
+    "payWeappImage":"默认分享图片（小程序）"
 }
diff --git a/admin/src/app/lang/zh-cn/setting.sms.json b/admin/src/app/lang/zh-cn/setting.sms.json
index edbc8fb0..2214832f 100644
--- a/admin/src/app/lang/zh-cn/setting.sms.json
+++ b/admin/src/app/lang/zh-cn/setting.sms.json
@@ -1,21 +1,21 @@
 {
-  "name": "短信类型",
-  "aliSms": "阿里云短信",
-  "tencentSms": "腾讯云短信",
-  "isUse": "是否启用",
-  "config": "设置",
-  "aliAppKey": "APP_KEY",
-  "aliSign": "短信签名",
-  "aliSecretKey": "SECRET_KEY",
-  "aliAppKeyPlaceholder": "请输入APP_KEY",
-  "aliSignPlaceholder": "请输入短信签名",
-  "aliSecretKeyPlaceholder": "请输入SECRET_KEY",
-  "tencentSign": "短信签名",
-  "tencentAppId": "APP_ID",
-  "tencentSecretId": "SECRET_ID",
-  "tencentSecretKey": "SECRET_KEY",
-  "tencentSignPlaceholder": "请输入短信签名",
-  "tencentAppIdPlaceholder": "请输入APP_ID",
-  "tencentSecretIdPlaceholder": "请输入SECRET_ID",
-  "tencentSecretKeyPlaceholder": "请输入SECRET_KEY"
-}
+      "name": "短信类型",
+      "aliSms":"阿里云短信",
+      "tencentSms": "腾讯云短信",
+      "isUse":"是否启用",
+      "config":"设置",
+      "aliAppKey": "APP_KEY",
+      "aliSign":"短信签名",
+      "aliSecretKey":"SECRET_KEY",
+      "aliAppKeyPlaceholder": "请输入APP_KEY",
+      "aliSignPlaceholder":"请输入短信签名",
+      "aliSecretKeyPlaceholder":"请输入SECRET_KEY",
+      "tencentSign":"短信签名",
+      "tencentAppId":"APP_ID",
+      "tencentSecretId":"SECRET_ID",
+      "tencentSecretKey":"SECRET_KEY",
+      "tencentSignPlaceholder":"请输入短信签名",
+      "tencentAppIdPlaceholder":"请输入APP_ID",
+      "tencentSecretIdPlaceholder":"请输入SECRET_ID",
+      "tencentSecretKeyPlaceholder":"请输入SECRET_KEY"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/setting.sms_records.json b/admin/src/app/lang/zh-cn/setting.sms_records.json
index 33c15cd1..5cf4f6b2 100644
--- a/admin/src/app/lang/zh-cn/setting.sms_records.json
+++ b/admin/src/app/lang/zh-cn/setting.sms_records.json
@@ -1,35 +1,35 @@
 {
-  "noticeKey": "消息模板",
-  "noticeKeyPlaceholder": "请选择消息模板",
-  "noticeType": "消息类型",
-  "noticeInfo": "消息详情",
-  "uid": "通知的用户id",
-  "memberId": "消息的会员id",
-  "nickname": "接收会员",
-  "receiver": "手机号",
-  "noticeData": "消息内容",
-  "isClick": "点击次数",
-  "searchReceiver": "接收人",
-  "isVisit": "访问次数",
-  "createTime": "发送时间",
-  "startDate": "开始时间",
-  "endDate": "结束时间",
-  "sms": "短信",
-  "weapp": "微信小程序",
-  "wechat": "微信公众号",
-  "noticeTypePlaceholder": "请选择消息类型",
-  "uidPlaceholder": "请输入通知的用户id",
-  "memberIdPlaceholder": "请输入消息的会员id",
-  "nicknamePlaceholder": "请输入接收人用户昵称或姓名",
-  "receiverPlaceholder": "请输入接收人手机号",
-  "noticeDataPlaceholder": "请输入消息数据",
-  "isClickPlaceholder": "请输入点击次数",
-  "isVisitPlaceholder": "请输入访问次数",
-  "visitTimePlaceholder": "请输入访问时间",
-  "createTimePlaceholder": "请输入消息时间",
-  "buyerNotice": "会员消息",
-  "messageKey": "消息模版",
-  "messageInfo": "发送记录详情",
-  "smsType": "短信类型",
-  "sellerNotice": "平台消息"
-}
+	"noticeKey":"消息模板",
+	"noticeKeyPlaceholder":"请选择消息模板",
+	"noticeType":"消息类型",
+	"noticeInfo":"消息详情",
+	"uid":"通知的用户id",
+	"memberId":"消息的会员id",
+	"nickname":"接收会员",
+	"receiver":"手机号",
+	"noticeData":"消息内容",
+	"isClick":"点击次数",
+	"searchReceiver":"接收人",
+	"isVisit":"访问次数",
+	"createTime":"发送时间",
+	"startDate":"开始时间",
+	"endDate":"结束时间",
+	"sms":"短信",
+	"weapp":"微信小程序",
+	"wechat":"微信公众号",
+	"noticeTypePlaceholder":"请选择消息类型",
+	"uidPlaceholder":"请输入通知的用户id",
+	"memberIdPlaceholder":"请输入消息的会员id",
+	"nicknamePlaceholder":"请输入接收人用户昵称或姓名",
+	"receiverPlaceholder":"请输入接收人手机号",
+	"noticeDataPlaceholder":"请输入消息数据",
+	"isClickPlaceholder":"请输入点击次数",
+	"isVisitPlaceholder":"请输入访问次数",
+	"visitTimePlaceholder":"请输入访问时间",
+	"createTimePlaceholder":"请输入消息时间",
+	"buyerNotice": "会员消息",
+	"messageKey":"消息模版",
+    "messageInfo":"发送记录详情",
+    "smsType":"短信类型",
+	"sellerNotice":"平台消息"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/setting.storage.json b/admin/src/app/lang/zh-cn/setting.storage.json
index 9e8b0b94..d63a010c 100644
--- a/admin/src/app/lang/zh-cn/setting.storage.json
+++ b/admin/src/app/lang/zh-cn/setting.storage.json
@@ -1,42 +1,44 @@
 {
-  "name": "存储方式",
-  "aliStorage": "阿里云存储",
-  "localStorage": "本地存储",
-  "qiniuStorage": "七牛云存储",
-  "tencentStorage": "腾讯云存储",
-  "isUse": "是否启用",
-  "config": "设置",
-  "aliBucket": "存储空间",
-  "aliAccessKey": "AccessKeyID",
-  "aliSecretKey": "AccessKeySecret",
-  "aliEndpoint": "Endpoint",
-  "domain": "空间域名",
-  "domainPlaceholder": "请输入空间域名",
-  "aliBucketPlaceholder": "请输入存储空间",
-  "aliAccessKeyPlaceholder": "请输入AccessKeyID",
-  "aliSecretKeyPlaceholder": "请输入AccessKeySecret",
-  "aliEndpointPlaceholder": "请输入Endpoint",
-  "aliBucketTips": "存储空间与阿里云OSS开通对象名称一致",
-  "aliAccessKeyTips": "填写阿里云Access Key管理的(ID)。",
-  "aliSecretKeyTips": "Access Key Secret是您访问阿里云API的密钥，具有该账户完全的权限，请您妥善保管。(填写完Access Key ID 和 Access Key Secret 后请选择bucket)",
-  "aliEndpointTips": "Bucket地域endpoint",
-  "aliDomainTips": "域名格式：http://xx.xxxx.com/（不可绑定当前网站域名，建议新开二级域名）",
+      "name": "存储方式",
+      "aliStorage":"阿里云存储",
+      "localStorage": "本地存储",
+      "qiniuStorage": "七牛云存储",
+      "tencentStorage": "腾讯云存储",
+      "isUse":"是否启用",
+      "config":"设置",
+      "aliBucket": "存储空间",
+      "aliAccessKey": "AccessKeyID",
+      "aliSecretKey": "AccessKeySecret",
+      "aliEndpoint": "Endpoint",
+      "domain": "空间域名",
+      "domainPlaceholder": "请输入空间域名",
+      "aliBucketPlaceholder": "请输入存储空间",
+      "aliAccessKeyPlaceholder": "请输入AccessKeyID",
+      "aliSecretKeyPlaceholder": "请输入AccessKeySecret",
+      "aliEndpointPlaceholder": "请输入Endpoint",
+      "aliBucketTips": "存储空间与阿里云OSS开通对象名称一致",
+      "aliAccessKeyTips": "填写阿里云Access Key管理的(ID)。",
+      "aliSecretKeyTips": "Access Key Secret是您访问阿里云API的密钥，具有该账户完全的权限，请您妥善保管。(填写完Access Key ID 和 Access Key Secret 后请选择bucket)",
+      "aliEndpointTips": "Bucket地域endpoint",
+      "aliDomainTips": "域名格式：http://xx.xxxx.com/（不可绑定当前网站域名，建议新开二级域名）",
 
-  "qiniuBucket": "存储空间",
-  "qiniuAccessKey": "Accesskey",
-  "qiniuSecretKey": "Secretkey",
-  "qiniuBucketTips": "请保证bucket为可公共读取的",
-  "qiniuBucketPlaceholder": "请输入存储空间",
-  "qiniuAccessKeyPlaceholder": "请输入Accesskey",
-  "qiniuSecretKeyPlaceholder": "请输入Secretkey",
+      "qiniuBucket":"存储空间",
+      "qiniuAccessKey":"Accesskey",
+      "qiniuSecretKey":"Secretkey",
+      "qiniuBucketTips":"请保证bucket为可公共读取的",
+      "qiniuBucketPlaceholder": "请输入存储空间",
+      "qiniuAccessKeyPlaceholder": "请输入Accesskey",
+      "qiniuSecretKeyPlaceholder": "请输入Secretkey",
 
-  "tencentBucket": "存储空间",
-  "tencentAccessKey": "SECRET_ID",
-  "tencentSecretKey": "SECRET_KEY",
-  "region": "REGION",
-  "regionPlaceholder": "请输入REGION",
-  "tencentBucketTips": "请保证bucket为可公共读取的",
-  "tencentBucketPlaceholder": "请输入存储空间",
-  "tencentAccessKeyPlaceholder": "请输入SECRET_ID",
-  "tencentSecretKeyPlaceholder": "请输入SECRET_KEY"
-}
+      "tencentBucket":"存储空间",
+      "tencentAccessKey":"SECRET_ID",
+      "tencentSecretKey":"SECRET_KEY",
+      "region":"REGION",
+      "regionPlaceholder":"请输入REGION",
+      "tencentBucketTips":"请保证bucket为可公共读取的",
+      "tencentBucketPlaceholder": "请输入存储空间",
+      "tencentAccessKeyPlaceholder": "请输入SECRET_ID",
+      "tencentSecretKeyPlaceholder": "请输入SECRET_KEY"
+      
+      
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/setting.system.json b/admin/src/app/lang/zh-cn/setting.system.json
index 4881597c..0658ee78 100644
--- a/admin/src/app/lang/zh-cn/setting.system.json
+++ b/admin/src/app/lang/zh-cn/setting.system.json
@@ -1,35 +1,35 @@
 {
-  "websiteInfo": "后台设置",
-  "contactAddress": "联系地址",
-  "siteName": "站点名称",
-  "keywords": "网站关键字",
-  "logo": "长方形Logo",
-  "desc": "网站简介",
-  "province": "省",
-  "city": "市",
-  "district": "区/县",
-  "selectAddress": "请选择地址",
-  "address": "详细地址",
-  "phone": "客服电话",
-  "businessHours": "营业时间",
-  "contactAddressPlaceholder": "联系地址",
-  "siteNamePlaceholder": "站点名称",
-  "keywordsPlaceholder": "网站关键字",
-  "descPlaceholder": "网站简介",
-  "addressPlaceholder": "详细地址",
-  "phonePlaceholder": "客服电话",
-  "businessHoursPlaceholder": "营业时间",
-  "businessHoursTips": "例：上午9:00-12:00，下午2:00-6:00",
-  "frontEndInfo": "前台设置",
-  "frontEndName": "前台名称",
-  "frontEndNamePlaceholder": "请输入前台名称",
-  "frontEndLogo": "前台Logo",
-  "icon": "正方形Logo",
-  "serviceInformation": "服务信息",
-  "wechatCode": "公众号二维码",
-  "customerServiceCode": "客服二维码",
-  "contactsTel": "联系电话",
-  "contactsTelPlaceholder": "请输入联系电话",
-  "logoPlaceholder": "建议图片尺寸：210*30像素；图片格式：jpg、png、jpeg。",
-  "iconPlaceholder": "建议图片尺寸：100*100像素；图片格式：jpg、png、jpeg。"
+	"websiteInfo":"后台设置",
+	"contactAddress":"联系地址",
+	"siteName": "站点名称",
+	"keywords": "网站关键字",
+	"logo": "长方形Logo",
+	"desc": "网站简介",
+	"province": "省",
+	"city": "市",
+	"district": "区/县",
+	"selectAddress": "请选择地址",
+	"address": "详细地址",
+	"phone": "客服电话",
+	"businessHours": "营业时间",
+	"contactAddressPlaceholder":"联系地址",
+	"siteNamePlaceholder": "站点名称",
+	"keywordsPlaceholder": "网站关键字",
+	"descPlaceholder": "网站简介",
+	"addressPlaceholder": "详细地址",
+	"phonePlaceholder": "客服电话",
+	"businessHoursPlaceholder": "营业时间",
+	"businessHoursTips": "例：上午9:00-12:00，下午2:00-6:00",
+	"frontEndInfo": "前台设置",
+	"frontEndName": "前台名称",
+	"frontEndNamePlaceholder": "请输入前台名称",
+	"frontEndLogo": "前台Logo",
+	"icon": "正方形Logo",
+	"serviceInformation": "服务信息",
+	"wechatCode": "公众号二维码",
+	"customerServiceCode": "客服二维码",
+	"contactsTel": "联系电话",
+	"contactsTelPlaceholder": "请输入联系电话",
+	"logoPlaceholder": "建议图片尺寸：210*30像素；图片格式：jpg、png、jpeg。",
+	"iconPlaceholder": "建议图片尺寸：100*100像素；图片格式：jpg、png、jpeg。"
 }
diff --git a/admin/src/app/lang/zh-cn/setting.transfer.json b/admin/src/app/lang/zh-cn/setting.transfer.json
index ea1d1a56..cc6bc5f5 100644
--- a/admin/src/app/lang/zh-cn/setting.transfer.json
+++ b/admin/src/app/lang/zh-cn/setting.transfer.json
@@ -1,32 +1,33 @@
 {
-  "wechatpay": "微信打款设置",
-  "alipay": "支付宝打款设置",
-  "mchId": "商户号",
-  "mchIdPlaceholder": "请输入商户号",
-  "mchIdTips": "微信支付商户号（MCHID）",
-  "mchSecretKey": "APIv3密钥",
-  "mchSecretKeyPlaceholder": "请输入APIv3密钥",
-  "mchSecretKeyTips": "微信支付商户APIv3密钥（paySignKey）",
-  "mchSecretCert": "商户私钥",
-  "mchSecretCertPlaceholder": "请上传商户私钥",
-  "mchSecretCertTips": "微信支付API证书（apiclient_key.pem）",
-  "mchPublicCertPath": "商户公钥",
-  "mchPublicCertPathPlaceholder": "请上传商户公钥",
-  "mchPublicCertPathTips": "微信支付API证书（apiclient_cert.pem）",
-  "appId": "支付宝应用ID",
-  "appIdPlaceholder": "请输入支付宝应用ID",
-  "appSecretCert": "应用私钥",
-  "appSecretCertPlaceholder": "请输入应用私钥",
-  "appPublicCertPath": "应用公钥",
-  "appPublicCertPathPlaceholder": "请上传应用公钥",
-  "alipayPublicCertPath": "支付宝公钥",
-  "alipayPublicCertPathPlaceholder": "请上传支付宝公钥",
-  "alipayRootCertPath": "支付宝根证书",
-  "alipayRootCertPathPlaceholder": "请上传支付宝根证书",
-  "appIdTips": "支付宝分配给开发者的应用ID",
-  "appPublicCertPathTips": "上传appCertPublicKey文件",
-  "alipayPublicCertPathTips": "上传alipayCertPublicKey文件",
-  "alipayRootCertPathTips": "上传alipayRootCert文件",
-  "operationTip": "温馨提示：打款设置用于会员提现转账，发放红包等场景",
-  "transferTips": "注意：应微信方规定,在2025年1月15日前开通商家转账到零钱服务的商户号可正常使用转账功能,之后开通的不支持使用转账到零钱服务"
+    "wechatpay": "微信打款设置",
+    "alipay": "支付宝打款设置",
+    "mchId": "商户号",
+    "mchIdPlaceholder": "请输入商户号",
+    "mchIdTips": "微信支付商户号（MCHID）",
+    "mchSecretKey": "APIv3密钥",
+    "mchSecretKeyPlaceholder": "请输入APIv3密钥",
+    "mchSecretKeyTips": "微信支付商户APIv3密钥（paySignKey）",
+    "mchSecretCert": "商户私钥",
+    "mchSecretCertPlaceholder": "请上传商户私钥",
+    "mchSecretCertTips": "微信支付API证书（apiclient_key.pem）",
+    "mchPublicCertPath": "商户公钥",
+    "mchPublicCertPathPlaceholder": "请上传商户公钥",
+    "mchPublicCertPathTips": "微信支付API证书（apiclient_cert.pem）",
+    "appId": "支付宝应用ID",
+    "appIdPlaceholder": "请输入支付宝应用ID",
+    "appSecretCert": "应用私钥",
+    "appSecretCertPlaceholder": "请输入应用私钥",
+    "appPublicCertPath": "应用公钥",
+    "appPublicCertPathPlaceholder": "请上传应用公钥",
+    "alipayPublicCertPath": "支付宝公钥",
+    "alipayPublicCertPathPlaceholder": "请上传支付宝公钥",
+    "alipayRootCertPath": "支付宝根证书",
+    "alipayRootCertPathPlaceholder": "请上传支付宝根证书",
+    "appIdTips": "支付宝分配给开发者的应用ID",
+    "appPublicCertPathTips": "上传appCertPublicKey文件",
+    "alipayPublicCertPathTips": "上传alipayCertPublicKey文件",
+    "alipayRootCertPathTips": "上传alipayRootCert文件",
+    "operationTip": "温馨提示：打款设置用于会员提现转账，发放红包等场景",
+    "transferTips":"注意：应微信方规定,在2025年1月15日前开通商家转账到零钱服务的商户号可正常使用转账功能,之后开通的不支持使用转账到零钱服务"
+
 }
diff --git a/admin/src/app/lang/zh-cn/setting.weapp.json b/admin/src/app/lang/zh-cn/setting.weapp.json
index c4d04674..e3d16928 100644
--- a/admin/src/app/lang/zh-cn/setting.weapp.json
+++ b/admin/src/app/lang/zh-cn/setting.weapp.json
@@ -1,12 +1,12 @@
 {
-  "addVersion": "上传版本",
-  "version": "版本号",
-  "versionPlaceholder": "请添加版本号",
-  "createTime": "创建时间",
-  "status": "状态",
-  "editVersion": "添加/编辑版本",
-  "file": "文件",
-  "filePlaceholder": "请上传版本文件",
-  "desc": "版本说明",
-  "weappVersionDeleteTips": "确定要删除小程序版本吗"
-}
+	"addVersion": "上传版本",
+	"version": "版本号",
+	"versionPlaceholder": "请添加版本号",
+	"createTime": "创建时间",
+	"status": "状态",
+	"editVersion": "添加/编辑版本",
+	"file": "文件",
+	"filePlaceholder":"请上传版本文件",
+	"desc": "版本说明",
+	"weappVersionDeleteTips": "确定要删除小程序版本吗"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/setting.wxoplatform.json b/admin/src/app/lang/zh-cn/setting.wxoplatform.json
index 5ad2c22a..d992cfe3 100644
--- a/admin/src/app/lang/zh-cn/setting.wxoplatform.json
+++ b/admin/src/app/lang/zh-cn/setting.wxoplatform.json
@@ -1,19 +1,19 @@
 {
-  "oplatformSetting": "开放平台设置",
-  "appidPlaceholder": "微信第三方平台AppId",
-  "appsecretPlaceholder": "微信第三方平台AppSecret",
-  "oplatformComm": "开放平台通信",
-  "empowerStartDomain": "授权发起页域名",
-  "empowerReceiveUrl": "授权事件接收URL",
-  "messageValidationToken": "消息校验Token",
-  "messageDecryptKey": "消息加解密Key",
-  "messageReceiveUrl": "消息与事件接收URL",
-  "wechatDomain": "公众号开发域名",
-  "weappDomain": "小程序服务器域名",
-  "weappBusinessDomain": "小程序业务域名",
-  "oplatformBuilder": "开发者设置",
-  "builderEmail": "开发者邮箱",
-  "builderMobile": "开发者手机号",
-  "builderQQ": "开发者QQ",
-  "builderWx": "开发者微信"
-}
+	"oplatformSetting": "开放平台设置",
+	"appidPlaceholder": "微信第三方平台AppId",
+	"appsecretPlaceholder": "微信第三方平台AppSecret",
+	"oplatformComm": "开放平台通信",
+	"empowerStartDomain": "授权发起页域名",
+	"empowerReceiveUrl": "授权事件接收URL",
+	"messageValidationToken": "消息校验Token",
+	"messageDecryptKey": "消息加解密Key",
+	"messageReceiveUrl": "消息与事件接收URL",
+	"wechatDomain": "公众号开发域名",
+	"weappDomain": "小程序服务器域名",
+	"weappBusinessDomain": "小程序业务域名",
+	"oplatformBuilder": "开发者设置",
+	"builderEmail": "开发者邮箱",
+	"builderMobile": "开发者手机号",
+	"builderQQ": "开发者QQ",
+	"builderWx": "开发者微信"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/tools.addon.edit.json b/admin/src/app/lang/zh-cn/tools.addon.edit.json
index 773ce815..6feb681c 100644
--- a/admin/src/app/lang/zh-cn/tools.addon.edit.json
+++ b/admin/src/app/lang/zh-cn/tools.addon.edit.json
@@ -1,34 +1,34 @@
 {
-  "title": "插件名称",
-  "titlePlaceholder": "请输入插件名称",
-  "icon": "插件图标",
-  "iconPlaceholder": "请上传插件图标",
-  "iconPlaceholder1": "建议图片尺寸：200*200像素；图片格式：jpg、png、jpeg",
-  "key": "插件标识",
-  "keyPlaceholder": "请输入插件标识",
-  "keyPlaceholderErr": "插件标识格式不正确，只能以字母开头且只能输入字母、数字、下划线",
-  "keyPlaceholder1": "插件标识指开发插件的文件夹名称，申请之后不能修改(只能包括字母、数字和下划线，且只能以字母开头，格式如：f1111、f11_22)",
-  "keyPlaceholder2": "插件标识设置后建议进行插件标识检测，如果当前插件标识已经在niucloud官方市场注册，则只能在本地使用，无法在官方市场发布销售",
-  "desc": "插件描述",
-  "descPlaceholder": "请输入插件描述",
-  "author": "作者",
-  "authorPlaceholder": "请输入作者",
-  "version": "版本号",
-  "versionPlaceholder": "请输入版本号",
-  "versionPlaceholderErr": "版本号格式不正确",
-  "versionPlaceholder1": "请注意版本号输入格式，例如: 1.1.1",
-  "cover": "插件封面",
-  "coverPlaceholder": "请上传插件封面",
-  "coverPlaceholder1": "建议图片尺寸：480*240像素；图片格式：jpg、png、jpeg",
-  "type": "插件类型",
-  "typePlaceholder": "请选择插件类型",
-  "typePlaceholder1": "应用：指独立开发的系统，比如商城，零售，erp等",
-  "typePlaceholder2": "插件:指不是独立的系统，可以是辅助应用的插件比如商城的拼团，也可以是独立的插件比如万能表单等",
-  "supportType": "所属应用",
-  "supportApp": "支持应用",
-  "supportAppPlaceholder": "请选择支持应用",
-  "GeneratePlugins": "生成插件",
-  "successText": "检测当前插件标识尚未在应用市场注册，插件开发后可以在niucloud官方市场发布",
-  "warningText": "检测到当前插件标识已经在niucloud官方市场注册，开发的插件只能在本地使用，无法在官方市场发布销售",
-  "onSaveSuccessText": "插件生成成功"
+    "title":"插件名称",
+    "titlePlaceholder":"请输入插件名称",
+    "icon":"插件图标",
+    "iconPlaceholder":"请上传插件图标",
+    "iconPlaceholder1":"建议图片尺寸：200*200像素；图片格式：jpg、png、jpeg",
+    "key":"插件标识",
+    "keyPlaceholder":"请输入插件标识",
+    "keyPlaceholderErr":"插件标识格式不正确，只能以字母开头且只能输入字母、数字、下划线",
+    "keyPlaceholder1":"插件标识指开发插件的文件夹名称，申请之后不能修改(只能包括字母、数字和下划线，且只能以字母开头，格式如：f1111、f11_22)",
+    "keyPlaceholder2":"插件标识设置后建议进行插件标识检测，如果当前插件标识已经在niucloud官方市场注册，则只能在本地使用，无法在官方市场发布销售",
+    "desc":"插件描述",
+    "descPlaceholder":"请输入插件描述",
+    "author":"作者",
+    "authorPlaceholder":"请输入作者",
+    "version":"版本号",
+    "versionPlaceholder":"请输入版本号",
+    "versionPlaceholderErr":"版本号格式不正确",
+    "versionPlaceholder1":"请注意版本号输入格式，例如: 1.1.1",
+    "cover":"插件封面",
+    "coverPlaceholder":"请上传插件封面",
+    "coverPlaceholder1":"建议图片尺寸：480*240像素；图片格式：jpg、png、jpeg",
+    "type":"插件类型",
+    "typePlaceholder":"请选择插件类型",
+    "typePlaceholder1":"应用：指独立开发的系统，比如商城，零售，erp等",
+    "typePlaceholder2":"插件:指不是独立的系统，可以是辅助应用的插件比如商城的拼团，也可以是独立的插件比如万能表单等",
+    "supportType":"所属应用",
+    "supportApp":"支持应用",
+    "supportAppPlaceholder":"请选择支持应用",
+    "GeneratePlugins":"生成插件",
+    "successText":"检测当前插件标识尚未在应用市场注册，插件开发后可以在niucloud官方市场发布",
+    "warningText":"检测到当前插件标识已经在niucloud官方市场注册，开发的插件只能在本地使用，无法在官方市场发布销售",
+    "onSaveSuccessText":"插件生成成功"
 }
diff --git a/admin/src/app/lang/zh-cn/tools.addon.index.json b/admin/src/app/lang/zh-cn/tools.addon.index.json
index 200d0d68..94e1f1b8 100644
--- a/admin/src/app/lang/zh-cn/tools.addon.index.json
+++ b/admin/src/app/lang/zh-cn/tools.addon.index.json
@@ -1,30 +1,30 @@
 {
-  "developmentProcess": "开发流程",
-  "pluginList": "插件列表",
-  "addAddon": "新建插件",
-  "title": "插件名称",
-  "titlePlaceholder": "请输入插件名称",
-  "author": "作者",
-  "authorPlaceholder": "请输入作者",
-  "key": "插件标识",
-  "type": "插件类型",
-  "version": "版本号",
-  "status": "状态",
-  "codeDeleteTips": "删除插件后对应文件会一并删除，是否确认",
-  "step1": "新建一个插件",
-  "describe1": "点击新建插件，生成插件后系统会生成对应插件的基础代码",
-  "btn1": "新建插件",
-  "step2": "安装插件",
-  "describe2": "插件创建之后处于未安装状态，点击进入插件列表选择对应新建插件点击安装",
-  "btn2": "插件列表",
-  "step3": "开发插件",
-  "describe3": "插件安装成功之后就可以进行开发，具体查看开发教程",
-  "btn3": "查看教程",
-  "step4": "打包插件",
-  "describe4": "插件开发的前端代码是直接在对应开发环境运行的，并没有放入插件对应目录，点击打包后会将对应插件的代码整合到插件目录方便后期安装与打包发行版本",
-  "btn4": "插件列表",
-  "step5": "上传到云市场",
-  "describe5": "插件打包成功之后可以上传到官方云市场进行销售，可以打包后选择下载代码zip格式，然后在官网开发商引用选择上传版本",
-  "btn5": "官方市场",
-  "addonDownloadText": "插件打包成功，是否下载"
-}
+    "developmentProcess":"开发流程",
+    "pluginList":"插件列表",
+    "addAddon":"新建插件",
+    "title":"插件名称",
+    "titlePlaceholder":"请输入插件名称",
+    "author":"作者",
+    "authorPlaceholder":"请输入作者",
+    "key":"插件标识",
+    "type":"插件类型",
+    "version":"版本号",
+    "status":"状态",
+    "codeDeleteTips":"删除插件后对应文件会一并删除，是否确认",
+    "step1":"新建一个插件",
+    "describe1":"点击新建插件，生成插件后系统会生成对应插件的基础代码",
+    "btn1":"新建插件",
+    "step2":"安装插件",
+    "describe2":"插件创建之后处于未安装状态，点击进入插件列表选择对应新建插件点击安装",
+    "btn2":"插件列表",
+    "step3":"开发插件",
+    "describe3":"插件安装成功之后就可以进行开发，具体查看开发教程",
+    "btn3":"查看教程",
+    "step4":"打包插件",
+    "describe4":"插件开发的前端代码是直接在对应开发环境运行的，并没有放入插件对应目录，点击打包后会将对应插件的代码整合到插件目录方便后期安装与打包发行版本",
+    "btn4":"插件列表",
+    "step5":"上传到云市场",
+    "describe5":"插件打包成功之后可以上传到官方云市场进行销售，可以打包后选择下载代码zip格式，然后在官网开发商引用选择上传版本",
+    "btn5":"官方市场",
+    "addonDownloadText":"插件打包成功，是否下载"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/tools.code.edit.json b/admin/src/app/lang/zh-cn/tools.code.edit.json
index c460bb9d..51c1368a 100644
--- a/admin/src/app/lang/zh-cn/tools.code.edit.json
+++ b/admin/src/app/lang/zh-cn/tools.code.edit.json
@@ -1,143 +1,145 @@
 {
-  "basicSettings": "基础设置",
-  "fieldSettings": "字段设置",
-  "pageSettings": "页面设置",
-  "generationSettings": "生成配置",
-  "associatedConfiguration": "关联设置",
-  "tableName": "表名称",
-  "tableContent": "描述",
-  "addon": "所属插件",
-  "moduleName": "模块名",
-  "className": "类名",
-  "editType": "编辑方式",
-  "createTime": "创建时间",
-  "updateTime": "更新时间",
-  "popup": "弹出",
-  "page": "新页面",
-  "selectPlaceholder": "请选择",
-  "tableNamePlaceholder": "请输入表名",
-  "tableContentPlaceholder": "请输入描述",
-  "addonPlaceholder": "请选择插件",
-  "addonPlaceholder1": "/",
-  "moduleNamePlaceholder": "请输入模块名",
-  "classNamePlaceholder": "请输入类名",
-  "editTypePlaceholder": "请选择编辑方式",
-  "columnNamePlaceholder": "请输入字段名",
-  "columnCommentPlaceholder": "请输入字段描述",
-  "tableNameValidata": "表名不符合规范，请以 字母、_ 开头，不能出现 字母、数字、下划线 以外的字符",
-  "fieldNameValidata": "不符合规范，请以 字母、_ 开头，不能出现 字母、数字、下划线 以外的字符",
-  "addCode": "导入数据表",
-  "updateCode": "编辑代码生成",
-  "codeDeleteTips": "确定要删除吗？",
-  "tableComment": "表描述",
-  "tableCreateTime": "创建时间",
-  "tableUpdateTime": "修改时间",
-  "addBtn": "添加",
-  "searchPlaceholder": "请输入表名或表描述搜索",
-  "selectTableTips": "确认导入该数据表吗？",
-  "download": "下载",
-  "commentField": "常用字段",
-  "baseField": "公用字段",
-  "columnName": "字段列名",
-  "columnComment": "字段描述",
-  "columnType": "字段类型",
-  "fieldAttribute": "字段属性",
-  "addAndEdit": "添加编辑",
-  "listSearch": "列表查询",
-  "isPk": "主键",
-  "isRequired": "必填",
-  "isInsert": "添加",
-  "isUpdate": "编辑",
-  "isLists": "列表",
-  "isSearch": "搜索",
-  "isQuery": "查询",
-  "queryType": "搜索方式",
-  "formType": "表单类型",
-  "verifyType": "验证类型",
-  "formInput": "文本框",
-  "formTextarea": "文本域",
-  "formSelect": "下拉框",
-  "formRadio": "单选框",
-  "formCheckbox": "复选框",
-  "formDateTime": "日期",
-  "formImageSelect": "图片上传",
-  "formFileSelect": "文件上传",
-  "formVideoSelect": "视频上传",
-  "formEditor": "富文本",
-  "formNumber": "数字框",
-  "pk": "主键",
-  "status": "状态",
-  "string": "字符串",
-  "image": "图片",
-  "radio": "单选",
-  "checkbox": "复选",
-  "select": "下拉选择",
-  "editor": "富文本",
-  "dateTime": "日期",
-  "formValidation": "表单验证",
-  "deleteType": "删除类型",
-  "physicalDeletion": "物理删除",
-  "softDeletion": "软删除",
-  "deleteField": "删除字段",
-  "deleteFieldPlaceholder": "请选择删除字段",
-  "orderColumnName": "排序字段",
-  "orderColumnNamePlaceholder": "请选择排序字段",
-  "orderType": "排序方式",
-  "orderTypePlaceholder": "请选择排序方式",
-  "menuType": "上级菜单",
-  "autoBuild": "自动构建",
-  "manualAddition": "手动添加",
-  "controller": "控制器目录",
-  "dataModel": "模型目录",
-  "validator": "验证器目录",
-  "webView": "WEB端视图目录",
-  "routerView": "路由目录",
-  "insertAssociated": "新增关联",
-  "associatedType": "关联类型",
-  "associatedTypePlaceholder": "请选择关联类型",
-  "hasOne": "一对一",
-  "hasMany": "一对多",
-  "associatedName": "关联方法名称",
-  "associatedNamePlaceholder": "请输入关联方法名称",
-  "associatedModel": "关联模型",
-  "associatedModelPlaceholder": "请选择关联模型",
-  "localKey": "关联键",
-  "localKeyPlaceholder": "请选择关联键",
-  "foreignKey": "外键",
-  "foreignKeyPlaceholder": "请输入外键",
-  "addons": "关联应用",
-  "addonsPlaceholder": "请选择应用",
-  "saveAndSync": "同步代码",
-  "saveAndDownload": "下载代码",
-  "saveAndSyncText": "同步的代码与项目产生冲突，是否确认覆盖?",
-  "saveAndSyncText1": "同步的代码会加入到项目代码中，是否确认继续",
-  "mobileVerify": "手机号验证",
-  "numberVerify": "整数验证",
-  "idCardVerify": "身份证验证",
-  "emailVerify": "邮箱验证",
-  "maxVerify": "最大输入120个字符",
-  "minVerify": "最小输入1个字符",
-  "maxLabel": "最大输入字符",
-  "minLabel": "最小输入字符",
-  "minPlaceholder": "最小输入字符不能为空",
-  "minPlaceholder1": "最小输入字符不可大于最大输入字符",
-  "maxPlaceholder": "最大字输入字符不能为空",
-  "maxPlaceholder1": "最大输入字符不可小于最小输入字符",
-  "maxLabel1": "最大输入数",
-  "minLabel1": "最小输入数",
-  "min1Placeholder": "最小输入数不能为空",
-  "min1Placeholder1": "最小输入数不可大于最大输入数",
-  "max1Placeholder": "最大字输入数不能为空",
-  "max1Placeholder1": "最大输入数不可小于最小输入数",
-  "between": "输入字符区间",
-  "setUp": "设置",
-  "dictType": "数据字典",
-  "dictTypePlaceholder": "请选择数据字典",
-  "dictTypePlaceholder1": "部分字段未选择数据字典",
-  "remotePullDown": "远程下拉",
-  "remotePullDownValue": "远程下拉value字段",
-  "remotePullDownValuePlaceholder": "请选择远程下拉value字段",
-  "remotePullDownLabel": "远程下拉标题字段",
-  "remotePullDownLabelPlaceholder": "请选择远程下拉label字段",
-  "selectType": "下拉类型"
+      "basicSettings":"基础设置",
+      "fieldSettings":"字段设置",
+      "pageSettings":"页面设置",
+      "generationSettings":"生成配置",
+      "associatedConfiguration":"关联设置",
+      "tableName":"表名称",
+      "tableContent":"描述",
+      "addon":"所属插件",
+      "moduleName":"模块名",
+      "className":"类名",
+      "editType":"编辑方式",
+      "createTime":"创建时间",
+      "updateTime":"更新时间",
+      "popup":"弹出",
+      "page":"新页面",
+      "selectPlaceholder":"请选择",
+      "tableNamePlaceholder":"请输入表名",
+      "tableContentPlaceholder":"请输入描述",
+      "addonPlaceholder":"请选择插件",
+      "addonPlaceholder1":"/",
+      "moduleNamePlaceholder":"请输入模块名",
+      "classNamePlaceholder":"请输入类名",
+      "editTypePlaceholder":"请选择编辑方式",
+      "columnNamePlaceholder":"请输入字段名",
+      "columnCommentPlaceholder":"请输入字段描述",
+      "tableNameValidata": "表名不符合规范，请以 字母、_ 开头，不能出现 字母、数字、下划线 以外的字符",
+      "fieldNameValidata": "不符合规范，请以 字母、_ 开头，不能出现 字母、数字、下划线 以外的字符",
+      "addCode":"导入数据表",
+      "updateCode":"编辑代码生成",
+      "codeDeleteTips":"确定要删除吗？",
+      "tableComment":"表描述",
+      "tableCreateTime":"创建时间",
+      "tableUpdateTime":"修改时间",
+      "addBtn":"添加",
+      "searchPlaceholder":"请输入表名或表描述搜索",
+      "selectTableTips":"确认导入该数据表吗？",
+      "download":"下载",
+      "commentField":"常用字段",
+      "baseField":"公用字段",
+      "columnName": "字段列名",
+      "columnComment": "字段描述",
+      "columnType": "字段类型",
+      "fieldAttribute": "字段属性",
+      "addAndEdit":"添加编辑",
+      "listSearch":"列表查询",
+      "isPk":"主键",
+      "isRequired":"必填",
+      "isInsert":"添加",
+      "isUpdate":"编辑",
+      "isLists":"列表",
+      "isSearch":"搜索",
+      "isQuery":"查询",
+      "queryType":"搜索方式",
+      "formType": "表单类型",
+      "verifyType": "验证类型",
+      "formInput":"文本框",
+      "formTextarea":"文本域",
+      "formSelect":"下拉框",
+      "formRadio":"单选框",
+      "formCheckbox":"复选框",
+      "formDateTime":"日期",
+      "formImageSelect":"图片上传",
+      "formFileSelect":"文件上传",
+      "formVideoSelect":"视频上传",
+      "formEditor":"富文本",
+      "formNumber":"数字框",
+      "pk":"主键",
+      "status": "状态",
+      "string": "字符串",
+      "image": "图片",
+      "radio": "单选",
+      "checkbox": "复选",
+      "select": "下拉选择",
+      "editor": "富文本",
+      "dateTime": "日期",
+      "formValidation":"表单验证",
+      "deleteType":"删除类型",
+      "physicalDeletion":"物理删除",
+      "softDeletion":"软删除",
+      "deleteField":"删除字段",
+      "deleteFieldPlaceholder":"请选择删除字段",
+      "orderColumnName":"排序字段",
+      "orderColumnNamePlaceholder":"请选择排序字段",
+      "orderType":"排序方式",
+      "orderTypePlaceholder":"请选择排序方式",
+      "menuType":"上级菜单",
+      "autoBuild":"自动构建",
+      "manualAddition":"手动添加",
+      "controller":"控制器目录",
+      "dataModel":"模型目录",
+      "validator":"验证器目录",
+      "webView":"WEB端视图目录",
+      "routerView":"路由目录",
+      "insertAssociated":"新增关联",
+      "associatedType":"关联类型",
+      "associatedTypePlaceholder":"请选择关联类型",
+      "hasOne":"一对一",
+      "hasMany":"一对多",
+      "associatedName":"关联方法名称",
+      "associatedNamePlaceholder":"请输入关联方法名称",
+      "associatedModel":"关联模型",
+      "associatedModelPlaceholder":"请选择关联模型",
+      "localKey":"关联键",
+      "localKeyPlaceholder":"请选择关联键",
+      "foreignKey":"外键",
+      "foreignKeyPlaceholder":"请输入外键",
+      "addons":"关联应用",
+      "addonsPlaceholder":"请选择应用",
+      "saveAndSync":"同步代码",
+      "saveAndDownload":"下载代码",
+      "saveAndSyncText":"同步的代码与项目产生冲突，是否确认覆盖?",
+      "saveAndSyncText1":"同步的代码会加入到项目代码中，是否确认继续",
+      "mobileVerify":"手机号验证",
+      "numberVerify":"整数验证",
+      "idCardVerify":"身份证验证",
+      "emailVerify":"邮箱验证",
+      "maxVerify":"最大输入120个字符",
+      "minVerify":"最小输入1个字符",
+      "maxLabel":"最大输入字符",
+      "minLabel":"最小输入字符",
+      "minPlaceholder":"最小输入字符不能为空",
+      "minPlaceholder1":"最小输入字符不可大于最大输入字符",
+      "maxPlaceholder":"最大字输入字符不能为空",
+      "maxPlaceholder1":"最大输入字符不可小于最小输入字符",
+      "maxLabel1":"最大输入数",
+      "minLabel1":"最小输入数",
+      "min1Placeholder":"最小输入数不能为空",
+      "min1Placeholder1":"最小输入数不可大于最大输入数",
+      "max1Placeholder":"最大字输入数不能为空",
+      "max1Placeholder1":"最大输入数不可小于最小输入数",
+      "between":"输入字符区间",
+      "setUp":"设置",
+      "dictType":"数据字典",
+      "dictTypePlaceholder":"请选择数据字典",
+      "dictTypePlaceholder1":"部分字段未选择数据字典",
+      "remotePullDown": "远程下拉",
+      "remotePullDownValue":"远程下拉value字段",
+      "remotePullDownValuePlaceholder":"请选择远程下拉value字段",
+      "remotePullDownLabel":"远程下拉标题字段",
+      "remotePullDownLabelPlaceholder":"请选择远程下拉label字段",
+      "selectType":"下拉类型"
+
+
 }
diff --git a/admin/src/app/lang/zh-cn/tools.code.index.json b/admin/src/app/lang/zh-cn/tools.code.index.json
index b8344757..f8a7ca28 100644
--- a/admin/src/app/lang/zh-cn/tools.code.index.json
+++ b/admin/src/app/lang/zh-cn/tools.code.index.json
@@ -1,49 +1,49 @@
 {
-  "tableName": "表名称",
-  "tableContent": "描述",
-  "addon": "插件",
-  "moduleName": "模块名",
-  "className": "类名",
-  "editType": "编辑方式",
-  "createTime": "创建时间",
-  "updateTime": "更新时间",
-  "popup": "弹出",
-  "page": "新页面",
-  "tableNamePlaceholder": "请输入表名",
-  "tableContentPlaceholder": "请输入描述",
-  "addonPlaceholder": "请选择插件",
-  "moduleNamePlaceholder": "请输入模块名",
-  "classNamePlaceholder": "请输入类名",
-  "editTypePlaceholder": "请选择编辑方式",
-  "addCode": "导入数据表",
-  "updateCode": "编辑代码生成",
-  "codeDeleteTips": "确定要删除吗？",
-  "tableComment": "表描述",
-  "tableCreateTime": "创建时间",
-  "tableUpdateTime": "修改时间",
-  "addBtn": "添加",
-  "searchPlaceholder": "请输入表名或表描述搜索",
-  "selectTableTips": "确认导入该数据表吗？",
-  "download": "下载代码",
-  "codeGeneration": "代码生成",
-  "codeList": "生成列表",
-  "step1": "选择数据表生成代码",
-  "describe1": "点击添加，选择对应数据表，添加之后会跳转到对应生成代码的配置管理页面",
-  "btn1": "添加",
-  "step2": "基础设置",
-  "describe2": "代码生成查看基础设置，包括基础的表名、描述、所属插件设置",
-  "btn2": "插件列表",
-  "step3": "字段设置",
-  "describe3": "代码中字段的管理，包括字段是否进行增加、编辑、列表、查询展示等",
-  "btn3": "查看教程",
-  "step4": "页面设置",
-  "describe4": "正在开发中，会将字段进行展示管理配置，同时提供预览，真正实现自定义表单配置",
-  "btn4": "插件列表",
-  "step5": "生成配置",
-  "describe5": "针对代码中展示页面配置，包括单独页面编辑表单还是弹框，生成的代码穿插到系统中还是进行下载等",
-  "btn5": "官方市场",
-  "saveAndSync": "同步代码",
-  "saveAndSyncText": "同步的代码与项目产生冲突，是否确认覆盖?",
-  "saveAndSyncText1": "同步的代码会加入到项目代码中，是否确认继续",
-  "addonName": "所属插件"
-}
+      "tableName":"表名称",
+      "tableContent":"描述",
+      "addon":"插件",
+      "moduleName":"模块名",
+      "className":"类名",
+      "editType":"编辑方式",
+      "createTime":"创建时间",
+      "updateTime":"更新时间",
+      "popup":"弹出",
+      "page":"新页面",
+      "tableNamePlaceholder":"请输入表名",
+      "tableContentPlaceholder":"请输入描述",
+      "addonPlaceholder":"请选择插件",
+      "moduleNamePlaceholder":"请输入模块名",
+      "classNamePlaceholder":"请输入类名",
+      "editTypePlaceholder":"请选择编辑方式",
+      "addCode":"导入数据表",
+      "updateCode":"编辑代码生成",
+      "codeDeleteTips":"确定要删除吗？",
+      "tableComment":"表描述",
+      "tableCreateTime":"创建时间",
+      "tableUpdateTime":"修改时间",
+      "addBtn":"添加",
+      "searchPlaceholder":"请输入表名或表描述搜索",
+      "selectTableTips":"确认导入该数据表吗？",
+      "download":"下载代码",
+      "codeGeneration":"代码生成",
+      "codeList":"生成列表",
+      "step1":"选择数据表生成代码",
+      "describe1":"点击添加，选择对应数据表，添加之后会跳转到对应生成代码的配置管理页面",
+      "btn1":"添加",
+      "step2":"基础设置",
+      "describe2":"代码生成查看基础设置，包括基础的表名、描述、所属插件设置",
+      "btn2":"插件列表",
+      "step3":"字段设置",
+      "describe3":"代码中字段的管理，包括字段是否进行增加、编辑、列表、查询展示等",
+      "btn3":"查看教程",
+      "step4":"页面设置",
+      "describe4":"正在开发中，会将字段进行展示管理配置，同时提供预览，真正实现自定义表单配置",
+      "btn4":"插件列表",
+      "step5":"生成配置",
+      "describe5":"针对代码中展示页面配置，包括单独页面编辑表单还是弹框，生成的代码穿插到系统中还是进行下载等",
+      "btn5":"官方市场",
+      "saveAndSync":"同步代码",
+      "saveAndSyncText":"同步的代码与项目产生冲突，是否确认覆盖?",
+      "saveAndSyncText1":"同步的代码会加入到项目代码中，是否确认继续",
+      "addonName": "所属插件"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/tools.detection.json b/admin/src/app/lang/zh-cn/tools.detection.json
index efb77cb3..80c23ab7 100644
--- a/admin/src/app/lang/zh-cn/tools.detection.json
+++ b/admin/src/app/lang/zh-cn/tools.detection.json
@@ -1,16 +1,16 @@
 {
-  "title": "名称",
-  "serverInformation": "服务器信息",
-  "systemDemand": "系统环境要求",
-  "authorityStatus": "权限状态",
-  "name": "选项",
-  "demand": "要求",
-  "status": "状态",
-  "environment": "环境",
-  "version": "版本",
-  "phpType": "PHP版本",
-  "phpTypeValue": "大于等于8.0.0",
-  "mysqlType": "mysql版本",
-  "mysqlTypeValue": "大于等于5.7",
-  "process": "启动进程"
-}
+	"title": "名称",
+	"serverInformation": "服务器信息",
+	"systemDemand": "系统环境要求",
+	"authorityStatus": "权限状态",
+	"name": "选项",
+	"demand": "要求",
+	"status": "状态",
+	"environment": "环境",
+	"version": "版本",
+	"phpType": "PHP版本",
+	"phpTypeValue": "大于等于8.0.0",
+	"mysqlType": "mysql版本",
+	"mysqlTypeValue": "大于等于5.7",
+	"process": "启动进程"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/tools.schedule.json b/admin/src/app/lang/zh-cn/tools.schedule.json
index 9a18e7f9..3dcd19a6 100644
--- a/admin/src/app/lang/zh-cn/tools.schedule.json
+++ b/admin/src/app/lang/zh-cn/tools.schedule.json
@@ -1,35 +1,35 @@
 {
-  "title": "名称",
-  "cronInfo": "任务详情",
-  "type": "任务类型",
-  "lastTime": "最后执行时间",
-  "startDate": "开始时间",
-  "cron": "定时执行",
-  "endDate": "结束时间",
-  "titlePlaceholder": "请选择任务模版",
-  "typeName": "任务类型",
-  "crondType": "任务周期",
-  "count": "已执行次数",
-  "nextTime": "下次执行时间",
-  "task": "任务命令",
-  "data": "附加参数",
-  "statusDesc": "最后执行结果",
-  "key": "key",
-  "timeClass": "时间类型",
-  "executeTime": "执行时间",
-  "editCron": "编辑任务",
-  "cronTemplate": "任务模版",
-  "cronTime": "任务周期",
-  "openStatus": "任务状态",
-  "isopen": "是否启用",
-  "day": "日",
-  "hour": "时",
-  "min": "分",
-  "cronDeleteTips": "你确定要删除任务吗",
-  "addCron": "添加任务",
-  "cronTimeTips": "任务周期时间不能为空",
-  "cronTipsOne": "启动计划任务方式：",
-  "cronTipsTwo": "1、使用命令启动：php think workerman 如果更改了任务周期、状态、删除任务等操作后,需要重新启动下 php think workerman 确保生效",
-  "doOne": "执行一次",
-  "cronLog": "执行日志"
+      "title": "名称",
+      "cronInfo": "任务详情",
+      "type": "任务类型",
+      "lastTime": "最后执行时间",
+      "startDate":"开始时间",
+      "cron":"定时执行",
+      "endDate":"结束时间",
+      "titlePlaceholder": "请选择任务模版",
+      "typeName":"任务类型",
+      "crondType":"任务周期",
+      "count":"已执行次数",
+      "nextTime":"下次执行时间",
+      "task":"任务命令",
+      "data":"附加参数",
+      "statusDesc":"最后执行结果",
+	  "key": "key",
+	  "timeClass": "时间类型",
+	  "executeTime": "执行时间",
+	  "editCron": "编辑任务",
+	  "cronTemplate": "任务模版",
+	  "cronTime": "任务周期",
+	  "openStatus": "任务状态",
+	  "isopen": "是否启用",
+	  "day": "日",
+	  "hour": "时",
+	  "min": "分",
+	  "cronDeleteTips": "你确定要删除任务吗",
+	  "addCron": "添加任务",
+	  "cronTimeTips": "任务周期时间不能为空",
+	  "cronTipsOne": "启动计划任务方式：",
+	  "cronTipsTwo": "1、使用命令启动：php think workerman 如果更改了任务周期、状态、删除任务等操作后,需要重新启动下 php think workerman 确保生效",
+	  "doOne": "执行一次",
+	  "cronLog": "执行日志"
 }
diff --git a/admin/src/app/lang/zh-cn/tools.schedule_log.json b/admin/src/app/lang/zh-cn/tools.schedule_log.json
index 0ee2c4a0..93d2a4db 100644
--- a/admin/src/app/lang/zh-cn/tools.schedule_log.json
+++ b/admin/src/app/lang/zh-cn/tools.schedule_log.json
@@ -1,19 +1,19 @@
 {
-  "id": "日志编号",
-  "name": "任务名称",
-  "key": "key",
-  "class": "调用目标字符串",
-  "executeResult": "日志信息",
-  "status": "执行状态",
-  "executeTime": "执行时间",
-  "info": "详情",
-  "cronInfo": "日志详情",
-  "batchDelete": "批量删除",
-  "clearAll": "清空",
-  "batchEmptySelectedCronLogTips": "请选择要删除的日志",
-  "batchDeleteTips": "确定要删除选中的日志吗？",
-  "clearAllTips": "确定要清空所有日志吗？",
-  "deleteTips": "确定要删除该条日志吗？",
-  "startDate": "开始日期",
-  "endDate": "结束日期"
+	"id": "日志编号",
+	"name": "任务名称",
+	"key": "key",
+	"class": "调用目标字符串",
+	"executeResult": "日志信息",
+	"status": "执行状态",
+	"executeTime": "执行时间",
+	"info": "详情",
+	"cronInfo": "日志详情",
+	"batchDelete": "批量删除",
+	"clearAll": "清空",
+	"batchEmptySelectedCronLogTips": "请选择要删除的日志",
+	"batchDeleteTips": "确定要删除选中的日志吗？",
+	"clearAllTips": "确定要清空所有日志吗？",
+	"deleteTips": "确定要删除该条日志吗？",
+	"startDate": "开始日期",
+	"endDate": "结束日期"
 }
diff --git a/admin/src/app/lang/zh-cn/tools.updatecache.json b/admin/src/app/lang/zh-cn/tools.updatecache.json
index 220af913..bd94c790 100644
--- a/admin/src/app/lang/zh-cn/tools.updatecache.json
+++ b/admin/src/app/lang/zh-cn/tools.updatecache.json
@@ -1,7 +1,7 @@
 {
-  "refresh": "刷新",
-  "refreshMenu": "刷新菜单",
-  "refreshMenuDesc": "新增/修改插件菜单后，需要刷新插件菜单",
-  "dataCache": "数据缓存",
-  "dataCacheDesc": "新增/修改数据表后，需要清除数据表缓存"
-}
+      "refresh":"刷新",
+      "refreshMenu":"刷新菜单",
+      "refreshMenuDesc":"新增/修改插件菜单后，需要刷新插件菜单",
+      "dataCache":"数据缓存",
+      "dataCacheDesc":"新增/修改数据表后，需要清除数据表缓存"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/user.center.json b/admin/src/app/lang/zh-cn/user.center.json
index 14c95049..6905b790 100644
--- a/admin/src/app/lang/zh-cn/user.center.json
+++ b/admin/src/app/lang/zh-cn/user.center.json
@@ -1,6 +1,6 @@
 {
-  "personal": "个人中心",
-  "editPersonal": "编辑",
-  "headImg": "头像",
-  "realName": "名称"
-}
+    "personal": "个人中心",
+    "editPersonal": "编辑",
+    "headImg": "头像",
+    "realName": "名称"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/user.edit_center.json b/admin/src/app/lang/zh-cn/user.edit_center.json
index 58b5620f..7b41f3a8 100644
--- a/admin/src/app/lang/zh-cn/user.edit_center.json
+++ b/admin/src/app/lang/zh-cn/user.edit_center.json
@@ -1,18 +1,18 @@
 {
-  "editPersonal": "编辑个人中心",
-  "headImg": "头像",
-  "realName": "名称",
-  "originalPassword": "原始密码",
-  "password": "新密码",
-  "passwordCopy": "确认密码",
-  "passwordTip": "修改密码时必填.不修改密码时留空",
-  "realNamePlaceholder": "请输入用户名称",
-  "headImgPlaceholder": "请输入用户头像",
-  "originalPasswordPlaceholder": "请输入原始密码",
-  "passwordPlaceholder": "请输入新密码",
-  "save": "保存",
-  "cancel": "返回",
-  "originalPasswordHint": "原始密码不能为空",
-  "newPasswordHint": "请输入确认密码",
-  "doubleCipherHint": "两次新密码不同"
-}
+    "editPersonal": "编辑个人中心",
+    "headImg": "头像",
+    "realName": "名称",
+    "originalPassword": "原始密码",
+    "password": "新密码",
+    "passwordCopy": "确认密码",
+    "passwordTip": "修改密码时必填.不修改密码时留空",
+    "realNamePlaceholder": "请输入用户名称",
+    "headImgPlaceholder": "请输入用户头像",
+    "originalPasswordPlaceholder": "请输入原始密码",
+    "passwordPlaceholder": "请输入新密码",
+    "save": "保存",
+    "cancel": "返回",
+    "originalPasswordHint": "原始密码不能为空",
+    "newPasswordHint": "请输入确认密码",
+    "doubleCipherHint": "两次新密码不同"
+}
\ No newline at end of file
diff --git a/admin/src/app/views/app/authorize.vue b/admin/src/app/views/app/authorize.vue
index 35831af6..838df6b8 100644
--- a/admin/src/app/views/app/authorize.vue
+++ b/admin/src/app/views/app/authorize.vue
@@ -1,225 +1,104 @@
 <template>
-  <!--授权信息-->
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never" v-if="!loading">
-      <div class="flex">
-        <div
-          class="w-[450px] mr-[20px] p-[50px] bg-[var(--el-color-info-light-9)]"
-        >
-          <div class="flex items-center justify-between">
-            <span class="text-page-title">版本信息</span>
-            <div class="flex-1 w-0 flex justify-end">
-              <el-button
-                class="text-[#4C4C4C] w-[78px] h-[32px] !bg-transparent"
-                @click="getFrameworkVersionListFn"
-                v-if="
-                  !newVersion ||
-                  (newVersion && newVersion.version_no == versions)
-                "
-                >检测更新</el-button
-              >
-              <el-button
-                class="text-[#4C4C4C] w-[78px] h-[32px]"
-                type="primary"
-                @click="handleUpgrade"
-                v-else
-                >一键升级</el-button
-              >
-              <el-button
-                class="text-[#4C4C4C] w-[78px] h-[32px]"
-                type="primary"
-                @click="handleCloudBuild"
-                :loading="cloudBuildRef?.loading"
-                >云编译</el-button
-              >
-            </div>
-          </div>
-          <div class="mt-[30px] flex items-center text-[14px] text-[#797979]">
-            <span>当前版本</span>
-            <span class="text-[26px] ml-[15px] mr-[10px] text-[#656668]">{{
-              versions
-            }}</span>
-            <em
-              class="text-[12px]"
-              v-if="
-                !newVersion || (newVersion && newVersion.version_no == versions)
-              "
-              >(当前已是最新版本)</em
-            >
-            <em class="text-[12px] text-[red]" v-else
-              >(最新版本{{ newVersion.version_no }})</em
-            >
-          </div>
-        </div>
+    <!--授权信息-->
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never" v-if="!loading">
 
-        <div
-          class="flex flex-1 justify-between items-center p-[50px] bg-[var(--el-color-info-light-9)]"
-        >
-          <div class="flex flex-col">
-            <div class="flex flex-wrap items-center">
-              <p class="text-page-title mr-[20px]">授权信息</p>
-              <span class="text-[14px] text-[#666]">{{
-                authinfo.company_name || '--'
-              }}</span>
-            </div>
-            <div class="mt-[46px] ml-[40px] flex flex-wrap">
-              <span class="text-[14px] mr-[84px]"
-                >授权域名<em class="ml-[12px] text-[12px]">{{
-                  authinfo.site_address || '--'
-                }}</em></span
-              >
-              <span class="text-[14px] flex items-center">
-                <span>授权码</span>
-                <em class="ml-[12px] mr-[10px] text-[12px]">{{
-                  authinfo.auth_code
-                    ? isCheck
-                      ? authinfo.auth_code
-                      : hideAuthCode(authinfo.auth_code)
-                    : '--'
-                }}</em>
-                <el-icon
-                  v-if="!isCheck"
-                  @click="isCheck = !isCheck"
-                  class="text-[12px] cursor-pointer"
-                >
-                  <View />
-                </el-icon>
-                <el-icon
-                  v-else
-                  @click="isCheck = !isCheck"
-                  class="text-[12px] cursor-pointer"
-                >
-                  <Hide />
-                </el-icon>
-              </span>
-            </div>
-          </div>
-          <div class="flex flex-1 flex-wrap justify-end relative">
-            <el-button
-              class="w-[154px] !h-[48px] mt-[8px]"
-              type="primary"
-              @click="authCodeApproveFn"
-              >授权码认证</el-button
-            >
-            <el-popover
-              ref="getAuthCodeDialog"
-              placement="bottom-start"
-              :width="478"
-              trigger="click"
-              class="mt-[8px]"
-            >
-              <div class="px-[18px] py-[8px]">
-                <p class="leading-[32px] text-[14px]">
-                  您在官方应用市场购买任意一款应用，即可获得授权码。输入正确授权码认证通过后，即可支持在线升级和其它相关服务
-                </p>
-                <div class="flex justify-end mt-[36px]">
-                  <el-button class="w-[182px] !h-[48px]" plain @click="market"
-                    >去应用市场逛逛</el-button
-                  >
-                  <el-button
-                    class="w-[100px] !h-[48px]"
-                    plain
-                    @click="getAuthCodeDialog.hide()"
-                    >关闭</el-button
-                  >
+            <div class="flex">
+                <div class="w-[450px] mr-[20px] p-[50px] bg-[var(--el-color-info-light-9)]">
+                    <div class="flex items-center justify-between">
+                        <span class="text-page-title">版本信息</span>
+                        <div class="flex-1 w-0 flex justify-end">
+                            <el-button class="text-[#4C4C4C] w-[78px] h-[32px] !bg-transparent" @click="getFrameworkVersionListFn" v-if="!newVersion || (newVersion && newVersion.version_no == versions)">检测更新</el-button>
+                            <el-button class="text-[#4C4C4C] w-[78px] h-[32px]" type="primary" @click="handleUpgrade" v-else>一键升级</el-button>
+                            <el-button class="text-[#4C4C4C] w-[78px] h-[32px]" type="primary" @click="handleCloudBuild" :loading="cloudBuildRef?.loading">云编译</el-button>
+                        </div>
+                    </div>
+                    <div class="mt-[30px] flex items-center text-[14px] text-[#797979]">
+                        <span>当前版本</span>
+                        <span class="text-[26px] ml-[15px] mr-[10px] text-[#656668]">{{versions}}</span>
+                        <em class="text-[12px]" v-if="!newVersion || (newVersion && newVersion.version_no == versions)">(当前已是最新版本)</em>
+                        <em class="text-[12px] text-[red]" v-else>(最新版本{{ newVersion.version_no }})</em>
+                    </div>
                 </div>
-              </div>
-              <template #reference>
-                <el-button
-                  class="w-[154px] !h-[48px] mt-[8px] !text-[var(--el-color-primary)] hover:!text-[var(--el-color-primary)] !bg-transparent"
-                  plain
-                  type="primary"
-                  >如何获取授权码?</el-button
-                >
-              </template>
-            </el-popover>
-          </div>
 
-          <el-dialog
-            v-model="authCodeApproveDialog"
-            title="授权码认证"
-            width="400px"
-          >
-            <el-form
-              :model="formData"
-              label-width="0"
-              ref="formRef"
-              :rules="formRules"
-              class="page-form"
-            >
-              <el-card class="box-card !border-none" shadow="never">
-                <el-form-item prop="auth_code">
-                  <el-input
-                    v-model.trim="formData.auth_code"
-                    :placeholder="t('authCodePlaceholder')"
-                    class="input-width"
-                    clearable
-                    size="large"
-                  />
-                </el-form-item>
+                <div class="flex flex-1 justify-between items-center p-[50px] bg-[var(--el-color-info-light-9)]">
+                    <div class="flex flex-col">
+                        <div class="flex flex-wrap items-center">
+                            <p class="text-page-title mr-[20px]">授权信息</p>
+                            <span class="text-[14px] text-[#666]">{{ authinfo.company_name || '--' }}</span>
+                        </div>
+                        <div class="mt-[46px] ml-[40px] flex flex-wrap">
+                            <span class="text-[14px] mr-[84px]">授权域名<em class="ml-[12px] text-[12px]">{{ authinfo.site_address || '--' }}</em></span>
+                            <span class="text-[14px] flex items-center">
+                                <span>授权码</span>
+                                <em class="ml-[12px] mr-[10px] text-[12px]">{{ authinfo.auth_code ? (isCheck ? authinfo.auth_code : hideAuthCode(authinfo.auth_code)) : '--' }}</em>
+                                <el-icon v-if="!isCheck" @click="isCheck = !isCheck" class="text-[12px] cursor-pointer">
+                                    <View />
+                                </el-icon>
+                                <el-icon v-else @click="isCheck = !isCheck" class="text-[12px] cursor-pointer">
+                                    <Hide />
+                                </el-icon>
+                            </span>
+                        </div>
+                    </div>
+                    <div class="flex flex-1 flex-wrap justify-end relative">
+                        <el-button class="w-[154px] !h-[48px] mt-[8px]" type="primary" @click="authCodeApproveFn">授权码认证</el-button>
+                        <el-popover ref="getAuthCodeDialog" placement="bottom-start" :width="478" trigger="click" class="mt-[8px]">
+                            <div class="px-[18px] py-[8px]">
+                                <p class="leading-[32px] text-[14px]">您在官方应用市场购买任意一款应用，即可获得授权码。输入正确授权码认证通过后，即可支持在线升级和其它相关服务</p>
+                                <div class="flex justify-end mt-[36px]">
+                                    <el-button class="w-[182px] !h-[48px]" plain @click="market">去应用市场逛逛</el-button>
+                                    <el-button class="w-[100px] !h-[48px]" plain @click="getAuthCodeDialog.hide()">关闭</el-button>
+                                </div>
+                            </div>
+                            <template #reference>
+                                <el-button class="w-[154px] !h-[48px] mt-[8px] !text-[var(--el-color-primary)] hover:!text-[var(--el-color-primary)] !bg-transparent" plain type="primary">如何获取授权码?</el-button>
+                            </template>
+                        </el-popover>
+                    </div>
 
-                <div class="mt-[20px]">
-                  <el-form-item prop="auth_secret">
-                    <el-input
-                      v-model.trim="formData.auth_secret"
-                      clearable
-                      :placeholder="t('authSecretPlaceholder')"
-                      class="input-width"
-                      size="large"
-                    />
-                  </el-form-item>
-                </div>
+                    <el-dialog v-model="authCodeApproveDialog" title="授权码认证" width="400px">
+                        <el-form :model="formData" label-width="0" ref="formRef" :rules="formRules" class="page-form">
+                            <el-card class="box-card !border-none" shadow="never">
+                                <el-form-item prop="auth_code">
+                                    <el-input v-model.trim="formData.auth_code" :placeholder="t('authCodePlaceholder')" class="input-width" clearable size="large" />
+                                </el-form-item>
 
-                <div class="text-sm mt-[10px] text-info">
-                  {{ t('authInfoTips') }}
-                </div>
+                                <div class="mt-[20px]">
+                                    <el-form-item prop="auth_secret">
+                                        <el-input v-model.trim="formData.auth_secret" clearable :placeholder="t('authSecretPlaceholder')" class="input-width" size="large" />
+                                    </el-form-item>
+                                </div>
 
-                <div class="mt-[20px]">
-                  <el-button
-                    type="primary"
-                    class="w-full"
-                    size="large"
-                    :loading="saveLoading"
-                    @click="save(formRef)"
-                    >{{ t('confirm') }}</el-button
-                  >
-                </div>
-                <div class="mt-[10px] text-right">
-                  <el-button type="primary" link @click="market">{{
-                    t('notHaveAuth')
-                  }}</el-button>
+                                <div class="text-sm mt-[10px] text-info">{{ t('authInfoTips') }}</div>
+
+                                <div class="mt-[20px]">
+                                    <el-button type="primary" class="w-full" size="large" :loading="saveLoading" @click="save(formRef)">{{ t('confirm') }}</el-button>
+                                </div>
+                                <div class="mt-[10px] text-right">
+                                    <el-button type="primary" link @click="market">{{ t('notHaveAuth') }}</el-button>
+                                </div>
+                            </el-card>
+                        </el-form>
+                    </el-dialog>
                 </div>
-              </el-card>
-            </el-form>
-          </el-dialog>
-        </div>
-      </div>
-    </el-card>
+            </div>
+        </el-card>
 
-    <el-card class="box-card !border-none" shadow="never" v-if="!loading">
-      <div class="text-page-title mb-[20px]">历史版本</div>
-      <el-timeline>
-        <el-timeline-item
-          :timestamp="item['release_time'] + ' 版本：' + item['version_no']"
-          v-for="(item, index) in frameworkVersionList"
-          type="primary"
-          :hollow="true"
-          placement="top"
-          :key="index"
-        >
-          <div
-            class="mt-[10px] p-[20px] bg-overlay rounded-md timeline-log-wrap whitespace-pre-wrap"
-            v-if="item['upgrade_log']"
-          >
-            <div v-html="item['upgrade_log']"></div>
-          </div>
-        </el-timeline-item>
-      </el-timeline>
-    </el-card>
+        <el-card class="box-card !border-none " shadow="never" v-if="!loading">
+            <div class="text-page-title mb-[20px]">历史版本</div>
+            <el-timeline>
+                <el-timeline-item :timestamp="item['release_time'] + ' 版本：' + item['version_no']" v-for="(item,index) in frameworkVersionList" type="primary" :hollow="true" placement="top" :key="index">
+                    <div class="mt-[10px] p-[20px] bg-overlay rounded-md timeline-log-wrap whitespace-pre-wrap" v-if="item['upgrade_log']">
+                        <div v-html="item['upgrade_log']"></div>
+                    </div>
+                </el-timeline-item>
+            </el-timeline>
+        </el-card>
 
-    <upgrade ref="upgradeRef" />
-    <cloud-build ref="cloudBuildRef" />
-  </div>
+        <upgrade ref="upgradeRef" />
+        <cloud-build ref="cloudBuildRef" />
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -227,11 +106,7 @@ import { reactive, ref, computed } from 'vue'
 import { t } from '@/lang'
 import { getVersions } from '@/app/api/auth'
 import { getInstallConfig } from '@/app/api/sys'
-import {
-  getAuthInfo,
-  setAuthInfo,
-  getFrameworkVersionList,
-} from '@/app/api/module'
+import { getAuthInfo, setAuthInfo, getFrameworkVersionList } from '@/app/api/module'
 import { ElMessageBox, FormInstance, FormRules, ElMessage } from 'element-plus'
 import Upgrade from '@/app/components/upgrade/index.vue'
 import CloudBuild from '@/app/components/cloud-build/index.vue'
@@ -247,126 +122,113 @@ const frameworkVersionList = ref([])
 
 const installPhpConfig = ref(null)
 
-getInstallConfig()
-  .then(({ data }) => {
+getInstallConfig().then(({ data }) => {
     installPhpConfig.value = data
-  })
-  .catch()
+}).catch()
 
 const checkVersion = ref(false)
 const getFrameworkVersionListFn = () => {
-  getFrameworkVersionList().then(({ data }) => {
-    frameworkVersionList.value = data
-    if (checkVersion.value) {
-      if (
-        !newVersion.value ||
-        (newVersion.value && newVersion.value.version_no == versions.value)
-      ) {
-        ElMessage({
-          message: t('versionTips'),
-          type: 'success',
-        })
-      }
-    } else {
-      checkVersion.value = true
-    }
-  })
+    getFrameworkVersionList().then(({ data }) => {
+        frameworkVersionList.value = data
+        if (checkVersion.value) {
+            if (!newVersion.value || (newVersion.value && newVersion.value.version_no == versions.value)) {
+                ElMessage({
+                    message: t('versionTips'),
+                    type: 'success'
+                })
+            }
+        } else {
+            checkVersion.value = true
+        }
+    })
 }
 getFrameworkVersionListFn()
 
-const newVersion: any = computed(() => {
-  return frameworkVersionList.value.length
-    ? frameworkVersionList.value[0]
-    : null
+const newVersion:any = computed(() => {
+    return frameworkVersionList.value.length ? frameworkVersionList.value[0] : null
 })
 
-const hideAuthCode = (res: any) => {
-  const authCode = cloneDeep(res)
-  const data =
-    authCode.slice(0, authCode.length / 2) +
-    authCode.slice(authCode.length / 2, authCode.length - 1).replace(/./g, '*')
-  return data
+const hideAuthCode = (res:any) => {
+    const authCode = cloneDeep(res)
+    const data = authCode.slice(0, authCode.length / 2) + authCode.slice(authCode.length / 2, authCode.length - 1).replace(/./g, '*')
+    return data
 }
 
 const authCodeApproveFn = () => {
-  authCodeApproveDialog.value = true
+    authCodeApproveDialog.value = true
 }
 
 interface AuthInfo {
-  company_name: string
-  site_address: string
-  auth_code: string
+    company_name: string,
+    site_address: string,
+    auth_code: string
 }
 
 const authinfo = ref<AuthInfo>({
-  company_name: '',
-  site_address: '',
-  auth_code: '',
+    company_name: '',
+    site_address: '',
+    auth_code: ''
 })
 const loading = ref(true)
 const saveLoading = ref(false)
 const checkAppMange = () => {
-  getAuthInfo()
-    .then((res) => {
-      loading.value = false
-      if (res.data.data && res.data.data.length != 0) {
-        authinfo.value = res.data.data
+    getAuthInfo().then((res) => {
+        loading.value = false
+        if (res.data.data && res.data.data.length != 0) {
+            authinfo.value = res.data.data
+            authCodeApproveDialog.value = false
+        }
+    }).catch(() => {
+        loading.value = false
         authCodeApproveDialog.value = false
-      }
-    })
-    .catch(() => {
-      loading.value = false
-      authCodeApproveDialog.value = false
     })
 }
 
 checkAppMange()
 
 const formData = reactive<Record<string, string>>({
-  auth_code: '',
-  auth_secret: '',
+    auth_code: '',
+    auth_secret: ''
 })
 const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = reactive<FormRules>({
-  auth_code: [
-    { required: true, message: t('authCodePlaceholder'), trigger: 'blur' },
-  ],
-  auth_secret: [
-    { required: true, message: t('authSecretPlaceholder'), trigger: 'blur' },
-  ],
+    auth_code: [
+        { required: true, message: t('authCodePlaceholder'), trigger: 'blur' }
+    ],
+    auth_secret: [
+        { required: true, message: t('authSecretPlaceholder'), trigger: 'blur' }
+    ]
 })
 
 const save = async (formEl: FormInstance | undefined) => {
-  if (saveLoading.value || !formEl) return
+    if (saveLoading.value || !formEl) return
 
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      saveLoading.value = true
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            saveLoading.value = true
 
-      setAuthInfo(formData)
-        .then(() => {
-          saveLoading.value = false
-          checkAppMange()
-        })
-        .catch(() => {
-          saveLoading.value = false
-          authCodeApproveDialog.value = false
-        })
-    }
-  })
+            setAuthInfo(formData).then(() => {
+                saveLoading.value = false
+                checkAppMange()
+            }).catch(() => {
+                saveLoading.value = false
+                authCodeApproveDialog.value = false
+            })
+        }
+    })
 }
 
 const market = () => {
-  window.open(installPhpConfig.value?.website_url)
+    window.open(installPhpConfig.value?.website_url)
 }
 
 const versions = ref('')
 const getVersionsInfo = () => {
-  getVersions().then((res) => {
-    versions.value = res.data.version.version
-  })
+    getVersions().then(res => {
+        versions.value = res.data.version.version
+    })
 }
 getVersionsInfo()
 
@@ -374,29 +236,31 @@ getVersionsInfo()
  * 升级
  */
 const handleUpgrade = () => {
-  if (!authinfo.value.auth_code) {
-    authCodeApproveFn()
-    return
-  }
-  upgradeRef.value?.open()
+    if (!authinfo.value.auth_code) {
+        authCodeApproveFn()
+        return
+    }
+    upgradeRef.value?.open()
 }
 
 const handleCloudBuild = () => {
-  if (!authinfo.value.auth_code) {
-    authCodeApproveFn()
-    return
-  }
-  if (cloudBuildRef.value.cloudBuildTask) {
-    cloudBuildRef.value?.open()
-    return
-  }
-  ElMessageBox.confirm(t('cloudBuildTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    cloudBuildRef.value?.open()
-  })
+    if (!authinfo.value.auth_code) {
+        authCodeApproveFn()
+        return
+    }
+    if (cloudBuildRef.value.cloudBuildTask) {
+        cloudBuildRef.value?.open()
+        return
+    }
+    ElMessageBox.confirm(t('cloudBuildTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        cloudBuildRef.value?.open()
+    })
 }
 </script>
 
diff --git a/admin/src/app/views/app/index.vue b/admin/src/app/views/app/index.vue
index aed7ade9..1393a193 100644
--- a/admin/src/app/views/app/index.vue
+++ b/admin/src/app/views/app/index.vue
@@ -1,69 +1,48 @@
 <template>
-  <!--应用管理-->
-  <div class="main-container" v-loading="loading">
-    <el-card class="box-card !border-none" shadow="never">
-      <template v-if="Object.keys(appList).length">
-        <template v-for="(item, index) in appList" :key="index + 'b'">
-          <template v-if="item.list.length">
-            <div class="flex justify-between items-center">
-              <span class="text-page-title">{{ item.title }}</span>
-            </div>
+    <!--应用管理-->
+    <div class="main-container" v-loading="loading">
+        <el-card class="box-card !border-none" shadow="never">
 
-            <div class="flex flex-wrap plug-list pb-10 plug-large">
-              <div
-                class="cursor-pointer mt-[20px] mr-4 bg-[#f7f7f7]"
-                v-for="(childItem, childIndex) in item.list"
-                :key="childIndex"
-                @click="toLink(childItem)"
-              >
-                <div
-                  class="w-[264px] flex py-[20px] px-[17px] app-item relative"
-                >
-                  <el-image
-                    class="w-[40px] h-[40px] mr-[10px]"
-                    :src="img(childItem.icon)"
-                    fit="contain"
-                  >
-                    <template #error>
-                      <div class="image-slot">
-                        <img
-                          class="w-[40px] h-[40px]"
-                          src="@/app/assets/images/index/app_default.png"
-                        />
-                      </div>
-                    </template>
-                  </el-image>
-                  <div class="flex flex-col justify-between w-[180px]">
-                    <div class="text-[14px] flex items-center">
-                      <span class="app-text max-w-[170px]">{{
-                        childItem.title
-                      }}</span>
-                      <span
-                        class="iconfont iconxiaochengxu2 text-[#00b240] ml-[4px] !text-[14px]"
-                      ></span>
-                    </div>
-                    <!-- <el-icon color="#666">
+            <template v-if="Object.keys(appList).length">
+
+                <template v-for="(item, index) in appList" :key="index + 'b'">
+                    <template v-if="item.list.length">
+                        <div class="flex justify-between items-center">
+                            <span class="text-page-title">{{ item.title }}</span>
+                        </div>
+
+                        <div class="flex flex-wrap plug-list pb-10 plug-large">
+                            <div class="cursor-pointer mt-[20px] mr-4 bg-[#f7f7f7]" v-for="(childItem,childIndex) in item.list" :key="childIndex" @click="toLink(childItem)">
+                                <div class="w-[264px] flex py-[20px] px-[17px] app-item relative">
+                                    <el-image class="w-[40px] h-[40px] mr-[10px]" :src="img(childItem.icon)" fit="contain">
+                                        <template #error>
+                                            <div class="image-slot">
+                                                <img class="w-[40px] h-[40px]" src="@/app/assets/images/index/app_default.png" />
+                                            </div>
+                                        </template>
+                                    </el-image>
+                                    <div class="flex flex-col justify-between w-[180px]">
+                                        <div class="text-[14px] flex items-center">
+                                            <span class="app-text max-w-[170px]">{{ childItem.title }}</span>
+                                            <span class="iconfont iconxiaochengxu2 text-[#00b240] ml-[4px] !text-[14px]"></span>
+                                        </div>
+                                            <!-- <el-icon color="#666">
                                                 <QuestionFilled />
                                             </el-icon> -->
-                    <p class="app-text text-[12px] text-[#999]">
-                      {{ childItem.desc }}
-                    </p>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </template>
-        </template>
-      </template>
+                                        <p class="app-text text-[12px] text-[#999]">{{childItem.desc}}</p>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </template>
+                </template>
+            </template>
 
-      <div
-        class="empty flex items-center justify-center"
-        v-if="!loading && !Object.keys(appList).length"
-      >
-        <el-empty :description="t('emptyAppData')" />
-      </div>
-    </el-card>
-  </div>
+            <div class="empty flex items-center justify-center" v-if="!loading && !Object.keys(appList).length">
+                <el-empty :description="t('emptyAppData')" />
+            </div>
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -80,38 +59,37 @@ const appList = ref<Record<string, any>[]>([])
 
 const loading = ref(true)
 const getAppList = async () => {
-  // const res = await getSiteAddons()
-  // appList.value = res.data
-  // loading.value = false
+    // const res = await getSiteAddons()
+    // appList.value = res.data
+    // loading.value = false
 
-  const res = await getShowApp()
-  appList.value = res.data
-  loading.value = false
+    const res = await getShowApp()
+    appList.value = res.data
+    loading.value = false
 }
 getAppList()
 
 const toLink = (item: any) => {
-  console.log('tol', item)
-  if (item.url) {
-    router.push(item.url)
-  } else {
-    addonIndexRoute[item.key] &&
-      router.push({ name: addonIndexRoute[item.key] })
-  }
+    console.log('tol', item)
+    if (item.url) {
+        router.push(item.url)
+    } else {
+        addonIndexRoute[item.key] && router.push({ name: addonIndexRoute[item.key] })
+    }
 }
 </script>
 
 <style lang="scss" scoped>
-.app-text {
-  overflow: hidden;
-  /* 超出部分隐藏 */
-  white-space: nowrap;
-  /* 禁止文本换行 */
-  text-overflow: ellipsis;
-  /* 显示省略号 */
-}
-.app-item:hover {
-  transition: 0.5s;
-  box-shadow: 0px 2px 8px 0px rgba(0, 0, 0, 0.1);
-}
+    .app-text {
+        overflow: hidden;
+        /* 超出部分隐藏 */
+        white-space: nowrap;
+        /* 禁止文本换行 */
+        text-overflow: ellipsis;
+        /* 显示省略号 */
+    }
+    .app-item:hover{
+        transition: 0.5s;
+        box-shadow: 0px 2px 8px 0px rgba(0,0,0,0.1);
+    }
 </style>
diff --git a/admin/src/app/views/auth/components/edit-menu.vue b/admin/src/app/views/auth/components/edit-menu.vue
index 0cfafb95..6a39834f 100644
--- a/admin/src/app/views/auth/components/edit-menu.vue
+++ b/admin/src/app/views/auth/components/edit-menu.vue
@@ -1,193 +1,100 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="popTitle"
-    width="500px"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="90px"
-      class="page-form"
-      ref="formRef"
-      :rules="formRules"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('menuName')" prop="menu_name">
-        <el-input
-          v-model.trim="formData.menu_name"
-          maxlength="10"
-          show-word-limit
-          :placeholder="t('menuNamePlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-      <el-form-item :label="t('menuKey')" prop="menu_key" v-if="!formData.id">
-        <el-input
-          v-model.trim="formData.menu_key"
-          maxlength="50"
-          show-word-limit
-          :placeholder="t('menuKeyPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('menuType')">
-        <el-radio-group v-model="formData.menu_type">
-          <el-radio :label="0">{{ t('menuTypeDir') }}</el-radio>
-          <el-radio :label="1">{{ t('menuTypeMenu') }}</el-radio>
-          <el-radio :label="2">{{ t('menuTypeButton') }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-
-      <el-form-item :label="t('addon')" prop="addon">
-        <el-select
-          v-model="formData.addon"
-          :placeholder="t('addon')"
-          class="input-width"
-          @change="addonChange"
-        >
-          <el-option
-            v-for="(item, index) in addonList"
-            :label="item.title"
-            :value="item.key"
-            :key="index"
-          />
-        </el-select>
-      </el-form-item>
-
-      <el-form-item :label="t('parentMenu')" prop="parent_key">
-        <el-tree-select
-          class="input-width"
-          v-if="formData.addon != ''"
-          v-model="formData.parent_key"
-          :props="{ label: 'menu_name', value: 'menu_key' }"
-          :data="addonMenuList"
-          check-strictly
-          :render-after-expand="false"
-        />
-        <el-tree-select
-          class="input-width"
-          v-else
-          v-model="formData.parent_key"
-          :props="{ label: 'menu_name', value: 'menu_key' }"
-          :data="sysMenuList"
-          check-strictly
-          :render-after-expand="false"
-        />
-      </el-form-item>
-
-      <el-form-item
-        :label="t('routePath')"
-        prop="router_path"
-        v-show="formData.menu_type == 1"
-      >
-        <el-input
-          v-model.trim="formData.router_path"
-          :placeholder="t('routePathPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item
-        :label="t('viewPath')"
-        prop="view_path"
-        v-show="formData.menu_type == 1"
-      >
-        <el-input
-          v-model.trim="formData.view_path"
-          :placeholder="t('viewPathPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item
-        :label="t('authId')"
-        prop="api_url"
-        v-show="formData.menu_type != 0"
-      >
-        <el-input
-          v-model.trim="formData.api_url"
-          :placeholder="t('authIdPlaceholder')"
-          class="input-width"
-        >
-          <template #append>
-            <el-select
-              class="border-none"
-              style="width: 100px"
-              v-model="formData.methods"
-            >
-              <el-option label="POST" value="post" />
-              <el-option label="GET" value="get" />
-              <el-option label="PUT" value="put" />
-              <el-option label="DELETE" value="delete" />
-            </el-select>
-          </template>
-        </el-input>
-      </el-form-item>
-
-      <el-form-item
-        :label="t('menuIcon')"
-        prop="icon"
-        v-show="formData.menu_type != 2"
-      >
-        <div class="input-width">
-          <select-icon v-model="formData.icon" />
-        </div>
-      </el-form-item>
-
-      <el-form-item :label="t('status')" v-show="formData.menu_type != 2">
-        <el-radio-group v-model="formData.status">
-          <el-radio :label="1">{{ t('statusNormal') }}</el-radio>
-          <el-radio :label="0">{{ t('statusDeactivate') }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-
-      <el-form-item :label="t('isShow')" v-show="formData.menu_type != 2">
-        <el-radio-group v-model="formData.is_show">
-          <el-radio :label="1">{{ t('show') }}</el-radio>
-          <el-radio :label="0">{{ t('hidden') }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-
-      <el-form-item :label="t('menuShortName')">
-        <el-input
-          v-model.trim="formData.menu_short_name"
-          :placeholder="t('menuShortNamePlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('sort')">
-        <el-input-number v-model="formData.sort" :min="0" />
-      </el-form-item>
-    </el-form>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+    <el-dialog v-model="showDialog" :title="popTitle" width="500px" :destroy-on-close="true">
+        <el-form :model="formData" label-width="90px" class="page-form" ref="formRef" :rules="formRules" v-loading="loading">
+            <el-form-item :label="t('menuName')" prop="menu_name">
+                <el-input v-model.trim="formData.menu_name" maxlength="10" show-word-limit :placeholder="t('menuNamePlaceholder')" class="input-width" />
+            </el-form-item>
+            <el-form-item :label="t('menuKey')" prop="menu_key" v-if="!formData.id">
+                <el-input v-model.trim="formData.menu_key" maxlength="50" show-word-limit :placeholder="t('menuKeyPlaceholder')" class="input-width" />
+            </el-form-item>
+
+            <el-form-item :label="t('menuType')">
+                <el-radio-group v-model="formData.menu_type">
+                    <el-radio :label="0">{{ t('menuTypeDir') }}</el-radio>
+                    <el-radio :label="1">{{ t('menuTypeMenu') }}</el-radio>
+                    <el-radio :label="2">{{ t('menuTypeButton') }}</el-radio>
+                </el-radio-group>
+            </el-form-item>
+
+            <el-form-item :label="t('addon')" prop="addon">
+                <el-select v-model="formData.addon" :placeholder="t('addon')" class="input-width" @change="addonChange">
+                    <el-option v-for="(item, index) in addonList" :label="item.title" :value="item.key" :key="index" />
+                </el-select>
+            </el-form-item>
+
+            <el-form-item :label="t('parentMenu')" prop="parent_key">
+                <el-tree-select class="input-width" v-if="formData.addon != ''" v-model="formData.parent_key"
+                    :props="{ label: 'menu_name', value: 'menu_key' }" :data="addonMenuList" check-strictly
+                    :render-after-expand="false" />
+                <el-tree-select class="input-width" v-else v-model="formData.parent_key"
+                    :props="{ label: 'menu_name', value: 'menu_key' }" :data="sysMenuList" check-strictly
+                    :render-after-expand="false" />
+            </el-form-item>
+
+            <el-form-item :label="t('routePath')" prop="router_path" v-show="formData.menu_type == 1">
+                <el-input v-model.trim="formData.router_path" :placeholder="t('routePathPlaceholder')" class="input-width" />
+            </el-form-item>
+
+            <el-form-item :label="t('viewPath')" prop="view_path" v-show="formData.menu_type == 1">
+                <el-input v-model.trim="formData.view_path" :placeholder="t('viewPathPlaceholder')" class="input-width" />
+            </el-form-item>
+
+            <el-form-item :label="t('authId')" prop="api_url" v-show="formData.menu_type != 0">
+                <el-input v-model.trim="formData.api_url" :placeholder="t('authIdPlaceholder')" class="input-width">
+                    <template #append>
+                        <el-select class="border-none" style="width: 100px" v-model="formData.methods">
+                            <el-option label="POST" value="post" />
+                            <el-option label="GET" value="get" />
+                            <el-option label="PUT" value="put" />
+                            <el-option label="DELETE" value="delete" />
+                        </el-select>
+                    </template>
+                </el-input>
+            </el-form-item>
+
+            <el-form-item :label="t('menuIcon')" prop="icon" v-show="formData.menu_type != 2">
+                <div class="input-width">
+                    <select-icon v-model="formData.icon" />
+                </div>
+            </el-form-item>
+
+            <el-form-item :label="t('status')" v-show="formData.menu_type != 2">
+                <el-radio-group v-model="formData.status">
+                    <el-radio :label="1">{{ t('statusNormal') }}</el-radio>
+                    <el-radio :label="0">{{ t('statusDeactivate') }}</el-radio>
+                </el-radio-group>
+            </el-form-item>
+
+            <el-form-item :label="t('isShow')" v-show="formData.menu_type != 2">
+                <el-radio-group v-model="formData.is_show">
+                    <el-radio :label="1">{{ t('show') }}</el-radio>
+                    <el-radio :label="0">{{ t('hidden') }}</el-radio>
+                </el-radio-group>
+            </el-form-item>
+
+            <el-form-item :label="t('menuShortName')">
+                <el-input v-model.trim="formData.menu_short_name" :placeholder="t('menuShortNamePlaceholder')" class="input-width" />
+            </el-form-item>
+
+            <el-form-item :label="t('sort')">
+                <el-input-number v-model="formData.sort" :min="0"/>
+            </el-form-item>
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
 import { ref, reactive, computed } from 'vue'
 import { t } from '@/lang'
 import type { FormInstance } from 'element-plus'
-import {
-  addMenu,
-  editMenu,
-  getMenuInfo,
-  getSystemMenu,
-  getAddonMenu,
-} from '@/app/api/sys'
+import { addMenu, editMenu, getMenuInfo, getSystemMenu, getAddonMenu } from '@/app/api/sys'
 import { getAddonDevelop } from '@/app/api/tools'
 
 const showDialog = ref(false)
@@ -198,21 +105,21 @@ let popTitle: string = ''
  * 表单数据
  */
 const initialFormData = {
-  id: 0,
-  menu_name: '',
-  menu_type: 0,
-  parent_key: '',
-  icon: '',
-  api_url: '',
-  router_path: '',
-  view_path: '',
-  methods: 'post',
-  sort: '',
-  status: 1,
-  is_show: 1,
-  menu_key: '',
-  addon: '',
-  menu_short_name: '',
+    id: 0,
+    menu_name: '',
+    menu_type: 0,
+    parent_key: '',
+    icon: '',
+    api_url: '',
+    router_path: '',
+    view_path: '',
+    methods: 'post',
+    sort: '',
+    status: 1,
+    is_show: 1,
+    menu_key: '',
+    addon: '',
+    menu_short_name: ''
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -222,79 +129,67 @@ const addonMenuList = ref<Array<any>>([])
 const formRef = ref<FormInstance>()
 
 const validataMenuKey = (val: string) => {
-  return /^([a-zA-Z_$])([a-zA-Z0-9_$])*$/.test(val)
+    return /^([a-zA-Z_$])([a-zA-Z0-9_$])*$/.test(val)
 }
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    menu_name: [
-      { required: true, message: t('menuNamePlaceholder'), trigger: 'blur' },
-    ],
-    menu_key: [
-      { required: true, message: t('menuKeyPlaceholder'), trigger: 'blur' },
-      {
-        validator: (rule: any, value: string, callback: any) => {
-          if (!validataMenuKey(value)) {
-            callback(new Error(t('menuKeyValidata')))
-          }
-
-          callback()
-        },
-        trigger: 'blur',
-      },
-    ],
-    router_path: [
-      {
-        required: formData.menu_type == 1,
-        message: t('routePathPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    view_path: [
-      {
-        required: formData.menu_type == 1,
-        message: t('viewPathPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    api_url: [
-      {
-        required: formData.menu_type == 2,
-        message: t('authIdPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-  }
+    return {
+        menu_name: [
+            { required: true, message: t('menuNamePlaceholder'), trigger: 'blur' }
+        ],
+        menu_key: [
+            { required: true, message: t('menuKeyPlaceholder'), trigger: 'blur' },
+            {
+                validator: (rule: any, value: string, callback: any) => {
+                    if (!validataMenuKey(value)) {
+                        callback(new Error(t('menuKeyValidata')))
+                    }
+
+                    callback()
+                },
+                trigger: 'blur'
+            }
+        ],
+        router_path: [
+            { required: formData.menu_type == 1, message: t('routePathPlaceholder'), trigger: 'blur' }
+        ],
+        view_path: [
+            { required: formData.menu_type == 1, message: t('viewPathPlaceholder'), trigger: 'blur' }
+        ],
+        api_url: [
+            { required: formData.menu_type == 2, message: t('authIdPlaceholder'), trigger: 'blur' }
+        ]
+    }
 })
 
 // 获取插件列表
 const getAddonDevelopFn = async () => {
-  const { data } = await getAddonDevelop({})
-  addonList.value = [{ title: '系统', key: '' }]
-  addonList.value.push(...data)
+    const { data } = await getAddonDevelop({})
+    addonList.value = [{ title: '系统', key: '' }]
+    addonList.value.push(...data)
 }
 
 // 获取系统菜单列表
 const getSystemMenuFn = async () => {
-  const { data } = await getSystemMenu()
-  sysMenuList.value = [{ menu_name: '顶级', menu_key: '' }]
-  sysMenuList.value.push(...data)
+    const { data } = await getSystemMenu()
+    sysMenuList.value = [{ menu_name: '顶级', menu_key: '' }]
+    sysMenuList.value.push(...data)
 }
 
 // 获取系统应用列表
 const getAddonMenuFn = async (key: any) => {
-  const { data } = await getAddonMenu(key)
-  addonMenuList.value = data
+    const { data } = await getAddonMenu(key)
+    addonMenuList.value = data
 }
 
 // 选择应用
 const addonChange = async (val: any) => {
-  formData.parent_key = ''
-  if (val != '') {
-    await getAddonMenuFn(val)
-    formData.parent_key = addonMenuList.value[0].menu_key
-  }
+    formData.parent_key = ''
+    if (val != '') {
+        await getAddonMenuFn(val)
+        formData.parent_key = addonMenuList.value[0].menu_key
+    }
 }
 
 const emit = defineEmits(['complete'])
@@ -304,53 +199,51 @@ const emit = defineEmits(['complete'])
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  const save = formData.id ? editMenu : addMenu
-
-  await formEl.validate(async (valid, fields) => {
-    if (valid) {
-      loading.value = true
-
-      const data = formData
+    if (loading.value || !formEl) return
+    const save = formData.id ? editMenu : addMenu
+
+    await formEl.validate(async (valid, fields) => {
+        if (valid) {
+            loading.value = true
+
+            const data = formData
+
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
+}
 
-      save(data)
-        .then((res) => {
-          loading.value = false
-          showDialog.value = false
-          emit('complete')
+const setFormData = async (row: any = null) => {
+    loading.value = true
+    Object.assign(formData, initialFormData)
+    popTitle = t('addMenu')
+    getAddonDevelopFn()
+    getSystemMenuFn()
+    if (row.menu_key) {
+        popTitle = t('updateMenu')
+        const data = await (await getMenuInfo(row.menu_key)).data
+        Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
         })
-        .catch(() => {
-          loading.value = false
+        if (formData.addon != '') getAddonMenuFn(formData.addon)
+    } else {
+        Object.keys(formData).forEach((key: string) => {
+            if (row[key] != undefined) formData[key] = row[key]
         })
     }
-  })
-}
-
-const setFormData = async (row: any = null) => {
-  loading.value = true
-  Object.assign(formData, initialFormData)
-  popTitle = t('addMenu')
-  getAddonDevelopFn()
-  getSystemMenuFn()
-  if (row.menu_key) {
-    popTitle = t('updateMenu')
-    const data = await (await getMenuInfo(row.menu_key)).data
-    Object.keys(formData).forEach((key: string) => {
-      if (data[key] != undefined) formData[key] = data[key]
-    })
-    if (formData.addon != '') getAddonMenuFn(formData.addon)
-  } else {
-    Object.keys(formData).forEach((key: string) => {
-      if (row[key] != undefined) formData[key] = row[key]
-    })
-  }
 
-  loading.value = false
+    loading.value = false
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
diff --git a/admin/src/app/views/auth/components/edit-role.vue b/admin/src/app/views/auth/components/edit-role.vue
index 63fc0285..faefe0db 100644
--- a/admin/src/app/views/auth/components/edit-role.vue
+++ b/admin/src/app/views/auth/components/edit-role.vue
@@ -1,75 +1,39 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="popTitle"
-    width="500px"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="90px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('roleName')" prop="role_name">
-        <el-input
-          v-model.trim="formData.role_name"
-          :placeholder="t('roleNamePlaceholder')"
-          clearable
-          :disabled="formData.uid"
-          class="input-width"
-          maxlength="10"
-          :show-word-limit="true"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('status')">
-        <el-radio-group v-model="formData.status">
-          <el-radio :label="1">{{ t('startUsing') }}</el-radio>
-          <el-radio :label="0">{{ t('statusDeactivate') }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-
-      <el-form-item :label="t('permission')" prop="rules">
-        <div class="flex items-center justify-between w-11/12">
-          <div>
-            <el-checkbox v-model="selectAll" :label="t('selectAll')" />
-            <el-checkbox v-model="checkStrictly" :label="t('checkStrictly')" />
-          </div>
-          <el-button link type="primary" @click="menuAction()">{{
-            t('foldText')
-          }}</el-button>
-        </div>
-        <el-scrollbar height="35vh" class="w-full">
-          <el-tree
-            :data="menus"
-            :props="{ label: 'menu_name' }"
-            :default-checked-keys="formData.rules"
-            :check-strictly="checkStrictly"
-            show-checkbox
-            default-expand-all
-            @check-change="handleCheckChange"
-            node-key="menu_key"
-            ref="treeRef"
-          />
-        </el-scrollbar>
-      </el-form-item>
-    </el-form>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+    <el-dialog v-model="showDialog" :title="popTitle" width="500px" :destroy-on-close="true">
+        <el-form :model="formData" label-width="90px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+            <el-form-item :label="t('roleName')" prop="role_name">
+                <el-input v-model.trim="formData.role_name" :placeholder="t('roleNamePlaceholder')" clearable :disabled="formData.uid" class="input-width" maxlength="10" :show-word-limit="true" />
+            </el-form-item>
+
+            <el-form-item :label="t('status')">
+                <el-radio-group v-model="formData.status">
+                    <el-radio :label="1">{{ t('startUsing') }}</el-radio>
+                    <el-radio :label="0">{{ t('statusDeactivate') }}</el-radio>
+                </el-radio-group>
+            </el-form-item>
+
+            <el-form-item :label="t('permission')" prop="rules">
+                <div class="flex items-center justify-between w-11/12">
+                    <div>
+                        <el-checkbox v-model="selectAll" :label="t('selectAll')" />
+                        <el-checkbox v-model="checkStrictly" :label="t('checkStrictly')" />
+                    </div>
+                    <el-button link type="primary" @click="menuAction()">{{ t('foldText') }}</el-button>
+
+                </div>
+                <el-scrollbar height="35vh" class="w-full">
+                    <el-tree :data="menus" :props="{ label: 'menu_name' }" :default-checked-keys="formData.rules" :check-strictly="checkStrictly" show-checkbox default-expand-all @check-change="handleCheckChange" node-key="menu_key" ref="treeRef" />
+                </el-scrollbar>
+            </el-form-item>
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{t('confirm')}}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup async>
@@ -90,7 +54,7 @@ let popTitle: string = ''
 // 获取权限数据
 const menus = ref<Record<string, any>[]>([])
 getAuthMenus({ is_button: 0 }).then((res) => {
-  menus.value = res.data
+    menus.value = res.data
 })
 
 // 全选
@@ -98,51 +62,49 @@ const selectAll = ref(false)
 const checkStrictly = ref(false)
 const treeRef: Record<string, any> | null = ref(null)
 watch(selectAll, () => {
-  if (selectAll.value) {
-    treeRef.value.setCheckedNodes(toRaw(menus.value))
-  } else {
-    treeRef.value.setCheckedNodes([])
-  }
+    if (selectAll.value) {
+        treeRef.value.setCheckedNodes(toRaw(menus.value))
+    } else {
+        treeRef.value.setCheckedNodes([])
+    }
 })
 
 const handleCheckChange = debounce((e) => {
-  formData.rules = treeRef.value.getCheckedKeys()
+    formData.rules = treeRef.value.getCheckedKeys()
 })
 
 const menuAction = () => {
-  if (isOpen.value) {
-    collapseAll(menus.value)
-    isOpen.value = false
-  } else {
-    unFoldAll(menus.value)
-    isOpen.value = true
-  }
+    if (isOpen.value) {
+        collapseAll(menus.value)
+        isOpen.value = false
+    } else {
+        unFoldAll(menus.value)
+        isOpen.value = true
+    }
 }
 
 // 全部展开
-const unFoldAll = (data: any) => {
-  Object.keys(data).forEach((key: string | any) => {
-    treeRef.value.store.nodesMap[data[key].menu_key].expanded = true
-    if (data[key].children && data[key].children.length > 0)
-      collapseAll(data[key].children)
-  })
+const unFoldAll = (data:any) => {
+    Object.keys(data).forEach((key:string|any) => {
+        treeRef.value.store.nodesMap[data[key].menu_key].expanded = true
+        if (data[key].children && data[key].children.length > 0) collapseAll(data[key].children)
+    })
 }
 // 全部折叠
-const collapseAll = (data: any) => {
-  Object.keys(data).forEach((key: string | any) => {
-    treeRef.value.store.nodesMap[data[key].menu_key].expanded = false
-    if (data[key].children && data[key].children.length > 0)
-      collapseAll(data[key].children)
-  })
+const collapseAll = (data:any) => {
+    Object.keys(data).forEach((key:string|any) => {
+        treeRef.value.store.nodesMap[data[key].menu_key].expanded = false
+        if (data[key].children && data[key].children.length > 0) collapseAll(data[key].children)
+    })
 }
 /**
  * 表单数据
  */
 const initialFormData = {
-  role_id: 0,
-  role_name: '',
-  status: 1,
-  rules: [],
+    role_id: 0,
+    role_name: '',
+    status: 1,
+    rules: []
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -150,20 +112,20 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    role_name: [
-      { required: true, message: t('roleNamePlaceholder'), trigger: 'blur' },
-    ],
-    rules: [
-      {
-        validator: (rule: any, value: string, callback: any) => {
-          if (!value.length) callback(new Error(t('rulesPlaceholder')))
-          else callback()
-        },
-        trigger: 'blur',
-      },
-    ],
-  }
+    return {
+        role_name: [
+            { required: true, message: t('roleNamePlaceholder'), trigger: 'blur' }
+        ],
+        rules: [
+            {
+                validator: (rule: any, value: string, callback: any) => {
+                    if (!value.length) callback(new Error(t('rulesPlaceholder')))
+                    else callback()
+                },
+                trigger: 'blur'
+            }
+        ]
+    }
 })
 
 const emit = defineEmits(['complete'])
@@ -173,76 +135,74 @@ const emit = defineEmits(['complete'])
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  const save = formData.role_id ? editRole : addRole
+    if (loading.value || !formEl) return
+    const save = formData.role_id ? editRole : addRole
 
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
 
-      const data = Object.assign({}, formData)
-      data.rules = data.rules.concat(treeRef.value.getHalfCheckedKeys())
+            const data = Object.assign({}, formData)
+            data.rules = data.rules.concat(treeRef.value.getHalfCheckedKeys())
 
-      save(data)
-        .then((res) => {
-          loading.value = false
-          showDialog.value = false
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
 
-          emit('complete')
-        })
-        .catch(() => {
-          loading.value = false
-          // showDialog.value = false
+                emit('complete')
+            }).catch(() => {
+                loading.value = false
+                // showDialog.value = false
+            })
+        }
+    })
+}
+
+const setFormData = async (row: any = null) => {
+    loading.value = true
+    selectAll.value = false
+    Object.assign(formData, initialFormData)
+    popTitle = t('addRole')
+    if (row) {
+        popTitle = t('updateRole')
+        const data = await (await getRoleInfo(row.role_id)).data
+        Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) {
+                if (key == 'rules') {
+                    const arr = data.rules
+                    const newArr:any = []
+
+                    Object.keys(data.rules).forEach((i) => {
+                        checked(data.rules[i], menus.value, newArr)
+                    })
+                    formData[key] = newArr
+                } else {
+                    formData[key] = data[key]
+                }
+            }
         })
     }
-  })
+    loading.value = false
 }
 
-const setFormData = async (row: any = null) => {
-  loading.value = true
-  selectAll.value = false
-  Object.assign(formData, initialFormData)
-  popTitle = t('addRole')
-  if (row) {
-    popTitle = t('updateRole')
-    const data = await (await getRoleInfo(row.role_id)).data
-    Object.keys(formData).forEach((key: string) => {
-      if (data[key] != undefined) {
-        if (key == 'rules') {
-          const arr = data.rules
-          const newArr: any = []
-
-          Object.keys(data.rules).forEach((i) => {
-            checked(data.rules[i], menus.value, newArr)
-          })
-          formData[key] = newArr
+function checked (menuKey:string, data:any, newArr:any) {
+    Object.keys(data).forEach((key:string) => {
+        const item = data[key]
+        if (item.menu_key == menuKey) {
+            if (!item.children || item.children.length == 0) {
+                newArr.push(item.menu_key)
+            }
         } else {
-          formData[key] = data[key]
+            if (item.children && item.children.length > 0) {
+                checked(menuKey, item.children, newArr)
+            }
         }
-      }
     })
-  }
-  loading.value = false
-}
-
-function checked(menuKey: string, data: any, newArr: any) {
-  Object.keys(data).forEach((key: string) => {
-    const item = data[key]
-    if (item.menu_key == menuKey) {
-      if (!item.children || item.children.length == 0) {
-        newArr.push(item.menu_key)
-      }
-    } else {
-      if (item.children && item.children.length > 0) {
-        checked(menuKey, item.children, newArr)
-      }
-    }
-  })
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
diff --git a/admin/src/app/views/auth/components/edit-user.vue b/admin/src/app/views/auth/components/edit-user.vue
index e291fcad..3bf81e44 100644
--- a/admin/src/app/views/auth/components/edit-user.vue
+++ b/admin/src/app/views/auth/components/edit-user.vue
@@ -1,119 +1,49 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="popTitle"
-    width="500px"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="90px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('accountNumber')" prop="username">
-        <el-input
-          v-model.trim="formData.username"
-          :placeholder="t('accountNumberPlaceholder')"
-          clearable
-          :disabled="formData.uid"
-          class="input-width"
-          maxlength="10"
-          show-word-limit
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('headImg')">
-        <upload-image v-model="formData.head_img" />
-      </el-form-item>
-
-      <el-form-item :label="t('userRealName')" prop="real_name">
-        <el-input
-          v-model.trim="formData.real_name"
-          :placeholder="t('userRealNamePlaceholder')"
-          :readonly="real_name_input"
-          @click="real_name_input = false"
-          @blur="real_name_input = true"
-          clearable
-          class="input-width"
-          maxlength="10"
-          show-word-limit
-        />
-      </el-form-item>
-      <div v-if="!formData.uid">
-        <el-form-item :label="t('password')" prop="password">
-          <el-input
-            v-model.trim="formData.password"
-            :placeholder="t('passwordPlaceholder')"
-            :readonly="password_input"
-            @click="password_input = false"
-            @blur="password_input = true"
-            type="password"
-            :show-password="true"
-            clearable
-            class="input-width"
-          />
-        </el-form-item>
-
-        <el-form-item :label="t('confirmPassword')" prop="confirm_password">
-          <el-input
-            v-model.trim="formData.confirm_password"
-            :placeholder="t('confirmPasswordPlaceholder')"
-            :readonly="confirm_password_input"
-            @click="confirm_password_input = false"
-            @blur="confirm_password_input = true"
-            type="password"
-            :show-password="true"
-            clearable
-            class="input-width"
-          />
-        </el-form-item>
-      </div>
-
-      <el-form-item
-        :label="t('userRoleName')"
-        prop="role_ids"
-        v-if="!formData.userrole.is_admin"
-      >
-        <el-select
-          v-model="formData.role_ids"
-          :placeholder="t('userRolePlaceholder')"
-          class="input-width"
-          multiple
-          collapse-tags
-          collapse-tags-tooltip
-        >
-          <el-option
-            :label="item.role_name"
-            :value="item.role_id"
-            v-for="(item, index) in roles"
-            :key="index"
-          />
-        </el-select>
-      </el-form-item>
-
-      <el-form-item :label="t('status')">
-        <el-radio-group v-model="formData.status">
-          <el-radio :label="1">{{ t('statusUnlock') }}</el-radio>
-          <el-radio :label="0">{{ t('lock') }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-    </el-form>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+    <el-dialog v-model="showDialog" :title="popTitle" width="500px" :destroy-on-close="true">
+        <el-form :model="formData" label-width="90px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+
+            <el-form-item :label="t('accountNumber')" prop="username">
+                <el-input v-model.trim="formData.username" :placeholder="t('accountNumberPlaceholder')" clearable :disabled="formData.uid" class="input-width" maxlength="10" show-word-limit />
+            </el-form-item>
+
+            <el-form-item :label="t('headImg')">
+                <upload-image v-model="formData.head_img" />
+            </el-form-item>
+
+            <el-form-item :label="t('userRealName')" prop="real_name">
+                <el-input v-model.trim="formData.real_name" :placeholder="t('userRealNamePlaceholder')" :readonly="real_name_input" @click="real_name_input = false" @blur="real_name_input = true" clearable class="input-width" maxlength="10" show-word-limit />
+            </el-form-item>
+            <div v-if="!formData.uid">
+                <el-form-item :label="t('password')" prop="password">
+                    <el-input v-model.trim="formData.password" :placeholder="t('passwordPlaceholder')" :readonly="password_input" @click="password_input = false" @blur="password_input = true" type="password" :show-password="true" clearable class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('confirmPassword')" prop="confirm_password">
+                    <el-input v-model.trim="formData.confirm_password" :placeholder="t('confirmPasswordPlaceholder')" :readonly="confirm_password_input" @click="confirm_password_input = false" @blur="confirm_password_input = true" type="password" :show-password="true" clearable class="input-width" />
+                </el-form-item>
+            </div>
+
+            <el-form-item :label="t('userRoleName')" prop="role_ids" v-if="!formData.userrole.is_admin">
+                <el-select v-model="formData.role_ids" :placeholder="t('userRolePlaceholder')" class="input-width" multiple collapse-tags collapse-tags-tooltip>
+                    <el-option :label="item.role_name" :value="item.role_id" v-for="(item, index) in roles" :key="index" />
+                </el-select>
+            </el-form-item>
+
+            <el-form-item :label="t('status')">
+                <el-radio-group v-model="formData.status">
+                    <el-radio :label="1">{{ t('statusUnlock') }}</el-radio>
+                    <el-radio :label="0">{{ t('lock') }}</el-radio>
+                </el-radio-group>
+            </el-form-item>
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -138,15 +68,15 @@ let popTitle: string = ''
  * 表单数据
  */
 const initialFormData = {
-  uid: 0,
-  username: '',
-  head_img: '',
-  real_name: '',
-  password: '',
-  confirm_password: '',
-  status: 1,
-  role_ids: [],
-  userrole: {},
+    uid: 0,
+    username: '',
+    head_img: '',
+    real_name: '',
+    password: '',
+    confirm_password: '',
+    status: 1,
+    role_ids: [],
+    userrole: {}
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -154,68 +84,50 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    uid: [
-      {
-        validator: (rule: any, value: string, callback: any) => {
-          if (!formData.uid && uid.value === '')
-            callback(new Error(t('managerPlaceholder')))
-          else callback()
-        },
-        trigger: 'blur',
-      },
-    ],
-    username: [
-      {
-        required: formData.uid == 0,
-        message: t('accountNumberPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    real_name: [
-      {
-        required: true,
-        message: t('userRealNamePlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    role_ids: [
-      { required: true, message: t('userRolePlaceholder'), trigger: 'blur' },
-    ],
-    password: [
-      {
-        required: formData.uid == 0,
-        message: t('passwordPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    confirm_password: [
-      {
-        required: formData.uid == 0,
-        message: t('confirmPasswordPlaceholder'),
-        trigger: 'blur',
-      },
-      {
-        validator: (rule: any, value: string, callback: any) => {
-          if (value != formData.password)
-            callback(new Error(t('confirmPasswordError')))
-          else callback()
-        },
-        trigger: 'blur',
-      },
-    ],
-  }
+    return {
+        uid: [
+            {
+                validator: (rule: any, value: string, callback: any) => {
+                    if (!formData.uid && uid.value === '') callback(new Error(t('managerPlaceholder')))
+                    else callback()
+                },
+                trigger: 'blur'
+            }
+        ],
+        username: [
+            { required: formData.uid == 0, message: t('accountNumberPlaceholder'), trigger: 'blur' }
+        ],
+        real_name: [
+            { required: true, message: t('userRealNamePlaceholder'), trigger: 'blur' }
+        ],
+        role_ids: [
+            { required: true, message: t('userRolePlaceholder'), trigger: 'blur' }
+        ],
+        password: [
+            { required: formData.uid == 0, message: t('passwordPlaceholder'), trigger: 'blur' }
+        ],
+        confirm_password: [
+            { required: formData.uid == 0, message: t('confirmPasswordPlaceholder'), trigger: 'blur' },
+            {
+                validator: (rule: any, value: string, callback: any) => {
+                    if (value != formData.password) callback(new Error(t('confirmPasswordError')))
+                    else callback()
+                },
+                trigger: 'blur'
+            }
+        ]
+    }
 })
 
 const emit = defineEmits(['complete'])
 
 // 角色
 const roles = ref<Record<string, any>>([])
-allRole().then((res) => {
-  roles.value = res.data
-  roles.value.forEach((element: any) => {
-    element.role_id = element.role_id.toString()
-  })
+allRole().then(res => {
+    roles.value = res.data
+    roles.value.forEach((element:any) => {
+        element.role_id = element.role_id.toString()
+    })
 })
 
 /**
@@ -223,49 +135,47 @@ allRole().then((res) => {
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  const save = formData.uid ? editUser : addUser
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-
-      const data = deepClone(toRaw(formData))
-      if (!formData.uid && typeof uid.value == 'number') data.uid = uid.value
-
-      save(data)
-        .then((res) => {
-          loading.value = false
-          showDialog.value = false
-          emit('complete')
-        })
-        .catch(() => {
-          loading.value = false
-        })
-    }
-  })
+    if (loading.value || !formEl) return
+    const save = formData.uid ? editUser : addUser
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            const data = deepClone(toRaw(formData))
+            if (!formData.uid && typeof uid.value == 'number') data.uid = uid.value
+
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
 }
 
 const setFormData = async (row: any = null) => {
-  loading.value = true
-  uid.value = ''
-  Object.assign(formData, initialFormData)
-  popTitle = t('addUser')
-
-  if (row) {
-    popTitle = t('updateUser')
-    const data = await (await getUserInfo(row.uid)).data
-    data.role_ids = data.role_ids || []
-    Object.keys(formData).forEach((key: string) => {
-      if (data[key] != undefined) formData[key] = data[key]
-    })
-  }
-  loading.value = false
+    loading.value = true
+    uid.value = ''
+    Object.assign(formData, initialFormData)
+    popTitle = t('addUser')
+
+    if (row) {
+        popTitle = t('updateUser')
+        const data = await (await getUserInfo(row.uid)).data
+        data.role_ids = data.role_ids || []
+        Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
diff --git a/admin/src/app/views/auth/components/select-menu-item.vue b/admin/src/app/views/auth/components/select-menu-item.vue
index b4bd0ab5..96601d6f 100644
--- a/admin/src/app/views/auth/components/select-menu-item.vue
+++ b/admin/src/app/views/auth/components/select-menu-item.vue
@@ -1,37 +1,33 @@
 <template>
-  <template v-if="prop.menu.menu_type != 2">
-    <el-option :label="`${prop.menu.menu_name}`" :value="prop.menu.menu_key">
-      <span v-html="`${menuLevel}${prop.menu.menu_name}`"></span>
-    </el-option>
-    <template v-if="prop.menu.children">
-      <select-menu-item
-        :menu="item"
-        v-for="(item, index) in prop.menu.children"
-        :level="prop.level + 1"
-        :key="index"
-      />
+    <template v-if="prop.menu.menu_type != 2">
+        <el-option :label="`${prop.menu.menu_name}`" :value="prop.menu.menu_key">
+            <span v-html="`${menuLevel}${prop.menu.menu_name}`"></span>
+        </el-option>
+        <template v-if="prop.menu.children">
+            <select-menu-item :menu="item" v-for="(item,index) in prop.menu.children" :level="prop.level + 1"  :key="index" />
+        </template>
     </template>
-  </template>
 </template>
 
 <script lang="ts" setup>
 import { computed } from 'vue'
 
-const prop: any = defineProps({
-  menu: Object,
-  level: {
-    type: Number,
-    default: 0,
-  },
+const prop:any = defineProps({
+    menu: Object,
+    level: {
+        type: Number,
+        default: 0
+    }
 })
 
 const menuLevel = computed(() => {
-  let t = ''
-  for (let i = 0; i < prop.level; i++) {
-    t += i == 0 ? '&emsp;|--' : '--'
-  }
-  return t
+    let t = ''
+    for (let i = 0; i < prop.level; i++) {
+        t += i == 0 ? '&emsp;|--' : '--'
+    }
+    return t
 })
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
diff --git a/admin/src/app/views/auth/components/user-log-detail.vue b/admin/src/app/views/auth/components/user-log-detail.vue
index 138a8a0d..160c2810 100644
--- a/admin/src/app/views/auth/components/user-log-detail.vue
+++ b/admin/src/app/views/auth/components/user-log-detail.vue
@@ -1,38 +1,23 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="t('detail')"
-    width="500px"
-    :destroy-on-close="true"
-  >
-    <el-scrollbar height="400px" v-loading="loading">
-      <el-descriptions :column="1">
-        <el-descriptions-item :label="t('username')" label-align="right">{{
-          logData.username
-        }}</el-descriptions-item>
-        <el-descriptions-item :label="t('ip')" label-align="right">{{
-          logData.ip
-        }}</el-descriptions-item>
-        <el-descriptions-item :label="t('url')" label-align="right"
-          ><span class="break-all">{{
-            logData.url
-          }}</span></el-descriptions-item
-        >
-        <el-descriptions-item :label="t('type')" label-align="right">{{
-          logData.type
-        }}</el-descriptions-item>
-        <el-descriptions-item :label="t('params')" label-align="right">
-          <span class="break-all">{{ logData.params }}</span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </el-scrollbar>
+    <el-dialog v-model="showDialog" :title="t('detail')" width="500px" :destroy-on-close="true">
+        <el-scrollbar height="400px" v-loading="loading">
+            <el-descriptions :column="1">
+                <el-descriptions-item :label="t('username')" label-align="right">{{logData.username}}</el-descriptions-item>
+                <el-descriptions-item :label="t('ip')" label-align="right">{{logData.ip}}</el-descriptions-item>
+                <el-descriptions-item :label="t('url')" label-align="right"><span class="break-all">{{logData.url}}</span></el-descriptions-item>
+                <el-descriptions-item :label="t('type')" label-align="right">{{logData.type}}</el-descriptions-item>
+                <el-descriptions-item :label="t('params')" label-align="right">
+                    <span class="break-all">{{logData.params}}</span>
+                </el-descriptions-item>
+            </el-descriptions>
+        </el-scrollbar>
 
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-      </span>
-    </template>
-  </el-dialog>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -44,37 +29,37 @@ const showDialog = ref(false)
 const loading = ref(false)
 
 interface LogData {
-  username: string
-  ip: string
-  url: string
-  type: string
-  params: any
+    username: string
+    ip: string,
+    url: string,
+    type: string,
+    params:any
 }
 
 const logData = ref<LogData>({
-  username: '',
-  ip: '',
-  url: '',
-  type: '',
-  params: '',
+    username: '',
+    ip: '',
+    url: '',
+    type: '',
+    params: ''
 })
 const getLogDetail = async () => {
-  logData.value = await (await getLogInfo(id)).data
-  loading.value = false
+    logData.value = await (await getLogInfo(id)).data
+    loading.value = false
 }
 
 let id = 0
 const setFormData = async (row: any = null) => {
-  loading.value = true
-  if (row) {
-    id = row.id
-    getLogDetail()
-  }
+    loading.value = true
+    if (row) {
+        id = row.id
+        getLogDetail()
+    }
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
diff --git a/admin/src/app/views/auth/log.vue b/admin/src/app/views/auth/log.vue
index 28282892..19dc0eb5 100644
--- a/admin/src/app/views/auth/log.vue
+++ b/admin/src/app/views/auth/log.vue
@@ -1,118 +1,61 @@
 <template>
-  <!--操作日志-->
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
+    <!--操作日志-->
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
 
-      <div class="flex justify-between items-center mt-[20px]">
-        <el-form
-          :inline="true"
-          :model="sysUserLogTableData.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('ip')" prop="ip">
-            <el-input
-              v-model.trim="sysUserLogTableData.searchParam.ip"
-              :placeholder="t('ipPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('username')" prop="username">
-            <el-input
-              v-model.trim="sysUserLogTableData.searchParam.username"
-              :placeholder="t('usernamePlaceholder')"
-            />
-          </el-form-item>
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+            </div>
 
-          <el-form-item :label="t('url')" prop="url">
-            <el-input
-              v-model.trim="sysUserLogTableData.searchParam.url"
-              :placeholder="t('urlPlaceholder')"
-            />
-          </el-form-item>
+            <div class="flex justify-between items-center mt-[20px]">
+                <el-form :inline="true" :model="sysUserLogTableData.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('ip')" prop="ip">
+                        <el-input v-model.trim="sysUserLogTableData.searchParam.ip" :placeholder="t('ipPlaceholder')" />
+                    </el-form-item>
+                    <el-form-item :label="t('username')" prop="username">
+                        <el-input v-model.trim="sysUserLogTableData.searchParam.username" :placeholder="t('usernamePlaceholder')" />
+                    </el-form-item>
 
-          <el-form-item>
-            <el-button type="primary" @click="loadSysUserLogList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </div>
+                    <el-form-item :label="t('url')" prop="url">
+                        <el-input v-model.trim="sysUserLogTableData.searchParam.url" :placeholder="t('urlPlaceholder')" />
+                    </el-form-item>
 
-      <div>
-        <el-table
-          :data="sysUserLogTableData.data"
-          size="large"
-          v-loading="sysUserLogTableData.loading"
-        >
-          <template #empty>
-            <span>{{
-              !sysUserLogTableData.loading ? t('emptyData') : ''
-            }}</span>
-          </template>
-          <el-table-column
-            prop="username"
-            :label="t('username')"
-            min-width="120"
-          />
-          <el-table-column
-            prop="ip"
-            :label="t('ip')"
-            min-width="100"
-            align="left"
-          />
-          <el-table-column prop="url" :label="t('url')" min-width="180" />
-          <el-table-column
-            prop="type"
-            :label="t('type')"
-            min-width="100"
-            align="center"
-          />
-          <el-table-column
-            :label="t('createTime')"
-            min-width="180"
-            align="center"
-          >
-            <template #default="{ row }">
-              {{ row.create_time || '' }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            :label="t('operation')"
-            align="right"
-            fixed="right"
-            width="130"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="detailEvent(row)">{{
-                t('detail')
-              }}</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+                    <el-form-item>
+                        <el-button type="primary" @click="loadSysUserLogList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </div>
 
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="sysUserLogTableData.page"
-            v-model:page-size="sysUserLogTableData.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="sysUserLogTableData.total"
-            @size-change="loadSysUserLogList()"
-            @current-change="loadSysUserLogList"
-          />
-        </div>
+            <div>
+                <el-table :data="sysUserLogTableData.data" size="large" v-loading="sysUserLogTableData.loading">
+                    <template #empty>
+                        <span>{{ !sysUserLogTableData.loading ? t('emptyData') : '' }}</span>
+                    </template>
+                    <el-table-column prop="username" :label="t('username')" min-width="120" />
+                    <el-table-column prop="ip" :label="t('ip')" min-width="100" align="left"/>
+                    <el-table-column prop="url" :label="t('url')" min-width="180" />
+                    <el-table-column prop="type" :label="t('type')" min-width="100" align="center"/>
+                     <el-table-column :label="t('createTime')" min-width="180" align="center">
+                        <template #default="{ row }">
+                            {{ row.create_time || '' }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('operation')" align="right" fixed="right" width="130">
+                        <template #default="{ row }">
+                            <el-button type="primary" link @click="detailEvent(row)">{{ t('detail') }}</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
 
-        <user-log-detail
-          ref="userLogDetailDialog"
-          @complete="loadSysUserLogList()"
-        />
-      </div>
-    </el-card>
-  </div>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="sysUserLogTableData.page" v-model:page-size="sysUserLogTableData.limit" layout="total, sizes, prev, pager, next, jumper" :total="sysUserLogTableData.total" @size-change="loadSysUserLogList()" @current-change="loadSysUserLogList" />
+                </div>
+
+                <user-log-detail ref="userLogDetailDialog" @complete="loadSysUserLogList()" />
+            </div>
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -126,44 +69,42 @@ import { useRoute } from 'vue-router'
 const route = useRoute()
 const pageName = route.meta.title
 const sysUserLogTableData = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    ip: '',
-    username: '',
-    url: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        ip: '',
+        username: '',
+        url: ''
+    }
 })
 
 const searchFormRef = ref<FormInstance>()
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
+    if (!formEl) return
 
-  formEl.resetFields()
-  loadSysUserLogList()
+    formEl.resetFields()
+    loadSysUserLogList()
 }
 /**
  * 获取管理员操作记录表列表
  */
 const loadSysUserLogList = (page: number = 1) => {
-  sysUserLogTableData.loading = true
-  sysUserLogTableData.page = page
+    sysUserLogTableData.loading = true
+    sysUserLogTableData.page = page
 
-  getLogList({
-    page: sysUserLogTableData.page,
-    limit: sysUserLogTableData.limit,
-    ...sysUserLogTableData.searchParam,
-  })
-    .then((res) => {
-      sysUserLogTableData.loading = false
-      sysUserLogTableData.data = res.data.data
-      sysUserLogTableData.total = res.data.total
-    })
-    .catch(() => {
-      sysUserLogTableData.loading = false
+    getLogList({
+        page: sysUserLogTableData.page,
+        limit: sysUserLogTableData.limit,
+        ...sysUserLogTableData.searchParam
+    }).then(res => {
+        sysUserLogTableData.loading = false
+        sysUserLogTableData.data = res.data.data
+        sysUserLogTableData.total = res.data.total
+    }).catch(() => {
+        sysUserLogTableData.loading = false
     })
 }
 loadSysUserLogList()
@@ -173,8 +114,8 @@ const userLogDetailDialog: Record<string, any> | null = ref(null)
  * @param data
  */
 const detailEvent = (data: any) => {
-  userLogDetailDialog.value.setFormData(data)
-  userLogDetailDialog.value.showDialog = true
+    userLogDetailDialog.value.setFormData(data)
+    userLogDetailDialog.value.showDialog = true
 }
 </script>
 
diff --git a/admin/src/app/views/auth/menu.vue b/admin/src/app/views/auth/menu.vue
index 5aff64de..e21ef7df 100644
--- a/admin/src/app/views/auth/menu.vue
+++ b/admin/src/app/views/auth/menu.vue
@@ -1,175 +1,94 @@
 <template>
-  <!--站点菜单-->
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-        <div class="flex items-center">
-          <el-button type="primary" class="w-[100px]" @click="addEvent">
-            {{ t('addMenu') }}
-          </el-button>
-          <el-button class="w-[100px]" @click="refreshMenu">
-            {{ t('initializeMenu') }}
-          </el-button>
-        </div>
-      </div>
+    <!--站点菜单-->
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
 
-      <el-tabs v-model="active">
-        <el-tab-pane :label="t('system')" name="system">
-          <el-table
-            :data="menusTableData.system"
-            row-key="menu_key"
-            size="large"
-            v-loading="menusTableData.loading"
-          >
-            <template #empty>
-              <span>{{ !menusTableData.loading ? t('emptyData') : '' }}</span>
-            </template>
-            <el-table-column
-              prop="menu_name"
-              :show-overflow-tooltip="true"
-              :label="t('menuName')"
-              min-width="150"
-            />
-            <el-table-column :label="t('icon')" width="100" align="center">
-              <template #default="{ row }">
-                <icon v-if="row.icon" :name="row.icon" size="18px" />
-              </template>
-            </el-table-column>
-            <el-table-column :label="t('menuType')" width="80">
-              <template #default="{ row }">
-                <div v-if="row.menu_type == 0">{{ t('menuTypeDir') }}</div>
-                <div v-else-if="row.menu_type == 1">
-                  {{ t('menuTypeMenu') }}
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+                <div class="flex items-center">
+                    <el-button type="primary" class="w-[100px]" @click="addEvent">
+                        {{ t('addMenu') }}
+                    </el-button>
+                    <el-button class="w-[100px]" @click="refreshMenu">
+                        {{ t('initializeMenu') }}
+                    </el-button>
                 </div>
-                <div v-else-if="row.menu_type == 2">
-                  {{ t('menuTypeButton') }}
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="api_url"
-              :label="t('authId')"
-              min-width="150"
-              align="center"
-            />
-            <el-table-column
-              :label="t('status')"
-              min-width="120"
-              align="center"
-            >
-              <template #default="{ row }">
-                <el-tag class="ml-2" type="success" v-if="row.status == 1">{{
-                  t('statusNormal')
-                }}</el-tag>
-                <el-tag class="ml-2" type="error" v-if="row.status == 0">{{
-                  t('statusDeactivate')
-                }}</el-tag>
-              </template>
-            </el-table-column>
-            <el-table-column prop="sort" :label="t('sort')" min-width="100" />
-            <el-table-column
-              :label="t('operation')"
-              align="right"
-              fixed="right"
-              width="130"
-            >
-              <template #default="{ row }">
-                <el-button type="primary" link @click="editEvent(row)">{{
-                  t('edit')
-                }}</el-button>
-                <el-button
-                  type="primary"
-                  link
-                  @click="deleteEvent(row.menu_key)"
-                  >{{ t('delete') }}</el-button
-                >
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-tab-pane>
-        <el-tab-pane :label="t('application')" name="application">
-          <el-table
-            :data="menusTableData.application"
-            row-key="menu_key"
-            size="large"
-            v-loading="menusTableData.loading"
-          >
-            <template #empty>
-              <span>{{ !menusTableData.loading ? t('emptyData') : '' }}</span>
-            </template>
-            <el-table-column
-              prop="menu_name"
-              :show-overflow-tooltip="true"
-              :label="t('menuName')"
-              min-width="150"
-            />
-            <el-table-column :label="t('icon')" width="100" align="center">
-              <template #default="{ row }">
-                <icon v-if="row.icon" :name="row.icon" size="18px" />
-              </template>
-            </el-table-column>
-            <el-table-column :label="t('menuType')" width="80">
-              <template #default="{ row }">
-                <div v-if="row.menu_type == 0">{{ t('menuTypeDir') }}</div>
-                <div v-else-if="row.menu_type == 1">
-                  {{ t('menuTypeMenu') }}
-                </div>
-                <div v-else-if="row.menu_type == 2">
-                  {{ t('menuTypeButton') }}
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="api_url"
-              :label="t('authId')"
-              min-width="150"
-              align="center"
-            />
-            <el-table-column
-              :label="t('status')"
-              min-width="120"
-              align="center"
-            >
-              <template #default="{ row }">
-                <el-tag class="ml-2" type="success" v-if="row.status == 1">{{
-                  t('statusNormal')
-                }}</el-tag>
-                <el-tag class="ml-2" type="error" v-if="row.status == 0">{{
-                  t('statusDeactivate')
-                }}</el-tag>
-              </template>
-            </el-table-column>
-            <el-table-column prop="sort" :label="t('sort')" min-width="100" />
-            <el-table-column
-              :label="t('operation')"
-              align="right"
-              fixed="right"
-              width="130"
-            >
-              <template #default="{ row }">
-                <el-button type="primary" link @click="editEvent(row)">{{
-                  t('edit')
-                }}</el-button>
-                <el-button
-                  type="primary"
-                  link
-                  @click="deleteEvent(row.menu_key)"
-                  >{{ t('delete') }}</el-button
-                >
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-tab-pane>
-      </el-tabs>
+            </div>
 
-      <edit-menu
-        ref="editMenuDialog"
-        :menu-tree="menusTableData.data"
-        @complete="getMenuList"
-      />
-    </el-card>
-  </div>
+            <el-tabs v-model="active">
+                <el-tab-pane :label="t('system')" name="system">
+                    <el-table :data="menusTableData.system" row-key="menu_key" size="large" v-loading="menusTableData.loading">
+                        <template #empty>
+                            <span>{{ !menusTableData.loading ? t('emptyData') : '' }}</span>
+                        </template>
+                        <el-table-column prop="menu_name" :show-overflow-tooltip="true" :label="t('menuName')" min-width="150" />
+                        <el-table-column :label="t('icon')" width="100" align="center">
+                            <template #default="{ row }">
+                                <icon v-if="row.icon" :name="row.icon" size="18px" />
+                            </template>
+                        </el-table-column>
+                        <el-table-column :label="t('menuType')" width="80">
+                            <template #default="{ row }">
+                                <div v-if="row.menu_type == 0">{{ t('menuTypeDir') }}</div>
+                                <div v-else-if="row.menu_type == 1">{{ t('menuTypeMenu') }}</div>
+                                <div v-else-if="row.menu_type == 2">{{ t('menuTypeButton') }}</div>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="api_url" :label="t('authId')" min-width="150" align="center" />
+                        <el-table-column :label="t('status')" min-width="120" align="center">
+                            <template #default="{ row }">
+                                <el-tag class="ml-2" type="success" v-if="row.status == 1">{{ t('statusNormal') }}</el-tag>
+                                <el-tag class="ml-2" type="error" v-if="row.status == 0">{{ t('statusDeactivate') }}</el-tag>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="sort" :label="t('sort')" min-width="100" />
+                        <el-table-column :label="t('operation')" align="right" fixed="right" width="130">
+                            <template #default="{ row }">
+                                <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+                                <el-button type="primary" link @click="deleteEvent(row.menu_key)">{{ t('delete') }}</el-button>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </el-tab-pane>
+                <el-tab-pane :label="t('application')" name="application">
+                    <el-table :data="menusTableData.application" row-key="menu_key" size="large" v-loading="menusTableData.loading">
+                        <template #empty>
+                            <span>{{ !menusTableData.loading ? t('emptyData') : '' }}</span>
+                        </template>
+                        <el-table-column prop="menu_name" :show-overflow-tooltip="true" :label="t('menuName')" min-width="150" />
+                        <el-table-column :label="t('icon')" width="100" align="center">
+                            <template #default="{ row }">
+                                <icon v-if="row.icon" :name="row.icon" size="18px" />
+                            </template>
+                        </el-table-column>
+                        <el-table-column :label="t('menuType')" width="80">
+                            <template #default="{ row }">
+                                <div v-if="row.menu_type == 0">{{ t('menuTypeDir') }}</div>
+                                <div v-else-if="row.menu_type == 1">{{ t('menuTypeMenu') }}</div>
+                                <div v-else-if="row.menu_type == 2">{{ t('menuTypeButton') }}</div>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="api_url" :label="t('authId')" min-width="150" align="center" />
+                        <el-table-column :label="t('status')" min-width="120" align="center">
+                            <template #default="{ row }">
+                                <el-tag class="ml-2" type="success" v-if="row.status == 1">{{ t('statusNormal') }}</el-tag>
+                                <el-tag class="ml-2" type="error" v-if="row.status == 0">{{ t('statusDeactivate') }}</el-tag>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="sort" :label="t('sort')" min-width="100" />
+                        <el-table-column :label="t('operation')" align="right" fixed="right" width="130">
+                            <template #default="{ row }">
+                                <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+                                <el-button type="primary" link @click="deleteEvent(row.menu_key)">{{ t('delete') }}</el-button>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </el-tab-pane>
+            </el-tabs>
+
+            <edit-menu ref="editMenuDialog" :menu-tree="menusTableData.data" @complete="getMenuList" />
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -185,52 +104,47 @@ const active = ref('system')
 const pageName = route.meta.title
 
 const menusTableData = reactive<Record<string, any>>({
-  loading: true,
-  system: [],
-  application: [],
+    loading: true,
+    system: [],
+    application: []
 })
 
 /**
  * 获取菜单
  */
 const getMenuList = () => {
-  menusTableData.loading = true
-  getMenus()
-    .then(({ data }) => {
-      menusTableData.loading = false
-      const system: Record<string, any>[] = []
-      const application: Record<string, any> = []
-      data.forEach((item: any) => {
-        item.addon == '' ? system.push(item) : application.push(item)
-      })
-      menusTableData.system = system
-      menusTableData.application = application
+    menusTableData.loading = true
+    getMenus().then(({ data }) => {
+        menusTableData.loading = false
+        const system: Record<string, any>[] = []
+        const application: Record<string, any> = []
+        data.forEach((item: any) => {
+            item.addon == '' ? system.push(item) : application.push(item)
+        })
+        menusTableData.system = system
+        menusTableData.application = application
+    }).catch(() => {
+
     })
-    .catch(() => {})
 }
 getMenuList()
 // 重置菜单
 const refreshMenu = () => {
-  ElMessageBox.confirm(
-    h('div', null, [
-      h('p', null, t('initializeMenuTipsOne')),
-      h('p', null, t('initializeMenuTipsTwo')),
-    ]),
-    t('warning'),
-    {
-      confirmButtonText: t('confirm'),
-      cancelButtonText: t('cancel'),
-      // type: 'warning'
-    }
-  )
-    .then(() => {
-      menuRefresh({})
-        .then((res) => {
-          location.reload()
-        })
-        .catch(() => {})
-    })
-    .catch(() => {})
+    ElMessageBox.confirm(h('div', null, [
+        h('p', null, t('initializeMenuTipsOne')),
+        h('p', null, t('initializeMenuTipsTwo')),
+        ]), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            // type: 'warning'
+        }
+    ).then(() => {
+        menuRefresh({}).then(res => {
+            location.reload()
+        }).catch(() => {})
+    }).catch(()=>{})
+
 }
 /**
  * 添加菜单
@@ -238,8 +152,8 @@ const refreshMenu = () => {
 const editMenuDialog: Record<string, any> | null = ref(null)
 
 const addEvent = () => {
-  editMenuDialog.value.setFormData({})
-  editMenuDialog.value.showDialog = true
+    editMenuDialog.value.setFormData({})
+    editMenuDialog.value.showDialog = true
 }
 
 /**
@@ -247,25 +161,26 @@ const addEvent = () => {
  * @param data
  */
 const editEvent = (data: any) => {
-  editMenuDialog.value.setFormData(data)
-  editMenuDialog.value.showDialog = true
+    editMenuDialog.value.setFormData(data)
+    editMenuDialog.value.showDialog = true
 }
 
 /**
  * 删除菜单
  */
 const deleteEvent = (key: string) => {
-  ElMessageBox.confirm(t('menuDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    deleteMenu(key)
-      .then((res) => {
-        getMenuList()
-      })
-      .catch(() => {})
-  })
+    ElMessageBox.confirm(t('menuDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        deleteMenu(key).then(res => {
+            getMenuList()
+        }).catch(() => {
+        })
+    })
 }
 </script>
 
diff --git a/admin/src/app/views/auth/role.vue b/admin/src/app/views/auth/role.vue
index 6193b95d..03deef48 100644
--- a/admin/src/app/views/auth/role.vue
+++ b/admin/src/app/views/auth/role.vue
@@ -1,100 +1,54 @@
 <template>
-  <!--角色管理-->
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
+    <!--角色管理-->
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
 
-      <div class="flex justify-between items-center mt-[20px]">
-        <el-form
-          :inline="true"
-          :model="roleTableData.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('roleName')" prop="search">
-            <el-input
-              v-model.trim="roleTableData.searchParam.search"
-              class="w-[240px]"
-              :placeholder="t('roleNamePlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="loadRoleList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-        <el-button
-          type="primary"
-          class="w-[100px] self-start"
-          @click="addEvent"
-          >{{ t('addRole') }}</el-button
-        >
-      </div>
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+            </div>
 
-      <div>
-        <el-table
-          :data="roleTableData.data"
-          size="large"
-          v-loading="roleTableData.loading"
-        >
-          <template #empty>
-            <span>{{ !roleTableData.loading ? t('emptyData') : '' }}</span>
-          </template>
-          <el-table-column prop="role_name" :label="t('roleName')" />
-          <el-table-column :label="t('status')">
-            <template #default="{ row }">
-              <el-tag type="success" v-if="row.status == 1">{{
-                row.status_name
-              }}</el-tag>
-              <el-tag type="error" v-if="row.status == 0">{{
-                row.status_name
-              }}</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="create_time"
-            :label="t('createTime')"
-          ></el-table-column>
-          <el-table-column
-            :label="t('operation')"
-            align="right"
-            fixed="right"
-            width="130"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="editEvent(row)">{{
-                t('edit')
-              }}</el-button>
-              <el-button
-                type="primary"
-                link
-                @click="deleteEvent(row.role_id)"
-                >{{ t('delete') }}</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
+            <div class="flex justify-between items-center mt-[20px]">
+                <el-form :inline="true" :model="roleTableData.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('roleName')" prop="search">
+                        <el-input v-model.trim="roleTableData.searchParam.search" class="w-[240px]" :placeholder="t('roleNamePlaceholder')" />
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="loadRoleList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+                <el-button type="primary" class="w-[100px] self-start" @click="addEvent">{{ t('addRole') }}</el-button>
+            </div>
 
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="roleTableData.page"
-            v-model:page-size="roleTableData.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="roleTableData.total"
-            @size-change="loadRoleList()"
-            @current-change="loadRoleList"
-          />
-        </div>
-      </div>
+            <div>
+                <el-table :data="roleTableData.data" size="large" v-loading="roleTableData.loading">
+                    <template #empty>
+                        <span>{{ !roleTableData.loading ? t('emptyData') : '' }}</span>
+                    </template>
+                    <el-table-column prop="role_name" :label="t('roleName')" />
+                    <el-table-column :label="t('status')">
+                        <template #default="{ row }">
+                            <el-tag type="success" v-if="row.status == 1">{{ row.status_name }}</el-tag>
+                            <el-tag type="error" v-if="row.status == 0">{{ row.status_name }}</el-tag>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="create_time" :label="t('createTime')"></el-table-column>
+                    <el-table-column :label="t('operation')" align="right" fixed="right" width="130">
+                        <template #default="{ row }">
+                            <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+                            <el-button type="primary" link @click="deleteEvent(row.role_id)">{{ t('delete') }}</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
 
-      <edit-role ref="editRoleDialog" @complete="loadRoleList()" />
-    </el-card>
-  </div>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="roleTableData.page" v-model:page-size="roleTableData.limit" layout="total, sizes, prev, pager, next, jumper" :total="roleTableData.total" @size-change="loadRoleList()" @current-change="loadRoleList" />
+                </div>
+            </div>
+
+            <edit-role ref="editRoleDialog" @complete="loadRoleList()" />
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -108,42 +62,40 @@ import { useRoute } from 'vue-router'
 const route = useRoute()
 const pageName = route.meta.title
 const roleTableData = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    search: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        search: ''
+    }
 })
 
 const searchFormRef = ref<FormInstance>()
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
+    if (!formEl) return
 
-  formEl.resetFields()
-  loadRoleList()
+    formEl.resetFields()
+    loadRoleList()
 }
 /**
  * 获取角色列表
  */
 const loadRoleList = (page: number = 1) => {
-  roleTableData.loading = true
-  roleTableData.page = page
+    roleTableData.loading = true
+    roleTableData.page = page
 
-  getRoleList({
-    page: roleTableData.page,
-    limit: roleTableData.limit,
-    role_name: roleTableData.searchParam.search,
-  })
-    .then((res) => {
-      roleTableData.loading = false
-      roleTableData.data = res.data.data
-      roleTableData.total = res.data.total
-    })
-    .catch(() => {
-      roleTableData.loading = false
+    getRoleList({
+        page: roleTableData.page,
+        limit: roleTableData.limit,
+        role_name: roleTableData.searchParam.search
+    }).then(res => {
+        roleTableData.loading = false
+        roleTableData.data = res.data.data
+        roleTableData.total = res.data.total
+    }).catch(() => {
+        roleTableData.loading = false
     })
 }
 loadRoleList()
@@ -154,8 +106,8 @@ const editRoleDialog: Record<string, any> | null = ref(null)
  * 添加角色
  */
 const addEvent = () => {
-  editRoleDialog.value.setFormData()
-  editRoleDialog.value.showDialog = true
+    editRoleDialog.value.setFormData()
+    editRoleDialog.value.showDialog = true
 }
 
 /**
@@ -163,25 +115,26 @@ const addEvent = () => {
  * @param data
  */
 const editEvent = (data: any) => {
-  editRoleDialog.value.setFormData(data)
-  editRoleDialog.value.showDialog = true
+    editRoleDialog.value.setFormData(data)
+    editRoleDialog.value.showDialog = true
 }
 
 /**
  * 删除角色
  */
 const deleteEvent = (id: number) => {
-  ElMessageBox.confirm(t('roleDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    deleteRole(id)
-      .then(() => {
-        loadRoleList()
-      })
-      .catch(() => {})
-  })
+    ElMessageBox.confirm(t('roleDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        deleteRole(id).then(() => {
+            loadRoleList()
+        }).catch(() => {
+        })
+    })
 }
 </script>
 
diff --git a/admin/src/app/views/auth/user.vue b/admin/src/app/views/auth/user.vue
index 63622eee..27462420 100644
--- a/admin/src/app/views/auth/user.vue
+++ b/admin/src/app/views/auth/user.vue
@@ -1,172 +1,91 @@
 <template>
-  <!--管理员-->
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
-
-      <div class="flex justify-between items-center mt-[20px]">
-        <el-form
-          :inline="true"
-          :model="userTableData.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('accountNumber')" prop="search">
-            <el-input
-              v-model="userTableData.searchParam.search"
-              class="input-width"
-              :placeholder="t('accountNumberPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="loadUserList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-        <el-button
-          type="primary"
-          class="w-[100px] self-start"
-          @click="addEvent"
-          >{{ t('addUser') }}</el-button
-        >
-      </div>
-
-      <div>
-        <el-table
-          :data="userTableData.data"
-          size="large"
-          v-loading="userTableData.loading"
-        >
-          <template #empty>
-            <span>{{ !userTableData.loading ? t('emptyData') : '' }}</span>
-          </template>
-
-          <el-table-column :label="t('headImg')" width="100" align="left">
-            <template #default="{ row }">
-              <div class="w-[35px] h-[35px] flex items-center justify-center">
-                <img
-                  v-if="row.head_img"
-                  :src="img(row.head_img)"
-                  class="w-[35px] rounded-full"
-                />
-                <img
-                  v-else
-                  src="@/app/assets/images/member_head.png"
-                  class="w-[35px] rounded-full"
-                />
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="username"
-            :label="t('accountNumber')"
-            min-width="120"
-            show-overflow-tooltip
-          />
-          <el-table-column
-            prop="real_name"
-            :label="t('userRealName')"
-            min-width="120"
-            show-overflow-tooltip
-          >
-            <template #default="{ row }">
-              <span>{{ row.real_name ? row.real_name : '--' }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            :label="t('userRoleName')"
-            min-width="120"
-            show-overflow-tooltip
-          >
-            <template #default="{ row }">
-              <span v-if="row.is_admin">{{ t('administrator') }}</span>
-              <span v-else-if="row.role_data.length">{{
-                row.role_data.join(' | ')
-              }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('status')" min-width="90" align="center">
-            <template #default="{ row }">
-              <el-tag class="ml-2" type="success" v-if="row.status == 1">{{
-                t('statusUnlock')
-              }}</el-tag>
-              <el-tag class="ml-2" type="error" v-if="row.status == 0">{{
-                t('statusLock')
-              }}</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="last_time"
-            :label="t('lastLoginTime')"
-            min-width="180"
-            align="center"
-          >
-            <template #default="{ row }">
-              {{ row.last_time || '' }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            :label="t('lastLoginIP')"
-            min-width="180"
-            align="center"
-          >
-            <template #default="{ row }">
-              {{ row.last_ip || '' }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            :label="t('operation')"
-            align="right"
-            fixed="right"
-            width="160"
-          >
-            <template #default="{ row }">
-              <div v-if="row.is_admin != 1">
-                <el-button type="primary" link @click="editEvent(row)">{{
-                  t('edit')
-                }}</el-button>
-                <el-button
-                  type="primary"
-                  link
-                  @click="lockEvent(row.uid)"
-                  v-if="row.status"
-                  >{{ t('lock') }}</el-button
-                >
-                <el-button
-                  type="primary"
-                  link
-                  @click="unlockEvent(row.uid)"
-                  v-else
-                  >{{ t('unlock') }}</el-button
-                >
-              </div>
-              <div v-else>
-                <el-button link disabled>{{ t('adminDisabled') }}</el-button>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="userTableData.page"
-            v-model:page-size="userTableData.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="userTableData.total"
-            @size-change="loadUserList()"
-            @current-change="loadUserList"
-          />
-        </div>
-      </div>
-
-      <edit-user ref="editUserDialog" @complete="loadUserList()" />
-    </el-card>
-  </div>
+    <!--管理员-->
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+            </div>
+
+            <div class="flex justify-between items-center mt-[20px]">
+                <el-form :inline="true" :model="userTableData.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('accountNumber')" prop="search">
+                        <el-input v-model="userTableData.searchParam.search" class="input-width" :placeholder="t('accountNumberPlaceholder')" />
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="loadUserList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+                <el-button type="primary" class="w-[100px] self-start" @click="addEvent">{{ t('addUser') }}</el-button>
+            </div>
+
+            <div>
+                <el-table :data="userTableData.data" size="large" v-loading="userTableData.loading">
+                    <template #empty>
+                        <span>{{ !userTableData.loading ? t('emptyData') : '' }}</span>
+                    </template>
+
+                    <el-table-column :label="t('headImg')" width="100" align="left">
+                        <template #default="{ row }">
+                            <div class="w-[35px] h-[35px] flex items-center justify-center">
+                                <img v-if="row.head_img" :src="img(row.head_img)" class="w-[35px] rounded-full" />
+                                <img v-else src="@/app/assets/images/member_head.png" class="w-[35px] rounded-full" />
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="username" :label="t('accountNumber')" min-width="120" show-overflow-tooltip />
+                    <el-table-column prop="real_name" :label="t('userRealName')" min-width="120" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            <span>{{ row.real_name ? row.real_name :'--' }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('userRoleName')" min-width="120" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            <span v-if="row.is_admin">{{ t('administrator') }}</span>
+                            <span v-else-if="row.role_data.length">{{ row.role_data.join(' | ') }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('status')" min-width="90" align="center">
+                        <template #default="{ row }">
+                            <el-tag class="ml-2" type="success" v-if="row.status == 1">{{ t('statusUnlock') }}</el-tag>
+                            <el-tag class="ml-2" type="error" v-if="row.status == 0">{{ t('statusLock') }}</el-tag>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="last_time" :label="t('lastLoginTime')" min-width="180" align="center">
+                        <template #default="{ row }">
+                            {{ row.last_time || '' }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('lastLoginIP')" min-width="180" align="center">
+                        <template #default="{ row }">
+                            {{ row.last_ip || '' }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('operation')" align="right" fixed="right" width="160">
+                        <template #default="{ row }">
+                            <div v-if="row.is_admin != 1">
+                                <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+                                <el-button type="primary" link @click="lockEvent(row.uid)" v-if="row.status">{{ t('lock') }}</el-button>
+                                <el-button type="primary" link @click="unlockEvent(row.uid)" v-else>{{ t('unlock') }}</el-button>
+                            </div>
+                            <div v-else>
+                                <el-button link disabled>{{ t('adminDisabled') }}</el-button>
+                            </div>
+                        </template>
+                    </el-table-column>
+                </el-table>
+
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="userTableData.page" v-model:page-size="userTableData.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="userTableData.total"
+                        @size-change="loadUserList()" @current-change="loadUserList" />
+                </div>
+            </div>
+
+            <edit-user ref="editUserDialog" @complete="loadUserList()" />
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -182,46 +101,44 @@ import { useRoute } from 'vue-router'
 const route = useRoute()
 const pageName = route.meta.title
 const userTableData = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    search: '',
-    user_type: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        search: '',
+        user_type: ''
+    }
 })
 
 const searchFormRef = ref<FormInstance>()
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
+    if (!formEl) return
 
-  formEl.resetFields()
-  loadUserList()
+    formEl.resetFields()
+    loadUserList()
 }
 
 /**
  * 获取用户列表
  */
 const loadUserList = (page: number = 1) => {
-  userTableData.loading = true
-  userTableData.page = page
-
-  getUserList({
-    page: userTableData.page,
-    limit: userTableData.limit,
-    username: userTableData.searchParam.search,
-    user_type: userTableData.searchParam.user_type,
-  })
-    .then((res) => {
-      userTableData.loading = false
-      userTableData.data = res.data.data
-      userTableData.total = res.data.total
-    })
-    .catch(() => {
-      userTableData.loading = false
+    userTableData.loading = true
+    userTableData.page = page
+
+    getUserList({
+        page: userTableData.page,
+        limit: userTableData.limit,
+        username: userTableData.searchParam.search,
+        user_type: userTableData.searchParam.user_type
+    }).then(res => {
+        userTableData.loading = false
+        userTableData.data = res.data.data
+        userTableData.total = res.data.total
+    }).catch(() => {
+        userTableData.loading = false
     })
 }
 loadUserList()
@@ -232,8 +149,8 @@ const editUserDialog: Record<string, any> | null = ref(null)
  * 添加用户
  */
 const addEvent = () => {
-  editUserDialog.value.setFormData()
-  editUserDialog.value.showDialog = true
+    editUserDialog.value.setFormData()
+    editUserDialog.value.showDialog = true
 }
 
 /**
@@ -241,43 +158,46 @@ const addEvent = () => {
  * @param data
  */
 const editEvent = (data: any) => {
-  editUserDialog.value.setFormData(data)
-  editUserDialog.value.showDialog = true
+    editUserDialog.value.setFormData(data)
+    editUserDialog.value.showDialog = true
 }
 
 /**
  * 锁定用户
  */
 const lockEvent = (id: number) => {
-  ElMessageBox.confirm(t('userLockTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    lockUser(id)
-      .then(() => {
-        loadUserList()
-      })
-      .catch(() => {})
-  })
+    ElMessageBox.confirm(t('userLockTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        lockUser(id).then(() => {
+            loadUserList()
+        }).catch(() => {
+        })
+    })
 }
 
 /**
  * 解锁用户
  */
 const unlockEvent = (id: number) => {
-  ElMessageBox.confirm(t('userUnlockTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    unlockUser(id)
-      .then(() => {
-        loadUserList()
-      })
-      .catch(() => {})
-  })
+    ElMessageBox.confirm(t('userUnlockTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        unlockUser(id).then(() => {
+            loadUserList()
+        }).catch(() => {
+        })
+    })
 }
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/channel/aliapp/access.vue b/admin/src/app/views/channel/aliapp/access.vue
index 8af473c2..f003e492 100644
--- a/admin/src/app/views/channel/aliapp/access.vue
+++ b/admin/src/app/views/channel/aliapp/access.vue
@@ -1,108 +1,93 @@
 <template>
-  <!--支付宝小程序-->
-  <div class="main-container">
-    <el-card class="card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
+    <!--支付宝小程序-->
+    <div class="main-container">
+        <el-card class="card !border-none" shadow="never">
 
-      <el-tabs v-model="activeName" class="my-[20px]" @tab-change="handleClick">
-        <el-tab-pane :label="t('weappAccessFlow')" name="/channel/aliapp" />
-      </el-tabs>
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+            </div>
 
-      <div class="p-[20px]">
-        <h3 class="panel-title !text-sm">{{ t('weappInlet') }}</h3>
+            <el-tabs v-model="activeName" class="my-[20px]" @tab-change="handleClick">
+                <el-tab-pane :label="t('weappAccessFlow')" name="/channel/aliapp" />
+            </el-tabs>
 
-        <el-row>
-          <el-col :span="20">
-            <el-steps :active="4" direction="vertical">
-              <el-step>
-                <template #title>
-                  <p class="text-[14px] font-[700]">
-                    {{ t('weappAttestation') }}
-                  </p>
-                </template>
-                <template #description>
-                  <span class="text-[#999]">{{ t('weappAttest') }}</span>
-                  <div class="mt-[20px] mb-[40px] h-[32px]">
-                    <el-button
-                      type="primary"
-                      @click="
-                        linkEvent('https://open.alipay.com/develop/manage')
-                      "
-                      >{{ t('clickAccess') }}</el-button
-                    >
-                  </div>
-                </template>
-              </el-step>
+            <div class="p-[20px]">
+                <h3 class="panel-title !text-sm">{{ t("weappInlet") }}</h3>
 
-              <el-step>
-                <template #title>
-                  <p class="text-[14px] font-[700]">
-                    {{ t('weappSetting') }}
-                  </p>
-                </template>
-                <template #description>
-                  <span class="text-[#999]">{{ t('emplace') }}</span>
-                  <div class="mt-[20px] mb-[40px] h-[32px]">
-                    <el-button
-                      type="primary"
-                      plain
-                      @click="router.push('/channel/aliapp/config')"
-                      >{{ t('weappSettingBtn') }}</el-button
-                    >
-                  </div>
-                </template>
-              </el-step>
+                <el-row>
+                    <el-col :span="20">
+                        <el-steps :active="4" direction="vertical">
+                            <el-step>
+                                <template #title>
+                                    <p class="text-[14px] font-[700]">
+                                        {{ t("weappAttestation") }}
+                                    </p>
+                                </template>
+                                <template #description>
+                                    <span class="text-[#999]">{{ t("weappAttest") }}</span>
+                                    <div class="mt-[20px] mb-[40px] h-[32px]">
+                                        <el-button type="primary" @click="linkEvent('https://open.alipay.com/develop/manage')">{{ t("clickAccess") }}</el-button>
+                                    </div>
+                                </template>
+                            </el-step>
 
-              <el-step>
-                <template #title>
-                  <p class="text-[14px] font-[700]">
-                    {{ t('uploadVersion') }}
-                  </p>
-                </template>
-                <template #description>
-                  <span class="text-[#999]">{{ t('releaseCourse') }}</span>
-                  <div class="mt-[20px] mb-[40px] h-[32px]"></div>
-                </template>
-              </el-step>
+                            <el-step>
+                                <template #title>
+                                    <p class="text-[14px] font-[700]">
+                                        {{ t("weappSetting") }}
+                                    </p>
+                                </template>
+                                <template #description>
+                                    <span class="text-[#999]">{{ t("emplace") }}</span>
+                                    <div class="mt-[20px] mb-[40px] h-[32px]">
+                                        <el-button type="primary" plain @click="router.push('/channel/aliapp/config')">{{ t("weappSettingBtn") }}</el-button>
+                                    </div>
+                                </template>
+                            </el-step>
 
-              <el-step>
-                <template #title>
-                  <p class="text-[14px] font-[700]">
-                    {{ t('completeAccess') }}
-                  </p>
-                </template>
-                <template #description>
-                  <span class="text-[#999]">{{ t('releaseCourse') }}</span>
-                </template>
-              </el-step>
-            </el-steps>
-          </el-col>
+                            <el-step>
+                                <template #title>
+                                    <p class="text-[14px] font-[700]">
+                                        {{ t("uploadVersion") }}
+                                    </p>
+                                </template>
+                                <template #description>
+                                    <span class="text-[#999]">{{ t("releaseCourse") }}</span>
+                                    <div class="mt-[20px] mb-[40px] h-[32px]"></div>
+                                </template>
+                            </el-step>
 
-          <el-col :span="4">
-            <div class="flex justify-center">
-              <el-image
-                class="w-[180px] h-[180px]"
-                :src="qrCode ? img(qrCode) : ''"
-              >
-                <template #error>
-                  <div
-                    class="w-[100%] h-[100%] flex items-center justify-center bg-[#f5f7fa]"
-                  >
-                    <span>{{ qrCode ? t('fileErr') : t('emptyQrCode') }}</span>
-                  </div>
-                </template>
-              </el-image>
-            </div>
-            <div class="mt-[22px] text-center">
-              <p class="text-[12px]">{{ t('clickAccess2') }}</p>
+                            <el-step>
+                                <template #title>
+                                    <p class="text-[14px] font-[700]">
+                                        {{ t("completeAccess") }}
+                                    </p>
+                                </template>
+                                <template #description>
+                                    <span class="text-[#999]">{{ t("releaseCourse") }}</span>
+                                </template>
+                            </el-step>
+                        </el-steps>
+                    </el-col>
+
+                    <el-col :span="4">
+                        <div class="flex justify-center">
+                            <el-image class="w-[180px] h-[180px]" :src="qrCode ? img(qrCode) : ''">
+                                <template #error>
+                                    <div class="w-[100%] h-[100%] flex items-center  justify-center bg-[#f5f7fa]">
+                                        <span>{{ qrCode ? t('fileErr') : t('emptyQrCode') }}</span>
+                                    </div>
+                                </template>
+                            </el-image>
+                        </div>
+                        <div class="mt-[22px] text-center">
+                            <p class=" text-[12px]">{{ t('clickAccess2') }}</p>
+                        </div>
+                    </el-col>
+                </el-row>
             </div>
-          </el-col>
-        </el-row>
-      </div>
-    </el-card>
-  </div>
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -120,14 +105,14 @@ const activeName = ref('/channel/aliapp')
 const active = ref(2)
 const qrCode = ref<string>('')
 onMounted(async () => {
-  const res = await getAliappConfig()
-  qrCode.value = res.data.qr_code
+    const res = await getAliappConfig()
+    qrCode.value = res.data.qr_code
 })
 const linkEvent = (url: string) => {
-  window.open(url, '_blank')
+    window.open(url, '_blank')
 }
 const handleClick = (val: any) => {
-  router.push({ path: activeName.value })
+    router.push({ path: activeName.value })
 }
 </script>
 
diff --git a/admin/src/app/views/channel/aliapp/config.vue b/admin/src/app/views/channel/aliapp/config.vue
index 066f044a..6ef5bb69 100644
--- a/admin/src/app/views/channel/aliapp/config.vue
+++ b/admin/src/app/views/channel/aliapp/config.vue
@@ -1,145 +1,95 @@
 <template>
-  <!--支付宝配置-->
-  <div class="main-container">
-    <el-card class="card !border-none" shadow="never">
-      <el-page-header :content="pageName" :icon="ArrowLeft" @back="back()" />
-    </el-card>
-
-    <el-form
-      class="page-form mt-[15px]"
-      :model="formData"
-      label-width="150px"
-      ref="formRef"
-      v-loading="loading"
-    >
-      <el-card class="box-card !border-none" shadow="never">
-        <h3 class="panel-title !text-sm">{{ t('aliappSet') }}</h3>
-
-        <el-form-item :label="t('aliappName')">
-          <el-input
-            v-model.trim="formData.name"
-            :placeholder="t('aliappNamePlaceholder')"
-            class="input-width"
-            clearable
-          />
-        </el-form-item>
-
-        <el-form-item :label="t('aliappQrcode')">
-          <upload-image v-model="formData.qrcode" />
-          <div class="form-tip">{{ t('aliappQrcodeTips') }}</div>
-        </el-form-item>
-      </el-card>
-
-      <el-card class="box-card !border-none mt-[15px]" shadow="never">
-        <h3 class="panel-title !text-sm">{{ t('aliappDevelopInfo') }}</h3>
-
-        <el-form-item :label="t('aliappOriginal')">
-          <el-input
-            v-model.trim="formData.private_key"
-            :placeholder="t('aliappOriginalPlaceholder')"
-            class="input-width"
-            clearable
-          />
-        </el-form-item>
-
-        <el-form-item :label="t('aliappAppid')">
-          <el-input
-            v-model.trim="formData.app_id"
-            :placeholder="t('appidPlaceholder')"
-            class="input-width"
-            clearable
-          />
-        </el-form-item>
-
-        <el-form-item :label="t('countersignType')">
-          {{ t('certificate') }}
-        </el-form-item>
-
-        <el-form-item :label="t('publicKey')">
-          <div class="input-width">
-            <upload-file
-              v-model="formData.public_key_crt"
-              api="sys/document/aliyun"
-            />
-          </div>
-          <div class="form-tip">{{ t('publicKeyTips') }}</div>
-        </el-form-item>
-
-        <el-form-item :label="t('alipayPublicKey')">
-          <div class="input-width">
-            <upload-file
-              v-model="formData.alipay_public_key_crt"
-              api="sys/document/aliyun"
-            />
-          </div>
-          <div class="form-tip">{{ t('alipayPublicKeyTips') }}</div>
-        </el-form-item>
-
-        <el-form-item :label="t('alipayWithCrt')">
-          <div class="input-width">
-            <upload-file
-              v-model="formData.alipay_with_crt"
-              api="sys/document/aliyun"
-            />
-          </div>
-          <div class="form-tip">{{ t('alipayWithCrtTips') }}</div>
-        </el-form-item>
-      </el-card>
-
-      <el-card class="box-card !border-none mt-[15px]" shadow="never">
-        <h3 class="panel-title !text-sm">{{ t('theServerSetting') }}</h3>
-
-        <el-form-item label="AESKey">
-          <el-input
-            v-model.trim="formData.aes_key"
-            :placeholder="t('AESKeyPlaceholder')"
-            class="input-width"
-            show-word-limit
-            clearable
-          />
-        </el-form-item>
-      </el-card>
-
-      <el-card class="box-card !border-none mt-[15px]" shadow="never">
-        <h3 class="panel-title !text-sm">{{ t('functionSetting') }}</h3>
-
-        <el-form-item :label="t('serveWhiteList')">
-          <el-input
-            :model-value="formData.request_url"
-            class="input-width"
-            :readonly="true"
-          >
-            <template #append>
-              <div
-                class="cursor-pointer"
-                @click="copyEvent(formData.request_url)"
-              >
-                {{ t('copy') }}
-              </div>
-            </template>
-          </el-input>
-        </el-form-item>
-      </el-card>
-    </el-form>
-
-    <div class="fixed-footer-wrap">
-      <div class="fixed-footer">
-        <el-button type="primary" :loading="loading" @click="save(formRef)">{{
-          t('save')
-        }}</el-button>
-      </div>
+    <!--支付宝配置-->
+    <div class="main-container">
+
+        <el-card class="card !border-none" shadow="never">
+            <el-page-header :content="pageName" :icon="ArrowLeft" @back="back()" />
+        </el-card>
+
+        <el-form class="page-form mt-[15px]" :model="formData" label-width="150px" ref="formRef" v-loading="loading">
+            <el-card class="box-card !border-none" shadow="never">
+                <h3 class="panel-title !text-sm">{{ t('aliappSet') }}</h3>
+
+                <el-form-item :label="t('aliappName')">
+                    <el-input v-model.trim="formData.name" :placeholder="t('aliappNamePlaceholder')" class="input-width" clearable />
+                </el-form-item>
+
+                <el-form-item :label="t('aliappQrcode')">
+                    <upload-image v-model="formData.qrcode" />
+                    <div class="form-tip">{{ t('aliappQrcodeTips') }}</div>
+                </el-form-item>
+            </el-card>
+
+            <el-card class="box-card !border-none mt-[15px]" shadow="never">
+                <h3 class="panel-title !text-sm">{{ t('aliappDevelopInfo') }}</h3>
+
+                <el-form-item :label="t('aliappOriginal')">
+                    <el-input v-model.trim="formData.private_key" :placeholder="t('aliappOriginalPlaceholder')" class="input-width" clearable />
+                </el-form-item>
+
+                <el-form-item :label="t('aliappAppid')">
+                    <el-input v-model.trim="formData.app_id" :placeholder="t('appidPlaceholder')" class="input-width" clearable />
+                </el-form-item>
+
+                <el-form-item :label="t('countersignType')">
+                    {{ t('certificate') }}
+                </el-form-item>
+
+                <el-form-item :label="t('publicKey')">
+                    <div class="input-width">
+                        <upload-file v-model="formData.public_key_crt" api="sys/document/aliyun" />
+                    </div>
+                    <div class="form-tip">{{ t('publicKeyTips') }}</div>
+                </el-form-item>
+
+                <el-form-item :label="t('alipayPublicKey')">
+                    <div class="input-width">
+                        <upload-file v-model="formData.alipay_public_key_crt" api="sys/document/aliyun" />
+                    </div>
+                    <div class="form-tip">{{ t('alipayPublicKeyTips') }}</div>
+                </el-form-item>
+
+                <el-form-item :label="t('alipayWithCrt')">
+                    <div class="input-width">
+                        <upload-file v-model="formData.alipay_with_crt" api="sys/document/aliyun" />
+                    </div>
+                    <div class="form-tip">{{ t('alipayWithCrtTips') }}</div>
+                </el-form-item>
+            </el-card>
+
+            <el-card class="box-card !border-none mt-[15px]" shadow="never">
+                <h3 class="panel-title !text-sm">{{ t('theServerSetting') }}</h3>
+
+                <el-form-item label="AESKey">
+                    <el-input v-model.trim="formData.aes_key" :placeholder="t('AESKeyPlaceholder')" class="input-width" show-word-limit clearable />
+                </el-form-item>
+            </el-card>
+
+            <el-card class="box-card !border-none mt-[15px]" shadow="never">
+                <h3 class="panel-title !text-sm">{{ t('functionSetting') }}</h3>
+
+                <el-form-item :label="t('serveWhiteList')">
+                    <el-input :model-value="formData.request_url" class="input-width" :readonly="true">
+                        <template #append>
+                            <div class="cursor-pointer" @click="copyEvent(formData.request_url)">{{ t('copy') }}</div>
+                        </template>
+                    </el-input>
+                </el-form-item>
+            </el-card>
+        </el-form>
+
+        <div class="fixed-footer-wrap">
+            <div class="fixed-footer">
+                <el-button type="primary" :loading="loading" @click="save(formRef)">{{ t('save') }}</el-button>
+            </div>
+        </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref, watch } from 'vue'
 import { t } from '@/lang'
-import {
-  setAliappConfig,
-  getAliappConfig,
-  getAliappStatic,
-} from '@/app/api/aliapp'
+import { setAliappConfig, getAliappConfig, getAliappStatic } from '@/app/api/aliapp'
 import { useClipboard } from '@vueuse/core'
 import { ElMessage, FormInstance } from 'element-plus'
 import { ArrowLeft } from '@element-plus/icons-vue'
@@ -149,21 +99,21 @@ const route = useRoute()
 const router = useRouter()
 const pageName = route.meta.title
 const back = () => {
-  router.push('/channel/aliapp')
+    router.push('/channel/aliapp')
 }
 
 const loading = ref(true)
 
 const formData = reactive<Record<string, string>>({
-  name: '',
-  qrcode: '',
-  private_key: '',
-  app_id: '',
-  aes_key: '',
-  public_key_crt: '',
-  alipay_public_key_crt: '',
-  alipay_with_crt: '',
-  request_url: '',
+    name: '',
+    qrcode: '',
+    private_key: '',
+    app_id: '',
+    aes_key: '',
+    public_key_crt: '',
+    alipay_public_key_crt: '',
+    alipay_with_crt: '',
+    request_url: ''
 })
 
 const formRef = ref<FormInstance>()
@@ -171,15 +121,15 @@ const formRef = ref<FormInstance>()
 /**
  * 获取支付宝配置
  */
-getAliappConfig().then((res) => {
-  Object.assign(formData, res.data)
-  loading.value = false
+getAliappConfig().then(res => {
+    Object.assign(formData, res.data)
+    loading.value = false
 })
 /**
  * 获取支付宝静态资源
  */
-getAliappStatic().then((res) => {
-  formData.request_url = res.data.domain
+getAliappStatic().then(res => {
+    formData.request_url = res.data.domain
 })
 
 /**
@@ -187,44 +137,43 @@ getAliappStatic().then((res) => {
  */
 const { copy, isSupported, copied } = useClipboard()
 const copyEvent = (text: string) => {
-  if (!isSupported.value) {
-    ElMessage({
-      message: t('notSupportCopy'),
-      type: 'warning',
-    })
-    return
-  }
-  copy(text)
+    if (!isSupported.value) {
+        ElMessage({
+            message: t('notSupportCopy'),
+            type: 'warning'
+        })
+        return
+    }
+    copy(text)
 }
 
 watch(copied, () => {
-  if (copied.value) {
-    ElMessage({
-      message: t('copySuccess'),
-      type: 'success',
-    })
-  }
+    if (copied.value) {
+        ElMessage({
+            message: t('copySuccess'),
+            type: 'success'
+        })
+    }
 })
 
 /**
  * 保存
  */
 const save = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      setAliappConfig(formData)
-        .then(() => {
-          loading.value = false
-        })
-        .catch(() => {
-          loading.value = false
-        })
-    }
-  })
+    if (loading.value || !formEl) return
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+            setAliappConfig(formData).then(() => {
+                loading.value = false
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
 }
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/channel/aliapp/course.vue b/admin/src/app/views/channel/aliapp/course.vue
index 658ec923..7736af80 100644
--- a/admin/src/app/views/channel/aliapp/course.vue
+++ b/admin/src/app/views/channel/aliapp/course.vue
@@ -1,153 +1,93 @@
 <template>
-  <!--配置教程-->
-  <div class="main-container">
-    <el-card class="card !border-none" shadow="never">
-      <el-page-header :content="pageName" :icon="ArrowLeft" @back="back()" />
-    </el-card>
+    <!--配置教程-->
+    <div class="main-container">
 
-    <el-card class="box-card mt-[15px] !border-none" shadow="never">
-      <div class="flex">
-        <div class="min-w-[60px]">
-          <span
-            class="flex justify-center items-center block w-[40px] h-[40px] border-[1px] border-primary rounded-[999px] text-primary"
-            >1</span
-          >
-        </div>
-        <div>
-          <p class="flex items-center text-[14px]">
-            {{ t('alipayCourseTipsOne1') }}--<el-button
-              link
-              type="primary"
-              @click="linkEvent"
-              >{{ t('alipayCourseTipsOne2') }}</el-button
-            >, {{ t('alipayCourseTipsOne3') }}
-          </p>
-          <div class="w-[100%] mt-[10px]">
-            <img
-              class="w-[100%]"
-              src="@/app/assets/images/setting/alipay1.png"
-            />
-          </div>
-          <p class="flex items-center text-[14px] mt-[20px]">
-            {{ t('alipayCourseTipsTwo1') }}
-          </p>
-          <div class="w-[100%] mt-[10px]">
-            <img
-              class="w-[100%]"
-              src="@/app/assets/images/setting/alipay2.png"
-            />
-          </div>
-          <div class="w-[100%] mt-[10px]">
-            <img
-              class="w-[100%]"
-              src="@/app/assets/images/setting/alipay3.png"
-            />
-          </div>
-        </div>
-      </div>
-      <div class="flex mt-[40px]">
-        <div class="min-w-[60px]">
-          <span
-            class="flex justify-center items-center block w-[40px] h-[40px] border-[1px] border-primary rounded-[999px] text-primary"
-            >2</span
-          >
-        </div>
-        <div>
-          <p class="flex items-center text-[14px]">
-            {{ t('alipayCourseTipsTwo2') }}
-          </p>
-          <div class="w-[100%] mt-[10px] flex flex-wrap">
-            <div class="w-[100%]">
-              <img
-                class="w-[100%]"
-                src="@/app/assets/images/setting/alipay4.png"
-              />
+        <el-card class="card !border-none" shadow="never">
+            <el-page-header :content="pageName" :icon="ArrowLeft" @back="back()" />
+        </el-card>
+
+        <el-card class="box-card mt-[15px] !border-none" shadow="never">
+            <div class="flex">
+                <div class="min-w-[60px]">
+                    <span class="flex justify-center items-center block w-[40px] h-[40px] border-[1px] border-primary rounded-[999px] text-primary">1</span>
+                </div>
+                <div>
+                    <p class="flex items-center text-[14px]">{{ t('alipayCourseTipsOne1') }}--<el-button link type="primary" @click="linkEvent">{{ t('alipayCourseTipsOne2') }}</el-button>, {{ t('alipayCourseTipsOne3') }}</p>
+                    <div class="w-[100%] mt-[10px]">
+                        <img class="w-[100%]" src="@/app/assets/images/setting/alipay1.png" />
+                    </div>
+                    <p class="flex items-center text-[14px] mt-[20px]">{{ t('alipayCourseTipsTwo1') }}</p>
+                    <div class="w-[100%] mt-[10px]">
+                        <img class="w-[100%]" src="@/app/assets/images/setting/alipay2.png" />
+                    </div>
+                    <div class="w-[100%] mt-[10px]">
+                        <img class="w-[100%]" src="@/app/assets/images/setting/alipay3.png" />
+                    </div>
+                </div>
+            </div>
+            <div class="flex mt-[40px]">
+                <div class="min-w-[60px]">
+                    <span class="flex justify-center items-center block w-[40px] h-[40px] border-[1px] border-primary rounded-[999px] text-primary">2</span>
+                </div>
+                <div>
+                    <p class="flex items-center text-[14px]">{{ t('alipayCourseTipsTwo2') }}</p>
+                    <div class="w-[100%] mt-[10px] flex flex-wrap">
+                        <div class="w-[100%]">
+                            <img class="w-[100%]" src="@/app/assets/images/setting/alipay4.png" />
+                        </div>
+                        <div>
+                            <el-row :gutter="20">
+                                <el-col :span="6">
+                                    <div class="w-[100%]">
+                                        <img class="w-[100%]" src="@/app/assets/images/setting/alipay4_1.jpg" />
+                                    </div>
+                                </el-col>
+                                <el-col :span="6">
+                                    <div class="w-[100%]">
+                                        <img class="w-[100%]" src="@/app/assets/images/setting/alipay4_2.jpg" />
+                                    </div>
+                                </el-col>
+                                <el-col :span="6">
+                                    <div class="w-[100%]">
+                                        <img class="w-[100%]" src="@/app/assets/images/setting/alipay4_3.jpg" />
+                                    </div>
+                                </el-col>
+                                <el-col :span="6">
+                                    <div class="w-[100%]">
+                                        <img class="w-[100%]" src="@/app/assets/images/setting/alipay4_4.jpg" />
+                                    </div>
+                                </el-col>
+                            </el-row>
+                        </div>
+                    </div>
+                </div>
             </div>
-            <div>
-              <el-row :gutter="20">
-                <el-col :span="6">
-                  <div class="w-[100%]">
-                    <img
-                      class="w-[100%]"
-                      src="@/app/assets/images/setting/alipay4_1.jpg"
-                    />
-                  </div>
-                </el-col>
-                <el-col :span="6">
-                  <div class="w-[100%]">
-                    <img
-                      class="w-[100%]"
-                      src="@/app/assets/images/setting/alipay4_2.jpg"
-                    />
-                  </div>
-                </el-col>
-                <el-col :span="6">
-                  <div class="w-[100%]">
-                    <img
-                      class="w-[100%]"
-                      src="@/app/assets/images/setting/alipay4_3.jpg"
-                    />
-                  </div>
-                </el-col>
-                <el-col :span="6">
-                  <div class="w-[100%]">
-                    <img
-                      class="w-[100%]"
-                      src="@/app/assets/images/setting/alipay4_4.jpg"
-                    />
-                  </div>
-                </el-col>
-              </el-row>
+            <div class="flex mt-[40px]">
+                <div class="min-w-[60px]">
+                    <span class="flex justify-center items-center block w-[40px] h-[40px] border-[1px] border-primary rounded-[999px] text-primary">3</span>
+                </div>
+                <div>
+                    <!-- <span class="text-primary">{{ t('alipayCourseTipsThree2') }}</span> -->
+                    <p class="flex items-center text-[14px]">{{ t('alipayCourseTipsThree1') }}
+                    </p>
+                    <div class="w-[100%] mt-[10px]">
+                        <img class="w-[100%]" src="@/app/assets/images/setting/alipay5.png" />
+                    </div>
+                    <div class="w-[100%] mt-[10px]">
+                        <img class="w-[100%]" src="@/app/assets/images/setting/alipay6.png" />
+                    </div>
+                    <p class="flex items-center text-[14px] mt-[20px]">{{ t('alipayCourseTipsThree2') }}</p>
+                    <div class="w-[100%] mt-[10px]">
+                        <img class="w-[100%]" src="@/app/assets/images/setting/alipay7.png" />
+                    </div>
+                    <p class="flex items-center text-[14px] mt-[20px]">{{ t('alipayCourseTipsThree3') }}</p>
+                    <div class="w-[100%] mt-[10px]">
+                        <img class="w-[100%]" src="@/app/assets/images/setting/alipay8.png" />
+                    </div>
+                </div>
             </div>
-          </div>
-        </div>
-      </div>
-      <div class="flex mt-[40px]">
-        <div class="min-w-[60px]">
-          <span
-            class="flex justify-center items-center block w-[40px] h-[40px] border-[1px] border-primary rounded-[999px] text-primary"
-            >3</span
-          >
-        </div>
-        <div>
-          <!-- <span class="text-primary">{{ t('alipayCourseTipsThree2') }}</span> -->
-          <p class="flex items-center text-[14px]">
-            {{ t('alipayCourseTipsThree1') }}
-          </p>
-          <div class="w-[100%] mt-[10px]">
-            <img
-              class="w-[100%]"
-              src="@/app/assets/images/setting/alipay5.png"
-            />
-          </div>
-          <div class="w-[100%] mt-[10px]">
-            <img
-              class="w-[100%]"
-              src="@/app/assets/images/setting/alipay6.png"
-            />
-          </div>
-          <p class="flex items-center text-[14px] mt-[20px]">
-            {{ t('alipayCourseTipsThree2') }}
-          </p>
-          <div class="w-[100%] mt-[10px]">
-            <img
-              class="w-[100%]"
-              src="@/app/assets/images/setting/alipay7.png"
-            />
-          </div>
-          <p class="flex items-center text-[14px] mt-[20px]">
-            {{ t('alipayCourseTipsThree3') }}
-          </p>
-          <div class="w-[100%] mt-[10px]">
-            <img
-              class="w-[100%]"
-              src="@/app/assets/images/setting/alipay8.png"
-            />
-          </div>
-        </div>
-      </div>
-    </el-card>
-  </div>
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -160,32 +100,33 @@ import { useRoute, useRouter } from 'vue-router'
 const route = useRoute()
 const router = useRouter()
 const back = () => {
-  router.push('/channel/aliapp')
+    router.push('/channel/aliapp')
 }
 const pageName = route.meta.title
 const loading = ref(true)
 const formData = reactive<Record<string, string>>({
-  wechat_name: '',
-  wechat_original: '',
-  app_id: '',
-  app_secret: '',
-  qr_code: '',
-  token: '',
-  encoding_aes_key: '',
-  encryption_type: 'not_encrypt',
+    wechat_name: '',
+    wechat_original: '',
+    app_id: '',
+    app_secret: '',
+    qr_code: '',
+    token: '',
+    encoding_aes_key: '',
+    encryption_type: 'not_encrypt'
 })
 
 /**
  * 获取微信配置
  */
-getWechatConfig().then((res) => {
-  Object.assign(formData, res.data)
-  loading.value = false
+getWechatConfig().then(res => {
+    Object.assign(formData, res.data)
+    loading.value = false
 })
 
 const linkEvent = () => {
-  window.open('https://open.alipay.com/develop/manage', '_blank')
+    window.open('https://open.alipay.com/develop/manage', '_blank')
 }
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/channel/h5/config.vue b/admin/src/app/views/channel/h5/config.vue
index 40b88f7a..35eb7f36 100644
--- a/admin/src/app/views/channel/h5/config.vue
+++ b/admin/src/app/views/channel/h5/config.vue
@@ -1,50 +1,33 @@
 <template>
-  <!--H5端-->
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
-
-      <el-form
-        class="page-form mt-[20px]"
-        :model="formData"
-        label-width="150px"
-        ref="formRef"
-      >
-        <el-form-item :label="t('isOpen')">
-          <el-switch v-model="formData.is_open" />
-        </el-form-item>
-        <el-form-item :label="t('h5DomainName')">
-          <el-input
-            :model-value="formData.request_url"
-            class="input-width"
-            :readonly="true"
-          >
-            <template #append>
-              <div
-                class="cursor-pointer"
-                @click="copyEvent(formData.request_url)"
-              >
-                {{ t('copy') }}
-              </div>
-            </template>
-          </el-input>
-          <span class="ml-2 cursor-pointer visit-btn" @click="visitFn">{{
-            t('clickVisit')
-          }}</span>
-        </el-form-item>
-      </el-form>
-    </el-card>
-
-    <div class="fixed-footer-wrap">
-      <div class="fixed-footer">
-        <el-button type="primary" :loading="loading" @click="save(formRef)">{{
-          t('save')
-        }}</el-button>
-      </div>
+    <!--H5端-->
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+            </div>
+
+            <el-form class="page-form mt-[20px]" :model="formData" label-width="150px" ref="formRef">
+                <el-form-item :label="t('isOpen')">
+                    <el-switch v-model="formData.is_open"/>
+                </el-form-item>
+                <el-form-item :label="t('h5DomainName')">
+                    <el-input :model-value="formData.request_url" class="input-width" :readonly="true">
+                        <template #append>
+                            <div class="cursor-pointer" @click="copyEvent(formData.request_url)">{{ t('copy') }}</div>
+                        </template>
+                    </el-input>
+                    <span class="ml-2 cursor-pointer visit-btn" @click="visitFn">{{t('clickVisit')}}</span>
+                </el-form-item>
+            </el-form>
+        </el-card>
+
+        <div class="fixed-footer-wrap">
+            <div class="fixed-footer">
+                <el-button type="primary" :loading="loading" @click="save(formRef)">{{ t('save') }}</el-button>
+            </div>
+        </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
@@ -62,8 +45,8 @@ const pageName = route.meta.title
 const loading = ref(true)
 
 const formData = reactive<Record<string, string | boolean | any>>({
-  is_open: true,
-  request_url: '',
+    is_open: true,
+    request_url: ''
 })
 
 const formRef = ref<FormInstance>()
@@ -71,16 +54,16 @@ const formRef = ref<FormInstance>()
 /**
  * 获取h5配置
  */
-getH5Config().then((res) => {
-  Object.assign(formData, res.data)
-  formData.is_open = Boolean(Number(formData.is_open))
-  loading.value = false
+getH5Config().then(res => {
+    Object.assign(formData, res.data)
+    formData.is_open = Boolean(Number(formData.is_open))
+    loading.value = false
 })
 /**
  * 获取h5域名
  */
-getUrl().then((res) => {
-  formData.request_url = res.data.wap_url + '/'
+getUrl().then(res => {
+    formData.request_url = res.data.wap_url + '/'
 })
 
 /**
@@ -88,55 +71,54 @@ getUrl().then((res) => {
  */
 const { copy, isSupported, copied } = useClipboard()
 const copyEvent = (text: string) => {
-  if (!isSupported.value) {
-    ElMessage({
-      message: t('notSupportCopy'),
-      type: 'warning',
-    })
-    return
-  }
-  copy(text)
+    if (!isSupported.value) {
+        ElMessage({
+            message: t('notSupportCopy'),
+            type: 'warning'
+        })
+        return
+    }
+    copy(text)
 }
 
 watch(copied, () => {
-  if (copied.value) {
-    ElMessage({
-      message: t('copySuccess'),
-      type: 'success',
-    })
-  }
+    if (copied.value) {
+        ElMessage({
+            message: t('copySuccess'),
+            type: 'success'
+        })
+    }
 })
 
 // 点击访问
 const visitFn = () => {
-  window.open(formData.request_url)
+    window.open(formData.request_url)
 }
 
 /**
  * 保存
  */
 const save = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      const data = { ...formData }
-      data.is_open = Number(data.is_open)
-      setH5Config(data)
-        .then(() => {
-          loading.value = false
-        })
-        .catch(() => {
-          loading.value = false
-        })
-    }
-  })
+    if (loading.value || !formEl) return
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+            const data = { ...formData }
+            data.is_open = Number(data.is_open)
+            setH5Config(data).then(() => {
+                loading.value = false
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
 }
+
 </script>
 
 <style lang="scss" scoped>
-.visit-btn {
-  color: var(--el-color-primary);
-}
+    .visit-btn{
+        color:var(--el-color-primary);
+    }
 </style>
diff --git a/admin/src/app/views/channel/pc/config.vue b/admin/src/app/views/channel/pc/config.vue
index e586f0cf..f9d4e521 100644
--- a/admin/src/app/views/channel/pc/config.vue
+++ b/admin/src/app/views/channel/pc/config.vue
@@ -1,55 +1,38 @@
 <template>
-  <!--PC端-->
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
-
-      <el-form
-        class="page-form mt-[20px]"
-        :model="formData"
-        label-width="150px"
-        ref="formRef"
-      >
-        <!-- <el-form-item :label="t('preview')" prop="weapp_name">
+    <!--PC端-->
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+            </div>
+
+            <el-form class="page-form mt-[20px]" :model="formData" label-width="150px" ref="formRef">
+                <!-- <el-form-item :label="t('preview')" prop="weapp_name">
                    <img class="w-[500px]" src="@/app/assets/images/channel/preview.png" alt="">
                 </el-form-item> -->
 
-        <el-form-item :label="t('isOpen')">
-          <el-switch v-model="formData.is_open" />
-        </el-form-item>
-
-        <el-form-item :label="t('pCDomainName')">
-          <el-input
-            :model-value="formData.request_url"
-            class="input-width"
-            :readonly="true"
-          >
-            <template #append>
-              <div
-                class="cursor-pointer"
-                @click="copyEvent(formData.request_url)"
-              >
-                {{ t('copy') }}
-              </div>
-            </template>
-          </el-input>
-          <span class="ml-2 cursor-pointer visit-btn" @click="visitFn">{{
-            t('clickVisit')
-          }}</span>
-        </el-form-item>
-      </el-form>
-    </el-card>
-
-    <div class="fixed-footer-wrap">
-      <div class="fixed-footer">
-        <el-button type="primary" :loading="loading" @click="save(formRef)">{{
-          t('save')
-        }}</el-button>
-      </div>
+                <el-form-item :label="t('isOpen')">
+                    <el-switch v-model="formData.is_open"/>
+                </el-form-item>
+
+                <el-form-item :label="t('pCDomainName')">
+                    <el-input :model-value="formData.request_url" class="input-width" :readonly="true">
+                        <template #append>
+                            <div class="cursor-pointer" @click="copyEvent(formData.request_url)">{{ t('copy') }}</div>
+                        </template>
+                    </el-input>
+                    <span class="ml-2 cursor-pointer visit-btn" @click="visitFn">{{t('clickVisit')}}</span>
+                </el-form-item>
+            </el-form>
+        </el-card>
+
+        <div class="fixed-footer-wrap">
+            <div class="fixed-footer">
+                <el-button type="primary" :loading="loading" @click="save(formRef)">{{ t('save') }}</el-button>
+            </div>
+        </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
@@ -59,15 +42,15 @@ import { getUrl } from '@/app/api/sys'
 import { useClipboard } from '@vueuse/core'
 import { ElMessage, FormInstance } from 'element-plus'
 import { useRoute } from 'vue-router'
-import { getPcConfig, setPcConfig } from '@/app/api/pc'
+import { getPcConfig, setPcConfig } from "@/app/api/pc"
 
 const route = useRoute()
 const pageName = route.meta.title
 const loading = ref(true)
 
 const formData = reactive<Record<string, string | boolean | any>>({
-  is_open: false,
-  request_url: '',
+    is_open: false,
+    request_url: ''
 })
 
 const formRef = ref<FormInstance>()
@@ -75,18 +58,18 @@ const formRef = ref<FormInstance>()
 /**
  * 获取pc域名
  */
-getUrl().then((res) => {
-  formData.request_url = res.data.web_url + '/'
-  loading.value = false
+getUrl().then(res => {
+    formData.request_url = res.data.web_url + '/'
+    loading.value = false
 })
 
 /**
  * 获取pc配置
  */
-getPcConfig().then((res) => {
-  Object.assign(formData, res.data)
-  formData.is_open = Boolean(Number(formData.is_open))
-  loading.value = false
+getPcConfig().then(res => {
+    Object.assign(formData, res.data)
+    formData.is_open = Boolean(Number(formData.is_open))
+    loading.value = false
 })
 
 /**
@@ -94,55 +77,53 @@ getPcConfig().then((res) => {
  */
 const { copy, isSupported, copied } = useClipboard()
 const copyEvent = (text: string) => {
-  if (!isSupported.value) {
-    ElMessage({
-      message: t('notSupportCopy'),
-      type: 'warning',
-    })
-    return
-  }
-  copy(text)
+    if (!isSupported.value) {
+        ElMessage({
+            message: t('notSupportCopy'),
+            type: 'warning'
+        })
+        return
+    }
+    copy(text)
 }
 
 watch(copied, () => {
-  if (copied.value) {
-    ElMessage({
-      message: t('copySuccess'),
-      type: 'success',
-    })
-  }
+    if (copied.value) {
+        ElMessage({
+            message: t('copySuccess'),
+            type: 'success'
+        })
+    }
 })
 
 // 点击访问
 const visitFn = () => {
-  window.open(formData.request_url)
+    window.open(formData.request_url)
 }
 
 /**
  * 保存
  */
 const save = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      const data = { ...formData }
-      data.is_open = Number(data.is_open)
-      setPcConfig(data)
-        .then(() => {
-          loading.value = false
-        })
-        .catch(() => {
-          loading.value = false
-        })
-    }
-  })
+    if (loading.value || !formEl) return
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+            const data = { ...formData }
+            data.is_open = Number(data.is_open)
+            setPcConfig(data).then(() => {
+                loading.value = false
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
 }
 </script>
 
 <style lang="scss" scoped>
-.visit-btn {
-  color: var(--el-color-primary);
-}
+    .visit-btn {
+        color: var(--el-color-primary);
+    }
 </style>
diff --git a/admin/src/app/views/channel/weapp/access.vue b/admin/src/app/views/channel/weapp/access.vue
index 2b105513..8251a615 100644
--- a/admin/src/app/views/channel/weapp/access.vue
+++ b/admin/src/app/views/channel/weapp/access.vue
@@ -1,124 +1,99 @@
 <template>
-  <!--微信小程序-->
-  <div class="main-container">
-    <el-card class="card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
-
-      <el-tabs v-model="activeName" class="mt-[20px]" @tab-change="handleClick">
-        <el-tab-pane :label="t('weappAccessFlow')" name="/channel/weapp" />
-        <el-tab-pane
-          :label="t('subscribeMessage')"
-          name="/channel/weapp/message"
-        />
-        <el-tab-pane :label="t('weappRelease')" name="/channel/weapp/code" />
-      </el-tabs>
-
-      <div class="p-[20px]">
-        <h3 class="panel-title !text-sm">{{ t('weappInlet') }}</h3>
-
-        <el-row>
-          <el-col :span="20">
-            <el-steps class="!mt-[10px]" :active="4" direction="vertical">
-              <el-step>
-                <template #title>
-                  <p class="text-[14px] font-[700]">
-                    {{ t('weappAttestation') }}
-                  </p>
-                </template>
-                <template #description>
-                  <span class="text-[#999]">{{ t('weappAttest') }}</span>
-                  <div class="mt-[20px] mb-[40px] h-[32px]">
-                    <el-button
-                      type="primary"
-                      @click="linkEvent('https://mp.weixin.qq.com/')"
-                      >{{ t('clickAccess') }}</el-button
-                    >
-                  </div>
-                </template>
-              </el-step>
-
-              <el-step>
-                <template #title>
-                  <p class="text-[14px] font-[700]">
-                    {{ t('weappSetting') }}
-                  </p>
-                </template>
-                <template #description>
-                  <span class="text-[#999]">{{ t('emplace') }}</span>
-                  <div class="mt-[20px] mb-[40px] h-[32px]">
-                    <el-button
-                      type="primary"
-                      @click="router.push('/channel/weapp/config')"
-                      >{{ t('weappSettingBtn') }}</el-button
-                    >
-                    <el-button
-                      type="primary"
-                      plain
-                      @click="router.push('/channel/weapp/course')"
-                      >配置教程</el-button
-                    >
-                  </div>
-                </template>
-              </el-step>
-
-              <el-step>
-                <template #title>
-                  <p class="text-[14px] font-[700]">
-                    {{ t('uploadVersion') }}
-                  </p>
-                </template>
-                <template #description>
-                  <span class="text-[#999]">{{ t('releaseCourse') }}</span>
-                  <div class="mt-[20px] mb-[40px] h-[32px]">
-                    <el-button
-                      type="primary"
-                      plain
-                      @click="router.push('/channel/weapp/code')"
-                      >{{ t('weappRelease') }}</el-button
-                    >
-                  </div>
-                </template>
-              </el-step>
-
-              <el-step>
-                <template #title>
-                  <p class="text-[14px] font-[700]">
-                    {{ t('completeAccess') }}
-                  </p>
-                </template>
-                <template #description>
-                  <span class="text-[#999]">{{ t('releaseCourse') }}</span>
-                  <div class="mt-[20px] mb-[40px] h-[32px]"></div>
-                </template>
-              </el-step>
-            </el-steps>
-          </el-col>
-
-          <el-col :span="4">
-            <div class="flex justify-center">
-              <el-image
-                class="w-[180px] h-[180px]"
-                :src="qrCode ? img(qrCode) : ''"
-              >
-                <template #error>
-                  <div
-                    class="w-[100%] h-[100%] flex items-center justify-center bg-[#f5f7fa]"
-                  >
-                    <span>{{ qrCode ? t('fileErr') : t('emptyQrCode') }}</span>
-                  </div>
-                </template>
-              </el-image>
+    <!--微信小程序-->
+    <div class="main-container">
+        <el-card class="card !border-none" shadow="never">
+
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
             </div>
-            <div class="mt-[22px] text-center">
-              <p class="text-[12px]">{{ t('clickAccess2') }}</p>
+
+            <el-tabs v-model="activeName" class="mt-[20px]" @tab-change="handleClick">
+                <el-tab-pane :label="t('weappAccessFlow')" name="/channel/weapp" />
+                <el-tab-pane :label="t('subscribeMessage')" name="/channel/weapp/message" />
+                <el-tab-pane :label="t('weappRelease')" name="/channel/weapp/code" />
+            </el-tabs>
+
+            <div class="p-[20px]">
+                <h3 class="panel-title !text-sm">{{ t("weappInlet") }}</h3>
+
+                <el-row>
+                    <el-col :span="20">
+                        <el-steps class="!mt-[10px]" :active="4" direction="vertical">
+                            <el-step>
+                                <template #title>
+                                    <p class="text-[14px] font-[700]">
+                                        {{ t("weappAttestation") }}
+                                    </p>
+                                </template>
+                                <template #description>
+                                    <span class="text-[#999]">{{ t("weappAttest") }}</span>
+                                    <div class="mt-[20px] mb-[40px] h-[32px]">
+                                        <el-button type="primary" @click="linkEvent('https://mp.weixin.qq.com/')">{{ t("clickAccess") }}</el-button>
+                                    </div>
+                                </template>
+                            </el-step>
+
+                            <el-step>
+                                <template #title>
+                                    <p class="text-[14px] font-[700]">
+                                        {{ t("weappSetting") }}
+                                    </p>
+                                </template>
+                                <template #description>
+                                    <span class="text-[#999]">{{ t("emplace") }}</span>
+                                    <div class="mt-[20px] mb-[40px] h-[32px]">
+                                        <el-button type="primary" @click="router.push('/channel/weapp/config')">{{ t("weappSettingBtn") }}</el-button>
+                                        <el-button type="primary" plain @click="router.push('/channel/weapp/course')">配置教程</el-button>
+                                    </div>
+                                </template>
+                            </el-step>
+
+                            <el-step>
+                                <template #title>
+                                    <p class="text-[14px] font-[700]">
+                                        {{ t("uploadVersion") }}
+                                    </p>
+                                </template>
+                                <template #description>
+                                    <span class="text-[#999]">{{ t("releaseCourse") }}</span>
+                                    <div class="mt-[20px] mb-[40px] h-[32px]">
+                                        <el-button type="primary" plain @click="router.push('/channel/weapp/code')">{{ t("weappRelease") }}</el-button>
+                                    </div>
+                                </template>
+                            </el-step>
+
+                            <el-step>
+                                <template #title>
+                                    <p class="text-[14px] font-[700]">
+                                        {{ t("completeAccess") }}
+                                    </p>
+                                </template>
+                                <template #description>
+                                    <span class="text-[#999]">{{ t("releaseCourse") }}</span>
+                                    <div class="mt-[20px] mb-[40px] h-[32px]"></div>
+                                </template>
+                            </el-step>
+                        </el-steps>
+                    </el-col>
+
+                    <el-col :span="4">
+                        <div class="flex justify-center">
+                            <el-image class="w-[180px] h-[180px]" :src="qrCode ? img(qrCode) : ''">
+                                <template #error>
+                                    <div class="w-[100%] h-[100%] flex items-center  justify-center bg-[#f5f7fa]">
+                                        <span>{{ qrCode ? t('fileErr') : t('emptyQrCode') }}</span>
+                                    </div>
+                                </template>
+                            </el-image>
+                        </div>
+                        <div class="mt-[22px] text-center">
+                            <p class=" text-[12px]">{{ t('clickAccess2') }}</p>
+                        </div>
+                    </el-col>
+                </el-row>
             </div>
-          </el-col>
-        </el-row>
-      </div>
-    </el-card>
-  </div>
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -138,25 +113,27 @@ const qrCode = ref('')
 const weappConfig = ref({})
 
 const onShowGetWeappConfig = async () => {
-  await getWeappConfig().then(({ data }) => {
-    weappConfig.value = data
-    qrCode.value = data.qr_code
-  })
+    await getWeappConfig().then(({ data }) => {
+        weappConfig.value = data
+        qrCode.value = data.qr_code
+    })
 }
 
 onMounted(async () => {
-  onShowGetWeappConfig()
+    onShowGetWeappConfig()
 })
 
 onUnmounted(() => {
-  document.removeEventListener('visibilitychange', () => {})
+    document.removeEventListener('visibilitychange', () => {
+
+    })
 })
 
 const linkEvent = (url: string) => {
-  window.open(url, '_blank')
+    window.open(url, '_blank')
 }
 const handleClick = (val: any) => {
-  router.push({ path: activeName.value })
+    router.push({ path: activeName.value })
 }
 </script>
 
diff --git a/admin/src/app/views/channel/weapp/code.vue b/admin/src/app/views/channel/weapp/code.vue
index 717f23bf..ae8bc0f8 100644
--- a/admin/src/app/views/channel/weapp/code.vue
+++ b/admin/src/app/views/channel/weapp/code.vue
@@ -1,182 +1,99 @@
 <template>
-  <!--小程序发布-->
-  <div class="main-container">
-    <el-card class="card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
+    <!--小程序发布-->
+    <div class="main-container">
+        <el-card class="card !border-none" shadow="never">
 
-      <el-tabs v-model="activeName" class="my-[20px]" @tab-change="handleClick">
-        <el-tab-pane :label="t('weappAccessFlow')" name="/channel/weapp" />
-        <el-tab-pane
-          :label="t('subscribeMessage')"
-          name="/channel/weapp/message"
-        />
-        <el-tab-pane :label="t('weappRelease')" name="/channel/weapp/code" />
-      </el-tabs>
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+            </div>
 
-      <div class="mt-[20px]" v-if="!weappConfig.is_authorization">
-        <el-button
-          type="primary"
-          @click="insert"
-          :loading="uploading"
-          :disabled="loading"
-          >{{ t('cloudRelease') }}</el-button
-        >
-        <el-button @click="localInsert" :disabled="loading">{{
-          t('localRelease')
-        }}</el-button>
-      </div>
+            <el-tabs v-model="activeName" class="my-[20px]" @tab-change="handleClick">
+                <el-tab-pane :label="t('weappAccessFlow')" name="/channel/weapp" />
+                <el-tab-pane :label="t('subscribeMessage')" name="/channel/weapp/message" />
+                <el-tab-pane :label="t('weappRelease')" name="/channel/weapp/code" />
+            </el-tabs>
 
-      <el-table
-        class="mt-[15px]"
-        :data="weappTableData.data"
-        v-loading="weappTableData.loading"
-        size="default"
-      >
-        <template #empty>
-          <span>{{ t('emptyData') }}</span>
-        </template>
+            <div class="mt-[20px]" v-if="!weappConfig.is_authorization">
+                <el-button type="primary" @click="insert" :loading="uploading" :disabled="loading">{{ t('cloudRelease') }}</el-button>
+                <el-button @click="localInsert" :disabled="loading">{{ t('localRelease') }}</el-button>
+            </div>
 
-        <el-table-column prop="version" :label="t('code')" align="left" />
-        <el-table-column prop="status_name" :label="t('status')" align="left">
-          <template #default="{ row }">
-            <div>{{ row.status_name }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="create_time"
-          :label="t('createTime')"
-          align="center"
-        />
-        <el-table-column
-          :label="t('operation')"
-          fixed="right"
-          align="right"
-          min-width="120"
-        >
-          <template #default="{ row, $index }">
-            <template
-              v-if="
-                previewContent &&
-                $index == 0 &&
-                (row.status == 1 || row.status == 2) &&
-                weappTableData.page == 1
-              "
-            >
-              <el-tooltip :content="previewContent" raw-content effect="light">
-                <el-button type="primary" link>{{ t('preview') }}</el-button>
-              </el-tooltip>
-            </template>
-            <el-button
-              type="primary"
-              link
-              v-if="row.status == -1 || row.status == -2"
-              @click="handleFailReason(row)"
-            >
-              {{ t('failReason') }}</el-button
-            >
-          </template>
-        </el-table-column>
-      </el-table>
+            <el-table class="mt-[15px]" :data="weappTableData.data" v-loading="weappTableData.loading" size="default">
+                <template #empty>
+                    <span>{{ t('emptyData') }}</span>
+                </template>
+
+                <el-table-column prop="version" :label="t('code')" align="left" />
+                <el-table-column prop="status_name" :label="t('status')" align="left">
+                    <template #default="{ row }">
+                        <div>{{ row.status_name }}</div>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="create_time" :label="t('createTime')" align="center" />
+                <el-table-column :label="t('operation')" fixed="right" align="right" min-width="120">
+                    <template #default="{ row, $index }">
+                        <template v-if="previewContent && $index == 0 && (row.status == 1 || row.status == 2) && weappTableData.page == 1">
+                            <el-tooltip :content="previewContent" raw-content effect="light">
+                                <el-button type="primary" link>{{ t('preview') }}</el-button>
+                            </el-tooltip>
+                        </template>
+                        <el-button type="primary" link v-if="row.status == -1 || row.status == -2" @click="handleFailReason(row)">
+                            {{ t('failReason') }}</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
 
-      <div class="mt-[16px] flex justify-end">
-        <el-pagination
-          v-model:current-page="weappTableData.page"
-          v-model:page-size="weappTableData.limit"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="weappTableData.total"
-          @size-change="getWeappVersionListFn()"
-          @current-change="getWeappVersionListFn"
-        />
-      </div>
-    </el-card>
+            <div class="mt-[16px] flex justify-end">
+                <el-pagination v-model:current-page="weappTableData.page" v-model:page-size="weappTableData.limit"
+                    layout="total, sizes, prev, pager, next, jumper" :total="weappTableData.total"
+                    @size-change="getWeappVersionListFn()" @current-change="getWeappVersionListFn" />
+            </div>
+        </el-card>
 
-    <el-dialog
-      v-model="dialogVisible"
-      :title="t('codeDownTwoDesc')"
-      width="30%"
-      :before-close="handleClose"
-    >
-      <el-form ref="ruleFormRef" :model="form" label-width="120px">
-        <el-form-item prop="code" :label="t('code')">
-          <el-input
-            v-model.trim="form.code"
-            :placeholder="t('codePlaceholder')"
-            onkeyup="this.value = this.value.replace(/[^\d\.]/g,'');"
-          />
-        </el-form-item>
-        <el-form-item prop="path" :label="t('path')">
-          <upload-file
-            v-model="form.path"
-            :api="'weapp/upload'"
-            :accept="'.zip'"
-          />
-        </el-form-item>
-        <el-form-item :label="t('content')">
-          <el-input
-            type="textarea"
-            v-model.trim="form.content"
-            :placeholder="t('contentPlaceholder')"
-          />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="dialogVisible = false">{{
-            t('cancel')
-          }}</el-button>
-          <el-button type="primary" @click="insert">
-            {{ t('confirm') }}
-          </el-button>
-        </span>
-      </template>
-    </el-dialog>
+        <el-dialog v-model="dialogVisible" :title="t('codeDownTwoDesc')" width="30%" :before-close="handleClose">
+            <el-form ref="ruleFormRef" :model="form" label-width="120px">
+                <el-form-item prop="code" :label="t('code')">
+                    <el-input v-model.trim="form.code" :placeholder="t('codePlaceholder')" onkeyup="this.value = this.value.replace(/[^\d\.]/g,'');" />
+                </el-form-item>
+                <el-form-item prop="path" :label="t('path')">
+                    <upload-file v-model="form.path" :api="'weapp/upload'" :accept="'.zip'" />
+                </el-form-item>
+                <el-form-item :label="t('content')">
+                    <el-input type="textarea" v-model.trim="form.content" :placeholder="t('contentPlaceholder')" />
+                </el-form-item>
+            </el-form>
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="dialogVisible = false">{{ t('cancel') }}</el-button>
+                    <el-button type="primary" @click="insert">
+                        {{ t('confirm') }}
+                    </el-button>
+                </span>
+            </template>
+        </el-dialog>
 
-    <el-dialog
-      v-model="failReasonDialogVisible"
-      :title="t('failReason')"
-      width="60%"
-    >
-      <el-scrollbar class="h-[60vh] w-full whitespace-pre-wrap p-[20px]">
-        <div v-html="failReason"></div>
-      </el-scrollbar>
-    </el-dialog>
+        <el-dialog v-model="failReasonDialogVisible" :title="t('failReason')" width="60%">
+            <el-scrollbar class="h-[60vh] w-full whitespace-pre-wrap p-[20px]">
+                <div v-html="failReason"></div>
+            </el-scrollbar>
+        </el-dialog>
 
-    <el-dialog
-      v-model="uploadSuccessShowDialog"
-      :title="t('warning')"
-      width="500px"
-      draggable
-    >
-      <span v-html="t('uploadSuccessTips')"></span>
-      <template #footer>
-        <div class="flex justify-end">
-          <el-button @click="knownToKnow" type="primary">{{
-            t('knownToKnow')
-          }}</el-button>
-          <el-button
-            @click="uploadSuccessShowDialog = false"
-            type="primary"
-            plain
-            >{{ t('confirm') }}</el-button
-          >
-        </div>
-      </template>
-    </el-dialog>
-  </div>
+        <el-dialog v-model="uploadSuccessShowDialog" :title="t('warning')" width="500px" draggable>
+            <span v-html="t('uploadSuccessTips')"></span>
+            <template #footer>
+                <div class="flex justify-end">
+                    <el-button @click="knownToKnow" type="primary">{{ t('knownToKnow') }}</el-button>
+                    <el-button @click="uploadSuccessShowDialog = false" type="primary" plain>{{ t('confirm') }}</el-button>
+                </div>
+            </template>
+        </el-dialog>
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
 import { getInstallConfig } from '@/app/api/sys'
-import {
-  setWeappVersion,
-  getWeappPreview,
-  getWeappVersionList,
-  getWeappUploadLog,
-  getWeappConfig,
-} from '@/app/api/weapp'
+import { setWeappVersion, getWeappPreview, getWeappVersionList, getWeappUploadLog, getWeappConfig } from '@/app/api/weapp'
 import { t } from '@/lang'
 import { useRoute, useRouter } from 'vue-router'
 import { getAuthInfo } from '@/app/api/module'
@@ -190,63 +107,59 @@ const router = useRouter()
 const pageName = route.meta.title
 const dialogVisible = ref(false)
 const loading = ref(true)
-const weappTableData: {
-  page: number
-  limit: number
-  total: number
-  loading: boolean
-  data: AnyObject
+const weappTableData:{
+    page: number,
+    limit: number,
+    total: number,
+    loading: boolean,
+    data: AnyObject
 } = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: false,
-  data: [],
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: false,
+    data: []
 })
 const form = ref({
-  desc: '',
-  code: '',
-  path: '',
-  content: '',
+    desc: '',
+    code: '',
+    path: '',
+    content: ''
 })
 const installPhpConfig = ref(null)
 const uploadSuccessShowDialog = ref(false)
 const authCode = ref('')
 
-getInstallConfig()
-  .then(({ data }) => {
+getInstallConfig().then(({ data }) => {
     installPhpConfig.value = data
-  })
-  .catch()
+}).catch()
 
-getAuthInfo()
-  .then((res) => {
+getAuthInfo().then(res => {
     if (res.data.data && res.data.data.auth_code) {
-      authCode.value = res.data.data.auth_code
-      getWeappPreviewImage()
+        authCode.value = res.data.data.auth_code
+        getWeappPreviewImage()
     }
     loading.value = false
-  })
-  .catch(() => {
+}).catch(() => {
     loading.value = false
-  })
+})
 
 const weappConfig = ref<{
-  app_id: string
-  app_secret: string
-  is_authorization: number
+    app_id:string,
+    app_secret:string,
+    is_authorization: number
 }>({
-  app_id: '',
-  app_secret: '',
-  is_authorization: 0,
+    app_id: '',
+    app_secret: '',
+    is_authorization: 0
 })
-getWeappConfig().then((res) => {
-  weappConfig.value = res.data
+getWeappConfig().then(res => {
+    weappConfig.value = res.data
 })
 
 const activeName = ref('/channel/weapp/code')
 const handleClick = (val: any) => {
-  router.push({ path: activeName.value })
+    router.push({ path: activeName.value })
 }
 const ruleFormRef = ref<any>(null)
 
@@ -254,143 +167,131 @@ const ruleFormRef = ref<any>(null)
  * 获取版本列表
  */
 const getWeappVersionListFn = (page: number = 1) => {
-  weappTableData.loading = true
-  weappTableData.page = page
+    weappTableData.loading = true
+    weappTableData.page = page
 
-  getWeappVersionList({
-    page: weappTableData.page,
-    limit: weappTableData.limit,
-  })
-    .then((res) => {
-      weappTableData.loading = false
-      weappTableData.data = res.data.data
-      weappTableData.total = res.data.total
-      if (
-        page == 1 &&
-        weappTableData.data.length &&
-        weappTableData.data[0].status == 0
-      )
-        getWeappUploadLogFn(weappTableData.data[0].task_key)
-    })
-    .catch(() => {
-      weappTableData.loading = false
+    getWeappVersionList({
+        page: weappTableData.page,
+        limit: weappTableData.limit
+    }).then(res => {
+        weappTableData.loading = false
+        weappTableData.data = res.data.data
+        weappTableData.total = res.data.total
+        if (page == 1 && weappTableData.data.length && weappTableData.data[0].status == 0) getWeappUploadLogFn(weappTableData.data[0].task_key)
+    }).catch(() => {
+        weappTableData.loading = false
     })
 }
 
 getWeappVersionListFn()
 
 const handleClose = () => {
-  ruleFormRef.value.clearValidate()
+    ruleFormRef.value.clearValidate()
 }
 
 const uploading = ref(false)
 const insert = () => {
-  if (!authCode.value) {
-    authElMessageBox()
-    return
-  }
-  if (!weappConfig.value.app_id) {
-    configElMessageBox()
-    return
-  }
+    if (!authCode.value) {
+        authElMessageBox()
+        return
+    }
+    if (!weappConfig.value.app_id) {
+        configElMessageBox()
+        return
+    }
 
-  if (uploading.value) return
-  uploading.value = true
+    if (uploading.value) return
+    uploading.value = true
 
-  previewContent.value = ''
+    previewContent.value = ''
 
-  setWeappVersion(form.value)
-    .then((res) => {
-      getWeappVersionListFn()
-      getWeappPreviewImage()
-      uploading.value = false
-    })
-    .catch(() => {
-      uploading.value = false
+    setWeappVersion(form.value).then(res => {
+        getWeappVersionListFn()
+        getWeappPreviewImage()
+        uploading.value = false
+    }).catch(() => {
+        uploading.value = false
     })
 }
 
 const localInsert = () => {
-  ElMessageBox.alert(t('localInsertTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-  })
+    ElMessageBox.alert(t('localInsertTips'), t('warning'), {
+        confirmButtonText: t('confirm')
+    })
 }
 
 const previewContent = ref('')
 const getWeappPreviewImage = () => {
-  if (!authCode.value) return
-  getWeappPreview()
-    .then((res) => {
-      if (res.data)
-        previewContent.value = `<img src="${res.data}" class="w-[150px]">`
-    })
-    .catch()
+    if (!authCode.value) return
+    getWeappPreview().then(res => {
+        if (res.data) previewContent.value = `<img src="${ res.data }" class="w-[150px]">`
+    }).catch()
 }
 
 const getWeappUploadLogFn = (key: string) => {
-  getWeappUploadLog(key).then((res) => {
-    const data = res.data.data ?? []
-    if (data[0] && data[0].length) {
-      const last = data[0][data[0].length - 1]
-      if (last.code == 0) {
-        getWeappVersionListFn()
-        return
-      }
-      if (last.code == 1 && last.percent == 100) {
-        getWeappVersionListFn()
-        getWeappPreviewImage()
-        !Storage.get('weappUploadTipsLock') &&
-          (uploadSuccessShowDialog.value = true)
-        return
-      }
-      setTimeout(() => {
-        getWeappUploadLogFn(key)
-      }, 2000)
-    }
-  })
+    getWeappUploadLog(key).then(res => {
+        const data = res.data.data ?? []
+        if (data[0] && data[0].length) {
+            const last = data[0][data[0].length - 1]
+            if (last.code == 0) {
+                getWeappVersionListFn()
+                return
+            }
+            if (last.code == 1 && last.percent == 100) {
+                getWeappVersionListFn()
+                getWeappPreviewImage()
+                !Storage.get('weappUploadTipsLock') && (uploadSuccessShowDialog.value = true)
+                return
+            }
+            setTimeout(() => {
+                getWeappUploadLogFn(key)
+            }, 2000)
+        }
+    })
 }
 
 const authElMessageBox = () => {
-  ElMessageBox.confirm(
-    `上传代码需先绑定授权码，如果已有授权请先进行绑定，没有授权可到${installPhpConfig.value.website_name}官网购买授权之后再进行操作`,
-    t('warning'),
-    {
-      distinguishCancelAndClose: true,
-      confirmButtonText: t('toBind'),
-      cancelButtonText: `去${installPhpConfig.value.website_name}官网`,
-    }
-  )
-    .then(() => {
-      router.push({ path: '/tools/authorize' })
-    })
-    .catch((action: string) => {
-      if (action === 'cancel') {
-        window.open(installPhpConfig.value.website_url)
-      }
+    ElMessageBox.confirm(
+        `上传代码需先绑定授权码，如果已有授权请先进行绑定，没有授权可到${installPhpConfig.value.website_name}官网购买授权之后再进行操作`,
+        t('warning'),
+        {
+            distinguishCancelAndClose: true,
+            confirmButtonText: t('toBind'),
+            cancelButtonText: `去${installPhpConfig.value.website_name}官网`
+        }
+    ).then(() => {
+        router.push({ path: '/tools/authorize' })
+    }).catch((action: string) => {
+        if (action === 'cancel') {
+            window.open(installPhpConfig.value.website_url)
+        }
     })
 }
 
 const configElMessageBox = () => {
-  ElMessageBox.confirm(t('weappTips'), t('warning'), {
-    confirmButtonText: t('toSetting'),
-    cancelButtonText: t('cancel'),
-  })
-    .then(() => {
-      router.push({ path: '/channel/weapp/config' })
+    ElMessageBox.confirm(
+        t('weappTips'),
+        t('warning'),
+        {
+            confirmButtonText: t('toSetting'),
+            cancelButtonText: t('cancel')
+        }
+    ).then(() => {
+        router.push({ path: '/channel/weapp/config' })
+    }).catch((action: string) => {
     })
-    .catch((action: string) => {})
 }
 
 const failReason = ref('')
 const failReasonDialogVisible = ref(false)
 const handleFailReason = (data: any) => {
-  failReason.value = data.fail_reason
-  failReasonDialogVisible.value = true
+    failReason.value = data.fail_reason
+    failReasonDialogVisible.value = true
 }
 
 const knownToKnow = () => {
-  Storage.set({ key: 'weappUploadTipsLock', data: true })
-  uploadSuccessShowDialog.value = false
+    Storage.set({ key: 'weappUploadTipsLock', data: true })
+    uploadSuccessShowDialog.value = false
 }
 </script>
 
diff --git a/admin/src/app/views/channel/weapp/config.vue b/admin/src/app/views/channel/weapp/config.vue
index 582db6f7..1f2834fb 100644
--- a/admin/src/app/views/channel/weapp/config.vue
+++ b/admin/src/app/views/channel/weapp/config.vue
@@ -1,238 +1,130 @@
 <template>
-  <!--小程序配置-->
-  <div class="main-container">
-    <el-card class="card !border-none" shadow="never">
-      <el-page-header :content="pageName" :icon="ArrowLeft" @back="back()" />
-    </el-card>
-
-    <el-form
-      class="page-form mt-[15px]"
-      :model="formData"
-      label-width="170px"
-      ref="formRef"
-      :rules="formRules"
-      v-loading="loading"
-    >
-      <el-card class="box-card !border-none" shadow="never">
-        <h3 class="panel-title !text-sm">{{ t('weappInfo') }}</h3>
-
-        <el-form-item :label="t('weappName')" prop="weapp_name">
-          <el-input
-            v-model.trim="formData.weapp_name"
-            :placeholder="t('weappNamePlaceholder')"
-            class="input-width"
-            clearable
-            :readonly="formData.is_authorization"
-          />
-        </el-form-item>
-
-        <el-form-item :label="t('weappOriginal')" prop="weapp_original">
-          <el-input
-            v-model.trim="formData.weapp_original"
-            :placeholder="t('weappOriginalPlaceholder')"
-            class="input-width"
-            clearable
-            :readonly="formData.is_authorization"
-          />
-        </el-form-item>
-
-        <el-form-item :label="t('weappQrcode')" prop="qr_code">
-          <upload-image v-model="formData.qr_code" />
-          <div class="form-tip">{{ t('weappQrcodeTips') }}</div>
-        </el-form-item>
-      </el-card>
-
-      <el-card class="box-card !border-none mt-[15px]" shadow="never">
-        <h3 class="panel-title !text-sm">{{ t('weappDevelopInfo') }}</h3>
-
-        <el-form-item :label="t('weappAppid')" prop="app_id">
-          <el-input
-            v-model.trim="formData.app_id"
-            :placeholder="t('appidPlaceholder')"
-            class="input-width"
-            clearable
-            :readonly="formData.is_authorization"
-          />
-          <div class="form-tip">{{ t('weappAppidTips') }}</div>
-        </el-form-item>
-
-        <el-form-item
-          :label="t('weappAppsecret')"
-          prop="app_secret"
-          v-if="!formData.is_authorization"
-        >
-          <el-input
-            v-model.trim="formData.app_secret"
-            :placeholder="t('appSecretPlaceholder')"
-            class="input-width"
-            clearable
-          />
-          <div class="form-tip">{{ t('weappAppsecretTips') }}</div>
-        </el-form-item>
-      </el-card>
-
-      <el-card
-        class="box-card !border-none mt-[15px]"
-        shadow="never"
-        v-if="!formData.is_authorization"
-      >
-        <h3 class="panel-title !text-sm">{{ t('weappUpload') }}</h3>
-
-        <el-form-item :label="t('uploadKey')" prop="upload_private_key">
-          <div class="input-width">
-            <upload-file
-              v-model="formData.upload_private_key"
-              api="sys/document/wechat"
-            />
-          </div>
-          <div class="form-tip">{{ t('uploadKeyTips') }}</div>
-          <div class="form-tip">
-            {{ t('uploadIpTips') }}{{ formData.upload_ip }}
-          </div>
-        </el-form-item>
-      </el-card>
-
-      <el-card class="box-card !border-none mt-[15px]" shadow="never">
-        <h3 class="panel-title !text-sm">{{ t('theServerSetting') }}</h3>
-
-        <el-form-item label="URL">
-          <el-input
-            :model-value="formData.serve_url"
-            placeholder="Please input"
-            class="input-width"
-            :readonly="true"
-          >
-            <template #append>
-              <div
-                class="cursor-pointer"
-                @click="copyEvent(formData.serve_url)"
-              >
-                {{ t('copy') }}
-              </div>
-            </template>
-          </el-input>
-        </el-form-item>
-
-        <el-form-item label="Token" prop="token">
-          <el-input
-            v-model.trim="formData.token"
-            :placeholder="t('tokenPlaceholder')"
-            class="input-width"
-            maxlength="32"
-            show-word-limit
-            clearable
-          />
-          <div class="form-tip">{{ t('tokenTips') }}</div>
-        </el-form-item>
-
-        <el-form-item label="EncodingAESKey" prop="encoding_aes_key">
-          <el-input
-            v-model.trim="formData.encoding_aes_key"
-            :placeholder="t('encodingAesKeyPlaceholder')"
-            class="input-width"
-            maxlength="43"
-            show-word-limit
-            clearable
-          />
-          <div class="form-tip">{{ t('encodingAESKeyTips') }}</div>
-        </el-form-item>
-
-        <el-form-item :label="t('encryptionType')" prop="encryption_type">
-          <el-radio-group v-model="formData.encryption_type">
-            <el-radio label="not_encrypt">{{ t('cleartextMode') }}</el-radio>
-            <el-radio label="compatible">{{ t('compatibleMode') }}</el-radio>
-            <el-radio label="safe">{{ t('safeMode') }}</el-radio>
-          </el-radio-group>
-          <div class="form-tip">{{ t('cleartextModeTips') }}</div>
-          <div class="form-tip">{{ t('compatibleModeTips') }}</div>
-          <div class="form-tip">{{ t('safeModeTips') }}</div>
-        </el-form-item>
-      </el-card>
-
-      <el-card class="box-card !border-none mt-[15px]" shadow="never">
-        <div class="flex">
-          <h3 class="panel-title !text-sm">{{ t('functionSetting') }}</h3>
+    <!--小程序配置-->
+    <div class="main-container">
+
+        <el-card class="card !border-none" shadow="never">
+            <el-page-header :content="pageName" :icon="ArrowLeft" @back="back()" />
+        </el-card>
+
+        <el-form class="page-form mt-[15px]" :model="formData" label-width="170px" ref="formRef" :rules="formRules" v-loading="loading">
+            <el-card class="box-card !border-none" shadow="never">
+                <h3 class="panel-title !text-sm">{{ t('weappInfo') }}</h3>
+
+                <el-form-item :label="t('weappName')" prop="weapp_name">
+                    <el-input v-model.trim="formData.weapp_name" :placeholder="t('weappNamePlaceholder')" class="input-width" clearable :readonly="formData.is_authorization"/>
+                </el-form-item>
+
+                <el-form-item :label="t('weappOriginal')" prop="weapp_original">
+                    <el-input v-model.trim="formData.weapp_original" :placeholder="t('weappOriginalPlaceholder')" class="input-width" clearable :readonly="formData.is_authorization"/>
+                </el-form-item>
+
+                <el-form-item :label="t('weappQrcode')" prop="qr_code">
+                    <upload-image v-model="formData.qr_code" />
+                    <div class="form-tip">{{ t('weappQrcodeTips') }}</div>
+                </el-form-item>
+            </el-card>
+
+            <el-card class="box-card !border-none mt-[15px]" shadow="never">
+                <h3 class="panel-title !text-sm">{{ t('weappDevelopInfo') }}</h3>
+
+                <el-form-item :label="t('weappAppid')" prop="app_id">
+                    <el-input v-model.trim="formData.app_id" :placeholder="t('appidPlaceholder')" class="input-width" clearable :readonly="formData.is_authorization"/>
+                    <div class="form-tip">{{ t('weappAppidTips') }}</div>
+                </el-form-item>
+
+                <el-form-item :label="t('weappAppsecret')" prop="app_secret" v-if="!formData.is_authorization">
+                    <el-input v-model.trim="formData.app_secret" :placeholder="t('appSecretPlaceholder')" class="input-width" clearable />
+                    <div class="form-tip">{{ t('weappAppsecretTips') }}</div>
+                </el-form-item>
+            </el-card>
+
+            <el-card class="box-card !border-none mt-[15px]" shadow="never" v-if="!formData.is_authorization">
+                <h3 class="panel-title !text-sm">{{ t('weappUpload') }}</h3>
+
+                <el-form-item :label="t('uploadKey')" prop="upload_private_key">
+                    <div class="input-width">
+                        <upload-file v-model="formData.upload_private_key" api="sys/document/wechat" />
+                    </div>
+                    <div class="form-tip">{{ t('uploadKeyTips') }}</div>
+                    <div class="form-tip">{{ t('uploadIpTips') }}{{ formData.upload_ip }}</div>
+                </el-form-item>
+            </el-card>
+
+            <el-card class="box-card !border-none mt-[15px]" shadow="never">
+                <h3 class="panel-title !text-sm">{{ t('theServerSetting') }}</h3>
+
+                <el-form-item label="URL">
+                    <el-input :model-value="formData.serve_url" placeholder="Please input" class="input-width" :readonly="true">
+                        <template #append>
+                            <div class="cursor-pointer" @click="copyEvent(formData.serve_url)">{{ t('copy') }}</div>
+                        </template>
+                    </el-input>
+                </el-form-item>
+
+                <el-form-item label="Token" prop="token">
+                    <el-input v-model.trim="formData.token" :placeholder="t('tokenPlaceholder')" class="input-width" maxlength="32" show-word-limit clearable />
+                    <div class="form-tip">{{ t('tokenTips') }}</div>
+                </el-form-item>
+
+                <el-form-item label="EncodingAESKey" prop="encoding_aes_key">
+                    <el-input v-model.trim="formData.encoding_aes_key" :placeholder="t('encodingAesKeyPlaceholder')" class="input-width" maxlength="43" show-word-limit clearable />
+                    <div class="form-tip">{{ t('encodingAESKeyTips') }}</div>
+                </el-form-item>
+
+                <el-form-item :label="t('encryptionType')" prop="encryption_type">
+                    <el-radio-group v-model="formData.encryption_type">
+                        <el-radio label="not_encrypt">{{ t('cleartextMode') }}</el-radio>
+                        <el-radio label="compatible">{{ t('compatibleMode') }}</el-radio>
+                        <el-radio label="safe">{{ t('safeMode') }}</el-radio>
+                    </el-radio-group>
+                    <div class="form-tip">{{ t('cleartextModeTips') }}</div>
+                    <div class="form-tip">{{ t('compatibleModeTips') }}</div>
+                    <div class="form-tip">{{ t('safeModeTips') }}</div>
+                </el-form-item>
+            </el-card>
+
+            <el-card class="box-card !border-none mt-[15px]" shadow="never">
+                <div class="flex">
+                    <h3 class="panel-title !text-sm">{{ t('functionSetting') }}</h3>
+                </div>
+
+                <el-form-item :label="t('requestUrl')">
+                    <el-input :model-value="formData.request_url" placeholder="Please input" class="input-width" :readonly="true">
+                        <template #append>
+                            <div class="cursor-pointer" @click="copyEvent(formData.request_url)">{{ t('copy') }}</div>
+                        </template>
+                    </el-input>
+                </el-form-item>
+                <el-form-item :label="t('socketUrl')">
+                    <el-input :model-value="formData.socket_url" placeholder="Please input" class="input-width" :readonly="true">
+                        <template #append>
+                            <div class="cursor-pointer" @click="copyEvent(formData.socket_url)">{{ t('copy') }}</div>
+                        </template>
+                    </el-input>
+                </el-form-item>
+                <el-form-item :label="t('uploadUrl')">
+                    <el-input :model-value="formData.upload_url" placeholder="Please input" class="input-width" :readonly="true">
+                        <template #append>
+                            <div class="cursor-pointer" @click="copyEvent(formData.upload_url)">{{ t('copy') }}</div>
+                        </template>
+                    </el-input>
+                </el-form-item>
+                <el-form-item :label="t('downloadUrl')">
+                    <el-input :model-value="formData.download_url" placeholder="Please input" class="input-width" :readonly="true">
+                        <template #append>
+                            <div class="cursor-pointer" @click="copyEvent(formData.download_url)">{{ t('copy') }}</div>
+                        </template>
+                    </el-input>
+                </el-form-item>
+            </el-card>
+        </el-form>
+
+        <div class="fixed-footer-wrap">
+            <div class="fixed-footer">
+                <el-button type="primary" :loading="loading" @click="save(formRef)">{{ t('save') }}</el-button>
+            </div>
         </div>
-
-        <el-form-item :label="t('requestUrl')">
-          <el-input
-            :model-value="formData.request_url"
-            placeholder="Please input"
-            class="input-width"
-            :readonly="true"
-          >
-            <template #append>
-              <div
-                class="cursor-pointer"
-                @click="copyEvent(formData.request_url)"
-              >
-                {{ t('copy') }}
-              </div>
-            </template>
-          </el-input>
-        </el-form-item>
-        <el-form-item :label="t('socketUrl')">
-          <el-input
-            :model-value="formData.socket_url"
-            placeholder="Please input"
-            class="input-width"
-            :readonly="true"
-          >
-            <template #append>
-              <div
-                class="cursor-pointer"
-                @click="copyEvent(formData.socket_url)"
-              >
-                {{ t('copy') }}
-              </div>
-            </template>
-          </el-input>
-        </el-form-item>
-        <el-form-item :label="t('uploadUrl')">
-          <el-input
-            :model-value="formData.upload_url"
-            placeholder="Please input"
-            class="input-width"
-            :readonly="true"
-          >
-            <template #append>
-              <div
-                class="cursor-pointer"
-                @click="copyEvent(formData.upload_url)"
-              >
-                {{ t('copy') }}
-              </div>
-            </template>
-          </el-input>
-        </el-form-item>
-        <el-form-item :label="t('downloadUrl')">
-          <el-input
-            :model-value="formData.download_url"
-            placeholder="Please input"
-            class="input-width"
-            :readonly="true"
-          >
-            <template #append>
-              <div
-                class="cursor-pointer"
-                @click="copyEvent(formData.download_url)"
-              >
-                {{ t('copy') }}
-              </div>
-            </template>
-          </el-input>
-        </el-form-item>
-      </el-card>
-    </el-form>
-
-    <div class="fixed-footer-wrap">
-      <div class="fixed-footer">
-        <el-button type="primary" :loading="loading" @click="save(formRef)">{{
-          t('save')
-        }}</el-button>
-      </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
@@ -248,76 +140,64 @@ const route = useRoute()
 const router = useRouter()
 const pageName = route.meta.title
 const back = () => {
-  router.push('/channel/weapp')
+    router.push('/channel/weapp')
 }
 const loading = ref(true)
 
 const formData = reactive<Record<string, any>>({
-  weapp_name: '',
-  weapp_original: '',
-  app_id: '',
-  app_secret: '',
-  qr_code: '',
-  token: '',
-  encoding_aes_key: '',
-  encryption_type: 'not_encrypt',
-  serve_url: '',
-  request_url: '',
-  socket_url: '',
-  upload_url: '',
-  download_url: '',
-  upload_private_key: '',
-  is_authorization: 0,
+    weapp_name: '',
+    weapp_original: '',
+    app_id: '',
+    app_secret: '',
+    qr_code: '',
+    token: '',
+    encoding_aes_key: '',
+    encryption_type: 'not_encrypt',
+    serve_url: '',
+    request_url: '',
+    socket_url: '',
+    upload_url: '',
+    download_url: '',
+    upload_private_key: '',
+    is_authorization: 0
 })
 
 const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    weapp_name: [
-      { required: true, message: t('weappNamePlaceholder'), trigger: 'blur' },
-    ],
-    weapp_original: [
-      {
-        required: true,
-        message: t('weappOriginalPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    app_id: [
-      { required: true, message: t('appidPlaceholder'), trigger: 'blur' },
-    ],
-    app_secret: [
-      {
-        required: !formData.is_authorization,
-        message: t('appSecretPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    token: [
-      { required: true, message: t('tokenPlaceholder'), trigger: 'blur' },
-    ],
-    encoding_aes_key: [
-      {
-        required: true,
-        message: t('encodingAesKeyPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-  }
+    return {
+        weapp_name: [
+            { required: true, message: t('weappNamePlaceholder'), trigger: 'blur' }
+        ],
+        weapp_original: [
+            { required: true, message: t('weappOriginalPlaceholder'), trigger: 'blur' }
+        ],
+        app_id: [
+            { required: true, message: t('appidPlaceholder'), trigger: 'blur' }
+        ],
+        app_secret: [
+            { required: !formData.is_authorization, message: t('appSecretPlaceholder'), trigger: 'blur' }
+        ],
+        token: [
+            { required: true, message: t('tokenPlaceholder'), trigger: 'blur' }
+        ],
+        encoding_aes_key: [
+            { required: true, message: t('encodingAesKeyPlaceholder'), trigger: 'blur' }
+        ]
+    }
 })
 
 /**
  * 获取微信配置
  */
-getWeappConfig().then((res) => {
-  Object.assign(formData, res.data)
-  loading.value = false
+getWeappConfig().then(res => {
+    Object.assign(formData, res.data)
+    loading.value = false
 })
 
-getWeappConfig().then((res) => {
-  Object.assign(res.data)
+getWeappConfig().then(res => {
+    Object.assign(res.data)
 })
 
 /**
@@ -325,44 +205,43 @@ getWeappConfig().then((res) => {
  */
 const { copy, isSupported, copied } = useClipboard()
 const copyEvent = (text: string) => {
-  if (!isSupported.value) {
-    ElMessage({
-      message: t('notSupportCopy'),
-      type: 'warning',
-    })
-    return
-  }
-  copy(text)
+    if (!isSupported.value) {
+        ElMessage({
+            message: t('notSupportCopy'),
+            type: 'warning'
+        })
+        return
+    }
+    copy(text)
 }
 
 watch(copied, () => {
-  if (copied.value) {
-    ElMessage({
-      message: t('copySuccess'),
-      type: 'success',
-    })
-  }
+    if (copied.value) {
+        ElMessage({
+            message: t('copySuccess'),
+            type: 'success'
+        })
+    }
 })
 
 /**
  * 保存
  */
 const save = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      setWeappConfig(formData)
-        .then(() => {
-          loading.value = false
-        })
-        .catch(() => {
-          loading.value = false
-        })
-    }
-  })
+    if (loading.value || !formEl) return
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+            setWeappConfig(formData).then(() => {
+                loading.value = false
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
 }
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/channel/weapp/course.vue b/admin/src/app/views/channel/weapp/course.vue
index 7cda5469..bd381e98 100644
--- a/admin/src/app/views/channel/weapp/course.vue
+++ b/admin/src/app/views/channel/weapp/course.vue
@@ -1,96 +1,58 @@
 <template>
-  <!--配置教程-->
-  <div class="main-container">
-    <el-card class="card !border-none" shadow="never">
-      <el-page-header :content="pageName" :icon="ArrowLeft" @back="back()" />
-    </el-card>
+    <!--配置教程-->
+	<div class="main-container">
 
-    <el-card class="box-card mt-[15px] !border-none" shadow="never">
-      <div class="flex">
-        <div class="min-w-[60px]">
-          <span
-            class="flex justify-center items-center block w-[40px] h-[40px] border-[1px] border-primary rounded-[999px] text-primary"
-            >1</span
-          >
-        </div>
-        <div>
-          <p class="flex items-center text-[14px]">
-            {{ t('writingTipsOne1')
-            }}<el-button link type="primary" @click="linkEvent">{{
-              t('writingTipsOne2')
-            }}</el-button
-            >,{{ t('writingTipsOne3') }}
-          </p>
-          <div class="w-[100%] mt-[10px]">
-            <img
-              class="w-[100%]"
-              src="@/app/assets/images/setting/weapp_1.png"
-            />
-          </div>
-        </div>
-      </div>
-      <div class="flex mt-[40px]">
-        <div class="min-w-[60px]">
-          <span
-            class="flex justify-center items-center block w-[40px] h-[40px] border-[1px] border-primary rounded-[999px] text-primary"
-            >2</span
-          >
-        </div>
-        <div>
-          <p class="flex items-center text-[14px]">
-            {{ t('writingTipsTwo1') }}
-          </p>
-          <div class="w-[100%] mt-[10px]">
-            <img
-              class="w-[100%]"
-              src="@/app/assets/images/setting/weapp_2.png"
-            />
-          </div>
-        </div>
-      </div>
-      <div class="flex mt-[40px]">
-        <div class="min-w-[60px]">
-          <span
-            class="flex justify-center items-center block w-[40px] h-[40px] border-[1px] border-primary rounded-[999px] text-primary"
-            >3</span
-          >
-        </div>
-        <div>
-          <p class="flex items-center text-[14px]">
-            {{ t('writingTipsThree1')
-            }}<span class="text-primary">{{ t('writingTipsThree2') }}</span>
-          </p>
-          <div class="w-[100%] mt-[10px]">
-            <img
-              class="w-[100%]"
-              src="@/app/assets/images/setting/weapp_3.png"
-            />
-          </div>
-        </div>
-      </div>
-      <div class="flex mt-[40px]">
-        <div class="min-w-[60px]">
-          <span
-            class="flex justify-center items-center block w-[40px] h-[40px] border-[1px] border-primary rounded-[999px] text-primary"
-            >4</span
-          >
-        </div>
-        <div>
-          <p class="flex items-center text-[14px]">
-            {{ t('writingTipsFour1')
-            }}<span class="text-primary">URL / Token / EncondingAESKey</span
-            >{{ t('writingTipsFour2') }}
-          </p>
-          <div class="w-[100%] mt-[10px]">
-            <img
-              class="w-[100%]"
-              src="@/app/assets/images/setting/weapp_4.png"
-            />
-          </div>
-        </div>
-      </div>
-    </el-card>
-  </div>
+		<el-card class="card !border-none" shadow="never">
+		    <el-page-header :content="pageName" :icon="ArrowLeft" @back="back()" />
+		</el-card>
+
+		<el-card class="box-card mt-[15px] !border-none" shadow="never">
+            <div class="flex">
+                <div class="min-w-[60px]">
+                    <span class="flex justify-center items-center block w-[40px] h-[40px] border-[1px] border-primary rounded-[999px] text-primary">1</span>
+                </div>
+                <div>
+                    <p class="flex items-center text-[14px]">{{ t('writingTipsOne1') }}<el-button link type="primary" @click="linkEvent">{{ t("writingTipsOne2") }}</el-button>,{{ t('writingTipsOne3') }}</p>
+                    <div class="w-[100%] mt-[10px]">
+                        <img class="w-[100%]" src="@/app/assets/images/setting/weapp_1.png" />
+                    </div>
+                </div>
+            </div>
+            <div class="flex mt-[40px]">
+                <div class="min-w-[60px]">
+                    <span class="flex justify-center items-center block w-[40px] h-[40px] border-[1px] border-primary rounded-[999px] text-primary">2</span>
+                </div>
+                <div>
+                    <p class="flex items-center text-[14px]">{{ t('writingTipsTwo1') }}</p>
+                    <div class="w-[100%] mt-[10px]">
+                        <img class="w-[100%]" src="@/app/assets/images/setting/weapp_2.png" />
+                    </div>
+                </div>
+            </div>
+            <div class="flex mt-[40px]">
+                <div class="min-w-[60px]">
+                    <span class="flex justify-center items-center block w-[40px] h-[40px] border-[1px] border-primary rounded-[999px] text-primary">3</span>
+                </div>
+                <div>
+                    <p class="flex items-center text-[14px]">{{ t('writingTipsThree1') }}<span class="text-primary">{{ t('writingTipsThree2') }}</span></p>
+                    <div class="w-[100%] mt-[10px]">
+                        <img class="w-[100%]" src="@/app/assets/images/setting/weapp_3.png" />
+                    </div>
+                </div>
+            </div>
+            <div class="flex mt-[40px]">
+                <div class="min-w-[60px]">
+                    <span class="flex justify-center items-center block w-[40px] h-[40px] border-[1px] border-primary rounded-[999px] text-primary">4</span>
+                </div>
+                <div>
+                    <p class="flex items-center text-[14px]">{{ t('writingTipsFour1') }}<span class="text-primary">URL / Token / EncondingAESKey</span>{{ t('writingTipsFour2') }}</p>
+                    <div class="w-[100%] mt-[10px]">
+                        <img class="w-[100%]" src="@/app/assets/images/setting/weapp_4.png" />
+                    </div>
+                </div>
+            </div>
+		</el-card>
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -102,11 +64,12 @@ const route = useRoute()
 const router = useRouter()
 const pageName = route.meta.title
 const back = () => {
-  router.push('/channel/weapp')
+    router.push('/channel/weapp')
 }
 const linkEvent = () => {
-  window.open('https://mp.weixin.qq.com/', '_blank')
+    window.open('https://mp.weixin.qq.com/', '_blank')
 }
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/channel/weapp/template.vue b/admin/src/app/views/channel/weapp/template.vue
index 62e3b64c..e093ffb1 100644
--- a/admin/src/app/views/channel/weapp/template.vue
+++ b/admin/src/app/views/channel/weapp/template.vue
@@ -1,101 +1,63 @@
 <template>
-  <!--订阅消息-->
-  <div class="main-container">
-    <el-card class="card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
-
-      <el-tabs v-model="activeName" class="my-[20px]" @tab-change="handleClick">
-        <el-tab-pane :label="t('weappAccessFlow')" name="/channel/weapp" />
-        <el-tab-pane
-          :label="t('subscribeMessage')"
-          name="/channel/weapp/message"
-        />
-        <el-tab-pane :label="t('weappRelease')" name="/channel/weapp/code" />
-      </el-tabs>
-
-      <el-alert :title="t('operationTipTwo')" type="info" show-icon />
-
-      <div class="mt-[20px]">
-        <el-table
-          :data="cronTableData.data"
-          :span-method="templateSpan"
-          size="large"
-          v-loading="cronTableData.loading"
-        >
-          <template #empty>
-            <span>{{ !cronTableData.loading ? t('emptyData') : '' }}</span>
-          </template>
-
-          <el-table-column
-            prop="addon_name"
-            :label="t('addon')"
-            min-width="120"
-          />
-          <el-table-column
-            prop="name"
-            :show-overflow-tooltip="true"
-            :label="t('name')"
-            min-width="150"
-          >
-            <template #default="{ row }">
-              <div class="flex items-center">
-                <span class="mr-[5px]">{{ row.name }}</span>
-                <el-tooltip
-                  :content="row.weapp.tips"
-                  v-if="row.weapp.tips"
-                  placement="top"
-                >
-                  <icon name="element WarningFilled" />
-                </el-tooltip>
-              </div>
-            </template>
-          </el-table-column>
-
-          <el-table-column :label="t('response')" min-width="180">
-            <template #default="{ row }">
-              <div
-                v-for="(item, index) in row.weapp.content"
-                :key="'a' + index"
-                class="text-left"
-              >
-                {{ item.join(':') }}
-              </div>
-            </template>
-          </el-table-column>
-
-          <el-table-column :label="t('isStart')" min-width="100" align="center">
-            <template #default="{ row }">
-              {{ row.is_weapp == 1 ? t('startUsing') : t('statusDeactivate') }}
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            prop="weapp_template_id"
-            :label="t('serialNumber')"
-            min-width="180"
-          />
-
-          <el-table-column
-            :label="t('operation')"
-            fixed="right"
-            align="right"
-            width="200"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="infoSwitch(row)">{{
-                row.is_weapp == 1 ? t('close') : t('open')
-              }}</el-button>
-              <el-button type="primary" link @click="batchAcquisitionFn(row)">{{
-                t('regain')
-              }}</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </el-card>
-  </div>
+    <!--订阅消息-->
+    <div class="main-container">
+        <el-card class="card !border-none" shadow="never">
+
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+            </div>
+
+            <el-tabs v-model="activeName" class="my-[20px]" @tab-change="handleClick">
+                <el-tab-pane :label="t('weappAccessFlow')" name="/channel/weapp" />
+                <el-tab-pane :label="t('subscribeMessage')" name="/channel/weapp/message" />
+                <el-tab-pane :label="t('weappRelease')" name="/channel/weapp/code" />
+            </el-tabs>
+
+            <el-alert :title="t('operationTipTwo')" type="info" show-icon />
+
+            <div class="mt-[20px]">
+                <el-table :data="cronTableData.data" :span-method="templateSpan" size="large" v-loading="cronTableData.loading">
+                    <template #empty>
+                        <span>{{ !cronTableData.loading ? t('emptyData') : '' }}</span>
+                    </template>
+
+                    <el-table-column prop="addon_name" :label="t('addon')" min-width="120" />
+                    <el-table-column prop="name" :show-overflow-tooltip="true" :label="t('name')" min-width="150" >
+                        <template #default="{ row }">
+                            <div class="flex items-center">
+                                <span class="mr-[5px]">{{row.name }}</span>
+                                <el-tooltip :content="row.weapp.tips" v-if="row.weapp.tips" placement="top">
+                                    <icon name="element WarningFilled" />
+                                </el-tooltip>
+                            </div>
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column :label="t('response')" min-width="180">
+                        <template #default="{ row }">
+                            <div v-for="(item, index) in row.weapp.content" :key="'a' + index" class="text-left">{{ item.join(":") }}</div>
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column :label="t('isStart')" min-width="100" align="center">
+                        <template #default="{ row }">
+                            {{ row.is_weapp == 1 ? t('startUsing') : t('statusDeactivate') }}
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column prop="weapp_template_id" :label="t('serialNumber')" min-width="180" />
+
+                    <el-table-column :label="t('operation')" fixed="right" align="right" width="200">
+                        <template #default="{ row }">
+                            <el-button type="primary" link @click="infoSwitch(row)">{{ row.is_weapp == 1 ? t('close') : t('open') }}</el-button>
+                            <el-button type="primary" link @click="batchAcquisitionFn(row)">{{ t('regain') }}</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -112,76 +74,69 @@ const router = useRouter()
 const pageName = route.meta.title
 const activeName = ref('/channel/weapp/message')
 const handleClick = (val: any) => {
-  router.push({ path: activeName.value })
+    router.push({ path: activeName.value })
 }
 const cronTableData = reactive({
-  loading: true,
-  data: [],
+    loading: true,
+    data: []
 })
 
 /**
  * 获取消息模板列表
  */
 const loadCronList = (page: number = 1) => {
-  cronTableData.loading = true
-
-  getTemplateList()
-    .then((res) => {
-      cronTableData.loading = false
-      let data = []
-      res.data.forEach((item) => {
-        if (item.notice.length) {
-          const addons = []
-          Object.keys(item.notice).forEach((key, index) => {
-            const notice = item.notice[key]
-            notice.addon_name = item.title
-            addons.push(notice)
-          })
-          if (addons.length) {
-            addons[0].rowspan = addons.length
-            data = data.concat(addons)
-          }
-        }
-      })
-      cronTableData.data = data
-    })
-    .catch(() => {
-      cronTableData.loading = false
+    cronTableData.loading = true
+
+    getTemplateList().then(res => {
+        cronTableData.loading = false
+        let data = []
+        res.data.forEach(item => {
+            if (item.notice.length) {
+                const addons = []
+                Object.keys(item.notice).forEach((key, index) => {
+                    const notice = item.notice[key]
+                    notice.addon_name = item.title
+                    addons.push(notice)
+                })
+                if (addons.length) {
+                    addons[0].rowspan = addons.length
+                    data = data.concat(addons)
+                }
+            }
+        })
+        cronTableData.data = data
+    }).catch(() => {
+        cronTableData.loading = false
     })
 }
 loadCronList()
 
-const templateSpan = (row: any) => {
-  if (row.columnIndex === 0) {
-    if (row.row.rowspan) {
-      return {
-        rowspan: row.row.rowspan,
-        colspan: 1,
-      }
-    } else {
-      return {
-        rowspan: 0,
-        colspan: 0,
-      }
+const templateSpan = (row : any) => {
+    if (row.columnIndex === 0) {
+        if (row.row.rowspan) {
+            return {
+                rowspan: row.row.rowspan,
+                colspan: 1
+            }
+        } else {
+            return {
+                rowspan: 0,
+                colspan: 0
+            }
+        }
     }
-  }
 }
 
 /**
  * 批量获取
  */
 const batchAcquisitionFn = (row: AnyObject | null = null) => {
-  const loading = ElLoading.service({
-    lock: true,
-    background: 'rgba(0, 0, 0, 0)',
-  })
-  getBatchAcquisition({ keys: row ? [row.key] : [] })
-    .then(() => {
-      loadCronList()
-      loading.close()
-    })
-    .catch(() => {
-      loading.close()
+    const loading = ElLoading.service({ lock: true, background: 'rgba(0, 0, 0, 0)' })
+    getBatchAcquisition({ keys: row ? [row.key] : [] }).then(() => {
+        loadCronList()
+        loading.close()
+    }).catch(() => {
+        loading.close()
     })
 }
 
@@ -189,28 +144,27 @@ const batchAcquisitionFn = (row: AnyObject | null = null) => {
  * 开启或关闭订阅消息
  */
 interface Switch {
-  key: string
-  type: string
-  status: number
+    key: string;
+    type: string;
+    status: number
 }
-const infoSwitch = (res: any) => {
-  const data = ref<Switch>({
-    key: '',
-    type: '',
-    status: 0,
-  })
-  data.value.status = res.is_weapp ? 0 : 1
-  data.value.key = res.key
-  data.value.type = 'weapp'
-  cronTableData.loading = true
-  editNoticeStatus(data.value)
-    .then((res) => {
-      loadCronList()
+const infoSwitch = (res:any) => {
+    const data = ref<Switch>({
+        key: '',
+        type: '',
+        status: 0
     })
-    .catch(() => {
-      cronTableData.loading = false
+    data.value.status = res.is_weapp ? 0 : 1
+    data.value.key = res.key
+    data.value.type = 'weapp'
+    cronTableData.loading = true
+    editNoticeStatus(data.value).then(res => {
+        loadCronList()
+    }).catch(() => {
+        cronTableData.loading = false
     })
 }
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/channel/wechat/access.vue b/admin/src/app/views/channel/wechat/access.vue
index 0781a2fc..2e2f7d3e 100644
--- a/admin/src/app/views/channel/wechat/access.vue
+++ b/admin/src/app/views/channel/wechat/access.vue
@@ -1,107 +1,87 @@
 <template>
-  <!--微信公众号-->
-  <div class="main-container">
-    <el-card class="card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
-
-      <el-tabs v-model="activeName" class="my-[20px]" @tab-change="handleClick">
-        <el-tab-pane :label="t('wechatAccessFlow')" name="/channel/wechat" />
-        <el-tab-pane :label="t('customMenu')" name="/channel/wechat/menu" />
-        <el-tab-pane
-          :label="t('wechatTemplate')"
-          name="/channel/wechat/message"
-        />
-        <el-tab-pane :label="t('reply')" name="/channel/wechat/reply" />
-      </el-tabs>
-
-      <div class="p-[20px]">
-        <h3 class="panel-title !text-sm">{{ t('wechatInlet') }}</h3>
-
-        <el-row>
-          <el-col :span="20">
-            <el-steps class="!mt-[10px]" :active="3" direction="vertical">
-              <el-step>
-                <template #title>
-                  <p class="text-[14px] font-[700]">
-                    {{ t('wechatAttestation') }}
-                  </p>
-                </template>
-                <template #description>
-                  <span class="text-[#999]">{{ t('wechatAttestation1') }}</span>
-                  <div class="mt-[20px] mb-[40px] h-[32px]">
-                    <el-button
-                      type="primary"
-                      @click="linkEvent('https://mp.weixin.qq.com/')"
-                      >{{ t('clickAccess') }}</el-button
-                    >
-                  </div>
-                </template>
-              </el-step>
-
-              <el-step>
-                <template #title>
-                  <p class="text-[14px] font-[700]">
-                    {{ t('wechatSetting') }}
-                  </p>
-                </template>
-                <template #description>
-                  <span class="text-[#999]">{{ t('wechatSetting1') }}</span>
-                  <div class="mt-[20px] mb-[40px] h-[32px]">
-                    <el-button
-                      type="primary"
-                      @click="router.push('/channel/wechat/config')"
-                      >{{ t('clickSetting') }}</el-button
-                    >
-                  </div>
-                </template>
-              </el-step>
-
-              <el-step>
-                <template #title>
-                  <p class="text-[14px] font-[700]">
-                    {{ t('wechatAccess') }}
-                  </p>
-                </template>
-                <template #description>
-                  <span class="text-[#999]">{{ t('wechatAccess') }}</span>
-                  <div class="mt-[20px] mb-[40px] h-[32px]">
-                    <el-button
-                      type="primary"
-                      plain
-                      @click="router.push('/channel/wechat/course')"
-                      >{{ t('releaseCourse') }}</el-button
-                    >
-                  </div>
-                </template>
-              </el-step>
-            </el-steps>
-          </el-col>
-
-          <el-col :span="4">
-            <div class="flex justify-center">
-              <el-image
-                class="w-[180px] h-[180px]"
-                :src="qrcode ? img(qrcode) : ''"
-              >
-                <template #error>
-                  <div
-                    class="w-[100%] h-[100%] flex items-center justify-center bg-[#f5f7fa]"
-                  >
-                    <span>{{ qrcode ? t('fileErr') : t('emptyQrCode') }}</span>
-                  </div>
-                </template>
-              </el-image>
+    <!--微信公众号-->
+    <div class="main-container">
+        <el-card class="card !border-none" shadow="never">
+
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
             </div>
-            <div class="mt-[22px] text-center">
-              <p class="text-[12px]">{{ t('clickAccess2') }}</p>
+
+            <el-tabs v-model="activeName" class="my-[20px]" @tab-change="handleClick">
+                <el-tab-pane :label="t('wechatAccessFlow')" name="/channel/wechat" />
+                <el-tab-pane :label="t('customMenu')" name="/channel/wechat/menu" />
+                <el-tab-pane :label="t('wechatTemplate')" name="/channel/wechat/message" />
+                <el-tab-pane :label="t('reply')" name="/channel/wechat/reply" />
+            </el-tabs>
+
+            <div class="p-[20px]">
+                <h3 class="panel-title !text-sm">{{ t("wechatInlet") }}</h3>
+
+                <el-row>
+                    <el-col :span="20">
+                        <el-steps class="!mt-[10px]" :active="3" direction="vertical">
+                            <el-step>
+                                <template #title>
+                                    <p class="text-[14px] font-[700]">
+                                        {{ t("wechatAttestation") }}
+                                    </p>
+                                </template>
+                                <template #description>
+                                    <span class="text-[#999]">{{ t("wechatAttestation1") }}</span>
+                                    <div class="mt-[20px] mb-[40px] h-[32px]">
+                                        <el-button type="primary" @click="linkEvent('https://mp.weixin.qq.com/')">{{ t("clickAccess") }}</el-button>
+                                    </div>
+                                </template>
+                            </el-step>
+
+                            <el-step>
+                                <template #title>
+                                    <p class="text-[14px] font-[700]">
+                                        {{ t("wechatSetting") }}
+                                    </p>
+                                </template>
+                                <template #description>
+                                    <span class="text-[#999]">{{ t("wechatSetting1") }}</span>
+                                    <div class="mt-[20px] mb-[40px] h-[32px]">
+                                        <el-button type="primary" @click="router.push('/channel/wechat/config')">{{ t("clickSetting") }}</el-button>
+                                    </div>
+                                </template>
+                            </el-step>
+
+                            <el-step>
+                                <template #title>
+                                    <p class="text-[14px] font-[700]">
+                                        {{ t("wechatAccess") }}
+                                    </p>
+                                </template>
+                                <template #description>
+                                    <span class="text-[#999]">{{ t("wechatAccess") }}</span>
+                                    <div class="mt-[20px] mb-[40px] h-[32px]">
+                                        <el-button type="primary" plain @click="router.push('/channel/wechat/course')">{{ t("releaseCourse") }}</el-button>
+                                    </div>
+                                </template>
+                            </el-step>
+                        </el-steps>
+                    </el-col>
+
+                    <el-col :span="4">
+                        <div class="flex justify-center">
+                            <el-image class="w-[180px] h-[180px]" :src="qrcode ? img(qrcode) : ''">
+                                <template #error>
+                                    <div class="w-[100%] h-[100%] flex items-center justify-center bg-[#f5f7fa]">
+                                        <span>{{ qrcode ? t('fileErr') : t('emptyQrCode') }}</span>
+                                    </div>
+                                </template>
+                            </el-image>
+                        </div>
+                        <div class="mt-[22px] text-center">
+                            <p class="text-[12px]">{{ t('clickAccess2') }}</p>
+                        </div>
+                    </el-col>
+                </el-row>
             </div>
-          </el-col>
-        </el-row>
-      </div>
-    </el-card>
-  </div>
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -122,26 +102,27 @@ const wechatConfig = ref({})
 const oplatformConfig = ref({})
 
 const onShowGetWechatConfig = async () => {
-  await getWechatConfig().then(({ data }) => {
-    wechatConfig.value = data
-    qrcode.value = data.qr_code
-  })
+    await getWechatConfig().then(({data}) => {
+        wechatConfig.value = data
+        qrcode.value = data.qr_code
+    })
 }
 
 onMounted(async () => {
-  onShowGetWechatConfig()
+    onShowGetWechatConfig()
 })
 
 onUnmounted(() => {
-  document.removeEventListener('visibilitychange', () => {})
+    document.removeEventListener('visibilitychange', () => {
+    })
 })
 
 const linkEvent = (url: string) => {
-  window.open(url, '_blank')
+    window.open(url, '_blank')
 }
 
 const handleClick = (val: any) => {
-  router.push({ path: activeName.value })
+    router.push({ path: activeName.value })
 }
 </script>
 
diff --git a/admin/src/app/views/channel/wechat/components/menu-form.vue b/admin/src/app/views/channel/wechat/components/menu-form.vue
index 6547bdb9..ed81f7d8 100644
--- a/admin/src/app/views/channel/wechat/components/menu-form.vue
+++ b/admin/src/app/views/channel/wechat/components/menu-form.vue
@@ -1,77 +1,39 @@
 <template>
-  <div class="panel-title">
-    {{ buttonData.sub_button ? t('menuNameInfo') : t('subMenuNameInfo') }}
-  </div>
-
-  <el-form
-    :model="buttonData"
-    label-width="140px"
-    ref="formRef"
-    :rules="formRules"
-    class="page-form mt-[30px]"
-  >
-    <el-form-item :label="t('menuName')" prop="name">
-      <el-input
-        v-model.trim="buttonData.name"
-        :placeholder="t('menuNamePlaceholder')"
-        class="input-width"
-        clearable
-      />
-      <div class="form-tip">
-        {{ buttonData.sub_button ? t('menuNameTips') : t('subMenuNameTips') }}
-      </div>
-    </el-form-item>
-
-    <template v-if="!buttonData.sub_button || !buttonData.sub_button.length">
-      <el-form-item :label="t('messageType')">
-        <el-radio-group v-model="buttonData.type">
-          <el-radio label="view">{{ t('skipWebpage') }}</el-radio>
-          <el-radio label="miniprogram">{{ t('skipWeapp') }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-
-      <el-form-item :label="t('webpageUrl')" prop="url">
-        <el-input
-          v-model.trim="buttonData.url"
-          :placeholder="t('webpageUrlPlaceholder')"
-          class="input-width"
-          clearable
-        />
-      </el-form-item>
-
-      <el-form-item
-        :label="t('weappAppid')"
-        prop="appid"
-        v-show="buttonData.type == 'miniprogram'"
-      >
-        <el-input
-          v-model.trim="buttonData.appid"
-          :placeholder="t('weappAppidPlaceholder')"
-          class="input-width"
-          clearable
-        />
-      </el-form-item>
-
-      <el-form-item
-        :label="t('weappPage')"
-        prop="pagepath"
-        v-show="buttonData.type == 'miniprogram'"
-      >
-        <el-input
-          v-model.trim="buttonData.pagepath"
-          :placeholder="t('weappPagePlaceholder')"
-          class="input-width"
-          clearable
-        />
-      </el-form-item>
-    </template>
-
-    <div class="mt-[40px]">
-      <el-button type="primary" link @click="deleteButton">{{
-        t('deleteMemu')
-      }}</el-button>
-    </div>
-  </el-form>
+    <div class="panel-title">{{ buttonData.sub_button ? t('menuNameInfo') : t('subMenuNameInfo') }}</div>
+
+    <el-form :model="buttonData" label-width="140px" ref="formRef" :rules="formRules" class="page-form mt-[30px]">
+
+        <el-form-item :label="t('menuName')" prop="name">
+            <el-input v-model.trim="buttonData.name" :placeholder="t('menuNamePlaceholder')" class="input-width" clearable />
+            <div class="form-tip">{{ buttonData.sub_button ? t('menuNameTips') : t('subMenuNameTips') }}</div>
+        </el-form-item>
+
+        <template v-if="!buttonData.sub_button || !buttonData.sub_button.length">
+            <el-form-item :label="t('messageType')">
+                <el-radio-group v-model="buttonData.type">
+                    <el-radio label="view">{{ t('skipWebpage') }}</el-radio>
+                    <el-radio label="miniprogram">{{ t('skipWeapp') }}</el-radio>
+                </el-radio-group>
+            </el-form-item>
+
+            <el-form-item :label="t('webpageUrl')" prop="url">
+                <el-input v-model.trim="buttonData.url" :placeholder="t('webpageUrlPlaceholder')" class="input-width" clearable />
+            </el-form-item>
+
+            <el-form-item :label="t('weappAppid')" prop="appid" v-show="buttonData.type == 'miniprogram'">
+                <el-input v-model.trim="buttonData.appid" :placeholder="t('weappAppidPlaceholder')" class="input-width" clearable />
+            </el-form-item>
+
+            <el-form-item :label="t('weappPage')" prop="pagepath" v-show="buttonData.type == 'miniprogram'">
+                <el-input v-model.trim="buttonData.pagepath" :placeholder="t('weappPagePlaceholder')" class="input-width" clearable />
+            </el-form-item>
+
+        </template>
+
+        <div class="mt-[40px]">
+            <el-button type="primary" link @click="deleteButton">{{ t('deleteMemu') }}</el-button>
+        </div>
+    </el-form>
 </template>
 
 <script lang="ts" setup>
@@ -80,112 +42,90 @@ import { t } from '@/lang'
 import { strByteLength, isUrl } from '@/utils/common'
 
 const prop = defineProps({
-  data: {
-    type: Object,
-    default: () => {},
-  },
-  index: {
-    type: Number,
-    default: 0,
-  },
-  subIndex: {
-    type: Number,
-    default: -1,
-  },
+    data: {
+        type: Object,
+        default: () => { }
+    },
+    index: {
+        type: Number,
+        default: 0
+    },
+    subIndex: {
+        type: Number,
+        default: -1
+    }
 })
 
 const formRef = ref()
 
 const buttonData = computed({
-  get() {
-    return prop.data
-  },
-  set(value) {},
+    get () {
+        return prop.data
+    },
+    set (value) {
+
+    }
 })
 
 /**
  * 验证规则
  */
 const formRules = computed(() => {
-  return {
-    name: [
-      { required: true, message: t('menuNamePlaceholder'), trigger: 'blur' },
-      {
-        validator: (rule: any, value: string, callback: any) => {
-          if (buttonData.value.sub_button && strByteLength(value) > 8)
-            callback(new Error(t('menuNameTips')))
-          else if (!buttonData.value.sub_button && strByteLength(value) > 16)
-            callback(new Error(t('subMenuNameTips')))
-          else callback()
-        },
-        trigger: ['blur', 'change'],
-      },
-    ],
-    url: [
-      {
-        required:
-          !buttonData.value.sub_button || !buttonData.value.sub_button.length,
-        message: t('webpageUrlPlaceholder'),
-        trigger: 'blur',
-      },
-      {
-        validator: (rule: any, value: string, callback: any) => {
-          if (
-            !buttonData.value.sub_button ||
-            !buttonData.value.sub_button.length
-          ) {
-            if (!isUrl(value)) {
-              callback(new Error(t('menuUrlErrorTips')))
-            } else {
-              callback()
+    return {
+        name: [
+            { required: true, message: t('menuNamePlaceholder'), trigger: 'blur' },
+            {
+                validator: (rule: any, value: string, callback: any) => {
+                    if (buttonData.value.sub_button && strByteLength(value) > 8) callback(new Error(t('menuNameTips')))
+                    else if (!buttonData.value.sub_button && strByteLength(value) > 16) callback(new Error(t('subMenuNameTips')))
+                    else callback()
+                },
+                trigger: ['blur', 'change']
+            }
+        ],
+        url: [
+            { required: !buttonData.value.sub_button || !buttonData.value.sub_button.length, message: t('webpageUrlPlaceholder'), trigger: 'blur' },
+            {
+                validator: (rule: any, value: string, callback: any) => {
+                    if (!buttonData.value.sub_button || !buttonData.value.sub_button.length) {
+                        if (!isUrl(value)) {
+                            callback(new Error(t('menuUrlErrorTips')))
+                        } else {
+                            callback()
+                        }
+                    } else {
+                        callback()
+                    }
+                }
             }
-          } else {
-            callback()
-          }
-        },
-      },
-    ],
-    appid: [
-      {
-        required:
-          (!buttonData.value.sub_button ||
-            !buttonData.value.sub_button.length) &&
-          buttonData.value.type == 'miniprogram',
-        message: t('weappAppidPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    pagepath: [
-      {
-        required:
-          (!buttonData.value.sub_button ||
-            !buttonData.value.sub_button.length) &&
-          buttonData.value.type == 'miniprogram',
-        message: t('weappPagePlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-  }
+        ],
+        appid: [
+            { required: ((!buttonData.value.sub_button || !buttonData.value.sub_button.length) && buttonData.value.type == 'miniprogram'), message: t('weappAppidPlaceholder'), trigger: 'blur' }
+        ],
+        pagepath: [
+            { required: ((!buttonData.value.sub_button || !buttonData.value.sub_button.length) && buttonData.value.type == 'miniprogram'), message: t('weappPagePlaceholder'), trigger: 'blur' }
+        ]
+    }
 })
 
 const emit = defineEmits(['delete'])
 
 const deleteButton = () => {
-  emit('delete')
+    emit('delete')
 }
 
 const validate = async () => {
-  let validate = false
-  await formRef.value.validate(async (valid: boolean) => {
-    validate = valid
-  })
-  return validate
+    let validate = false
+    await formRef.value.validate(async (valid: boolean) => {
+        validate = valid
+    })
+    return validate
 }
 
 defineExpose({
-  validate,
-  index: prop.index,
-  subIndex: prop.subIndex,
+    validate,
+    index: prop.index,
+    subIndex: prop.subIndex
 })
 </script>
 
diff --git a/admin/src/app/views/channel/wechat/components/news-card.vue b/admin/src/app/views/channel/wechat/components/news-card.vue
index ed4dac37..ec704a78 100644
--- a/admin/src/app/views/channel/wechat/components/news-card.vue
+++ b/admin/src/app/views/channel/wechat/components/news-card.vue
@@ -1,79 +1,59 @@
 <template>
-  <div
-    class="attachment-item text-sm mr-[10px] mb-[10px] w-[280px] rounded-lg overflow-hidden border border-color"
-    v-if="data"
-  >
-    <div class="relative" @mouseover="hover = true" @mouseout="hover = false">
-      <div class="w-full h-[130px] relative">
-        <el-image
-          :src="data.value.news_item[0].thumb_url"
-          class="w-full h-full"
-        />
-        <div
-          class="absolute left-0 bottom-0 p-[10px] w-full truncate text-white leading-none"
-          v-if="data.value.news_item.length > 1"
-        >
-          {{ data.value.news_item[0].title }}
-        </div>
-      </div>
-      <div v-if="data.value.news_item.length > 1">
-        <template v-for="(newsItem, newsIndex) in data.value.news_item">
-          <div
-            class="px-[15px] py-[10px] flex"
-            :class="{
-              'border-b border-color':
-                newsIndex < data.value.news_item.length - 1,
-            }"
-            v-if="newsIndex > 0"
-          >
-            <div class="flex-1 w-0 truncate">
-              {{ newsItem.title }}
+    <div class="attachment-item text-sm mr-[10px] mb-[10px] w-[280px] rounded-lg overflow-hidden border border-color" v-if="data">
+        <div class="relative" @mouseover="hover = true" @mouseout="hover = false">
+            <div class="w-full h-[130px] relative">
+                <el-image :src="data.value.news_item[0].thumb_url" class="w-full h-full"/>
+                <div class="absolute left-0 bottom-0 p-[10px] w-full truncate text-white leading-none" v-if="data.value.news_item.length > 1">
+                    {{ data.value.news_item[0].title }}
+                </div>
+            </div>
+            <div v-if="data.value.news_item.length > 1">
+                <template v-for="(newsItem, newsIndex) in data.value.news_item">
+                    <div class="px-[15px] py-[10px] flex" :class="{'border-b border-color' : newsIndex < data.value.news_item.length - 1 }" v-if="newsIndex > 0">
+                        <div class="flex-1 w-0 truncate">
+                            {{ newsItem.title }}
+                        </div>
+                        <div class="w-[50px] h-[50px] ml-[10px]">
+                            <el-image :src="newsItem.thumb_url" class="w-full h-full"/>
+                        </div>
+                    </div>
+                </template>
+            </div>
+            <div class="px-[15px] py-[10px]" v-else>
+                {{ data.value.news_item[0].title }}
             </div>
-            <div class="w-[50px] h-[50px] ml-[10px]">
-              <el-image :src="newsItem.thumb_url" class="w-full h-full" />
+            <div class="absolute z-[1] flex items-center justify-center w-full h-full inset-0 bg-black bg-opacity-60 cursor-pointer" @click="data = null" v-show="hover && props.mode == 'select'">
+                <icon name="element Delete" color="#fff" size="40px" />
             </div>
-          </div>
-        </template>
-      </div>
-      <div class="px-[15px] py-[10px]" v-else>
-        {{ data.value.news_item[0].title }}
-      </div>
-      <div
-        class="absolute z-[1] flex items-center justify-center w-full h-full inset-0 bg-black bg-opacity-60 cursor-pointer"
-        @click="data = null"
-        v-show="hover && props.mode == 'select'"
-      >
-        <icon name="element Delete" color="#fff" size="40px" />
-      </div>
+        </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
 import { computed, ref } from 'vue'
 
 const props = defineProps({
-  modelValue: {
-    type: Object,
-    default: () => {
-      return {}
+    modelValue: {
+        type: Object,
+        default: () => {
+            return {}
+        }
     },
-  },
-  mode: {
-    type: String,
-    default: 'select',
-  },
+    mode: {
+        type: String,
+        default: 'select'
+    }
 })
 const emit = defineEmits(['update:modelValue'])
 
 const hover = ref(false)
 const data = computed({
-  get() {
-    return props.modelValue
-  },
-  set(value) {
-    emit('update:modelValue', value)
-  },
+    get () {
+        return props.modelValue
+    },
+    set (value) {
+        emit('update:modelValue', value)
+    }
 })
 
 const meta = document.createElement('meta')
diff --git a/admin/src/app/views/channel/wechat/components/reply-form.vue b/admin/src/app/views/channel/wechat/components/reply-form.vue
index 8b3acc62..128e80a6 100644
--- a/admin/src/app/views/channel/wechat/components/reply-form.vue
+++ b/admin/src/app/views/channel/wechat/components/reply-form.vue
@@ -1,262 +1,124 @@
 <template>
-  <div class="border border-br-light rounded">
-    <div
-      class="py-[10px] px-[30px] flex text-sm border-0 border-b border-br-light text-tx-regular"
-    >
-      <div
-        class="pr-[25px] cursor-pointer flex items-center"
-        :class="{ 'text-primary': formData.msgtype == 'text' }"
-        @click="switchMsgType('text')"
-      >
-        <icon name="iconfont iconxingzhuang-wenzi" size="18" class="mr-[5px]" />
-        文本
-      </div>
-      <div
-        class="pr-[25px] cursor-pointer flex items-center"
-        :class="{ 'text-primary': formData.msgtype == 'image' }"
-        @click="switchMsgType('image')"
-      >
-        <icon name="iconfont icontupian" size="18px" class="mr-[5px]" />
-        图片
-      </div>
-      <div
-        class="pr-[25px] cursor-pointer flex items-center"
-        :class="{ 'text-primary': formData.msgtype == 'video' }"
-        @click="switchMsgType('video')"
-      >
-        <icon name="iconfont iconshipin1" size="18" class="mr-[5px]" />
-        视频
-      </div>
-      <div
-        class="pr-[25px] cursor-pointer flex items-center"
-        :class="{ 'text-primary': formData.msgtype == 'mpnewsarticle' }"
-        @click="switchMsgType('mpnewsarticle')"
-      >
-        <icon name="iconfont icontuwendaohang2" size="13px" class="mr-[5px]" />
-        图文
-      </div>
-      <div
-        class="pr-[25px] cursor-pointer flex items-center"
-        :class="{ 'text-primary': formData.msgtype == 'miniprogrampage' }"
-        @click="switchMsgType('miniprogrampage')"
-      >
-        <icon name="iconfont iconxiaochengxu" size="14px" class="mr-[5px]" />
-        小程序卡片
-      </div>
-    </div>
-    <div class="py-[20px] px-[30px] h-[350px]">
-      <div v-if="formData.msgtype == 'text'">
-        <el-input
-          v-model.trim="formData.text.content"
-          :rows="5"
-          type="textarea"
-          placeholder=""
-          maxlength="600"
-          :show-word-limit="true"
-          resize="none"
-          input-style="box-shadow: none;height:300px"
-        />
-      </div>
-      <div
-        v-if="formData.msgtype == 'image'"
-        class="flex w-full h-full justify-center items-center image-media"
-      >
-        <div class="w-full h-full" v-if="formData.image.url">
-          <upload-image
-            :limit="1"
-            width="150px"
-            height="150px"
-            v-model="formData.image.url"
-          />
+    <div class="border border-br-light rounded">
+        <div class="py-[10px] px-[30px] flex text-sm border-0 border-b border-br-light text-tx-regular">
+            <div class="pr-[25px] cursor-pointer flex items-center" :class="{'text-primary': formData.msgtype == 'text'}" @click="switchMsgType('text')">
+                <icon name="iconfont iconxingzhuang-wenzi" size="18" class="mr-[5px]"/>
+                文本
+            </div>
+            <div class="pr-[25px] cursor-pointer flex items-center" :class="{'text-primary': formData.msgtype == 'image'}" @click="switchMsgType('image')">
+                <icon name="iconfont icontupian" size="18px" class="mr-[5px]"/>
+                图片
+            </div>
+            <div class="pr-[25px] cursor-pointer flex items-center" :class="{'text-primary': formData.msgtype == 'video'}" @click="switchMsgType('video')">
+                <icon name="iconfont iconshipin1" size="18" class="mr-[5px]"/>
+                视频
+            </div>
+            <div class="pr-[25px] cursor-pointer flex items-center" :class="{'text-primary': formData.msgtype == 'mpnewsarticle'}" @click="switchMsgType('mpnewsarticle')">
+                <icon name="iconfont icontuwendaohang2" size="13px" class="mr-[5px]"/>
+                图文
+            </div>
+            <div class="pr-[25px] cursor-pointer flex items-center" :class="{'text-primary': formData.msgtype == 'miniprogrampage'}" @click="switchMsgType('miniprogrampage')">
+                <icon name="iconfont iconxiaochengxu" size="14px" class="mr-[5px]"/>
+                小程序卡片
+            </div>
         </div>
-        <div
-          v-else
-          class="flex w-full h-full justify-center items-center image-media"
-        >
-          <div
-            class="flex flex-1 h-full border border-br-light cursor-pointer select-media"
-          >
-            <select-wechat-media type="image" @success="setImageMedia">
-              <div class="flex items-center justify-center flex-col">
-                <icon
-                  name="element Plus"
-                  size="20px"
-                  color="var(--el-text-color-secondary)"
+        <div class="py-[20px] px-[30px] h-[350px]">
+            <div v-if="formData.msgtype == 'text'">
+                <el-input
+                    v-model.trim="formData.text.content" :rows="5" type="textarea" placeholder="" maxlength="600" :show-word-limit="true"
+                    resize="none"
+                    input-style="box-shadow: none;height:300px"
                 />
-                <div class="leading-none text-xs mt-[10px] text-secondary">
-                  从素材库选择
+            </div>
+            <div v-if="formData.msgtype == 'image'" class="flex w-full h-full justify-center items-center image-media">
+                <div class="w-full h-full" v-if="formData.image.url">
+                    <upload-image :limit="1" width="150px" height="150px" v-model="formData.image.url"/>
                 </div>
-              </div>
-            </select-wechat-media>
-          </div>
-          <div
-            class="flex flex-1 h-full ml-[20px] border border-br-light cursor-pointer"
-          >
-            <upload-media
-              type="image"
-              class="w-full h-full flex items-center justify-center"
-              @success="setImageMedia"
-            >
-              <div class="flex items-center justify-center flex-col">
-                <icon
-                  name="element Plus"
-                  size="20px"
-                  color="var(--el-text-color-secondary)"
-                />
-                <div class="leading-none text-xs mt-[10px] text-secondary">
-                  上传图片
+                <div v-else class="flex w-full h-full justify-center items-center image-media">
+                    <div class="flex flex-1 h-full border border-br-light cursor-pointer select-media">
+                        <select-wechat-media type="image" @success="setImageMedia">
+                            <div class="flex items-center justify-center flex-col">
+                                <icon name="element Plus" size="20px" color="var(--el-text-color-secondary)" />
+                                <div class="leading-none text-xs mt-[10px] text-secondary">从素材库选择</div>
+                            </div>
+                        </select-wechat-media>
+                    </div>
+                    <div class="flex flex-1 h-full ml-[20px] border border-br-light cursor-pointer">
+                        <upload-media type="image" class="w-full h-full flex items-center justify-center" @success="setImageMedia">
+                            <div class="flex items-center justify-center flex-col">
+                                <icon name="element Plus" size="20px" color="var(--el-text-color-secondary)" />
+                                <div class="leading-none text-xs mt-[10px] text-secondary">上传图片</div>
+                            </div>
+                        </upload-media>
+                    </div>
                 </div>
-              </div>
-            </upload-media>
-          </div>
-        </div>
-      </div>
-      <div
-        v-if="formData.msgtype == 'video'"
-        class="flex w-full h-full justify-center items-center video-media"
-      >
-        <div class="w-full h-full" v-if="formData.video.url">
-          <upload-video
-            :limit="1"
-            width="150px"
-            height="150px"
-            v-model="formData.video.url"
-          />
-        </div>
-        <div
-          v-else
-          class="flex w-full h-full justify-center items-center video-media"
-        >
-          <div
-            class="flex flex-1 h-full border border-br-light cursor-pointer select-media"
-          >
-            <select-wechat-media type="video" @success="setVideoMedia">
-              <div class="flex items-center justify-center flex-col">
-                <icon
-                  name="element Plus"
-                  size="20px"
-                  color="var(--el-text-color-secondary)"
-                />
-                <div class="leading-none text-xs mt-[10px] text-secondary">
-                  从素材库选择
+            </div>
+            <div v-if="formData.msgtype == 'video'" class="flex w-full h-full justify-center items-center video-media">
+                <div class="w-full h-full" v-if="formData.video.url">
+                    <upload-video :limit="1" width="150px" height="150px" v-model="formData.video.url"/>
                 </div>
-              </div>
-            </select-wechat-media>
-          </div>
-          <div
-            class="flex flex-1 h-full ml-[20px] border border-br-light cursor-pointer"
-          >
-            <upload-media
-              type="video"
-              class="w-full h-full flex items-center justify-center"
-              @success="setVideoMedia"
-            >
-              <div class="flex items-center justify-center flex-col">
-                <icon
-                  name="element Plus"
-                  size="20px"
-                  color="var(--el-text-color-secondary)"
-                />
-                <div class="leading-none text-xs mt-[10px] text-secondary">
-                  上传视频
+                <div v-else class="flex w-full h-full justify-center items-center video-media">
+                    <div class="flex flex-1 h-full border border-br-light cursor-pointer select-media">
+                        <select-wechat-media type="video" @success="setVideoMedia">
+                            <div class="flex items-center justify-center flex-col">
+                                <icon name="element Plus" size="20px" color="var(--el-text-color-secondary)" />
+                                <div class="leading-none text-xs mt-[10px] text-secondary">从素材库选择</div>
+                            </div>
+                        </select-wechat-media>
+                    </div>
+                    <div class="flex flex-1 h-full ml-[20px] border border-br-light cursor-pointer">
+                        <upload-media type="video" class="w-full h-full flex items-center justify-center" @success="setVideoMedia">
+                            <div class="flex items-center justify-center flex-col">
+                                <icon name="element Plus" size="20px" color="var(--el-text-color-secondary)" />
+                                <div class="leading-none text-xs mt-[10px] text-secondary">上传视频</div>
+                            </div>
+                        </upload-media>
+                    </div>
                 </div>
-              </div>
-            </upload-media>
-          </div>
-        </div>
-      </div>
-      <div
-        v-if="formData.msgtype == 'mpnewsarticle'"
-        class="flex w-full h-full justify-center items-center image-media"
-      >
-        <div class="w-full h-full" v-if="formData.mpnewsarticle">
-          <news-card v-model="formData.mpnewsarticle" />
-        </div>
-        <div
-          v-else
-          class="flex w-full h-full justify-center items-center image-media"
-        >
-          <div
-            class="flex flex-1 h-full border border-br-light cursor-pointer select-media"
-          >
-            <select-wechat-media type="news" @success="setNewsMedia">
-              <div class="flex items-center justify-center flex-col">
-                <icon
-                  name="element Plus"
-                  size="20px"
-                  color="var(--el-text-color-secondary)"
-                />
-                <div class="leading-none text-xs mt-[10px] text-secondary">
-                  从素材库选择
+            </div>
+            <div v-if="formData.msgtype == 'mpnewsarticle'" class="flex w-full h-full justify-center items-center image-media">
+                <div class="w-full h-full" v-if="formData.mpnewsarticle">
+                    <news-card v-model="formData.mpnewsarticle"/>
                 </div>
-              </div>
-            </select-wechat-media>
-          </div>
-        </div>
-      </div>
-      <div v-if="formData.msgtype == 'miniprogrampage'">
-        <el-form
-          :model="formData.miniprogrampage"
-          label-width="140px"
-          class="page-form"
-          ref="formRef"
-          :rules="formRules"
-        >
-          <el-form-item label="小程序APPID" prop="appid">
-            <el-input
-              v-model.trim="formData.miniprogrampage.appid"
-              class="input-width"
-            />
-            <div class="form-tip">小程序需已经与公众号关联</div>
-          </el-form-item>
-          <el-form-item label="小程序卡片标题" prop="title">
-            <el-input
-              v-model.trim="formData.miniprogrampage.title"
-              class="input-width"
-            />
-          </el-form-item>
-          <el-form-item label="小程序的页面路径" prop="pagepath">
-            <el-input
-              v-model.trim="formData.miniprogrampage.pagepath"
-              class="input-width"
-            />
-          </el-form-item>
-          <el-form-item label="小程序卡片图片" prop="thumb_media_url">
-            <upload-image
-              :limit="1"
-              width="100px"
-              height="100px"
-              v-model="formData.miniprogrampage.thumb_media_url"
-              v-if="formData.miniprogrampage.thumb_media_url"
-            />
-            <select-wechat-media
-              type="image"
-              @success="setWeappImageMedia"
-              v-else
-            >
-              <div
-                class="rounded cursor-pointer overflow-hidden relative border border-solid border-color image-wrap mr-[10px] w-[100px] h-[100px]"
-              >
-                <div
-                  class="w-full h-full flex items-center justify-center flex-col content-wrap"
-                >
-                  <icon
-                    name="element Plus"
-                    size="20px"
-                    color="var(--el-text-color-secondary)"
-                  />
-                  <div class="leading-none text-xs mt-[10px] text-secondary">
-                    {{ t('upload.root') }}
-                  </div>
+                <div v-else class="flex w-full h-full justify-center items-center image-media">
+                    <div class="flex flex-1 h-full border border-br-light cursor-pointer select-media">
+                        <select-wechat-media type="news" @success="setNewsMedia">
+                            <div class="flex items-center justify-center flex-col">
+                                <icon name="element Plus" size="20px" color="var(--el-text-color-secondary)" />
+                                <div class="leading-none text-xs mt-[10px] text-secondary">从素材库选择</div>
+                            </div>
+                        </select-wechat-media>
+                    </div>
                 </div>
-              </div>
-            </select-wechat-media>
-            <div class="form-tip">小程序卡片图片建议大小为520*416</div>
-          </el-form-item>
-        </el-form>
-      </div>
+            </div>
+            <div v-if="formData.msgtype == 'miniprogrampage'">
+                <el-form :model="formData.miniprogrampage" label-width="140px" class="page-form" ref="formRef" :rules="formRules">
+                    <el-form-item label="小程序APPID" prop="appid">
+                        <el-input v-model.trim="formData.miniprogrampage.appid" class="input-width"/>
+                        <div class="form-tip">小程序需已经与公众号关联</div>
+                    </el-form-item>
+                    <el-form-item label="小程序卡片标题" prop="title">
+                        <el-input v-model.trim="formData.miniprogrampage.title" class="input-width"/>
+                    </el-form-item>
+                    <el-form-item label="小程序的页面路径" prop="pagepath">
+                        <el-input v-model.trim="formData.miniprogrampage.pagepath" class="input-width"/>
+                    </el-form-item>
+                    <el-form-item label="小程序卡片图片" prop="thumb_media_url">
+                        <upload-image :limit="1" width="100px" height="100px" v-model="formData.miniprogrampage.thumb_media_url" v-if="formData.miniprogrampage.thumb_media_url"/>
+                        <select-wechat-media type="image" @success="setWeappImageMedia" v-else>
+                            <div class="rounded cursor-pointer overflow-hidden relative border border-solid border-color image-wrap mr-[10px] w-[100px] h-[100px]">
+                                <div class="w-full h-full flex items-center justify-center flex-col content-wrap">
+                                    <icon name="element Plus" size="20px" color="var(--el-text-color-secondary)" />
+                                    <div class="leading-none text-xs mt-[10px] text-secondary">{{ t('upload.root') }}</div>
+                                </div>
+                            </div>
+                        </select-wechat-media>
+                        <div class="form-tip">小程序卡片图片建议大小为520*416</div>
+                    </el-form-item>
+                </el-form>
+            </div>
+        </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
@@ -269,163 +131,159 @@ import { ElMessage, FormInstance, FormRules } from 'element-plus'
 import NewsCard from '@/app/views/channel/wechat/components/news-card.vue'
 
 const props = defineProps({
-  modelValue: {
-    type: Object,
-    default: () => {
-      return {}
-    },
-  },
+    modelValue: {
+        type: Object,
+        default: () => {
+            return {}
+        }
+    }
 })
 const emit = defineEmits(['update:modelValue'])
 
 const formData = ref({
-  msgtype: 'text',
-  text: {
-    content: '',
-  },
-  image: {
-    media_id: '',
-    url: '',
-  },
-  video: {
-    media_id: '',
-    url: '',
-  },
-  miniprogrampage: {
-    appid: '',
-    title: '',
-    pagepath: '',
-    thumb_media_url: '',
-    thumb_media_id: '',
-  },
-  mpnewsarticle: null,
+    msgtype: 'text',
+    text: {
+        content: ''
+    },
+    image: {
+        media_id: '',
+        url: ''
+    },
+    video: {
+        media_id: '',
+        url: ''
+    },
+    miniprogrampage: {
+        appid: '',
+        title: '',
+        pagepath: '',
+        thumb_media_url: '',
+        thumb_media_id: ''
+    },
+    mpnewsarticle: null
 })
 
 const value = computed({
-  get() {
-    return props.modelValue
-  },
-  set(value) {
-    emit('update:modelValue', value)
-  },
+    get () {
+        return props.modelValue
+    },
+    set (value) {
+        emit('update:modelValue', value)
+    }
 })
 
-watch(
-  () => value.value,
-  (nval, oval) => {
+watch(() => value.value, (nval, oval) => {
     if ((!oval || !Object.keys(oval).length) && Object.keys(nval).length) {
-      formData.value = value.value
+        formData.value = value.value
     }
-  },
-  { immediate: true }
-)
+}, { immediate: true })
 
-watch(
-  () => formData.value,
-  () => {
+watch(() => formData.value, () => {
     value.value = formData.value
-  },
-  { deep: true }
-)
+}, { deep: true })
 
 const switchMsgType = (type: string) => {
-  formData.value.msgtype = type
+    formData.value.msgtype = type
 }
 
 const setImageMedia = (data: any) => {
-  formData.value.image.media_id = data.media_id
-  formData.value.image.url = data.value
+    formData.value.image.media_id = data.media_id
+    formData.value.image.url = data.value
 }
 
 const setVideoMedia = (data: any) => {
-  formData.value.video.media_id = data.media_id
-  formData.value.video.url = data.value
+    formData.value.video.media_id = data.media_id
+    formData.value.video.url = data.value
 }
 
 const setWeappImageMedia = (data: any) => {
-  formData.value.miniprogrampage.thumb_media_id = data.media_id
-  formData.value.miniprogrampage.thumb_media_url = data.value
+    formData.value.miniprogrampage.thumb_media_id = data.media_id
+    formData.value.miniprogrampage.thumb_media_url = data.value
 }
 
 const setNewsMedia = (data: any) => {
-  formData.value.mpnewsarticle = {
-    article_id: data.media_id,
-    value: data.value,
-  }
+    formData.value.mpnewsarticle = {
+        article_id: data.media_id,
+        value: data.value
+    }
 }
 
 const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = reactive<FormRules>({
-  appid: [{ required: true, message: '请填写小程序appid', trigger: 'blur' }],
-  title: [{ required: true, message: '请填写小程序卡片标题', trigger: 'blur' }],
-  pagepath: [
-    { required: true, message: '请填写小程序卡片跳转页面', trigger: 'blur' },
-  ],
-  thumb_media_url: [
-    { required: true, message: '请上传小程序卡片封面', trigger: 'blur' },
-  ],
+    appid: [
+        { required: true, message: '请填写小程序appid', trigger: 'blur' }
+    ],
+    title: [
+        { required: true, message: '请填写小程序卡片标题', trigger: 'blur' }
+    ],
+    pagepath: [
+        { required: true, message: '请填写小程序卡片跳转页面', trigger: 'blur' }
+    ],
+    thumb_media_url: [
+        { required: true, message: '请上传小程序卡片封面', trigger: 'blur' }
+    ]
 })
 
 /**
  * 验证数据
  */
 const verify = async () => {
-  let verify = true
-  switch (formData.value.msgtype) {
-    case 'text':
-      if (Test.empty(formData.value.text.content)) {
-        ElMessage({ message: '请输入回复内容', type: 'warning' })
-        verify = false
-      }
-      break
-    case 'image':
-      if (Test.empty(formData.value.image.url)) {
-        ElMessage({ message: '请上传回复图片', type: 'warning' })
-        verify = false
-      }
-      break
-    case 'video':
-      if (Test.empty(formData.value.video.url)) {
-        ElMessage({ message: '请上传回复视频', type: 'warning' })
-        verify = false
-      }
-      break
-    case 'miniprogrampage':
-      await formRef.value.validate(async (valid) => {
-        verify = valid
-      })
-      break
-    case 'mpnewsarticle':
-      if (Test.empty(formData.value.mpnewsarticle)) {
-        ElMessage({ message: '请选择图文', type: 'warning' })
-        verify = false
-      }
-      break
-  }
-  return verify
+    let verify = true
+    switch (formData.value.msgtype) {
+        case 'text':
+            if (Test.empty(formData.value.text.content)) {
+                ElMessage({ message: '请输入回复内容', type: 'warning' })
+                verify = false
+            }
+            break
+        case 'image':
+            if (Test.empty(formData.value.image.url)) {
+                ElMessage({ message: '请上传回复图片', type: 'warning' })
+                verify = false
+            }
+            break
+        case 'video':
+            if (Test.empty(formData.value.video.url)) {
+                ElMessage({ message: '请上传回复视频', type: 'warning' })
+                verify = false
+            }
+            break
+        case 'miniprogrampage':
+            await formRef.value.validate(async (valid) => {
+                verify = valid
+            })
+            break
+        case 'mpnewsarticle':
+            if (Test.empty(formData.value.mpnewsarticle)) {
+                ElMessage({ message: '请选择图文', type: 'warning' })
+                verify = false
+            }
+            break
+    }
+    return verify
 }
 
 defineExpose({
-  verify,
+    verify
 })
 </script>
 
 <style lang="scss" scoped>
 :deep(.image-media, .video-media) {
-  .el-upload {
-    width: 100%;
-    height: 100%;
-  }
+    .el-upload {
+        width: 100%;
+        height: 100%;
+    }
 }
 :deep(.select-media) {
-  & > div {
-    width: 100%;
-    height: 100%;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-  }
+    & > div {
+        width: 100%;
+        height: 100%;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+    }
 }
 </style>
diff --git a/admin/src/app/views/channel/wechat/components/select-wechat-media.vue b/admin/src/app/views/channel/wechat/components/select-wechat-media.vue
index 22b190dd..343aa83e 100644
--- a/admin/src/app/views/channel/wechat/components/select-wechat-media.vue
+++ b/admin/src/app/views/channel/wechat/components/select-wechat-media.vue
@@ -1,289 +1,212 @@
 <template>
-  <div @click="openDialog">
-    <slot></slot>
-  </div>
-  <el-dialog
-    v-model="showDialog"
-    :title="t('upload.select' + type)"
-    width="60%"
-    class="attachment-dialog"
-    :destroy-on-close="true"
-  >
-    <div class="flex border-t border-b main-wrap border-color w-full h-[40vh]">
-      <!-- 素材 -->
-      <div
-        class="attachment-list-wrap flex flex-col p-[15px] flex-1 overflow-hidden"
-      >
-        <el-row :gutter="15" class="h-[32px]">
-          <el-col :span="10">
-            <div class="flex" v-if="prop.type != 'news'">
-              <upload-media :type="prop.type" @success="getAttachmentList()">
-                <el-button type="primary">{{
-                  t('upload.upload' + type)
-                }}</el-button>
-              </upload-media>
-            </div>
-            <div class="flex" v-else>
-              <el-button
-                type="primary"
-                :loading="syncLoading"
-                @click="syncWechatNews"
-                >{{ syncLoading ? '同步中' : '同步微信图文' }}</el-button
-              >
-            </div>
-          </el-col>
-        </el-row>
-        <div class="flex-1 my-[15px] h-0" v-loading="attachment.loading">
-          <el-scrollbar>
-            <!-- 素材管理 -->
-            <div v-if="attachment.data.length">
-              <div class="flex flex-wrap" v-if="prop.type != 'news'">
-                <div
-                  class="attachment-item mr-[10px] mb-[10px] w-[120px]"
-                  v-for="(item, index) in attachment.data"
-                  :key="index"
-                  @click="selectedFile = item"
-                >
-                  <div
-                    class="attachment-wrap w-full rounded cursor-pointer overflow-hidden relative flex items-center justify-center h-[120px]"
-                  >
-                    <el-image
-                      :src="img(item.value)"
-                      fit="contain"
-                      v-if="type == 'image'"
-                      :preview-src-list="item.image_list"
-                    />
-                    <video
-                      :src="img(item.value)"
-                      v-else-if="type == 'video'"
-                    ></video>
-                    <div
-                      class="absolute z-[1] flex items-center justify-center w-full h-full inset-0 bg-black bg-opacity-60"
-                      v-show="selectedFile.id == item.id"
-                    >
-                      <icon name="element Select" color="#fff" size="40px" />
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div class="relative" ref="waterfallContainerRef" v-else>
-                <div
-                  ref="waterfallItemRef"
-                  class="absolute attachment-item mr-[10px] mb-[10px] w-[280px] rounded-lg overflow-hidden border border-color"
-                  v-for="(item, index) in attachment.data"
-                  :style="{
-                    left: listPosition[index] ? listPosition[index].left : '',
-                    top: listPosition[index] ? listPosition[index].top : '',
-                  }"
-                  :key="index"
-                  @click="selectedFile = item"
-                >
-                  <div class="relative">
-                    <div class="w-full h-[130px] relative">
-                      <el-image
-                        :src="item.value.news_item[0].thumb_url"
-                        class="w-full h-full"
-                      />
-                      <div
-                        class="absolute left-0 bottom-0 p-[10px] w-full truncate text-white leading-none"
-                        v-if="item.value.news_item.length > 1"
-                      >
-                        {{ item.value.news_item[0].title }}
-                      </div>
-                    </div>
-                    <div v-if="item.value.news_item.length > 1">
-                      <template
-                        v-for="(newsItem, newsIndex) in item.value.news_item"
-                      >
-                        <div
-                          class="px-[15px] py-[10px] flex"
-                          :class="{
-                            'border-b border-color':
-                              newsIndex < item.value.news_item.length - 1,
-                          }"
-                          v-if="newsIndex > 0"
-                        >
-                          <div class="flex-1 w-0 truncate">
-                            {{ newsItem.title }}
-                          </div>
-                          <div class="w-[50px] h-[50px] ml-[10px]">
-                            <el-image
-                              :src="newsItem.thumb_url"
-                              class="w-full h-full"
-                            />
-                          </div>
+    <div @click="openDialog">
+        <slot></slot>
+    </div>
+    <el-dialog v-model="showDialog" :title="t('upload.select' + type)" width="60%" class="attachment-dialog" :destroy-on-close="true">
+        <div class="flex border-t border-b main-wrap border-color w-full h-[40vh]">
+            <!-- 素材 -->
+            <div class="attachment-list-wrap flex flex-col p-[15px] flex-1 overflow-hidden">
+                <el-row :gutter="15" class="h-[32px]">
+                    <el-col :span="10">
+                        <div class="flex" v-if="prop.type != 'news'">
+                            <upload-media :type="prop.type" @success="getAttachmentList()">
+                                <el-button type="primary">{{ t('upload.upload' + type) }}</el-button>
+                            </upload-media>
+                        </div>
+                        <div class="flex" v-else>
+                            <el-button type="primary" :loading="syncLoading" @click="syncWechatNews">{{ syncLoading ? '同步中' : '同步微信图文'}}</el-button>
+                        </div>
+                    </el-col>
+                </el-row>
+                <div class="flex-1 my-[15px] h-0" v-loading="attachment.loading">
+                    <el-scrollbar>
+                        <!-- 素材管理 -->
+                        <div v-if="attachment.data.length">
+                            <div class="flex flex-wrap" v-if="prop.type != 'news'">
+                                <div class="attachment-item mr-[10px] mb-[10px] w-[120px]" v-for="(item, index) in attachment.data" :key="index" @click="selectedFile = item">
+                                    <div class="attachment-wrap w-full rounded cursor-pointer overflow-hidden relative flex items-center justify-center h-[120px]">
+                                        <el-image :src="img(item.value)" fit="contain" v-if="type == 'image'" :preview-src-list="item.image_list" />
+                                        <video :src="img(item.value)" v-else-if="type == 'video'"></video>
+                                        <div class="absolute z-[1] flex items-center justify-center w-full h-full inset-0 bg-black bg-opacity-60" v-show="selectedFile.id == item.id">
+                                            <icon name="element Select" color="#fff" size="40px" />
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="relative" ref="waterfallContainerRef" v-else>
+                                <div ref="waterfallItemRef" class="absolute attachment-item mr-[10px] mb-[10px] w-[280px] rounded-lg overflow-hidden border border-color" v-for="(item, index) in attachment.data"
+                                     :style="{ left: listPosition[index] ? listPosition[index].left : '', top: listPosition[index] ? listPosition[index].top : '' }"
+                                     :key="index" @click="selectedFile = item">
+                                    <div class="relative">
+                                        <div class="w-full h-[130px] relative">
+                                            <el-image :src="item.value.news_item[0].thumb_url" class="w-full h-full"/>
+                                            <div class="absolute left-0 bottom-0 p-[10px] w-full truncate text-white leading-none" v-if="item.value.news_item.length > 1">
+                                                {{ item.value.news_item[0].title }}
+                                            </div>
+                                        </div>
+                                        <div v-if="item.value.news_item.length > 1">
+                                            <template v-for="(newsItem, newsIndex) in item.value.news_item">
+                                                <div class="px-[15px] py-[10px] flex" :class="{'border-b border-color' : newsIndex < item.value.news_item.length - 1 }" v-if="newsIndex > 0">
+                                                    <div class="flex-1 w-0 truncate">
+                                                        {{ newsItem.title }}
+                                                    </div>
+                                                    <div class="w-[50px] h-[50px] ml-[10px]">
+                                                        <el-image :src="newsItem.thumb_url" class="w-full h-full"/>
+                                                    </div>
+                                                </div>
+                                            </template>
+                                        </div>
+                                        <div class="px-[15px] py-[10px]" v-else>
+                                            {{ item.value.news_item[0].title }}
+                                        </div>
+                                        <div class="absolute z-[1] flex items-center justify-center w-full h-full inset-0 bg-black bg-opacity-60" v-show="selectedFile.id == item.id">
+                                            <icon name="element Select" color="#fff" size="40px" />
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="flex items-center justify-center" v-else>
+                            <el-empty v-if="!attachment.loading" :description="t('upload.mediaEmpty')" :image-size="100" />
                         </div>
-                      </template>
-                    </div>
-                    <div class="px-[15px] py-[10px]" v-else>
-                      {{ item.value.news_item[0].title }}
-                    </div>
-                    <div
-                      class="absolute z-[1] flex items-center justify-center w-full h-full inset-0 bg-black bg-opacity-60"
-                      v-show="selectedFile.id == item.id"
-                    >
-                      <icon name="element Select" color="#fff" size="40px" />
-                    </div>
-                  </div>
+                    </el-scrollbar>
                 </div>
-              </div>
-            </div>
-            <div class="flex items-center justify-center" v-else>
-              <el-empty
-                v-if="!attachment.loading"
-                :description="t('upload.mediaEmpty')"
-                :image-size="100"
-              />
+                <el-row :gutter="20">
+                    <el-col span="24">
+                        <div class="flex h-full justify-end items-center">
+                            <el-pagination v-model:current-page="attachment.page" :small="true"
+                                v-model:page-size="attachment.limit" :page-sizes="[10, 20, 30, 40, 60]"
+                                layout="total, sizes, prev, pager, next, jumper" :total="attachment.total"
+                                @size-change="getAttachmentList()" @current-change="getAttachmentList" />
+                        </div>
+                    </el-col>
+                </el-row>
             </div>
-          </el-scrollbar>
         </div>
-        <el-row :gutter="20">
-          <el-col span="24">
-            <div class="flex h-full justify-end items-center">
-              <el-pagination
-                v-model:current-page="attachment.page"
-                :small="true"
-                v-model:page-size="attachment.limit"
-                :page-sizes="[10, 20, 30, 40, 60]"
-                layout="total, sizes, prev, pager, next, jumper"
-                :total="attachment.total"
-                @size-change="getAttachmentList()"
-                @current-change="getAttachmentList"
-              />
-            </div>
-          </el-col>
-        </el-row>
-      </div>
-    </div>
 
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button type="primary" @click="confirm">{{
-          t('confirm')
-        }}</el-button>
-      </span>
-    </template>
-  </el-dialog>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" @click="confirm">{{ t('confirm') }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
-import { reactive, ref, nextTick } from 'vue'
-import { t } from '@/lang'
-import UploadMedia from './upload-media.vue'
-import { img, debounce } from '@/utils/common'
-import { getMediaList, syncNews } from '@/app/api/wechat'
-
-const prop = defineProps({
-  type: {
-    type: String,
-    default: 'image',
-  },
-})
-
-const showDialog = ref(false)
-
-const openDialog = () => {
-  prop.type == 'news' && waterfall()
-  showDialog.value = true
-}
-
-const attachment: Record<string, any> = reactive({
-  loading: true,
-  page: 1,
-  total: 0,
-  limit: 10,
-  data: [],
-})
-
-/**
- * 查询素材
- */
-const getAttachmentList = (page: number = 1) => {
-  attachment.loading = true
-  attachment.page = page
-  getMediaList({
-    page: attachment.page,
-    limit: attachment.limit,
-    type: prop.type,
-  })
-    .then((res) => {
-      attachment.data = res.data.data
-      attachment.total = res.data.total
-      attachment.loading = false
-      prop.type == 'news' && waterfall()
-    })
-    .catch(() => {
-      attachment.loading = false
-    })
-}
-getAttachmentList()
-
-const emits = defineEmits(['success'])
-const selectedFile: Record<string, any> = ref({})
-
-const confirm = () => {
-  emits('success', selectedFile.value)
-}
-
-const syncLoading = ref(false)
-const syncWechatNews = () => {
-  if (syncLoading.value) return
-  syncLoading.value = true
-
-  syncNews()
-    .then(() => {
-      syncLoading.value = false
-      getAttachmentList()
-    })
-    .catch(() => {
-      syncLoading.value = false
+    import { reactive, ref, nextTick } from 'vue'
+    import { t } from '@/lang'
+    import UploadMedia from './upload-media.vue'
+    import { img, debounce } from '@/utils/common'
+    import { getMediaList, syncNews } from '@/app/api/wechat'
+
+    const prop = defineProps({
+        type: {
+            type: String,
+            default: 'image'
+        }
     })
-}
 
-const meta = document.createElement('meta')
-meta.content = 'same-origin'
-meta.name = 'referrer'
-document.getElementsByTagName('head')[0].appendChild(meta)
+    const showDialog = ref(false)
 
-// 瀑布流计算
-const waterfallContainerRef = ref(null)
-const waterfallItemRef = ref([])
-const listPosition = ref([])
-const waterfall = debounce(() => {
-  nextTick(() => {
-    const containerWidth = waterfallContainerRef.value.clientWidth
-    const column = parseInt(containerWidth / 292)
-    const heights = []
-    const positions = []
+    const openDialog = () => {
+        prop.type == 'news' && waterfall()
+        showDialog.value = true
+    }
 
-    waterfallItemRef.value.forEach((item, i) => {
-      if (i < column) {
-        const position = {}
-        position.top = '0px'
-        if (i % column == 0) {
-          position.left = item.clientWidth * i + 'px'
-        } else {
-          position.left = item.clientWidth * i + (i % column) * 10 + 'px'
-        }
-        positions[i] = position
-        heights[i] = item.clientHeight + 10
-      } else {
-        let minHeight = Math.min(...heights) //  找到第一列的最小高度
-        let minIndex = heights.findIndex((item) => item === minHeight) // 找到最小高度的索引
-        let position = {}
-        position.top = minHeight + 10 + 'px'
-        position.left = positions[minIndex].left
-        positions[i] = position
-        heights[minIndex] += item.clientHeight + 10
-      }
+    const attachment: Record<string, any> = reactive({
+        loading: true,
+        page: 1,
+        total: 0,
+        limit: 10,
+        data: []
     })
-    listPosition.value = positions
-  })
-}, 800)
 
-// 重新布局，以适应窗口变化
-window.addEventListener('resize', () => waterfall())
+    /**
+     * 查询素材
+     */
+    const getAttachmentList = (page: number = 1) => {
+        attachment.loading = true
+        attachment.page = page
+        getMediaList({
+            page: attachment.page,
+            limit: attachment.limit,
+            type: prop.type
+        }).then(res => {
+            attachment.data = res.data.data
+            attachment.total = res.data.total
+            attachment.loading = false
+            prop.type == 'news' && waterfall()
+        }).catch(() => {
+            attachment.loading = false
+        })
+    }
+    getAttachmentList()
+
+    const emits = defineEmits(['success'])
+    const selectedFile: Record<string, any> = ref({})
+
+    const confirm = () => {
+        emits('success', selectedFile.value)
+    }
+
+    const syncLoading = ref(false)
+    const syncWechatNews = () => {
+        if (syncLoading.value) return
+        syncLoading.value = true
+
+        syncNews().then(() => {
+            syncLoading.value = false
+            getAttachmentList()
+        }).catch(() => {
+            syncLoading.value = false
+        })
+    }
+
+    const meta = document.createElement('meta')
+    meta.content = 'same-origin'
+    meta.name = 'referrer'
+    document.getElementsByTagName('head')[0].appendChild(meta)
+
+    // 瀑布流计算
+    const waterfallContainerRef = ref(null)
+    const waterfallItemRef = ref([])
+    const listPosition = ref([])
+    const waterfall = debounce(() => {
+        nextTick(() => {
+            const containerWidth = waterfallContainerRef.value.clientWidth
+            const column = parseInt(containerWidth / 292)
+            const heights = []
+            const positions = []
+
+            waterfallItemRef.value.forEach((item, i) => {
+                if (i < column) {
+                    const position = {}
+                    position.top = '0px'
+                    if (i % column == 0) {
+                        position.left = item.clientWidth * i + "px"
+                    } else {
+                        position.left = item.clientWidth * i + (i % column * 10) + "px"
+                    }
+                    positions[i] = position
+                    heights[i] = item.clientHeight + 10
+                } else {
+                    let minHeight = Math.min(...heights) //  找到第一列的最小高度
+                    let minIndex = heights.findIndex(item => item === minHeight) // 找到最小高度的索引
+                    let position = {}
+                    position.top = minHeight + 10 + "px"
+                    position.left = positions[minIndex].left
+                    positions[i] = position
+                    heights[minIndex] += item.clientHeight + 10
+                }
+            })
+            listPosition.value = positions
+        })
+    }, 800)
+
+    // 重新布局，以适应窗口变化
+    window.addEventListener('resize', () => waterfall())
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
diff --git a/admin/src/app/views/channel/wechat/components/upload-media.vue b/admin/src/app/views/channel/wechat/components/upload-media.vue
index b20aaea8..3118ee46 100644
--- a/admin/src/app/views/channel/wechat/components/upload-media.vue
+++ b/admin/src/app/views/channel/wechat/components/upload-media.vue
@@ -1,20 +1,20 @@
 <template>
-  <el-upload v-bind="upload" ref="uploadRef">
-    <slot></slot>
-  </el-upload>
+    <el-upload v-bind="upload" ref="uploadRef">
+        <slot></slot>
+    </el-upload>
 </template>
 
-<script lang="ts" setup>
+<script lang='ts' setup>
 import { computed, ref } from 'vue'
 import { getToken } from '@/utils/common'
 import storage from '@/utils/storage'
 import { ElMessage, UploadFile, UploadFiles } from 'element-plus'
 
 const prop = defineProps({
-  type: {
-    type: String,
-    default: 'image',
-  },
+    type: {
+        type: String,
+        default: 'image'
+    }
 })
 
 const emits = defineEmits(['success'])
@@ -22,28 +22,24 @@ const emits = defineEmits(['success'])
 const uploadRef = ref<Record<string, any> | null>(null)
 // 上传文件
 const upload = computed(() => {
-  const headers: Record<string, any> = {}
-  headers[import.meta.env.VITE_REQUEST_HEADER_TOKEN_KEY] = getToken()
+    const headers: Record<string, any> = {}
+    headers[import.meta.env.VITE_REQUEST_HEADER_TOKEN_KEY] = getToken()
 
-  return {
-    action: `${import.meta.env.VITE_APP_BASE_URL}/wechat/media/${prop.type}`,
-    multiple: true,
-    headers,
-    accept: prop.type == 'image' ? '.bmp,.png,.jpeg,.jpg,.gif' : '.mp4',
-    onSuccess: (
-      response: any,
-      uploadFile: UploadFile,
-      uploadFiles: UploadFiles
-    ) => {
-      if (response.code >= 1) {
-        emits('success', response.data)
-        uploadRef.value?.handleRemove(uploadFile)
-      } else {
-        uploadFile.status = 'fail'
-        uploadRef.value?.handleRemove(uploadFile)
-        ElMessage({ message: response.msg, type: 'error' })
-      }
-    },
-  }
+    return {
+        action: `${import.meta.env.VITE_APP_BASE_URL}/wechat/media/${prop.type}`,
+        multiple: true,
+        headers,
+        accept: prop.type == 'image' ? '.bmp,.png,.jpeg,.jpg,.gif' : '.mp4',
+        onSuccess: (response: any, uploadFile: UploadFile, uploadFiles: UploadFiles) => {
+            if (response.code >= 1) {
+                emits('success', response.data)
+                uploadRef.value?.handleRemove(uploadFile)
+            } else {
+                uploadFile.status = 'fail'
+                uploadRef.value?.handleRemove(uploadFile)
+                ElMessage({ message: response.msg, type: 'error' })
+            }
+        }
+    }
 })
 </script>
diff --git a/admin/src/app/views/channel/wechat/config.vue b/admin/src/app/views/channel/wechat/config.vue
index 2f4beb7f..85853850 100644
--- a/admin/src/app/views/channel/wechat/config.vue
+++ b/admin/src/app/views/channel/wechat/config.vue
@@ -1,216 +1,126 @@
 <template>
-  <!--公众号配置-->
-  <div class="main-container">
-    <el-card class="card !border-none" shadow="never">
-      <el-page-header :content="pageName" :icon="ArrowLeft" @back="back()" />
-    </el-card>
-
-    <el-form
-      class="page-form mt-[15px]"
-      :model="formData"
-      label-width="150px"
-      ref="formRef"
-      :rules="formRules"
-      v-loading="loading"
-    >
-      <el-card class="box-card !border-none" shadow="never">
-        <h3 class="panel-title !text-sm">{{ t('wechatInfo') }}</h3>
-
-        <el-form-item :label="t('wechatName')" prop="wechat_name">
-          <el-input
-            v-model.trim="formData.wechat_name"
-            :placeholder="t('wechatNamePlaceholder')"
-            class="input-width"
-            clearable
-            :readonly="formData.is_authorization"
-          />
-        </el-form-item>
-
-        <el-form-item :label="t('wechatOriginal')" prop="wechat_original">
-          <el-input
-            v-model.trim="formData.wechat_original"
-            :placeholder="t('wechatOriginalPlaceholder')"
-            class="input-width"
-            clearable
-            :readonly="formData.is_authorization"
-          />
-        </el-form-item>
-
-        <el-form-item :label="t('wechatQrcode')" prop="qr_code">
-          <upload-image v-model="formData.qr_code" />
-          <div class="form-tip">{{ t('wechatQrcodeTips') }}</div>
-        </el-form-item>
-      </el-card>
-
-      <el-card class="box-card !border-none mt-[15px]" shadow="never">
-        <h3 class="panel-title !text-sm">{{ t('wechatDevelopInfo') }}</h3>
-
-        <el-form-item :label="t('wechatAppid')" prop="app_id">
-          <el-input
-            v-model.trim="formData.app_id"
-            :placeholder="t('appidPlaceholder')"
-            class="input-width"
-            clearable
-            :readonly="formData.is_authorization"
-          />
-          <div class="form-tip">{{ t('wechatAppidTips') }}</div>
-        </el-form-item>
-
-        <el-form-item
-          :label="t('wechatAppsecret')"
-          prop="app_secret"
-          v-if="!formData.is_authorization"
-        >
-          <el-input
-            v-model.trim="formData.app_secret"
-            :placeholder="t('appSecretPlaceholder')"
-            class="input-width"
-            clearable
-          />
-          <div class="form-tip">{{ t('wechatAppsecretTips') }}</div>
-        </el-form-item>
-      </el-card>
-
-      <el-card class="box-card !border-none mt-[15px]" shadow="never">
-        <h3 class="panel-title !text-sm">{{ t('theServerSetting') }}</h3>
-
-        <el-form-item label="URL">
-          <el-input
-            :model-value="wechatStatic.serve_url"
-            placeholder="Please input"
-            class="input-width"
-            :readonly="true"
-          >
-            <template #append>
-              <div
-                class="cursor-pointer"
-                @click="copyEvent(wechatStatic.serve_url)"
-              >
-                {{ t('copy') }}
-              </div>
-            </template>
-          </el-input>
-        </el-form-item>
-
-        <el-form-item label="Token" prop="token">
-          <el-input
-            v-model.trim="formData.token"
-            :placeholder="t('tokenPlaceholder')"
-            class="input-width"
-            maxlength="32"
-            show-word-limit
-            clearable
-          />
-          <div class="form-tip">{{ t('tokenTips') }}</div>
-        </el-form-item>
-
-        <el-form-item label="EncodingAESKey" prop="encoding_aes_key">
-          <el-input
-            v-model.trim="formData.encoding_aes_key"
-            :placeholder="t('encodingAesKeyPlaceholder')"
-            class="input-width"
-            maxlength="43"
-            show-word-limit
-            clearable
-          />
-          <div class="form-tip">{{ t('encodingAESKeyTips') }}</div>
-        </el-form-item>
-
-        <el-form-item :label="t('encryptionType')" prop="encryption_type">
-          <el-radio-group v-model="formData.encryption_type">
-            <el-radio label="not_encrypt">{{ t('cleartextMode') }}</el-radio>
-            <el-radio label="compatible">{{ t('compatibleMode') }}</el-radio>
-            <el-radio label="safe">{{ t('safeMode') }}</el-radio>
-          </el-radio-group>
-          <div class="form-tip">{{ t('cleartextModeTips') }}</div>
-          <div class="form-tip">{{ t('compatibleModeTips') }}</div>
-          <div class="form-tip">{{ t('safeModeTips') }}</div>
-        </el-form-item>
-      </el-card>
-
-      <el-card class="box-card !border-none mt-[15px]" shadow="never">
-        <div class="flex">
-          <h3 class="panel-title !text-sm">{{ t('functionSetting') }}</h3>
+    <!--公众号配置-->
+    <div class="main-container">
+
+        <el-card class="card !border-none" shadow="never">
+            <el-page-header :content="pageName" :icon="ArrowLeft" @back="back()" />
+        </el-card>
+
+        <el-form class="page-form mt-[15px]" :model="formData" label-width="150px" ref="formRef" :rules="formRules" v-loading="loading">
+            <el-card class="box-card !border-none" shadow="never">
+                <h3 class="panel-title !text-sm">{{ t('wechatInfo') }}</h3>
+
+                <el-form-item :label="t('wechatName')" prop="wechat_name">
+                    <el-input v-model.trim="formData.wechat_name" :placeholder="t('wechatNamePlaceholder')" class="input-width" clearable :readonly="formData.is_authorization"/>
+                </el-form-item>
+
+                <el-form-item :label="t('wechatOriginal')" prop="wechat_original">
+                    <el-input v-model.trim="formData.wechat_original" :placeholder="t('wechatOriginalPlaceholder')" class="input-width" clearable :readonly="formData.is_authorization"/>
+                </el-form-item>
+
+                <el-form-item :label="t('wechatQrcode')" prop="qr_code">
+                    <upload-image v-model="formData.qr_code" />
+                    <div class="form-tip">{{ t('wechatQrcodeTips') }}</div>
+                </el-form-item>
+            </el-card>
+
+            <el-card class="box-card !border-none mt-[15px]" shadow="never">
+                <h3 class="panel-title !text-sm">{{ t('wechatDevelopInfo') }}</h3>
+
+                <el-form-item :label="t('wechatAppid')" prop="app_id">
+                    <el-input v-model.trim="formData.app_id" :placeholder="t('appidPlaceholder')" class="input-width" clearable :readonly="formData.is_authorization"/>
+                    <div class="form-tip">{{ t('wechatAppidTips') }}</div>
+                </el-form-item>
+
+                <el-form-item :label="t('wechatAppsecret')" prop="app_secret" v-if="!formData.is_authorization">
+                    <el-input v-model.trim="formData.app_secret" :placeholder="t('appSecretPlaceholder')" class="input-width" clearable />
+                    <div class="form-tip">{{ t('wechatAppsecretTips') }}</div>
+                </el-form-item>
+            </el-card>
+
+            <el-card class="box-card !border-none mt-[15px]" shadow="never">
+                <h3 class="panel-title !text-sm">{{ t('theServerSetting') }}</h3>
+
+                <el-form-item label="URL">
+                    <el-input :model-value="wechatStatic.serve_url" placeholder="Please input" class="input-width" :readonly="true">
+                        <template #append>
+                            <div class="cursor-pointer" @click="copyEvent(wechatStatic.serve_url)">{{ t('copy') }}</div>
+                        </template>
+                    </el-input>
+                </el-form-item>
+
+                <el-form-item label="Token" prop="token">
+                    <el-input v-model.trim="formData.token" :placeholder="t('tokenPlaceholder')" class="input-width" maxlength="32" show-word-limit clearable />
+                    <div class="form-tip">{{ t('tokenTips') }}</div>
+                </el-form-item>
+
+                <el-form-item label="EncodingAESKey" prop="encoding_aes_key">
+                    <el-input v-model.trim="formData.encoding_aes_key" :placeholder="t('encodingAesKeyPlaceholder')" class="input-width" maxlength="43" show-word-limit clearable />
+                    <div class="form-tip">{{ t('encodingAESKeyTips') }}</div>
+                </el-form-item>
+
+                <el-form-item :label="t('encryptionType')" prop="encryption_type">
+                    <el-radio-group v-model="formData.encryption_type">
+                        <el-radio label="not_encrypt">{{ t('cleartextMode') }}</el-radio>
+                        <el-radio label="compatible">{{ t('compatibleMode') }}</el-radio>
+                        <el-radio label="safe">{{ t('safeMode') }}</el-radio>
+                    </el-radio-group>
+                    <div class="form-tip">{{ t('cleartextModeTips') }}</div>
+                    <div class="form-tip">{{ t('compatibleModeTips') }}</div>
+                    <div class="form-tip">{{ t('safeModeTips') }}</div>
+                </el-form-item>
+            </el-card>
+
+            <el-card class="box-card !border-none mt-[15px]" shadow="never">
+                <div class="flex">
+                    <h3 class="panel-title !text-sm">{{ t('functionSetting') }}</h3>
+                </div>
+
+                <el-form-item label="">
+                    <div class="form-tip">{{ t('functionSettingTips') }}</div>
+                </el-form-item>
+
+                <el-form-item :label="t('businessDomain')">
+                    <el-input :model-value="wechatStatic.business_domain" placeholder="Please input" class="input-width" :readonly="true">
+                        <template #append>
+                            <div class="cursor-pointer" @click="copyEvent(wechatStatic.business_domain)">{{ t('copy') }}
+                            </div>
+                        </template>
+                    </el-input>
+                </el-form-item>
+
+                <el-form-item :label="t('jsSecureDomain')">
+                    <el-input :model-value="wechatStatic.js_secure_domain" placeholder="Please input" class="input-width" :readonly="true">
+                        <template #append>
+                            <div class="cursor-pointer" @click="copyEvent(wechatStatic.business_domain)">{{ t('copy') }}
+                            </div>
+                        </template>
+                    </el-input>
+                </el-form-item>
+
+                <el-form-item :label="t('webAuthDomain')">
+                    <el-input :model-value="wechatStatic.web_auth_domain" placeholder="Please input" class="input-width" :readonly="true">
+                        <template #append>
+                            <div class="cursor-pointer" @click="copyEvent(wechatStatic.business_domain)">{{ t('copy') }}
+                            </div>
+                        </template>
+                    </el-input>
+                </el-form-item>
+            </el-card>
+        </el-form>
+
+        <div class="fixed-footer-wrap">
+            <div class="fixed-footer">
+                <el-button type="primary" :loading="loading" @click="save(formRef)">{{ t('save') }}</el-button>
+            </div>
         </div>
-
-        <el-form-item label="">
-          <div class="form-tip">{{ t('functionSettingTips') }}</div>
-        </el-form-item>
-
-        <el-form-item :label="t('businessDomain')">
-          <el-input
-            :model-value="wechatStatic.business_domain"
-            placeholder="Please input"
-            class="input-width"
-            :readonly="true"
-          >
-            <template #append>
-              <div
-                class="cursor-pointer"
-                @click="copyEvent(wechatStatic.business_domain)"
-              >
-                {{ t('copy') }}
-              </div>
-            </template>
-          </el-input>
-        </el-form-item>
-
-        <el-form-item :label="t('jsSecureDomain')">
-          <el-input
-            :model-value="wechatStatic.js_secure_domain"
-            placeholder="Please input"
-            class="input-width"
-            :readonly="true"
-          >
-            <template #append>
-              <div
-                class="cursor-pointer"
-                @click="copyEvent(wechatStatic.business_domain)"
-              >
-                {{ t('copy') }}
-              </div>
-            </template>
-          </el-input>
-        </el-form-item>
-
-        <el-form-item :label="t('webAuthDomain')">
-          <el-input
-            :model-value="wechatStatic.web_auth_domain"
-            placeholder="Please input"
-            class="input-width"
-            :readonly="true"
-          >
-            <template #append>
-              <div
-                class="cursor-pointer"
-                @click="copyEvent(wechatStatic.business_domain)"
-              >
-                {{ t('copy') }}
-              </div>
-            </template>
-          </el-input>
-        </el-form-item>
-      </el-card>
-    </el-form>
-
-    <div class="fixed-footer-wrap">
-      <div class="fixed-footer">
-        <el-button type="primary" :loading="loading" @click="save(formRef)">{{
-          t('save')
-        }}</el-button>
-      </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref, watch, computed } from 'vue'
 import { t } from '@/lang'
-import {
-  getWechatConfig,
-  getWechatStatic,
-  editWechatConfig,
-} from '@/app/api/wechat'
+import { getWechatConfig, getWechatStatic, editWechatConfig } from '@/app/api/wechat'
 import { useClipboard } from '@vueuse/core'
 import { ElMessage, FormInstance } from 'element-plus'
 import { ArrowLeft } from '@element-plus/icons-vue'
@@ -220,78 +130,66 @@ const route = useRoute()
 const router = useRouter()
 const pageName = route.meta.title
 const back = () => {
-  router.push('/channel/wechat')
+    router.push('/channel/wechat')
 }
 const loading = ref(true)
 
 const formData = reactive<Record<string, any>>({
-  wechat_name: '',
-  wechat_original: '',
-  app_id: '',
-  app_secret: '',
-  qr_code: '',
-  token: '',
-  encoding_aes_key: '',
-  encryption_type: 'not_encrypt',
-  is_authorization: 0,
+    wechat_name: '',
+    wechat_original: '',
+    app_id: '',
+    app_secret: '',
+    qr_code: '',
+    token: '',
+    encoding_aes_key: '',
+    encryption_type: 'not_encrypt',
+    is_authorization: 0
 })
 
 const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    wechat_name: [
-      { required: true, message: t('wechatNamePlaceholder'), trigger: 'blur' },
-    ],
-    wechat_original: [
-      {
-        required: true,
-        message: t('wechatOriginalPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    app_id: [
-      { required: true, message: t('appidPlaceholder'), trigger: 'blur' },
-    ],
-    app_secret: [
-      {
-        required: !formData.is_authorization,
-        message: t('appSecretPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    token: [
-      { required: true, message: t('tokenPlaceholder'), trigger: 'blur' },
-    ],
-    encoding_aes_key: [
-      {
-        required: true,
-        message: t('encodingAesKeyPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-  }
+    return {
+        wechat_name: [
+            { required: true, message: t('wechatNamePlaceholder'), trigger: 'blur' }
+        ],
+        wechat_original: [
+            { required: true, message: t('wechatOriginalPlaceholder'), trigger: 'blur' }
+        ],
+        app_id: [
+            { required: true, message: t('appidPlaceholder'), trigger: 'blur' }
+        ],
+        app_secret: [
+            { required: !formData.is_authorization, message: t('appSecretPlaceholder'), trigger: 'blur' }
+        ],
+        token: [
+            { required: true, message: t('tokenPlaceholder'), trigger: 'blur' }
+        ],
+        encoding_aes_key: [
+            { required: true, message: t('encodingAesKeyPlaceholder'), trigger: 'blur' }
+        ]
+    }
 })
 
 /**
  * 获取微信配置
  */
-getWechatConfig().then((res) => {
-  Object.assign(formData, res.data)
-  loading.value = false
+getWechatConfig().then(res => {
+    Object.assign(formData, res.data)
+    loading.value = false
 })
 
 const wechatStatic = reactive<Record<string, string>>({
-  business_domain: '',
-  js_secure_domain: '',
-  serve_url: '',
-  web_auth_domain: '',
+    business_domain: '',
+    js_secure_domain: '',
+    serve_url: '',
+    web_auth_domain: ''
 })
 
-getWechatStatic().then((res) => {
-  Object.assign(wechatStatic, res.data)
-  loading.value = false
+getWechatStatic().then(res => {
+    Object.assign(wechatStatic, res.data)
+    loading.value = false
 })
 
 /**
@@ -299,44 +197,43 @@ getWechatStatic().then((res) => {
  */
 const { copy, isSupported, copied } = useClipboard()
 const copyEvent = (text: string) => {
-  if (!isSupported.value) {
-    ElMessage({
-      message: t('notSupportCopy'),
-      type: 'warning',
-    })
-    return
-  }
-  copy(text)
+    if (!isSupported.value) {
+        ElMessage({
+            message: t('notSupportCopy'),
+            type: 'warning'
+        })
+        return
+    }
+    copy(text)
 }
 
 watch(copied, () => {
-  if (copied.value) {
-    ElMessage({
-      message: t('copySuccess'),
-      type: 'success',
-    })
-  }
+    if (copied.value) {
+        ElMessage({
+            message: t('copySuccess'),
+            type: 'success'
+        })
+    }
 })
 
 /**
  * 保存
  */
 const save = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      editWechatConfig(formData)
-        .then(() => {
-          loading.value = false
-        })
-        .catch(() => {
-          loading.value = false
-        })
-    }
-  })
+    if (loading.value || !formEl) return
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+            editWechatConfig(formData).then(() => {
+                loading.value = false
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
 }
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/channel/wechat/course.vue b/admin/src/app/views/channel/wechat/course.vue
index 636d438e..f85025d0 100644
--- a/admin/src/app/views/channel/wechat/course.vue
+++ b/admin/src/app/views/channel/wechat/course.vue
@@ -1,87 +1,53 @@
 <template>
-  <!--发布教程-->
-  <div class="main-container">
-    <el-card class="card !border-none" shadow="never">
-      <el-page-header :content="pageName" :icon="ArrowLeft" @back="back()" />
-    </el-card>
+    <!--发布教程-->
+    <div class="main-container">
 
-    <el-card class="box-card mt-[15px] pt-[20px] !border-none" shadow="never">
-      <div class="flex">
-        <div class="min-w-[60px]">
-          <span
-            class="flex justify-center items-center block w-[40px] h-[40px] border-[1px] border-primary rounded-[999px] text-primary"
-            >1</span
-          >
-        </div>
-        <div>
-          <p class="flex items-center text-[14px]">
-            {{ t('writingTipsOne1') }}--<el-button
-              link
-              type="primary"
-              @click="linkEvent"
-              >{{ t('writingTipsOne2') }}</el-button
-            >, {{ t('writingTipsOne3')
-            }}<span class="text-primary">URL / Token / EncondingAESKey</span
-            >{{ t('writingTipsOne4') }}
-          </p>
-          <div class="w-[100%] mt-[10px]">
-            <img
-              class="w-[100%]"
-              src="@/app/assets/images/setting/wechat_1.png"
-            />
-          </div>
-          <p class="flex items-center text-[14px] mt-[20px]">
-            {{ t('writingTipsOne5') }}
-          </p>
-          <div class="w-[100%] mt-[10px]">
-            <img
-              class="w-[100%]"
-              src="@/app/assets/images/setting/wechat_4.png"
-            />
-          </div>
-        </div>
-      </div>
-      <div class="flex mt-[40px]">
-        <div class="min-w-[60px]">
-          <span
-            class="flex justify-center items-center block w-[40px] h-[40px] border-[1px] border-primary rounded-[999px] text-primary"
-            >2</span
-          >
-        </div>
-        <div>
-          <p class="flex items-center text-[14px]">
-            {{ t('writingTipsTwo1') }}
-          </p>
-          <div class="w-[100%] mt-[10px]">
-            <img
-              class="w-[100%]"
-              src="@/app/assets/images/setting/wechat_2.png"
-            />
-          </div>
-        </div>
-      </div>
-      <div class="flex mt-[40px]">
-        <div class="min-w-[60px]">
-          <span
-            class="flex justify-center items-center block w-[40px] h-[40px] border-[1px] border-primary rounded-[999px] text-primary"
-            >3</span
-          >
-        </div>
-        <div>
-          <p class="flex items-center text-[14px]">
-            {{ t('writingTipsThree1')
-            }}<span class="text-primary">{{ t('writingTipsThree2') }}</span>
-          </p>
-          <div class="w-[100%] mt-[10px]">
-            <img
-              class="w-[100%]"
-              src="@/app/assets/images/setting/wechat_3.png"
-            />
-          </div>
-        </div>
-      </div>
-    </el-card>
-  </div>
+        <el-card class="card !border-none" shadow="never">
+            <el-page-header :content="pageName" :icon="ArrowLeft" @back="back()" />
+        </el-card>
+
+        <el-card class="box-card mt-[15px] pt-[20px] !border-none" shadow="never">
+            <div class="flex">
+                <div class="min-w-[60px]">
+                    <span class="flex justify-center items-center block w-[40px] h-[40px] border-[1px] border-primary rounded-[999px] text-primary">1</span>
+                </div>
+                <div>
+                    <p class="flex items-center text-[14px]">{{ t('writingTipsOne1') }}--<el-button link type="primary"
+                            @click="linkEvent">{{ t('writingTipsOne2') }}</el-button>, {{ t('writingTipsOne3') }}<span
+                            class="text-primary">URL / Token / EncondingAESKey</span>{{ t('writingTipsOne4') }}</p>
+                    <div class="w-[100%] mt-[10px]">
+                        <img class="w-[100%]" src="@/app/assets/images/setting/wechat_1.png" />
+                    </div>
+                    <p class="flex items-center text-[14px] mt-[20px]">{{ t('writingTipsOne5') }}</p>
+                    <div class="w-[100%] mt-[10px]">
+                        <img class="w-[100%]" src="@/app/assets/images/setting/wechat_4.png" />
+                    </div>
+                </div>
+            </div>
+            <div class="flex mt-[40px]">
+                <div class="min-w-[60px]">
+                    <span class="flex justify-center items-center block w-[40px] h-[40px] border-[1px] border-primary rounded-[999px] text-primary">2</span>
+                </div>
+                <div>
+                    <p class="flex items-center text-[14px]">{{ t('writingTipsTwo1') }}</p>
+                    <div class="w-[100%] mt-[10px]">
+                        <img class="w-[100%]" src="@/app/assets/images/setting/wechat_2.png" />
+                    </div>
+                </div>
+            </div>
+            <div class="flex mt-[40px]">
+                <div class="min-w-[60px]">
+                    <span class="flex justify-center items-center block w-[40px] h-[40px] border-[1px] border-primary rounded-[999px] text-primary">3</span>
+                </div>
+                <div>
+                    <p class="flex items-center text-[14px]">{{ t('writingTipsThree1') }}<span class="text-primary">{{ t('writingTipsThree2') }}</span></p>
+                    <div class="w-[100%] mt-[10px]">
+                        <img class="w-[100%]" src="@/app/assets/images/setting/wechat_3.png" />
+                    </div>
+                </div>
+            </div>
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -95,31 +61,32 @@ const route = useRoute()
 const pageName = route.meta.title
 const router = useRouter()
 const back = () => {
-  router.push('/channel/wechat')
+    router.push('/channel/wechat')
 }
 const loading = ref(true)
 const formData = reactive<Record<string, string>>({
-  wechat_name: '',
-  wechat_original: '',
-  app_id: '',
-  app_secret: '',
-  qr_code: '',
-  token: '',
-  encoding_aes_key: '',
-  encryption_type: 'not_encrypt',
+    wechat_name: '',
+    wechat_original: '',
+    app_id: '',
+    app_secret: '',
+    qr_code: '',
+    token: '',
+    encoding_aes_key: '',
+    encryption_type: 'not_encrypt'
 })
 
 /**
  * 获取微信配置
  */
-getWechatConfig().then((res) => {
-  Object.assign(formData, res.data)
-  loading.value = false
+getWechatConfig().then(res => {
+    Object.assign(formData, res.data)
+    loading.value = false
 })
 
 const linkEvent = () => {
-  window.open('https://mp.weixin.qq.com/', '_blank')
+    window.open('https://mp.weixin.qq.com/', '_blank')
 }
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/channel/wechat/keyword_reply_edit.vue b/admin/src/app/views/channel/wechat/keyword_reply_edit.vue
index 07bf006d..6643b3dc 100644
--- a/admin/src/app/views/channel/wechat/keyword_reply_edit.vue
+++ b/admin/src/app/views/channel/wechat/keyword_reply_edit.vue
@@ -1,151 +1,88 @@
 <template>
-  <!--关键字回复添加/编辑-->
-  <div class="main-container">
-    <el-card class="card !border-none" shadow="never">
-      <el-page-header :content="pageName" :icon="ArrowLeft" @back="back()" />
-    </el-card>
-
-    <el-form
-      class="page-form mt-[15px]"
-      :model="formData"
-      label-width="150px"
-      ref="formRef"
-      :rules="formRules"
-      v-loading="loading"
-    >
-      <el-card class="box-card !border-none" shadow="never">
-        <el-form-item :label="t('ruleName')" prop="name">
-          <el-input
-            v-model.trim="formData.name"
-            :placeholder="t('ruleNamePlaceholder')"
-            class="input-width"
-            clearable
-            maxlength="60"
-          />
-          <div class="form-tip">{{ t('ruleNameTips') }}</div>
-        </el-form-item>
-
-        <el-form-item :label="t('keyword')" prop="keyword">
-          <el-input
-            v-model.trim="formData.keyword"
-            :placeholder="t('keywordPlaceholder')"
-            class="input-width"
-            clearable
-          >
-            <template #prepend>
-              <el-select v-model="formData.matching_type" style="width: 115px">
-                <el-option :label="t('allMatching')" value="full" />
-                <el-option :label="t('fuzzyMatching')" value="like" />
-              </el-select>
-            </template>
-          </el-input>
-        </el-form-item>
-
-        <el-form-item :label="t('content')" prop="content">
-          <div class="flex flex-col">
-            <div
-              class="flex items-center"
-              v-for="(item, index) in formData.content"
-            >
-              <div
-                class="w-[300px] bg-page p-[10px] mr-[10px] mb-[10px] rounded leading-none"
-                v-if="item.msgtype == 'text'"
-              >
-                {{ item.text.content }}
-              </div>
-              <div
-                class="w-[300px] bg-page p-[10px] mr-[10px] mb-[10px] rounded"
-                v-if="item.msgtype == 'image'"
-              >
-                <upload-image
-                  :limit="1"
-                  width="120px"
-                  height="120px"
-                  v-model="item.image.url"
-                />
-              </div>
-              <div
-                class="w-[300px] bg-page p-[10px] mr-[10px] mb-[10px] rounded"
-                v-if="item.msgtype == 'video'"
-              >
-                <upload-video
-                  :limit="1"
-                  width="120px"
-                  height="120px"
-                  v-model="item.video.url"
-                />
-              </div>
-              <div
-                class="w-[300px] bg-page p-[10px] mr-[10px] mb-[10px] rounded"
-                v-if="item.msgtype == 'mpnewsarticle'"
-              >
-                <news-card v-model="item.mpnewsarticle" mode="show" />
-              </div>
-              <div
-                class="w-[300px] bg-page p-[10px] mr-[10px] mb-[10px] rounded"
-                v-if="item.msgtype == 'miniprogrampage'"
-              >
-                小程序卡片【{{ item.miniprogrampage.appid }}】
-              </div>
-              <icon
-                name="element Delete"
-                class="cursor-pointer"
-                @click="removeContent(index)"
-              />
-            </div>
-            <div class="mt-[10px]">
-              <el-button type="primary" @click="showDialog = true">{{
-                t('addReplyContent')
-              }}</el-button>
+    <!--关键字回复添加/编辑-->
+    <div class="main-container">
+
+        <el-card class="card !border-none" shadow="never">
+            <el-page-header :content="pageName" :icon="ArrowLeft" @back="back()" />
+        </el-card>
+
+        <el-form class="page-form mt-[15px]" :model="formData" label-width="150px" ref="formRef" :rules="formRules" v-loading="loading">
+            <el-card class="box-card !border-none" shadow="never">
+
+                <el-form-item :label="t('ruleName')" prop="name">
+                    <el-input v-model.trim="formData.name" :placeholder="t('ruleNamePlaceholder')" class="input-width" clearable maxlength="60"/>
+                    <div class="form-tip">{{ t('ruleNameTips') }}</div>
+                </el-form-item>
+
+                <el-form-item :label="t('keyword')" prop="keyword">
+                    <el-input v-model.trim="formData.keyword" :placeholder="t('keywordPlaceholder')" class="input-width" clearable >
+                        <template #prepend>
+                            <el-select v-model="formData.matching_type" style="width: 115px">
+                                <el-option :label="t('allMatching')" value="full" />
+                                <el-option :label="t('fuzzyMatching')" value="like" />
+                            </el-select>
+                        </template>
+                    </el-input>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <div class="flex flex-col">
+                        <div class="flex items-center" v-for="(item, index) in formData.content">
+                            <div class="w-[300px] bg-page p-[10px] mr-[10px] mb-[10px] rounded leading-none" v-if="item.msgtype == 'text'">
+                                {{ item.text.content }}
+                            </div>
+                            <div class="w-[300px] bg-page p-[10px] mr-[10px] mb-[10px] rounded" v-if="item.msgtype == 'image'">
+                                <upload-image :limit="1" width="120px" height="120px" v-model="item.image.url"/>
+                            </div>
+                            <div class="w-[300px] bg-page p-[10px] mr-[10px] mb-[10px] rounded" v-if="item.msgtype == 'video'">
+                                <upload-video :limit="1" width="120px" height="120px" v-model="item.video.url"/>
+                            </div>
+                            <div class="w-[300px] bg-page p-[10px] mr-[10px] mb-[10px] rounded" v-if="item.msgtype == 'mpnewsarticle'">
+                                <news-card v-model="item.mpnewsarticle" mode="show"/>
+                            </div>
+                            <div class="w-[300px] bg-page p-[10px] mr-[10px] mb-[10px] rounded" v-if="item.msgtype == 'miniprogrampage'">
+                                小程序卡片【{{ item.miniprogrampage.appid }}】
+                            </div>
+                            <icon name="element Delete" class="cursor-pointer" @click="removeContent(index)"/>
+                        </div>
+                        <div class="mt-[10px]">
+                            <el-button type="primary" @click="showDialog = true">{{ t('addReplyContent') }}</el-button>
+                        </div>
+                    </div>
+                </el-form-item>
+
+                <el-form-item :label="t('replyMethod')" prop="reply_method">
+                    <el-radio-group v-model="formData.reply_method">
+                        <el-radio label="all">{{ t('replyMethodAll') }}</el-radio>
+                        <el-radio label="rand">{{ t('replyMethodRand') }}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+            </el-card>
+        </el-form>
+
+        <div class="fixed-footer-wrap">
+            <div class="fixed-footer">
+                <el-button type="primary" :loading="loading" @click="save(formRef)">{{ t('save') }}</el-button>
             </div>
-          </div>
-        </el-form-item>
-
-        <el-form-item :label="t('replyMethod')" prop="reply_method">
-          <el-radio-group v-model="formData.reply_method">
-            <el-radio label="all">{{ t('replyMethodAll') }}</el-radio>
-            <el-radio label="rand">{{ t('replyMethodRand') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-      </el-card>
-    </el-form>
-
-    <div class="fixed-footer-wrap">
-      <div class="fixed-footer">
-        <el-button type="primary" :loading="loading" @click="save(formRef)">{{
-          t('save')
-        }}</el-button>
-      </div>
-    </div>
+        </div>
+
+        <el-dialog v-model="showDialog" :title="t('addReplyContent')" width="60%" :destroy-on-close="true">
+            <reply-form v-model="replyContent" ref="ReplyRef"/>
 
-    <el-dialog
-      v-model="showDialog"
-      :title="t('addReplyContent')"
-      width="60%"
-      :destroy-on-close="true"
-    >
-      <reply-form v-model="replyContent" ref="ReplyRef" />
-
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-          <el-button type="primary" @click="addReplyContent">{{
-            t('confirm')
-          }}</el-button>
-        </span>
-      </template>
-    </el-dialog>
-  </div>
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                    <el-button type="primary" @click="addReplyContent">{{ t('confirm') }}</el-button>
+                </span>
+            </template>
+        </el-dialog>
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
 import { t } from '@/lang'
-import {
-  getKeywordsReplyInfo,
-  editKeywordsReply,
-  addKeywordsReply,
-} from '@/app/api/wechat'
+import { getKeywordsReplyInfo, editKeywordsReply, addKeywordsReply } from '@/app/api/wechat'
 import { ElMessage, FormInstance, FormRules } from 'element-plus'
 import { ArrowLeft } from '@element-plus/icons-vue'
 import { useRoute, useRouter } from 'vue-router'
@@ -156,92 +93,87 @@ const route = useRoute()
 const router = useRouter()
 const pageName = route.meta.title
 const back = () => {
-  router.push('/channel/wechat/reply')
+    router.push('/channel/wechat/reply')
 }
 
 const showDialog = ref(false)
 
 const formData: any = reactive({
-  id: 0,
-  name: '',
-  keyword: '',
-  content: [],
-  matching_type: 'full',
-  reply_method: 'all',
+    id: 0,
+    name: '',
+    keyword: '',
+    content: [],
+    matching_type: 'full',
+    reply_method: 'all'
 })
 
 const replyContent = ref({})
 const ReplyRef = ref(null)
 
 const addReplyContent = () => {
-  ReplyRef.value?.verify().then((res) => {
-    if (res) {
-      formData.content.push(replyContent.value)
-      replyContent.value = {}
-      showDialog.value = false
-    }
-  })
+    ReplyRef.value?.verify().then(res => {
+        if (res) {
+            formData.content.push(replyContent.value)
+            replyContent.value = {}
+            showDialog.value = false
+        }
+    })
 }
 
 const removeContent = (index: number) => {
-  formData.content.splice(index, 1)
+    formData.content.splice(index, 1)
 }
 
 const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = reactive<FormRules>({
-  name: [
-    { required: true, message: t('ruleNamePlaceholder'), trigger: 'blur' },
-  ],
-  keyword: [
-    { required: true, message: t('keywordPlaceholder'), trigger: 'blur' },
-  ],
-  content: [
-    {
-      validator: (rule: any, value: any, callback: any) => {
-        if (!formData.content.length)
-          callback(new Error(t('contentPlaceholder')))
-        callback()
-      },
-      trigger: 'blur',
-    },
-  ],
+    name: [
+        { required: true, message: t('ruleNamePlaceholder'), trigger: 'blur' }
+    ],
+    keyword: [
+        { required: true, message: t('keywordPlaceholder'), trigger: 'blur' }
+    ],
+    content: [
+        {
+            validator: (rule: any, value: any, callback: any) => {
+                if (!formData.content.length) callback(new Error(t('contentPlaceholder')))
+                callback()
+            }, trigger: 'blur'
+        }
+    ]
 })
 
 const loading = ref(false)
 
 if (route.query.id) {
-  getKeywordsReplyInfo(route.query.id)
-    .then(({ data }) => {
-      Object.keys(formData).forEach((key: string) => {
-        if (data[key] != undefined) formData[key] = data[key]
-      })
-      loading.value = false
-    })
-    .catch()
+    getKeywordsReplyInfo(route.query.id).then(({ data }) => {
+        Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+        loading.value = false
+    }).catch()
 } else {
-  loading.value = false
+    loading.value = false
 }
 
 /**
  * 保存
  */
 const save = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      const api = formData.id ? editKeywordsReply : addKeywordsReply
-      loading.value = true
-      api(formData)
-        .then(() => {
-          loading.value = false
-        })
-        .catch(() => {
-          loading.value = false
-        })
-    }
-  })
+    if (loading.value || !formEl) return
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            const api = formData.id ? editKeywordsReply : addKeywordsReply
+            loading.value = true
+            api(formData).then(() => {
+                loading.value = false
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
 }
+
 </script>
diff --git a/admin/src/app/views/channel/wechat/menu.vue b/admin/src/app/views/channel/wechat/menu.vue
index 997f80b8..21c73894 100644
--- a/admin/src/app/views/channel/wechat/menu.vue
+++ b/admin/src/app/views/channel/wechat/menu.vue
@@ -1,142 +1,90 @@
 <template>
-  <!--自定义菜单-->
-  <div class="main-container">
-    <el-card class="card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
-
-      <el-tabs v-model="activeName" class="my-[20px]" @tab-change="handleClick">
-        <el-tab-pane :label="t('wechatAccessFlow')" name="/channel/wechat" />
-        <el-tab-pane :label="t('customMenu')" name="/channel/wechat/menu" />
-        <el-tab-pane
-          :label="t('wechatTemplate')"
-          name="/channel/wechat/message"
-        />
-        <el-tab-pane :label="t('reply')" name="/channel/wechat/reply" />
-      </el-tabs>
-
-      <div class="flex" v-loading="loading">
-        <div
-          class="preview-wrap w-[300px] h-[550px] mr-[16px] bg-overlay rounded-md flex flex-col justify-between border border-color"
-        >
-          <div class="head w-full h-[70px]"></div>
-
-          <div class="menu-list h-[70px] flex border-t border-color">
-            <div class="py-[15px]">
-              <div
-                class="flex h-full px-[10px] items-center justify-center border-r border-color"
-              >
-                <icon name="iconfont iconjianpan" size="20px" color="#b1b2b3" />
-              </div>
+    <!--自定义菜单-->
+    <div class="main-container">
+        <el-card class="card !border-none" shadow="never">
+
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
             </div>
-            <div class="flex-1 flex w-0">
-              <div
-                class="menu-item py-[15px] flex items-center justify-center cursor-pointer"
-                :class="{
-                  'size-1': button.length == 1,
-                  'size-2-3': button.length > 1,
-                  active: index == buttonIndex,
-                  curr: index == buttonIndex && subButtonIndex == -1,
-                }"
-                v-for="(item, index) in button"
-                :key="index"
-                @click="selectButton(index)"
-              >
-                <div
-                  class="menu-name px-[10px] border-r border-color w-full leading-[40px] text-base truncate text-center"
-                >
-                  {{ item.name }}
-                </div>
-                <div class="active-shade"></div>
-
-                <!-- 子菜单 -->
-                <div
-                  class="sub-menu-wrap w-full bg-overlay border border-color rounded"
-                >
-                  <div
-                    class="menu-item h-[50px] p-[10px] border-b border-color flex items-center justify-center cursor-pointer"
-                    :class="{ curr: subIndex == subButtonIndex }"
-                    v-for="(subItem, subIndex) in item.sub_button"
-                    :key="subIndex"
-                    @click.stop="selectBubButton(index, subIndex)"
-                  >
-                    <div
-                      class="menu-name w-full text-base truncate text-center"
-                    >
-                      {{ subItem.name }}
+
+            <el-tabs v-model="activeName" class="my-[20px]" @tab-change="handleClick">
+                <el-tab-pane :label="t('wechatAccessFlow')" name="/channel/wechat" />
+                <el-tab-pane :label="t('customMenu')" name="/channel/wechat/menu" />
+                <el-tab-pane :label="t('wechatTemplate')" name="/channel/wechat/message" />
+                <el-tab-pane :label="t('reply')" name="/channel/wechat/reply" />
+            </el-tabs>
+
+            <div class="flex" v-loading="loading">
+                <div class="preview-wrap w-[300px] h-[550px] mr-[16px] bg-overlay rounded-md flex flex-col justify-between border border-color">
+                    <div class="head w-full h-[70px]"></div>
+
+                    <div class="menu-list h-[70px] flex border-t border-color">
+                        <div class="py-[15px]">
+                            <div class="flex h-full px-[10px] items-center justify-center border-r border-color">
+                                <icon name="iconfont iconjianpan" size="20px" color="#b1b2b3" />
+                            </div>
+                        </div>
+                        <div class="flex-1 flex w-0">
+                            <div class="menu-item py-[15px] flex items-center justify-center cursor-pointer"
+                                :class="{ 'size-1': button.length == 1, 'size-2-3': button.length > 1, 'active': index == buttonIndex, 'curr': index == buttonIndex && subButtonIndex == -1 }"
+                                v-for="(item, index) in button" :key="index" @click="selectButton(index)">
+                                <div class="menu-name px-[10px] border-r border-color w-full leading-[40px] text-base truncate text-center">{{ item.name }}</div>
+                                <div class="active-shade"></div>
+
+                                <!-- 子菜单 -->
+                                <div class="sub-menu-wrap w-full bg-overlay border border-color rounded">
+                                    <div class="menu-item h-[50px] p-[10px] border-b border-color flex items-center justify-center cursor-pointer"
+                                        :class="{ 'curr': subIndex == subButtonIndex }"
+                                        v-for="(subItem, subIndex) in item.sub_button" :key="subIndex"
+                                        @click.stop="selectBubButton(index, subIndex)">
+                                        <div class="menu-name w-full text-base truncate text-center">{{ subItem.name }}</div>
+                                        <div class="active-shade"></div>
+                                    </div>
+                                    <!-- 添加子菜单 -->
+                                    <div class="add-menu flex items-center justify-center flex-1 cursor-pointer menu-item h-[50px]"
+                                        v-show="!item.sub_button || item.sub_button.length < 5"
+                                        @click.stop="addSubButton(index)">
+                                        <icon name="element Plus" />
+                                    </div>
+                                </div>
+                            </div>
+                            <!-- 添加菜单 -->
+                            <div class="add-menu flex items-center justify-center flex-1 cursor-pointer menu-item" v-show="button.length < 3" @click="addButton">
+                                <icon name="element Plus" />
+                            </div>
+                        </div>
                     </div>
-                    <div class="active-shade"></div>
-                  </div>
-                  <!-- 添加子菜单 -->
-                  <div
-                    class="add-menu flex items-center justify-center flex-1 cursor-pointer menu-item h-[50px]"
-                    v-show="!item.sub_button || item.sub_button.length < 5"
-                    @click.stop="addSubButton(index)"
-                  >
-                    <icon name="element Plus" />
-                  </div>
                 </div>
-              </div>
-              <!-- 添加菜单 -->
-              <div
-                class="add-menu flex items-center justify-center flex-1 cursor-pointer menu-item"
-                v-show="button.length < 3"
-                @click="addButton"
-              >
-                <icon name="element Plus" />
-              </div>
-            </div>
-          </div>
-        </div>
 
-        <div class="flex-1">
-          <el-card class="box-card !border-none h-auto" shadow="never">
-            <template v-if="button.length">
-              <div v-for="(item, index) in button" :key="index">
-                <div v-show="index == buttonIndex && subButtonIndex == -1">
-                  <menu-form
-                    :data="item"
-                    @delete="deleteButton"
-                    :index="index"
-                    ref="formRef"
-                  />
-                </div>
+                <div class="flex-1">
+                    <el-card class="box-card !border-none h-auto" shadow="never">
+                        <template v-if="button.length">
+
+                            <div v-for="(item, index) in button" :key="index">
+                                <div v-show="index == buttonIndex && subButtonIndex == -1">
+                                    <menu-form :data="item" @delete="deleteButton" :index="index" ref="formRef" />
+                                </div>
 
-                <div
-                  v-for="(subItem, subIndex) in item.sub_button"
-                  :key="subIndex"
-                >
-                  <div
-                    v-show="index == buttonIndex && subIndex == subButtonIndex"
-                  >
-                    <menu-form
-                      :data="subItem"
-                      @delete="deleteButton"
-                      :index="index"
-                      :sub-index="subIndex"
-                      ref="formRef"
-                    />
-                  </div>
+                                <div v-for="(subItem, subIndex) in item.sub_button" :key="subIndex">
+                                    <div v-show="index == buttonIndex && subIndex == subButtonIndex">
+                                        <menu-form :data="subItem" @delete="deleteButton" :index="index" :sub-index="subIndex" ref="formRef" />
+                                    </div>
+                                </div>
+                            </div>
+
+                        </template>
+                        <div v-else class="py-[20px] leading">尚未添加自定义菜单，点击左侧添加菜单为公众号创建菜单栏。</div>
+                    </el-card>
                 </div>
-              </div>
-            </template>
-            <div v-else class="py-[20px] leading">
-              尚未添加自定义菜单，点击左侧添加菜单为公众号创建菜单栏。
             </div>
-          </el-card>
+        </el-card>
+
+        <div class="fixed-footer-wrap">
+            <div class="fixed-footer">
+                <el-button type="primary" :loading="loading" @click="save()">{{ t('save') }}</el-button>
+            </div>
         </div>
-      </div>
-    </el-card>
-
-    <div class="fixed-footer-wrap">
-      <div class="fixed-footer">
-        <el-button type="primary" :loading="loading" @click="save()">{{
-          t('save')
-        }}</el-button>
-      </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
@@ -157,29 +105,29 @@ const subButtonIndex = ref<number>(-1)
 const formRef = ref<Record<string, any>[] | null>(null)
 const activeName = ref('/channel/wechat/menu')
 const handleClick = (val: any) => {
-  router.push({ path: activeName.value })
+    router.push({ path: activeName.value })
 }
 /**
  * 获取公众号菜单配置
  */
 getWechatMenu().then((res) => {
-  button.value = res.data
-  loading.value = false
+    button.value = res.data
+    loading.value = false
 })
 
 /**
  * 添加一级菜单
  */
 const addButton = () => {
-  button.value.push({
-    name: '菜单名称',
-    type: 'view',
-    url: '',
-    appid: '',
-    pagepath: '',
-    sub_button: [],
-  })
-  selectButton(button.value.length - 1)
+    button.value.push({
+        name: '菜单名称',
+        type: 'view',
+        url: '',
+        appid: '',
+        pagepath: '',
+        sub_button: []
+    })
+    selectButton(button.value.length - 1)
 }
 
 /**
@@ -187,23 +135,23 @@ const addButton = () => {
  * @param index
  */
 const addSubButton = (index: number) => {
-  !button.value[index].sub_button && (button.value[index].sub_button = [])
-  button.value[index].sub_button.push({
-    name: '子菜单名称',
-    type: 'view',
-    url: '',
-    appid: '',
-    pagepath: '',
-  })
-  selectBubButton(index, button.value[index].sub_button.length - 1)
+    !button.value[index].sub_button && (button.value[index].sub_button = [])
+    button.value[index].sub_button.push({
+        name: '子菜单名称',
+        type: 'view',
+        url: '',
+        appid: '',
+        pagepath: ''
+    })
+    selectBubButton(index, button.value[index].sub_button.length - 1)
 }
 
 /**
  * 选择一级菜单
  */
 const selectButton = (index: number) => {
-  buttonIndex.value = index
-  subButtonIndex.value = -1
+    buttonIndex.value = index
+    subButtonIndex.value = -1
 }
 
 /**
@@ -212,135 +160,138 @@ const selectButton = (index: number) => {
  * @param subIndex
  */
 const selectBubButton = (index: number, subIndex: number) => {
-  buttonIndex.value = index
-  subButtonIndex.value = subIndex
+    buttonIndex.value = index
+    subButtonIndex.value = subIndex
 }
 
 /**
  * 删除菜单
  */
 const deleteButton = () => {
-  ElMessageBox.confirm(t('deleteMemuTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    if (subButtonIndex.value != -1) {
-      button.value[buttonIndex.value].sub_button.splice(subButtonIndex.value, 1)
-      subButtonIndex.value =
-        button.value[buttonIndex.value].sub_button.length - 1
-      // 如果子菜单被全部删除
-      if (subButtonIndex.value == -1) {
-        Object.assign(button.value[buttonIndex.value], {
-          type: 'view',
-          url: '',
-          appid: '',
-          pagepath: '',
-        })
-      }
-    } else {
-      button.value.splice(buttonIndex.value, 1)
-      button.value.length && (buttonIndex.value = button.value.length - 1)
-    }
-  })
+    ElMessageBox.confirm(
+        t('deleteMemuTips'),
+        t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        if (subButtonIndex.value != -1) {
+            button.value[buttonIndex.value].sub_button.splice(subButtonIndex.value, 1)
+            subButtonIndex.value = button.value[buttonIndex.value].sub_button.length - 1
+            // 如果子菜单被全部删除
+            if (subButtonIndex.value == -1) {
+                Object.assign(button.value[buttonIndex.value], {
+                    type: 'view',
+                    url: '',
+                    appid: '',
+                    pagepath: ''
+                })
+            }
+        } else {
+            button.value.splice(buttonIndex.value, 1)
+            button.value.length && (buttonIndex.value = button.value.length - 1)
+        }
+    })
 }
 
 /**
  * 保存
  */
 const save = async () => {
-  if (!formRef.value || !formRef.value) {
-    ElMessage.error(t('menusEmptyTips'))
-    return
-  }
-  for (let i = 0; i < formRef?.value.length; i++) {
-    const item = formRef.value[i]
-    const validate = await item.validate()
-    if (!validate) {
-      buttonIndex.value = item.index
-      subButtonIndex.value = item.subIndex
-      break
+    if (!formRef.value || !formRef.value) {
+        ElMessage.error(t('menusEmptyTips'))
+        return
     }
-  }
-  if (loading.value) return
-  loading.value = true
-  editWechatMenu({ button: button.value })
-    .then(() => {
-      loading.value = false
-    })
-    .catch(() => {
-      loading.value = false
+    for (let i = 0; i < formRef?.value.length; i++) {
+        const item = formRef.value[i]
+        const validate = await item.validate()
+        if (!validate) {
+            buttonIndex.value = item.index
+            subButtonIndex.value = item.subIndex
+            break
+        }
+    }
+    if (loading.value) return
+    loading.value = true
+    editWechatMenu({ button: button.value }).then(() => {
+        loading.value = false
+    }).catch(() => {
+        loading.value = false
     })
 }
 </script>
 
 <style lang="scss" scoped>
-.preview-wrap {
-  .head {
-    background: url('@/app/assets/images/wechat-menu-head-bg.png');
-    background-size: cover;
-  }
+    .preview-wrap {
 
-  .menu-item {
-    position: relative;
+        .head {
+            background: url('@/app/assets/images/wechat-menu-head-bg.png');
+            background-size: cover;
+        }
 
-    &.size-1 {
-      width: 50%;
-    }
+        .menu-item {
+            position: relative;
 
-    &.size-2-3 {
-      width: 33.33%;
-    }
+            &.size-1 {
+                width: 50%;
+            }
 
-    &:nth-child(3) > .menu-name {
-      border-right: 0;
-    }
+            &.size-2-3 {
+                width: 33.33%;
+            }
 
-    .active-shade {
-      position: absolute;
-      width: 100%;
-      height: 100%;
-      border: 1px solid var(--el-color-primary);
-      display: none;
-      left: 0;
-      top: 0;
-    }
+            &:nth-child(3)>.menu-name {
+                border-right: 0;
+            }
 
-    &.curr {
-      background: var(--el-color-primary-light-9);
+            .active-shade {
+                position: absolute;
+                width: 100%;
+                height: 100%;
+                border: 1px solid var(--el-color-primary);
+                display: none;
+                left: 0;
+                top: 0;
+            }
 
-      > .menu-name {
-        color: var(--el-color-primary);
-      }
+            &.curr {
+                background: var(--el-color-primary-light-9);
 
-      & > .active-shade {
-        display: block;
-      }
-    }
+                >.menu-name {
+                    color: var(--el-color-primary);
+                }
 
-    &.active {
-      .sub-menu-wrap {
-        display: block !important;
-      }
-    }
-  }
+                &>.active-shade {
+                    display: block;
+                }
+            }
 
-  .sub-menu-wrap {
-    display: none;
-    position: absolute;
-    top: 0;
-    transform: translateY(calc(-100% - 15px));
+            &.active {
+                .sub-menu-wrap {
+                    display: block !important;
+                }
+            }
+        }
 
-    .menu-item:nth-child(5) {
-      border-bottom: 0;
+        .sub-menu-wrap {
+            display: none;
+            position: absolute;
+            top: 0;
+            transform: translateY(calc(-100% - 15px));
+
+            .menu-item:nth-child(5) {
+                border-bottom: 0;
+            }
+        }
     }
-  }
-}
 
-.dark {
-  .preview-wrap .head {
-    background: url('@/app/assets/images/wechat-menu-head-dark-bg.png');
-    background-size: cover;
-  }
-}
+    .dark {
+
+        .preview-wrap .head {
+            background: url('@/app/assets/images/wechat-menu-head-dark-bg.png');
+            background-size: cover;
+        }
+    }
 </style>
diff --git a/admin/src/app/views/channel/wechat/reply.vue b/admin/src/app/views/channel/wechat/reply.vue
index 8dbdd829..0e22d275 100644
--- a/admin/src/app/views/channel/wechat/reply.vue
+++ b/admin/src/app/views/channel/wechat/reply.vue
@@ -1,113 +1,78 @@
 <template>
-  <!--自动回复-->
-  <div class="main-container">
-    <el-card class="card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ t('title') }}</span>
-      </div>
-
-      <el-tabs v-model="activeName" class="my-[20px]" @tab-change="handleClick">
-        <el-tab-pane :label="t('wechatAccessFlow')" name="/channel/wechat" />
-        <el-tab-pane :label="t('customMenu')" name="/channel/wechat/menu" />
-        <el-tab-pane
-          :label="t('wechatTemplate')"
-          name="/channel/wechat/message"
-        />
-        <el-tab-pane :label="t('reply')" name="/channel/wechat/reply" />
-      </el-tabs>
-
-      <div>
-        <el-radio-group v-model="replyType" style="margin-bottom: 30px">
-          <el-radio-button label="keyword">{{
-            t('keywordReply')
-          }}</el-radio-button>
-          <el-radio-button label="default">{{
-            t('defaultReply')
-          }}</el-radio-button>
-          <el-radio-button label="subscribe">{{
-            t('subscribeReply')
-          }}</el-radio-button>
-        </el-radio-group>
-
-        <div v-show="replyType == 'keyword'">
-          <div class="flex justify-between items-center">
-            <el-button type="primary" @click="addKeywordsReply"
-              >新建回复</el-button
-            >
-          </div>
-
-          <div class="mt-[10px]">
-            <el-table
-              :data="replyTableData.data"
-              size="large"
-              v-loading="replyTableData.loading"
-            >
-              <template #empty>
-                <span>{{ !replyTableData.loading ? t('emptyData') : '' }}</span>
-              </template>
-              <el-table-column prop="name" label="规则名称" min-width="120" />
-              <el-table-column prop="keyword" label="关键字" min-width="120" />
-              <el-table-column label="匹配规则" min-width="150" align="center">
-                <template #default="{ row }">
-                  {{ row.matching_type == 'full' ? '全匹配' : '模糊匹配' }}
-                </template>
-              </el-table-column>
-              <el-table-column label="回复方式" min-width="150" align="center">
-                <template #default="{ row }">
-                  {{ row.reply_method == 'all' ? '全部回复' : '随机回复一条' }}
-                </template>
-              </el-table-column>
-              <el-table-column
-                :label="t('operation')"
-                align="right"
-                fixed="right"
-                width="180"
-              >
-                <template #default="{ row }">
-                  <el-button
-                    type="primary"
-                    link
-                    @click="editKeywordsReply(row)"
-                    >{{ t('edit') }}</el-button
-                  >
-                  <el-button type="primary" link @click="deleteKeyword(row)">{{
-                    t('delete')
-                  }}</el-button>
-                </template>
-              </el-table-column>
-            </el-table>
-
-            <div class="mt-[16px] flex justify-end">
-              <el-pagination
-                v-model:current-page="replyTableData.page"
-                v-model:page-size="replyTableData.limit"
-                layout="total, sizes, prev, pager, next, jumper"
-                :total="replyTableData.total"
-                @size-change="loadKeywordsReplyList()"
-                @current-change="loadKeywordsReplyList"
-              />
+    <!--自动回复-->
+    <div class="main-container">
+        <el-card class="card !border-none" shadow="never">
+
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ t('title') }}</span>
+            </div>
+
+            <el-tabs v-model="activeName" class="my-[20px]" @tab-change="handleClick">
+                <el-tab-pane :label="t('wechatAccessFlow')" name="/channel/wechat" />
+                <el-tab-pane :label="t('customMenu')" name="/channel/wechat/menu" />
+                <el-tab-pane :label="t('wechatTemplate')" name="/channel/wechat/message" />
+                <el-tab-pane :label="t('reply')" name="/channel/wechat/reply" />
+            </el-tabs>
+
+            <div>
+                <el-radio-group v-model="replyType" style="margin-bottom: 30px">
+                    <el-radio-button label="keyword">{{ t('keywordReply') }}</el-radio-button>
+                    <el-radio-button label="default">{{ t('defaultReply') }}</el-radio-button>
+                    <el-radio-button label="subscribe">{{ t('subscribeReply') }}</el-radio-button>
+                </el-radio-group>
+
+                <div v-show="replyType == 'keyword'">
+                    <div class="flex justify-between items-center">
+                        <el-button type="primary" @click="addKeywordsReply">新建回复</el-button>
+                    </div>
+
+                    <div class="mt-[10px]">
+                        <el-table :data="replyTableData.data" size="large" v-loading="replyTableData.loading">
+                            <template #empty>
+                                <span>{{ !replyTableData.loading ? t('emptyData') : '' }}</span>
+                            </template>
+                            <el-table-column prop="name" label="规则名称" min-width="120" />
+                            <el-table-column prop="keyword" label="关键字" min-width="120" />
+                            <el-table-column label="匹配规则" min-width="150" align="center">
+                                <template #default="{ row }">
+                                    {{ row.matching_type == 'full' ? '全匹配' : '模糊匹配' }}
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="回复方式" min-width="150" align="center">
+                                <template #default="{ row }">
+                                    {{ row.reply_method == 'all' ? '全部回复' : '随机回复一条' }}
+                                </template>
+                            </el-table-column>
+                            <el-table-column :label="t('operation')" align="right" fixed="right" width="180">
+                                <template #default="{ row }">
+                                    <el-button type="primary" link @click="editKeywordsReply(row)">{{ t('edit') }}</el-button>
+                                    <el-button type="primary" link @click="deleteKeyword(row)">{{ t('delete') }}</el-button>
+                                </template>
+                            </el-table-column>
+                        </el-table>
+
+                        <div class="mt-[16px] flex justify-end">
+                            <el-pagination v-model:current-page="replyTableData.page" v-model:page-size="replyTableData.limit"
+                               layout="total, sizes, prev, pager, next, jumper" :total="replyTableData.total"
+                               @size-change="loadKeywordsReplyList()" @current-change="loadKeywordsReplyList" />
+                        </div>
+                    </div>
+                </div>
+                <div v-show="replyType == 'default'">
+                    <reply-form v-model="defaultReply" ref="defaultReplyRef"/>
+                    <div class="mt-[20px]">
+                        <el-button type="primary" :loading="loading" @click="save()">{{ t('save') }}</el-button>
+                    </div>
+                </div>
+                <div v-show="replyType == 'subscribe'">
+                    <reply-form v-model="subscribeReply" ref="subscribeReplyRef"/>
+                    <div class="mt-[20px]">
+                        <el-button type="primary" :loading="loading" @click="save()">{{ t('save') }}</el-button>
+                    </div>
+                </div>
             </div>
-          </div>
-        </div>
-        <div v-show="replyType == 'default'">
-          <reply-form v-model="defaultReply" ref="defaultReplyRef" />
-          <div class="mt-[20px]">
-            <el-button type="primary" :loading="loading" @click="save()">{{
-              t('save')
-            }}</el-button>
-          </div>
-        </div>
-        <div v-show="replyType == 'subscribe'">
-          <reply-form v-model="subscribeReply" ref="subscribeReplyRef" />
-          <div class="mt-[20px]">
-            <el-button type="primary" :loading="loading" @click="save()">{{
-              t('save')
-            }}</el-button>
-          </div>
-        </div>
-      </div>
-    </el-card>
-  </div>
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -115,12 +80,12 @@ import { reactive, ref } from 'vue'
 import { useRouter } from 'vue-router'
 import { t } from '@/lang'
 import {
-  getKeywordsReplyList,
-  getDefaultReply,
-  getSubscribeReply,
-  setDefaultReply,
-  setSubscribeReply,
-  delKeywordsReply,
+    getKeywordsReplyList,
+    getDefaultReply,
+    getSubscribeReply,
+    setDefaultReply,
+    setSubscribeReply,
+    delKeywordsReply
 } from '@/app/api/wechat'
 import ReplyForm from '@/app/views/channel/wechat/components/reply-form.vue'
 import { ElMessageBox } from 'element-plus'
@@ -130,102 +95,95 @@ const activeName = ref('/channel/wechat/reply')
 const replyType = ref('keyword')
 
 const addKeywordsReply = () => {
-  router.push('/channel/wechat/keyword_reply_edit')
+    router.push('/channel/wechat/keyword_reply_edit')
 }
 
 const editKeywordsReply = (row: Object) => {
-  router.push('/channel/wechat/keyword_reply_edit?id=' + row.id)
+    router.push('/channel/wechat/keyword_reply_edit?id=' + row.id)
 }
 
 /**
  * 删除菜单
  */
 const deleteKeyword = (row: Object) => {
-  ElMessageBox.confirm(t('replyDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    delKeywordsReply(row.id)
-      .then(() => {
-        loadKeywordsReplyList()
-      })
-      .catch(() => {})
-  })
+    ElMessageBox.confirm(t('replyDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        delKeywordsReply(row.id).then(() => {
+            loadKeywordsReplyList()
+        }).catch(() => {
+        })
+    })
 }
 const handleClick = (val: any) => {
-  router.push({ path: activeName.value })
+    router.push({ path: activeName.value })
 }
 
 const defaultReply = ref({})
 const subscribeReply = ref({})
 
-getDefaultReply()
-  .then(({ data }) => {
+getDefaultReply().then(({ data }) => {
     data.length != 0 && (defaultReply.value = data.content)
-  })
-  .catch()
+}).catch()
 
-getSubscribeReply()
-  .then(({ data }) => {
+getSubscribeReply().then(({ data }) => {
     data.length != 0 && (subscribeReply.value = data.content)
-  })
-  .catch()
+}).catch()
 
 const defaultReplyRef = ref(null)
 const subscribeReplyRef = ref(null)
 
 const save = async () => {
-  let verify = true,
-    api,
-    data = {}
-
-  switch (replyType.value) {
-    case 'default':
-      await defaultReplyRef.value?.verify().then((res) => {
-        verify = res
-      })
-      api = setDefaultReply
-      data = defaultReply.value
-      break
-    case 'subscribe':
-      await subscribeReplyRef.value?.verify().then((res) => {
-        verify = res
-      })
-      api = setSubscribeReply
-      data = subscribeReply.value
-      break
-  }
-  if (verify) {
-    api({ content: data })
-      .then(() => {})
-      .catch()
-  }
+    let verify = true,
+        api,
+        data = {}
+
+    switch (replyType.value) {
+        case 'default':
+            await defaultReplyRef.value?.verify().then(res => {
+                verify = res
+            })
+            api = setDefaultReply
+            data = defaultReply.value
+            break
+        case 'subscribe':
+            await subscribeReplyRef.value?.verify().then(res => {
+                verify = res
+            })
+            api = setSubscribeReply
+            data = subscribeReply.value
+            break
+    }
+    if (verify) {
+        api({content: data}).then(() => {}).catch()
+    }
 }
 
 const replyTableData = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: []
 })
 
 const loadKeywordsReplyList = (page: number = 1) => {
-  replyTableData.loading = true
-  replyTableData.page = page
-
-  getKeywordsReplyList({
-    page: replyTableData.page,
-    limit: replyTableData.limit,
-  })
-    .then((res) => {
-      replyTableData.loading = false
-      replyTableData.data = res.data.data
-      replyTableData.total = res.data.total
-    })
-    .catch(() => {
-      replyTableData.loading = false
+    replyTableData.loading = true
+    replyTableData.page = page
+
+    getKeywordsReplyList({
+        page: replyTableData.page,
+        limit: replyTableData.limit
+    }).then(res => {
+        replyTableData.loading = false
+        replyTableData.data = res.data.data
+        replyTableData.total = res.data.total
+    }).catch(() => {
+        replyTableData.loading = false
     })
 }
 loadKeywordsReplyList()
diff --git a/admin/src/app/views/channel/wechat/template.vue b/admin/src/app/views/channel/wechat/template.vue
index bae4777f..1df0e57b 100644
--- a/admin/src/app/views/channel/wechat/template.vue
+++ b/admin/src/app/views/channel/wechat/template.vue
@@ -1,116 +1,66 @@
 <template>
-  <!--模板消息-->
-  <div class="main-container">
-    <el-card class="card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-        <el-button
-          type="primary"
-          class="w-[100px]"
-          @click="batchAcquisitionFn()"
-          >{{ t('batchAcquisition') }}</el-button
-        >
-      </div>
+    <!--模板消息-->
+    <div class="main-container">
+        <el-card class="card !border-none" shadow="never">
 
-      <el-tabs v-model="activeName" class="my-[20px]" @tab-change="handleClick">
-        <el-tab-pane :label="t('wechatAccessFlow')" name="/channel/wechat" />
-        <el-tab-pane :label="t('customMenu')" name="/channel/wechat/menu" />
-        <el-tab-pane
-          :label="t('wechatTemplate')"
-          name="/channel/wechat/message"
-        />
-        <el-tab-pane :label="t('reply')" name="/channel/wechat/reply" />
-      </el-tabs>
-
-      <el-table
-        :data="cronTableData.data"
-        :span-method="templateSpan"
-        size="large"
-        v-loading="cronTableData.loading"
-      >
-        <template #empty>
-          <span>{{ !cronTableData.loading ? t('emptyData') : '' }}</span>
-        </template>
-
-        <el-table-column
-          prop="addon_name"
-          :label="t('addon')"
-          min-width="120"
-        />
-        <el-table-column
-          prop="name"
-          :show-overflow-tooltip="true"
-          :label="t('name')"
-          min-width="150"
-        >
-          <template #default="{ row }">
-            <div class="flex items-center">
-              <span class="mr-[5px]">{{ row.name }}</span>
-              <el-tooltip
-                :content="row.wechat.tips"
-                v-if="row.wechat.tips"
-                placement="top"
-              >
-                <icon name="element WarningFilled" />
-              </el-tooltip>
-            </div>
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          :label="t('messageType')"
-          min-width="100"
-          align="center"
-        >
-          <template #default="{ row }">
-            <span>{{
-              row.message_type == 1 ? t('buyerNews') : t('sellerMessage')
-            }}</span>
-          </template>
-        </el-table-column>
-
-        <el-table-column :label="t('isStart')" min-width="100" align="center">
-          <template #default="{ row }">
-            {{ row.is_wechat == 1 ? t('startUsing') : t('statusDeactivate') }}
-          </template>
-        </el-table-column>
-
-        <el-table-column :label="t('response')" min-width="180">
-          <template #default="{ row }">
-            <div
-              v-for="(item, index) in row.wechat.content"
-              :key="'a' + index"
-              class="text-left"
-            >
-              {{ item.join('：') }}
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+                <el-button type="primary" class="w-[100px]" @click="batchAcquisitionFn()">{{ t('batchAcquisition') }}</el-button>
             </div>
-          </template>
-        </el-table-column>
 
-        <el-table-column
-          prop="wechat_template_id"
-          :label="t('serialNumber')"
-          min-width="140"
-        />
-
-        <el-table-column
-          :label="t('operation')"
-          fixed="right"
-          align="right"
-          width="200"
-        >
-          <template #default="{ row }">
-            <el-button type="primary" link @click="infoSwitch(row)">{{
-              row.is_wechat == 1 ? t('close') : t('open')
-            }}</el-button>
-            <el-button type="primary" link @click="batchAcquisitionFn(row)">{{
-              t('regain')
-            }}</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
-  </div>
+            <el-tabs v-model="activeName" class="my-[20px]" @tab-change="handleClick">
+                <el-tab-pane :label="t('wechatAccessFlow')" name="/channel/wechat" />
+                <el-tab-pane :label="t('customMenu')" name="/channel/wechat/menu" />
+                <el-tab-pane :label="t('wechatTemplate')" name="/channel/wechat/message" />
+                <el-tab-pane :label="t('reply')" name="/channel/wechat/reply" />
+            </el-tabs>
+
+            <el-table :data="cronTableData.data" :span-method="templateSpan" size="large" v-loading="cronTableData.loading">
+                <template #empty>
+                    <span>{{ !cronTableData.loading ? t('emptyData') : '' }}</span>
+                </template>
+
+                <el-table-column prop="addon_name" :label="t('addon')" min-width="120" />
+                <el-table-column prop="name" :show-overflow-tooltip="true" :label="t('name')" min-width="150" >
+                    <template #default="{ row }">
+                        <div class="flex items-center">
+                            <span class="mr-[5px]">{{row.name }}</span>
+                            <el-tooltip :content="row.wechat.tips" v-if="row.wechat.tips" placement="top">
+                                <icon name="element WarningFilled" />
+                            </el-tooltip>
+                        </div>
+                    </template>
+                </el-table-column>
+
+                <el-table-column :label="t('messageType')" min-width="100" align="center">
+                    <template #default="{ row }">
+                        <span>{{ row.message_type == 1 ? t('buyerNews') : t('sellerMessage') }}</span>
+                    </template>
+                </el-table-column>
+
+                <el-table-column :label="t('isStart')" min-width="100" align="center">
+                    <template #default="{ row }">
+                        {{ row.is_wechat == 1 ? t('startUsing') : t('statusDeactivate') }}
+                    </template>
+                </el-table-column>
+
+                <el-table-column :label="t('response')" min-width="180">
+                    <template #default="{ row }">
+                        <div v-for="(item, index) in row.wechat.content" :key="'a' + index" class="text-left">{{ item.join("：") }}</div>
+                    </template>
+                </el-table-column>
+
+                <el-table-column prop="wechat_template_id" :label="t('serialNumber')" min-width="140" />
+
+                <el-table-column :label="t('operation')" fixed="right" align="right" width="200">
+                    <template #default="{ row }">
+                        <el-button type="primary" link @click="infoSwitch(row)">{{ row.is_wechat == 1 ? t('close') : t('open') }}</el-button>
+                        <el-button type="primary" link @click="batchAcquisitionFn(row)">{{ t('regain') }}</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -126,76 +76,69 @@ const route = useRoute()
 const router = useRouter()
 const pageName = route.meta.title
 const cronTableData = reactive({
-  loading: true,
-  data: [],
+    loading: true,
+    data: []
 })
 const activeName = ref('/channel/wechat/message')
 const handleClick = (val: any) => {
-  router.push({ path: activeName.value })
+    router.push({ path: activeName.value })
 }
 /**
  * 获取消息模板列表
  */
 const loadCronList = (page: number = 1) => {
-  cronTableData.loading = true
-
-  getTemplateList()
-    .then((res) => {
-      cronTableData.loading = false
-      let data = []
-      res.data.forEach((item) => {
-        if (item.notice.length) {
-          const addons = []
-          Object.keys(item.notice).forEach((key, index) => {
-            const notice = item.notice[key]
-            notice.addon_name = item.title
-            addons.push(notice)
-          })
-          if (addons.length) {
-            addons[0].rowspan = addons.length
-            data = data.concat(addons)
-          }
-        }
-      })
-      cronTableData.data = data
-    })
-    .catch((e) => {
-      cronTableData.loading = false
+    cronTableData.loading = true
+
+    getTemplateList().then(res => {
+        cronTableData.loading = false
+        let data = []
+        res.data.forEach(item => {
+            if (item.notice.length) {
+                const addons = []
+                Object.keys(item.notice).forEach((key, index) => {
+                    const notice = item.notice[key]
+                    notice.addon_name = item.title
+                    addons.push(notice)
+                })
+                if (addons.length) {
+                    addons[0].rowspan = addons.length
+                    data = data.concat(addons)
+                }
+            }
+        })
+        cronTableData.data = data
+    }).catch((e) => {
+        cronTableData.loading = false
     })
 }
 loadCronList()
 
-const templateSpan = (row: any) => {
-  if (row.columnIndex === 0) {
-    if (row.row.rowspan) {
-      return {
-        rowspan: row.row.rowspan,
-        colspan: 1,
-      }
-    } else {
-      return {
-        rowspan: 0,
-        colspan: 0,
-      }
+const templateSpan = (row : any) => {
+    if (row.columnIndex === 0) {
+        if (row.row.rowspan) {
+            return {
+                rowspan: row.row.rowspan,
+                colspan: 1
+            }
+        } else {
+            return {
+                rowspan: 0,
+                colspan: 0
+            }
+        }
     }
-  }
 }
 
 /**
  * 批量获取
  */
 const batchAcquisitionFn = (row: AnyObject | null = null) => {
-  const loading = ElLoading.service({
-    lock: true,
-    background: 'rgba(0, 0, 0, 0)',
-  })
-  getBatchAcquisition({ keys: row ? [row.key] : [] })
-    .then(() => {
-      loadCronList()
-      loading.close()
-    })
-    .catch(() => {
-      loading.close()
+    const loading = ElLoading.service({ lock: true, background: 'rgba(0, 0, 0, 0)' })
+    getBatchAcquisition({ keys: row ? [row.key] : [] }).then(() => {
+        loadCronList()
+        loading.close()
+    }).catch(() => {
+        loading.close()
     })
 }
 
@@ -203,56 +146,54 @@ const batchAcquisitionFn = (row: AnyObject | null = null) => {
  * 开启或关闭模版消息
  */
 interface Switch {
-  key: string
-  type: string
-  status: number
+    key: string;
+    type: string;
+    status: number
 }
 
 const infoSwitch = (res: AnyObject) => {
-  const data = ref<Switch>({
-    key: '',
-    type: '',
-    status: 0,
-  })
-  data.value.status = res.is_wechat ? 0 : 1
-  data.value.key = res.key
-  data.value.type = 'wechat'
-  cronTableData.loading = true
-  editNoticeStatus(data.value)
-    .then((res) => {
-      loadCronList()
+    const data = ref<Switch>({
+        key: '',
+        type: '',
+        status: 0
     })
-    .catch(() => {
-      cronTableData.loading = false
+    data.value.status = res.is_wechat ? 0 : 1
+    data.value.key = res.key
+    data.value.type = 'wechat'
+    cronTableData.loading = true
+    editNoticeStatus(data.value).then(res => {
+        loadCronList()
+    }).catch(() => {
+        cronTableData.loading = false
     })
 }
 </script>
 <style lang="scss" scoped>
 :deep(.el-tabs__item:hover) {
-  border-bottom: 2px solid var(--el-color-primary);
+    border-bottom: 2px solid var(--el-color-primary);
 }
 
 :deep(.el-tabs__item) {
-  padding: 0;
+    padding: 0;
 }
 
-:deep(.el-tabs__item + .el-tabs__item) {
-  margin-right: 20px;
-  margin-left: 20px;
-  // border-bottom: 2px solid var(--el-color-primary);
+:deep(.el-tabs__item+.el-tabs__item) {
+    margin-right: 20px;
+    margin-left: 20px;
+    // border-bottom: 2px solid var(--el-color-primary);
 }
 
 :deep(.el-tabs--top) {
-  .el-tabs__active-bar {
-    display: none;
-  }
+    .el-tabs__active-bar {
+        display: none;
+    }
 
-  .el-tabs__item.is-active {
-    border-bottom: 2px solid var(--el-color-primary);
-  }
+    .el-tabs__item.is-active {
+        border-bottom: 2px solid var(--el-color-primary);
+    }
 
-  .el-tabs__item.is-top:nth-child(2) {
-    margin-right: 20px;
-  }
-}
-</style>
+    .el-tabs__item.is-top:nth-child(2) {
+        margin-right: 20px;
+    }
+
+}</style>
diff --git a/admin/src/app/views/children_like/children_like.vue b/admin/src/app/views/children_like/children_like.vue
new file mode 100644
index 00000000..59d5f064
--- /dev/null
+++ b/admin/src/app/views/children_like/children_like.vue
@@ -0,0 +1,564 @@
+<template>
+  <div class="main-container">
+    <el-card class="box-card !border-none" shadow="never">
+      <el-tabs v-model="active">
+        <el-tab-pane label="互动游戏" name="CourseSyllabus">
+          <div class="flex justify-between items-center">
+            <el-button type="primary" @click="addEvent">
+              {{ t('addLessonCourseTeaching') }}
+            </el-button>
+          </div>
+          <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+            <el-form :inline="true" :model="lessonCourseTeachingTable.searchParam" ref="searchFormRef">
+              <el-form-item :label="t('title')" prop="title">
+                <el-input v-model="lessonCourseTeachingTable.searchParam.title" :placeholder="t('titlePlaceholder')" />
+              </el-form-item>
+
+              <el-form-item :label="t('status')" prop="status">
+                <el-select class="w-[280px]" v-model="lessonCourseTeachingTable.searchParam.status" clearable :placeholder="t('statusPlaceholder')">
+                  <el-option label="全部" value=""></el-option>
+                  <el-option
+                      v-for="(item, index) in statusList"
+                      :key="index"
+                      :label="item.name"
+                      :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+
+              <el-form-item :label="t('createTime')" prop="create_time">
+                <el-date-picker v-model="lessonCourseTeachingTable.searchParam.create_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+              </el-form-item>
+
+              <el-form-item :label="t('updateTime')" prop="update_time">
+                <el-date-picker v-model="lessonCourseTeachingTable.searchParam.update_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+              </el-form-item>
+
+              <el-form-item>
+                <el-button type="primary" @click="loadLessonCourseTeachingList()">{{ t('search') }}</el-button>
+                <el-button @click="resetForm(searchFormRef, 27)">{{ t('reset') }}</el-button>
+              </el-form-item>
+            </el-form>
+          </el-card>
+
+          <div class="mt-[10px]">
+            <el-table :data="lessonCourseTeachingTable.data" size="large" v-loading="lessonCourseTeachingTable.loading">
+              <template #empty>
+                <span>{{ !lessonCourseTeachingTable.loading ? t('emptyData') : '' }}</span>
+              </template>
+              <el-table-column prop="title" :label="t('title')" min-width="120" :show-overflow-tooltip="true"/>
+
+              <el-table-column :label="t('image')" width="100" align="left">
+                <template #default="{ row }">
+                  <el-avatar v-if="row.image" :src="img(row.image)" />
+                  <el-avatar v-else icon="UserFilled" />
+                </template>
+              </el-table-column>
+              <el-table-column :label="t('type')" min-width="180" align="center" :show-overflow-tooltip="true">
+                <template #default="{ row }">
+                  <div v-for="(item, index) in typeList">
+                    <div v-if="item.value == row.type">{{ item.name }}</div>
+                  </div>
+                </template>
+              </el-table-column>
+
+              <el-table-column :label="t('status')" min-width="180" align="center" :show-overflow-tooltip="true">
+                <template #default="{ row }">
+                  <div v-for="(item, index) in statusList">
+                    <div v-if="item.value == row.status">{{ item.name }}</div>
+                  </div>
+                </template>
+              </el-table-column>
+
+              <el-table-column :label="t('operation')" fixed="right" min-width="120">
+                <template #default="{ row }">
+                  <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+                  <el-button type="primary" link @click="deleteEvent(row.id, 27)">{{ t('delete') }}</el-button>
+                </template>
+              </el-table-column>
+
+            </el-table>
+            <div class="mt-[16px] flex justify-end">
+              <el-pagination v-model:current-page="lessonCourseTeachingTable.page" v-model:page-size="lessonCourseTeachingTable.limit"
+                             layout="total, sizes, prev, pager, next, jumper" :total="lessonCourseTeachingTable.total"
+                             @size-change="loadLessonCourseTeachingList()" @current-change="loadLessonCourseTeachingList" />
+            </div>
+          </div>
+
+          <edit ref="editLessonCourseTeachingDialog" @complete="loadLessonCourseTeachingList" />
+        </el-tab-pane>
+        <el-tab-pane label="套圈游戏" name="JumpLessonLibrary">
+          <div class="flex justify-between items-center">
+            <el-button type="primary" @click="addJumpLessonLibrary">
+              {{ t('addJumpLessonLibrary') }}
+            </el-button>
+          </div>
+          <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+            <el-form :inline="true" :model="JumpLessonLibraryTable.searchParam" ref="searchFormRef">
+              <el-form-item :label="t('title')" prop="title">
+                <el-input v-model="JumpLessonLibraryTable.searchParam.title" :placeholder="t('titlePlaceholder')" />
+              </el-form-item>
+
+              <el-form-item :label="t('status')" prop="status">
+                <el-select class="w-[280px]" v-model="JumpLessonLibraryTable.searchParam.status" clearable :placeholder="t('statusPlaceholder')">
+                  <el-option label="全部" value=""></el-option>
+                  <el-option
+                      v-for="(item, index) in statusList"
+                      :key="index"
+                      :label="item.name"
+                      :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+
+              <el-form-item :label="t('createTime')" prop="create_time">
+                <el-date-picker v-model="JumpLessonLibraryTable.searchParam.create_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+              </el-form-item>
+
+              <el-form-item :label="t('updateTime')" prop="update_time">
+                <el-date-picker v-model="JumpLessonLibraryTable.searchParam.update_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+              </el-form-item>
+
+              <el-form-item>
+                <el-button type="primary" @click="loadJumpLessonLibraryList()">{{ t('search') }}</el-button>
+                <el-button @click="resetForm(searchFormRef, 28)">{{ t('reset') }}</el-button>
+              </el-form-item>
+            </el-form>
+          </el-card>
+
+          <div class="mt-[10px]">
+            <el-table :data="JumpLessonLibraryTable.data" size="large" v-loading="JumpLessonLibraryTable.loading">
+              <template #empty>
+                <span>{{ !JumpLessonLibraryTable.loading ? t('emptyData') : '' }}</span>
+              </template>
+              <el-table-column prop="title" :label="t('title')" min-width="120" :show-overflow-tooltip="true"/>
+
+              <el-table-column :label="t('image')" width="100" align="left">
+                <template #default="{ row }">
+                  <el-avatar v-if="row.image" :src="img(row.image)" />
+                  <el-avatar v-else icon="UserFilled" />
+                </template>
+              </el-table-column>
+              <el-table-column :label="t('type')" min-width="180" align="center" :show-overflow-tooltip="true">
+                <template #default="{ row }">
+                  <div v-for="(item, index) in typeList">
+                    <div v-if="item.value == row.type">{{ item.name }}</div>
+                  </div>
+                </template>
+              </el-table-column>
+
+              <el-table-column :label="t('status')" min-width="180" align="center" :show-overflow-tooltip="true">
+                <template #default="{ row }">
+                  <div v-for="(item, index) in statusList">
+                    <div v-if="item.value == row.status">{{ item.name }}</div>
+                  </div>
+                </template>
+              </el-table-column>
+
+              <el-table-column :label="t('operation')" fixed="right" min-width="120">
+                <template #default="{ row }">
+                  <el-button type="primary" link @click="editJumpLessonLibrary(row)">{{ t('edit') }}</el-button>
+                  <el-button type="primary" link @click="deleteEvent(row.id, 28)">{{ t('delete') }}</el-button>
+                </template>
+              </el-table-column>
+
+            </el-table>
+            <div class="mt-[16px] flex justify-end">
+              <el-pagination v-model:current-page="JumpLessonLibraryTable.page" v-model:page-size="JumpLessonLibraryTable.limit"
+                             layout="total, sizes, prev, pager, next, jumper" :total="JumpLessonLibraryTable.total"
+                             @size-change="loadJumpLessonLibraryList()" @current-change="loadJumpLessonLibraryList" />
+            </div>
+          </div>
+
+          <edit-jump ref="editJumpLessonLibraryDialog" @complete="loadJumpLessonLibraryList" />
+        </el-tab-pane>
+        <el-tab-pane label="鼓励方式" name="EnTeachingLibrary">
+          <div class="flex justify-between items-center">
+            <el-button type="primary" @click="addEnTeachingLibrary">
+              {{ t('addEnTeachingLibrary') }}
+            </el-button>
+          </div>
+          <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+            <el-form :inline="true" :model="EnTeachingLibraryTable.searchParam" ref="searchFormRef">
+              <el-form-item :label="t('title')" prop="title">
+                <el-input v-model="EnTeachingLibraryTable.searchParam.title" :placeholder="t('titlePlaceholder')" />
+              </el-form-item>
+
+              <el-form-item :label="t('status')" prop="status">
+                <el-select class="w-[280px]" v-model="EnTeachingLibraryTable.searchParam.status" clearable :placeholder="t('statusPlaceholder')">
+                  <el-option label="全部" value=""></el-option>
+                  <el-option
+                      v-for="(item, index) in statusList"
+                      :key="index"
+                      :label="item.name"
+                      :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+
+              <el-form-item :label="t('createTime')" prop="create_time">
+                <el-date-picker v-model="EnTeachingLibraryTable.searchParam.create_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+              </el-form-item>
+
+              <el-form-item :label="t('updateTime')" prop="update_time">
+                <el-date-picker v-model="EnTeachingLibraryTable.searchParam.update_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+              </el-form-item>
+
+              <el-form-item>
+                <el-button type="primary" @click="loadEnTeachingLibraryList()">{{ t('search') }}</el-button>
+                <el-button @click="resetForm(searchFormRef, 29)">{{ t('reset') }}</el-button>
+              </el-form-item>
+            </el-form>
+          </el-card>
+
+          <div class="mt-[10px]">
+            <el-table :data="EnTeachingLibraryTable.data" size="large" v-loading="EnTeachingLibraryTable.loading">
+              <template #empty>
+                <span>{{ !EnTeachingLibraryTable.loading ? t('emptyData') : '' }}</span>
+              </template>
+              <el-table-column prop="title" :label="t('title')" min-width="120" :show-overflow-tooltip="true"/>
+
+              <el-table-column :label="t('image')" width="100" align="left">
+                <template #default="{ row }">
+                  <el-avatar v-if="row.image" :src="img(row.image)" />
+                  <el-avatar v-else icon="UserFilled" />
+                </template>
+              </el-table-column>
+              <el-table-column :label="t('type')" min-width="180" align="center" :show-overflow-tooltip="true">
+                <template #default="{ row }">
+                  <div v-for="(item, index) in typeList">
+                    <div v-if="item.value == row.type">{{ item.name }}</div>
+                  </div>
+                </template>
+              </el-table-column>
+
+              <el-table-column :label="t('status')" min-width="180" align="center" :show-overflow-tooltip="true">
+                <template #default="{ row }">
+                  <div v-for="(item, index) in statusList">
+                    <div v-if="item.value == row.status">{{ item.name }}</div>
+                  </div>
+                </template>
+              </el-table-column>
+
+              <el-table-column :label="t('operation')" fixed="right" min-width="120">
+                <template #default="{ row }">
+                  <el-button type="primary" link @click="editEnTeachingLibrary(row)">{{ t('edit') }}</el-button>
+                  <el-button type="primary" link @click="deleteEvent(row.id, 29)">{{ t('delete') }}</el-button>
+                </template>
+              </el-table-column>
+
+            </el-table>
+            <div class="mt-[16px] flex justify-end">
+              <el-pagination v-model:current-page="EnTeachingLibraryTable.page" v-model:page-size="EnTeachingLibraryTable.limit"
+                             layout="total, sizes, prev, pager, next, jumper" :total="EnTeachingLibraryTable.total"
+                             @size-change="loadEnTeachingLibraryList()" @current-change="loadEnTeachingLibraryList" />
+            </div>
+          </div>
+
+          <edit-en ref="editEnTeachingLibraryDialog" @complete="loadEnTeachingLibraryList" />
+        </el-tab-pane>
+      </el-tabs>
+    </el-card>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { reactive, ref, watch } from 'vue'
+import { t } from '@/lang'
+import { useDictionary } from '@/app/api/dict'
+import { getLessonCourseTeachingList, deleteLessonCourseTeaching, getWithPersonnelDataList, getJumpLessonLibraryList, getEnTeachingLibraryList, getBasketballTeachingLibraryList, getStrengTeachingLibraryList, getNinjaTeachingLibraryList, getSecurityTeachingLibraryList, getPhysicalTeachingLibraryList } from '@/app/api/lesson_course_teaching'
+import { img } from '@/utils/common'
+import { ElMessageBox,FormInstance } from 'element-plus'
+import Edit from '@/app/views/children_like/components/lesson-course-teaching-edit.vue'
+import EditJump from '@/app/views/children_like/components/Jump-lesson-library-edit.vue'
+import EditEn from '@/app/views/children_like/components/en-course-teaching-edit.vue'
+import { useRoute } from 'vue-router'
+const route = useRoute()
+const pageName = route.meta.title;
+const active = 'CourseSyllabus'
+
+let lessonCourseTeachingTable = reactive({
+  page: 1,
+  limit: 10,
+  total: 0,
+  loading: true,
+  data: [],
+  searchParam:{
+    "title":"",
+    "status":"",
+    "create_time":[],
+    "update_time":[],
+    table_type: 27
+  }
+})
+let JumpLessonLibraryTable = reactive({
+  page: 1,
+  limit: 10,
+  total: 0,
+  loading: true,
+  data: [],
+  searchParam:{
+    "title":"",
+    "status":"",
+    "create_time":[],
+    "update_time":[],
+    table_type: 28
+  }
+})
+let EnTeachingLibraryTable = reactive({
+  page: 1,
+  limit: 10,
+  total: 0,
+  loading: true,
+  data: [],
+  searchParam:{
+    "title":"",
+    "status":"",
+    "create_time":[],
+    "update_time":[],
+    table_type: 29
+  }
+})
+
+const searchFormRef = ref<FormInstance>()
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 字典数据
+const typeList = ref([] as any[])
+const typeDictList = async () => {
+  typeList.value = await (await useDictionary('material_type')).data.dictionary
+}
+typeDictList();
+const statusList = ref([] as any[])
+const statusDictList = async () => {
+  statusList.value = await (await useDictionary('course_status')).data.dictionary
+}
+statusDictList();
+
+const editLessonCourseTeachingDialog: Record<string, any> | null = ref(null)
+const editJumpLessonLibraryDialog: Record<string, any> | null = ref(null)
+const editEnTeachingLibraryDialog: Record<string, any> | null = ref(null)
+const editBasketballTeachingLibraryDialog: Record<string, any> | null = ref(null)
+
+/**
+ * 获取课程教学大纲列表
+ */
+const loadLessonCourseTeachingList = (page: number = 1) => {
+  lessonCourseTeachingTable.loading = true
+  lessonCourseTeachingTable.page = page
+
+  getLessonCourseTeachingList({
+    page: lessonCourseTeachingTable.page,
+    limit: lessonCourseTeachingTable.limit,
+    ...lessonCourseTeachingTable.searchParam
+  }).then(res => {
+    lessonCourseTeachingTable.loading = false
+    lessonCourseTeachingTable.data = res.data.data
+    lessonCourseTeachingTable.total = res.data.total
+  }).catch(() => {
+    lessonCourseTeachingTable.loading = false
+  })
+}
+loadLessonCourseTeachingList()
+
+/**
+ * 添加课程教学大纲
+ */
+const addEvent = () => {
+  editLessonCourseTeachingDialog.value.setFormData()
+  editLessonCourseTeachingDialog.value.showDialog = true
+}
+
+/**
+ * 编辑课程教学大纲
+ * @param data
+ */
+const editEvent = (data: any) => {
+  editLessonCourseTeachingDialog.value.setFormData(data)
+  editLessonCourseTeachingDialog.value.showDialog = true
+}
+
+
+/**
+ * 获取跳绳教案库列表
+ */
+const loadJumpLessonLibraryList = (page: number = 1) => {
+  JumpLessonLibraryTable.loading = true
+  JumpLessonLibraryTable.page = page
+
+  getJumpLessonLibraryList({
+    page: JumpLessonLibraryTable.page,
+    limit: JumpLessonLibraryTable.limit,
+    ...JumpLessonLibraryTable.searchParam
+  }).then(res => {
+    JumpLessonLibraryTable.loading = false
+    JumpLessonLibraryTable.data = res.data.data
+    JumpLessonLibraryTable.total = res.data.total
+  }).catch(() => {
+    JumpLessonLibraryTable.loading = false
+  })
+}
+loadJumpLessonLibraryList()
+
+/**
+ * 添加跳绳教案库
+ */
+const addJumpLessonLibrary = () => {
+  editJumpLessonLibraryDialog.value.setFormData()
+  editJumpLessonLibraryDialog.value.showDialog = true
+}
+
+/**
+ * 编辑跳绳教案库
+ * @param data
+ */
+const editJumpLessonLibrary = (data: any) => {
+  editJumpLessonLibraryDialog.value.setFormData(data)
+  editJumpLessonLibraryDialog.value.showDialog = true
+}
+
+
+/**
+ * 获取增高教案库列表
+ */
+const loadEnTeachingLibraryList = (page: number = 1) => {
+  EnTeachingLibraryTable.loading = true
+  EnTeachingLibraryTable.page = page
+
+  getEnTeachingLibraryList({
+    page: EnTeachingLibraryTable.page,
+    limit: EnTeachingLibraryTable.limit,
+    ...EnTeachingLibraryTable.searchParam
+  }).then(res => {
+    EnTeachingLibraryTable.loading = false
+    EnTeachingLibraryTable.data = res.data.data
+    EnTeachingLibraryTable.total = res.data.total
+  }).catch(() => {
+    EnTeachingLibraryTable.loading = false
+  })
+}
+loadEnTeachingLibraryList()
+
+/**
+ * 添加增高教案库
+ */
+const addEnTeachingLibrary = () => {
+  editEnTeachingLibraryDialog.value.setFormData()
+  editEnTeachingLibraryDialog.value.showDialog = true
+}
+
+/**
+ * 编辑增高教案库
+ * @param data
+ */
+const editEnTeachingLibrary = (data: any) => {
+  editEnTeachingLibraryDialog.value.setFormData(data)
+  editEnTeachingLibraryDialog.value.showDialog = true
+}
+
+
+/**
+ * 删除教研管理
+ */
+const deleteEvent = (id: number, type: number) => {
+  ElMessageBox.confirm(t('lessonCourseTeachingDeleteTips'), t('warning'),
+      {
+        confirmButtonText: t('confirm'),
+        cancelButtonText: t('cancel'),
+        type: 'warning',
+      }
+  ).then(() => {
+    deleteLessonCourseTeaching(id).then(() => {
+      if (type === 27) {
+        loadLessonCourseTeachingList()
+      } else if (type === 28) {
+        loadJumpLessonLibraryList()
+      } else if (type === 29) {
+        loadEnTeachingLibraryList()
+      }
+    }).catch(() => {
+    })
+  })
+}
+
+
+const userPermissionList = ref([])
+const setUserPermissionList = async () => {
+  userPermissionList.value = await (await getWithPersonnelDataList({})).data
+}
+setUserPermissionList()
+
+const resetForm = (formEl: FormInstance | undefined, type: number) => {
+  if (!formEl) return
+  formEl.resetFields()
+  if (type === 27) {
+    lessonCourseTeachingTable = reactive({
+      page: 1,
+      limit: 10,
+      total: 0,
+      loading: true,
+      data: [],
+      searchParam: {
+        "title": "",
+        "status": "",
+        "create_time": [],
+        "update_time": [],
+        table_type: 27
+      }
+    })
+    loadLessonCourseTeachingList()
+  } else if (type === 28) {
+    JumpLessonLibraryTable = reactive({
+      page: 1,
+      limit: 10,
+      total: 0,
+      loading: true,
+      data: [],
+      searchParam: {
+        "title": "",
+        "status": "",
+        "create_time": [],
+        "update_time": [],
+        table_type: 28
+      }
+    })
+    loadJumpLessonLibraryList()
+  } else if (type === 29) {
+    EnTeachingLibraryTable = reactive({
+      page: 1,
+      limit: 10,
+      total: 0,
+      loading: true,
+      data: [],
+      searchParam: {
+        "title": "",
+        "status": "",
+        "create_time": [],
+        "update_time": [],
+        table_type: 29
+      }
+    })
+    loadEnTeachingLibraryList()
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+/* 多行超出隐藏 */
+.multi-hidden {
+  word-break: break-all;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+}
+</style>
diff --git a/admin/src/app/views/children_like/components/Jump-lesson-library-edit.vue b/admin/src/app/views/children_like/components/Jump-lesson-library-edit.vue
new file mode 100644
index 00000000..01aeba1a
--- /dev/null
+++ b/admin/src/app/views/children_like/components/Jump-lesson-library-edit.vue
@@ -0,0 +1,229 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('updateJumpLessonLibrary') : t('addJumpLessonLibrary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addJumpLessonLibrary, editJumpLessonLibrary, getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+import { addPublicLibraryList, editPublicLibraryList } from '@/app/api/future_ontent'
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: '',
+  table_type: 28
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+// ,
+//     user_permission: [
+//         { required: true, message: t('userPermissionPlaceholder'), trigger: 'blur' },
+//
+//     ]
+
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editPublicLibraryList : addPublicLibraryList
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+          data.table_type = 28
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/children_like/components/basketball-course-teaching-edit.vue b/admin/src/app/views/children_like/components/basketball-course-teaching-edit.vue
new file mode 100644
index 00000000..573cba88
--- /dev/null
+++ b/admin/src/app/views/children_like/components/basketball-course-teaching-edit.vue
@@ -0,0 +1,224 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('editBasketballTeachingLibrary') : t('addBasketballTeachingLibrary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addBasketballTeachingLibrary, editBasketballTeachingLibrary, getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+import { addPublicLibraryList, editPublicLibraryList } from '@/app/api/future_ontent'
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+  status: '',
+  table_type: 26
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editPublicLibraryList : addPublicLibraryList
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+            data.table_type = 26
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/children_like/components/en-course-teaching-edit.vue b/admin/src/app/views/children_like/components/en-course-teaching-edit.vue
new file mode 100644
index 00000000..11d9d853
--- /dev/null
+++ b/admin/src/app/views/children_like/components/en-course-teaching-edit.vue
@@ -0,0 +1,223 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('editEnTeachingLibrary') : t('addEnTeachingLibrary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addEnTeachingLibrary, editEnTeachingLibrary, getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+import { addPublicLibraryList, editPublicLibraryList } from '@/app/api/future_ontent'
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: '',
+  table_type: 29
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editPublicLibraryList : addPublicLibraryList
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+          data.table_type = 29
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/children_like/components/lesson-course-teaching-edit.vue b/admin/src/app/views/children_like/components/lesson-course-teaching-edit.vue
new file mode 100644
index 00000000..28c2c4a2
--- /dev/null
+++ b/admin/src/app/views/children_like/components/lesson-course-teaching-edit.vue
@@ -0,0 +1,224 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('updateLessonCourseTeaching') : t('addLessonCourseTeaching')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+
+import { addPublicLibraryList, editPublicLibraryList } from '@/app/api/future_ontent'
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: ''
+    // user_permission: [],
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editPublicLibraryList : addPublicLibraryList
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+            data.table_type = 27
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/children_like/components/ninja-teaching-edit.vue b/admin/src/app/views/children_like/components/ninja-teaching-edit.vue
new file mode 100644
index 00000000..7ac26150
--- /dev/null
+++ b/admin/src/app/views/children_like/components/ninja-teaching-edit.vue
@@ -0,0 +1,224 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('editNinjaTeachingLibrary') : t('addNinjaTeachingLibrary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addNinjaTeachingLibrary, editNinjaTeachingLibrary, getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+import { addPublicLibraryList, editPublicLibraryList } from '@/app/api/future_ontent'
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: '',
+  table_type: 21
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editPublicLibraryList : addPublicLibraryList
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+          data.table_type = 21
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/children_like/components/physical-teaching-edit.vue b/admin/src/app/views/children_like/components/physical-teaching-edit.vue
new file mode 100644
index 00000000..2c53ea49
--- /dev/null
+++ b/admin/src/app/views/children_like/components/physical-teaching-edit.vue
@@ -0,0 +1,223 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('editPhysicalTeachingLibrary') : t('addPhysicalTeachingLibrary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addPhysicalTeachingLibrary, editPhysicalTeachingLibrary, getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: ''
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editPhysicalTeachingLibrary : addPhysicalTeachingLibrary
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/children_like/components/security-teaching-edit.vue b/admin/src/app/views/children_like/components/security-teaching-edit.vue
new file mode 100644
index 00000000..5cda7ef5
--- /dev/null
+++ b/admin/src/app/views/children_like/components/security-teaching-edit.vue
@@ -0,0 +1,224 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('editSecurityTeachingLibrary') : t('addSecurityTeachingLibrary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addSecurityTeachingLibrary, editSecurityTeachingLibrary, getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+import { addPublicLibraryList, editPublicLibraryList } from '@/app/api/future_ontent'
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: '',
+  table_type: 22
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editPublicLibraryList : addPublicLibraryList
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+          data.table_type = 22
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/children_like/components/strengthen-course-teaching-edit.vue b/admin/src/app/views/children_like/components/strengthen-course-teaching-edit.vue
new file mode 100644
index 00000000..95b8d9f3
--- /dev/null
+++ b/admin/src/app/views/children_like/components/strengthen-course-teaching-edit.vue
@@ -0,0 +1,223 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('editStrengthenTeachingLibrary') : t('addStrengthenTeachingLibrary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addStrengTeachingLibrary, editStrengTeachingLibrary, getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+import { addPublicLibraryList, editPublicLibraryList } from '@/app/api/future_ontent'
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: '',
+  table_type: 20
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editPublicLibraryList : addPublicLibraryList
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+          data.table_type = 20
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/departments/components/departments-edit.vue b/admin/src/app/views/departments/components/departments-edit.vue
index 5c1000f2..e66c2972 100644
--- a/admin/src/app/views/departments/components/departments-edit.vue
+++ b/admin/src/app/views/departments/components/departments-edit.vue
@@ -1,166 +1,166 @@
-<template>
-    <el-dialog v-model="showDialog" :title="formData.id ? t('updateDepartments') : t('addDepartments')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
-        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
-                <el-form-item :label="t('departmentName')" prop="department_name">
-                    <el-input v-model="formData.department_name" clearable :placeholder="t('departmentNamePlaceholder')" class="input-width" />
-                </el-form-item>
-                
-                <el-form-item :label="t('parentDepartmentId')" >
-                    <el-select class="input-width" v-model="formData.parent_department_id" clearable :placeholder="t('parentDepartmentIdPlaceholder')">
-                       <el-option label="请选择" value=""></el-option>
-                        <el-option
-                            v-for="(item, index) in parentDepartmentIdList"
-                            :key="index"
-                            :label="item['department_name']"
-                            :value="item['id']"
-                        />
-                    </el-select>
-                </el-form-item>
-                

-        </el-form>
-
-        <template #footer>
-            <span class="dialog-footer">
-                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
-                    t('confirm')
-                }}</el-button>
-            </span>
-        </template>
-    </el-dialog>
-</template>
-
-<script lang="ts" setup>
-import { ref, reactive, computed, watch } from 'vue'
-import { useDictionary } from '@/app/api/dict'
-import { t } from '@/lang'
-import type { FormInstance } from 'element-plus'
-import { addDepartments, editDepartments, getDepartmentsInfo, getWithDepartmentsList } from '@/app/api/departments'
-
-let showDialog = ref(false)
-const loading = ref(false)
-
-/**
- * 表单数据
- */
-const initialFormData = {
-    id: '',
-    department_name: '',
-    parent_department_id: '',

-}
-const formData: Record<string, any> = reactive({ ...initialFormData })
-
-const formRef = ref<FormInstance>()
-
-// 表单验证规则
-const formRules = computed(() => {
-    return {
-    department_name: [
-        { required: true, message: t('departmentNamePlaceholder'), trigger: 'blur' },
-        
-    ]
-,
-    parent_department_id: [
-        { required: true, message: t('parentDepartmentIdPlaceholder'), trigger: 'blur' },
-        
-    ]
-,
-    }
-})
-
-const emit = defineEmits(['complete'])
-
-/**
- * 确认
- * @param formEl
- */
-const confirm = async (formEl: FormInstance | undefined) => {
-    if (loading.value || !formEl) return
-    let save = formData.id ? editDepartments : addDepartments
-
-    await formEl.validate(async (valid) => {
-        if (valid) {
-            loading.value = true
-
-            let data = formData
-
-            save(data).then(res => {
-                loading.value = false
-                showDialog.value = false
-                emit('complete')
-            }).catch(err => {
-                loading.value = false
-            })
-        }
-    })
-}
-
-// 获取字典数据
-    
-
-    
-    const parentDepartmentIdList = ref([] as any[])
-    const setParentDepartmentIdList = async () => {
-    parentDepartmentIdList.value = await (await getWithDepartmentsList({})).data
-    }
-    setParentDepartmentIdList()
-const setFormData = async (row: any = null) => {
-    Object.assign(formData, initialFormData)
-    loading.value = true
-    if(row){
-        const data = await (await getDepartmentsInfo(row.id)).data
-        if (data) Object.keys(formData).forEach((key: string) => {
-            if (data[key] != undefined) formData[key] = data[key]
-        })
-    }
-    loading.value = false
-}
-
-// 验证手机号格式
-const mobileVerify = (rule: any, value: any, callback: any) => {
-    if (value && !/^1[3-9]\d{9}$/.test(value)) {
-        callback(new Error(t('generateMobile')))
-    } else {
-        callback()
-    }
-}
-
-// 验证身份证号
-const idCardVerify = (rule: any, value: any, callback: any) => {
-    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
-        callback(new Error(t('generateIdCard')))
-    } else {
-        callback()
-    }
-}
-
-// 验证邮箱号
-const emailVerify = (rule: any, value: any, callback: any) => {
-    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
-        callback(new Error(t('generateEmail')))
-    } else {
-        callback()
-    }
-}
-
-// 验证请输入整数
-const numberVerify = (rule: any, value: any, callback: any) => {
-    if (!Number.isInteger(value)) {
-        callback(new Error(t('generateNumber')))
-    } else {
-        callback()
-    }
-}
-
-defineExpose({
-    showDialog,
-    setFormData
-})
-</script>
-
-<style lang="scss" scoped></style>
-<style lang="scss">
-.diy-dialog-wrap .el-form-item__label{
-    height: auto  !important;
-}
-</style>
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('updateDepartments') : t('addDepartments')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('departmentName')" prop="department_name">
+                    <el-input v-model="formData.department_name" clearable :placeholder="t('departmentNamePlaceholder')" class="input-width" />
+                </el-form-item>
+                
+                <el-form-item :label="t('parentDepartmentId')" >
+                    <el-select class="input-width" v-model="formData.parent_department_id" clearable :placeholder="t('parentDepartmentIdPlaceholder')">
+                       <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in parentDepartmentIdList"
+                            :key="index"
+                            :label="item['department_name']"
+                            :value="item['id']"
+                        />
+                    </el-select>
+                </el-form-item>
+                
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addDepartments, editDepartments, getDepartmentsInfo, getWithDepartmentsList } from '@/app/api/departments'
+
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    department_name: '',
+    parent_department_id: '',
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    department_name: [
+        { required: true, message: t('departmentNamePlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    parent_department_id: [
+        { required: true, message: t('parentDepartmentIdPlaceholder'), trigger: 'blur' },
+        
+    ]
+
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editDepartments : addDepartments
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    
+
+    
+    const parentDepartmentIdList = ref([] as any[])
+    const setParentDepartmentIdList = async () => {
+    parentDepartmentIdList.value = await (await getWithDepartmentsList({})).data
+    }
+    setParentDepartmentIdList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getDepartmentsInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/departments/departments.vue b/admin/src/app/views/departments/departments.vue
index 5e907bb0..b4b971e4 100644
--- a/admin/src/app/views/departments/departments.vue
+++ b/admin/src/app/views/departments/departments.vue
@@ -1,179 +1,183 @@
-<template>
-    <div class="main-container">
-        <el-card class="box-card !border-none" shadow="never">
-
-            <div class="flex justify-between items-center">
-                <span class="text-lg">{{pageName}}</span>
-                <el-button type="primary" @click="addEvent">
-                    {{ t('addDepartments') }}
-                </el-button>
-            </div>
-
-            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
-                <el-form :inline="true" :model="departmentsTable.searchParam" ref="searchFormRef">
-                    <el-form-item :label="t('departmentName')" prop="department_name">
-                        <el-input v-model="departmentsTable.searchParam.department_name" :placeholder="t('departmentNamePlaceholder')" />
-                    </el-form-item>
-                    
-                    <el-form-item :label="t('parentDepartmentId')" prop="parent_department_id">
-                        <el-select class="w-[280px]" v-model="departmentsTable.searchParam.parent_department_id" clearable :placeholder="t('parentDepartmentIdPlaceholder')">
-                           <el-option
-                                       v-for="(item, index) in parentDepartmentIdList"
-                                       :key="index"
-                                       :label="item['department_name']"
-                                       :value="item['id']"
-                                   />
-                        </el-select>
-                    </el-form-item>
-                    

-                    <el-form-item>
-                        <el-button type="primary" @click="loadDepartmentsList()">{{ t('search') }}</el-button>
-                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
-                    </el-form-item>
-                </el-form>
-            </el-card>
-
-            <div class="mt-[10px]">
-                <el-table :data="departmentsTable.data" size="large" v-loading="departmentsTable.loading">
-                    <template #empty>
-                        <span>{{ !departmentsTable.loading ? t('emptyData') : '' }}</span>
-                    </template>
-                    <el-table-column prop="department_name" :label="t('departmentName')" min-width="120" :show-overflow-tooltip="true"/>
-                    
-                    <el-table-column prop="parent_department_id_name" :label="t('parentDepartmentId')" min-width="120" :show-overflow-tooltip="true"/>
-                    

-                    <el-table-column :label="t('operation')" fixed="right" min-width="120">
-                       <template #default="{ row }">
-                           <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
-                           <el-button type="primary" link @click="deleteEvent(row.id)">{{ t('delete') }}</el-button>
-                       </template>
-                    </el-table-column>
-
-                </el-table>
-                <div class="mt-[16px] flex justify-end">
-                    <el-pagination v-model:current-page="departmentsTable.page" v-model:page-size="departmentsTable.limit"
-                        layout="total, sizes, prev, pager, next, jumper" :total="departmentsTable.total"
-                        @size-change="loadDepartmentsList()" @current-change="loadDepartmentsList" />
-                </div>
-            </div>
-
-            <edit ref="editDepartmentsDialog" @complete="loadDepartmentsList" />
-        </el-card>
-    </div>
-</template>
-
-<script lang="ts" setup>
-import { reactive, ref, watch } from 'vue'
-import { t } from '@/lang'
-import { useDictionary } from '@/app/api/dict'
-import { getDepartmentsList, deleteDepartments, getWithDepartmentsList } from '@/app/api/departments'
-import { img } from '@/utils/common'
-import { ElMessageBox,FormInstance } from 'element-plus'
-import Edit from '@/app/views/departments/components/departments-edit.vue'
-import { useRoute } from 'vue-router'
-const route = useRoute()
-const pageName = route.meta.title;
-
-let departmentsTable = reactive({
-    page: 1,
-    limit: 10,
-    total: 0,
-    loading: true,
-    data: [],
-    searchParam:{
-      "department_name":"",
-      "parent_department_id":""
-    }
-})
-
-const searchFormRef = ref<FormInstance>()
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 字典数据
-    
-
-/**
- * 获取部门列表
- */
-const loadDepartmentsList = (page: number = 1) => {
-    departmentsTable.loading = true
-    departmentsTable.page = page
-
-    getDepartmentsList({
-        page: departmentsTable.page,
-        limit: departmentsTable.limit,
-         ...departmentsTable.searchParam
-    }).then(res => {
-        departmentsTable.loading = false
-        departmentsTable.data = res.data.data
-        departmentsTable.total = res.data.total
-    }).catch(() => {
-        departmentsTable.loading = false
-    })
-}
-loadDepartmentsList()
-
-const editDepartmentsDialog: Record<string, any> | null = ref(null)
-
-/**
- * 添加部门
- */
-const addEvent = () => {
-    editDepartmentsDialog.value.setFormData()
-    editDepartmentsDialog.value.showDialog = true
-}
-
-/**
- * 编辑部门
- * @param data
- */
-const editEvent = (data: any) => {
-    editDepartmentsDialog.value.setFormData(data)
-    editDepartmentsDialog.value.showDialog = true
-}
-
-/**
- * 删除部门
- */
-const deleteEvent = (id: number) => {
-    ElMessageBox.confirm(t('departmentsDeleteTips'), t('warning'),
-        {
-            confirmButtonText: t('confirm'),
-            cancelButtonText: t('cancel'),
-            type: 'warning',
-        }
-    ).then(() => {
-        deleteDepartments(id).then(() => {
-            loadDepartmentsList()
-        }).catch(() => {
-        })
-    })
-}
-
-    
-    const parentDepartmentIdList = ref([])
-    const setParentDepartmentIdList = async () => {
-    parentDepartmentIdList.value = await (await getWithDepartmentsList({})).data
-    }
-    setParentDepartmentIdList()
-
-const resetForm = (formEl: FormInstance | undefined) => {
-    if (!formEl) return
-    formEl.resetFields()
-    loadDepartmentsList()
-}
-</script>
-
-<style lang="scss" scoped>
-/* 多行超出隐藏 */
-.multi-hidden {
-		word-break: break-all;
-		text-overflow: ellipsis;
-		overflow: hidden;
-		display: -webkit-box;
-		-webkit-line-clamp: 2;
-		-webkit-box-orient: vertical;
-	}
-</style>
+<template>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+
+            <div class="flex justify-between items-center">
+                <span class="text-lg">{{pageName}}</span>
+                <el-button type="primary" @click="addEvent">
+                    {{ t('addDepartments') }}
+                </el-button>
+            </div>
+
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="departmentsTable.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('departmentName')" prop="department_name">
+                        <el-input v-model="departmentsTable.searchParam.department_name" :placeholder="t('departmentNamePlaceholder')" />
+                    </el-form-item>
+                    
+                    <el-form-item :label="t('parentDepartmentId')" prop="parent_department_id">
+                        <el-select class="w-[280px]" v-model="departmentsTable.searchParam.parent_department_id" clearable :placeholder="t('parentDepartmentIdPlaceholder')">
+                           <el-option
+                                       v-for="(item, index) in parentDepartmentIdList"
+                                       :key="index"
+                                       :label="item['department_name']"
+                                       :value="item['id']"
+                                   />
+                        </el-select>
+                    </el-form-item>
+                    
+                    <el-form-item>
+                        <el-button type="primary" @click="loadDepartmentsList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+
+            <div class="mt-[10px]">
+                <el-table :data="departmentsTable.data" size="large" v-loading="departmentsTable.loading">
+                    <template #empty>
+                        <span>{{ !departmentsTable.loading ? t('emptyData') : '' }}</span>
+                    </template>
+                    <el-table-column prop="department_name" :label="t('departmentName')" min-width="120" :show-overflow-tooltip="true"/>
+                    
+                    <el-table-column prop="parent_department_id_name" :label="t('parentDepartmentId')" min-width="120" :show-overflow-tooltip="true"/>
+                    
+                    <el-table-column prop="created_at" :label="t('createdAt')" min-width="120" :show-overflow-tooltip="true"/>
+                    
+                    <el-table-column prop="updated_at" :label="t('updatedAt')" min-width="120" :show-overflow-tooltip="true"/>
+                    
+                    <el-table-column :label="t('operation')" fixed="right" min-width="120">
+                       <template #default="{ row }">
+                           <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+                           <el-button type="primary" link @click="deleteEvent(row.id)">{{ t('delete') }}</el-button>
+                       </template>
+                    </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="departmentsTable.page" v-model:page-size="departmentsTable.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="departmentsTable.total"
+                        @size-change="loadDepartmentsList()" @current-change="loadDepartmentsList" />
+                </div>
+            </div>
+
+            <edit ref="editDepartmentsDialog" @complete="loadDepartmentsList" />
+        </el-card>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { reactive, ref, watch } from 'vue'
+import { t } from '@/lang'
+import { useDictionary } from '@/app/api/dict'
+import { getDepartmentsList, deleteDepartments, getWithDepartmentsList } from '@/app/api/departments'
+import { img } from '@/utils/common'
+import { ElMessageBox,FormInstance } from 'element-plus'
+import Edit from '@/app/views/departments/components/departments-edit.vue'
+import { useRoute } from 'vue-router'
+const route = useRoute()
+const pageName = route.meta.title;
+
+let departmentsTable = reactive({
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam:{
+      "department_name":"",
+      "parent_department_id":""
+    }
+})
+
+const searchFormRef = ref<FormInstance>()
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 字典数据
+    
+
+/**
+ * 获取部门列表
+ */
+const loadDepartmentsList = (page: number = 1) => {
+    departmentsTable.loading = true
+    departmentsTable.page = page
+
+    getDepartmentsList({
+        page: departmentsTable.page,
+        limit: departmentsTable.limit,
+         ...departmentsTable.searchParam
+    }).then(res => {
+        departmentsTable.loading = false
+        departmentsTable.data = res.data.data
+        departmentsTable.total = res.data.total
+    }).catch(() => {
+        departmentsTable.loading = false
+    })
+}
+loadDepartmentsList()
+
+const editDepartmentsDialog: Record<string, any> | null = ref(null)
+
+/**
+ * 添加部门
+ */
+const addEvent = () => {
+    editDepartmentsDialog.value.setFormData()
+    editDepartmentsDialog.value.showDialog = true
+}
+
+/**
+ * 编辑部门
+ * @param data
+ */
+const editEvent = (data: any) => {
+    editDepartmentsDialog.value.setFormData(data)
+    editDepartmentsDialog.value.showDialog = true
+}
+
+/**
+ * 删除部门
+ */
+const deleteEvent = (id: number) => {
+    ElMessageBox.confirm(t('departmentsDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning',
+        }
+    ).then(() => {
+        deleteDepartments(id).then(() => {
+            loadDepartmentsList()
+        }).catch(() => {
+        })
+    })
+}
+
+    
+    const parentDepartmentIdList = ref([])
+    const setParentDepartmentIdList = async () => {
+    parentDepartmentIdList.value = await (await getWithDepartmentsList({})).data
+    }
+    setParentDepartmentIdList()
+
+const resetForm = (formEl: FormInstance | undefined) => {
+    if (!formEl) return
+    formEl.resetFields()
+    loadDepartmentsList()
+}
+</script>
+
+<style lang="scss" scoped>
+/* 多行超出隐藏 */
+.multi-hidden {
+		word-break: break-all;
+		text-overflow: ellipsis;
+		overflow: hidden;
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		-webkit-box-orient: vertical;
+	}
+</style>
diff --git a/admin/src/app/views/dict/components/dict.vue b/admin/src/app/views/dict/components/dict.vue
index ef93d3ac..a6872680 100644
--- a/admin/src/app/views/dict/components/dict.vue
+++ b/admin/src/app/views/dict/components/dict.vue
@@ -1,120 +1,58 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="t('dictData')"
-    width="60%"
-    class="diy-dialog-wrap"
-    :destroy-on-close="true"
-  >
-    <div class="mb-[10px]">
-      <el-button type="primary" @click="addEvent">
-        {{ t('addDictData') }}
-      </el-button>
-    </div>
-    <el-table :data="tableDate" size="large" v-loading="loading">
-      <el-table-column :label="t('dataName')" prop="name" />
-      <el-table-column :label="t('dataValue')" prop="value" />
-      <el-table-column
-        :label="t('sort')"
-        align="center"
-        min-width="100px"
-        prop="sort"
-      />
-      <el-table-column :label="t('memo')" prop="memo" />
-      <el-table-column
-        :label="t('operation')"
-        align="right"
-        fixed="right"
-        width="120"
-      >
-        <template #default="{ row, $index }">
-          <el-button type="primary" link @click="editEvent(row, $index)">{{
-            t('edit')
-          }}</el-button>
-          <el-button type="primary" link @click="deleteEvent($index)">{{
-            t('delete')
-          }}</el-button>
+    <el-dialog v-model="showDialog" :title="t('dictData')" width="60%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <div class="mb-[10px]">
+            <el-button type="primary" @click="addEvent">
+                {{ t('addDictData') }}
+            </el-button>
+        </div>
+        <el-table :data="tableDate" size="large" v-loading="loading">
+            <el-table-column :label="t('dataName')" prop="name" />
+            <el-table-column :label="t('dataValue')" prop="value" />
+            <el-table-column :label="t('sort')" align="center" min-width="100px" prop="sort" />
+            <el-table-column :label="t('memo')" prop="memo" />
+            <el-table-column :label="t('operation')" align="right" fixed="right" width="120">
+                <template #default="{ row, $index }">
+                    <el-button type="primary" link @click="editEvent(row, $index)">{{ t('edit') }}</el-button>
+                    <el-button type="primary" link @click="deleteEvent($index)">{{ t('delete') }}</el-button>
+                </template>
+            </el-table-column>
+
+        </el-table>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" @click="confirm()">{{ t('confirm') }}</el-button>
+            </span>
         </template>
-      </el-table-column>
-    </el-table>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button type="primary" @click="confirm()">{{
-          t('confirm')
-        }}</el-button>
-      </span>
-    </template>
-    <el-dialog
-      v-model="dialogVisible"
-      :title="type != 'edit' ? t('addDictData') : t('editDictData')"
-      width="480"
-      class="diy-dialog-wrap"
-      :destroy-on-close="true"
-    >
-      <el-form
-        :model="formData"
-        label-width="120px"
-        ref="formRef"
-        :rules="formRules"
-        class="page-form"
-      >
-        <el-form-item :label="t('name')">
-          <el-input v-model.trim="name" disabled class="input-width" />
-        </el-form-item>
-        <el-form-item :label="t('dataName')" prop="name">
-          <el-input
-            v-model.trim="formData.name"
-            clearable
-            :placeholder="t('dataNamePlaceholder')"
-            class="input-width"
-          />
-        </el-form-item>
-        <el-form-item :label="t('dataValue')" prop="value">
-          <el-input
-            v-model.trim="formData.value"
-            clearable
-            :placeholder="t('dataValuePlaceholder')"
-            class="input-width"
-          />
-        </el-form-item>
-        <el-form-item :label="t('sort')" prop="sort">
-          <div>
-            <el-input-number
-              v-model="formData.sort"
-              ::step="1"
-              step-strictly
-              :value-on-clear="0"
-              :min="0"
-              class="input-width"
-            />
-            <p class="text-[12px] text-[#a9a9a9] leading-normal mt-[5px]">
-              {{ t('sortPlaceholder') }}
-            </p>
-          </div>
-        </el-form-item>
-        <el-form-item :label="t('memo')">
-          <el-input
-            v-model.trim="formData.memo"
-            type="textarea"
-            clearable
-            :placeholder="t('momePlaceholder')"
-            class="input-width"
-          />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="dialogVisible = false">{{
-            t('cancel')
-          }}</el-button>
-          <el-button type="primary" @click="submit(formRef)">{{
-            t('confirm')
-          }}</el-button>
-        </span>
-      </template>
+        <el-dialog v-model="dialogVisible" :title="type != 'edit' ? t('addDictData') : t('editDictData')" width="480" class="diy-dialog-wrap" :destroy-on-close="true">
+            <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form">
+                <el-form-item :label="t('name')">
+                    <el-input v-model.trim="name" disabled class="input-width" />
+                </el-form-item>
+                <el-form-item :label="t('dataName')" prop="name">
+                    <el-input v-model.trim="formData.name" clearable :placeholder="t('dataNamePlaceholder')" class="input-width" />
+                </el-form-item>
+                <el-form-item :label="t('dataValue')" prop="value">
+                    <el-input v-model.trim="formData.value" clearable :placeholder="t('dataValuePlaceholder')" class="input-width" />
+                </el-form-item>
+                <el-form-item :label="t('sort')" prop="sort">
+                    <div>
+                        <el-input-number v-model="formData.sort" ::step="1" step-strictly :value-on-clear="0" :min="0" class="input-width" />
+                        <p class="text-[12px] text-[#a9a9a9] leading-normal mt-[5px]">{{ t('sortPlaceholder') }}</p>
+                    </div>
+                </el-form-item>
+                <el-form-item :label="t('memo')">
+                    <el-input v-model.trim="formData.memo" type="textarea" clearable :placeholder="t('momePlaceholder')" class="input-width" />
+                </el-form-item>
+            </el-form>
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="dialogVisible = false">{{ t('cancel') }}</el-button>
+                    <el-button type="primary" @click="submit(formRef)">{{ t('confirm') }}</el-button>
+                </span>
+            </template>
+        </el-dialog>
     </el-dialog>
-  </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -137,54 +75,52 @@ const formRef = ref()
  */
 const name = ref('')
 const initialFormData = {
-  name: '',
-  value: '',
-  sort: 0,
-  memo: '',
+    name: '',
+    value: '',
+    sort: 0,
+    memo: ''
 }
 const formData = ref({ ...initialFormData })
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    name: [
-      { required: true, message: t('dataNamePlaceholder'), trigger: 'blur' },
-    ],
-    value: [
-      { required: true, message: t('dataValuePlaceholder'), trigger: 'blur' },
-    ],
-  }
+    return {
+        name: [
+            { required: true, message: t('dataNamePlaceholder'), trigger: 'blur' }
+        ],
+        value: [
+            { required: true, message: t('dataValuePlaceholder'), trigger: 'blur' }
+        ]
+    }
 })
 const addEvent = () => {
-  type.value = 'add'
-  formData.value = cloneDeep(initialFormData)
-  dialogVisible.value = true
+    type.value = 'add'
+    formData.value = cloneDeep(initialFormData)
+    dialogVisible.value = true
 }
 const tableIndex = ref(0)
 const editEvent = (row: any, index: number) => {
-  type.value = 'edit'
-  tableIndex.value = index
-  formData.value = cloneDeep(initialFormData)
-  formData.value = Object.assign(formData.value, cloneDeep(row))
-  dialogVisible.value = true
+    type.value = 'edit'
+    tableIndex.value = index
+    formData.value = cloneDeep(initialFormData)
+    formData.value = Object.assign(formData.value, cloneDeep(row))
+    dialogVisible.value = true
 }
 /**
  * 表单确认
  */
 const submit = async (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      if (type.value != 'edit') {
-        tableDate.value.push(cloneDeep(formData.value))
-      } else {
-        tableDate.value.splice(tableIndex.value, 1, cloneDeep(formData.value))
-      }
-      tableDate.value.sort(function (a, b) {
-        return b.sort - a.sort
-      })
-      dialogVisible.value = false
-    }
-  })
+    if (!formEl) return
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            if (type.value != 'edit') {
+                tableDate.value.push(cloneDeep(formData.value))
+            } else {
+                tableDate.value.splice(tableIndex.value, 1, cloneDeep(formData.value))
+            }
+            tableDate.value.sort(function (a, b) { return b.sort - a.sort })
+            dialogVisible.value = false
+        }
+    })
 }
 const emit = defineEmits(['complete'])
 
@@ -192,43 +128,41 @@ const emit = defineEmits(['complete'])
  *删除
  */
 const deleteEvent = (index: number) => {
-  tableDate.value.splice(index, 1)
+    tableDate.value.splice(index, 1)
 }
 /**
  * 确认
  */
 const confirm = async () => {
-  loading.value = true
-  setDictData(id.value, { dictionary: JSON.stringify(tableDate.value) })
-    .then((res) => {
-      loading.value = false
-      showDialog.value = false
-      emit('complete')
-    })
-    .catch(() => {
-      loading.value = false
+    loading.value = true
+    setDictData(id.value, { dictionary: JSON.stringify(tableDate.value) }).then(res => {
+        loading.value = false
+        showDialog.value = false
+        emit('complete')
+    }).catch(() => {
+        loading.value = false
     })
 }
 
 const setFormData = async (row: any = null) => {
-  showDialog.value = true
-  loading.value = true
-  id.value = row.id
-  name.value = row.name
-  const data = await (await getDictInfo(row.id)).data
-  tableDate.value = data.dictionary
-  loading.value = false
+    showDialog.value = true
+    loading.value = true
+    id.value = row.id
+    name.value = row.name
+    const data = await (await getDictInfo(row.id)).data
+    tableDate.value = data.dictionary
+    loading.value = false
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
 <style lang="scss" scoped></style>
 <style lang="scss">
 .diy-dialog-wrap .el-form-item__label {
-  height: auto !important;
+    height: auto !important;
 }
 </style>
diff --git a/admin/src/app/views/dict/components/edit.vue b/admin/src/app/views/dict/components/edit.vue
index 27dd60a4..f755ace2 100644
--- a/admin/src/app/views/dict/components/edit.vue
+++ b/admin/src/app/views/dict/components/edit.vue
@@ -1,63 +1,25 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="formData.id ? t('updateDict') : t('addDict')"
-    width="480"
-    class="diy-dialog-wrap"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="120px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('name')" prop="name">
-        <el-input
-          v-model.trim="formData.name"
-          clearable
-          maxlength="40"
-          show-word-limit
-          :placeholder="t('namePlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-      <el-form-item :label="t('key')" prop="key">
-        <el-input
-          v-model.trim="formData.key"
-          clearable
-          maxlength="40"
-          show-word-limit
-          :placeholder="t('keyPlaceholder')"
-          class="input-width"
-        />
-        <p class="form-tip">{{ t('keyFormatTips') }}</p>
-      </el-form-item>
-      <el-form-item :label="t('memo')">
-        <el-input
-          v-model.trim="formData.memo"
-          type="textarea"
-          clearable
-          :placeholder="t('memoPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-    </el-form>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('updateDict') : t('addDict')" width="480" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+            <el-form-item :label="t('name')" prop="name">
+                <el-input v-model.trim="formData.name" clearable maxlength="40" show-word-limit :placeholder="t('namePlaceholder')" class="input-width" />
+            </el-form-item>
+            <el-form-item :label="t('key')" prop="key">
+                <el-input v-model.trim="formData.key" clearable  maxlength="40" show-word-limit :placeholder="t('keyPlaceholder')" class="input-width" />
+                <p class="form-tip">{{ t('keyFormatTips') }}</p>
+            </el-form-item>
+            <el-form-item :label="t('memo')">
+                <el-input v-model.trim="formData.memo" type="textarea" clearable :placeholder="t('memoPlaceholder')" class="input-width" />
+            </el-form-item>
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -73,10 +35,10 @@ const loading = ref(false)
  * 表单数据
  */
 const initialFormData = {
-  id: '',
-  name: '',
-  key: '',
-  memo: '',
+    id: '',
+    name: '',
+    key: '',
+    memo: ''
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -84,23 +46,27 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    name: [{ required: true, message: t('namePlaceholder'), trigger: 'blur' }],
-    key: [
-      { required: true, message: t('keyPlaceholder'), trigger: 'blur' },
-      {
-        validator: (rule: any, value: any, callback: any) => {
-          if (/^[a-zA-Z_]+$/.test(value)) {
-            callback()
-          } else {
-            callback(new Error(t('keyFormatTips')))
-          }
-        },
-        trigger: 'blur',
-      },
-    ],
-    data: [{ required: true, message: t('dataPlaceholder'), trigger: 'blur' }],
-  }
+    return {
+        name: [
+            { required: true, message: t('namePlaceholder'), trigger: 'blur' }
+        ],
+        key: [
+            { required: true, message: t('keyPlaceholder'), trigger: 'blur' },
+            {
+                validator: (rule: any, value: any, callback: any) => {
+                    if (/^[a-zA-Z_]+$/.test(value)) {
+                        callback()
+                    } else {
+                        callback(new Error(t('keyFormatTips')))
+                    }
+                },
+                trigger: 'blur'
+            }
+        ],
+        data: [
+            { required: true, message: t('dataPlaceholder'), trigger: 'blur' }
+        ]
+    }
 })
 
 const emit = defineEmits(['complete'])
@@ -110,110 +76,103 @@ const emit = defineEmits(['complete'])
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  const save = formData.id ? editDict : addDict
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-
-      const data = formData
-
-      save(data)
-        .then((res) => {
-          loading.value = false
-          showDialog.value = false
-          emit('complete')
-        })
-        .catch(() => {
-          loading.value = false
-        })
-    }
-  })
+    if (loading.value || !formEl) return
+    const save = formData.id ? editDict : addDict
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            const data = formData
+
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
 }
 
 const setFormData = async (row: any = null) => {
-  Object.assign(formData, initialFormData)
-  loading.value = true
-  if (row) {
-    const data = await (await getDictInfo(row.id)).data
-    if (data) {
-      Object.keys(formData).forEach((key: string) => {
-        if (data[key] != undefined) formData[key] = data[key]
-      })
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if (row) {
+        const data = await (await getDictInfo(row.id)).data
+        if (data) {
+            Object.keys(formData).forEach((key: string) => {
+                if (data[key] != undefined) formData[key] = data[key]
+            })
+        }
     }
-  }
-  loading.value = false
+    loading.value = false
 }
 
 // 验证手机号格式
 const mobileVerify = (rule: any, value: any, callback: any) => {
-  if (value && !/^1[3-9]\d{9}$/.test(value)) {
-    callback(new Error(t('generateMobile')))
-  } else {
-    callback()
-  }
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
 }
 
 // 验证身份证号
 const idCardVerify = (rule: any, value: any, callback: any) => {
-  if (
-    value &&
-    !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(
-      value
-    )
-  ) {
-    callback(new Error(t('generateIdCard')))
-  } else {
-    callback()
-  }
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
 }
 
 // 验证邮箱号
 const emailVerify = (rule: any, value: any, callback: any) => {
-  if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
-    callback(new Error(t('generateEmail')))
-  } else {
-    callback()
-  }
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
 }
 
 // 验证至少输入1个字符
 const minInputVerify = (rule: any, value: any, callback: any) => {
-  if (value && !/^\d{0,}$/.test(value)) {
-    callback(new Error(t('generateMin')))
-  } else {
-    callback()
-  }
+    if (value && !/^\d{0,}$/.test(value)) {
+        callback(new Error(t('generateMin')))
+    } else {
+        callback()
+    }
 }
 
 // 验证最多输入150个字符
 const maxInputVerify = (rule: any, value: any, callback: any) => {
-  if (value && !/^\d{0,150}$/.test(value)) {
-    callback(new Error(t('generateMax')))
-  } else {
-    callback()
-  }
+    if (value && !/^\d{0,150}$/.test(value)) {
+        callback(new Error(t('generateMax')))
+    } else {
+        callback()
+    }
 }
 
 // 验证请输入整数
 const numberVerify = (rule: any, value: any, callback: any) => {
-  if (!Number.isInteger(value)) {
-    callback(new Error(t('generateNumber')))
-  } else {
-    callback()
-  }
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
 <style lang="scss" scoped></style>
 <style lang="scss">
-.diy-dialog-wrap .el-form-item__label {
-  height: auto !important;
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
 }
 </style>
diff --git a/admin/src/app/views/dict/list.vue b/admin/src/app/views/dict/list.vue
index 9dffcea9..508b6a26 100644
--- a/admin/src/app/views/dict/list.vue
+++ b/admin/src/app/views/dict/list.vue
@@ -1,99 +1,60 @@
 <template>
-  <!--数据字典-->
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-        <el-button type="primary" @click="addEvent">
-          {{ t('addDict') }}
-        </el-button>
-      </div>
-
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="dictTable.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('name')" prop="name">
-            <el-input
-              v-model.trim="dictTable.searchParam.name"
-              :placeholder="t('namePlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('key')" prop="key">
-            <el-input
-              v-model.trim="dictTable.searchParam.key"
-              :placeholder="t('keyPlaceholder')"
-            />
-          </el-form-item>
-
-          <el-form-item>
-            <el-button type="primary" @click="loadDictList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
-
-      <div class="mt-[10px]">
-        <el-table
-          :data="dictTable.data"
-          size="large"
-          v-loading="dictTable.loading"
-        >
-          <template #empty>
-            <span>{{ !dictTable.loading ? t('emptyData') : '' }}</span>
-          </template>
-          <el-table-column prop="name" :label="t('name')" min-width="120" />
-          <el-table-column prop="key" :label="t('key')" min-width="120" />
-          <el-table-column prop="memo" :label="t('memo')" min-width="120" />
-          <el-table-column
-            prop="create_time"
-            :label="t('createTime')"
-            min-width="120"
-          />
-          <el-table-column
-            :label="t('operation')"
-            align="right"
-            fixed="right"
-            min-width="120"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="dictData(row)">{{
-                t('dictData')
-              }}</el-button>
-              <el-button type="primary" link @click="editEvent(row)">{{
-                t('edit')
-              }}</el-button>
-              <el-button type="primary" link @click="deleteEvent(row.id)">{{
-                t('delete')
-              }}</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="dictTable.page"
-            v-model:page-size="dictTable.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="dictTable.total"
-            @size-change="loadDictList()"
-            @current-change="loadDictList"
-          />
-        </div>
-      </div>
-
-      <edit ref="editDictDialog" @complete="loadDictList" />
-      <dict ref="dictDialog" @complete="loadDictList" />
-    </el-card>
-  </div>
+    <!--数据字典-->
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{pageName}}</span>
+                <el-button type="primary" @click="addEvent">
+                    {{ t('addDict') }}
+                </el-button>
+            </div>
+
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="dictTable.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('name')" prop="name">
+                        <el-input v-model.trim="dictTable.searchParam.name" :placeholder="t('namePlaceholder')" />
+                    </el-form-item>
+                    <el-form-item :label="t('key')" prop="key">
+                        <el-input v-model.trim="dictTable.searchParam.key" :placeholder="t('keyPlaceholder')" />
+                    </el-form-item>
+
+                    <el-form-item>
+                        <el-button type="primary" @click="loadDictList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+
+            <div class="mt-[10px]">
+                <el-table :data="dictTable.data" size="large" v-loading="dictTable.loading">
+                    <template #empty>
+                        <span>{{ !dictTable.loading ? t('emptyData') : '' }}</span>
+                    </template>
+                    <el-table-column prop="name" :label="t('name')" min-width="120" />
+                    <el-table-column prop="key" :label="t('key')" min-width="120" />
+                    <el-table-column prop="memo" :label="t('memo')" min-width="120" />
+                    <el-table-column prop="create_time" :label="t('createTime')" min-width="120" />
+                    <el-table-column :label="t('operation')" align="right" fixed="right" min-width="120">
+                       <template #default="{ row }">
+                           <el-button type="primary" link @click="dictData(row)">{{ t('dictData') }}</el-button>
+                           <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+                           <el-button type="primary" link @click="deleteEvent(row.id)">{{ t('delete') }}</el-button>
+                       </template>
+                    </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="dictTable.page" v-model:page-size="dictTable.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="dictTable.total"
+                        @size-change="loadDictList()" @current-change="loadDictList" />
+                </div>
+            </div>
+
+            <edit ref="editDictDialog" @complete="loadDictList" />
+            <dict ref="dictDialog" @complete="loadDictList" />
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -110,15 +71,15 @@ const route = useRoute()
 const pageName = route.meta.title
 
 const dictTable = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    name: '',
-    key: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        name: '',
+        key: ''
+    }
 })
 
 const searchFormRef = ref<FormInstance>()
@@ -127,21 +88,19 @@ const searchFormRef = ref<FormInstance>()
  * 获取数据字典列表
  */
 const loadDictList = (page: number = 1) => {
-  dictTable.loading = true
-  dictTable.page = page
-
-  getDictList({
-    page: dictTable.page,
-    limit: dictTable.limit,
-    ...dictTable.searchParam,
-  })
-    .then((res) => {
-      dictTable.loading = false
-      dictTable.data = res.data.data
-      dictTable.total = res.data.total
-    })
-    .catch(() => {
-      dictTable.loading = false
+    dictTable.loading = true
+    dictTable.page = page
+
+    getDictList({
+        page: dictTable.page,
+        limit: dictTable.limit,
+        ...dictTable.searchParam
+    }).then(res => {
+        dictTable.loading = false
+        dictTable.data = res.data.data
+        dictTable.total = res.data.total
+    }).catch(() => {
+        dictTable.loading = false
     })
 }
 loadDictList()
@@ -152,8 +111,8 @@ const editDictDialog: Record<string, any> | null = ref(null)
  * 添加数据字典
  */
 const addEvent = () => {
-  editDictDialog.value.setFormData()
-  editDictDialog.value.showDialog = true
+    editDictDialog.value.setFormData()
+    editDictDialog.value.showDialog = true
 }
 
 /**
@@ -161,38 +120,40 @@ const addEvent = () => {
  * @param data
  */
 const editEvent = (data: any) => {
-  editDictDialog.value.setFormData(data)
-  editDictDialog.value.showDialog = true
+    editDictDialog.value.setFormData(data)
+    editDictDialog.value.showDialog = true
 }
 
 const dictDialog: Record<string, any> | null = ref(null)
 
 const dictData = (data: any) => {
-  dictDialog.value.setFormData(data)
+    dictDialog.value.setFormData(data)
 }
 
 /**
  * 删除数据字典
  */
 const deleteEvent = (id: number) => {
-  ElMessageBox.confirm(t('dictDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    deleteDict(id)
-      .then(() => {
-        loadDictList()
-      })
-      .catch(() => {})
-  })
+    ElMessageBox.confirm(t('dictDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        deleteDict(id).then(() => {
+            loadDictList()
+        }).catch(() => {
+        })
+    })
 }
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadDictList()
+    if (!formEl) return
+    formEl.resetFields()
+    loadDictList()
 }
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/diy/components/add-theme.vue b/admin/src/app/views/diy/components/add-theme.vue
index 6c53b562..8830fa30 100644
--- a/admin/src/app/views/diy/components/add-theme.vue
+++ b/admin/src/app/views/diy/components/add-theme.vue
@@ -1,58 +1,29 @@
 <template>
-  <el-dialog
-    v-model="dialogThemeVisible"
-    title="新增颜色"
-    width="550px"
-    align-center
-  >
-    <el-form
-      :model="formData"
-      label-width="120px"
-      ref="formRef"
-      :rules="formRules"
-    >
-      <el-form-item label="名字" prop="title">
-        <el-input
-          v-model="formData.title"
-          class="!w-[250px]"
-          maxlength="7"
-          placeholder="请输入颜色名称"
-        />
-      </el-form-item>
+    <el-dialog v-model="dialogThemeVisible" title="新增颜色" width="550px" align-center>
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules">
+            <el-form-item label="名字" prop="title">
+                <el-input v-model="formData.title" class="!w-[250px]" maxlength="7" placeholder="请输入颜色名称" />
+            </el-form-item>
 
-      <el-form-item label="颜色key值" prop="label">
-        <el-input
-          v-model="formData.label"
-          class="!w-[250px]"
-          maxlength="20"
-          :disabled="type == 'edit'"
-          placeholder="请输入颜色key值"
-        />
-      </el-form-item>
+            <el-form-item label="颜色key值" prop="label">
+                <el-input v-model="formData.label" class="!w-[250px]" maxlength="20" :disabled="type=='edit'" placeholder="请输入颜色key值" />
+            </el-form-item>
 
-      <el-form-item label="颜色value值" prop="value">
-        <el-color-picker
-          v-model="formData.value"
-          show-alpha
-          :predefine="diyStore.predefineColors"
-        />
-      </el-form-item>
+            <el-form-item label="颜色value值" prop="value">
+                <el-color-picker v-model="formData.value" show-alpha :predefine="diyStore.predefineColors"/>
+            </el-form-item>
 
-      <el-form-item label="颜色提示">
-        <el-input
-          v-model="formData.tip"
-          class="!w-[250px]"
-          placeholder="请输入颜色提示"
-        />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button @click="dialogThemeVisible = false">取消</el-button>
-        <el-button type="primary" @click="confirmFn(formRef)">保存</el-button>
-      </div>
-    </template>
-  </el-dialog>
+            <el-form-item label="颜色提示">
+                <el-input v-model="formData.tip" class="!w-[250px]" placeholder="请输入颜色提示" />
+            </el-form-item>
+        </el-form>
+        <template #footer>
+            <div class="dialog-footer">
+                <el-button @click="dialogThemeVisible = false">取消</el-button>
+                <el-button type="primary" @click="confirmFn(formRef)">保存</el-button>
+            </div>
+        </template>
+    </el-dialog>
 </template>
 
 <script setup lang="ts">
@@ -71,73 +42,78 @@ const dialogThemeVisible = ref(false)
 let confirmRepeat = false
 const emit = defineEmits(['confirm'])
 /**
- * 表单数据
- */
+* 表单数据
+*/
 const initialData = {
-  title: '',
-  label: '',
-  value: '',
-  tip: '',
+    title: '',
+    label: '',
+    value: '',
+    tip: ''
 }
-let keyArr = [] // 存储现有颜色的key
+let keyArr = []; // 存储现有颜色的key
 let type = ref('') // 区分编辑和添加
 const formData: Record<string, any> = reactive({ ...initialData })
 
-const open = (option: any) => {
-  keyArr = option.key
-  type.value = ''
-  // 恢复默认值
-  for (let key in formData) {
-    formData[key] = ''
-  }
-  if (option.data && Object.keys(option.data).length) {
-    type.value = 'edit'
-    Object.keys(formData).forEach((item, index) => {
-      formData[item] = option.data[item] ? option.data[item] : ''
-    })
-  }
-  dialogThemeVisible.value = true
+const open = (option:any) => {
+    keyArr = option.key;
+    type.value = '';
+    // 恢复默认值
+    for(let key in formData){
+        formData[key] = ''
+    }
+    if(option.data && Object.keys(option.data).length){
+        type.value = 'edit';
+        Object.keys(formData).forEach((item,index)=>{
+            formData[item] = option.data[item] ? option.data[item] : '';
+        })
+    }
+    dialogThemeVisible.value = true
 }
 
 const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = reactive<FormRules>({
-  title: [{ required: true, message: '请输入颜色名称', trigger: 'blur' }],
-  value: [{ required: true, message: '请输入颜色value值', trigger: 'blur' }],
-  label: [
-    { required: true, message: '请输入颜色key值', trigger: 'blur' },
-    {
-      validator: (rule: any, value: any, callback: any) => {
-        const regex = /^[a-zA-Z0-9-]+$/
-        if (keyArr.indexOf(value) != -1) {
-          callback('新增颜色key值与已存在颜色key值命名重复，请修改命名')
-        }
-        if (!regex.test(value)) {
-          callback('颜色key值只能输入字母、数字和连字符')
-        } else {
-          callback()
+    title: [
+        { required: true, message: "请输入颜色名称", trigger: 'blur' }
+    ],
+    value: [
+        { required: true, message: "请输入颜色value值", trigger: 'blur' }
+    ],
+    label: [
+        { required: true, message: "请输入颜色key值", trigger: 'blur' },
+        {
+            validator: (rule: any, value: any, callback: any) => {
+                const regex = /^[a-zA-Z0-9-]+$/
+                if (keyArr.indexOf(value) != -1) {
+                    callback('新增颜色key值与已存在颜色key值命名重复，请修改命名')
+                } if (!regex.test(value)) {
+                    callback('颜色key值只能输入字母、数字和连字符')
+                } else{
+                    callback();
+                }
+            },
+            trigger: 'blur'
         }
-      },
-      trigger: 'blur',
-    },
-  ],
+    ]
 })
 
 const confirmFn = async (formEl: FormInstance | undefined) => {
-  if (confirmRepeat || !formEl) return
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      emit('confirm', cloneDeep(formData))
-      dialogThemeVisible.value = false
-    }
-  })
+    if (confirmRepeat || !formEl) return
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            emit('confirm', cloneDeep(formData));
+            dialogThemeVisible.value = false;
+        }
+    })
 }
 
 defineExpose({
-  dialogThemeVisible,
-  open,
+    dialogThemeVisible,
+    open
 })
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+
+</style>
diff --git a/admin/src/app/views/diy/components/edit-active-cube.vue b/admin/src/app/views/diy/components/edit-active-cube.vue
index 612ff439..55ffec14 100644
--- a/admin/src/app/views/diy/components/edit-active-cube.vue
+++ b/admin/src/app/views/diy/components/edit-active-cube.vue
@@ -1,370 +1,203 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('titleContent') }}</h3>
-      <el-form label-width="80px" class="px-[10px]" @submit.prevent>
-        <el-form-item :label="t('selectStyle')" class="flex">
-          <span
-            class="text-primary flex-1 cursor-pointer"
-            @click="showTitleStyle"
-            >{{ diyStore.editComponent.titleStyle.title }}</span
-          >
-          <el-icon>
-            <ArrowRight />
-          </el-icon>
-        </el-form-item>
-        <el-form-item
-          :label="t('title')"
-          v-if="
-            diyStore.editComponent &&
-            diyStore.editComponent.titleStyle &&
-            diyStore.editComponent.titleStyle.value != 'style-5'
-          "
-        >
-          <el-input
-            v-model.trim="diyStore.editComponent.text"
-            :placeholder="t('titlePlaceholder')"
-            clearable
-            maxlength="10"
-            show-word-limit
-          />
-        </el-form-item>
-        <el-form-item :label="t('image')" v-else>
-          <upload-image v-model="diyStore.editComponent.textImg" :limit="1" />
-        </el-form-item>
-        <el-form-item :label="t('link')">
-          <diy-link v-model="diyStore.editComponent.textLink" />
-        </el-form-item>
-        <el-form-item :label="t('subTitle')">
-          <el-input
-            v-model.trim="diyStore.editComponent.subTitle.text"
-            :placeholder="t('subTitlePlaceholder')"
-            clearable
-            maxlength="8"
-            show-word-limit
-          />
-        </el-form-item>
-        <el-form-item :label="t('link')">
-          <diy-link v-model="diyStore.editComponent.subTitle.link" />
-        </el-form-item>
-      </el-form>
-
-      <el-dialog
-        v-model="showTitleDialog"
-        :title="t('selectStyle')"
-        width="460px"
-      >
-        <div class="flex flex-wrap">
-          <template v-for="(item, index) in titleStyleList" :key="index">
-            <div
-              :class="{
-                'border-primary': selectTitleStyle.value == item.value,
-              }"
-              @click="changeTitleStyle(item)"
-              class="flex items-center justify-center overflow-hidden w-[200px] h-[100px] mr-[12px] mb-[12px] cursor-pointer border bg-[#eee]"
-            >
-              <img :src="img(item.url)" />
-            </div>
-          </template>
-        </div>
-
-        <template #footer>
-          <span class="dialog-footer">
-            <el-button @click="showTitleDialog = false">{{
-              t('cancel')
-            }}</el-button>
-            <el-button type="primary" @click="confirmTitleStyle">{{
-              t('confirm')
-            }}</el-button>
-          </span>
-        </template>
-      </el-dialog>
-    </div>
-
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('activeCubeBlockContent') }}</h3>
-      <el-form label-width="90px" class="px-[10px]">
-        <el-form-item :label="t('selectStyle')" class="flex">
-          <span
-            class="text-primary flex-1 cursor-pointer"
-            @click="showBlockStyle"
-            >{{ diyStore.editComponent.blockStyle.title }}</span
-          >
-          <el-icon>
-            <ArrowRight />
-          </el-icon>
-        </el-form-item>
-
-        <el-dialog
-          v-model="showListDialog"
-          :title="t('selectStyle')"
-          width="600px"
-        >
-          <div class="flex flex-wrap">
-            <template v-for="(item, index) in blockStyleList" :key="index">
-              <div
-                :class="{
-                  'border-primary': selectBlockStyle.value == item.value,
-                }"
-                @click="changeBlockStyle(item)"
-                class="flex items-center justify-center overflow-hidden w-[250px] h-[150px] mr-[12px] mb-[12px] cursor-pointer border bg-[#eee]"
-              >
-                <img :src="img(item.url)" />
-              </div>
-            </template>
-          </div>
-
-          <template #footer>
-            <span class="dialog-footer">
-              <el-button @click="showListDialog = false">{{
-                t('cancel')
-              }}</el-button>
-              <el-button type="primary" @click="confirmBlockStyle">{{
-                t('confirm')
-              }}</el-button>
-            </span>
-          </template>
-        </el-dialog>
-
-        <p class="text-sm text-gray-400 mb-[10px]">
-          {{ t('dragMouseAdjustOrder') }}
-        </p>
-
-        <div ref="blockBoxRef">
-          <div
-            v-for="(item, index) in diyStore.editComponent.list"
-            :key="item.id"
-            class="item-wrap p-[10px] pb-0 relative border border-dashed border-gray-300 mb-[16px]"
-          >
-            <el-form-item :label="t('image')">
-              <upload-image v-model="item.imageUrl" :limit="1" />
-            </el-form-item>
-
-            <el-form-item :label="t('activeCubeTitle')">
-              <el-input
-                v-model.trim="item.title.text"
-                :placeholder="t('activeCubeTitlePlaceholder')"
-                clearable
-                maxlength="4"
-                show-word-limit
-              />
-            </el-form-item>
-
-            <el-form-item
-              :label="t('activeCubeSubTitleTextColor')"
-              v-show="diyStore.editComponent.blockStyle.value == 'style-3'"
-            >
-              <el-color-picker
-                v-model="item.title.textColor"
-                show-alpha
-                :predefine="diyStore.predefineColors"
-              />
-            </el-form-item>
-
-            <el-form-item
-              :label="t('activeCubeSubTitle')"
-              v-if="diyStore.editComponent.blockStyle.value != 'style-3'"
-            >
-              <el-input
-                v-model.trim="item.subTitle.text"
-                :placeholder="t('activeCubeSubTitlePlaceholder')"
-                clearable
-                maxlength="6"
-                show-word-limit
-              />
-            </el-form-item>
-
-            <div v-show="diyStore.editComponent.blockStyle.value == 'style-4'">
-              <el-form-item :label="t('activeCubeSubTitleTextColor')">
-                <el-color-picker
-                  v-model="item.subTitle.textColor"
-                  show-alpha
-                  :predefine="diyStore.predefineColors"
-                />
-              </el-form-item>
-              <el-form-item :label="t('activeCubeSubTitleBgColor')">
-                <el-color-picker
-                  v-model="item.subTitle.startColor"
-                  show-alpha
-                  :predefine="diyStore.predefineColors"
-                />
-                <icon
-                  name="iconfont iconmap-connect"
-                  size="20px"
-                  class="block !text-gray-400 mx-[5px]"
-                />
-                <el-color-picker
-                  v-model="item.subTitle.endColor"
-                  show-alpha
-                  :predefine="diyStore.predefineColors"
-                />
-              </el-form-item>
-            </div>
-
-            <el-form-item :label="t('activeListFrameColor')">
-              <el-color-picker
-                v-model="item.listFrame.startColor"
-                show-alpha
-                :predefine="diyStore.predefineColors"
-              />
-              <icon
-                name="iconfont iconmap-connect"
-                size="20px"
-                class="block !text-gray-400 mx-[5px]"
-              />
-              <el-color-picker
-                v-model="item.listFrame.endColor"
-                show-alpha
-                :predefine="diyStore.predefineColors"
-              />
-            </el-form-item>
-
-            <div
-              v-show="
-                diyStore.editComponent.blockStyle.value != 'style-4' &&
-                diyStore.editComponent.blockStyle.value != 'style-3'
-              "
-            >
-              <el-form-item :label="t('activeCubeButton')">
-                <el-input
-                  v-model.trim="item.moreTitle.text"
-                  :placeholder="t('activeCubeButtonPlaceholder')"
-                  clearable
-                  maxlength="3"
-                  show-word-limit
-                />
-              </el-form-item>
-
-              <el-form-item :label="t('activeCubeButtonColor')">
-                <el-color-picker
-                  v-model="item.moreTitle.startColor"
-                  show-alpha
-                  :predefine="diyStore.predefineColors"
-                />
-                <icon
-                  name="iconfont iconmap-connect"
-                  size="20px"
-                  class="block !text-gray-400 mx-[5px]"
-                />
-                <el-color-picker
-                  v-model="item.moreTitle.endColor"
-                  show-alpha
-                  :predefine="diyStore.predefineColors"
-                />
-              </el-form-item>
-            </div>
-
-            <el-form-item :label="t('link')">
-              <diy-link v-model="item.link" />
-            </el-form-item>
-
-            <div
-              class="del absolute cursor-pointer z-[2] top-[-8px] right-[-8px]"
-              v-show="diyStore.editComponent.list.length > 1"
-              @click="diyStore.editComponent.list.splice(index, 1)"
-            >
-              <icon name="element CircleCloseFilled" color="#bbb" size="20px" />
-            </div>
-          </div>
-        </div>
-
-        <el-button
-          v-show="diyStore.editComponent.list.length < 10"
-          class="w-full"
-          @click="addItem"
-          >{{ t('activeCubeAddItem') }}</el-button
-        >
-      </el-form>
-    </div>
-  </div>
-
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <div class="edit-attr-item-wrap" v-if="selectTitleStyle.value != 'style-5'">
-      <h3 class="mb-[10px]">{{ t('titleStyle') }}</h3>
-      <el-form label-width="90px" class="px-[10px]">
-        <el-form-item :label="t('textColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.titleColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('subTitleStyle') }}</h3>
-      <el-form label-width="90px" class="px-[10px]">
-        <el-form-item :label="t('textColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.subTitle.textColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-        <el-form-item :label="t('subTextBgColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.subTitle.startColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-          <icon
-            name="iconfont iconmap-connect"
-            size="20px"
-            class="block !text-gray-400 mx-[5px]"
-          />
-          <el-color-picker
-            v-model="diyStore.editComponent.subTitle.endColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('activeCubeBlockStyle') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('activeCubeBlockTextFontWeight')">
-          <el-radio-group
-            v-model="diyStore.editComponent.blockStyle.fontWeight"
-          >
-            <el-radio :label="'normal'">{{ t('fontWeightNormal') }}</el-radio>
-            <el-radio :label="'bold'">{{ t('fontWeightBold') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item :label="t('activeCubeBlockBtnText')" class="flex">
-          <el-radio-group v-model="diyStore.editComponent.blockStyle.btnText">
-            <el-radio :label="'normal'">{{ t('btnTextNormal') }}</el-radio>
-            <el-radio :label="'italics'">{{ t('btnTextItalics') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item :label="t('topRounded')">
-          <el-slider
-            v-model="diyStore.editComponent.topElementRounded"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-            :max="50"
-          />
-        </el-form-item>
-        <el-form-item :label="t('bottomRounded')">
-          <el-slider
-            v-model="diyStore.editComponent.bottomElementRounded"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-            :max="50"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
+
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('titleContent') }}</h3>
+			<el-form label-width="80px" class="px-[10px]" @submit.prevent>
+				<el-form-item :label="t('selectStyle')" class="flex">
+					<span class="text-primary flex-1 cursor-pointer" @click="showTitleStyle">{{ diyStore.editComponent.titleStyle.title }}</span>
+					<el-icon>
+						<ArrowRight />
+					</el-icon>
+				</el-form-item>
+                <el-form-item :label="t('title')"  v-if="diyStore.editComponent && diyStore.editComponent.titleStyle && diyStore.editComponent.titleStyle.value != 'style-5'">
+                    <el-input v-model.trim="diyStore.editComponent.text" :placeholder="t('titlePlaceholder')" clearable maxlength="10" show-word-limit />
+                </el-form-item>
+                <el-form-item :label="t('image')" v-else>
+                    <upload-image v-model="diyStore.editComponent.textImg" :limit="1"/>
+                </el-form-item>
+                <el-form-item :label="t('link')">
+                    <diy-link v-model="diyStore.editComponent.textLink"/>
+                </el-form-item>
+                <el-form-item :label="t('subTitle')">
+                    <el-input v-model.trim="diyStore.editComponent.subTitle.text" :placeholder="t('subTitlePlaceholder')" clearable maxlength="8" show-word-limit />
+                </el-form-item>
+                <el-form-item :label="t('link')">
+                    <diy-link v-model="diyStore.editComponent.subTitle.link"/>
+                </el-form-item>
+			</el-form>
+
+			<el-dialog v-model="showTitleDialog" :title="t('selectStyle')" width="460px">
+
+				<div class="flex flex-wrap">
+					<template v-for="(item,index) in titleStyleList" :key="index">
+						<div :class="{ 'border-primary': selectTitleStyle.value == item.value }" @click="changeTitleStyle(item)" class="flex items-center justify-center overflow-hidden w-[200px] h-[100px] mr-[12px] mb-[12px] cursor-pointer border bg-[#eee]">
+							<img :src="img(item.url)" />
+						</div>
+					</template>
+				</div>
+
+				<template #footer>
+					<span class="dialog-footer">
+						<el-button @click="showTitleDialog = false">{{ t('cancel') }}</el-button>
+						<el-button type="primary" @click="confirmTitleStyle">{{ t('confirm') }}</el-button>
+					</span>
+				</template>
+
+			</el-dialog>
+		</div>
+
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('activeCubeBlockContent') }}</h3>
+			<el-form label-width="90px" class="px-[10px]">
+
+				<el-form-item :label="t('selectStyle')" class="flex">
+					<span class="text-primary flex-1 cursor-pointer" @click="showBlockStyle">{{ diyStore.editComponent.blockStyle.title }}</span>
+					<el-icon>
+						<ArrowRight />
+					</el-icon>
+				</el-form-item>
+
+				<el-dialog v-model="showListDialog" :title="t('selectStyle')" width="600px">
+					<div class="flex flex-wrap">
+						<template v-for="(item,index) in blockStyleList" :key="index">
+							<div :class="{ 'border-primary': selectBlockStyle.value == item.value }" @click="changeBlockStyle(item)" class="flex items-center justify-center overflow-hidden w-[250px] h-[150px] mr-[12px] mb-[12px] cursor-pointer border bg-[#eee]">
+								<img :src="img(item.url)" />
+							</div>
+						</template>
+
+					</div>
+
+					<template #footer>
+						<span class="dialog-footer">
+							<el-button @click="showListDialog = false">{{ t('cancel') }}</el-button>
+							<el-button type="primary" @click="confirmBlockStyle">{{ t('confirm') }}</el-button>
+						</span>
+					</template>
+
+				</el-dialog>
+
+				<p class="text-sm text-gray-400 mb-[10px]">{{ t('dragMouseAdjustOrder') }}</p>
+
+				<div ref="blockBoxRef">
+					<div v-for="(item,index) in diyStore.editComponent.list" :key="item.id" class="item-wrap p-[10px] pb-0 relative border border-dashed border-gray-300 mb-[16px]">
+						<el-form-item :label="t('image')">
+							<upload-image v-model="item.imageUrl" :limit="1"/>
+						</el-form-item>
+
+						<el-form-item :label="t('activeCubeTitle')">
+							<el-input v-model.trim="item.title.text" :placeholder="t('activeCubeTitlePlaceholder')" clearable maxlength="4" show-word-limit/>
+						</el-form-item>
+
+                        <el-form-item :label="t('activeCubeSubTitleTextColor')" v-show="diyStore.editComponent.blockStyle.value == 'style-3'">
+                            <el-color-picker v-model="item.title.textColor" show-alpha :predefine="diyStore.predefineColors" />
+                        </el-form-item>
+
+						<el-form-item :label="t('activeCubeSubTitle')" v-if="diyStore.editComponent.blockStyle.value != 'style-3'">
+							<el-input v-model.trim="item.subTitle.text" :placeholder="t('activeCubeSubTitlePlaceholder')" clearable maxlength="6" show-word-limit/>
+						</el-form-item>
+
+                        <div v-show="diyStore.editComponent.blockStyle.value == 'style-4'">
+                            <el-form-item :label="t('activeCubeSubTitleTextColor')">
+                                <el-color-picker v-model="item.subTitle.textColor" show-alpha :predefine="diyStore.predefineColors" />
+                            </el-form-item>
+                            <el-form-item :label="t('activeCubeSubTitleBgColor')">
+                                <el-color-picker v-model="item.subTitle.startColor" show-alpha :predefine="diyStore.predefineColors" />
+                                <icon name="iconfont iconmap-connect" size="20px" class="block !text-gray-400 mx-[5px]"/>
+                                <el-color-picker v-model="item.subTitle.endColor" show-alpha :predefine="diyStore.predefineColors"/>
+                            </el-form-item>
+                        </div>
+
+                        <el-form-item :label="t('activeListFrameColor')">
+                            <el-color-picker v-model="item.listFrame.startColor" show-alpha :predefine="diyStore.predefineColors" />
+                            <icon name="iconfont iconmap-connect" size="20px" class="block !text-gray-400 mx-[5px]"/>
+                            <el-color-picker v-model="item.listFrame.endColor" show-alpha :predefine="diyStore.predefineColors"/>
+                        </el-form-item>
+
+                        <div v-show="diyStore.editComponent.blockStyle.value != 'style-4' && diyStore.editComponent.blockStyle.value != 'style-3'">
+                            <el-form-item :label="t('activeCubeButton')">
+                                <el-input v-model.trim="item.moreTitle.text" :placeholder="t('activeCubeButtonPlaceholder')" clearable maxlength="3" show-word-limit/>
+                            </el-form-item>
+
+                            <el-form-item :label="t('activeCubeButtonColor')">
+                                <el-color-picker v-model="item.moreTitle.startColor" show-alpha :predefine="diyStore.predefineColors" />
+                                <icon name="iconfont iconmap-connect" size="20px" class="block !text-gray-400 mx-[5px]"/>
+                                <el-color-picker v-model="item.moreTitle.endColor" show-alpha :predefine="diyStore.predefineColors"/>
+                            </el-form-item>
+                        </div>
+
+						<el-form-item :label="t('link')">
+							<diy-link v-model="item.link"/>
+						</el-form-item>
+
+						<div class="del absolute cursor-pointer z-[2] top-[-8px] right-[-8px]" v-show="diyStore.editComponent.list.length > 1" @click="diyStore.editComponent.list.splice(index,1)">
+							<icon name="element CircleCloseFilled" color="#bbb" size="20px"/>
+						</div>
+					</div>
+				</div>
+
+				<el-button v-show="diyStore.editComponent.list.length < 10" class="w-full" @click="addItem">{{ t('activeCubeAddItem') }}</el-button>
+
+			</el-form>
+		</div>
+
+	</div>
+
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+
+		<div class="edit-attr-item-wrap" v-if="selectTitleStyle.value != 'style-5'">
+			<h3 class="mb-[10px]">{{ t('titleStyle') }}</h3>
+			<el-form label-width="90px" class="px-[10px]">
+				<el-form-item :label="t('textColor')">
+					<el-color-picker v-model="diyStore.editComponent.titleColor" show-alpha :predefine="diyStore.predefineColors"/>
+				</el-form-item>
+			</el-form>
+		</div>
+
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('subTitleStyle') }}</h3>
+			<el-form label-width="90px" class="px-[10px]">
+					<el-form-item :label="t('textColor')">
+						<el-color-picker v-model="diyStore.editComponent.subTitle.textColor" show-alpha :predefine="diyStore.predefineColors"/>
+					</el-form-item>
+				<el-form-item :label="t('subTextBgColor')">
+					<el-color-picker v-model="diyStore.editComponent.subTitle.startColor" show-alpha :predefine="diyStore.predefineColors"/>
+					<icon name="iconfont iconmap-connect" size="20px" class="block !text-gray-400 mx-[5px]"/>
+					<el-color-picker v-model="diyStore.editComponent.subTitle.endColor" show-alpha :predefine="diyStore.predefineColors"/>
+				</el-form-item>
+			</el-form>
+		</div>
+
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('activeCubeBlockStyle') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('activeCubeBlockTextFontWeight')">
+					<el-radio-group v-model="diyStore.editComponent.blockStyle.fontWeight">
+						<el-radio :label="'normal'">{{t('fontWeightNormal')}}</el-radio>
+						<el-radio :label="'bold'">{{t('fontWeightBold')}}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+                <el-form-item :label="t('activeCubeBlockBtnText')" class="flex">
+					<el-radio-group v-model="diyStore.editComponent.blockStyle.btnText">
+						<el-radio :label="'normal'">{{t('btnTextNormal')}}</el-radio>
+						<el-radio :label="'italics'">{{t('btnTextItalics')}}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+				<el-form-item :label="t('topRounded')">
+					<el-slider v-model="diyStore.editComponent.topElementRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+				</el-form-item>
+				<el-form-item :label="t('bottomRounded')">
+					<el-slider v-model="diyStore.editComponent.bottomElementRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+				</el-form-item>
+			</el-form>
+		</div>
+
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+	</div>
+
 </template>
 
 <script lang="ts" setup>
@@ -380,396 +213,388 @@ diyStore.editComponent.ignore = [] // 忽略公共属性
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
-  const res = { code: true, message: '' }
-
-  if (diyStore.value[index].text == '') {
-    res.code = false
-    res.message = t('activeCubeTitlePlaceholder')
-    return res
-  }
+    const res = { code: true, message: '' }
 
-  diyStore.value[index].list.forEach((item: any) => {
-    if (item.imageUrl === '') {
-      res.code = false
-      res.message = t('imageUrlTip')
-      return res
-    }
-    if (item.title.text === '') {
-      res.code = false
-      res.message = t('activeCubeTitlePlaceholder')
-      return res
-    }
-    if (
-      ['style-1', 'style-2', 'style-4'].indexOf(
-        diyStore.value[index].blockStyle.value
-      ) != -1
-    ) {
-      if (item.subTitle.text === '') {
-        res.code = false
-        res.message = t('activeCubeSubTitlePlaceholder')
-        return res
-      }
-    }
-    if (
-      ['style-1', 'style-2'].indexOf(diyStore.value[index].blockStyle.value) !=
-      -1
-    ) {
-      if (item.moreTitle.text === '') {
+    if(diyStore.value[index].text == ''){
         res.code = false
-        res.message = t('activeCubeButtonPlaceholder')
+        res.message = t('activeCubeTitlePlaceholder')
         return res
-      }
     }
-  })
-  return res
+
+    diyStore.value[index].list.forEach((item: any) => {
+        if (item.imageUrl === '') {
+            res.code = false
+            res.message = t('imageUrlTip')
+            return res
+        }
+        if (item.title.text === '') {
+            res.code = false
+            res.message = t('activeCubeTitlePlaceholder')
+            return res
+        }
+        if(['style-1','style-2','style-4'].indexOf(diyStore.value[index].blockStyle.value) != -1){
+            if (item.subTitle.text === '') {
+                res.code = false
+                res.message = t('activeCubeSubTitlePlaceholder')
+                return res
+            }
+        }
+        if(['style-1','style-2'].indexOf(diyStore.value[index].blockStyle.value) != -1){
+            if (item.moreTitle.text === '') {
+                res.code = false
+                res.message = t('activeCubeButtonPlaceholder')
+                return res
+            }
+        }
+    })
+    return res
 }
 
 diyStore.editComponent.list.forEach((item: any) => {
-  if (!item.id) item.id = diyStore.generateRandom()
+    if (!item.id) item.id = diyStore.generateRandom()
 })
 
 // 标题风格样式
 const showTitleDialog = ref(false)
 
 const showTitleStyle = () => {
-  selectTitleStyle.title = diyStore.editComponent.titleStyle.title
-  selectTitleStyle.value = diyStore.editComponent.titleStyle.value
-  showTitleDialog.value = true
+	selectTitleStyle.title = diyStore.editComponent.titleStyle.title;
+	selectTitleStyle.value = diyStore.editComponent.titleStyle.value;
+    showTitleDialog.value = true
 }
 
 const titleStyleList = reactive([
-  {
-    url: 'static/resource/images/diy/active_cube/title_style1.png',
-    title: '风格1',
-    value: 'style-1',
-  },
-  {
-    url: 'static/resource/images/diy/active_cube/title_style2.png',
-    title: '风格2',
-    value: 'style-2',
-  },
-  {
-    url: 'static/resource/images/diy/active_cube/title_style3.png',
-    title: '风格3',
-    value: 'style-3',
-  },
-  {
-    url: 'static/resource/images/diy/active_cube/title_style5.png',
-    title: '风格4',
-    value: 'style-4',
-  },
-  {
-    url: 'static/resource/images/diy/active_cube/title_style6.png',
-    title: '风格5',
-    value: 'style-5',
-  },
+	{
+        url : 'static/resource/images/diy/active_cube/title_style1.png',
+        title:'风格1',
+	    value:'style-1'
+	},{
+        url : 'static/resource/images/diy/active_cube/title_style2.png',
+        title:'风格2',
+	    value:'style-2'
+	},{
+        url : 'static/resource/images/diy/active_cube/title_style3.png',
+        title:'风格3',
+	    value:'style-3'
+	},{
+        url : 'static/resource/images/diy/active_cube/title_style5.png',
+        title:'风格4',
+	    value:'style-4'
+	},{
+        url : 'static/resource/images/diy/active_cube/title_style6.png',
+        title:'风格5',
+	    value:'style-5'
+	}
 ])
 
 const selectTitleStyle = reactive({
-  title: diyStore.editComponent.titleStyle.title,
-  value: diyStore.editComponent.titleStyle.value,
+    title: diyStore.editComponent.titleStyle.title,
+    value: diyStore.editComponent.titleStyle.value
 })
 
-const changeTitleStyle = (item: any) => {
-  selectTitleStyle.title = item.title
-  selectTitleStyle.value = item.value
+const changeTitleStyle = (item:any) => {
+    selectTitleStyle.title = item.title;
+    selectTitleStyle.value = item.value;
 }
 
 const confirmTitleStyle = () => {
-  diyStore.editComponent.titleStyle.title = selectTitleStyle.title
-  diyStore.editComponent.titleStyle.value = selectTitleStyle.value
-  initTitleStyle(diyStore.editComponent.titleStyle.value)
-  showTitleDialog.value = false
+    diyStore.editComponent.titleStyle.title = selectTitleStyle.title;
+    diyStore.editComponent.titleStyle.value = selectTitleStyle.value;
+    initTitleStyle(diyStore.editComponent.titleStyle.value);
+    showTitleDialog.value = false
 }
 
-const initTitleStyle = (style) => {
-  if (diyStore.editComponent.titleStyle.value == 'style-1') {
-    diyStore.editComponent.titleColor = '#F91700'
-    diyStore.editComponent.subTitle.textColor = '#FFFFFF'
-    diyStore.editComponent.subTitle.startColor = '#FB792F'
-    diyStore.editComponent.subTitle.endColor = '#F91700'
-  } else if (diyStore.editComponent.titleStyle.value == 'style-2') {
-    diyStore.editComponent.titleColor = '#F91700'
-    diyStore.editComponent.subTitle.textColor = '#FFFFFF'
-    diyStore.editComponent.subTitle.startColor = '#FB792F'
-    diyStore.editComponent.subTitle.endColor = '#F91700'
-  } else if (diyStore.editComponent.titleStyle.value == 'style-3') {
-    diyStore.editComponent.titleColor = '#F91700'
-    diyStore.editComponent.subTitle.textColor = '#FFFFFF'
-    diyStore.editComponent.subTitle.startColor = '#FB792F'
-    diyStore.editComponent.subTitle.endColor = '#F91700'
-  } else if (diyStore.editComponent.titleStyle.value == 'style-4') {
-    diyStore.editComponent.titleColor = '#FFFFFF'
-    diyStore.editComponent.subTitle.textColor = '#333333'
-    diyStore.editComponent.subTitle.startColor = '#FFFFFF'
-    diyStore.editComponent.subTitle.endColor = '#FFFFFF'
-  } else if (diyStore.editComponent.titleStyle.value == 'style-5') {
-    diyStore.editComponent.titleColor = ''
-    diyStore.editComponent.subTitle.textColor = '#999999'
-    diyStore.editComponent.subTitle.startColor = '#FFFFFF'
-    diyStore.editComponent.subTitle.endColor = '#FFFFFF'
-  }
+const initTitleStyle = (style)=>{
+    if(diyStore.editComponent.titleStyle.value == 'style-1'){
+        diyStore.editComponent.titleColor = "#F91700";
+        diyStore.editComponent.subTitle.textColor = "#FFFFFF";
+        diyStore.editComponent.subTitle.startColor = "#FB792F";
+        diyStore.editComponent.subTitle.endColor = "#F91700";
+    }else if(diyStore.editComponent.titleStyle.value == 'style-2'){
+        diyStore.editComponent.titleColor = "#F91700";
+        diyStore.editComponent.subTitle.textColor = "#FFFFFF";
+        diyStore.editComponent.subTitle.startColor = "#FB792F";
+        diyStore.editComponent.subTitle.endColor = "#F91700";
+    }else if(diyStore.editComponent.titleStyle.value == 'style-3'){
+        diyStore.editComponent.titleColor = "#F91700";
+        diyStore.editComponent.subTitle.textColor = "#FFFFFF";
+        diyStore.editComponent.subTitle.startColor = "#FB792F";
+        diyStore.editComponent.subTitle.endColor = "#F91700";
+    }else if(diyStore.editComponent.titleStyle.value == 'style-4'){
+        diyStore.editComponent.titleColor = "#FFFFFF";
+        diyStore.editComponent.subTitle.textColor = "#333333";
+        diyStore.editComponent.subTitle.startColor = "#FFFFFF";
+        diyStore.editComponent.subTitle.endColor = "#FFFFFF";
+    }else if(diyStore.editComponent.titleStyle.value == 'style-5'){
+        diyStore.editComponent.titleColor = "";
+        diyStore.editComponent.subTitle.textColor = "#999999";
+        diyStore.editComponent.subTitle.startColor = "#FFFFFF";
+        diyStore.editComponent.subTitle.endColor = "#FFFFFF";
+    }
 }
 
 // 板块风格样式
 const showListDialog = ref(false)
 
 const showBlockStyle = () => {
-  showListDialog.value = true
+    showListDialog.value = true
 }
 
 const blockStyleList = reactive([
-  {
-    url: 'static/resource/images/diy/active_cube/block_style1.png',
-    title: '风格1',
-    value: 'style-1',
-  },
-  {
-    url: 'static/resource/images/diy/active_cube/block_style2.png',
-    title: '风格2',
-    value: 'style-2',
-  },
-  {
-    url: 'static/resource/images/diy/active_cube/block_style3.png',
-    title: '风格3',
-    value: 'style-3',
-  },
-  {
-    url: 'static/resource/images/diy/active_cube/block_style4.png',
-    title: '风格4',
-    value: 'style-4',
-  },
+    {
+        url : 'static/resource/images/diy/active_cube/block_style1.png',
+        title:'风格1',
+        value:'style-1'
+    },
+    {
+        url : 'static/resource/images/diy/active_cube/block_style2.png',
+        title:'风格2',
+        value:'style-2'
+    },
+    {
+        url : 'static/resource/images/diy/active_cube/block_style3.png',
+        title:'风格3',
+        value:'style-3'
+    },
+    {
+        url : 'static/resource/images/diy/active_cube/block_style4.png',
+        title:'风格4',
+        value:'style-4'
+    }
 ])
 
 const selectBlockStyle = reactive({
-  title: diyStore.editComponent.blockStyle.title,
-  value: diyStore.editComponent.blockStyle.value,
+    title: diyStore.editComponent.blockStyle.title,
+    value: diyStore.editComponent.blockStyle.value
 })
 
-const changeBlockStyle = (item: any) => {
-  selectBlockStyle.title = item.title
-  selectBlockStyle.value = item.value
+const changeBlockStyle = (item:any) => {
+    selectBlockStyle.title = item.title;
+    selectBlockStyle.value = item.value;
 }
 
 const confirmBlockStyle = () => {
-  diyStore.editComponent.blockStyle.title = selectBlockStyle.title
-  diyStore.editComponent.blockStyle.value = selectBlockStyle.value
-  initBlockStyle(diyStore.editComponent.blockStyle.value)
-  showListDialog.value = false
+    diyStore.editComponent.blockStyle.title = selectBlockStyle.title;
+    diyStore.editComponent.blockStyle.value = selectBlockStyle.value;
+    initBlockStyle(diyStore.editComponent.blockStyle.value);
+    showListDialog.value = false
 }
 
-const initBlockStyle = (style: any) => {
-  if (style == 'style-1') {
-    diyStore.editComponent.blockStyle.fontWeight = 'normal'
-    diyStore.editComponent.blockStyle.btnText = 'normal'
-
-    diyStore.editComponent.list[0].title.textColor = '#303133'
-    diyStore.editComponent.list[0].subTitle.textColor = '#999999'
-    diyStore.editComponent.list[0].subTitle.startColor = ''
-    diyStore.editComponent.list[0].subTitle.endColor = ''
-    diyStore.editComponent.list[0].moreTitle.startColor = '#FEA715'
-    diyStore.editComponent.list[0].moreTitle.endColor = '#FE1E00'
-    diyStore.editComponent.list[0].listFrame.startColor = '#FFFAF5'
-    diyStore.editComponent.list[0].listFrame.endColor = '#FFFFFF'
-
-    diyStore.editComponent.list[1].title.textColor = '#303133'
-    diyStore.editComponent.list[1].subTitle.textColor = '#999999'
-    diyStore.editComponent.list[1].subTitle.startColor = ''
-    diyStore.editComponent.list[1].subTitle.endColor = ''
-    diyStore.editComponent.list[1].moreTitle.startColor = '#FFBF50'
-    diyStore.editComponent.list[1].moreTitle.endColor = '#FF9E03'
-    diyStore.editComponent.list[1].listFrame.startColor = '#FFFAF5'
-    diyStore.editComponent.list[1].listFrame.endColor = '#FFFFFF'
-
-    diyStore.editComponent.list[2].title.textColor = '#303133'
-    diyStore.editComponent.list[2].subTitle.textColor = '#999999'
-    diyStore.editComponent.list[2].subTitle.startColor = ''
-    diyStore.editComponent.list[2].subTitle.endColor = ''
-    diyStore.editComponent.list[2].moreTitle.startColor = '#A2E792'
-    diyStore.editComponent.list[2].moreTitle.endColor = '#49CD2D'
-    diyStore.editComponent.list[2].listFrame.startColor = '#FFFAF5'
-    diyStore.editComponent.list[2].listFrame.endColor = '#FFFFFF'
-
-    diyStore.editComponent.list[3].title.textColor = '#303133'
-    diyStore.editComponent.list[3].subTitle.textColor = '#999999'
-    diyStore.editComponent.list[3].subTitle.startColor = ''
-    diyStore.editComponent.list[3].subTitle.endColor = ''
-    diyStore.editComponent.list[3].moreTitle.startColor = '#4AC1FF'
-    diyStore.editComponent.list[3].moreTitle.endColor = '#1D7CFF'
-    diyStore.editComponent.list[3].listFrame.startColor = '#FFFAF5'
-    diyStore.editComponent.list[3].listFrame.endColor = '#FFFFFF'
-  } else if (style == 'style-2') {
-    diyStore.editComponent.blockStyle.fontWeight = 'normal'
-    diyStore.editComponent.blockStyle.btnText = 'normal'
-
-    diyStore.editComponent.blockStyle.fontWeight = 'bold'
-    diyStore.editComponent.blockStyle.btnText = 'italics'
-
-    diyStore.editComponent.list[0].title.textColor = '#303133'
-    diyStore.editComponent.list[0].subTitle.textColor = '#999999'
-    diyStore.editComponent.list[0].subTitle.startColor = ''
-    diyStore.editComponent.list[0].subTitle.endColor = ''
-    diyStore.editComponent.list[0].moreTitle.startColor = '#FFC051'
-    diyStore.editComponent.list[0].moreTitle.endColor = '#FF9C00'
-    diyStore.editComponent.list[0].listFrame.startColor = '#FFF1DB'
-    diyStore.editComponent.list[0].listFrame.endColor = '#FFFBF4'
-
-    diyStore.editComponent.list[1].title.textColor = '#303133'
-    diyStore.editComponent.list[1].subTitle.textColor = '#999999'
-    diyStore.editComponent.list[1].subTitle.startColor = ''
-    diyStore.editComponent.list[1].subTitle.endColor = ''
-    diyStore.editComponent.list[1].moreTitle.startColor = '#A4E894'
-    diyStore.editComponent.list[1].moreTitle.endColor = '#45CC2A'
-    diyStore.editComponent.list[1].listFrame.startColor = '#E6F6E2'
-    diyStore.editComponent.list[1].listFrame.endColor = '#F5FDF3'
-
-    diyStore.editComponent.list[2].title.textColor = '#303133'
-    diyStore.editComponent.list[2].subTitle.textColor = '#999999'
-    diyStore.editComponent.list[2].subTitle.startColor = ''
-    diyStore.editComponent.list[2].subTitle.endColor = ''
-    diyStore.editComponent.list[2].moreTitle.startColor = '#4BC2FF'
-    diyStore.editComponent.list[2].moreTitle.endColor = '#1F7DFF'
-    diyStore.editComponent.list[2].listFrame.startColor = '#E2F6FF'
-    diyStore.editComponent.list[2].listFrame.endColor = '#F2FAFF'
-
-    diyStore.editComponent.list[3].title.textColor = '#303133'
-    diyStore.editComponent.list[3].subTitle.textColor = '#999999'
-    diyStore.editComponent.list[3].subTitle.startColor = ''
-    diyStore.editComponent.list[3].subTitle.endColor = ''
-    diyStore.editComponent.list[3].moreTitle.startColor = '#FB792F'
-    diyStore.editComponent.list[3].moreTitle.endColor = '#F91700'
-    diyStore.editComponent.list[3].listFrame.startColor = '#FFEAEA'
-    diyStore.editComponent.list[3].listFrame.endColor = '#FFFCFB'
-  } else if (style == 'style-3') {
-    diyStore.editComponent.blockStyle.fontWeight = 'normal'
-    diyStore.editComponent.blockStyle.btnText = 'normal'
-
-    diyStore.editComponent.list[0].title.textColor = '#FF1128'
-    diyStore.editComponent.list[0].subTitle.textColor = ''
-    diyStore.editComponent.list[0].subTitle.startColor = ''
-    diyStore.editComponent.list[0].subTitle.endColor = ''
-    diyStore.editComponent.list[0].moreTitle.startColor = ''
-    diyStore.editComponent.list[0].moreTitle.endColor = ''
-    diyStore.editComponent.list[0].listFrame.startColor = ''
-    diyStore.editComponent.list[0].listFrame.endColor = ''
-
-    diyStore.editComponent.list[1].title.textColor = '#303133'
-    diyStore.editComponent.list[1].subTitle.textColor = ''
-    diyStore.editComponent.list[1].subTitle.startColor = ''
-    diyStore.editComponent.list[1].subTitle.endColor = ''
-    diyStore.editComponent.list[1].moreTitle.startColor = ''
-    diyStore.editComponent.list[1].moreTitle.endColor = ''
-    diyStore.editComponent.list[1].listFrame.startColor = ''
-    diyStore.editComponent.list[1].listFrame.endColor = ''
-
-    diyStore.editComponent.list[2].title.textColor = '#303133'
-    diyStore.editComponent.list[2].subTitle.textColor = ''
-    diyStore.editComponent.list[2].subTitle.startColor = ''
-    diyStore.editComponent.list[2].subTitle.endColor = ''
-    diyStore.editComponent.list[2].moreTitle.startColor = ''
-    diyStore.editComponent.list[2].moreTitle.endColor = ''
-    diyStore.editComponent.list[2].listFrame.startColor = ''
-    diyStore.editComponent.list[2].listFrame.endColor = ''
-
-    diyStore.editComponent.list[3].title.textColor = '#303133'
-    diyStore.editComponent.list[3].subTitle.textColor = ''
-    diyStore.editComponent.list[3].subTitle.startColor = ''
-    diyStore.editComponent.list[3].subTitle.endColor = ''
-    diyStore.editComponent.list[3].moreTitle.startColor = ''
-    diyStore.editComponent.list[3].moreTitle.endColor = ''
-    diyStore.editComponent.list[3].listFrame.startColor = ''
-    diyStore.editComponent.list[3].listFrame.endColor = ''
-  } else if (style == 'style-4') {
-    diyStore.editComponent.blockStyle.fontWeight = 'bold'
-    diyStore.editComponent.blockStyle.btnText = 'normal'
-
-    diyStore.editComponent.list[0].title.textColor = '#303133'
-    diyStore.editComponent.list[0].subTitle.textColor = '#ED6E00'
-    diyStore.editComponent.list[0].subTitle.startColor = '#FFE4D9'
-    diyStore.editComponent.list[0].subTitle.endColor = '#FFE4D9'
-    diyStore.editComponent.list[0].moreTitle.startColor = ''
-    diyStore.editComponent.list[0].moreTitle.endColor = ''
-    diyStore.editComponent.list[0].listFrame.startColor = '#FFAD4D'
-    diyStore.editComponent.list[0].listFrame.endColor = '#F93D02'
-
-    diyStore.editComponent.list[1].title.textColor = '#303133'
-    diyStore.editComponent.list[1].subTitle.textColor = '#2E59E9'
-    diyStore.editComponent.list[1].subTitle.startColor = '#CAD7F8'
-    diyStore.editComponent.list[1].subTitle.endColor = '#CAD7F8'
-    diyStore.editComponent.list[1].moreTitle.startColor = ''
-    diyStore.editComponent.list[1].moreTitle.endColor = ''
-    diyStore.editComponent.list[1].listFrame.startColor = '#7CA7F4'
-    diyStore.editComponent.list[1].listFrame.endColor = '#2B56E9'
-
-    diyStore.editComponent.list[2].title.textColor = '#303133'
-    diyStore.editComponent.list[2].subTitle.textColor = '#F62F55'
-    diyStore.editComponent.list[2].subTitle.startColor = '#FCD6D9'
-    diyStore.editComponent.list[2].subTitle.endColor = '#FCD6D9'
-    diyStore.editComponent.list[2].moreTitle.startColor = ''
-    diyStore.editComponent.list[2].moreTitle.endColor = ''
-    diyStore.editComponent.list[2].listFrame.startColor = '#FF7F48'
-    diyStore.editComponent.list[2].listFrame.endColor = '#EE335B'
-
-    diyStore.editComponent.list[3].title.textColor = '#303133'
-    diyStore.editComponent.list[3].subTitle.textColor = '#139B3C'
-    diyStore.editComponent.list[3].subTitle.startColor = '#D3F1DA'
-    diyStore.editComponent.list[3].subTitle.endColor = '#D3F1DA'
-    diyStore.editComponent.list[3].moreTitle.startColor = ''
-    diyStore.editComponent.list[3].moreTitle.endColor = ''
-    diyStore.editComponent.list[3].listFrame.startColor = '#90D48C'
-    diyStore.editComponent.list[3].listFrame.endColor = '#299F4F'
-  }
+const initBlockStyle = (style: any)=>{
+    if(style == 'style-1'){
+        diyStore.editComponent.blockStyle.fontWeight = "normal";
+        diyStore.editComponent.blockStyle.btnText = "normal";
+
+        diyStore.editComponent.list[0].title.textColor = "#303133";
+        diyStore.editComponent.list[0].subTitle.textColor = "#999999";
+        diyStore.editComponent.list[0].subTitle.startColor = "";
+        diyStore.editComponent.list[0].subTitle.endColor = "";
+        diyStore.editComponent.list[0].moreTitle.startColor = "#FEA715";
+        diyStore.editComponent.list[0].moreTitle.endColor = "#FE1E00";
+        diyStore.editComponent.list[0].listFrame.startColor = "#FFFAF5";
+        diyStore.editComponent.list[0].listFrame.endColor = "#FFFFFF";
+
+        diyStore.editComponent.list[1].title.textColor = "#303133";
+        diyStore.editComponent.list[1].subTitle.textColor = "#999999";
+        diyStore.editComponent.list[1].subTitle.startColor = "";
+        diyStore.editComponent.list[1].subTitle.endColor = "";
+        diyStore.editComponent.list[1].moreTitle.startColor = "#FFBF50";
+        diyStore.editComponent.list[1].moreTitle.endColor = "#FF9E03";
+        diyStore.editComponent.list[1].listFrame.startColor = "#FFFAF5";
+        diyStore.editComponent.list[1].listFrame.endColor = "#FFFFFF";
+
+        diyStore.editComponent.list[2].title.textColor = "#303133";
+        diyStore.editComponent.list[2].subTitle.textColor = "#999999";
+        diyStore.editComponent.list[2].subTitle.startColor = "";
+        diyStore.editComponent.list[2].subTitle.endColor = "";
+        diyStore.editComponent.list[2].moreTitle.startColor = "#A2E792";
+        diyStore.editComponent.list[2].moreTitle.endColor = "#49CD2D";
+        diyStore.editComponent.list[2].listFrame.startColor = "#FFFAF5";
+        diyStore.editComponent.list[2].listFrame.endColor = "#FFFFFF";
+
+        diyStore.editComponent.list[3].title.textColor = "#303133";
+        diyStore.editComponent.list[3].subTitle.textColor = "#999999";
+        diyStore.editComponent.list[3].subTitle.startColor = "";
+        diyStore.editComponent.list[3].subTitle.endColor = "";
+        diyStore.editComponent.list[3].moreTitle.startColor = "#4AC1FF";
+        diyStore.editComponent.list[3].moreTitle.endColor = "#1D7CFF";
+        diyStore.editComponent.list[3].listFrame.startColor = "#FFFAF5";
+        diyStore.editComponent.list[3].listFrame.endColor = "#FFFFFF";
+
+    }else if(style == 'style-2'){
+        diyStore.editComponent.blockStyle.fontWeight = "normal";
+        diyStore.editComponent.blockStyle.btnText = "normal";
+
+        diyStore.editComponent.blockStyle.fontWeight = "bold";
+        diyStore.editComponent.blockStyle.btnText = "italics";
+
+        diyStore.editComponent.list[0].title.textColor = "#303133";
+        diyStore.editComponent.list[0].subTitle.textColor = "#999999";
+        diyStore.editComponent.list[0].subTitle.startColor = "";
+        diyStore.editComponent.list[0].subTitle.endColor = "";
+        diyStore.editComponent.list[0].moreTitle.startColor = "#FFC051";
+        diyStore.editComponent.list[0].moreTitle.endColor = "#FF9C00";
+        diyStore.editComponent.list[0].listFrame.startColor = "#FFF1DB";
+        diyStore.editComponent.list[0].listFrame.endColor = "#FFFBF4";
+
+        diyStore.editComponent.list[1].title.textColor = "#303133";
+        diyStore.editComponent.list[1].subTitle.textColor = "#999999";
+        diyStore.editComponent.list[1].subTitle.startColor = "";
+        diyStore.editComponent.list[1].subTitle.endColor = "";
+        diyStore.editComponent.list[1].moreTitle.startColor = "#A4E894";
+        diyStore.editComponent.list[1].moreTitle.endColor = "#45CC2A";
+        diyStore.editComponent.list[1].listFrame.startColor = "#E6F6E2";
+        diyStore.editComponent.list[1].listFrame.endColor = "#F5FDF3";
+
+        diyStore.editComponent.list[2].title.textColor = "#303133";
+        diyStore.editComponent.list[2].subTitle.textColor = "#999999";
+        diyStore.editComponent.list[2].subTitle.startColor = "";
+        diyStore.editComponent.list[2].subTitle.endColor = "";
+        diyStore.editComponent.list[2].moreTitle.startColor = "#4BC2FF";
+        diyStore.editComponent.list[2].moreTitle.endColor = "#1F7DFF";
+        diyStore.editComponent.list[2].listFrame.startColor = "#E2F6FF";
+        diyStore.editComponent.list[2].listFrame.endColor = "#F2FAFF";
+
+        diyStore.editComponent.list[3].title.textColor = "#303133";
+        diyStore.editComponent.list[3].subTitle.textColor = "#999999";
+        diyStore.editComponent.list[3].subTitle.startColor = "";
+        diyStore.editComponent.list[3].subTitle.endColor = "";
+        diyStore.editComponent.list[3].moreTitle.startColor = "#FB792F";
+        diyStore.editComponent.list[3].moreTitle.endColor = "#F91700";
+        diyStore.editComponent.list[3].listFrame.startColor = "#FFEAEA";
+        diyStore.editComponent.list[3].listFrame.endColor = "#FFFCFB";
+    }else if(style == 'style-3'){
+        diyStore.editComponent.blockStyle.fontWeight = "normal";
+        diyStore.editComponent.blockStyle.btnText = "normal";
+
+        diyStore.editComponent.list[0].title.textColor = "#FF1128";
+        diyStore.editComponent.list[0].subTitle.textColor = "";
+        diyStore.editComponent.list[0].subTitle.startColor = "";
+        diyStore.editComponent.list[0].subTitle.endColor = "";
+        diyStore.editComponent.list[0].moreTitle.startColor = "";
+        diyStore.editComponent.list[0].moreTitle.endColor = "";
+        diyStore.editComponent.list[0].listFrame.startColor = "";
+        diyStore.editComponent.list[0].listFrame.endColor = "";
+
+        diyStore.editComponent.list[1].title.textColor = "#303133";
+        diyStore.editComponent.list[1].subTitle.textColor = "";
+        diyStore.editComponent.list[1].subTitle.startColor = "";
+        diyStore.editComponent.list[1].subTitle.endColor = "";
+        diyStore.editComponent.list[1].moreTitle.startColor = "";
+        diyStore.editComponent.list[1].moreTitle.endColor = "";
+        diyStore.editComponent.list[1].listFrame.startColor = "";
+        diyStore.editComponent.list[1].listFrame.endColor = "";
+
+        diyStore.editComponent.list[2].title.textColor = "#303133";
+        diyStore.editComponent.list[2].subTitle.textColor = "";
+        diyStore.editComponent.list[2].subTitle.startColor = "";
+        diyStore.editComponent.list[2].subTitle.endColor = "";
+        diyStore.editComponent.list[2].moreTitle.startColor = "";
+        diyStore.editComponent.list[2].moreTitle.endColor = "";
+        diyStore.editComponent.list[2].listFrame.startColor = "";
+        diyStore.editComponent.list[2].listFrame.endColor = "";
+
+        diyStore.editComponent.list[3].title.textColor = "#303133";
+        diyStore.editComponent.list[3].subTitle.textColor = "";
+        diyStore.editComponent.list[3].subTitle.startColor = "";
+        diyStore.editComponent.list[3].subTitle.endColor = "";
+        diyStore.editComponent.list[3].moreTitle.startColor = "";
+        diyStore.editComponent.list[3].moreTitle.endColor = "";
+        diyStore.editComponent.list[3].listFrame.startColor = "";
+        diyStore.editComponent.list[3].listFrame.endColor = "";
+    }else if(style == 'style-4'){
+        diyStore.editComponent.blockStyle.fontWeight = "bold";
+        diyStore.editComponent.blockStyle.btnText = "normal";
+
+        diyStore.editComponent.list[0].title.textColor = "#303133";
+        diyStore.editComponent.list[0].subTitle.textColor = "#ED6E00";
+        diyStore.editComponent.list[0].subTitle.startColor = "#FFE4D9";
+        diyStore.editComponent.list[0].subTitle.endColor = "#FFE4D9";
+        diyStore.editComponent.list[0].moreTitle.startColor = "";
+        diyStore.editComponent.list[0].moreTitle.endColor = "";
+        diyStore.editComponent.list[0].listFrame.startColor = "#FFAD4D";
+        diyStore.editComponent.list[0].listFrame.endColor = "#F93D02";
+
+        diyStore.editComponent.list[1].title.textColor = "#303133";
+        diyStore.editComponent.list[1].subTitle.textColor = "#2E59E9";
+        diyStore.editComponent.list[1].subTitle.startColor = "#CAD7F8";
+        diyStore.editComponent.list[1].subTitle.endColor = "#CAD7F8";
+        diyStore.editComponent.list[1].moreTitle.startColor = "";
+        diyStore.editComponent.list[1].moreTitle.endColor = "";
+        diyStore.editComponent.list[1].listFrame.startColor = "#7CA7F4";
+        diyStore.editComponent.list[1].listFrame.endColor = "#2B56E9";
+
+        diyStore.editComponent.list[2].title.textColor = "#303133";
+        diyStore.editComponent.list[2].subTitle.textColor = "#F62F55";
+        diyStore.editComponent.list[2].subTitle.startColor = "#FCD6D9";
+        diyStore.editComponent.list[2].subTitle.endColor = "#FCD6D9";
+        diyStore.editComponent.list[2].moreTitle.startColor = "";
+        diyStore.editComponent.list[2].moreTitle.endColor = "";
+        diyStore.editComponent.list[2].listFrame.startColor = "#FF7F48";
+        diyStore.editComponent.list[2].listFrame.endColor = "#EE335B";
+
+        diyStore.editComponent.list[3].title.textColor = "#303133";
+        diyStore.editComponent.list[3].subTitle.textColor = "#139B3C";
+        diyStore.editComponent.list[3].subTitle.startColor = "#D3F1DA";
+        diyStore.editComponent.list[3].subTitle.endColor = "#D3F1DA";
+        diyStore.editComponent.list[3].moreTitle.startColor = "";
+        diyStore.editComponent.list[3].moreTitle.endColor = "";
+        diyStore.editComponent.list[3].listFrame.startColor = "#90D48C";
+        diyStore.editComponent.list[3].listFrame.endColor = "#299F4F";
+    }
 }
 
 const addItem = () => {
-  diyStore.editComponent.list.push({
-    id: diyStore.generateRandom(),
-    title: {
-      title: '标题',
-      textColor: '#000000',
-    },
-    subTitle: {
-      text: '副标题',
-      textColor: '#999999',
-      startColor: '',
-      endColor: '',
-    },
-    listFrame: {
-      startColor: '#4AC1FF',
-      endColor: '#1D7CFF',
-    },
-    moreTitle: {
-      text: '去看看',
-      startColor: '#FEA715',
-      endColor: '#FE1E00',
-    },
-    imageUrl: '',
-    link: { name: '' },
-  })
+    diyStore.editComponent.list.push({
+        id: diyStore.generateRandom(),
+        title:{
+            title:'标题',
+            textColor: "#000000"
+        },
+        subTitle:{
+            text:'副标题',
+            textColor: "#999999",
+	        startColor:'',
+            endColor:''
+        },
+        listFrame: {
+            startColor: "#4AC1FF",
+            endColor: "#1D7CFF"
+        },
+        moreTitle:{
+            text:'去看看',
+	        startColor:'#FEA715',
+            endColor:'#FE1E00'
+        },
+        imageUrl: '',
+        link: { name: '' }
+    })
 }
 
 const blockBoxRef = ref()
 
 onMounted(() => {
-  nextTick(() => {
-    const sortable = Sortable.create(blockBoxRef.value, {
-      group: 'item-wrap',
-      animation: 200,
-      onEnd: (event) => {
-        const temp = diyStore.editComponent.list[event.oldIndex!]
-        diyStore.editComponent.list.splice(event.oldIndex!, 1)
-        diyStore.editComponent.list.splice(event.newIndex!, 0, temp)
-        sortable.sort(
-          range(diyStore.editComponent.list.length).map((value) => {
-            return value.toString()
-          })
-        )
-      },
+    nextTick(() => {
+        const sortable = Sortable.create(blockBoxRef.value, {
+            group: 'item-wrap',
+            animation: 200,
+            onEnd: event => {
+                const temp = diyStore.editComponent.list[event.oldIndex!]
+                diyStore.editComponent.list.splice(event.oldIndex!, 1)
+                diyStore.editComponent.list.splice(event.newIndex!, 0, temp)
+                sortable.sort(
+                    range(diyStore.editComponent.list.length).map(value => {
+                        return value.toString()
+                    })
+                )
+            }
+        })
     })
-  })
 })
 
 defineExpose({})
+
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
diff --git a/admin/src/app/views/diy/components/edit-carousel-search.vue b/admin/src/app/views/diy/components/edit-carousel-search.vue
index 42b0f7a2..5c659866 100644
--- a/admin/src/app/views/diy/components/edit-carousel-search.vue
+++ b/admin/src/app/views/diy/components/edit-carousel-search.vue
@@ -1,578 +1,312 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('carouselSearchShowPosition') }}</h3>
-      <el-form label-width="100px" class="px-[10px]">
-        <el-form-item :label="t('carouselSearchShowWay')">
-          <el-radio-group v-model="diyStore.editComponent.positionWay">
-            <el-radio label="static">{{
-              t('carouselSearchShowWayStatic')
-            }}</el-radio>
-            <el-radio label="fixed">{{
-              t('carouselSearchShowWayFixed')
-            }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item
-          :label="t('carouselSearchFixedBgColor')"
-          v-show="diyStore.editComponent.positionWay == 'fixed'"
-        >
-          <el-color-picker
-            v-model="diyStore.editComponent.fixedBgColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-        <el-form-item :label="t('carouselSearchBgGradient')">
-          <el-radio-group v-model="diyStore.editComponent.bgGradient">
-            <el-radio :label="true">{{ t('carouselSearchOpen') }}</el-radio>
-            <el-radio :label="false">{{ t('carouselSearchClose') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('carouselSearchSet') }}</h3>
-      <el-form label-width="100px" class="px-[10px]" @submit.prevent>
-        <el-form-item :label="t('selectStyle')" class="flex">
-          <span
-            class="text-primary flex-1 cursor-pointer"
-            @click="showSearchStyle"
-            >{{ diyStore.editComponent.search.styleName }}</span
-          >
-          <el-icon>
-            <ArrowRight />
-          </el-icon>
-        </el-form-item>
-        <el-form-item
-          :label="t('carouselSearchSubTitle')"
-          v-if="diyStore.editComponent.search.style == 'style-2'"
-        >
-          <el-input
-            v-model.trim="diyStore.editComponent.search.subTitle.text"
-            :placeholder="t('carouselSearchSubTitlePlaceholder')"
-            clearable
-            maxlength="10"
-            show-word-limit
-          />
-        </el-form-item>
-        <el-form-item :label="t('logo')">
-          <upload-image
-            v-model="diyStore.editComponent.search.logo"
-            :limit="1"
-          />
-          <div class="text-sm text-gray-400 mb-[10px]">
-            {{ t('carouselSearchLogoTips') }}
-          </div>
-        </el-form-item>
-        <el-form-item :label="t('carouselSearchText')">
-          <div>
-            <el-input
-              v-model.trim="diyStore.editComponent.search.text"
-              :placeholder="t('carouselSearchPlaceholder')"
-              clearable
-              maxlength="20"
-              show-word-limit
-            />
-            <p class="text-sm text-gray-400 mt-[10px] leading-[1.5]">
-              {{ t('carouselSearchTextTips') }}
-            </p>
-          </div>
-        </el-form-item>
-        <el-form-item :label="t('link')">
-          <diy-link v-model="diyStore.editComponent.search.link" />
-        </el-form-item>
-      </el-form>
-
-      <el-dialog
-        v-model="showSearchDialog"
-        :title="t('selectStyle')"
-        width="500px"
-      >
-        <div class="flex flex-wrap">
-          <template v-for="(item, index) in searchStyleList" :key="index">
-            <div
-              :class="{
-                'border-primary': selectSearchStyle.value == item.value,
-              }"
-              @click="changeSearchStyle(item)"
-              class="flex items-center justify-center overflow-hidden w-[200px] h-[100px] m-[6px] cursor-pointer border bg-[#eee]"
-            >
-              <img :src="img(item.url)" />
-            </div>
-          </template>
-        </div>
-
-        <template #footer>
-          <span class="dialog-footer">
-            <el-button @click="showSearchDialog = false">{{
-              t('cancel')
-            }}</el-button>
-            <el-button type="primary" @click="confirmSearchStyle">{{
-              t('confirm')
-            }}</el-button>
-          </span>
-        </template>
-      </el-dialog>
-    </div>
-
-    <div class="edit-attr-item-wrap mb-[20px]">
-      <h3 class="mb-[10px]">{{ t('carouselSearchHotWordSet') }}</h3>
-      <el-form label-width="100px" class="px-[10px]">
-        <el-form-item :label="t('carouselSearchHotWordInterval')">
-          <el-slider
-            v-model="diyStore.editComponent.search.hotWord.interval"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-            :min="1"
-            :max="10"
-          />
-        </el-form-item>
-
-        <p class="text-sm text-gray-400 mb-[10px]">
-          {{ t('dragMouseAdjustOrder') }}
-        </p>
-
-        <div ref="searchHotWordTabBoxRef">
-          <div
-            v-for="(item, index) in diyStore.editComponent.search.hotWord.list"
-            :key="item.id"
-            class="item-wrap p-[10px] relative border border-dashed border-gray-300 mb-[16px]"
-          >
-            <el-form-item :label="t('carouselSearchHotWordText')" class="!mb-0">
-              <el-input
-                v-model.trim="item.text"
-                :placeholder="t('carouselSearchHotWordTextPlaceholder')"
-                clearable
-                maxlength="4"
-                show-word-limit
-              />
-            </el-form-item>
-
-            <div
-              class="del absolute cursor-pointer z-[2] top-[-8px] right-[-8px]"
-              @click="
-                diyStore.editComponent.search.hotWord.list.splice(index, 1)
-              "
-            >
-              <icon name="element CircleCloseFilled" color="#bbb" size="20px" />
-            </div>
-          </div>
-          <el-button
-            v-show="diyStore.editComponent.search.hotWord.list.length < 50"
-            class="w-full"
-            @click="addHotWordItem"
-            >{{ t('carouselSearchAddHotWordItem') }}</el-button
-          >
-        </div>
-      </el-form>
-    </div>
-
-    <el-collapse
-      v-model="activeNames"
-      @change="handleChange"
-      class="collapse-wrap"
-    >
-      <el-collapse-item :title="t('carouselSearchTabSet')" name="tab">
-        <div class="edit-attr-item-wrap">
-          <el-form label-width="100px" class="px-[10px]" @submit.prevent>
-            <el-form-item :label="t('carouselSearchTabControl')">
-              <el-switch v-model="diyStore.editComponent.tab.control" />
-            </el-form-item>
-
-            <p class="text-sm text-gray-400 mb-[10px]">
-              {{ t('dragMouseAdjustOrder') }}
-            </p>
-
-            <div ref="tabBoxRef">
-              <div
-                v-for="(item, index) in diyStore.editComponent.tab.list"
-                :key="item.id"
-                class="item-wrap p-[10px] pb-0 relative border border-dashed border-gray-300 mb-[16px]"
-              >
-                <el-form-item :label="t('carouselSearchTabCategoryText')">
-                  <el-input
-                    v-model.trim="item.text"
-                    :placeholder="t('carouselSearchTabCategoryTextPlaceholder')"
-                    clearable
-                    maxlength="4"
-                    show-word-limit
-                  />
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
+
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('carouselSearchShowPosition') }}</h3>
+			<el-form label-width="100px" class="px-[10px]">
+				<el-form-item :label="t('carouselSearchShowWay')">
+					<el-radio-group v-model="diyStore.editComponent.positionWay">
+						<el-radio label="static">{{ t('carouselSearchShowWayStatic') }}</el-radio>
+						<el-radio label="fixed">{{ t('carouselSearchShowWayFixed') }}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+				<el-form-item :label="t('carouselSearchFixedBgColor')" v-show="diyStore.editComponent.positionWay == 'fixed'">
+					<el-color-picker v-model="diyStore.editComponent.fixedBgColor" show-alpha :predefine="diyStore.predefineColors"/>
+				</el-form-item>
+                <el-form-item :label="t('carouselSearchBgGradient')">
+                    <el-radio-group v-model="diyStore.editComponent.bgGradient">
+						<el-radio :label="true">{{ t('carouselSearchOpen') }}</el-radio>
+						<el-radio :label="false">{{ t('carouselSearchClose') }}</el-radio>
+					</el-radio-group>
                 </el-form-item>
+			</el-form>
+		</div>
+
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('carouselSearchSet') }}</h3>
+			<el-form label-width="100px" class="px-[10px]" @submit.prevent>
+				<el-form-item :label="t('selectStyle')" class="flex">
+					<span class="text-primary flex-1 cursor-pointer" @click="showSearchStyle">{{ diyStore.editComponent.search.styleName }}</span>
+					<el-icon>
+						<ArrowRight />
+					</el-icon>
+				</el-form-item>
+                <el-form-item :label="t('carouselSearchSubTitle')" v-if="diyStore.editComponent.search.style == 'style-2'">
+                    <el-input v-model.trim="diyStore.editComponent.search.subTitle.text" :placeholder="t('carouselSearchSubTitlePlaceholder')" clearable maxlength="10" show-word-limit />
+				</el-form-item>
+				<el-form-item :label="t('logo')">
+					<upload-image v-model="diyStore.editComponent.search.logo" :limit="1" />
+				    <div class="text-sm text-gray-400 mb-[10px]">{{ t('carouselSearchLogoTips') }}</div>
+				</el-form-item>
+				<el-form-item :label="t('carouselSearchText')">
+					<div>
+                        <el-input v-model.trim="diyStore.editComponent.search.text" :placeholder="t('carouselSearchPlaceholder')" clearable maxlength="20" show-word-limit />
+                        <p class="text-sm text-gray-400 mt-[10px] leading-[1.5]">{{t('carouselSearchTextTips')}}</p>
+                    </div>
+				</el-form-item>
+				<el-form-item :label="t('link')">
+					<diy-link v-model="diyStore.editComponent.search.link"/>
+				</el-form-item>
+			</el-form>
+
+            <el-dialog v-model="showSearchDialog" :title="t('selectStyle')" width="500px">
+
+				<div class="flex flex-wrap">
+					<template v-for="(item,index) in searchStyleList" :key="index">
+						<div :class="{ 'border-primary': selectSearchStyle.value == item.value }" @click="changeSearchStyle(item)" class="flex items-center justify-center overflow-hidden w-[200px] h-[100px] m-[6px] cursor-pointer border bg-[#eee]">
+							<img :src="img(item.url)" />
+						</div>
+					</template>
+				</div>
+
+				<template #footer>
+					<span class="dialog-footer">
+						<el-button @click="showSearchDialog = false">{{ t('cancel') }}</el-button>
+						<el-button type="primary" @click="confirmSearchStyle">{{ t('confirm') }}</el-button>
+					</span>
+				</template>
+
+			</el-dialog>
+		</div>
+
+		<div class="edit-attr-item-wrap mb-[20px]">
+			<h3 class="mb-[10px]">{{ t('carouselSearchHotWordSet') }}</h3>
+			<el-form label-width="100px" class="px-[10px]">
+
+				<el-form-item :label="t('carouselSearchHotWordInterval')">
+					<el-slider v-model="diyStore.editComponent.search.hotWord.interval" show-input size="small" class="ml-[10px] diy-nav-slider" :min="1" :max="10"/>
+				</el-form-item>
+
+				<p class="text-sm text-gray-400 mb-[10px]">{{ t('dragMouseAdjustOrder') }}</p>
+
+				<div ref="searchHotWordTabBoxRef">
+					<div v-for="(item,index) in diyStore.editComponent.search.hotWord.list" :key="item.id" class="item-wrap p-[10px] relative border border-dashed border-gray-300 mb-[16px]">
+
+						<el-form-item :label="t('carouselSearchHotWordText')" class="!mb-0">
+							<el-input v-model.trim="item.text" :placeholder="t('carouselSearchHotWordTextPlaceholder')" clearable maxlength="4" show-word-limit/>
+						</el-form-item>
+
+						<div class="del absolute cursor-pointer z-[2] top-[-8px] right-[-8px]" @click="diyStore.editComponent.search.hotWord.list.splice(index,1)">
+							<icon name="element CircleCloseFilled" color="#bbb" size="20px"/>
+						</div>
+
+					</div>
+					<el-button v-show="diyStore.editComponent.search.hotWord.list.length < 50" class="w-full" @click="addHotWordItem">{{ t('carouselSearchAddHotWordItem') }}</el-button>
+				</div>
+
+			</el-form>
+		</div>
+
+		<el-collapse v-model="activeNames" @change="handleChange" class="collapse-wrap">
+            <el-collapse-item :title="t('carouselSearchTabSet')" name="tab">
+                <div class="edit-attr-item-wrap">
+                    <el-form label-width="100px" class="px-[10px]" @submit.prevent>
+                        <el-form-item :label="t('carouselSearchTabControl')">
+                            <el-switch v-model="diyStore.editComponent.tab.control" />
+                        </el-form-item>
+
+                        <p class="text-sm text-gray-400 mb-[10px]">{{ t('dragMouseAdjustOrder') }}</p>
+
+                        <div ref="tabBoxRef">
+                            <div v-for="(item,index) in diyStore.editComponent.tab.list" :key="item.id" class="item-wrap p-[10px] pb-0 relative border border-dashed border-gray-300 mb-[16px]">
+
+                                <el-form-item :label="t('carouselSearchTabCategoryText')">
+                                    <el-input v-model.trim="item.text" :placeholder="t('carouselSearchTabCategoryTextPlaceholder')" clearable maxlength="4" show-word-limit/>
+                                </el-form-item>
+
+                                <el-form-item :label="t('dataSources')">
+                                    <el-input v-model.trim="item.diy_title" :placeholder="t('selectDiyPagePlaceholder')" readonly class="select-diy-page-input" @click="diyPageShowDialogOpen(index)">
+                                        <template #suffix>
+                                            <div @click.stop="tabClear(index)">
+                                                <el-icon v-if="item.diy_title">
+                                                    <Close />
+                                                </el-icon>
+                                                <el-icon v-else>
+                                                    <ArrowRight />
+                                                </el-icon>
+                                            </div>
+                                        </template>
+                                    </el-input>
+                                </el-form-item>
+
+                                <div class="del absolute cursor-pointer z-[2] top-[-8px] right-[-8px]" v-show="diyStore.editComponent.tab.list.length > 1" @click="diyStore.editComponent.tab.list.splice(index,1)">
+                                    <icon name="element CircleCloseFilled" color="#bbb" size="20px"/>
+                                </div>
+
+                            </div>
+                            <el-button v-show="diyStore.editComponent.tab.list.length < 50" class="w-full" @click="addTabItem">{{ t('carouselSearchAddTabItem') }}</el-button>
+                        </div>
+
+                        <!-- 选择微页面弹出框 -->
+                        <el-dialog v-model="diyPageShowDialog" :title="t('selectSourcesDiyPage')" width="1000px" :close-on-press-escape="true" :destroy-on-close="true" :close-on-click-modal="false">
+                            <el-table :data="diyPageTable.data" ref="diyPageTableRef" size="large" v-loading="diyPageTable.loading" height="490px" @current-change="handleCurrentDiyPageChange" row-key="id" highlight-current-row>
+                                <template #empty>
+                                    <span>{{ !diyPageTable.loading ? t('emptyData') : '' }}</span>
+                                </template>
+                                <el-table-column prop="page_title" :label="t('diyPageTitle')" min-width="120" />
+                                <el-table-column prop="addon_name" :label="t('diyPageTypeName')" min-width="80" />
+                                <el-table-column prop="type_name" :label="t('diyPageForAddon')" min-width="80" />
+                            </el-table>
+                            <div class="mt-[16px] flex justify-end">
+                                <el-pagination v-model:current-page="diyPageTable.page" v-model:page-size="diyPageTable.limit"
+                                                layout="total, sizes, prev, pager, next, jumper" :total="diyPageTable.total"
+                                                @size-change="loadDiyPageList" @current-change="loadDiyPageList" />
+                            </div>
+                            <div class="flex items-center justify-end mt-[15px]">
+                                <el-button type="primary" @click="saveDiyPageId">{{ t('confirm') }}</el-button>
+                                <el-button @click="diyPageShowDialog = false">{{ t('cancel') }}</el-button>
+                            </div>
+                        </el-dialog>
+
+                    </el-form>
+                </div>
+            </el-collapse-item>
+            <el-collapse-item :title="t('carouselSearchSwiperSet')" name="swiper">
+                <el-form label-width="100px" class="px-[10px]">
+                    <el-form-item :label="t('carouselSearchSwiperControl')">
+                        <el-switch v-model="diyStore.editComponent.swiper.control" />
+                    </el-form-item>
+                    <el-form-item :label="t('carouselSearchSwiperInterval')">
+                        <el-slider v-model="diyStore.editComponent.swiper.interval" show-input size="small" class="ml-[10px] diy-nav-slider" :min="1" :max="10"/>
+                    </el-form-item>
+
+                    <div class="text-sm text-gray-400 mb-[10px]">{{ t('carouselSearchSwiperTips') }}</div>
+
+                    <div ref="imageBoxRef">
+                        <div v-for="(item,index) in diyStore.editComponent.swiper.list" :key="item.id" class="item-wrap p-[10px] pb-0 relative border border-dashed border-gray-300 mb-[16px]">
+                            <el-form-item :label="t('image')">
+                                <upload-image v-model="item.imageUrl" :limit="1" @change="selectImg" />
+                            </el-form-item>
+
+                            <div class="del absolute cursor-pointer z-[2] top-[-8px] right-[-8px]" v-show="diyStore.editComponent.swiper.list.length > 1" @click="diyStore.editComponent.swiper.list.splice(index,1)">
+                                <icon name="element CircleCloseFilled" color="#bbb" size="20px"/>
+                            </div>
+
+                            <el-form-item :label="t('link')">
+                                <diy-link v-model="item.link"/>
+                            </el-form-item>
+                        </div>
+                    </div>
+
+                    <el-button v-show="diyStore.editComponent.swiper.list.length < 10" class="w-full" @click="addImageAd">{{ t('addImageAd') }}</el-button>
+
+                </el-form>
+            </el-collapse-item>
+        </el-collapse>
+
+	</div>
+
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+        <div class="edit-attr-item-wrap" v-if="diyStore.editComponent.search.style == 'style-2'">
+			<h3 class="mb-[10px]">{{ t('carouselSearchPositionStyle') }}</h3>
+			<el-form label-width="100px" class="px-[10px]">
+				<el-form-item :label="t('carouselSearchTextColor')">
+					<el-color-picker v-model="diyStore.editComponent.search.positionColor" show-alpha :predefine="diyStore.predefineColors"/>
+				</el-form-item>
+			</el-form>
+		</div>
+
+        <div class="edit-attr-item-wrap" v-if="diyStore.editComponent.search.style == 'style-2'">
+			<h3 class="mb-[10px]">{{ t('carouselSearchSubTitleStyle') }}</h3>
+			<el-form label-width="100px" class="px-[10px]">
+				<el-form-item :label="t('carouselSearchTextColor')">
+					<el-color-picker v-model="diyStore.editComponent.search.subTitle.textColor" show-alpha :predefine="diyStore.predefineColors"/>
+				</el-form-item>
+				<el-form-item :label="t('carouselSearchBgColor')">
+                    <el-color-picker v-model="diyStore.editComponent.search.subTitle.startColor" :predefine="diyStore.predefineColors" show-alpha/>
+                    <icon name="iconfont iconmap-connect" size="20px" class="block !text-gray-400 mx-[5px]"/>
+                    <el-color-picker v-model="diyStore.editComponent.search.subTitle.endColor" :predefine="diyStore.predefineColors" show-alpha/>
+				</el-form-item>
+			</el-form>
+		</div>
 
-                <el-form-item :label="t('dataSources')">
-                  <el-input
-                    v-model.trim="item.diy_title"
-                    :placeholder="t('selectDiyPagePlaceholder')"
-                    readonly
-                    class="select-diy-page-input"
-                    @click="diyPageShowDialogOpen(index)"
-                  >
-                    <template #suffix>
-                      <div @click.stop="tabClear(index)">
-                        <el-icon v-if="item.diy_title">
-                          <Close />
-                        </el-icon>
-                        <el-icon v-else>
-                          <ArrowRight />
-                        </el-icon>
-                      </div>
-                    </template>
-                  </el-input>
-                </el-form-item>
+        <div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('carouselSearchStyle') }}</h3>
+			<el-form label-width="100px" class="px-[10px]">
+				<el-form-item :label="t('carouselSearchTextColor')">
+					<el-color-picker v-model="diyStore.editComponent.search.color" show-alpha :predefine="diyStore.predefineColors"/>
+				</el-form-item>
+				<el-form-item :label="t('carouselSearchBgColor')">
+					<el-color-picker v-model="diyStore.editComponent.search.bgColor" show-alpha :predefine="diyStore.predefineColors"/>
+				</el-form-item>
+				<el-form-item :label="t('carouselSearchBtnColor')">
+					<el-color-picker v-model="diyStore.editComponent.search.btnColor" show-alpha :predefine="diyStore.predefineColors"/>
+				</el-form-item>
+				<el-form-item :label="t('carouselSearchBtnBgColor')">
+					<el-color-picker v-model="diyStore.editComponent.search.btnBgColor" show-alpha :predefine="diyStore.predefineColors"/>
+				</el-form-item>
+			</el-form>
+		</div>
+
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('carouselSearchTabStyle') }}</h3>
+			<el-form label-width="100px" class="px-[10px]">
+				<el-form-item :label="t('noColor')">
+					<el-color-picker v-model="diyStore.editComponent.tab.noColor" show-alpha :predefine="diyStore.predefineColors"/>
+				</el-form-item>
+				<el-form-item :label="t('selectColor')">
+					<el-color-picker v-model="diyStore.editComponent.tab.selectColor" show-alpha :predefine="diyStore.predefineColors"/>
+				</el-form-item>
+				<el-form-item :label="t('fixedNoColor')">
+					<el-color-picker v-model="diyStore.editComponent.tab.fixedNoColor" show-alpha :predefine="diyStore.predefineColors"/>
+				</el-form-item>
+				<el-form-item :label="t('fixedSelectColor')">
+					<el-color-picker v-model="diyStore.editComponent.tab.fixedSelectColor" show-alpha :predefine="diyStore.predefineColors"/>
+				</el-form-item>
+			</el-form>
+		</div>
+
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('carouselSearchSwiperSet') }}</h3>
+			<el-form label-width="100px" class="px-[10px]">
+                <el-form-item :label="t('carouselSearchSwiperStyle')" @change="changeSwiperStyle">
+					<el-radio-group v-model="diyStore.editComponent.swiper.swiperStyle">
+						<el-radio label="style-1">{{ t('carouselSearchSwiperIndicatorStyle1') }}</el-radio>
+						<el-radio label="style-2">{{ t('carouselSearchSwiperIndicatorStyle2') }}</el-radio>
+						<el-radio label="style-3">{{ t('carouselSearchSwiperIndicatorStyle3') }}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+				<el-form-item :label="t('topRounded')">
+					<el-slider v-model="diyStore.editComponent.swiper.topRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+				</el-form-item>
+				<el-form-item :label="t('bottomRounded')">
+					<el-slider v-model="diyStore.editComponent.swiper.bottomRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+				</el-form-item>
+			</el-form>
+		</div>
+
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('carouselSearchSwiperIndicatorSet') }}</h3>
+			<el-form label-width="100px" class="px-[10px]">
+				<el-form-item :label="t('carouselSearchSwiperIndicatorStyle')">
+					<el-radio-group v-model="diyStore.editComponent.swiper.indicatorStyle">
+						<el-radio label="style-1">{{ t('carouselSearchSwiperIndicatorStyle1') }}</el-radio>
+						<el-radio label="style-2">{{ t('carouselSearchSwiperIndicatorStyle2') }}</el-radio>
+						<el-radio label="style-3">{{ t('carouselSearchSwiperIndicatorStyle3') }}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+				<el-form-item :label="t('carouselSearchSwiperIndicatorAlign')">
+					<el-radio-group v-model="diyStore.editComponent.swiper.indicatorAlign">
+						<el-radio label="left">{{ t('alignLeft') }}</el-radio>
+						<el-radio label="center">{{ t('alignCenter') }}</el-radio>
+						<el-radio label="right">{{ t('alignRight') }}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+				<el-form-item :label="t('noColor')">
+					<el-color-picker v-model="diyStore.editComponent.swiper.indicatorColor" show-alpha :predefine="diyStore.predefineColors"/>
+				</el-form-item>
+				<el-form-item :label="t('selectColor')">
+					<el-color-picker v-model="diyStore.editComponent.swiper.indicatorActiveColor" show-alpha :predefine="diyStore.predefineColors"/>
+				</el-form-item>
+			</el-form>
+		</div>
+
+		<!-- 组件样式 -->
+		<!-- <slot name="style"></slot> -->
+	</div>
 
-                <div
-                  class="del absolute cursor-pointer z-[2] top-[-8px] right-[-8px]"
-                  v-show="diyStore.editComponent.tab.list.length > 1"
-                  @click="diyStore.editComponent.tab.list.splice(index, 1)"
-                >
-                  <icon
-                    name="element CircleCloseFilled"
-                    color="#bbb"
-                    size="20px"
-                  />
-                </div>
-              </div>
-              <el-button
-                v-show="diyStore.editComponent.tab.list.length < 50"
-                class="w-full"
-                @click="addTabItem"
-                >{{ t('carouselSearchAddTabItem') }}</el-button
-              >
-            </div>
-
-            <!-- 选择微页面弹出框 -->
-            <el-dialog
-              v-model="diyPageShowDialog"
-              :title="t('selectSourcesDiyPage')"
-              width="1000px"
-              :close-on-press-escape="true"
-              :destroy-on-close="true"
-              :close-on-click-modal="false"
-            >
-              <el-table
-                :data="diyPageTable.data"
-                ref="diyPageTableRef"
-                size="large"
-                v-loading="diyPageTable.loading"
-                height="490px"
-                @current-change="handleCurrentDiyPageChange"
-                row-key="id"
-                highlight-current-row
-              >
-                <template #empty>
-                  <span>{{ !diyPageTable.loading ? t('emptyData') : '' }}</span>
-                </template>
-                <el-table-column
-                  prop="page_title"
-                  :label="t('diyPageTitle')"
-                  min-width="120"
-                />
-                <el-table-column
-                  prop="addon_name"
-                  :label="t('diyPageTypeName')"
-                  min-width="80"
-                />
-                <el-table-column
-                  prop="type_name"
-                  :label="t('diyPageForAddon')"
-                  min-width="80"
-                />
-              </el-table>
-              <div class="mt-[16px] flex justify-end">
-                <el-pagination
-                  v-model:current-page="diyPageTable.page"
-                  v-model:page-size="diyPageTable.limit"
-                  layout="total, sizes, prev, pager, next, jumper"
-                  :total="diyPageTable.total"
-                  @size-change="loadDiyPageList"
-                  @current-change="loadDiyPageList"
-                />
-              </div>
-              <div class="flex items-center justify-end mt-[15px]">
-                <el-button type="primary" @click="saveDiyPageId">{{
-                  t('confirm')
-                }}</el-button>
-                <el-button @click="diyPageShowDialog = false">{{
-                  t('cancel')
-                }}</el-button>
-              </div>
-            </el-dialog>
-          </el-form>
-        </div>
-      </el-collapse-item>
-      <el-collapse-item :title="t('carouselSearchSwiperSet')" name="swiper">
-        <el-form label-width="100px" class="px-[10px]">
-          <el-form-item :label="t('carouselSearchSwiperControl')">
-            <el-switch v-model="diyStore.editComponent.swiper.control" />
-          </el-form-item>
-          <el-form-item :label="t('carouselSearchSwiperInterval')">
-            <el-slider
-              v-model="diyStore.editComponent.swiper.interval"
-              show-input
-              size="small"
-              class="ml-[10px] diy-nav-slider"
-              :min="1"
-              :max="10"
-            />
-          </el-form-item>
-
-          <div class="text-sm text-gray-400 mb-[10px]">
-            {{ t('carouselSearchSwiperTips') }}
-          </div>
-
-          <div ref="imageBoxRef">
-            <div
-              v-for="(item, index) in diyStore.editComponent.swiper.list"
-              :key="item.id"
-              class="item-wrap p-[10px] pb-0 relative border border-dashed border-gray-300 mb-[16px]"
-            >
-              <el-form-item :label="t('image')">
-                <upload-image
-                  v-model="item.imageUrl"
-                  :limit="1"
-                  @change="selectImg"
-                />
-              </el-form-item>
-
-              <div
-                class="del absolute cursor-pointer z-[2] top-[-8px] right-[-8px]"
-                v-show="diyStore.editComponent.swiper.list.length > 1"
-                @click="diyStore.editComponent.swiper.list.splice(index, 1)"
-              >
-                <icon
-                  name="element CircleCloseFilled"
-                  color="#bbb"
-                  size="20px"
-                />
-              </div>
-
-              <el-form-item :label="t('link')">
-                <diy-link v-model="item.link" />
-              </el-form-item>
-            </div>
-          </div>
-
-          <el-button
-            v-show="diyStore.editComponent.swiper.list.length < 10"
-            class="w-full"
-            @click="addImageAd"
-            >{{ t('addImageAd') }}</el-button
-          >
-        </el-form>
-      </el-collapse-item>
-    </el-collapse>
-  </div>
-
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <div
-      class="edit-attr-item-wrap"
-      v-if="diyStore.editComponent.search.style == 'style-2'"
-    >
-      <h3 class="mb-[10px]">{{ t('carouselSearchPositionStyle') }}</h3>
-      <el-form label-width="100px" class="px-[10px]">
-        <el-form-item :label="t('carouselSearchTextColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.search.positionColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <div
-      class="edit-attr-item-wrap"
-      v-if="diyStore.editComponent.search.style == 'style-2'"
-    >
-      <h3 class="mb-[10px]">{{ t('carouselSearchSubTitleStyle') }}</h3>
-      <el-form label-width="100px" class="px-[10px]">
-        <el-form-item :label="t('carouselSearchTextColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.search.subTitle.textColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-        <el-form-item :label="t('carouselSearchBgColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.search.subTitle.startColor"
-            :predefine="diyStore.predefineColors"
-            show-alpha
-          />
-          <icon
-            name="iconfont iconmap-connect"
-            size="20px"
-            class="block !text-gray-400 mx-[5px]"
-          />
-          <el-color-picker
-            v-model="diyStore.editComponent.search.subTitle.endColor"
-            :predefine="diyStore.predefineColors"
-            show-alpha
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('carouselSearchStyle') }}</h3>
-      <el-form label-width="100px" class="px-[10px]">
-        <el-form-item :label="t('carouselSearchTextColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.search.color"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-        <el-form-item :label="t('carouselSearchBgColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.search.bgColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-        <el-form-item :label="t('carouselSearchBtnColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.search.btnColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-        <el-form-item :label="t('carouselSearchBtnBgColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.search.btnBgColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('carouselSearchTabStyle') }}</h3>
-      <el-form label-width="100px" class="px-[10px]">
-        <el-form-item :label="t('noColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.tab.noColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-        <el-form-item :label="t('selectColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.tab.selectColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-        <el-form-item :label="t('fixedNoColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.tab.fixedNoColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-        <el-form-item :label="t('fixedSelectColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.tab.fixedSelectColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('carouselSearchSwiperSet') }}</h3>
-      <el-form label-width="100px" class="px-[10px]">
-        <el-form-item
-          :label="t('carouselSearchSwiperStyle')"
-          @change="changeSwiperStyle"
-        >
-          <el-radio-group v-model="diyStore.editComponent.swiper.swiperStyle">
-            <el-radio label="style-1">{{
-              t('carouselSearchSwiperIndicatorStyle1')
-            }}</el-radio>
-            <el-radio label="style-2">{{
-              t('carouselSearchSwiperIndicatorStyle2')
-            }}</el-radio>
-            <el-radio label="style-3">{{
-              t('carouselSearchSwiperIndicatorStyle3')
-            }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item :label="t('topRounded')">
-          <el-slider
-            v-model="diyStore.editComponent.swiper.topRounded"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-            :max="50"
-          />
-        </el-form-item>
-        <el-form-item :label="t('bottomRounded')">
-          <el-slider
-            v-model="diyStore.editComponent.swiper.bottomRounded"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-            :max="50"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('carouselSearchSwiperIndicatorSet') }}</h3>
-      <el-form label-width="100px" class="px-[10px]">
-        <el-form-item :label="t('carouselSearchSwiperIndicatorStyle')">
-          <el-radio-group
-            v-model="diyStore.editComponent.swiper.indicatorStyle"
-          >
-            <el-radio label="style-1">{{
-              t('carouselSearchSwiperIndicatorStyle1')
-            }}</el-radio>
-            <el-radio label="style-2">{{
-              t('carouselSearchSwiperIndicatorStyle2')
-            }}</el-radio>
-            <el-radio label="style-3">{{
-              t('carouselSearchSwiperIndicatorStyle3')
-            }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item :label="t('carouselSearchSwiperIndicatorAlign')">
-          <el-radio-group
-            v-model="diyStore.editComponent.swiper.indicatorAlign"
-          >
-            <el-radio label="left">{{ t('alignLeft') }}</el-radio>
-            <el-radio label="center">{{ t('alignCenter') }}</el-radio>
-            <el-radio label="right">{{ t('alignRight') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item :label="t('noColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.swiper.indicatorColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-        <el-form-item :label="t('selectColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.swiper.indicatorActiveColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <!-- 组件样式 -->
-    <!-- <slot name="style"></slot> -->
-  </div>
 </template>
 
 <script lang="ts" setup>
@@ -582,139 +316,130 @@ import useDiyStore from '@/stores/modules/diy'
 import { ref, reactive, watch, onMounted, nextTick } from 'vue'
 import { ElTable } from 'element-plus'
 import Sortable from 'sortablejs'
-import { range, cloneDeep } from 'lodash-es'
+import { range,cloneDeep } from 'lodash-es'
 
 import { getDiyPageListByCarouselSearch } from '@/app/api/diy'
 
 const diyStore = useDiyStore()
-diyStore.editComponent.ignore = [
-  'componentBgColor',
-  'componentBgUrl',
-  'marginTop',
-  'marginBottom',
-  'topRounded',
-  'bottomRounded',
-  'pageBgColor',
-  'marginBoth',
-] // 忽略公共属性
+diyStore.editComponent.ignore = ['componentBgColor','componentBgUrl','marginTop','marginBottom','topRounded','bottomRounded','pageBgColor','marginBoth'] // 忽略公共属性
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
-  const res = { code: true, message: '' }
+    const res = { code: true, message: '' }
 
-  diyStore.value[index].search.hotWord.list.forEach((item: any) => {
-    if (item.text == '') {
-      res.code = false
-      res.message = t('carouselSearchHotWordTextPlaceholder')
-      return res
-    }
-  })
+    diyStore.value[index].search.hotWord.list.forEach((item: any) => {
+        if(item.text == ''){
+            res.code = false
+            res.message = t('carouselSearchHotWordTextPlaceholder')
+            return res
+        }
+    });
 
-  diyStore.value[index].tab.list.forEach((item: any) => {
-    if (item.text == '') {
-      res.code = false
-      res.message = t('carouselSearchTabCategoryTextPlaceholder')
-      return res
+    diyStore.value[index].tab.list.forEach((item: any) => {
+        if(item.text == ''){
+            res.code = false
+            res.message = t('carouselSearchTabCategoryTextPlaceholder')
+            return res
+        }
+        // if(item.diy_id == ''){
+        //     res.code = false
+        //     res.message = t('selectDiyPagePlaceholder')
+        //     return res
+        // }
+    });
+
+    if(diyStore.value[index].swiper.control){
+        diyStore.value[index].swiper.list.forEach((item: any) => {
+            if(item.imageUrl == ''){
+                res.code = false
+                res.message = t('imageUrlTip')
+                return res
+            }
+        });
     }
-    // if(item.diy_id == ''){
-    //     res.code = false
-    //     res.message = t('selectDiyPagePlaceholder')
-    //     return res
-    // }
-  })
-
-  if (diyStore.value[index].swiper.control) {
-    diyStore.value[index].swiper.list.forEach((item: any) => {
-      if (item.imageUrl == '') {
-        res.code = false
-        res.message = t('imageUrlTip')
-        return res
-      }
-    })
-  }
 
-  return res
+    return res
 }
 
 /************** 搜索框样式选择-start ********************/
 const selectSearchStyle = reactive({
-  title: diyStore.editComponent.search.styleName,
-  value: diyStore.editComponent.search.style,
+    title: diyStore.editComponent.search.styleName,
+    value: diyStore.editComponent.search.style
 })
 
 const showSearchDialog = ref(false)
 
 const showSearchStyle = () => {
-  showSearchDialog.value = true
-  selectSearchStyle.title = diyStore.editComponent.search.styleName
-  selectSearchStyle.value = diyStore.editComponent.search.style
+    showSearchDialog.value = true
+    selectSearchStyle.title = diyStore.editComponent.search.styleName;
+    selectSearchStyle.value = diyStore.editComponent.search.style;
 }
 
-const changeSearchStyle = (item: any) => {
-  selectSearchStyle.title = item.title
-  selectSearchStyle.value = item.value
+const changeSearchStyle = (item:any) => {
+    selectSearchStyle.title = item.title;
+    selectSearchStyle.value = item.value;
 }
 
 const confirmSearchStyle = () => {
-  diyStore.editComponent.search.styleName = selectSearchStyle.title
-  diyStore.editComponent.search.style = selectSearchStyle.value
-  showSearchDialog.value = false
+    diyStore.editComponent.search.styleName = selectSearchStyle.title;
+    diyStore.editComponent.search.style = selectSearchStyle.value;
+    showSearchDialog.value = false
 }
 
 const searchStyleList = reactive([
-  {
-    url: 'static/resource/images/diy/carousel_search/style_1.png',
-    title: '风格1',
-    value: 'style-1',
-  },
-  {
-    url: 'static/resource/images/diy/carousel_search/style_2.png',
-    title: '风格2',
-    value: 'style-2',
-  },
+    {
+        url: 'static/resource/images/diy/carousel_search/style_1.png',
+        title: '风格1',
+        value: 'style-1'
+    },
+    {
+        url: 'static/resource/images/diy/carousel_search/style_2.png',
+        title: '风格2',
+        value: 'style-2'
+    }
 ])
 
 /************** 搜索框样式选择-end ********************/
 
 diyStore.editComponent.search.hotWord.list.forEach((item: any) => {
-  if (!item.id) item.id = diyStore.generateRandom()
+    if (!item.id) item.id = diyStore.generateRandom()
 })
 
 diyStore.editComponent.tab.list.forEach((item: any) => {
-  if (!item.id) item.id = diyStore.generateRandom()
+    if (!item.id) item.id = diyStore.generateRandom()
 })
 
 diyStore.editComponent.swiper.list.forEach((item: any) => {
-  if (!item.id) item.id = diyStore.generateRandom()
+    if (!item.id) item.id = diyStore.generateRandom()
 })
 
 const activeNames = ref(['tab', 'swiper'])
 const handleChange = (val: string[]) => {}
 
 onMounted(() => {
-  loadDiyPageList()
+    loadDiyPageList()
 })
 
 const addHotWordItem = () => {
-  diyStore.editComponent.search.hotWord.list.push({
-    id: diyStore.generateRandom(),
-    text: '关键词',
-  })
+    diyStore.editComponent.search.hotWord.list.push({
+        id: diyStore.generateRandom(),
+        text : '关键词',
+    })
 }
 
-const tabClear = (index: any) => {
-  diyStore.editComponent.tab.list[index].diy_id = 0
-  diyStore.editComponent.tab.list[index].diy_title = ''
+const tabClear = (index:any) => {
+    diyStore.editComponent.tab.list[index].diy_id = 0;
+    diyStore.editComponent.tab.list[index].diy_title = '';
 }
 
 const addTabItem = () => {
-  diyStore.editComponent.tab.list.push({
-    id: diyStore.generateRandom(),
-    text: '分类名称', // 最多4个字
-    source: 'diy_page', // 数据源类型，微页面：diy_page
-    diy_id: '',
-    diy_title: '',
-  })
+    diyStore.editComponent.tab.list.push({
+        id: diyStore.generateRandom(),
+        text : '分类名称', // 最多4个字
+        source : 'diy_page', // 数据源类型，微页面：diy_page
+        diy_id : '',
+        diy_title : ''
+    })
 }
 
 const searchHotWordTabBoxRef = ref()
@@ -724,70 +449,65 @@ const tabBoxRef = ref()
 const imageBoxRef = ref()
 
 onMounted(() => {
-  nextTick(() => {
-    const hotWordSortable = Sortable.create(searchHotWordTabBoxRef.value, {
-      group: 'item-wrap',
-      animation: 200,
-      onEnd: (event) => {
-        const temp = diyStore.editComponent.search.hotWord.list[event.oldIndex!]
-        diyStore.editComponent.search.hotWord.list.splice(event.oldIndex!, 1)
-        diyStore.editComponent.search.hotWord.list.splice(
-          event.newIndex!,
-          0,
-          temp
-        )
-        tabSortable.sort(
-          range(diyStore.editComponent.search.hotWord.list.length).map(
-            (value) => {
-              return value.toString()
+    nextTick(() => {
+        const hotWordSortable = Sortable.create(searchHotWordTabBoxRef.value, {
+            group: 'item-wrap',
+            animation: 200,
+            onEnd: event => {
+                const temp = diyStore.editComponent.search.hotWord.list[event.oldIndex!]
+                diyStore.editComponent.search.hotWord.list.splice(event.oldIndex!, 1)
+                diyStore.editComponent.search.hotWord.list.splice(event.newIndex!, 0, temp)
+                tabSortable.sort(
+                    range(diyStore.editComponent.search.hotWord.list.length).map(value => {
+                        return value.toString()
+                    })
+                )
             }
-          )
-        )
-      },
-    })
-
-    const tabSortable = Sortable.create(tabBoxRef.value, {
-      group: 'item-wrap',
-      animation: 200,
-      onEnd: (event) => {
-        const temp = diyStore.editComponent.tab.list[event.oldIndex!]
-        diyStore.editComponent.tab.list.splice(event.oldIndex!, 1)
-        diyStore.editComponent.tab.list.splice(event.newIndex!, 0, temp)
-        tabSortable.sort(
-          range(diyStore.editComponent.tab.list.length).map((value) => {
-            return value.toString()
-          })
-        )
-      },
-    })
-
-    const imageSortable = Sortable.create(imageBoxRef.value, {
-      group: 'item-wrap',
-      animation: 200,
-      onEnd: (event) => {
-        const temp = diyStore.editComponent.swiper.list[event.oldIndex!]
-        diyStore.editComponent.swiper.list.splice(event.oldIndex!, 1)
-        diyStore.editComponent.swiper.list.splice(event.newIndex!, 0, temp)
-        imageSortable.sort(
-          range(diyStore.editComponent.swiper.list.length).map((value) => {
-            return value.toString()
-          })
-        )
-        handleHeight(true)
-      },
+        })
+
+        const tabSortable = Sortable.create(tabBoxRef.value, {
+            group: 'item-wrap',
+            animation: 200,
+            onEnd: event => {
+                const temp = diyStore.editComponent.tab.list[event.oldIndex!]
+                diyStore.editComponent.tab.list.splice(event.oldIndex!, 1)
+                diyStore.editComponent.tab.list.splice(event.newIndex!, 0, temp)
+                tabSortable.sort(
+                    range(diyStore.editComponent.tab.list.length).map(value => {
+                        return value.toString()
+                    })
+                )
+            }
+        })
+
+        const imageSortable = Sortable.create(imageBoxRef.value, {
+            group: 'item-wrap',
+            animation: 200,
+            onEnd: event => {
+                const temp = diyStore.editComponent.swiper.list[event.oldIndex!]
+                diyStore.editComponent.swiper.list.splice(event.oldIndex!, 1)
+                diyStore.editComponent.swiper.list.splice(event.newIndex!, 0, temp)
+                imageSortable.sort(
+                    range(diyStore.editComponent.swiper.list.length).map(value => {
+                        return value.toString()
+                    })
+                )
+                handleHeight(true)
+            }
+        })
     })
-  })
 })
 
 const diyPageShowDialog = ref(false)
 
 const diyPageTable = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {},
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+    }
 })
 const diyPageTableRef = ref<InstanceType<typeof ElTable>>()
 
@@ -795,116 +515,112 @@ const diyPageTableRef = ref<InstanceType<typeof ElTable>>()
  * 获取自定义页面列表
  */
 const loadDiyPageList = (page: number = 1) => {
-  diyPageTable.loading = true
-  diyPageTable.page = page
-
-  getDiyPageListByCarouselSearch({
-    page: diyPageTable.page,
-    limit: diyPageTable.limit,
-    ...diyPageTable.searchParam,
-  })
-    .then((res) => {
-      diyPageTable.loading = false
-      let data = res.data.data
-      let newData: any = []
-      let isExistCount = 0
-
-      // 排除当前编辑的微页面以及存在 置顶组件的数据
-      if (diyStore.id) {
-        for (let i = 0; i < data.length; i++) {
-          if (data[i].id == diyStore.id) {
-            isExistCount++
-          } else {
-            newData.push(data[i])
-          }
+    diyPageTable.loading = true
+    diyPageTable.page = page
+
+    getDiyPageListByCarouselSearch({
+        page: diyPageTable.page,
+        limit: diyPageTable.limit,
+        ...diyPageTable.searchParam
+    }).then(res => {
+        diyPageTable.loading = false
+        let data = res.data.data;
+        let newData: any = [];
+        let isExistCount = 0;
+
+        // 排除当前编辑的微页面以及存在 置顶组件的数据
+        if (diyStore.id) {
+            for (let i = 0; i < data.length; i++) {
+                if (data[i].id == diyStore.id) {
+                    isExistCount++;
+                } else {
+                    newData.push(data[i]);
+                }
+            }
+        } else {
+            newData = cloneDeep(data); // 添加
         }
-      } else {
-        newData = cloneDeep(data) // 添加
-      }
-      if (isExistCount) {
-        res.data.total = res.data.total - isExistCount
-      }
-      diyPageTable.data = newData
-      diyPageTable.total = res.data.total
-    })
-    .catch(() => {
-      diyPageTable.loading = false
+        if (isExistCount) {
+            res.data.total = res.data.total - isExistCount;
+        }
+        diyPageTable.data = newData
+        diyPageTable.total = res.data.total
+    }).catch(() => {
+        diyPageTable.loading = false
     })
 }
 
 // 选择微页面
-let currDiyPage: any = {}
-let currTabIndexForDiyPage = 0
+let currDiyPage:any = {}
+let currTabIndexForDiyPage = 0;
 const handleCurrentDiyPageChange = (val: string | any[]) => {
-  currDiyPage = val
+    currDiyPage = val
 }
 
 const saveDiyPageId = () => {
-  diyStore.editComponent.tab.list[currTabIndexForDiyPage].diy_id =
-    currDiyPage.id
-  diyStore.editComponent.tab.list[currTabIndexForDiyPage].diy_title =
-    currDiyPage.title
-  diyPageShowDialog.value = false
+    diyStore.editComponent.tab.list[currTabIndexForDiyPage].diy_id = currDiyPage.id;
+    diyStore.editComponent.tab.list[currTabIndexForDiyPage].diy_title = currDiyPage.title;
+    diyPageShowDialog.value = false
 }
 
-const diyPageShowDialogOpen = (index: any) => {
-  diyPageShowDialog.value = true
-  currTabIndexForDiyPage = index
-  if (currDiyPage) {
-    setTimeout(() => {
-      diyPageTableRef.value!.setCurrentRow(currDiyPage)
-    }, 200)
-  }
+const diyPageShowDialogOpen = (index:any) => {
+    diyPageShowDialog.value = true
+    currTabIndexForDiyPage = index;
+    if (currDiyPage) {
+        setTimeout(() => {
+            diyPageTableRef.value!.setCurrentRow(currDiyPage)
+        }, 200)
+    }
 }
 
 watch(
-  () => diyStore.editComponent.swiper.list,
-  (newValue, oldValue) => {
-    // 设置图片宽高
-    handleHeight()
-  },
-  { deep: true }
+    () => diyStore.editComponent.swiper.list,
+    (newValue, oldValue) => {
+        // 设置图片宽高
+        handleHeight()
+    },
+    { deep: true }
 )
 
 const addImageAd = () => {
-  diyStore.editComponent.swiper.list.push({
-    id: diyStore.generateRandom(),
-    imageUrl: '',
-    imgWidth: 0,
-    imgHeight: 0,
-    link: { name: '' },
-  })
+    diyStore.editComponent.swiper.list.push({
+        id: diyStore.generateRandom(),
+        imageUrl: '',
+        imgWidth: 0,
+        imgHeight: 0,
+        link: { name: '' }
+    })
 }
 
-const selectImg = (url: string) => {
-  handleHeight(true)
+const selectImg = (url:string) => {
+    handleHeight(true)
 }
 
-const changeSwiperStyle = (value: any) => {
-  handleHeight(true)
+const changeSwiperStyle = (value:any) => {
+    handleHeight(true)
 }
 
 // 处理高度
-const handleHeight = (isCalcHeight: boolean = false) => {
-  diyStore.editComponent.swiper.list.forEach((item: any, index: number) => {
-    const image = new Image()
-    image.src = img(item.imageUrl)
-    image.onload = async () => {
-      item.imgWidth = image.width
-      item.imgHeight = image.height
-      // 计算第一张图片高度
-      if (isCalcHeight && index == 0) {
-        const ratio = item.imgHeight / item.imgWidth
-        if (diyStore.editComponent.swiper.swiperStyle == 'style-1') {
-          item.width = 375 * 0.92 // 0.92：前端缩放比例
-        } else {
-          item.width = 355
+const handleHeight = (isCalcHeight:boolean = false)=> {
+    diyStore.editComponent.swiper.list.forEach((item: any, index: number) => {
+        const image = new Image()
+        image.src = img(item.imageUrl)
+        image.onload = async () => {
+            item.imgWidth = image.width
+            item.imgHeight = image.height
+            // 计算第一张图片高度
+            if (isCalcHeight && index == 0) {
+                const ratio = item.imgHeight / item.imgWidth
+                if(diyStore.editComponent.swiper.swiperStyle == 'style-1') {
+                    item.width = 375 * 0.92 // 0.92：前端缩放比例
+                }else{
+                    item.width = 355
+                }
+                item.height = item.width * ratio
+                diyStore.editComponent.swiper.imageHeight = parseInt(item.height)
+            }
         }
-        item.height = item.width * ratio
-        diyStore.editComponent.swiper.imageHeight = parseInt(item.height)
-      }
-    }
-  })
+    })
 }
 
 defineExpose({})
@@ -913,12 +629,12 @@ defineExpose({})
 <style lang="scss" scoped></style>
 
 <style lang="scss">
-.select-diy-page-input .el-input__inner {
-  cursor: pointer;
-}
-.collapse-wrap {
-  .el-collapse-item__header {
-    font-size: 16px;
-  }
-}
+	.select-diy-page-input .el-input__inner{
+		cursor: pointer;
+	}
+	.collapse-wrap{
+		.el-collapse-item__header{
+			font-size: 16px;
+		}
+	}
 </style>
diff --git a/admin/src/app/views/diy/components/edit-float-btn.vue b/admin/src/app/views/diy/components/edit-float-btn.vue
index 8f991121..4809f81c 100644
--- a/admin/src/app/views/diy/components/edit-float-btn.vue
+++ b/admin/src/app/views/diy/components/edit-float-btn.vue
@@ -1,8 +1,9 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap float-btn" v-show="diyStore.editTab == 'content'">
-    <div class="edit-attr-item-wrap">
-      <!-- <h3 class="mb-[10px]">{{ t('selectStyle') }}</h3>
+	<!-- 内容 -->
+	<div class="content-wrap float-btn" v-show="diyStore.editTab == 'content'">
+
+		<div class="edit-attr-item-wrap">
+            <!-- <h3 class="mb-[10px]">{{ t('selectStyle') }}</h3>
 			<el-form label-width="80px" class="px-[10px]">
 				<el-form-item :label="t('selectStyle')" class="flex">
 					<span class="text-primary flex-1 cursor-pointer" @click="showCouponStyle">{{ diyStore.editComponent.styleName }}</span>
@@ -27,107 +28,61 @@
                 </template>
 
             </el-dialog> -->
-      <h3 class="mb-[10px]">{{ t('floatBtnBtton') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('floatBtnBtton')">
-          <span>{{ selectTemplate.name }}</span>
-          <ul class="ml-[10px] flex items-center">
-            <template v-for="(item, i) in templateList" :key="i">
-              <li
-                v-if="
-                  diyStore.editComponent.style === 'style-1' ||
-                  (diyStore.editComponent.style === 'style-2' && i > 1)
-                "
-                :class="[
-                  'w-[50px] h-[32px] flex items-center justify-center border-solid  border-[1px] border-[#eee] cursor-pointer',
-                  { 'border-r-transparent': templateList.length != i + 1 },
-                  item.className == diyStore.editComponent.bottomPosition
-                    ? '!border-[var(--el-color-primary)]'
-                    : '',
-                ]"
-                @click="changeTemplateList(item)"
-              >
-                <span :class="['iconfont !text-[20px]', item.src]"></span>
-              </li>
-            </template>
-          </ul>
-        </el-form-item>
-        <el-form-item :label="t('floatBtnOffset')">
-          <el-slider
-            v-model="diyStore.editComponent.offset"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-            :max="100"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('floatBtnImageSet') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('floatBtnImageSize')">
-          <el-slider
-            v-model="diyStore.editComponent.imageSize"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-            :min="30"
-            :max="100"
-          />
-        </el-form-item>
-        <el-form-item :label="t('floatBtnAroundRadius')">
-          <el-slider
-            v-model="diyStore.editComponent.aroundRadius"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-            :max="50"
-          />
-        </el-form-item>
-
-        <div class="text-[12px] text-[#999] mb-[15px] mt-[5px]">
-          {{ t('floatBtnImageSuggest') }}
-        </div>
-        <div ref="imageBoxRef">
-          <div
-            v-for="(item, index) in diyStore.editComponent.list"
-            :key="item.id"
-            class="item-wrap p-[10px] pb-0 relative border border-dashed border-gray-300 mb-[16px]"
-          >
-            <el-form-item :label="t('image')">
-              <upload-image v-model="item.imageUrl" :limit="1" />
-            </el-form-item>
+			<h3 class="mb-[10px]">{{ t('floatBtnBtton') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('floatBtnBtton')">
+					<span>{{ selectTemplate.name }}</span>
+                    <ul class="ml-[10px] flex items-center">
+                        <template v-for="(item,i) in templateList" :key="i">
+                            <li v-if="diyStore.editComponent.style==='style-1'||(diyStore.editComponent.style==='style-2'&&i>1)" :class="['w-[50px] h-[32px] flex items-center justify-center border-solid  border-[1px] border-[#eee] cursor-pointer', {'border-r-transparent': templateList.length != (i+1)}, (item.className == diyStore.editComponent.bottomPosition) ?  '!border-[var(--el-color-primary)]' : '' ]" @click="changeTemplateList(item)">
+                                <span :class="['iconfont !text-[20px]', item.src]"></span>
+                            </li>
+                        </template>
+                    </ul>
+				</el-form-item>
+                <el-form-item :label="t('floatBtnOffset')">
+					<el-slider v-model="diyStore.editComponent.offset" show-input size="small" class="ml-[10px] diy-nav-slider" :max="100"/>
+				</el-form-item>
+			</el-form>
+		</div>
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('floatBtnImageSet') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+                <el-form-item :label="t('floatBtnImageSize')">
+					<el-slider v-model="diyStore.editComponent.imageSize" show-input size="small" class="ml-[10px] diy-nav-slider" :min="30" :max="100"/>
+				</el-form-item>
+				<el-form-item :label="t('floatBtnAroundRadius')">
+					<el-slider v-model="diyStore.editComponent.aroundRadius" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50"/>
+				</el-form-item>
 
-            <div
-              class="del absolute cursor-pointer z-[2] top-[-8px] right-[-8px]"
-              v-show="diyStore.editComponent.list.length > 1"
-              @click="diyStore.editComponent.list.splice(index, 1)"
-            >
-              <icon name="element CircleCloseFilled" color="#bbb" size="20px" />
-            </div>
+				<div class="text-[12px] text-[#999] mb-[15px] mt-[5px]">{{t('floatBtnImageSuggest')}}</div>
+				<div ref="imageBoxRef">
+					<div v-for="(item,index) in diyStore.editComponent.list" :key="item.id" class="item-wrap p-[10px] pb-0 relative border border-dashed border-gray-300 mb-[16px]">
+						<el-form-item :label="t('image')">
+							<upload-image v-model="item.imageUrl" :limit="1" />
+						</el-form-item>
+
+						<div class="del absolute cursor-pointer z-[2] top-[-8px] right-[-8px]" v-show="diyStore.editComponent.list.length > 1" @click="diyStore.editComponent.list.splice(index,1)">
+							<icon name="element CircleCloseFilled" color="#bbb" size="20px"/>
+						</div>
+
+						<el-form-item :label="t('link')">
+							<diy-link v-model="item.link"/>
+						</el-form-item>
+					</div>
+				</div>
+			</el-form>
 
-            <el-form-item :label="t('link')">
-              <diy-link v-model="item.link" />
-            </el-form-item>
-          </div>
-        </div>
-      </el-form>
+            <el-button v-show="diyStore.editComponent.list.length < 3" class="w-full" @click="addImageAd">{{ t('addImageAd') }}</el-button>
+		</div>
+	</div>
 
-      <el-button
-        v-show="diyStore.editComponent.list.length < 3"
-        class="w-full"
-        @click="addImageAd"
-        >{{ t('addImageAd') }}</el-button
-      >
-    </div>
-  </div>
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+	</div>
 
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
 </template>
 
 <script lang="ts" setup>
@@ -139,38 +94,32 @@ import { img } from '@/utils/common'
 import { range } from 'lodash-es'
 
 const diyStore = useDiyStore()
-diyStore.editComponent.ignore = [
-  'pageBgColor',
-  'marginTop',
-  'marginBottom',
-  'marginBoth',
-  'componentBgUrl',
-] // 忽略公共属性
+diyStore.editComponent.ignore = ['pageBgColor','marginTop','marginBottom','marginBoth','componentBgUrl'] // 忽略公共属性
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
-  const res = { code: true, message: '' }
-  diyStore.value[index].list.forEach((item: any) => {
-    if (item.imageUrl === '') {
-      res.code = false
-      res.message = t('imageUrlTip')
-      return res
-    }
-  })
-  return res
+    const res = { code: true, message: '' }
+    diyStore.value[index].list.forEach((item: any) => {
+        if (item.imageUrl === '') {
+            res.code = false
+            res.message = t('imageUrlTip')
+            return res
+        }
+    })
+    return res
 }
 
 /*********** 风格样式 **********/
 
 const showCouponDialog = ref(false)
 const selectCouponStyle = reactive({
-  title: diyStore.editComponent.styleName,
-  value: diyStore.editComponent.style,
+    title: diyStore.editComponent.styleName,
+    value: diyStore.editComponent.style
 })
 const showCouponStyle = () => {
-  showCouponDialog.value = true
-  selectCouponStyle.title = diyStore.editComponent.styleName
-  selectCouponStyle.value = diyStore.editComponent.style
+    showCouponDialog.value = true
+    selectCouponStyle.title = diyStore.editComponent.styleName;
+    selectCouponStyle.value = diyStore.editComponent.style;
 }
 // const couponStyleList = reactive([
 //     {
@@ -185,91 +134,93 @@ const showCouponStyle = () => {
 //     }
 // ])
 //风格点击
-const changeCouponStyle = (item: any) => {
-  selectCouponStyle.title = item.title
-  selectCouponStyle.value = item.value
+const changeCouponStyle = (item:any) => {
+    selectCouponStyle.title = item.title;
+    selectCouponStyle.value = item.value;
 }
 //确认风格
 const confirmCouponStyle = () => {
-  diyStore.editComponent.styleName = selectCouponStyle.title
-  diyStore.editComponent.style = selectCouponStyle.value
-  showCouponDialog.value = false
-  selectTemplate.value = {
-    name: '右下',
-    src: 'iconyouxiajiao',
-    className: 'lowerRight',
-  }
-  diyStore.editComponent.bottomPosition = 'lowerRight'
+    diyStore.editComponent.styleName = selectCouponStyle.title;
+    diyStore.editComponent.style = selectCouponStyle.value;
+    showCouponDialog.value = false
+    selectTemplate.value = {
+        name: '右下',
+        src: 'iconyouxiajiao',
+        className: 'lowerRight'
+    };
+    diyStore.editComponent.bottomPosition = 'lowerRight'
 }
 /******** end *******/
 const templateList = ref([
-  {
-    name: '左上',
-    src: 'iconzuoshangpc',
-    className: 'upperLeft',
-  },
-  {
-    name: '右上',
-    src: 'iconyoushangpc',
-    className: 'upperRight',
-  },
-  {
-    name: '左下',
-    src: 'iconzuoxiapc',
-    className: 'lowerLeft',
-  },
-  {
-    name: '右下',
-    src: 'iconyouxiapc',
-    className: 'lowerRight',
-  },
+    {
+        name: '左上',
+        src: 'iconzuoshangpc',
+        className: 'upperLeft'
+    },
+    {
+        name: '右上',
+        src: 'iconyoushangpc',
+        className: 'upperRight'
+    },
+    {
+        name: '左下',
+        src: 'iconzuoxiapc',
+        className: 'lowerLeft'
+    },
+    {
+        name: '右下',
+        src: 'iconyouxiapc',
+        className: 'lowerRight'
+    }
 ])
 
 const selectTemplate = ref({})
 templateList.value.forEach((item) => {
-  if (item.className == diyStore.editComponent.bottomPosition) {
-    selectTemplate.value = item
-  }
+    if (item.className == diyStore.editComponent.bottomPosition) {
+        selectTemplate.value = item
+    }
 })
 
 const changeTemplateList = (data: any) => {
-  selectTemplate.value = data
-  diyStore.editComponent.bottomPosition = data.className
+    selectTemplate.value = data;
+    diyStore.editComponent.bottomPosition = data.className
 }
 
 const addImageAd = () => {
-  diyStore.editComponent.list.push({
-    id: diyStore.generateRandom(),
-    imageUrl: '',
-    link: { name: '' },
-  })
+    diyStore.editComponent.list.push({
+        id: diyStore.generateRandom(),
+        imageUrl: '',
+        link: { name: '' }
+    })
 }
 
-const imageBoxRef = ref()
+const imageBoxRef = ref();
 diyStore.editComponent.list.forEach((item: any) => {
-  if (!item.id) item.id = diyStore.generateRandom()
+    if (!item.id) item.id = diyStore.generateRandom()
 })
 
 onMounted(() => {
-  nextTick(() => {
-    const imageSortable = Sortable.create(imageBoxRef.value, {
-      group: 'item-wrap',
-      animation: 200,
-      onEnd: (event) => {
-        const temp = diyStore.editComponent.list[event.oldIndex!]
-        diyStore.editComponent.list.splice(event.oldIndex!, 1)
-        diyStore.editComponent.list.splice(event.newIndex!, 0, temp)
-        imageSortable.sort(
-          range(diyStore.editComponent.list.length).map((value) => {
-            return value.toString()
-          })
-        )
-      },
+    nextTick(() => {
+        const imageSortable = Sortable.create(imageBoxRef.value, {
+            group: 'item-wrap',
+            animation: 200,
+            onEnd: event => {
+                const temp = diyStore.editComponent.list[event.oldIndex!]
+                diyStore.editComponent.list.splice(event.oldIndex!, 1)
+                diyStore.editComponent.list.splice(event.newIndex!, 0, temp)
+                imageSortable.sort(
+                    range(diyStore.editComponent.list.length).map(value => {
+                        return value.toString()
+                    })
+                )
+            }
+        })
     })
-  })
 })
 
 defineExpose({})
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+
+</style>
diff --git a/admin/src/app/views/diy/components/edit-graphic-nav.vue b/admin/src/app/views/diy/components/edit-graphic-nav.vue
index 2a4ef029..b2e8b4d5 100644
--- a/admin/src/app/views/diy/components/edit-graphic-nav.vue
+++ b/admin/src/app/views/diy/components/edit-graphic-nav.vue
@@ -1,244 +1,146 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('graphicNavModeTitle') }}</h3>
-      <el-form label-width="90px" class="px-[10px]">
-        <el-form-item :label="t('layoutMode')">
-          <el-radio-group v-model="diyStore.editComponent.layout">
-            <el-radio :label="'horizontal'">{{
-              t('layoutModeHorizontal')
-            }}</el-radio>
-            <el-radio :label="'vertical'">{{
-              t('layoutModeVertical')
-            }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-
-        <el-form-item :label="t('graphicNavSelectMode')">
-          <el-radio-group v-model="diyStore.editComponent.mode">
-            <el-radio :label="'graphic'">{{
-              t('graphicNavModeGraphic')
-            }}</el-radio>
-            <el-radio :label="'img'">{{ t('graphicNavModeImg') }}</el-radio>
-            <el-radio :label="'text'">{{ t('graphicNavModeText') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-
-        <view v-show="diyStore.editComponent.layout == 'horizontal'">
-          <el-form-item :label="t('graphicNavPageCount')">
-            <el-radio-group
-              v-model="diyStore.editComponent.pageCount"
-              @change="changePageCount"
-            >
-              <el-radio :label="1">{{ t('singleLine') }}</el-radio>
-              <el-radio :label="2">{{ t('multiline') }}</el-radio>
-            </el-radio-group>
-          </el-form-item>
-
-          <el-form-item :label="t('graphicNavShowStyle')">
-            <el-radio-group
-              v-model="diyStore.editComponent.showStyle"
-              @change="changeShowStyle"
-            >
-              <el-radio :label="'fixed'">{{
-                t('graphicNavStyleFixed')
-              }}</el-radio>
-              <el-radio :label="'singleSlide'">{{
-                diyStore.editComponent.pageCount == 2
-                  ? t('graphicNavStyleMultiLine')
-                  : t('graphicNavStyleSingleSlide')
-              }}</el-radio>
-              <el-radio :label="'pageSlide'">{{
-                t('graphicNavStylePageSlide')
-              }}</el-radio>
-            </el-radio-group>
-          </el-form-item>
-
-          <el-form-item :label="t('graphicNavRowCount')">
-            <el-radio-group v-model="diyStore.editComponent.rowCount">
-              <el-radio :label="3">3{{ t('piece') }}</el-radio>
-              <el-radio :label="4">4{{ t('piece') }}</el-radio>
-              <el-radio :label="5">5{{ t('piece') }}</el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </view>
-      </el-form>
-    </div>
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('graphicNavSetLabel') }}</h3>
-      <el-form label-width="90px" class="px-[10px]">
-        <p class="text-sm text-gray-400 mb-[10px]">{{ t('graphicNavTips') }}</p>
-
-        <div ref="imageBoxRef">
-          <div
-            v-for="(item, index) in diyStore.editComponent.list"
-            :key="item.id"
-            class="item-wrap p-[10px] pb-0 relative border border-dashed border-gray-300 mb-[16px]"
-          >
-            <el-form-item
-              :label="t('image')"
-              v-show="
-                diyStore.editComponent.mode === 'graphic' ||
-                diyStore.editComponent.mode === 'img'
-              "
-            >
-              <upload-image v-model="item.imageUrl" :limit="1" />
-            </el-form-item>
-
-            <el-form-item
-              :label="t('graphicNavTitle')"
-              v-show="
-                diyStore.editComponent.mode === 'graphic' ||
-                diyStore.editComponent.mode === 'text'
-              "
-            >
-              <el-input
-                v-model.trim="item.title"
-                :placeholder="t('graphicNavTitlePlaceholder')"
-                clearable
-                maxlength="20"
-                show-word-limit
-              />
-            </el-form-item>
-
-            <div
-              class="del absolute cursor-pointer z-[2] top-[-8px] right-[-8px]"
-              v-show="diyStore.editComponent.list.length > 1"
-              @click="diyStore.editComponent.list.splice(index, 1)"
-            >
-              <icon name="element CircleCloseFilled" color="#bbb" size="20px" />
-            </div>
-
-            <el-form-item :label="t('link')">
-              <diy-link v-model="item.link" />
-            </el-form-item>
-          </div>
-        </div>
-
-        <el-button
-          v-show="diyStore.editComponent.list.length < 50"
-          class="w-full"
-          @click="addGraphicNav"
-          >{{ t('addGraphicNav') }}</el-button
-        >
-      </el-form>
-    </div>
-  </div>
-
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <div
-      class="edit-attr-item-wrap"
-      v-show="['graphic', 'img'].includes(diyStore.editComponent.mode)"
-    >
-      <h3 class="mb-[10px]">{{ t('graphicNavImageSet') }}</h3>
-      <el-form label-width="90px" class="px-[10px]">
-        <el-form-item :label="t('graphicNavImageSize')">
-          <el-slider
-            v-model="diyStore.editComponent.imageSize"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-            :min="20"
-            :max="60"
-          />
-        </el-form-item>
-        <el-form-item :label="t('graphicNavAroundRadius')">
-          <el-slider
-            v-model="diyStore.editComponent.aroundRadius"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-            :max="50"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-    <div
-      class="edit-attr-item-wrap"
-      v-show="['graphic', 'text'].includes(diyStore.editComponent.mode)"
-    >
-      <h3 class="mb-[10px]">{{ t('textSet') }}</h3>
-      <el-form label-width="90px" class="px-[10px]">
-        <el-form-item :label="t('textFontSize')">
-          <el-slider
-            v-model="diyStore.editComponent.font.size"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-            :min="12"
-            :max="16"
-          />
-        </el-form-item>
-        <el-form-item :label="t('textFontWeight')">
-          <el-radio-group v-model="diyStore.editComponent.font.weight">
-            <el-radio :label="'normal'">{{ t('fontWeightNormal') }}</el-radio>
-            <el-radio :label="'bold'">{{ t('fontWeightBold') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item :label="t('textColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.font.color"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-    <div
-      class="edit-attr-item-wrap"
-      v-show="
-        diyStore.editComponent.showStyle == 'pageSlide' &&
-        diyStore.editComponent.layout == 'horizontal'
-      "
-    >
-      <h3 class="mb-[10px]">{{ t('carouselSearchSwiperIndicatorSet') }}</h3>
-      <el-form label-width="100px" class="px-[10px]">
-        <el-form-item :label="t('carouselSearchSwiperIndicatorStyle')">
-          <el-radio-group
-            v-model="diyStore.editComponent.swiper.indicatorStyle"
-          >
-            <el-radio label="style-1">{{
-              t('carouselSearchSwiperIndicatorStyle1')
-            }}</el-radio>
-            <el-radio label="style-2">{{
-              t('carouselSearchSwiperIndicatorStyle2')
-            }}</el-radio>
-            <el-radio label="style-3">{{
-              t('carouselSearchSwiperIndicatorStyle3')
-            }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item :label="t('carouselSearchSwiperIndicatorAlign')">
-          <el-radio-group
-            v-model="diyStore.editComponent.swiper.indicatorAlign"
-          >
-            <el-radio label="left">{{ t('alignLeft') }}</el-radio>
-            <el-radio label="center">{{ t('alignCenter') }}</el-radio>
-            <el-radio label="right">{{ t('alignRight') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item :label="t('noColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.swiper.indicatorColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-        <el-form-item :label="t('selectColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.swiper.indicatorActiveColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('graphicNavModeTitle') }}</h3>
+			<el-form label-width="90px" class="px-[10px]">
+
+				<el-form-item :label="t('layoutMode')">
+					<el-radio-group v-model="diyStore.editComponent.layout">
+						<el-radio :label="'horizontal'">{{t('layoutModeHorizontal')}}</el-radio>
+						<el-radio :label="'vertical'">{{t('layoutModeVertical')}}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+
+				<el-form-item :label="t('graphicNavSelectMode')">
+					<el-radio-group v-model="diyStore.editComponent.mode">
+						<el-radio :label="'graphic'">{{t('graphicNavModeGraphic')}}</el-radio>
+						<el-radio :label="'img'">{{t('graphicNavModeImg')}}</el-radio>
+						<el-radio :label="'text'">{{t('graphicNavModeText')}}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+
+				<view v-show="diyStore.editComponent.layout == 'horizontal'">
+
+					<el-form-item :label="t('graphicNavPageCount')">
+						<el-radio-group v-model="diyStore.editComponent.pageCount" @change="changePageCount">
+							<el-radio :label="1">{{t('singleLine')}}</el-radio>
+							<el-radio :label="2">{{t('multiline')}}</el-radio>
+						</el-radio-group>
+					</el-form-item>
+
+					<el-form-item :label="t('graphicNavShowStyle')">
+						<el-radio-group v-model="diyStore.editComponent.showStyle" @change="changeShowStyle">
+							<el-radio :label="'fixed'">{{t('graphicNavStyleFixed')}}</el-radio>
+							<el-radio :label="'singleSlide'">{{diyStore.editComponent.pageCount == 2 ? t('graphicNavStyleMultiLine') : t('graphicNavStyleSingleSlide')}}</el-radio>
+							<el-radio :label="'pageSlide'">{{t('graphicNavStylePageSlide')}}</el-radio>
+						</el-radio-group>
+					</el-form-item>
+
+					<el-form-item :label="t('graphicNavRowCount')">
+						<el-radio-group v-model="diyStore.editComponent.rowCount">
+							<el-radio :label="3">3{{t('piece')}}</el-radio>
+							<el-radio :label="4">4{{t('piece')}}</el-radio>
+							<el-radio :label="5">5{{t('piece')}}</el-radio>
+						</el-radio-group>
+					</el-form-item>
+				</view>
+			</el-form>
+		</div>
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('graphicNavSetLabel') }}</h3>
+			<el-form label-width="90px" class="px-[10px]">
+
+				<p class="text-sm text-gray-400 mb-[10px]">{{ t('graphicNavTips') }}</p>
+
+				<div ref="imageBoxRef">
+					<div v-for="(item,index) in diyStore.editComponent.list" :key="item.id" class="item-wrap p-[10px] pb-0 relative border border-dashed border-gray-300 mb-[16px]">
+						<el-form-item :label="t('image')" v-show="diyStore.editComponent.mode === 'graphic' || diyStore.editComponent.mode === 'img'">
+							<upload-image v-model="item.imageUrl" :limit="1"/>
+						</el-form-item>
+
+						<el-form-item :label="t('graphicNavTitle')" v-show="diyStore.editComponent.mode === 'graphic' || diyStore.editComponent.mode === 'text'">
+							<el-input v-model.trim="item.title" :placeholder="t('graphicNavTitlePlaceholder')" clearable maxlength="20" show-word-limit/>
+						</el-form-item>
+
+						<div class="del absolute cursor-pointer z-[2] top-[-8px] right-[-8px]" v-show="diyStore.editComponent.list.length > 1" @click="diyStore.editComponent.list.splice(index,1)">
+							<icon name="element CircleCloseFilled" color="#bbb" size="20px"/>
+						</div>
+
+						<el-form-item :label="t('link')">
+							<diy-link v-model="item.link"/>
+						</el-form-item>
+					</div>
+				</div>
+
+				<el-button v-show="diyStore.editComponent.list.length < 50" class="w-full" @click="addGraphicNav">{{ t('addGraphicNav') }}</el-button>
+
+			</el-form>
+		</div>
+	</div>
+
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+		<div class="edit-attr-item-wrap" v-show="['graphic','img'].includes(diyStore.editComponent.mode)">
+			<h3 class="mb-[10px]">{{ t('graphicNavImageSet') }}</h3>
+			<el-form label-width="90px" class="px-[10px]">
+				<el-form-item :label="t('graphicNavImageSize')">
+					<el-slider v-model="diyStore.editComponent.imageSize" show-input size="small" class="ml-[10px] diy-nav-slider" :min="20" :max="60"/>
+				</el-form-item>
+				<el-form-item :label="t('graphicNavAroundRadius')">
+					<el-slider v-model="diyStore.editComponent.aroundRadius" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50"/>
+				</el-form-item>
+			</el-form>
+		</div>
+		<div class="edit-attr-item-wrap" v-show="['graphic','text'].includes(diyStore.editComponent.mode)">
+			<h3 class="mb-[10px]">{{ t('textSet') }}</h3>
+			<el-form label-width="90px" class="px-[10px]">
+				<el-form-item :label="t('textFontSize')">
+					<el-slider v-model="diyStore.editComponent.font.size" show-input size="small" class="ml-[10px] diy-nav-slider" :min="12" :max="16"/>
+				</el-form-item>
+				<el-form-item :label="t('textFontWeight')">
+					<el-radio-group v-model="diyStore.editComponent.font.weight">
+						<el-radio :label="'normal'">{{t('fontWeightNormal')}}</el-radio>
+						<el-radio :label="'bold'">{{t('fontWeightBold')}}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+				<el-form-item :label="t('textColor')">
+					<el-color-picker v-model="diyStore.editComponent.font.color" show-alpha :predefine="diyStore.predefineColors"/>
+				</el-form-item>
+
+			</el-form>
+		</div>
+		<div class="edit-attr-item-wrap" v-show="diyStore.editComponent.showStyle == 'pageSlide' && diyStore.editComponent.layout == 'horizontal'">
+			<h3 class="mb-[10px]">{{ t('carouselSearchSwiperIndicatorSet') }}</h3>
+			<el-form label-width="100px" class="px-[10px]">
+				<el-form-item :label="t('carouselSearchSwiperIndicatorStyle')"> 
+					<el-radio-group v-model="diyStore.editComponent.swiper.indicatorStyle">
+						<el-radio label="style-1">{{ t('carouselSearchSwiperIndicatorStyle1') }}</el-radio>
+						<el-radio label="style-2">{{ t('carouselSearchSwiperIndicatorStyle2') }}</el-radio>
+						<el-radio label="style-3">{{ t('carouselSearchSwiperIndicatorStyle3') }}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+				<el-form-item :label="t('carouselSearchSwiperIndicatorAlign')">
+					<el-radio-group v-model="diyStore.editComponent.swiper.indicatorAlign">
+						<el-radio label="left">{{ t('alignLeft') }}</el-radio>
+						<el-radio label="center">{{ t('alignCenter') }}</el-radio>
+						<el-radio label="right">{{ t('alignRight') }}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+				<el-form-item :label="t('noColor')">
+					<el-color-picker v-model="diyStore.editComponent.swiper.indicatorColor" show-alpha :predefine="diyStore.predefineColors"/>
+				</el-form-item>
+				<el-form-item :label="t('selectColor')">
+					<el-color-picker v-model="diyStore.editComponent.swiper.indicatorActiveColor" show-alpha :predefine="diyStore.predefineColors"/>
+				</el-form-item>
+			</el-form>
+		</div>
+
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+
+	</div>
+
 </template>
 
 <script lang="ts" setup>
@@ -254,113 +156,107 @@ const diyStore = useDiyStore()
 diyStore.editComponent.ignore = [] // 忽略公共属性
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
-  const res = { code: true, message: '' }
-
-  diyStore.value[index].list.forEach((item: any) => {
-    if (
-      (diyStore.value[index].mode === 'graphic' ||
-        diyStore.value[index].mode === 'img') &&
-      item.imageUrl === ''
-    ) {
-      res.code = false
-      res.message = t('imageUrlTip')
-      return res
-    }
-    if (
-      (diyStore.value[index].mode === 'graphic' ||
-        diyStore.value[index].mode === 'text') &&
-      item.title === ''
-    ) {
-      res.code = false
-      res.message = t('graphicNavTitlePlaceholder')
-      return res
-    }
-  })
-  return res
+    const res = { code: true, message: '' }
+
+    diyStore.value[index].list.forEach((item: any) => {
+        if ((diyStore.value[index].mode === 'graphic' || diyStore.value[index].mode === 'img') && item.imageUrl === '') {
+            res.code = false
+            res.message = t('imageUrlTip')
+            return res
+        }
+        if ((diyStore.value[index].mode === 'graphic' || diyStore.value[index].mode === 'text') && item.title === '') {
+            res.code = false
+            res.message = t('graphicNavTitlePlaceholder')
+            return res
+        }
+    })
+    return res
 }
 
 diyStore.editComponent.list.forEach((item: any) => {
-  if (!item.id) item.id = diyStore.generateRandom()
+    if (!item.id) item.id = diyStore.generateRandom()
 })
 
 watch(
-  () => diyStore.editComponent.list,
-  (newValue, oldValue) => {
-    // 设置图片宽高
-    diyStore.editComponent.list.forEach((item: any) => {
-      const image = new Image()
-      image.src = img(item.imageUrl)
-      image.onload = async () => {
-        item.imgWidth = image.width
-        item.imgHeight = image.height
-      }
-    })
-  },
-  { deep: true }
+    () => diyStore.editComponent.list,
+    (newValue, oldValue) => {
+        // 设置图片宽高
+        diyStore.editComponent.list.forEach((item: any) => {
+            const image = new Image()
+            image.src = img(item.imageUrl)
+            image.onload = async () => {
+                item.imgWidth = image.width
+                item.imgHeight = image.height
+            }
+        })
+    },
+    { deep: true }
 )
 
 const addGraphicNav = () => {
-  diyStore.editComponent.list.push({
-    id: diyStore.generateRandom(),
-    title: '',
-    imageUrl: '',
-    imgWidth: 0,
-    imgHeight: 0,
-    link: { name: '' },
-    label: {
-      control: false,
-      text: '热门',
-      textColor: '#FFFFFF',
-      bgColorStart: '#F83287',
-      bgColorEnd: '#FE3423',
-    },
-  })
+    diyStore.editComponent.list.push({
+        id: diyStore.generateRandom(),
+        title: '',
+        imageUrl: '',
+        imgWidth: 0,
+        imgHeight: 0,
+        link: { name: '' },
+        label: {
+            control: false,
+            text: '热门',
+            textColor: '#FFFFFF',
+            bgColorStart: '#F83287',
+            bgColorEnd: '#FE3423'
+        }
+    })
 }
 
 const imageBoxRef = ref()
 
 onMounted(() => {
-  nextTick(() => {
-    const sortable = Sortable.create(imageBoxRef.value, {
-      group: 'item-wrap',
-      animation: 200,
-      onEnd: (event) => {
-        const temp = diyStore.editComponent.list[event.oldIndex!]
-        diyStore.editComponent.list.splice(event.oldIndex!, 1)
-        diyStore.editComponent.list.splice(event.newIndex!, 0, temp)
-        sortable.sort(
-          range(diyStore.editComponent.list.length).map((value) => {
-            return value.toString()
-          })
-        )
-      },
+    nextTick(() => {
+        const sortable = Sortable.create(imageBoxRef.value, {
+            group: 'item-wrap',
+            animation: 200,
+            onEnd: event => {
+                const temp = diyStore.editComponent.list[event.oldIndex!]
+                diyStore.editComponent.list.splice(event.oldIndex!, 1)
+                diyStore.editComponent.list.splice(event.newIndex!, 0, temp)
+                sortable.sort(
+                    range(diyStore.editComponent.list.length).map(value => {
+                        return value.toString()
+                    })
+                )
+            }
+        })
     })
-  })
 })
 
-const changePageCount = (value: any) => {
-  if (value == '1') {
-    diyStore.editComponent.showStyle = 'singleSlide'
-  } else if (value == '2') {
-    diyStore.editComponent.showStyle = 'fixed'
-  }
-}
+const changePageCount = (value:any)=>{
+    if(value == '1'){
+        diyStore.editComponent.showStyle = 'singleSlide';
+    }else if(value == '2'){
+        diyStore.editComponent.showStyle = 'fixed';
+    }
+}	
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped>
-.edit-graphic-nav {
-  .item-wrap {
-    .del {
-      display: none;
-    }
+	.edit-graphic-nav {
 
-    &:hover {
-      .del {
-        display: block;
-      }
-    }
-  }
-}
+		.item-wrap {
+			.del {
+				display: none;
+			}
+
+			&:hover {
+				.del {
+					display: block;
+				}
+			}
+		}
+	}
 </style>
diff --git a/admin/src/app/views/diy/components/edit-horz-blank.vue b/admin/src/app/views/diy/components/edit-horz-blank.vue
index a8a367c1..4175b448 100644
--- a/admin/src/app/views/diy/components/edit-horz-blank.vue
+++ b/admin/src/app/views/diy/components/edit-horz-blank.vue
@@ -1,27 +1,23 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('blankHeightSet') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('blankHeight')">
-          <el-slider
-            v-model="diyStore.editComponent.height"
-            show-input
-            size="small"
-            max="200"
-            class="ml-[10px] diy-nav-slider"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-  </div>
-
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('blankHeightSet') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('blankHeight')">
+					<el-slider v-model="diyStore.editComponent.height" show-input size="small" max="200" class="ml-[10px] diy-nav-slider"/>
+				</el-form-item>
+			</el-form>
+		</div>
+	</div>
+
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+	</div>
+
 </template>
 
 <script lang="ts" setup>
@@ -32,6 +28,7 @@ const diyStore = useDiyStore()
 diyStore.editComponent.ignore = ['pageBgColor', 'componentBgUrl'] // 忽略公共属性
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/diy/components/edit-horz-line.vue b/admin/src/app/views/diy/components/edit-horz-line.vue
index fbac4d73..232d4ee3 100644
--- a/admin/src/app/views/diy/components/edit-horz-line.vue
+++ b/admin/src/app/views/diy/components/edit-horz-line.vue
@@ -1,41 +1,32 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('horzLineStyle') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('styleLabel')">
-          <el-radio-group v-model="diyStore.editComponent.borderStyle">
-            <el-radio label="solid">{{ t('horzLineStyleSolid') }}</el-radio>
-            <el-radio label="dashed">{{ t('horzLineStyleDashed') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item :label="t('horzLineBorderColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.borderColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-        <el-form-item :label="t('horzLineBorderWidth')">
-          <el-slider
-            v-model="diyStore.editComponent.borderWidth"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-            :min="1"
-            :max="10"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-  </div>
-
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('horzLineStyle') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('styleLabel')">
+					<el-radio-group v-model="diyStore.editComponent.borderStyle">
+						<el-radio label="solid">{{ t('horzLineStyleSolid') }}</el-radio>
+						<el-radio label="dashed">{{ t('horzLineStyleDashed') }}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+				<el-form-item :label="t('horzLineBorderColor')">
+					<el-color-picker v-model="diyStore.editComponent.borderColor" show-alpha :predefine="diyStore.predefineColors"/>
+				</el-form-item>
+				<el-form-item :label="t('horzLineBorderWidth')">
+					<el-slider v-model="diyStore.editComponent.borderWidth" show-input size="small" class="ml-[10px] diy-nav-slider" :min="1" :max="10"/>
+				</el-form-item>
+			</el-form>
+		</div>
+	</div>
+
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+	</div>
+
 </template>
 
 <script lang="ts" setup>
@@ -43,15 +34,10 @@ import { t } from '@/lang'
 import useDiyStore from '@/stores/modules/diy'
 
 const diyStore = useDiyStore()
-diyStore.editComponent.ignore = [
-  'pageBgColor',
-  'componentBgColor',
-  'componentBgUrl',
-  'topRounded',
-  'bottomRounded',
-] // 忽略公共属性
+diyStore.editComponent.ignore = ['pageBgColor','componentBgColor', 'componentBgUrl', 'topRounded', 'bottomRounded'] // 忽略公共属性
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/diy/components/edit-hot-area.vue b/admin/src/app/views/diy/components/edit-hot-area.vue
index dd2344c9..dddb5638 100644
--- a/admin/src/app/views/diy/components/edit-hot-area.vue
+++ b/admin/src/app/views/diy/components/edit-hot-area.vue
@@ -1,35 +1,35 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('hotAreaSet') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <div ref="imageBoxRef">
-          <div
-            class="item-wrap p-[10px] pb-0 relative border border-dashed border-gray-300 mb-[16px]"
-          >
-            <el-form-item :label="t('hotAreaBackground')">
-              <upload-image
-                v-model="diyStore.editComponent.imageUrl"
-                :limit="1"
-                @change="selectImg"
-              />
-            </el-form-item>
-
-            <el-form-item :label="t('hotAreaSet')">
-              <heat-map v-model="diyStore.editComponent" />
-            </el-form-item>
-          </div>
-        </div>
-      </el-form>
-    </div>
-  </div>
-
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
+
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('hotAreaSet') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+
+				<div ref="imageBoxRef">
+					<div class="item-wrap p-[10px] pb-0 relative border border-dashed border-gray-300 mb-[16px]">
+						<el-form-item :label="t('hotAreaBackground')">
+							<upload-image v-model="diyStore.editComponent.imageUrl" :limit="1" @change="selectImg"/>
+						</el-form-item>
+
+						<el-form-item :label="t('hotAreaSet')">
+							<heat-map v-model="diyStore.editComponent"/>
+						</el-form-item>
+					</div>
+				</div>
+
+			</el-form>
+		</div>
+
+	</div>
+
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+	</div>
+
 </template>
 
 <script lang="ts" setup>
@@ -42,30 +42,32 @@ diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
-  const res = { code: true, message: '' }
-  if (diyStore.value[index].imageUrl === '') {
-    res.code = false
-    res.message = t('imageUrlTip')
+    const res = { code: true, message: '' }
+    if (diyStore.value[index].imageUrl === '') {
+        res.code = false
+        res.message = t('imageUrlTip')
+        return res
+    }
     return res
-  }
-  return res
 }
 
 const selectImg = (url: string) => {
-  handleHeight()
+    handleHeight()
 }
 
 // 处理高度
 const handleHeight = () => {
-  const image = new Image()
-  image.src = img(diyStore.editComponent.imageUrl)
-  image.onload = async () => {
-    diyStore.editComponent.imgWidth = image.width
-    diyStore.editComponent.imgHeight = image.height
-  }
+    const image = new Image()
+    image.src = img(diyStore.editComponent.imageUrl)
+    image.onload = async () => {
+        diyStore.editComponent.imgWidth = image.width
+        diyStore.editComponent.imgHeight = image.height
+    }
 }
 
 defineExpose({})
+
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
diff --git a/admin/src/app/views/diy/components/edit-image-ads.vue b/admin/src/app/views/diy/components/edit-image-ads.vue
index 1701f826..d7272e98 100644
--- a/admin/src/app/views/diy/components/edit-image-ads.vue
+++ b/admin/src/app/views/diy/components/edit-image-ads.vue
@@ -1,77 +1,51 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('imageSet') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item
-          :label="t('sameScreen')"
-          v-if="diyStore.currentIndex == 0"
-        >
-          <el-switch v-model="diyStore.editComponent.isSameScreen" />
-          <div class="text-sm text-gray-400 leading-[1.4]">
-            {{ t('imageAdsSameScreenTips') }}
-          </div>
-        </el-form-item>
-
-        <el-form-item :label="t('imageHeight')" class="display-block">
-          <el-input
-            v-model.trim="diyStore.editComponent.imageHeight"
-            :placeholder="t('imageHeightPlaceholder')"
-            clearable
-            maxlength="10"
-            @blur="blurImageHeight"
-          >
-            <template #append>px</template>
-          </el-input>
-          <div class="text-sm text-gray-400 mb-[10px]">
-            {{ t('imageAdsTips') }}
-          </div>
-        </el-form-item>
-
-        <div ref="imageBoxRef">
-          <div
-            v-for="(item, index) in diyStore.editComponent.list"
-            :key="item.id"
-            class="item-wrap p-[10px] pb-0 relative border border-dashed border-gray-300 mb-[16px]"
-          >
-            <el-form-item :label="t('image')">
-              <upload-image
-                v-model="item.imageUrl"
-                :limit="1"
-                @change="selectImg"
-              />
-            </el-form-item>
-
-            <div
-              class="del absolute cursor-pointer z-[2] top-[-8px] right-[-8px]"
-              v-show="diyStore.editComponent.list.length > 1"
-              @click="diyStore.editComponent.list.splice(index, 1)"
-            >
-              <icon name="element CircleCloseFilled" color="#bbb" size="20px" />
-            </div>
-
-            <el-form-item :label="t('link')">
-              <diy-link v-model="item.link" />
-            </el-form-item>
-          </div>
-        </div>
-
-        <el-button
-          v-show="diyStore.editComponent.list.length < 10"
-          class="w-full"
-          @click="addImageAd"
-          >{{ t('addImageAd') }}</el-button
-        >
-      </el-form>
-    </div>
-  </div>
-
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('imageSet') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+                
+				<el-form-item :label="t('sameScreen')" v-if="diyStore.currentIndex == 0">
+                    <el-switch v-model="diyStore.editComponent.isSameScreen" />
+                    <div class="text-sm text-gray-400 leading-[1.4]">{{ t('imageAdsSameScreenTips') }}</div>
+				</el-form-item>
+
+				<el-form-item :label="t('imageHeight')" class="display-block">
+					<el-input v-model.trim="diyStore.editComponent.imageHeight" :placeholder="t('imageHeightPlaceholder')" clearable maxlength="10" @blur="blurImageHeight">
+						<template #append>px</template>
+					</el-input>
+					<div class="text-sm text-gray-400 mb-[10px]">{{ t('imageAdsTips') }}</div>
+				</el-form-item>
+
+				<div ref="imageBoxRef">
+					<div v-for="(item,index) in diyStore.editComponent.list" :key="item.id" class="item-wrap p-[10px] pb-0 relative border border-dashed border-gray-300 mb-[16px]">
+						<el-form-item :label="t('image')">
+							<upload-image v-model="item.imageUrl" :limit="1" @change="selectImg" />
+						</el-form-item>
+
+						<div class="del absolute cursor-pointer z-[2] top-[-8px] right-[-8px]" v-show="diyStore.editComponent.list.length > 1" @click="diyStore.editComponent.list.splice(index,1)">
+							<icon name="element CircleCloseFilled" color="#bbb" size="20px"/>
+						</div>
+
+						<el-form-item :label="t('link')">
+							<diy-link v-model="item.link"/>
+						</el-form-item>
+					</div>
+				</div>
+
+				<el-button v-show="diyStore.editComponent.list.length < 10" class="w-full" @click="addImageAd">{{ t('addImageAd') }}</el-button>
+
+			</el-form>
+		</div>
+	</div>
+
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+	</div>
+
 </template>
 
 <script lang="ts" setup>
@@ -87,116 +61,115 @@ diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
-  const res = { code: true, message: '' }
-  if (diyStore.value[index].imageHeight == 0) {
-    res.code = false
-    res.message = t('imageHeightPlaceholder')
-    return res
-  }
-  if (!/^\d+.?\d{0,2}$/.test(diyStore.value[index].imageHeight)) {
-    res.code = false
-    res.message = t('imageHeightRegNum')
-    return res
-  }
-  diyStore.value[index].list.forEach((item: any) => {
-    if (item.imageUrl === '') {
-      res.code = false
-      res.message = t('imageUrlTip')
-      return res
+    const res = { code: true, message: '' }
+    if (diyStore.value[index].imageHeight == 0) {
+        res.code = false
+        res.message = t('imageHeightPlaceholder')
+        return res
+    }
+    if (!/^\d+.?\d{0,2}$/.test(diyStore.value[index].imageHeight)) {
+        res.code = false
+        res.message = t('imageHeightRegNum')
+        return res
     }
-  })
-  return res
+    diyStore.value[index].list.forEach((item: any) => {
+        if (item.imageUrl === '') {
+            res.code = false
+            res.message = t('imageUrlTip')
+            return res
+        }
+    })
+    return res
 }
 
 diyStore.editComponent.list.forEach((item: any) => {
-  if (!item.id) item.id = diyStore.generateRandom()
+    if (!item.id) item.id = diyStore.generateRandom()
 })
 
 watch(
-  () => diyStore.editComponent.list,
-  (newValue, oldValue) => {
-    // 设置图片宽高
-    handleHeight()
-  },
-  { deep: true }
+    () => diyStore.editComponent.list,
+    (newValue, oldValue) => {
+        // 设置图片宽高
+        handleHeight()
+    },
+    { deep: true }
 )
 
 const addImageAd = () => {
-  diyStore.editComponent.list.push({
-    id: diyStore.generateRandom(),
-    imageUrl: '',
-    imgWidth: 0,
-    imgHeight: 0,
-    link: { name: '' },
-  })
+    diyStore.editComponent.list.push({
+        id: diyStore.generateRandom(),
+        imageUrl: '',
+        imgWidth: 0,
+        imgHeight: 0,
+        link: { name: '' }
+    })
 }
 
-const selectImg = (url: string) => {
-  handleHeight(true)
+const selectImg = (url:string) => {
+    handleHeight(true)
 }
 
 // 处理高度
-const handleHeight = (isCalcHeight: boolean = false) => {
-  diyStore.editComponent.list.forEach((item: any, index: number) => {
-    const image = new Image()
-    image.src = img(item.imageUrl)
-    image.onload = async () => {
-      item.imgWidth = image.width
-      item.imgHeight = image.height
-      // 计算第一张图片高度
-      if (isCalcHeight && index == 0) {
-        const ratio = item.imgHeight / item.imgWidth
-        item.width = 375 - diyStore.editComponent.margin.both * 2
-        item.height = item.width * ratio
-        diyStore.editComponent.imageHeight = parseInt(item.height)
-      }
-    }
-  })
+const handleHeight = (isCalcHeight:boolean = false)=> {
+    diyStore.editComponent.list.forEach((item: any, index: number) => {
+        const image = new Image()
+        image.src = img(item.imageUrl)
+        image.onload = async () => {
+            item.imgWidth = image.width
+            item.imgHeight = image.height
+            // 计算第一张图片高度
+            if (isCalcHeight && index == 0) {
+                const ratio = item.imgHeight / item.imgWidth
+                item.width = 375 - (diyStore.editComponent.margin.both*2)
+                item.height = item.width * ratio
+                diyStore.editComponent.imageHeight = parseInt(item.height)
+            }
+        }
+    })
 }
 
 const blurImageHeight = () => {
-  diyStore.editComponent.imageHeight = diyStore.editComponent.imageHeight
-    ? parseInt(diyStore.editComponent.imageHeight)
-    : 0
+    diyStore.editComponent.imageHeight = diyStore.editComponent.imageHeight ? parseInt(diyStore.editComponent.imageHeight) : 0
 }
 
 const imageBoxRef = ref()
 
 onMounted(() => {
-  nextTick(() => {
-    const sortable = Sortable.create(imageBoxRef.value, {
-      group: 'item-wrap',
-      animation: 200,
-      onEnd: (event) => {
-        const temp = diyStore.editComponent.list[event.oldIndex!]
-        diyStore.editComponent.list.splice(event.oldIndex!, 1)
-        diyStore.editComponent.list.splice(event.newIndex!, 0, temp)
-        sortable.sort(
-          range(diyStore.editComponent.list.length).map((value) => {
-            return value.toString()
-          })
-        )
-        handleHeight(true)
-      },
+    nextTick(() => {
+        const sortable = Sortable.create(imageBoxRef.value, {
+            group: 'item-wrap',
+            animation: 200,
+            onEnd: event => {
+                const temp = diyStore.editComponent.list[event.oldIndex!]
+                diyStore.editComponent.list.splice(event.oldIndex!, 1)
+                diyStore.editComponent.list.splice(event.newIndex!, 0, temp)
+                sortable.sort(
+                    range(diyStore.editComponent.list.length).map(value => {
+                        return value.toString()
+                    })
+                )
+                handleHeight(true)
+            }
+        })
     })
-  })
 })
 
 defineExpose({})
 </script>
 
 <style lang="scss" scoped>
-.edit-image-ads {
-  .item-wrap {
-    .del {
-      display: none;
-    }
-
-    &:hover {
-      .del {
-        display: block;
-      }
-    }
-  }
-}
+	.edit-image-ads {
+
+		.item-wrap {
+			.del {
+				display: none;
+			}
+
+			&:hover {
+				.del {
+					display: block;
+				}
+			}
+		}
+	}
 </style>
diff --git a/admin/src/app/views/diy/components/edit-member-info.vue b/admin/src/app/views/diy/components/edit-member-info.vue
index 16ecb372..8bff4235 100644
--- a/admin/src/app/views/diy/components/edit-member-info.vue
+++ b/admin/src/app/views/diy/components/edit-member-info.vue
@@ -1,30 +1,30 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('memberStyle') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('bgUrl')">
-          <upload-image v-model="diyStore.editComponent.bgUrl" :limit="1" />
-        </el-form-item>
-      </el-form>
-    </div>
-  </div>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('memberStyle') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('bgUrl')">
+					<upload-image v-model="diyStore.editComponent.bgUrl" :limit="1"/>
+				</el-form-item>
+			</el-form>
+		</div>
+	</div>
 
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('memberStyle') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('textColor')">
-          <el-color-picker v-model="diyStore.editComponent.textColor" />
-        </el-form-item>
-      </el-form>
-    </div>
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('memberStyle') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('textColor')">
+					<el-color-picker v-model="diyStore.editComponent.textColor"/>
+				</el-form-item>
+			</el-form>
+		</div>
 
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -35,6 +35,7 @@ const diyStore = useDiyStore()
 diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/diy/components/edit-member-level.vue b/admin/src/app/views/diy/components/edit-member-level.vue
index f56c23d1..7346de75 100644
--- a/admin/src/app/views/diy/components/edit-member-level.vue
+++ b/admin/src/app/views/diy/components/edit-member-level.vue
@@ -1,52 +1,46 @@
+
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('selectStyle') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('selectStyle')" class="flex">
-          <span class="text-primary flex-1 cursor-pointer" @click="showStyle">{{
-            diyStore.editComponent.styleName
-          }}</span>
-          <el-icon>
-            <ArrowRight />
-          </el-icon>
-        </el-form-item>
-      </el-form>
-
-      <el-dialog v-model="showDialog" :title="t('selectStyle')" width="660px">
-        <div class="flex flex-wrap">
-          <template v-for="(item, index) in styleList" :key="index">
-            <div
-              :class="{
-                'border-primary': selectStyle.value == item.value,
-                '!mr-[0]': [(index + 1) % 3] == 0,
-              }"
-              @click="changeStyle(item)"
-              class="flex my-[5px] items-center justify-center overflow-hidden w-[200px] h-[100px] mr-[12px] cursor-pointer border bg-gray-50"
-            >
-              <img :src="img(item.url)" />
-            </div>
-          </template>
-        </div>
-
-        <template #footer>
-          <span class="dialog-footer">
-            <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-            <el-button type="primary" @click="confirmStyle">{{
-              t('confirm')
-            }}</el-button>
-          </span>
-        </template>
-      </el-dialog>
-    </div>
-  </div>
-
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('selectStyle') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('selectStyle')" class="flex">
+					<span class="text-primary flex-1 cursor-pointer" @click="showStyle">{{ diyStore.editComponent.styleName }}</span>
+					<el-icon>
+						<ArrowRight />
+					</el-icon>
+				</el-form-item>
+			</el-form>
+
+			<el-dialog v-model="showDialog" :title="t('selectStyle')" width="660px">
+
+				<div class="flex flex-wrap">
+					<template v-for="(item,index) in styleList" :key="index">
+						<div :class="{ 'border-primary': selectStyle.value == item.value, '!mr-[0]': [(index+1)%3] == 0 }" @click="changeStyle(item)" class="flex my-[5px] items-center justify-center overflow-hidden w-[200px] h-[100px] mr-[12px] cursor-pointer border bg-gray-50">
+							<img :src="img(item.url)" />
+						</div>
+					</template>
+				</div>
+
+				<template #footer>
+					<span class="dialog-footer">
+						<el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+						<el-button type="primary" @click="confirmStyle">{{ t('confirm') }}</el-button>
+					</span>
+				</template>
+
+			</el-dialog>
+		</div>
+	</div>
+
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -56,82 +50,85 @@ import { img } from '@/utils/common'
 import { ref, reactive } from 'vue'
 
 const diyStore = useDiyStore()
-diyStore.editComponent.ignore = ['componentBgColor', 'componentBgUrl'] // 忽略公共属性
+diyStore.editComponent.ignore = ['componentBgColor','componentBgUrl'] // 忽略公共属性
 
 const selectStyle = reactive({
-  title: diyStore.editComponent.styleName,
-  value: diyStore.editComponent.style,
+    title: diyStore.editComponent.styleName,
+    value: diyStore.editComponent.style
 })
 
 // 风格样式
 const showDialog = ref(false)
 
 const showStyle = () => {
-  showDialog.value = true
-  selectStyle.title = diyStore.editComponent.styleName
-  selectStyle.value = diyStore.editComponent.style
+    showDialog.value = true
+    selectStyle.title = diyStore.editComponent.styleName;
+    selectStyle.value = diyStore.editComponent.style;
 }
 
 const styleList = reactive([
-  {
-    url: 'static/resource/images/diy/member/member_level_style1.jpg',
-    title: '风格1',
-    value: 'style-1',
-  },
-  {
-    url: 'static/resource/images/diy/member/member_level_style2.png',
-    title: '风格2',
-    value: 'style-2',
-  },
-  {
-    url: 'static/resource/images/diy/member/member_level_style3.jpg',
-    title: '风格3',
-    value: 'style-3',
-  },
-  {
-    url: 'static/resource/images/diy/member/member_level_style4.png',
-    title: '风格4',
-    value: 'style-4',
-  },
-  {
-    url: 'static/resource/images/diy/member/member_level_style5.png',
-    title: '风格5',
-    value: 'style-5',
-  },
+    {
+        url: 'static/resource/images/diy/member/member_level_style1.jpg',
+        title: '风格1',
+        value: 'style-1'
+    },
+    {
+        url: 'static/resource/images/diy/member/member_level_style2.png',
+        title: '风格2',
+        value: 'style-2'
+    },
+    {
+        url: 'static/resource/images/diy/member/member_level_style3.jpg',
+        title: '风格3',
+        value: 'style-3'
+    },
+    {
+        url: 'static/resource/images/diy/member/member_level_style4.png',
+        title: '风格4',
+        value: 'style-4'
+    },
+    {
+        url: 'static/resource/images/diy/member/member_level_style5.png',
+        title: '风格5',
+        value: 'style-5'
+    }
 ])
 
-const changeStyle = (item: any) => {
-  selectStyle.title = item.title
-  selectStyle.value = item.value
+const changeStyle = (item:any) => {
+    selectStyle.title = item.title;
+    selectStyle.value = item.value;
 }
 
 const confirmStyle = () => {
-  diyStore.editComponent.styleName = selectStyle.title
-  diyStore.editComponent.style = selectStyle.value
-  initStyle(diyStore.editComponent.style)
-  showDialog.value = false
+    diyStore.editComponent.styleName = selectStyle.title;
+    diyStore.editComponent.style = selectStyle.value;
+    initStyle(diyStore.editComponent.style);
+    showDialog.value = false
 }
 
+
 const initStyle = (style: any) => {
-  if (style == 'style-1') {
-    diyStore.editComponent.bottomRounded = 0
-    diyStore.editComponent.topRounded = 12
-  } else if (style == 'style-2') {
-    diyStore.editComponent.bottomRounded = 0
-    diyStore.editComponent.topRounded = 12
-  } else if (style == 'style-3') {
-    diyStore.editComponent.bottomRounded = 12
-    diyStore.editComponent.topRounded = 12
-  } else if (style == 'style-4') {
-    diyStore.editComponent.bottomRounded = 12
-    diyStore.editComponent.topRounded = 12
-  } else if (style == 'style-5') {
-    diyStore.editComponent.bottomRounded = 12
-    diyStore.editComponent.topRounded = 12
-  }
+	if (style == 'style-1') {
+		diyStore.editComponent.bottomRounded = 0;
+		diyStore.editComponent.topRounded = 12;
+	} else if (style == 'style-2') {
+		diyStore.editComponent.bottomRounded = 0;
+		diyStore.editComponent.topRounded = 12;
+	} else if (style == 'style-3') {
+		diyStore.editComponent.bottomRounded = 12;
+		diyStore.editComponent.topRounded = 12;
+	} else if (style == 'style-4') {
+		diyStore.editComponent.bottomRounded = 12;
+		diyStore.editComponent.topRounded = 12;
+	} else if (style == 'style-5') {
+		diyStore.editComponent.bottomRounded = 12;
+		diyStore.editComponent.topRounded = 12;
+	}
+
 }
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/diy/components/edit-notice.vue b/admin/src/app/views/diy/components/edit-notice.vue
index 64466682..b6fe0b5b 100644
--- a/admin/src/app/views/diy/components/edit-notice.vue
+++ b/admin/src/app/views/diy/components/edit-notice.vue
@@ -1,177 +1,102 @@
 <template>
-  <!-- 内容 -->
-  <div
-    class="content-wrap notice-content-wrap"
-    v-show="diyStore.editTab == 'content'"
-  >
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('noticeStyle') }}</h3>
-      <el-form label-width="90px" class="px-[10px]">
-        <el-form-item :label="t('noticeType')">
-          <el-radio-group v-model="diyStore.editComponent.noticeType">
-            <el-radio label="img">{{ t('noticeTypeImg') }}</el-radio>
-            <el-radio label="text">{{ t('noticeTypeText') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <div
-          class="flex items-center flex-wrap py-[8px] px-[10px] bg-[#f4f3f7] rounded mb-[18px] mx-[18px]"
-          v-show="diyStore.editComponent.noticeType == 'img'"
-        >
-          <div
-            :class="[
-              'mr-[10px] rounded cursor-pointer border-[1px] border-solid',
-              {
-                'border-[var(--el-color-primary)]':
-                  diyStore.editComponent.systemUrl == 'style_1' &&
-                  diyStore.editComponent.imgType == 'system',
-              },
-            ]"
-          >
-            <img
-              src="@/app/assets/images/diy/notice/style_1.png"
-              :class="['h-[28px] px-[10px] py-[5px]']"
-              @click="changeStyle('style_1')"
-            />
-          </div>
+	<!-- 内容 -->
+	<div class="content-wrap notice-content-wrap" v-show="diyStore.editTab == 'content'">
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('noticeStyle') }}</h3>
+			<el-form label-width="90px" class="px-[10px]">
+				<el-form-item :label="t('noticeType')">
+					<el-radio-group v-model="diyStore.editComponent.noticeType">
+						<el-radio label="img">{{ t('noticeTypeImg') }}</el-radio>
+						<el-radio label="text">{{ t('noticeTypeText') }}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+				<div class="flex items-center flex-wrap py-[8px] px-[10px] bg-[#f4f3f7] rounded mb-[18px] mx-[18px]" v-show="diyStore.editComponent.noticeType == 'img'">
+					<div :class="['mr-[10px] rounded cursor-pointer border-[1px] border-solid', {'border-[var(--el-color-primary)]': diyStore.editComponent.systemUrl == 'style_1' && diyStore.editComponent.imgType == 'system'}]">
+						<img src="@/app/assets/images/diy/notice/style_1.png" :class="['h-[28px] px-[10px] py-[5px]']" @click="changeStyle('style_1')"/>
+					</div>
+
+					<div :class="['mr-[10px] rounded cursor-pointer w-[100px] border-[1px] border-solid', {'border-[var(--el-color-primary)]': diyStore.editComponent.systemUrl == 'style_2' && diyStore.editComponent.imgType == 'system'}]">
+						<img src="@/app/assets/images/diy/notice/style_2.png" class="px-[10px] py-[5px]" @click="changeStyle('style_2')"/>
+					</div>
+					<div @click.stop="diyStore.editComponent.imgType = 'diy'" :class="['mr-[10px] rounded cursor-pointer diy-upload-img border-[1px] border-solid', {'border-[var(--el-color-primary)]': (diyStore.editComponent.imageUrl && diyStore.editComponent.imgType == 'diy') }]">
+						<upload-image v-model="diyStore.editComponent.imageUrl" :limit="1"/>
+					</div>
+				</div>
+
+				<el-form-item :label="t('noticeTitle')" v-show="diyStore.editComponent.noticeType == 'text'">
+					<el-input v-model.trim="diyStore.editComponent.noticeTitle" :placeholder="t('titlePlaceholder')" clearable maxlength="20" show-word-limit/>
+				</el-form-item>
+
+			</el-form>
+
+		</div>
+
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('noticeText') }}</h3>
+			<el-form label-width="90px" class="px-[10px]">
+
+				<el-form-item :label="t('noticeScrollWay')">
+					<el-radio-group v-model="diyStore.editComponent.scrollWay">
+						<el-radio label="upDown">{{ t('noticeUpDown') }}</el-radio>
+						<el-radio label="horizontal">{{ t('noticeHorizontal') }}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+				<el-form-item :label="t('noticeShowType')">
+					<el-radio-group v-model="diyStore.editComponent.showType">
+						<el-radio label="popup">{{ t('noticeShowPopUp') }}</el-radio>
+						<el-radio label="link">{{ t('noticeShowLink') }}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+
+				<p class="text-sm text-gray-400 mb-[10px]">{{ t('dragMouseAdjustOrder') }}</p>
+
+				<div ref="noticeBoxRef">
+					<div v-for="(item,index) in diyStore.editComponent.list" :key="item.id" class="item-wrap p-[10px] pb-0 relative border border-dashed border-gray-300 mb-[16px]">
+
+						<el-form-item :label="t('noticeText')">
+							<el-input v-model.trim="item.text" :placeholder="t('noticePlaceholderText')" clearable maxlength="40" show-word-limit/>
+						</el-form-item>
+
+						<div class="del absolute cursor-pointer z-[2] top-[-8px] right-[-8px]" v-show="diyStore.editComponent.list.length > 1" @click="diyStore.editComponent.list.splice(index,1)">
+							<icon name="element CircleCloseFilled" color="#bbb" size="20px"/>
+						</div>
+
+						<el-form-item :label="t('link')" v-if="diyStore.editComponent.showType == 'link'">
+							<diy-link v-model="item.link"/>
+						</el-form-item>
+					</div>
+				</div>
+
+				<el-button class="w-full" @click="addNotice">{{ t('addNotice') }}</el-button>
+
+			</el-form>
+		</div>
+
+	</div>
+
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('textSet') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('textFontSize')">
+					<el-slider v-model="diyStore.editComponent.fontSize" show-input size="small" class="ml-[10px] diy-nav-slider" :min="12" :max="20"/>
+				</el-form-item>
+				<el-form-item :label="t('textFontWeight')">
+					<el-radio-group v-model="diyStore.editComponent.fontWeight">
+						<el-radio :label="'normal'">{{t('fontWeightNormal')}}</el-radio>
+						<el-radio :label="'bold'">{{t('fontWeightBold')}}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+				<el-form-item :label="t('textColor')">
+					<el-color-picker v-model="diyStore.editComponent.textColor"/>
+				</el-form-item>
+			</el-form>
+		</div>
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+	</div>
 
-          <div
-            :class="[
-              'mr-[10px] rounded cursor-pointer w-[100px] border-[1px] border-solid',
-              {
-                'border-[var(--el-color-primary)]':
-                  diyStore.editComponent.systemUrl == 'style_2' &&
-                  diyStore.editComponent.imgType == 'system',
-              },
-            ]"
-          >
-            <img
-              src="@/app/assets/images/diy/notice/style_2.png"
-              class="px-[10px] py-[5px]"
-              @click="changeStyle('style_2')"
-            />
-          </div>
-          <div
-            @click.stop="diyStore.editComponent.imgType = 'diy'"
-            :class="[
-              'mr-[10px] rounded cursor-pointer diy-upload-img border-[1px] border-solid',
-              {
-                'border-[var(--el-color-primary)]':
-                  diyStore.editComponent.imageUrl &&
-                  diyStore.editComponent.imgType == 'diy',
-              },
-            ]"
-          >
-            <upload-image
-              v-model="diyStore.editComponent.imageUrl"
-              :limit="1"
-            />
-          </div>
-        </div>
-
-        <el-form-item
-          :label="t('noticeTitle')"
-          v-show="diyStore.editComponent.noticeType == 'text'"
-        >
-          <el-input
-            v-model.trim="diyStore.editComponent.noticeTitle"
-            :placeholder="t('titlePlaceholder')"
-            clearable
-            maxlength="20"
-            show-word-limit
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('noticeText') }}</h3>
-      <el-form label-width="90px" class="px-[10px]">
-        <el-form-item :label="t('noticeScrollWay')">
-          <el-radio-group v-model="diyStore.editComponent.scrollWay">
-            <el-radio label="upDown">{{ t('noticeUpDown') }}</el-radio>
-            <el-radio label="horizontal">{{ t('noticeHorizontal') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item :label="t('noticeShowType')">
-          <el-radio-group v-model="diyStore.editComponent.showType">
-            <el-radio label="popup">{{ t('noticeShowPopUp') }}</el-radio>
-            <el-radio label="link">{{ t('noticeShowLink') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-
-        <p class="text-sm text-gray-400 mb-[10px]">
-          {{ t('dragMouseAdjustOrder') }}
-        </p>
-
-        <div ref="noticeBoxRef">
-          <div
-            v-for="(item, index) in diyStore.editComponent.list"
-            :key="item.id"
-            class="item-wrap p-[10px] pb-0 relative border border-dashed border-gray-300 mb-[16px]"
-          >
-            <el-form-item :label="t('noticeText')">
-              <el-input
-                v-model.trim="item.text"
-                :placeholder="t('noticePlaceholderText')"
-                clearable
-                maxlength="40"
-                show-word-limit
-              />
-            </el-form-item>
-
-            <div
-              class="del absolute cursor-pointer z-[2] top-[-8px] right-[-8px]"
-              v-show="diyStore.editComponent.list.length > 1"
-              @click="diyStore.editComponent.list.splice(index, 1)"
-            >
-              <icon name="element CircleCloseFilled" color="#bbb" size="20px" />
-            </div>
-
-            <el-form-item
-              :label="t('link')"
-              v-if="diyStore.editComponent.showType == 'link'"
-            >
-              <diy-link v-model="item.link" />
-            </el-form-item>
-          </div>
-        </div>
-
-        <el-button class="w-full" @click="addNotice">{{
-          t('addNotice')
-        }}</el-button>
-      </el-form>
-    </div>
-  </div>
-
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('textSet') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('textFontSize')">
-          <el-slider
-            v-model="diyStore.editComponent.fontSize"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-            :min="12"
-            :max="20"
-          />
-        </el-form-item>
-        <el-form-item :label="t('textFontWeight')">
-          <el-radio-group v-model="diyStore.editComponent.fontWeight">
-            <el-radio :label="'normal'">{{ t('fontWeightNormal') }}</el-radio>
-            <el-radio :label="'bold'">{{ t('fontWeightBold') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item :label="t('textColor')">
-          <el-color-picker v-model="diyStore.editComponent.textColor" />
-        </el-form-item>
-      </el-form>
-    </div>
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
 </template>
 
 <script lang="ts" setup>
@@ -185,100 +110,101 @@ diyStore.editComponent.ignore = [] // 忽略公共属性
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
-  const res = { code: true, message: '' }
-
-  if (diyStore.value[index].noticeType == 'text') {
-    if (diyStore.value[index].noticeTitle == '') {
-      res.code = false
-      res.message = t('noticeTypeTextPlaceholder')
-      return res
+    const res = { code: true, message: '' }
+
+    if(diyStore.value[index].noticeType == 'text'){
+        if(diyStore.value[index].noticeTitle == ''){
+            res.code = false
+            res.message = t('noticeTypeTextPlaceholder')
+            return res
+        }
     }
-  }
 
-  diyStore.value[index].list.forEach((item: any) => {
-    if (item.text == '') {
-      res.code = false
-      res.message = t('noticePlaceholderText')
-      return res
-    }
-  })
-  return res
+    diyStore.value[index].list.forEach((item: any) => {
+        if (item.text == '') {
+            res.code = false
+            res.message = t('noticePlaceholderText')
+            return res
+        }
+    })
+    return res
 }
 
 diyStore.editComponent.list.forEach((item: any) => {
-  if (!item.id) item.id = diyStore.generateRandom()
+    if (!item.id) item.id = diyStore.generateRandom()
 })
 
 const selectStyle = ref(diyStore.editComponent.style)
 
-const changeStyle = (value: any) => {
-  diyStore.editComponent.systemUrl = value
-  diyStore.editComponent.imgType = 'system'
+const changeStyle = (value :any) => {
+    diyStore.editComponent.systemUrl = value;
+    diyStore.editComponent.imgType = 'system';
 }
 
 watch(
-  () => diyStore.editComponent.imageUrl,
-  (newValue, oldValue) => {
-    if (newValue) {
-      diyStore.editComponent.imgType = 'diy'
-    } else {
-      changeStyle('style_1')
+    () => diyStore.editComponent.imageUrl,
+    (newValue, oldValue) => {
+	    if(newValue){
+            diyStore.editComponent.imgType = 'diy';
+	    }else{
+			changeStyle('style_1');
+	    }
     }
-  }
 )
 
 const addNotice = () => {
-  diyStore.editComponent.list.push({
-    id: diyStore.generateRandom(),
-    text: '公告',
-    link: { name: '' },
-  })
+    diyStore.editComponent.list.push({
+        id: diyStore.generateRandom(),
+        text: '公告',
+        link: { name: '' },
+    })
 }
 
 const noticeBoxRef = ref()
 
 onMounted(() => {
-  nextTick(() => {
-    const sortable = Sortable.create(noticeBoxRef.value, {
-      group: 'item-wrap',
-      animation: 200,
-      onEnd: (event) => {
-        const temp = diyStore.editComponent.list[event.oldIndex!]
-        diyStore.editComponent.list.splice(event.oldIndex!, 1)
-        diyStore.editComponent.list.splice(event.newIndex!, 0, temp)
-        sortable.sort(
-          range(diyStore.editComponent.list.length).map((value) => {
-            return value.toString()
-          })
-        )
-      },
+    nextTick(() => {
+        const sortable = Sortable.create(noticeBoxRef.value, {
+            group: 'item-wrap',
+            animation: 200,
+            onEnd: event => {
+                const temp = diyStore.editComponent.list[event.oldIndex!]
+                diyStore.editComponent.list.splice(event.oldIndex!, 1)
+                diyStore.editComponent.list.splice(event.newIndex!, 0, temp)
+                sortable.sort(
+                    range(diyStore.editComponent.list.length).map(value => {
+                        return value.toString()
+                    })
+                )
+            }
+        })
     })
-  })
 })
 
 defineExpose({})
 </script>
 
 <style lang="scss">
-.notice-content-wrap {
-  .add-notice-width {
-    width: calc(100% - 20px);
-  }
-
-  .diy-upload-img {
-    .image-wrap {
-      width: 50px !important;
-      height: 50px !important;
-      margin-right: 0 !important;
-      background: #fff;
-    }
-
-    .content-wrap {
-      div {
-        display: none;
-      }
-    }
-  }
-}
+	.notice-content-wrap {
+		.add-notice-width {
+			width: calc(100% - 20px);
+		}
+
+		.diy-upload-img {
+			.image-wrap {
+				width: 50px !important;
+				height: 50px !important;
+				margin-right: 0 !important;
+				background: #fff;
+			}
+
+			.content-wrap {
+				div {
+					display: none;
+				}
+			}
+			
+		}
+	}
 </style>
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/diy/components/edit-page.vue b/admin/src/app/views/diy/components/edit-page.vue
index 51baf7dc..205cdf83 100644
--- a/admin/src/app/views/diy/components/edit-page.vue
+++ b/admin/src/app/views/diy/components/edit-page.vue
@@ -1,269 +1,148 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('pageContent') }}</h3>
-      <el-form label-width="80px" class="px-[10px]" @submit.prevent>
-        <el-form-item :label="t('diyPageTitle')">
-          <el-input
-            v-model.trim="diyStore.pageTitle"
-            :placeholder="t('diyPageTitlePlaceholder')"
-            clearable
-            maxlength="16"
-            show-word-limit
-          />
-          <div class="text-sm text-gray-400">{{ t('pageTitleTips') }}</div>
-        </el-form-item>
-      </el-form>
-    </div>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
 
-    <!-- 表单布局 页面设置 -->
-    <slot name="content"></slot>
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('pageContent') }}</h3>
+			<el-form label-width="80px" class="px-[10px]" @submit.prevent>
+				<el-form-item :label="t('diyPageTitle')">
+					<el-input v-model.trim="diyStore.pageTitle" :placeholder="t('diyPageTitlePlaceholder')" clearable maxlength="16" show-word-limit/>
+					<div class="text-sm text-gray-400">{{ t('pageTitleTips') }}</div>
+				</el-form-item>
+			</el-form>
+		</div>
 
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('statusBarContent') }}</h3>
-      <el-form label-width="80px" class="px-[10px]" @submit.prevent>
-        <el-form-item :label="t('topStatusBarNav')" class="display-block">
-          <el-switch v-model="diyStore.global.topStatusBar.isShow" />
-          <div class="text-sm text-gray-400">
-            {{ t('statusBarSwitchTips') }}
-          </div>
-        </el-form-item>
-        <template v-if="diyStore.global.topStatusBar.isShow">
-          <el-form-item :label="t('diyTitle')">
-            <el-input
-              v-model.trim="diyStore.global.title"
-              :placeholder="t('diyTitlePlaceholder')"
-              clearable
-              maxlength="12"
-              show-word-limit
-            />
-            <div class="text-sm text-gray-400">{{ t('titleTips') }}</div>
-          </el-form-item>
-          <el-form-item :label="t('selectStyle')" class="display-block">
-            <div class="flex">
-              <span
-                class="text-primary flex-1 cursor-pointer"
-                @click="showStyle"
-                >{{ diyStore.global.topStatusBar.styleName }}</span
-              >
-              <el-icon>
-                <ArrowRight />
-              </el-icon>
-            </div>
-            <div class="text-sm text-gray-400 leading-[1.5]">
-              {{ t('styleShowTips') }}
-            </div>
-          </el-form-item>
-          <el-form-item
-            :label="t('topStatusBarImg')"
-            v-if="
-              ['style-2', 'style-3'].indexOf(
-                diyStore.global.topStatusBar.style
-              ) > -1
-            "
-          >
-            <upload-image
-              v-model="diyStore.global.topStatusBar.imgUrl"
-              :limit="1"
-            />
-            <div class="text-sm text-gray-400 mt-[10px]">
-              {{ t('topStatusBarImgTips') }}
+		<!-- 表单布局 页面设置 -->
+		<slot name="content"></slot>
+
+        <div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('statusBarContent') }}</h3>
+            <el-form label-width="80px" class="px-[10px]" @submit.prevent>
+                <el-form-item :label="t('topStatusBarNav')" class="display-block">
+					<el-switch v-model="diyStore.global.topStatusBar.isShow"/>
+					<div class="text-sm text-gray-400">{{ t('statusBarSwitchTips') }}</div>
+				</el-form-item>
+                <template v-if="diyStore.global.topStatusBar.isShow">
+                    <el-form-item :label="t('diyTitle')">
+                        <el-input v-model.trim="diyStore.global.title" :placeholder="t('diyTitlePlaceholder')" clearable maxlength="12" show-word-limit/>
+                        <div class="text-sm text-gray-400">{{ t('titleTips') }}</div>
+                    </el-form-item>
+                    <el-form-item :label="t('selectStyle')" class="display-block">
+                        <div class="flex">
+                            <span class="text-primary flex-1 cursor-pointer" @click="showStyle">{{diyStore.global.topStatusBar.styleName}}</span>
+                            <el-icon>
+                                <ArrowRight />
+                            </el-icon>
+                        </div>
+                        <div class="text-sm text-gray-400 leading-[1.5]">{{ t('styleShowTips') }}</div>
+                    </el-form-item>
+                    <el-form-item :label="t('topStatusBarImg')" v-if="['style-2','style-3'].indexOf(diyStore.global.topStatusBar.style) > -1">
+                        <upload-image v-model="diyStore.global.topStatusBar.imgUrl" :limit="1" />
+                        <div class="text-sm text-gray-400 mt-[10px]">{{ t('topStatusBarImgTips') }}</div>
+                    </el-form-item>
+                    <el-form-item :label="t('topStatusBarSearchName')" v-if="'style-3' == diyStore.global.topStatusBar.style">
+                        <el-input v-model.trim="diyStore.global.topStatusBar.inputPlaceholder" :placeholder="t('topStatusBarSearchNamePlaceholder')" clearable maxlength="12" show-word-limit/>
+                    </el-form-item>
+                    <el-form-item :label="t('textAlign')" v-show="diyStore.global.topStatusBar.style == 'style-1'">
+                        <el-radio-group v-model="diyStore.global.topStatusBar.textAlign">
+                            <el-radio :label="'left'">{{ t('textAlignLeft') }}</el-radio>
+                            <el-radio :label="'center'">{{ t('textAlignCenter') }}</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+                    <el-form-item :label="t('link')" v-if="['style-2','style-3'].indexOf(diyStore.global.topStatusBar.style) > -1">
+                        <diy-link v-model="diyStore.global.topStatusBar.link" />
+                    </el-form-item>
+                </template>
+			</el-form>
+		</div>
+        <div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('bottomNavContent') }}</h3>
+            <el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('tabbar')" class="display-block">
+					<el-switch v-model="diyStore.global.bottomTabBarSwitch"/>
+					<div class="text-sm text-gray-400">{{ t('tabbarSwitchTips') }}</div>
+				</el-form-item>
+			</el-form>
+		</div>
+
+         <el-dialog v-model="showDialog" :title="t('selectStyle')" width="800px">
+
+            <div class="flex flex-wrap">
+                <div class="flex items-center justify-center overflow-hidden w-[32%] h-[100px] mr-[2%] mb-[15px] cursor-pointer border bg-gray-50" :class="{ 'border-primary': selectStyle == 'style-1' }" @click="selectStyle = 'style-1'">
+                    <img class="max-w-[100%] max-h-[100%]" src="@/app/assets/images/diy/head/nav_style1.jpg" />
+                </div>
+                <div class="flex items-center justify-center overflow-hidden w-[32%] h-[100px] mr-[2%] mb-[15px] cursor-pointer border bg-gray-50" :class="{ 'border-primary': selectStyle == 'style-2' }" @click="selectStyle = 'style-2'">
+                    <img class="max-w-[100%] max-h-[100%]" src="@/app/assets/images/diy/head/nav_style2.jpg" />
+                </div>
+                <div class="flex items-center justify-center overflow-hidden w-[32%] h-[100px] mb-[15px] cursor-pointer border bg-gray-50" :class="{ 'border-primary': selectStyle == 'style-3' }" @click="selectStyle = 'style-3'">
+                    <img class="max-w-[100%] max-h-[100%]" src="@/app/assets/images/diy/head/nav_style3.jpg" />
+                </div>
+                <div class="flex items-center justify-center overflow-hidden w-[32%] h-[100px]  mr-[2%] cursor-pointer border bg-gray-50" :class="{ 'border-primary': selectStyle == 'style-4' }" @click="selectStyle = 'style-4'">
+                    <img class="max-w-[100%] max-h-[100%]" src="@/app/assets/images/diy/head/nav_style4.jpg" />
+                </div>
             </div>
-          </el-form-item>
-          <el-form-item
-            :label="t('topStatusBarSearchName')"
-            v-if="'style-3' == diyStore.global.topStatusBar.style"
-          >
-            <el-input
-              v-model.trim="diyStore.global.topStatusBar.inputPlaceholder"
-              :placeholder="t('topStatusBarSearchNamePlaceholder')"
-              clearable
-              maxlength="12"
-              show-word-limit
-            />
-          </el-form-item>
-          <el-form-item
-            :label="t('textAlign')"
-            v-show="diyStore.global.topStatusBar.style == 'style-1'"
-          >
-            <el-radio-group v-model="diyStore.global.topStatusBar.textAlign">
-              <el-radio :label="'left'">{{ t('textAlignLeft') }}</el-radio>
-              <el-radio :label="'center'">{{ t('textAlignCenter') }}</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item
-            :label="t('link')"
-            v-if="
-              ['style-2', 'style-3'].indexOf(
-                diyStore.global.topStatusBar.style
-              ) > -1
-            "
-          >
-            <diy-link v-model="diyStore.global.topStatusBar.link" />
-          </el-form-item>
-        </template>
-      </el-form>
-    </div>
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('bottomNavContent') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('tabbar')" class="display-block">
-          <el-switch v-model="diyStore.global.bottomTabBarSwitch" />
-          <div class="text-sm text-gray-400">{{ t('tabbarSwitchTips') }}</div>
-        </el-form-item>
-      </el-form>
-    </div>
 
-    <el-dialog v-model="showDialog" :title="t('selectStyle')" width="800px">
-      <div class="flex flex-wrap">
-        <div
-          class="flex items-center justify-center overflow-hidden w-[32%] h-[100px] mr-[2%] mb-[15px] cursor-pointer border bg-gray-50"
-          :class="{ 'border-primary': selectStyle == 'style-1' }"
-          @click="selectStyle = 'style-1'"
-        >
-          <img
-            class="max-w-[100%] max-h-[100%]"
-            src="@/app/assets/images/diy/head/nav_style1.jpg"
-          />
-        </div>
-        <div
-          class="flex items-center justify-center overflow-hidden w-[32%] h-[100px] mr-[2%] mb-[15px] cursor-pointer border bg-gray-50"
-          :class="{ 'border-primary': selectStyle == 'style-2' }"
-          @click="selectStyle = 'style-2'"
-        >
-          <img
-            class="max-w-[100%] max-h-[100%]"
-            src="@/app/assets/images/diy/head/nav_style2.jpg"
-          />
-        </div>
-        <div
-          class="flex items-center justify-center overflow-hidden w-[32%] h-[100px] mb-[15px] cursor-pointer border bg-gray-50"
-          :class="{ 'border-primary': selectStyle == 'style-3' }"
-          @click="selectStyle = 'style-3'"
-        >
-          <img
-            class="max-w-[100%] max-h-[100%]"
-            src="@/app/assets/images/diy/head/nav_style3.jpg"
-          />
-        </div>
-        <div
-          class="flex items-center justify-center overflow-hidden w-[32%] h-[100px] mr-[2%] cursor-pointer border bg-gray-50"
-          :class="{ 'border-primary': selectStyle == 'style-4' }"
-          @click="selectStyle = 'style-4'"
-        >
-          <img
-            class="max-w-[100%] max-h-[100%]"
-            src="@/app/assets/images/diy/head/nav_style4.jpg"
-          />
-        </div>
-      </div>
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                    <el-button type="primary" @click="changeStyle">{{ t('confirm') }}</el-button>
+                </span>
+            </template>
 
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-          <el-button type="primary" @click="changeStyle">{{
-            t('confirm')
-          }}</el-button>
-        </span>
-      </template>
-    </el-dialog>
-  </div>
+        </el-dialog>
+	</div>
 
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('pageStyle') }}</h3>
-      <el-form label-width="115px" class="px-[10px]">
-        <el-form-item :label="t('pageBgColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.pageStartBgColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-          <icon
-            name="iconfont iconmap-connect"
-            size="20px"
-            class="block !text-gray-400 mx-[5px]"
-          />
-          <el-color-picker
-            v-model="diyStore.editComponent.pageEndBgColor"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-        </el-form-item>
-        <el-form-item :label="t('bgGradientAngle')">
-          <el-radio-group v-model="diyStore.editComponent.pageGradientAngle">
-            <el-radio label="to bottom">{{ t('topToBottom') }}</el-radio>
-            <el-radio label="to right">{{ t('leftToRight') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item :label="t('bgHeightScale')">
-          <el-slider
-            v-model="diyStore.global.bgHeightScale"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-          />
-        </el-form-item>
-        <div class="text-sm text-gray-400 ml-[80px] mb-[10px]">
-          {{ t('bgHeightScaleTip') }}
-        </div>
-        <el-form-item :label="t('bgUrl')">
-          <upload-image v-model="diyStore.global.bgUrl" :limit="1" />
-        </el-form-item>
-      </el-form>
-    </div>
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('statusBarStyle') }}</h3>
-      <el-form label-width="115px" class="px-[10px]">
-        <el-form-item :label="t('topStatusBarBgColor')" class="display-block">
-          <el-color-picker
-            v-model="diyStore.global.topStatusBar.bgColor"
-            show-alpha
-          />
-        </el-form-item>
-        <el-form-item
-          :label="t('rollTopStatusBarBgColor')"
-          class="display-block"
-        >
-          <el-color-picker
-            v-model="diyStore.global.topStatusBar.rollBgColor"
-            show-alpha
-          />
-        </el-form-item>
-        <el-form-item :label="t('topStatusBarTextColor')" class="display-block">
-          <el-color-picker
-            v-model="diyStore.global.topStatusBar.textColor"
-            show-alpha
-          />
-        </el-form-item>
-        <el-form-item
-          :label="t('rollTopStatusBarTextColor')"
-          class="display-block"
-        >
-          <el-color-picker
-            v-model="diyStore.global.topStatusBar.rollTextColor"
-            show-alpha
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('marginSet') }}</h3>
-      <el-form label-width="115px" class="px-[10px]">
-        <el-form-item :label="t('marginBoth')">
-          <el-slider
-            v-model="diyStore.global.template.margin.both"
-            show-input
-            size="small"
-            @input="inputBoth"
-            class="ml-[10px] diy-nav-slider"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-  </div>
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('pageStyle') }}</h3>
+			<el-form label-width="115px" class="px-[10px]">
+				<el-form-item :label="t('pageBgColor')">
+					<el-color-picker v-model="diyStore.editComponent.pageStartBgColor" show-alpha :predefine="diyStore.predefineColors" />
+					<icon name="iconfont iconmap-connect" size="20px" class="block !text-gray-400 mx-[5px]"/>
+					<el-color-picker v-model="diyStore.editComponent.pageEndBgColor" show-alpha :predefine="diyStore.predefineColors" />
+				</el-form-item>
+				<el-form-item :label="t('bgGradientAngle')">
+					<el-radio-group v-model="diyStore.editComponent.pageGradientAngle">
+						<el-radio label="to bottom">{{ t('topToBottom') }}</el-radio>
+						<el-radio label="to right">{{ t('leftToRight') }}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+				<el-form-item :label="t('bgHeightScale')">
+					<el-slider v-model="diyStore.global.bgHeightScale" show-input size="small" class="ml-[10px] diy-nav-slider"/>
+				</el-form-item>
+				<div class="text-sm text-gray-400 ml-[80px] mb-[10px]">{{ t('bgHeightScaleTip') }}</div>
+				<el-form-item :label="t('bgUrl')">
+					<upload-image v-model="diyStore.global.bgUrl" :limit="1"/>
+				</el-form-item>
+			</el-form>
+		</div>
+        <div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('statusBarStyle') }}</h3>
+			<el-form label-width="115px" class="px-[10px]">
+                <el-form-item :label="t('topStatusBarBgColor')" class="display-block">
+					<el-color-picker v-model="diyStore.global.topStatusBar.bgColor" show-alpha />
+				</el-form-item>
+				<el-form-item :label="t('rollTopStatusBarBgColor')" class="display-block">
+					<el-color-picker v-model="diyStore.global.topStatusBar.rollBgColor" show-alpha />
+				</el-form-item>
+				<el-form-item :label="t('topStatusBarTextColor')" class="display-block">
+					<el-color-picker v-model="diyStore.global.topStatusBar.textColor" show-alpha />
+				</el-form-item>
+				<el-form-item :label="t('rollTopStatusBarTextColor')" class="display-block">
+					<el-color-picker v-model="diyStore.global.topStatusBar.rollTextColor" show-alpha />
+				</el-form-item>
+			</el-form>
+		</div>
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('marginSet') }}</h3>
+			<el-form label-width="115px" class="px-[10px]">
+				<el-form-item :label="t('marginBoth')">
+					<el-slider v-model="diyStore.global.template.margin.both" show-input size="small" @input="inputBoth" class="ml-[10px] diy-nav-slider"/>
+				</el-form-item>
+			</el-form>
+		</div>
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -275,60 +154,60 @@ import { img } from '@/utils/common'
 const diyStore = useDiyStore()
 
 watch(
-  () => diyStore.global.bgUrl,
-  (newValue, oldValue) => {
-    // 设置图片宽高
-    const image = new Image()
-    image.src = img(diyStore.global.bgUrl)
-    image.onload = async () => {
-      diyStore.global.imgWidth = image.width
-      diyStore.global.imgHeight = image.height
-    }
-    if (!diyStore.global.bgUrl) {
-      diyStore.global.imgWidth = ''
-      diyStore.global.imgHeight = ''
+    () => diyStore.global.bgUrl,
+    (newValue, oldValue) => {
+        // 设置图片宽高
+        const image = new Image()
+        image.src = img(diyStore.global.bgUrl)
+        image.onload = async () => {
+            diyStore.global.imgWidth = image.width
+            diyStore.global.imgHeight = image.height
+        }
+        if(!diyStore.global.bgUrl){
+            diyStore.global.imgWidth = ''
+            diyStore.global.imgHeight = ''
+        }
     }
-  }
 )
 
 // 改变页面的左右边距时，更新所有组件的数值
-const inputBoth = (value: any) => {
-  diyStore.value.forEach((item, index) => {
-    item.margin.both = value
-  })
+const inputBoth = (value:any)=>{
+    diyStore.value.forEach((item,index)=>{
+        item.margin.both = value;
+    })
+
 }
 
 watch(
-  () => diyStore.global,
-  (newValue, oldValue) => {
-    selectStyle.value = newValue.topStatusBar.style
-  },
-  { deep: true }
+    () => diyStore.global,
+    (newValue, oldValue) => {
+        selectStyle.value = newValue.topStatusBar.style
+    }, { deep: true }
 )
 
 const showDialog = ref(false)
 const showStyle = () => {
-  showDialog.value = true
+    showDialog.value = true
 }
 
-const selectStyle = ref('style-1')
+const selectStyle = ref("style-1")
 const changeStyle = () => {
-  switch (selectStyle.value) {
-    case 'style-1':
-      diyStore.global.topStatusBar.styleName = '风格1'
-      break
-    case 'style-2':
-      diyStore.global.topStatusBar.styleName = '风格2'
-      break
-    case 'style-3':
-      diyStore.global.topStatusBar.styleName = '风格3'
-      break
-    case 'style-4':
-      diyStore.global.topStatusBar.styleName = '风格4'
-      break
-  }
-  diyStore.global.topStatusBar.style = selectStyle.value
-  showDialog.value = false
+     switch (selectStyle.value) {
+        case 'style-1':
+            diyStore.global.topStatusBar.styleName = '风格1'
+            break
+        case 'style-2':
+            diyStore.global.topStatusBar.styleName = '风格2'
+            break
+        case 'style-3':
+            diyStore.global.topStatusBar.styleName = '风格3'
+            break
+        case 'style-4':
+            diyStore.global.topStatusBar.styleName = '风格4'
+            break
+    }
+    diyStore.global.topStatusBar.style = selectStyle.value
+    showDialog.value = false
 }
 
 defineExpose({})
diff --git a/admin/src/app/views/diy/components/edit-picture-show.vue b/admin/src/app/views/diy/components/edit-picture-show.vue
index 49c53c8b..ed158942 100644
--- a/admin/src/app/views/diy/components/edit-picture-show.vue
+++ b/admin/src/app/views/diy/components/edit-picture-show.vue
@@ -1,201 +1,121 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('pictureShowBlockOne') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('image')">
-          <upload-image
-            v-model="diyStore.editComponent.moduleOne.head.textImg"
-            :limit="1"
-          />
-        </el-form-item>
-
-        <el-form-item :label="t('subTitle')">
-          <el-input
-            v-model.trim="diyStore.editComponent.moduleOne.head.subText"
-            :placeholder="t('subTitlePlaceholder')"
-            clearable
-            maxlength="8"
-            show-word-limit
-          />
-        </el-form-item>
-
-        <el-form-item :label="t('subTitleTextColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.moduleOne.head.subTextColor"
-            show-alpha
-          />
-        </el-form-item>
-
-        <el-form-item :label="t('pictureShowBgColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.moduleOne.listFrame.startColor"
-            show-alpha
-          />
-          <icon
-            name="iconfont iconmap-connect"
-            size="20px"
-            class="block !text-gray-400 mx-[5px]"
-          />
-          <el-color-picker
-            v-model="diyStore.editComponent.moduleOne.listFrame.endColor"
-            show-alpha
-          />
-        </el-form-item>
-
-        <div
-          v-for="(item, index) in diyStore.editComponent.moduleOne.list"
-          :key="item.id"
-          class="item-wrap p-[10px] pb-0 relative border border-dashed border-gray-300 mb-[16px]"
-        >
-          <el-form-item :label="t('image')">
-            <upload-image v-model="item.imageUrl" :limit="1" />
-          </el-form-item>
-
-          <el-form-item :label="t('pictureShowBtnText')">
-            <el-input
-              v-model.trim="item.btnTitle.text"
-              :placeholder="t('activeCubeTitlePlaceholder')"
-              clearable
-              maxlength="4"
-              show-word-limit
-            />
-          </el-form-item>
-
-          <el-form-item :label="t('pictureShowBtnColor')">
-            <el-color-picker v-model="item.btnTitle.color" show-alpha />
-          </el-form-item>
-
-          <el-form-item :label="t('pictureShowBtnBgColor')">
-            <el-color-picker v-model="item.btnTitle.startColor" show-alpha />
-            <icon
-              name="iconfont iconmap-connect"
-              size="20px"
-              class="block !text-gray-400 mx-[5px]"
-            />
-            <el-color-picker v-model="item.btnTitle.endColor" show-alpha />
-          </el-form-item>
-
-          <el-form-item :label="t('link')">
-            <diy-link v-model="item.link" />
-          </el-form-item>
-        </div>
-      </el-form>
-    </div>
-
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('pictureShowBlockTwo') }}</h3>
-      <el-form label-width="90px" class="px-[10px]">
-        <el-form-item :label="t('image')">
-          <upload-image
-            v-model="diyStore.editComponent.moduleTwo.head.textImg"
-            :limit="1"
-          />
-        </el-form-item>
-        <el-form-item :label="t('subTitle')">
-          <el-input
-            v-model.trim="diyStore.editComponent.moduleTwo.head.subText"
-            :placeholder="t('subTitlePlaceholder')"
-            clearable
-            maxlength="8"
-            show-word-limit
-          />
-        </el-form-item>
-
-        <el-form-item :label="t('subTitleTextColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.moduleTwo.head.subTextColor"
-            show-alpha
-          />
-        </el-form-item>
-
-        <el-form-item :label="t('pictureShowBgColor')">
-          <el-color-picker
-            v-model="diyStore.editComponent.moduleTwo.listFrame.startColor"
-            show-alpha
-          />
-          <icon
-            name="iconfont iconmap-connect"
-            size="20px"
-            class="block !text-gray-400 mx-[5px]"
-          />
-          <el-color-picker
-            v-model="diyStore.editComponent.moduleTwo.listFrame.endColor"
-            show-alpha
-          />
-        </el-form-item>
-
-        <div
-          v-for="(item, index) in diyStore.editComponent.moduleTwo.list"
-          :key="item.id"
-          class="item-wrap p-[10px] pb-0 relative border border-dashed border-gray-300 mb-[16px]"
-        >
-          <el-form-item :label="t('image')">
-            <upload-image v-model="item.imageUrl" :limit="1" />
-          </el-form-item>
-
-          <el-form-item :label="t('pictureShowBtnText')">
-            <el-input
-              v-model.trim="item.btnTitle.text"
-              :placeholder="t('activeCubeTitlePlaceholder')"
-              clearable
-              maxlength="4"
-              show-word-limit
-            />
-          </el-form-item>
-
-          <el-form-item :label="t('pictureShowBtnColor')">
-            <el-color-picker v-model="item.btnTitle.color" show-alpha />
-          </el-form-item>
-
-          <el-form-item :label="t('pictureShowBtnBgColor')">
-            <el-color-picker v-model="item.btnTitle.startColor" show-alpha />
-            <icon
-              name="iconfont iconmap-connect"
-              size="20px"
-              class="block !text-gray-400 mx-[5px]"
-            />
-            <el-color-picker v-model="item.btnTitle.endColor" show-alpha />
-          </el-form-item>
-
-          <el-form-item :label="t('link')">
-            <diy-link v-model="item.link" />
-          </el-form-item>
-        </div>
-      </el-form>
-    </div>
-  </div>
-
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('pictureShowBlockStyle') }}</h3>
-      <el-form label-width="90px" class="px-[10px]">
-        <el-form-item :label="t('topRounded')">
-          <el-slider
-            v-model="diyStore.editComponent.moduleRounded.topRounded"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-            :max="100"
-          />
-        </el-form-item>
-        <el-form-item :label="t('bottomRounded')">
-          <el-slider
-            v-model="diyStore.editComponent.moduleRounded.bottomRounded"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-            :max="100"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
+
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('pictureShowBlockOne') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				 <el-form-item :label="t('image')">
+                    <upload-image v-model="diyStore.editComponent.moduleOne.head.textImg" :limit="1"/>
+                </el-form-item>
+
+                <el-form-item :label="t('subTitle')">
+                    <el-input v-model.trim="diyStore.editComponent.moduleOne.head.subText" :placeholder="t('subTitlePlaceholder')" clearable maxlength="8" show-word-limit />
+                </el-form-item>
+
+                <el-form-item :label="t('subTitleTextColor')">
+                    <el-color-picker v-model="diyStore.editComponent.moduleOne.head.subTextColor" show-alpha  />
+                </el-form-item>
+
+                <el-form-item :label="t('pictureShowBgColor')">
+                    <el-color-picker v-model="diyStore.editComponent.moduleOne.listFrame.startColor" show-alpha  />
+                    <icon name="iconfont iconmap-connect" size="20px" class="block !text-gray-400 mx-[5px]"/>
+                    <el-color-picker v-model="diyStore.editComponent.moduleOne.listFrame.endColor" show-alpha />
+                </el-form-item>
+
+                <div  v-for="(item,index) in diyStore.editComponent.moduleOne.list" :key="item.id" class="item-wrap p-[10px] pb-0 relative border border-dashed border-gray-300 mb-[16px]">
+                    <el-form-item :label="t('image')">
+                        <upload-image v-model="item.imageUrl" :limit="1"/>
+                    </el-form-item>
+
+                    <el-form-item :label="t('pictureShowBtnText')">
+                        <el-input v-model.trim="item.btnTitle.text" :placeholder="t('activeCubeTitlePlaceholder')" clearable maxlength="4" show-word-limit/>
+                    </el-form-item>
+
+                    <el-form-item :label="t('pictureShowBtnColor')">
+                        <el-color-picker v-model="item.btnTitle.color" show-alpha  />
+                    </el-form-item>
+
+                    <el-form-item :label="t('pictureShowBtnBgColor')">
+                        <el-color-picker v-model="item.btnTitle.startColor" show-alpha  />
+                        <icon name="iconfont iconmap-connect" size="20px" class="block !text-gray-400 mx-[5px]"/>
+                        <el-color-picker v-model="item.btnTitle.endColor" show-alpha />
+                    </el-form-item>
+
+                    <el-form-item :label="t('link')">
+                        <diy-link v-model="item.link"/>
+                    </el-form-item>
+                </div>
+			</el-form>
+		</div>
+
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('pictureShowBlockTwo') }}</h3>
+			<el-form label-width="90px" class="px-[10px]">
+                <el-form-item :label="t('image')">
+                    <upload-image v-model="diyStore.editComponent.moduleTwo.head.textImg" :limit="1"/>
+                </el-form-item>
+                <el-form-item :label="t('subTitle')">
+                    <el-input v-model.trim="diyStore.editComponent.moduleTwo.head.subText" :placeholder="t('subTitlePlaceholder')" clearable maxlength="8" show-word-limit />
+                </el-form-item>
+
+                <el-form-item :label="t('subTitleTextColor')">
+                    <el-color-picker v-model="diyStore.editComponent.moduleTwo.head.subTextColor" show-alpha  />
+                </el-form-item>
+
+                <el-form-item :label="t('pictureShowBgColor')">
+                    <el-color-picker v-model="diyStore.editComponent.moduleTwo.listFrame.startColor" show-alpha  />
+                    <icon name="iconfont iconmap-connect" size="20px" class="block !text-gray-400 mx-[5px]"/>
+                    <el-color-picker v-model="diyStore.editComponent.moduleTwo.listFrame.endColor" show-alpha />
+                </el-form-item>
+
+                <div  v-for="(item,index) in diyStore.editComponent.moduleTwo.list" :key="item.id" class="item-wrap p-[10px] pb-0 relative border border-dashed border-gray-300 mb-[16px]">
+                    <el-form-item :label="t('image')">
+                        <upload-image v-model="item.imageUrl" :limit="1"/>
+                    </el-form-item>
+
+                    <el-form-item :label="t('pictureShowBtnText')">
+                        <el-input v-model.trim="item.btnTitle.text" :placeholder="t('activeCubeTitlePlaceholder')" clearable maxlength="4" show-word-limit/>
+                    </el-form-item>
+
+                    <el-form-item :label="t('pictureShowBtnColor')">
+                        <el-color-picker v-model="item.btnTitle.color" show-alpha  />
+                    </el-form-item>
+
+                    <el-form-item :label="t('pictureShowBtnBgColor')">
+                        <el-color-picker v-model="item.btnTitle.startColor" show-alpha  />
+                        <icon name="iconfont iconmap-connect" size="20px" class="block !text-gray-400 mx-[5px]"/>
+                        <el-color-picker v-model="item.btnTitle.endColor" show-alpha />
+                    </el-form-item>
+
+                    <el-form-item :label="t('link')">
+                        <diy-link v-model="item.link"/>
+                    </el-form-item>
+                </div>
+
+			</el-form>
+		</div>
+
+	</div>
+
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+        <div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('pictureShowBlockStyle') }}</h3>
+			<el-form label-width="90px" class="px-[10px]">
+				<el-form-item :label="t('topRounded')">
+                    <el-slider v-model="diyStore.editComponent.moduleRounded.topRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="100"/>
+                </el-form-item>
+                <el-form-item :label="t('bottomRounded')">
+                    <el-slider v-model="diyStore.editComponent.moduleRounded.bottomRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="100"/>
+                </el-form-item>
+			</el-form>
+		</div>
+
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+	</div>
+
 </template>
 
 <script lang="ts" setup>
@@ -209,26 +129,28 @@ diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
-  const res = { code: true, message: '' }
-  diyStore.value[index].moduleOne.list.forEach((item: any) => {
-    if (item.imageUrl === '') {
-      res.code = false
-      res.message = t('imageUrlTip')
-      return res
-    }
-  })
-
-  diyStore.value[index].moduleTwo.list.forEach((item: any) => {
-    if (item.imageUrl === '') {
-      res.code = false
-      res.message = t('imageUrlTip')
-      return res
-    }
-  })
-  return res
+    const res = { code: true, message: '' }
+    diyStore.value[index].moduleOne.list.forEach((item: any) => {
+        if (item.imageUrl === '') {
+            res.code = false
+            res.message = t('imageUrlTip')
+            return res
+        }
+    })
+
+    diyStore.value[index].moduleTwo.list.forEach((item: any) => {
+        if (item.imageUrl === '') {
+            res.code = false
+            res.message = t('imageUrlTip')
+            return res
+        }
+    })
+    return res
 }
 
 defineExpose({})
+
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
diff --git a/admin/src/app/views/diy/components/edit-rich-text.vue b/admin/src/app/views/diy/components/edit-rich-text.vue
index 99f49590..4bb86bef 100644
--- a/admin/src/app/views/diy/components/edit-rich-text.vue
+++ b/admin/src/app/views/diy/components/edit-rich-text.vue
@@ -1,21 +1,19 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('richTextContentSet') }}</h3>
-      <editor
-        v-model="diyStore.editComponent.html"
-        :height="600"
-        class="editor-width"
-      />
-    </div>
-  </div>
-
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('richTextContentSet') }}</h3>
+			<editor v-model="diyStore.editComponent.html" :height="600" class="editor-width" />
+		</div>
+	</div>
+
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+	</div>
+
 </template>
 
 <script lang="ts" setup>
@@ -27,17 +25,18 @@ diyStore.editComponent.ignore = [] // 忽略公共属性
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
-  const res = { code: true, message: '' }
+    const res = { code: true, message: '' }
 
-  if (diyStore.value[index].html == '<p><br></p>') {
-    res.code = false
-    res.message = t('richTextPlaceholder')
+    if(diyStore.value[index].html == '<p><br></p>'){
+        res.code = false
+        res.message = t('richTextPlaceholder')
+        return res
+    }
     return res
-  }
-  return res
 }
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/diy/components/edit-rubik-cube.vue b/admin/src/app/views/diy/components/edit-rubik-cube.vue
index 299d55fa..b59a86fe 100644
--- a/admin/src/app/views/diy/components/edit-rubik-cube.vue
+++ b/admin/src/app/views/diy/components/edit-rubik-cube.vue
@@ -1,119 +1,74 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap rubik-cube" v-show="diyStore.editTab == 'content'">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('selectStyle') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('template')">
-          <span>{{ selectTemplate.name }}</span>
-        </el-form-item>
-        <ul class="selected-template-list">
-          <li
-            v-for="(item, i) in templateList"
-            :key="i"
-            :class="[
-              item.className == diyStore.editComponent.mode ? 'selected' : '',
-            ]"
-            @click="changeTemplateList(i)"
-          >
-            <icon :name="'iconfont ' + item.src" size="16px" />
-          </li>
-        </ul>
-      </el-form>
-    </div>
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('rubikCubeLayout') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <ul class="layout">
-          <li
-            v-for="(li, i) in selectTemplate.dimensionScale"
-            :key="i"
-            :class="[selectTemplate.className]"
-          >
-            <div
-              class="have-preview-image"
-              v-show="
-                diyStore.editComponent.list[i].imageUrl &&
-                diyStore.editComponent.list[i].imageUrl !=
-                  'static/resource/images/diy/figure.png'
-              "
-            >
-              <img :src="img(diyStore.editComponent.list[i].imageUrl)" />
-            </div>
-            <div
-              class="empty"
-              :class="[selectTemplate.className]"
-              v-show="
-                !diyStore.editComponent.list[i].imageUrl ||
-                diyStore.editComponent.list[i].imageUrl ==
-                  'static/resource/images/diy/figure.png'
-              "
-            >
-              <p>{{ li.name }}</p>
-              <p>{{ li.desc }}</p>
-            </div>
-          </li>
-        </ul>
-
-        <div
-          v-for="item in diyStore.editComponent.list"
-          :key="item.id"
-          class="item-wrap p-[10px] pb-0 relative border border-dashed border-gray-300 mb-[16px]"
-        >
-          <el-form-item :label="t('image')">
-            <upload-image
-              v-model="item.imageUrl"
-              :limit="1"
-              @change="selectImg"
-            />
-          </el-form-item>
-
-          <el-form-item :label="t('link')">
-            <diy-link v-model="item.link" />
-          </el-form-item>
-        </div>
-      </el-form>
-    </div>
-  </div>
-
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('rubikCubeStyle') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('imageGap')">
-          <el-slider
-            v-model="diyStore.editComponent.imageGap"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-            :max="30"
-          />
-        </el-form-item>
-        <el-form-item :label="t('topRounded')">
-          <el-slider
-            v-model="diyStore.editComponent.topElementRounded"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-            :max="50"
-          />
-        </el-form-item>
-        <el-form-item :label="t('bottomRounded')">
-          <el-slider
-            v-model="diyStore.editComponent.bottomElementRounded"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-            :max="50"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
+	<!-- 内容 -->
+	<div class="content-wrap rubik-cube" v-show="diyStore.editTab == 'content'">
+
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('selectStyle') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('template')">
+					<span>{{ selectTemplate.name }}</span>
+				</el-form-item>
+				<ul class="selected-template-list">
+					<li v-for="(item,i) in templateList" :key="i" :class="[(item.className == diyStore.editComponent.mode) ?  'selected' : '' ]" @click="changeTemplateList(i)">
+						<icon :name="'iconfont ' + item.src" size="16px"/>
+					</li>
+				</ul>
+			</el-form>
+		</div>
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('rubikCubeLayout') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+
+				<ul class="layout">
+					<li v-for="(li,i) in selectTemplate.dimensionScale" :key="i" :class="[selectTemplate.className]">
+						<div class="have-preview-image" v-show="diyStore.editComponent.list[i].imageUrl && diyStore.editComponent.list[i].imageUrl != 'static/resource/images/diy/figure.png'">
+							<img :src="img(diyStore.editComponent.list[i].imageUrl)"/>
+						</div>
+						<div class="empty" :class="[selectTemplate.className]" v-show="!diyStore.editComponent.list[i].imageUrl || diyStore.editComponent.list[i].imageUrl == 'static/resource/images/diy/figure.png'">
+							<p>{{li.name}}</p>
+							<p>{{li.desc}}</p>
+						</div>
+					</li>
+				</ul>
+
+				<div v-for="(item) in diyStore.editComponent.list" :key="item.id" class="item-wrap p-[10px] pb-0 relative border border-dashed border-gray-300 mb-[16px]">
+					<el-form-item :label="t('image')">
+						<upload-image v-model="item.imageUrl" :limit="1" @change="selectImg"/>
+					</el-form-item>
+
+					<el-form-item :label="t('link')">
+						<diy-link v-model="item.link"/>
+					</el-form-item>
+				</div>
+
+			</el-form>
+
+		</div>
+
+	</div>
+
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('rubikCubeStyle') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('imageGap')">
+					<el-slider v-model="diyStore.editComponent.imageGap" show-input size="small" class="ml-[10px] diy-nav-slider" :max="30"/>
+				</el-form-item>
+				<el-form-item :label="t('topRounded')">
+					<el-slider v-model="diyStore.editComponent.topElementRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50"/>
+				</el-form-item>
+				<el-form-item :label="t('bottomRounded')">
+					<el-slider v-model="diyStore.editComponent.bottomElementRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50"/>
+				</el-form-item>
+			</el-form>
+		</div>
+
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+	</div>
+
 </template>
 
 <script lang="ts" setup>
@@ -127,562 +82,557 @@ diyStore.editComponent.ignore = [] // 忽略公共属性
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
-  const res = { code: true, message: '' }
-  diyStore.value[index].list.forEach((item: any) => {
-    if (item.imageUrl === '') {
-      res.code = false
-      res.message = t('imageUrlTip')
-      return res
-    }
-  })
-  return res
+    const res = { code: true, message: '' }
+    diyStore.value[index].list.forEach((item: any) => {
+        if (item.imageUrl === '') {
+            res.code = false
+            res.message = t('imageUrlTip')
+            return res
+        }
+    })
+    return res
 }
 
 const templateList = ref([
-  {
-    name: '1行2个',
-    src: 'iconyihang2gepc1',
-    className: 'row1-of2',
-    dimensionScale: [
-      {
-        desc: '宽度50%',
-        size: '200px * 200px',
-        name: '图一',
-      },
-      {
-        desc: '宽度50%',
-        size: '200px * 200px',
-        name: '图二',
-      },
-    ],
-    descAux:
-      '选定布局区域，在下方添加图片，建议添加尺寸一致的图片，宽度最小建议为：200px',
-  },
-  {
-    name: '1行3个',
-    src: 'iconyihang3gepc',
-    className: 'row1-of3',
-    dimensionScale: [
-      {
-        desc: '宽度33.33%',
-        size: '200px * 200px',
-        name: '图一',
-      },
-      {
-        desc: '宽度33.33%',
-        size: '200px * 200px',
-        name: '图二',
-      },
-      {
-        desc: '宽度33.33%',
-        size: '200px * 200px',
-        name: '图三',
-      },
-    ],
-    descAux:
-      '选定布局区域，在下方添加图片，建议添加尺寸一致的图片，宽度最小建议为：130px',
-  },
-  {
-    name: '1行4个',
-    src: 'iconyihang4gepc',
-    className: 'row1-of4',
-    dimensionScale: [
-      {
-        desc: '宽度25%',
-        size: '200px * 200px',
-        name: '图一',
-      },
-      {
-        desc: '宽度25%',
-        size: '200px * 200px',
-        name: '图二',
-      },
-      {
-        desc: '宽度25%',
-        size: '200px * 200px',
-        name: '图三',
-      },
-      {
-        desc: '宽度25%',
-        size: '200px * 200px',
-        name: '图四',
-      },
-    ],
-    descAux:
-      '选定布局区域，在下方添加图片，建议添加尺寸一致的图片，宽度最小建议为：100px',
-  },
-  {
-    name: '2左2右',
-    src: 'iconliangzuoliangyoupc',
-    className: 'row2-lt-of2-rt',
-    dimensionScale: [
-      {
-        desc: '宽度50%',
-        size: '200px * 200px',
-        name: '图一',
-      },
-      {
-        desc: '宽度50%',
-        size: '200px * 200px',
-        name: '图二',
-      },
-      {
-        desc: '宽度50%',
-        size: '200px * 200px',
-        name: '图三',
-      },
-      {
-        desc: '宽度50%',
-        size: '200px * 200px',
-        name: '图四',
-      },
-    ],
-    descAux:
-      '选定布局区域，在下方添加图片，建议添加尺寸一致的图片，宽度最小建议为：200px',
-  },
-  {
-    name: '1左2右',
-    src: 'iconyizuoliangyoupc',
-    className: 'row1-lt-of2-rt',
-    dimensionScale: [
-      {
-        desc: '宽度50% * 高度100%',
-        size: '200px * 400px',
-        name: '图一',
-      },
-      {
-        desc: '宽度50% * 高度50%',
-        size: '200px * 200px',
-        name: '图二',
-      },
-      {
-        desc: '宽度50% * 高度50%',
-        size: '200px * 200px',
-        name: '图三',
-      },
-    ],
-    descAux:
-      '选定布局区域，在下方添加图片，宽度最小建议为：200px，右侧两张图片高度一致，左侧图片高度为右侧两张图片高度之和（例：左侧图片尺寸：200px * 300px，右侧两张图片尺寸：200px * 150px）',
-  },
-  {
-    name: '1上2下',
-    src: 'iconyishangliangxiapc',
-    className: 'row1-tp-of2-bm',
-    dimensionScale: [
-      {
-        desc: '宽度100% * 高度50%',
-        size: '400px * 200px',
-        name: '图一',
-      },
-      {
-        desc: '宽度50% * 高度50%',
-        size: '200px * 200px',
-        name: '图二',
-      },
-      {
-        desc: '宽度50% * 高度50%',
-        size: '200px * 200px',
-        name: '图三',
-      },
-    ],
-    descAux:
-      '选定布局区域，在下方添加图片，上方一张图片的宽度为下方两张图片宽度之和，下放两张图片尺寸一致，高度可根据实际需求自行确定（例：上方图片尺寸：400px * 150px，下方两张图片尺寸：200px * 150px）',
-  },
-  {
-    name: '1左3右',
-    src: 'iconyizuosanyoupc',
-    className: 'row1-lt-of1-tp-of2-bm',
-    dimensionScale: [
-      {
-        desc: '宽度50% * 高度100%',
-        size: '200px * 400px',
-        name: '图一',
-      },
-      {
-        desc: '宽度50% * 高度50%',
-        size: '200px * 200px',
-        name: '图二',
-      },
-      {
-        desc: '宽度25% * 高度50%',
-        size: '100px * 200px',
-        name: '图三',
-      },
-      {
-        desc: '宽度25% * 高度50%',
-        size: '100px * 200px',
-        name: '图四',
-      },
-    ],
-    descAux:
-      '选定布局区域，在下方添加图片，左右两侧内容宽高相同，右侧上下区域高度各占50%，右侧内容下半部分两张图片的宽度相同，各占右侧内容宽度的50%（例：左侧图片尺寸：200px * 400px，右侧上半部分图片尺寸：200px * 200px，右侧下半部分两张图片尺寸：100px * 200px）',
-  },
+    {
+        name: '1行2个',
+        src: 'iconyihang2gepc1',
+        className: 'row1-of2',
+        dimensionScale: [
+            {
+                desc: '宽度50%',
+                size: '200px * 200px',
+                name: '图一'
+            },
+            {
+                desc: '宽度50%',
+                size: '200px * 200px',
+                name: '图二'
+            }
+        ],
+        descAux: '选定布局区域，在下方添加图片，建议添加尺寸一致的图片，宽度最小建议为：200px'
+    },
+    {
+        name: '1行3个',
+        src: 'iconyihang3gepc',
+        className: 'row1-of3',
+        dimensionScale: [
+            {
+                desc: '宽度33.33%',
+                size: '200px * 200px',
+                name: '图一'
+            },
+            {
+                desc: '宽度33.33%',
+                size: '200px * 200px',
+                name: '图二'
+            },
+            {
+                desc: '宽度33.33%',
+                size: '200px * 200px',
+                name: '图三'
+            }
+        ],
+        descAux: '选定布局区域，在下方添加图片，建议添加尺寸一致的图片，宽度最小建议为：130px'
+    },
+    {
+        name: '1行4个',
+        src: 'iconyihang4gepc',
+        className: 'row1-of4',
+        dimensionScale: [
+            {
+                desc: '宽度25%',
+                size: '200px * 200px',
+                name: '图一'
+            },
+            {
+                desc: '宽度25%',
+                size: '200px * 200px',
+                name: '图二'
+            },
+            {
+                desc: '宽度25%',
+                size: '200px * 200px',
+                name: '图三'
+            },
+            {
+                desc: '宽度25%',
+                size: '200px * 200px',
+                name: '图四'
+            }
+        ],
+        descAux: '选定布局区域，在下方添加图片，建议添加尺寸一致的图片，宽度最小建议为：100px'
+    },
+    {
+        name: '2左2右',
+        src: 'iconliangzuoliangyoupc',
+        className: 'row2-lt-of2-rt',
+        dimensionScale: [
+            {
+                desc: '宽度50%',
+                size: '200px * 200px',
+                name: '图一'
+            },
+            {
+                desc: '宽度50%',
+                size: '200px * 200px',
+                name: '图二'
+            },
+            {
+                desc: '宽度50%',
+                size: '200px * 200px',
+                name: '图三'
+            },
+            {
+                desc: '宽度50%',
+                size: '200px * 200px',
+                name: '图四'
+            }
+        ],
+        descAux: '选定布局区域，在下方添加图片，建议添加尺寸一致的图片，宽度最小建议为：200px'
+    },
+    {
+        name: '1左2右',
+        src: 'iconyizuoliangyoupc',
+        className: 'row1-lt-of2-rt',
+        dimensionScale: [
+            {
+                desc: '宽度50% * 高度100%',
+                size: '200px * 400px',
+                name: '图一'
+            },
+            {
+                desc: '宽度50% * 高度50%',
+                size: '200px * 200px',
+                name: '图二'
+            },
+            {
+                desc: '宽度50% * 高度50%',
+                size: '200px * 200px',
+                name: '图三'
+            }
+        ],
+        descAux: '选定布局区域，在下方添加图片，宽度最小建议为：200px，右侧两张图片高度一致，左侧图片高度为右侧两张图片高度之和（例：左侧图片尺寸：200px * 300px，右侧两张图片尺寸：200px * 150px）'
+    },
+    {
+        name: '1上2下',
+        src: 'iconyishangliangxiapc',
+        className: 'row1-tp-of2-bm',
+        dimensionScale: [
+            {
+                desc: '宽度100% * 高度50%',
+                size: '400px * 200px',
+                name: '图一'
+            },
+            {
+                desc: '宽度50% * 高度50%',
+                size: '200px * 200px',
+                name: '图二'
+            },
+            {
+                desc: '宽度50% * 高度50%',
+                size: '200px * 200px',
+                name: '图三'
+            }
+        ],
+        descAux: '选定布局区域，在下方添加图片，上方一张图片的宽度为下方两张图片宽度之和，下放两张图片尺寸一致，高度可根据实际需求自行确定（例：上方图片尺寸：400px * 150px，下方两张图片尺寸：200px * 150px）'
+    },
+    {
+        name: '1左3右',
+        src: 'iconyizuosanyoupc',
+        className: 'row1-lt-of1-tp-of2-bm',
+        dimensionScale: [
+            {
+                desc: '宽度50% * 高度100%',
+                size: '200px * 400px',
+                name: '图一'
+            },
+            {
+                desc: '宽度50% * 高度50%',
+                size: '200px * 200px',
+                name: '图二'
+            },
+            {
+                desc: '宽度25% * 高度50%',
+                size: '100px * 200px',
+                name: '图三'
+            },
+            {
+                desc: '宽度25% * 高度50%',
+                size: '100px * 200px',
+                name: '图四'
+            }
+        ],
+        descAux: '选定布局区域，在下方添加图片，左右两侧内容宽高相同，右侧上下区域高度各占50%，右侧内容下半部分两张图片的宽度相同，各占右侧内容宽度的50%（例：左侧图片尺寸：200px * 400px，右侧上半部分图片尺寸：200px * 200px，右侧下半部分两张图片尺寸：100px * 200px）'
+    }
 ])
 
 const selectTemplate = computed(() => {
-  let data
-  templateList.value.forEach((item) => {
-    if (item.className == diyStore.editComponent.mode) {
-      data = item
-    }
-  })
-  return data
+    let data
+    templateList.value.forEach((item) => {
+        if (item.className == diyStore.editComponent.mode) {
+            data = item
+        }
+    })
+    return data
 })
 
 const changeTemplateList = (v: number) => {
-  for (let i = 0; i < templateList.value.length; i++) {
-    if (i == v) {
-      diyStore.editComponent.mode = templateList.value[i].className
-      const count = templateList.value[i].dimensionScale.length
-
-      // 重置当前编辑的图片集合
-
-      // 数量不够，进行添加
-      if (count > diyStore.editComponent.list.length) {
-        for (let j = 0; j < count; j++) {
-          if (j + 1 > diyStore.editComponent.list.length) {
-            diyStore.editComponent.list.push({
-              imageUrl: '',
-              imgWidth: 0,
-              imgHeight: 0,
-              link: { name: '' },
-            })
-          }
-        }
-      } else {
-        // 数量不相同时，并且数量超出，减去
-        if (count != diyStore.editComponent.list.length) {
-          for (let j = 0; j < diyStore.editComponent.list.length; j++) {
-            if (j + 1 > count) {
-              diyStore.editComponent.list.splice(j, 1)
-              j = 0
+    for (let i = 0; i < templateList.value.length; i++) {
+        if (i == v) {
+            diyStore.editComponent.mode = templateList.value[i].className
+            const count = templateList.value[i].dimensionScale.length
+
+            // 重置当前编辑的图片集合
+
+            // 数量不够，进行添加
+            if (count > diyStore.editComponent.list.length) {
+                for (let j = 0; j < count; j++) {
+                    if ((j + 1) > diyStore.editComponent.list.length) {
+                        diyStore.editComponent.list.push({
+                            imageUrl: '',
+                            imgWidth: 0,
+                            imgHeight: 0,
+                            link: { name: '' }
+                        })
+                    }
+                }
+            } else {
+                // 数量不相同时，并且数量超出，减去
+                if (count != diyStore.editComponent.list.length) {
+                    for (let j = 0; j < diyStore.editComponent.list.length; j++) {
+                        if ((j + 1) > count) {
+                            diyStore.editComponent.list.splice(j, 1)
+                            j = 0
+                        }
+                    }
+                }
             }
-          }
         }
-      }
     }
-  }
 }
 
-const selectImg = (url: string) => {
-  handleHeight(true)
+const selectImg = (url:string) => {
+    handleHeight(true)
 }
 
 // 处理高度
-const handleHeight = (isCalcHeight: boolean = false) => {
-  diyStore.editComponent.list.forEach((item: any, index: number) => {
-    const image = new Image()
-    image.src = img(item.imageUrl)
-    image.onload = async () => {
-      item.imgWidth = image.width
-      item.imgHeight = image.height
-    }
-  })
+const handleHeight = (isCalcHeight:boolean = false) => {
+    diyStore.editComponent.list.forEach((item: any, index: number) => {
+        const image = new Image()
+        image.src = img(item.imageUrl)
+        image.onload = async () => {
+            item.imgWidth = image.width
+            item.imgHeight = image.height
+        }
+    })
 }
 
 defineExpose({})
 </script>
 
 <style lang="scss" scoped>
-.rubik-cube .selected-template-list {
-  /*padding-left: 15px;*/
-  margin-bottom: 20px;
-  overflow: hidden;
-  display: flex;
-  flex-wrap: wrap;
-
-  li {
-    color: #909399;
-    width: 46px;
-    height: 32px;
-    text-align: center;
-    line-height: 29px;
-    border: 1px solid #e5e5e5;
-    cursor: pointer;
-    background: #ffffff;
-    box-sizing: border-box;
-    border-right: 1px transparent solid;
-
-    &:last-child {
-      border-right: 1px solid #e5e5e5;
-    }
-
-    &.selected {
-      color: var(--el-color-primary);
-      border-color: var(--el-color-primary);
-    }
-
-    img {
-      display: inline-block;
-    }
-
-    div {
-      font-size: 12px;
-    }
-  }
-}
-
-.layout {
-  overflow: hidden;
-  position: relative;
-  margin-bottom: 15px;
-
-  li {
-    float: left;
-    color: #909399;
-    border: 1px solid #e5e5e5;
-    cursor: pointer;
-    font-size: 12px;
-    position: relative;
-
-    div.empty {
-      left: 0;
-      text-align: center;
-      width: 100%;
-      position: absolute;
-      top: 50%;
-      margin-top: -26px;
-
-      p {
-        margin: 0;
-        line-height: 26px;
-      }
-    }
-
-    div.have-preview-image {
-      box-sizing: border-box;
-
-      img {
-        display: inline-block;
-        width: auto;
-        height: auto;
-        max-width: 100%;
-        max-height: 100%;
-      }
-    }
-
-    // 1行2个
-    &.row1-of2 {
-      width: 49.2%;
-      height: 160px;
-      border-right: 1px transparent solid;
-
-      &:last-child {
-        border-right: 1px solid #e5e5e5;
-      }
-
-      div.empty {
-      }
-
-      div.have-preview-image {
-        text-align: center;
-        height: 100%;
-        line-height: 160px;
-        background: #ffffff;
-      }
-    }
-
-    // 1行3个
-    &.row1-of3 {
-      width: 32.5%;
-      height: 100px;
-      border-right: 1px transparent solid;
-
-      &:last-child {
-        border-right: 1px solid #bdf;
-      }
-
-      div.empty {
-      }
-
-      div.have-preview-image {
-        text-align: center;
-        height: 100%;
-        line-height: 100px;
-        background: #ffffff;
-      }
-    }
-
-    // 1行4个
-    &.row1-of4 {
-      width: 24.2%;
-      height: 80px;
-      border-right: 1px transparent solid;
-
-      &:last-child {
-        border-right: 1px solid #bdf;
-      }
-
-      div.empty {
-      }
-
-      div.have-preview-image {
-        text-align: center;
-        height: 100%;
-        line-height: 80px;
-        background: #ffffff;
-      }
-    }
-
-    // 2左2右
-    &.row2-lt-of2-rt {
-      width: 49.2%;
-      height: 160px;
-
-      &:nth-child(1) {
-        border-right: 1px transparent solid;
-        border-bottom: 1px transparent solid;
-      }
-
-      &:nth-child(2) {
-        border-bottom: 1px transparent solid;
-      }
-
-      &:nth-child(3) {
-        border-right: 1px transparent solid;
-        clear: both;
-      }
-
-      div.empty {
-      }
-
-      div.have-preview-image {
-        text-align: center;
-        height: 100%;
-        line-height: 160px;
-        background: #ffffff;
-      }
-    }
-
-    // 1左2右
-    &.row1-lt-of2-rt {
-      width: 49.2%;
-      font-size: 12px;
-
-      &:nth-child(1) {
-        height: 322px;
-        border-right: 1px transparent solid;
-
-        div.have-preview-image {
-          text-align: center;
-          height: 100%;
-          line-height: 322px;
-          background: #ffffff;
-        }
-      }
-
-      &:nth-child(2) {
-        height: 160px;
-        border-bottom: 1px transparent solid;
-
-        div.have-preview-image {
-          text-align: center;
-          height: 100%;
-          line-height: 160px;
-          background: #ffffff;
-        }
-      }
-
-      &:nth-child(3) {
-        height: 160px;
-
-        div.have-preview-image {
-          text-align: center;
-          height: 100%;
-          line-height: 160px;
-          background: #ffffff;
-        }
-      }
-
-      div.empty {
-      }
-    }
-
-    // 1上2下
-    &.row1-tp-of2-bm {
-      height: 160px;
-
-      &:nth-child(1) {
-        width: 99.4%;
-        border-bottom: 1px transparent solid;
-      }
-
-      &:nth-child(2) {
-        width: 49.2%;
-        border-right: 1px transparent solid;
-      }
-
-      &:nth-child(3) {
-        width: 49.2%;
-      }
-
-      div.empty {
-      }
-
-      div.have-preview-image {
-        text-align: center;
-        height: 100%;
-        line-height: 160px;
-        background: #ffffff;
-      }
-    }
-
-    // 1左3右
-    &.row1-lt-of1-tp-of2-bm {
-      &:nth-child(1) {
-        height: 320px;
-        width: 49.2%;
-        border-right: 1px transparent solid;
-
-        div.have-preview-image {
-          text-align: center;
-          height: 100%;
-          line-height: 320px;
-          background: #ffffff;
-        }
-      }
-
-      &:nth-child(2) {
-        height: 160px;
-        width: 49.2%;
-        border-bottom: 1px transparent solid;
-
-        div.have-preview-image {
-          text-align: center;
-          height: 100%;
-          line-height: 160px;
-          background: #ffffff;
-        }
-      }
-
-      &:nth-child(3) {
-        height: 160px;
-        width: 24.2%;
-        border-right: 1px transparent solid;
-
-        div.have-preview-image {
-          text-align: center;
-          height: 100%;
-          line-height: 160px;
-          background: #ffffff;
-        }
-      }
-
-      &:nth-child(4) {
-        height: 160px;
-        width: 24.2%;
-
-        div.have-preview-image {
-          text-align: center;
-          height: 100%;
-          line-height: 160px;
-          background: #ffffff;
-        }
-      }
-
-      div.empty {
-      }
-    }
-  }
-}
-</style>
+	.rubik-cube .selected-template-list {
+		/*padding-left: 15px;*/
+		margin-bottom: 20px;
+		overflow: hidden;
+		display: flex;
+		flex-wrap: wrap;
+
+		li {
+			color: #909399;
+			width: 46px;
+			height: 32px;
+			text-align: center;
+			line-height: 29px;
+			border: 1px solid #e5e5e5;
+			cursor: pointer;
+			background: #ffffff;
+			box-sizing: border-box;
+			border-right: 1px transparent solid;
+
+			&:last-child {
+				border-right: 1px solid #e5e5e5;
+			}
+
+			&.selected {
+				color: var(--el-color-primary);
+				border-color: var(--el-color-primary);
+			}
+
+			img {
+				display: inline-block;
+			}
+
+			div {
+				font-size: 12px;
+			}
+		}
+	}
+
+	.layout {
+		overflow: hidden;
+		position: relative;
+		margin-bottom: 15px;
+
+		li {
+			float: left;
+			color: #909399;
+			border: 1px solid #e5e5e5;
+			cursor: pointer;
+			font-size: 12px;
+			position: relative;
+
+			div.empty {
+				left: 0;
+				text-align: center;
+				width: 100%;
+				position: absolute;
+				top: 50%;
+				margin-top: -26px;
+
+				p {
+					margin: 0;
+					line-height: 26px;
+				}
+			}
+
+			div.have-preview-image {
+				box-sizing: border-box;
+
+				img {
+					display: inline-block;
+					width: auto;
+					height: auto;
+					max-width: 100%;
+					max-height: 100%;
+				}
+			}
+
+			// 1行2个
+			&.row1-of2 {
+				width: 49.2%;
+				height: 160px;
+				border-right: 1px transparent solid;
+
+				&:last-child {
+					border-right: 1px solid #e5e5e5;
+				}
+
+				div.empty {
+				}
+
+				div.have-preview-image {
+					text-align: center;
+					height: 100%;
+					line-height: 160px;
+					background: #ffffff;
+				}
+
+			}
+
+			// 1行3个
+			&.row1-of3 {
+				width: 32.5%;
+				height: 100px;
+				border-right: 1px transparent solid;
+
+				&:last-child {
+					border-right: 1px solid #bdf;
+				}
+
+				div.empty {
+				}
+
+				div.have-preview-image {
+					text-align: center;
+					height: 100%;
+					line-height: 100px;
+					background: #ffffff;
+				}
+			}
+
+			// 1行4个
+			&.row1-of4 {
+				width: 24.2%;
+				height: 80px;
+				border-right: 1px transparent solid;
+
+				&:last-child {
+					border-right: 1px solid #bdf;
+				}
+
+				div.empty {
+				}
+
+				div.have-preview-image {
+					text-align: center;
+					height: 100%;
+					line-height: 80px;
+					background: #ffffff;
+				}
+			}
+
+			// 2左2右
+			&.row2-lt-of2-rt {
+				width: 49.2%;
+				height: 160px;
+
+				&:nth-child(1) {
+					border-right: 1px transparent solid;
+					border-bottom: 1px transparent solid;
+				}
+
+				&:nth-child(2) {
+					border-bottom: 1px transparent solid;
+				}
+
+				&:nth-child(3) {
+					border-right: 1px transparent solid;
+					clear: both;
+				}
+
+				div.empty {
+				}
+
+				div.have-preview-image {
+					text-align: center;
+					height: 100%;
+					line-height: 160px;
+					background: #ffffff;
+				}
+			}
+
+			// 1左2右
+			&.row1-lt-of2-rt {
+				width: 49.2%;
+				font-size: 12px;
+
+				&:nth-child(1) {
+					height: 322px;
+					border-right: 1px transparent solid;
+
+					div.have-preview-image {
+						text-align: center;
+						height: 100%;
+						line-height: 322px;
+						background: #ffffff;
+					}
+				}
+
+				&:nth-child(2) {
+					height: 160px;
+					border-bottom: 1px transparent solid;
+
+					div.have-preview-image {
+						text-align: center;
+						height: 100%;
+						line-height: 160px;
+						background: #ffffff;
+					}
+				}
+
+				&:nth-child(3) {
+					height: 160px;
+
+					div.have-preview-image {
+						text-align: center;
+						height: 100%;
+						line-height: 160px;
+						background: #ffffff;
+					}
+				}
+
+				div.empty {
+				}
+			}
+
+			// 1上2下
+			&.row1-tp-of2-bm {
+				height: 160px;
+
+				&:nth-child(1) {
+					width: 99.4%;
+					border-bottom: 1px transparent solid;
+				}
+
+				&:nth-child(2) {
+					width: 49.2%;
+					border-right: 1px transparent solid;
+				}
+
+				&:nth-child(3) {
+					width: 49.2%;
+				}
+
+				div.empty {
+				}
+
+				div.have-preview-image {
+					text-align: center;
+					height: 100%;
+					line-height: 160px;
+					background: #ffffff;
+				}
+			}
+
+			// 1左3右
+			&.row1-lt-of1-tp-of2-bm {
+				&:nth-child(1) {
+					height: 320px;
+					width: 49.2%;
+					border-right: 1px transparent solid;
+
+					div.have-preview-image {
+						text-align: center;
+						height: 100%;
+						line-height: 320px;
+						background: #ffffff;
+					}
+				}
+
+				&:nth-child(2) {
+					height: 160px;
+					width: 49.2%;
+					border-bottom: 1px transparent solid;
+
+					div.have-preview-image {
+						text-align: center;
+						height: 100%;
+						line-height: 160px;
+						background: #ffffff;
+					}
+				}
+
+				&:nth-child(3) {
+					height: 160px;
+					width: 24.2%;
+					border-right: 1px transparent solid;
+
+					div.have-preview-image {
+						text-align: center;
+						height: 100%;
+						line-height: 160px;
+						background: #ffffff;
+					}
+				}
+
+				&:nth-child(4) {
+					height: 160px;
+					width: 24.2%;
+
+					div.have-preview-image {
+						text-align: center;
+						height: 100%;
+						line-height: 160px;
+						background: #ffffff;
+					}
+				}
+
+				div.empty {
+				}
+			}
+
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/admin/src/app/views/diy/components/edit-text.vue b/admin/src/app/views/diy/components/edit-text.vue
index 1b311c32..5cdb33d5 100644
--- a/admin/src/app/views/diy/components/edit-text.vue
+++ b/admin/src/app/views/diy/components/edit-text.vue
@@ -1,169 +1,114 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('styleSet') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('selectStyle')" class="flex">
-          <span class="text-primary flex-1 cursor-pointer" @click="showStyle">{{
-            diyStore.editComponent.styleName
-          }}</span>
-          <el-icon>
-            <ArrowRight />
-          </el-icon>
-        </el-form-item>
-      </el-form>
-    </div>
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('titleContent') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('title')">
-          <el-input
-            v-model.trim="diyStore.editComponent.text"
-            :placeholder="t('titlePlaceholder')"
-            clearable
-            maxlength="15"
-            show-word-limit
-          />
-        </el-form-item>
-        <el-form-item :label="t('link')">
-          <diy-link v-model="diyStore.editComponent.link" />
-        </el-form-item>
-        <el-form-item
-          :label="t('textAlign')"
-          v-show="diyStore.editComponent.style == 'style-1'"
-        >
-          <el-radio-group v-model="diyStore.editComponent.textAlign">
-            <el-radio :label="'left'">{{ t('textAlignLeft') }}</el-radio>
-            <el-radio :label="'center'">{{ t('textAlignCenter') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <div
-      class="edit-attr-item-wrap"
-      v-show="diyStore.editComponent.subTitle.control"
-    >
-      <h3 class="mb-[10px]">{{ t('subTitleContent') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('subTitle')">
-          <el-input
-            v-model.trim="diyStore.editComponent.subTitle.text"
-            :placeholder="t('subTitlePlaceholder')"
-            clearable
-            maxlength="30"
-            show-word-limit
-          />
-        </el-form-item>
-        <el-form-item :label="t('textFontSize')">
-          <el-slider
-            v-model="diyStore.editComponent.subTitle.fontSize"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-            :min="12"
-            :max="16"
-          />
-        </el-form-item>
-        <el-form-item :label="t('textColor')">
-          <el-color-picker v-model="diyStore.editComponent.subTitle.color" />
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <div
-      class="edit-attr-item-wrap"
-      v-show="diyStore.editComponent.more.control"
-    >
-      <h3 class="mb-[10px]">{{ t('moreContent') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('more')">
-          <el-input
-            v-model.trim="diyStore.editComponent.more.text"
-            :placeholder="t('morePlaceholder')"
-            clearable
-            maxlength="8"
-            show-word-limit
-          />
-        </el-form-item>
-        <el-form-item :label="t('link')">
-          <diy-link v-model="diyStore.editComponent.more.link" />
-        </el-form-item>
-        <el-form-item :label="t('moreIsShow')">
-          <el-switch v-model="diyStore.editComponent.more.isShow" />
-        </el-form-item>
-        <el-form-item :label="t('textColor')">
-          <el-color-picker v-model="diyStore.editComponent.more.color" />
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <el-dialog v-model="showDialog" :title="t('selectStyle')" width="620px">
-      <div class="flex flex-wrap">
-        <div
-          class="flex items-center justify-center overflow-hidden w-[280px] h-[100px] mr-[12px] cursor-pointer border bg-gray-50"
-          :class="{ 'border-primary': selectStyle == 'style-1' }"
-          @click="selectStyle = 'style-1'"
-        >
-          <img
-            class="max-w-[280px] max-h-[220px]"
-            src="@/app/assets/images/diy/text/style1.png"
-          />
-        </div>
-        <div
-          class="flex items-center justify-center overflow-hidden w-[280px] h-[100px] cursor-pointer border bg-gray-50"
-          :class="{ 'border-primary': selectStyle == 'style-2' }"
-          @click="selectStyle = 'style-2'"
-        >
-          <img
-            class="max-w-[280px] max-h-[220px]"
-            src="@/app/assets/images/diy/text/style2.png"
-          />
-        </div>
-      </div>
-
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-          <el-button type="primary" @click="changeStyle">{{
-            t('confirm')
-          }}</el-button>
-        </span>
-      </template>
-    </el-dialog>
-  </div>
-
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('titleStyle') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('textFontSize')">
-          <el-slider
-            v-model="diyStore.editComponent.fontSize"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-            :min="12"
-            :max="30"
-          />
-        </el-form-item>
-        <el-form-item :label="t('textFontWeight')">
-          <el-radio-group v-model="diyStore.editComponent.fontWeight">
-            <el-radio :label="'normal'">{{ t('fontWeightNormal') }}</el-radio>
-            <el-radio :label="'bold'">{{ t('fontWeightBold') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item :label="t('textColor')">
-          <el-color-picker v-model="diyStore.editComponent.textColor" />
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('styleSet') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('selectStyle')" class="flex">
+					<span class="text-primary flex-1 cursor-pointer" @click="showStyle">{{ diyStore.editComponent.styleName }}</span>
+					<el-icon>
+						<ArrowRight />
+					</el-icon>
+				</el-form-item>
+			</el-form>
+		</div>
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('titleContent') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('title')">
+					<el-input v-model.trim="diyStore.editComponent.text" :placeholder="t('titlePlaceholder')" clearable maxlength="15" show-word-limit />
+				</el-form-item>
+				<el-form-item :label="t('link')">
+					<diy-link v-model="diyStore.editComponent.link" />
+				</el-form-item>
+				<el-form-item :label="t('textAlign')" v-show="diyStore.editComponent.style == 'style-1'">
+					<el-radio-group v-model="diyStore.editComponent.textAlign">
+						<el-radio :label="'left'">{{ t('textAlignLeft') }}</el-radio>
+						<el-radio :label="'center'">{{ t('textAlignCenter') }}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+			</el-form>
+		</div>
+
+		<div class="edit-attr-item-wrap" v-show="diyStore.editComponent.subTitle.control">
+			<h3 class="mb-[10px]">{{ t('subTitleContent') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('subTitle')">
+					<el-input v-model.trim="diyStore.editComponent.subTitle.text" :placeholder="t('subTitlePlaceholder')" clearable maxlength="30" show-word-limit />
+				</el-form-item>
+				<el-form-item :label="t('textFontSize')">
+					<el-slider v-model="diyStore.editComponent.subTitle.fontSize" show-input size="small" class="ml-[10px] diy-nav-slider" :min="12" :max="16" />
+				</el-form-item>
+				<el-form-item :label="t('textColor')">
+					<el-color-picker v-model="diyStore.editComponent.subTitle.color" />
+				</el-form-item>
+			</el-form>
+		</div>
+
+		<div class="edit-attr-item-wrap" v-show="diyStore.editComponent.more.control">
+			<h3 class="mb-[10px]">{{ t('moreContent') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('more')">
+					<el-input v-model.trim="diyStore.editComponent.more.text" :placeholder="t('morePlaceholder')" clearable maxlength="8" show-word-limit />
+				</el-form-item>
+				<el-form-item :label="t('link')">
+					<diy-link v-model="diyStore.editComponent.more.link" />
+				</el-form-item>
+				<el-form-item :label="t('moreIsShow')">
+					<el-switch v-model="diyStore.editComponent.more.isShow" />
+				</el-form-item>
+				<el-form-item :label="t('textColor')">
+					<el-color-picker v-model="diyStore.editComponent.more.color" />
+				</el-form-item>
+			</el-form>
+		</div>
+
+		<el-dialog v-model="showDialog" :title="t('selectStyle')" width="620px">
+
+			<div class="flex flex-wrap">
+				<div class="flex items-center justify-center overflow-hidden w-[280px] h-[100px] mr-[12px] cursor-pointer border bg-gray-50" :class="{ 'border-primary': selectStyle == 'style-1' }" @click="selectStyle = 'style-1'">
+					<img class="max-w-[280px] max-h-[220px]" src="@/app/assets/images/diy/text/style1.png" />
+				</div>
+				<div class="flex items-center justify-center overflow-hidden w-[280px] h-[100px] cursor-pointer border bg-gray-50" :class="{ 'border-primary': selectStyle == 'style-2' }" @click="selectStyle = 'style-2'">
+					<img class="max-w-[280px] max-h-[220px]" src="@/app/assets/images/diy/text/style2.png" />
+				</div>
+			</div>
+
+			<template #footer>
+				<span class="dialog-footer">
+					<el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+					<el-button type="primary" @click="changeStyle">{{ t('confirm') }}</el-button>
+				</span>
+			</template>
+
+		</el-dialog>
+	</div>
+
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('titleStyle') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('textFontSize')">
+					<el-slider v-model="diyStore.editComponent.fontSize" show-input size="small" class="ml-[10px] diy-nav-slider" :min="12" :max="30" />
+				</el-form-item>
+				<el-form-item :label="t('textFontWeight')">
+					<el-radio-group v-model="diyStore.editComponent.fontWeight">
+						<el-radio :label="'normal'">{{ t('fontWeightNormal') }}</el-radio>
+						<el-radio :label="'bold'">{{ t('fontWeightBold') }}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+				<el-form-item :label="t('textColor')">
+					<el-color-picker v-model="diyStore.editComponent.textColor" />
+				</el-form-item>
+			</el-form>
+		</div>
+
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -177,29 +122,30 @@ diyStore.editComponent.ignore = [] // 忽略公共属性
 const showDialog = ref(false)
 
 const showStyle = () => {
-  showDialog.value = true
+    showDialog.value = true
 }
 
 const selectStyle = ref(diyStore.editComponent.style)
 
 const changeStyle = () => {
-  switch (selectStyle.value) {
-    case 'style-1':
-      diyStore.editComponent.subTitle.control = false
-      diyStore.editComponent.more.control = false
-      diyStore.editComponent.styleName = '风格1'
-      break
-    case 'style-2':
-      diyStore.editComponent.subTitle.control = true
-      diyStore.editComponent.more.control = true
-      diyStore.editComponent.styleName = '风格2'
-      break
-  }
-  diyStore.editComponent.style = selectStyle.value
-  showDialog.value = false
+    switch (selectStyle.value) {
+        case 'style-1':
+            diyStore.editComponent.subTitle.control = false
+            diyStore.editComponent.more.control = false
+            diyStore.editComponent.styleName = '风格1'
+            break
+        case 'style-2':
+            diyStore.editComponent.subTitle.control = true
+            diyStore.editComponent.more.control = true
+            diyStore.editComponent.styleName = '风格2'
+            break
+    }
+    diyStore.editComponent.style = selectStyle.value
+    showDialog.value = false
 }
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/diy/components/edit-theme.vue b/admin/src/app/views/diy/components/edit-theme.vue
index 17d82d35..e237a6cb 100644
--- a/admin/src/app/views/diy/components/edit-theme.vue
+++ b/admin/src/app/views/diy/components/edit-theme.vue
@@ -1,97 +1,43 @@
 <template>
-  <el-dialog
-    v-model="dialogThemeVisible"
-    title="编辑色调"
-    width="850px"
-    align-center
-    destroy-on-close="true"
-  >
-    <el-form :model="openData" label-width="150px" :rules="formRules">
-      <el-form-item label="色调名称" prop="title">
-        <el-input
-          v-model="openData.title"
-          placeholder="请输入色调名称"
-          maxlength="15"
-          class="!w-[250px]"
-          :disabled="openData.mark != 'diy'"
-        />
-      </el-form-item>
-    </el-form>
-    <el-form
-      :model="formData"
-      label-width="150px"
-      class="h-[640px] overflow-auto"
-      ref="formRef"
-      @submit.prevent
-    >
-      <el-form-item
-        :label="item.title"
-        v-for="(item, index) in formData"
-        :key="index"
-        :prop="`${index}.value`"
-        :rules="[
-          {
-            required: true,
-            message: `请选择${item.title}色调`,
-            trigger: 'blur',
-          },
-        ]"
-      >
-        <el-color-picker
-          v-model="item.value"
-          show-alpha
-          :predefine="diyStore.predefineColors"
-        />
-        <div class="form-tip">{{ item.tip }}</div>
-      </el-form-item>
+    <el-dialog v-model="dialogThemeVisible" title="编辑色调"  width="850px" align-center destroy-on-close="true">
+        <el-form :model="openData" label-width="150px" :rules="formRules">
+            <el-form-item label="色调名称" prop="title" >
+                <el-input v-model="openData.title" placeholder="请输入色调名称" maxlength="15" class="!w-[250px]" :disabled="openData.mark != 'diy'" />
+            </el-form-item>
+        </el-form>
+        <el-form :model="formData" label-width="150px"  class="h-[640px] overflow-auto" ref="formRef" @submit.prevent>
 
-      <el-form-item
-        :label="item.title"
-        v-for="(item, index) in openData.diy_value"
-        :key="index"
-      >
-        <div class="flex items-center">
-          <el-color-picker
-            v-model="item.value"
-            show-alpha
-            :predefine="diyStore.predefineColors"
-          />
-          <span
-            class="text-primary cursor-pointer text-[14px] ml-[20px]"
-            @click="editThemeFn(item)"
-            >编辑</span
-          >
-          <span
-            class="text-primary cursor-pointer text-[14px] ml-[8px]"
-            @click="deleteThemeFn(item)"
-            >删除</span
-          >
-        </div>
-        <div class="form-tip">{{ item.tip }}</div>
-      </el-form-item>
+            <el-form-item :label="item.title" v-for="(item,index) in  formData" :key="index"  :prop="`${index}.value`" :rules="[{ required: true, message: `请选择${item.title}色调`, trigger: 'blur' }]">
+                <el-color-picker v-model="item.value" show-alpha :predefine="diyStore.predefineColors"/>
+                <div class="form-tip">{{item.tip}}</div>
+            </el-form-item>
 
-      <el-form-item>
-        <div
-          class="flex items-center text-primary cursor-pointer text-[14px]"
-          @click="addThemeFn"
-        >
-          <span class="mr-[3px]">+</span>
-          <span>新增颜色</span>
-        </div>
-        <div class="form-tip">新增颜色key值不能与当前的存在的key值重复</div>
-      </el-form-item>
-    </el-form>
-    <add-theme ref="addThemeRef" @confirm="addThemeConfirm" />
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button @click="dialogThemeVisible = false">取消</el-button>
-        <el-button type="primary" plain @click="resetConfirmFn()"
-          >重置</el-button
-        >
-        <el-button type="primary" @click="confirmFn(formRef)">保存</el-button>
-      </div>
-    </template>
-  </el-dialog>
+            <el-form-item :label="item.title" v-for="(item,index) in  openData.diy_value" :key="index">
+                <div class="flex items-center">
+                    <el-color-picker v-model="item.value" show-alpha :predefine="diyStore.predefineColors"/>
+                    <span class="text-primary cursor-pointer text-[14px] ml-[20px]"  @click="editThemeFn(item)">编辑</span>
+                    <span class="text-primary cursor-pointer text-[14px] ml-[8px]"  @click="deleteThemeFn(item)">删除</span>
+                </div>
+                <div class="form-tip">{{item.tip}}</div>
+            </el-form-item>
+
+            <el-form-item>
+                <div class="flex items-center text-primary cursor-pointer text-[14px]" @click="addThemeFn">
+                    <span class="mr-[3px]">+</span>
+                    <span>新增颜色</span>
+                </div>
+                <div class="form-tip">新增颜色key值不能与当前的存在的key值重复</div>
+            </el-form-item>
+        </el-form>
+        <add-theme ref="addThemeRef" @confirm="addThemeConfirm" />
+        <template #footer>
+            <div class="dialog-footer">
+                <el-button @click="dialogThemeVisible = false">取消</el-button>
+                <el-button type="primary" plain @click="resetConfirmFn()">重置</el-button>
+                <el-button type="primary" @click="confirmFn(formRef)">保存</el-button>
+            </div>
+        </template>
+    </el-dialog>
 </template>
 
 <script setup lang="ts">
@@ -107,13 +53,12 @@ const diyStore = useDiyStore()
 
 const dialogThemeVisible = ref(false)
 const addThemeRef = ref(null)
-const openData: Record<string, any> = reactive({
-  // 用于接收弹窗打开时的参数
-  title: '',
-  mark: '',
-  diy_value: [],
-  default: {},
-  data: {},
+const openData: Record<string, any> = reactive({ // 用于接收弹窗打开时的参数
+    title: '',
+    mark: '',
+    diy_value: [],
+    default: {},
+    data: {}
 })
 
 const emit = defineEmits(['confirm'])
@@ -122,189 +67,192 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    title: [{ required: true, message: '请输入色调名称', trigger: 'blur' }],
-  }
+    return {
+        title: [
+            { required: true, message: '请输入色调名称', trigger: 'blur' }
+        ]
+    }
 })
 
 /**
- * 表单数据
- */
+* 表单数据
+*/
 const initialFormData = [
-  {
-    title: '主色调',
-    label: '--primary-color',
-    value: '#333333',
-    tip: '主色调在uiapp中使用：var(--primary-color)',
-  },
-  {
-    title: '辅色调',
-    label: '--primary-help-color',
-    value: '#333333',
-    tip: '辅色调在uiapp中使用：var(--primary-help-color)',
-  },
-  {
-    title: '页面背景色',
-    label: '--page-bg-color',
-    value: '#ffffff',
-    tip: '页面背景色在uiapp中使用：var(--page-bg-color)',
-  },
-  {
-    title: '主色调浅色（淡）',
-    label: '--primary-color-light',
-    value: '',
-    tip: '主色调浅色（淡）在uiapp中使用：var(--primary-color-light)',
-  },
-  {
-    title: '主色调浅色（深）',
-    label: '--primary-color-light2',
-    value: '',
-    tip: '主色调浅色（深）在uiapp中使用：var(--primary-color-light2)',
-  },
-  {
-    title: '灰色调',
-    label: '--primary-color-dark',
-    value: '#cccccc',
-    tip: '灰色调在uiapp中使用：var(--primary-color-dark)',
-  },
-  {
-    title: '禁用色',
-    label: '--primary-color-disabled',
-    value: '#dddddd',
-    tip: '禁用色在uiapp中使用：var(--primary-color-disabled)',
-  },
-  {
-    title: '价格颜色',
-    label: '--price-text-color',
-    value: '#333333',
-    tip: '价格颜色在uiapp中使用：var(--price-text-color)',
-  },
+    {
+        title: '主色调',
+        label: '--primary-color',
+        value: '#333333',
+        tip: '主色调在uiapp中使用：var(--primary-color)'
+    },
+    {
+        title: '辅色调',
+        label: '--primary-help-color',
+        value: '#333333',
+        tip: '辅色调在uiapp中使用：var(--primary-help-color)'
+    },
+    {
+        title: '页面背景色',
+        label: '--page-bg-color',
+        value: '#ffffff',
+        tip: '页面背景色在uiapp中使用：var(--page-bg-color)'
+    },
+    {
+        title: '主色调浅色（淡）',
+        label: '--primary-color-light',
+        value: '',
+        tip: '主色调浅色（淡）在uiapp中使用：var(--primary-color-light)'
+    },
+    {
+        title: '主色调浅色（深）',
+        label: '--primary-color-light2',
+        value: '',
+        tip: '主色调浅色（深）在uiapp中使用：var(--primary-color-light2)'
+    },
+    {
+        title: '灰色调',
+        label: '--primary-color-dark',
+        value: '#cccccc',
+        tip: '灰色调在uiapp中使用：var(--primary-color-dark)'
+    },
+    {
+        title: '禁用色',
+        label: '--primary-color-disabled',
+        value: '#dddddd',
+        tip: '禁用色在uiapp中使用：var(--primary-color-disabled)'
+    },
+    {
+        title: '价格颜色',
+        label: '--price-text-color',
+        value: '#333333',
+        tip: '价格颜色在uiapp中使用：var(--price-text-color)'
+    }
 ]
 const formData = ref([...cloneDeep(initialFormData)])
 
-const open = (res: any) => {
-  // 参数： name=>色调名称，key=>区分系统还是应用的标识，default=>色调颜色的默认值，用于重置，data=>当前色调颜色值
-  Object.keys(openData).forEach((key: string) => {
-    openData[key] = res[key] != undefined ? cloneDeep(res[key]) : ''
-  })
+const open = (res:any) => { // 参数： name=>色调名称，key=>区分系统还是应用的标识，default=>色调颜色的默认值，用于重置，data=>当前色调颜色值
+    Object.keys(openData).forEach((key: string) => {
+        openData[key] = res[key] != undefined ? cloneDeep(res[key]) : ''
+    })
 
-  // 恢复默认值
-  formData.value.forEach((item, index) => {
-    initialFormData.forEach((subItem, subIndex) => {
-      if (item.label == subItem.label) {
-        item.value = subItem.value
-      }
+    // 恢复默认值
+    formData.value.forEach((item, index) => {
+        initialFormData.forEach((subItem, subIndex) => {
+            if (item.label == subItem.label) {
+                item.value = subItem.value
+            }
+        })
     })
-  })
 
-  // 渲染值
-  formData.value.forEach((item, index) => {
-    item.value = res.data[item.label] ? res.data[item.label] : item.value
-  })
-  console.log(formData.value, openData)
-  dialogThemeVisible.value = true
+    // 渲染值
+    formData.value.forEach((item, index) => {
+        item.value = res.data[item.label] ? res.data[item.label] : item.value
+    })
+    console.log(formData.value, openData)
+    dialogThemeVisible.value = true
 }
 
 // 新增颜色
 const addThemeFn = () => {
-  const keyArr = []
-  formData.value.forEach((item, index) => {
-    keyArr.push(item.label)
-  })
-  const obj = {
-    key: keyArr,
-  }
-  addThemeRef.value.open(obj)
+    const keyArr = []
+    formData.value.forEach((item, index) => {
+        keyArr.push(item.label)
+    })
+    const obj = {
+        key: keyArr
+    }
+    addThemeRef.value.open(obj)
 }
 
 // 编辑颜色
-const editThemeFn = (res: any) => {
-  const keyArr = []
-  formData.value.forEach((item, index) => {
-    keyArr.push(item.label)
-  })
-  const obj = {
-    key: keyArr,
-    data: res,
-  }
-  addThemeRef.value.open(obj)
+const editThemeFn = (res:any) => {
+    const keyArr = []
+    formData.value.forEach((item, index) => {
+        keyArr.push(item.label)
+    })
+    const obj = {
+        key: keyArr,
+        data: res
+    }
+    addThemeRef.value.open(obj)
 }
 // 删除颜色
-const deleteThemeFn = (res: any) => {
-  let indent = -1
-  for (let i = 0; i < openData.diy_value.length; i++) {
-    if (openData.diy_value[i].label == res.label) {
-      indent = i
+const deleteThemeFn = (res:any) => {
+    let indent = -1
+    for (let i = 0; i < openData.diy_value.length; i++) {
+        if (openData.diy_value[i].label == res.label) {
+            indent = i
+        }
+    }
+    if (indent > -1) {
+        openData.diy_value.splice(indent, 1)
     }
-  }
-  if (indent > -1) {
-    openData.diy_value.splice(indent, 1)
-  }
 }
 
 // 添加颜色组件回调
-const addThemeConfirm = (res: any) => {
-  for (let i = 0; i < openData.diy_value.length; i++) {
-    if (openData.diy_value[i].label == res.label) {
-      openData.diy_value[i] = res
-      return
+const addThemeConfirm = (res:any) =>{
+    for (let i = 0; i < openData.diy_value.length; i++) {
+        if (openData.diy_value[i].label == res.label) {
+            openData.diy_value[i] = res
+            return
+        }
     }
-  }
-  openData.diy_value.push(res)
+    openData.diy_value.push(res)
 }
 
 // 重置当前配色
 const resetConfirmFn = () => {
-  if (openData.default && Object.keys(openData.default).length) {
-    formData.value.forEach((item, index) => {
-      item.value = cloneDeep(openData.default[item.label])
-    })
-  } else {
-    formData.value = cloneDeep(initialFormData)
-  }
+    if (openData.default && Object.keys(openData.default).length) {
+        formData.value.forEach((item, index) => {
+            item.value = cloneDeep(openData.default[item.label])
+        })
+    } else {
+        formData.value = cloneDeep(initialFormData)
+    }
 
-  openData.diy_value = []
+    openData.diy_value = []
 
-  if (openData.mark == 'diy') {
-    openData.title = ''
-  }
+    if (openData.mark == 'diy') {
+        openData.title = ''
+    }
 
-  ElMessage({
-    message: '重置成功',
-    type: 'success',
-  })
+    ElMessage({
+        message: '重置成功',
+        type: 'success'
+    })
 }
 
 const confirmFn = async (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      const params = {
-        theme: {},
-        diy_value: [],
-        title: '',
-      }
-      params.title = openData.title
+    if (!formEl) return
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            const params = {
+                theme: {},
+                diy_value: [],
+                title: ''
+            }
+            params.title = openData.title
 
-      formData.value.forEach((item, index) => {
-        params.theme[item.label] = item.value
-      })
-      openData.diy_value.forEach((item, index) => {
-        params.theme[item.label] = item.value
-      })
+            formData.value.forEach((item, index) => {
+                params.theme[item.label] = item.value
+            })
+            openData.diy_value.forEach((item, index) => {
+                params.theme[item.label] = item.value
+            })
 
-      params.diy_value = openData.diy_value || []
+            params.diy_value = openData.diy_value || []
 
-      emit('confirm', params)
+            emit('confirm', params)
 
-      dialogThemeVisible.value = false
-    }
-  })
+            dialogThemeVisible.value = false
+        }
+    })
 }
 defineExpose({
-  dialogThemeVisible,
-  open,
+    dialogThemeVisible,
+    open
 })
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+
+</style>
diff --git a/admin/src/app/views/diy/components/theme-list.vue b/admin/src/app/views/diy/components/theme-list.vue
index 7057d93d..cc2cfe28 100644
--- a/admin/src/app/views/diy/components/theme-list.vue
+++ b/admin/src/app/views/diy/components/theme-list.vue
@@ -1,77 +1,30 @@
 <template>
-  <el-dialog
-    v-model="dialogThemeVisible"
-    :title="data.addon_title"
-    width="550px"
-    align-center
-  >
-    <el-form
-      class="page-form mt-[15px]"
-      :model="formData"
-      label-width="90px"
-      v-loading="loading"
-    >
-      <el-form-item label="选择配色">
-        <div class="flex items-center flex-wrap">
-          <template v-for="(tempItem, tempIndex) in theme_temp">
-            <div
-              :key="tempIndex"
-              v-if="tempItem.name != 'diy'"
-              class="flex items-center border-[1px] border-solid border-[#dcdee2] rounded-[5px] h-[40px] px-[15px] mr-[10px] cursor-pointer my-[5px]"
-              :class="{
-                '!border-[var(--el-color-primary)]':
-                  curr_theme_mark == tempItem.name,
-              }"
-              @click="themeTempChange(tempItem)"
-            >
-              <span
-                v-if="data.theme"
-                class="w-[20px] h-[20px] mr-[5px] rounded-[3px]"
-                :style="{ backgroundColor: data.theme['--primary-color'] }"
-              ></span>
-              <span
-                class="text-[14px]"
-                :class="{
-                  '!text-[var(--el-color-primary)]':
-                    curr_theme_mark == tempItem.name,
-                }"
-                >{{ tempItem.title }}</span
-              >
+    <el-dialog v-model="dialogThemeVisible" :title="data.addon_title"  width="550px"  align-center>
+        <el-form class="page-form mt-[15px]" :model="formData" label-width="90px" v-loading="loading">
+            <el-form-item label="选择配色">
+                <div class="flex items-center flex-wrap">
+                    <template v-for="(tempItem,tempIndex) in theme_temp">
+                        <div :key="tempIndex" v-if="tempItem.name != 'diy'" class="flex items-center border-[1px] border-solid border-[#dcdee2] rounded-[5px] h-[40px] px-[15px] mr-[10px] cursor-pointer my-[5px]" :class="{'!border-[var(--el-color-primary)]': curr_theme_mark == tempItem.name}" @click="themeTempChange(tempItem)">
+                            <span v-if="data.theme" class="w-[20px] h-[20px] mr-[5px] rounded-[3px]" :style="{backgroundColor: data.theme['--primary-color']}"></span>
+                            <span class="text-[14px]" :class="{'!text-[var(--el-color-primary)]': curr_theme_mark == tempItem.name}">{{tempItem.title}}</span>
+                        </div>
+                    </template>
+                    <div class="flex items-center border-[1px] border-solid border-[#dcdee2] rounded-[5px] h-[40px] px-[15px] cursor-pointer" :class="{'!border-[var(--el-color-primary)]': curr_theme_mark == 'diy'}" @click="themeTempChange('diy')">
+                        <span class="nc-iconfont nc-icon-tianjiaV6xx mr-[5px]" :class="{'!text-[var(--el-color-primary)]': curr_theme_mark == 'diy'}"></span>
+                        <span class="text-[14px]" :class="{'!text-[var(--el-color-primary)]': curr_theme_mark == 'diy'}">自定义</span>
+                    </div>
+                </div>
+            </el-form-item>
+        </el-form>
+        <edit-theme ref="editThemeRef"  @confirm="editThemeConfirm"/>
+        <template #footer>
+            <div class="dialog-footer">
+                <el-button @click="dialogThemeVisible = false">取消</el-button>
+                <el-button type="primary" plain @click="editThemeFn()">编辑</el-button>
+                <el-button type="primary" @click="confirmFn()">确定</el-button>
             </div>
-          </template>
-          <div
-            class="flex items-center border-[1px] border-solid border-[#dcdee2] rounded-[5px] h-[40px] px-[15px] cursor-pointer"
-            :class="{
-              '!border-[var(--el-color-primary)]': curr_theme_mark == 'diy',
-            }"
-            @click="themeTempChange('diy')"
-          >
-            <span
-              class="nc-iconfont nc-icon-tianjiaV6xx mr-[5px]"
-              :class="{
-                '!text-[var(--el-color-primary)]': curr_theme_mark == 'diy',
-              }"
-            ></span>
-            <span
-              class="text-[14px]"
-              :class="{
-                '!text-[var(--el-color-primary)]': curr_theme_mark == 'diy',
-              }"
-              >自定义</span
-            >
-          </div>
-        </div>
-      </el-form-item>
-    </el-form>
-    <edit-theme ref="editThemeRef" @confirm="editThemeConfirm" />
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button @click="dialogThemeVisible = false">取消</el-button>
-        <el-button type="primary" plain @click="editThemeFn()">编辑</el-button>
-        <el-button type="primary" @click="confirmFn()">确定</el-button>
-      </div>
-    </template>
-  </el-dialog>
+        </template>
+    </el-dialog>
 </template>
 
 <script setup lang="ts">
@@ -90,136 +43,132 @@ let confirmRepeat = false
 const curr_theme_title = ref('') //当前配色title
 const curr_theme_mark = ref('') //当前配色标识
 const curr_theme_value = ref('') //当前配色theme
-const theme_temp = ref([])
-const mode = ref('default') // 当前模式
+const theme_temp = ref([]);
+const mode = ref('default'); // 当前模式
 
 const data = ref({})
-const open = (res: any) => {
-  confirmRepeat = false
-  data.value = cloneDeep(res)
-  curr_theme_value.value = res.value
-  curr_theme_mark.value = res.color_mark
-  curr_theme_title.value = res.color_name
-
-  // 新增颜色
-  theme_temp.value.forEach((item, index) => {
-    if (item.name == data.value.color_mark) {
-      item.diy_value = data.value.diy_value
-      item.title = res.color_name
-    }
-  })
+const open = (res:any) => {
+
+    confirmRepeat = false;
+    data.value = cloneDeep(res);
+    curr_theme_value.value = res.value;
+    curr_theme_mark.value = res.color_mark;
+    curr_theme_title.value = res.color_name;
+
+    // 新增颜色
+    theme_temp.value.forEach((item,index)=>{
+        if(item.name == data.value.color_mark){
+            item.diy_value = data.value.diy_value;
+            item.title = res.color_name;
+        }
+    })
 
-  mode.value = res.mode
-  dialogThemeVisible.value = true
+    mode.value = res.mode;
+    dialogThemeVisible.value = true
 }
 
 const emit = defineEmits(['confirm'])
 
 const initData = () => {
-  getDefaultTheme().then((res) => {
-    theme_temp.value = res.data || []
-
-    // 将自定义添加到里面
-    let diy_theme_temp = {
-      name: 'diy',
-      theme: '',
-      title: '',
-    }
-    theme_temp.value.push(diy_theme_temp)
-  })
+    getDefaultTheme().then((res) => {
+        theme_temp.value = res.data || [];
+
+        // 将自定义添加到里面
+        let diy_theme_temp = {
+            name: 'diy',
+            theme: '',
+            title: ''
+        }
+        theme_temp.value.push(diy_theme_temp);
+    })
 }
 initData()
 
 // 切换不同配色
-const themeTempChange = (item) => {
-  if (item.name == data.value.color_mark) {
-    // 选择默认配色的情况
-    curr_theme_title.value = data.value.color_name
-    curr_theme_mark.value = data.value.color_mark
-    curr_theme_value.value = data.value.value
-  } else if (typeof item == 'object') {
-    // 选择除默认配色的情况
-    curr_theme_title.value = item.title
-    curr_theme_mark.value = item.name
-    curr_theme_value.value = item.theme
-  } else {
-    // 自定义情况
-    curr_theme_title.value = '自定义'
-    curr_theme_mark.value = item
-    curr_theme_value.value = ''
-  }
+const themeTempChange = (item)=>{
+    if(item.name == data.value.color_mark){ // 选择默认配色的情况
+        curr_theme_title.value = data.value.color_name;
+        curr_theme_mark.value = data.value.color_mark;
+        curr_theme_value.value = data.value.value;
+    }else if(typeof item == 'object'){ // 选择除默认配色的情况
+        curr_theme_title.value = item.title;
+        curr_theme_mark.value = item.name;
+        curr_theme_value.value = item.theme;
+    }else{ // 自定义情况
+        curr_theme_title.value = '自定义';
+        curr_theme_mark.value = item;
+        curr_theme_value.value = '';
+    }
 }
 
 // 编辑色调
-const editThemeFn = () => {
-  let theme = {
-    default: {}, // 当前色调的默认值
-    data: {}, // 当前色调
-    title: '',
-    mark: '', // 标识，区分是自定义还是模版色调,
-    diy_value: [], // 新增颜色值
-  }
-  theme.data = cloneDeep(curr_theme_value.value) || {}
-  theme.mark = curr_theme_mark.value
-  theme_temp.value.forEach((item, index) => {
-    if (item.name == curr_theme_mark.value) {
-      theme.default = item.theme ? cloneDeep(item.theme) : ''
-      theme.diy_value = item.diy_value || []
-      theme.title = item.title
+const editThemeFn = ()=>{
+    let theme = {
+        default: {}, // 当前色调的默认值
+        data: {}, // 当前色调
+        title:'',
+        mark: '', // 标识，区分是自定义还是模版色调,
+        diy_value: [] // 新增颜色值
     }
-  })
-  editThemeRef.value.open(theme)
+    theme.data = cloneDeep(curr_theme_value.value) || {};
+    theme.mark = curr_theme_mark.value;
+    theme_temp.value.forEach((item,index)=>{
+        if(item.name == curr_theme_mark.value){
+            theme.default = item.theme ? cloneDeep(item.theme) : '';
+            theme.diy_value= item.diy_value || [];
+            theme.title = item.title;
+        }
+    })
+    editThemeRef.value.open(theme)
 }
 
 // 编辑色调回调
-const editThemeConfirm = (res) => {
-  if (curr_theme_mark.value == data.value.color_mark) {
-    data.value.value = res.theme
-  }
-  theme_temp.value.forEach((item, index) => {
-    if (item.name == curr_theme_mark.value) {
-      item.diy_value = res.diy_value || []
+const editThemeConfirm = (res)=>{
+    if(curr_theme_mark.value == data.value.color_mark){
+        data.value.value = res.theme;
     }
-  })
-  data.value.title = res.title
-  curr_theme_value.value = res.theme
+    theme_temp.value.forEach((item,index)=>{
+        if(item.name == curr_theme_mark.value){
+            item.diy_value= res.diy_value || [];
+        }
+    })
+    data.value.title = res.title;
+    curr_theme_value.value = res.theme;
 }
 
 // 点击保存
 const confirmFn = () => {
-  if (confirmRepeat) return
-  confirmRepeat = true
-  let params = {}
-  params.id = data.value.id
-  params.mode = mode.value
-  params.color_mark = curr_theme_mark.value
-  params.value = curr_theme_value.value
-  params.key = data.value.key
-  params.color_name =
-    curr_theme_mark.value == 'diy'
-      ? data.value.title || '自定义'
-      : curr_theme_title.value
-  theme_temp.value.forEach((item, index) => {
-    if (item.name == curr_theme_mark.value) {
-      params.diy_value = cloneDeep(item.diy_value)
-    }
-  })
-
-  setDiyTheme(params)
-    .then((res) => {
-      emit('confirm', data)
-      confirmRepeat = false
-      dialogThemeVisible.value = false
+    if (confirmRepeat) return
+    confirmRepeat = true
+    let params = {}
+    params.id = data.value.id;
+    params.mode = mode.value;
+    params.color_mark = curr_theme_mark.value;
+    params.value = curr_theme_value.value;
+    params.key = data.value.key;
+    params.color_name = curr_theme_mark.value == 'diy' ? (data.value.title || '自定义') : curr_theme_title.value;
+    theme_temp.value.forEach((item,index)=>{
+        if(item.name == curr_theme_mark.value){
+            params.diy_value = cloneDeep(item.diy_value);
+        }
     })
-    .catch(() => {
-      confirmRepeat = false
+
+    setDiyTheme(params).then((res) => {
+        emit('confirm', data);
+        confirmRepeat = false;
+        dialogThemeVisible.value = false;
+    }).catch(()=>{
+        confirmRepeat = false;
     })
+
 }
 
 defineExpose({
-  dialogThemeVisible,
-  open,
+    dialogThemeVisible,
+    open
 })
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+
+</style>
diff --git a/admin/src/app/views/diy/edit.vue b/admin/src/app/views/diy/edit.vue
index 0667d85e..a37660dc 100644
--- a/admin/src/app/views/diy/edit.vue
+++ b/admin/src/app/views/diy/edit.vue
@@ -1,570 +1,222 @@
 <template>
-  <div class="main-container flex-1">
-    <el-header class="flex items-center h-[60px] bg-primary px-[20px]">
-      <div class="text-white cursor-pointer flex items-center" @click="goBack">
-        <el-icon size="14">
-          <ArrowLeft />
-        </el-icon>
-        <span class="pl-[5px] text-[14px]">{{ t('back') }}</span>
-      </div>
-      <div class="text-white ml-[10px] mr-[20px] flex items-center">
-        <span class="mr-[5px] text-[rgba(255,255,255,.5)]">｜</span>
-        <span class="mr-[5px] text-[14px]"
-          >{{ t('decorating') }}：{{ diyStore.typeName }}</span
-        >
-        <!--<el-icon class="font-bold"><EditPen /></el-icon>-->
-      </div>
-
-      <div
-        v-if="diyStore.type && diyStore.type != 'DIY_PAGE'"
-        class="flex items-center"
-      >
-        <span class="text-white mr-[10px] text-base">{{
-          t('templatePagePlaceholder')
-        }}</span>
-        <div class="w-[180px]">
-          <el-select
-            size="small"
-            v-model="template"
-            :placeholder="t('templatePagePlaceholder')"
-            @change="changeTemplatePage"
-          >
-            <el-option :label="t('templatePageEmpty')" value="" />
-            <el-option
-              v-for="(item, key) in templatePages"
-              :label="item.title"
-              :value="key"
-              :key="key"
-            />
-          </el-select>
-        </div>
-      </div>
-      <div class="flex-1"></div>
-      <el-button @click="preview()">{{ t('preview') }}</el-button>
-      <el-button @click="save()">{{ t('save') }}</el-button>
-    </el-header>
-
-    <div class="full-container flex flex-row flex-1 bg-page">
-      <div class="component-list w-[290px]">
-        <!-- 组件列表区域 -->
-        <el-scrollbar class="px-[10px]">
-          <el-collapse v-model="activeNames" @change="handleChange">
-            <el-collapse-item
-              v-for="(item, key) in component"
-              :key="key"
-              :title="item.title"
-              :name="key"
-            >
-              <ul class="flex flex-row flex-wrap">
-                <li
-                  v-for="(compItem, compKey) in item.list"
-                  :key="compKey"
-                  class="w-2/6 text-center cursor-pointer h-[65px]"
-                  :title="compItem.title"
-                  @click="diyStore.addComponent(compKey, compItem)"
-                >
-                  <icon
-                    v-if="compItem.icon"
-                    :name="compItem.icon"
-                    size="20px"
-                    class="inline-block mt-[3px]"
-                  />
-                  <icon
-                    v-else
-                    name="iconfont iconkaifazujian"
-                    size="20px"
-                    class="inline-block mt-[3px]"
-                  />
-                  <span class="block text-[12px] truncate">{{
-                    compItem.title
-                  }}</span>
-                </li>
-              </ul>
-            </el-collapse-item>
-          </el-collapse>
-        </el-scrollbar>
-      </div>
-
-      <div class="preview-wrap flex-1 relative mt-[20px]">
-        <el-scrollbar>
-          <el-button
-            class="page-btn absolute right-[20px]"
-            @click="diyStore.changeCurrentIndex(-99)"
-            >{{ t('pageSet') }}</el-button
-          >
-          <div class="diy-view-wrap w-[375px] shadow-lg mx-auto">
-            <div
-              class="preview-head bg-no-repeat bg-center bg-cover cursor-pointer h-[64px]"
-              :class="[diyStore.global.topStatusBar.style]"
-              :style="{ backgroundColor: diyStore.global.topStatusBar.bgColor }"
-              @click="diyStore.changeCurrentIndex(-99)"
-            >
-              <div
-                v-if="
-                  diyStore.global.topStatusBar.style == 'style-1' &&
-                  diyStore.global.topStatusBar.isShow
-                "
-                class="content-wrap"
-              >
-                <div
-                  class="title-wrap"
-                  :style="{
-                    fontSize: '14px',
-                    color: diyStore.global.topStatusBar.textColor,
-                    textAlign: diyStore.global.topStatusBar.textAlign,
-                  }"
-                >
-                  {{ diyStore.global.title }}
-                </div>
-              </div>
-              <div
-                v-if="
-                  diyStore.global.topStatusBar.style == 'style-2' &&
-                  diyStore.global.topStatusBar.isShow
-                "
-                class="content-wrap"
-              >
-                <div
-                  class="title-wrap"
-                  :style="{ color: diyStore.global.topStatusBar.textColor }"
-                >
-                  <div
-                    class="h-[28px] max-w-[150px] mr-[8px]"
-                    v-if="diyStore.global.topStatusBar.imgUrl"
-                  >
-                    <img
-                      class="max-w-[100%] max-h-[100%]"
-                      :src="img(diyStore.global.topStatusBar.imgUrl)"
-                      mode="heightFix"
-                    />
-                  </div>
-                  <div
-                    :style="{ color: diyStore.global.topStatusBar.textColor }"
-                  >
-                    {{ diyStore.global.title }}
-                  </div>
-                </div>
-              </div>
-              <div
-                v-if="
-                  diyStore.global.topStatusBar.style == 'style-3' &&
-                  diyStore.global.topStatusBar.isShow
-                "
-                class="content-wrap"
-              >
-                <div
-                  class="title-wrap"
-                  v-if="diyStore.global.topStatusBar.imgUrl"
-                >
-                  <img
-                    class="max-w-[100%] max-h-[100%]"
-                    :src="img(diyStore.global.topStatusBar.imgUrl)"
-                  />
-                </div>
-                <div class="search">
-                  <span
-                    class="nc-iconfont nc-icon-sousuo-duanV6xx1 !text-[12px] absolute left-[10px]"
-                  ></span>
-                  <span class="text-[12px]">{{
-                    diyStore.global.topStatusBar.inputPlaceholder
-                  }}</span>
-                </div>
-              </div>
-              <div
-                v-if="
-                  diyStore.global.topStatusBar.style == 'style-4' &&
-                  diyStore.global.topStatusBar.isShow
-                "
-                class="content-wrap"
-              >
-                <span
-                  class="iconfont iconxiazai19 !text-[14px]"
-                  :style="{ color: diyStore.global.topStatusBar.textColor }"
-                ></span>
-                <div
-                  class="title-wrap"
-                  :style="{ color: diyStore.global.topStatusBar.textColor }"
-                >
-                  我的位置
-                </div>
-                <span
-                  class="iconfont iconxiangyoujiantou !text-[12px]"
-                  :style="{ color: diyStore.global.topStatusBar.textColor }"
-                ></span>
-              </div>
+    <div class="main-container flex-1">
+        <el-header class="flex items-center h-[60px] bg-primary px-[20px]">
+            <div class="text-white cursor-pointer flex items-center" @click="goBack">
+                <el-icon size="14">
+                    <ArrowLeft />
+                </el-icon>
+                <span class="pl-[5px] text-[14px]">{{ t('back') }}</span>
             </div>
-            <div class="preview-block relative">
-              <ul
-                class="quick-action absolute text-center -right-[70px] top-[20px] w-[42px] rounded shadow-md"
-              >
-                <el-tooltip
-                  effect="light"
-                  :content="t('moveUpComponent')"
-                  placement="right"
-                >
-                  <icon
-                    name="iconfont iconjiantoushang"
-                    size="20px"
-                    class="block cursor-pointer leading-[40px]"
-                    @click="diyStore.moveUpComponent"
-                  />
-                </el-tooltip>
-                <el-tooltip
-                  effect="light"
-                  :content="t('moveDownComponent')"
-                  placement="right"
-                >
-                  <icon
-                    name="iconfont iconjiantouxia"
-                    size="20px"
-                    class="block cursor-pointer leading-[40px]"
-                    @click="diyStore.moveDownComponent"
-                  />
-                </el-tooltip>
-                <el-tooltip
-                  effect="light"
-                  :content="t('copyComponent')"
-                  placement="right"
-                >
-                  <icon
-                    name="iconfont iconcopy-line"
-                    size="20px"
-                    class="block cursor-pointer leading-[40px]"
-                    @click="diyStore.copyComponent"
-                  />
-                </el-tooltip>
-                <el-tooltip
-                  effect="light"
-                  :content="t('delComponent')"
-                  placement="right"
-                >
-                  <icon
-                    name="iconfont icondelete-line"
-                    size="20px"
-                    class="block cursor-pointer leading-[40px]"
-                    @click="diyStore.delComponent"
-                  />
-                </el-tooltip>
-                <el-tooltip
-                  effect="light"
-                  :content="t('resetComponent')"
-                  placement="right"
-                >
-                  <icon
-                    name="iconfont iconloader-line"
-                    size="20px"
-                    class="block cursor-pointer leading-[40px]"
-                    @click="diyStore.resetComponent"
-                  />
-                </el-tooltip>
-              </ul>
-
-              <!-- 组件预览渲染区域 -->
-              <iframe
-                id="previewIframe"
-                v-show="loadingIframe"
-                :src="wapPreview"
-                frameborder="0"
-                class="preview-iframe w-[375px]"
-              ></iframe>
-
-              <div
-                v-show="loadingDev"
-                class="preview-iframe w-[375px] pt-[20px] px-[20px]"
-              >
-                <div class="font-bold text-xl mb-[40px]">
-                  {{ t('developTitle') }}
-                </div>
-                <div class="mb-[20px] flex flex-col">
-                  <text class="mb-[10px]">{{ t('wapDomain') }}</text>
-                  <el-input
-                    v-model.trim="wapDomain"
-                    :placeholder="t('wapDomainPlaceholder')"
-                    clearable
-                  />
-                </div>
-                <el-button type="primary" @click="saveWapDomain">{{
-                  t('confirm')
-                }}</el-button>
-                <el-button type="primary" @click="settingTips()" plain>{{
-                  t('settingTips')
-                }}</el-button>
-              </div>
+            <div class="text-white ml-[10px] mr-[20px] flex items-center">
+                <span class="mr-[5px] text-[rgba(255,255,255,.5)]">｜</span>
+                <span class="mr-[5px] text-[14px]">{{ t('decorating') }}：{{ diyStore.typeName }}</span>
+                <!--<el-icon class="font-bold"><EditPen /></el-icon>-->
             </div>
-          </div>
-        </el-scrollbar>
-      </div>
-
-      <div class="edit-attribute-wrap w-[400px]">
-        <!-- 编辑组件属性区域 -->
-        <el-scrollbar>
-          <el-card class="box-card" shadow="never">
-            <template #header>
-              <div class="card-header flex justify-between items-center">
-                <span class="title flex-1">{{
-                  diyStore.currentIndex == -99
-                    ? t('pageSet')
-                    : diyStore.editComponent.componentTitle
-                }}</span>
-                <div
-                  class="tab-wrap flex rounded-[50px] bg-gray-100 text-[14px]"
-                  v-if="diyStore.currentComponent"
-                >
-                  <span
-                    class="cursor-pointer rounded-[50px] py-[5px] px-[15px]"
-                    :class="{
-                      'bg-primary text-white': diyStore.editTab == 'content',
-                    }"
-                    @click="diyStore.editTab = 'content'"
-                    >{{ t('tabEditContent') }}</span
-                  >
-                  <span
-                    class="cursor-pointer rounded-[50px] py-[5px] px-[15px]"
-                    :class="{
-                      'bg-primary text-white': diyStore.editTab == 'style',
-                    }"
-                    @click="diyStore.editTab = 'style'"
-                    >{{ t('tabEditStyle') }}</span
-                  >
+
+            <div v-if="diyStore.type && diyStore.type != 'DIY_PAGE'" class="flex items-center">
+                <span class="text-white mr-[10px] text-base">{{ t('templatePagePlaceholder') }}</span>
+                <div class="w-[180px]">
+                    <el-select size="small" v-model="template" :placeholder="t('templatePagePlaceholder')" @change="changeTemplatePage">
+                        <el-option :label="t('templatePageEmpty')" value="" />
+                        <el-option v-for="(item, key) in templatePages" :label="item.title" :value="key" :key="key"/>
+                    </el-select>
                 </div>
-              </div>
-            </template>
-
-            <div class="edit-component-wrap">
-              <component
-                v-if="diyStore.currentComponent"
-                :is="modules[diyStore.currentComponent]"
-                :value="diyStore.value[diyStore.currentIndex]"
-              >
-                <template #style>
-                  <div class="edit-attr-item-wrap">
-                    <h3 class="mb-[10px]">{{ t('componentStyleTitle') }}</h3>
-                    <el-form label-width="90px" class="px-[10px]">
-                      <template
-                        v-if="
-                          diyStore.editComponent.ignore.indexOf(
-                            'pageBgColor'
-                          ) == -1
-                        "
-                      >
-                        <el-form-item :label="t('bottomBgColor')">
-                          <el-color-picker
-                            v-model="diyStore.editComponent.pageStartBgColor"
-                            show-alpha
-                            :predefine="diyStore.predefineColors"
-                          />
-                          <icon
-                            name="iconfont iconmap-connect"
-                            size="20px"
-                            class="block !text-gray-400 mx-[5px]"
-                          />
-                          <el-color-picker
-                            v-model="diyStore.editComponent.pageEndBgColor"
-                            show-alpha
-                            :predefine="diyStore.predefineColors"
-                          />
-                        </el-form-item>
-                        <div class="text-sm text-gray-400 ml-[90px] mb-[10px]">
-                          {{ t('bottomBgTips') }}
+            </div>
+            <div class="flex-1"></div>
+            <el-button @click="preview()">{{ t('preview') }}</el-button>
+            <el-button @click="save()">{{ t('save') }}</el-button>
+        </el-header>
+
+        <div class="full-container flex flex-row flex-1 bg-page">
+
+            <div class="component-list w-[290px]">
+
+                <!-- 组件列表区域 -->
+                <el-scrollbar class="px-[10px]">
+                    <el-collapse v-model="activeNames" @change="handleChange">
+                        <el-collapse-item v-for="(item, key) in component" :key="key" :title="item.title" :name="key">
+                            <ul class="flex flex-row flex-wrap">
+                                <li v-for="(compItem, compKey) in item.list" :key="compKey" class="w-2/6 text-center cursor-pointer h-[65px]" :title="compItem.title" @click="diyStore.addComponent(compKey, compItem)">
+                                    <icon v-if="compItem.icon" :name="compItem.icon" size="20px" class="inline-block mt-[3px]" />
+                                    <icon v-else name="iconfont iconkaifazujian" size="20px" class="inline-block mt-[3px]" />
+                                    <span class="block text-[12px] truncate">{{ compItem.title }}</span>
+                                </li>
+                            </ul>
+                        </el-collapse-item>
+                    </el-collapse>
+                </el-scrollbar>
+
+            </div>
+
+            <div class="preview-wrap flex-1 relative mt-[20px]">
+
+                <el-scrollbar>
+                    <el-button class="page-btn absolute right-[20px]" @click="diyStore.changeCurrentIndex(-99)">{{ t('pageSet') }}</el-button>
+                    <div class="diy-view-wrap w-[375px] shadow-lg mx-auto">
+                        <div class="preview-head bg-no-repeat bg-center bg-cover cursor-pointer h-[64px]" :class="[diyStore.global.topStatusBar.style]" :style="{backgroundColor :diyStore.global.topStatusBar.bgColor}" @click="diyStore.changeCurrentIndex(-99)">
+                            <div v-if="diyStore.global.topStatusBar.style == 'style-1' && diyStore.global.topStatusBar.isShow" class="content-wrap">
+                                <div class="title-wrap" :style="{ fontSize: '14px', color: diyStore.global.topStatusBar.textColor, textAlign: diyStore.global.topStatusBar.textAlign }">
+                                    {{ diyStore.global.title }}
+                                </div>
+                            </div>
+                            <div v-if="diyStore.global.topStatusBar.style == 'style-2' && diyStore.global.topStatusBar.isShow" class="content-wrap">
+                                <div class="title-wrap" :style="{ color: diyStore.global.topStatusBar.textColor }">
+                                    <div class="h-[28px] max-w-[150px] mr-[8px]" v-if="diyStore.global.topStatusBar.imgUrl">
+                                        <img class="max-w-[100%] max-h-[100%]" :src="img(diyStore.global.topStatusBar.imgUrl)" mode="heightFix" />
+                                    </div>
+                                    <div :style="{ color: diyStore.global.topStatusBar.textColor }">{{ diyStore.global.title }}</div>
+                                </div>
+                            </div>
+                            <div v-if="diyStore.global.topStatusBar.style == 'style-3' && diyStore.global.topStatusBar.isShow" class="content-wrap">
+                                <div class="title-wrap" v-if="diyStore.global.topStatusBar.imgUrl">
+                                    <img class="max-w-[100%] max-h-[100%]" :src="img(diyStore.global.topStatusBar.imgUrl)" />
+                                </div>
+                                <div class="search">
+                                    <span class="nc-iconfont nc-icon-sousuo-duanV6xx1 !text-[12px] absolute left-[10px]"></span>
+                                    <span class="text-[12px]">{{diyStore.global.topStatusBar.inputPlaceholder}}</span>
+                                </div>
+                            </div>
+                            <div v-if="diyStore.global.topStatusBar.style == 'style-4' && diyStore.global.topStatusBar.isShow" class="content-wrap">
+                                <span class="iconfont iconxiazai19 !text-[14px]" :style="{ color: diyStore.global.topStatusBar.textColor }"></span>
+                                <div class="title-wrap" :style="{ color: diyStore.global.topStatusBar.textColor }">我的位置</div>
+                                <span class="iconfont iconxiangyoujiantou !text-[12px]" :style="{ color: diyStore.global.topStatusBar.textColor }"></span>
+                            </div>
+                        </div>
+                        <div class="preview-block relative">
+
+                            <ul class="quick-action absolute text-center -right-[70px] top-[20px] w-[42px] rounded shadow-md">
+                                <el-tooltip effect="light" :content="t('moveUpComponent')" placement="right">
+                                    <icon name="iconfont iconjiantoushang" size="20px" class="block cursor-pointer leading-[40px]" @click="diyStore.moveUpComponent" />
+                                </el-tooltip>
+                                <el-tooltip effect="light" :content="t('moveDownComponent')" placement="right">
+                                    <icon name="iconfont iconjiantouxia" size="20px" class="block cursor-pointer leading-[40px]" @click="diyStore.moveDownComponent" />
+                                </el-tooltip>
+                                <el-tooltip effect="light" :content="t('copyComponent')" placement="right">
+                                    <icon name="iconfont iconcopy-line" size="20px" class="block cursor-pointer leading-[40px]" @click="diyStore.copyComponent" />
+                                </el-tooltip>
+                                <el-tooltip effect="light" :content="t('delComponent')" placement="right">
+                                    <icon name="iconfont icondelete-line" size="20px" class="block cursor-pointer leading-[40px]" @click="diyStore.delComponent" />
+                                </el-tooltip>
+                                <el-tooltip effect="light" :content="t('resetComponent')" placement="right">
+                                    <icon name="iconfont iconloader-line" size="20px" class="block cursor-pointer leading-[40px]" @click="diyStore.resetComponent" />
+                                </el-tooltip>
+                            </ul>
+
+                            <!-- 组件预览渲染区域 -->
+                            <iframe id="previewIframe" v-show="loadingIframe" :src="wapPreview" frameborder="0" class="preview-iframe w-[375px]"></iframe>
+
+                            <div v-show="loadingDev" class="preview-iframe w-[375px] pt-[20px] px-[20px]">
+                                <div class="font-bold text-xl mb-[40px]">{{ t('developTitle') }}</div>
+                                <div class="mb-[20px] flex flex-col">
+                                    <text class="mb-[10px]">{{ t('wapDomain') }}</text>
+                                    <el-input v-model.trim="wapDomain" :placeholder="t('wapDomainPlaceholder')" clearable />
+                                </div>
+                                <el-button type="primary" @click="saveWapDomain">{{ t('confirm') }}</el-button>
+                                <el-button type="primary" @click="settingTips()" plain>{{ t('settingTips') }}</el-button>
+                            </div>
+
                         </div>
-                      </template>
-
-                      <el-form-item
-                        :label="t('bgGradientAngle')"
-                        v-if="
-                          diyStore.editComponent.ignore.indexOf(
-                            'pageBgColor'
-                          ) == -1
-                        "
-                      >
-                        <el-radio-group
-                          v-model="diyStore.editComponent.pageGradientAngle"
-                        >
-                          <el-radio label="to bottom">{{
-                            t('topToBottom')
-                          }}</el-radio>
-                          <el-radio label="to right">{{
-                            t('leftToRight')
-                          }}</el-radio>
-                        </el-radio-group>
-                      </el-form-item>
-
-                      <el-form-item
-                        :label="t('componentBgUrl')"
-                        v-if="
-                          diyStore.editComponent.ignore.indexOf(
-                            'componentBgUrl'
-                          ) == -1
-                        "
-                      >
-                        <upload-image
-                          v-model="diyStore.editComponent.componentBgUrl"
-                          :limit="1"
-                        />
-                      </el-form-item>
-
-                      <el-form-item
-                        :label="t('componentBgAlpha')"
-                        v-if="
-                          diyStore.editComponent.ignore.indexOf(
-                            'componentBgUrl'
-                          ) == -1 && diyStore.editComponent.componentBgUrl
-                        "
-                      >
-                        <el-slider
-                          v-model="diyStore.editComponent.componentBgAlpha"
-                          show-input
-                          size="small"
-                          :min="0"
-                          :max="10"
-                          class="ml-[10px] diy-nav-slider"
-                        />
-                      </el-form-item>
-
-                      <el-form-item
-                        :label="t('componentBgColor')"
-                        v-if="
-                          diyStore.editComponent.ignore.indexOf(
-                            'componentBgColor'
-                          ) == -1
-                        "
-                      >
-                        <el-color-picker
-                          v-model="diyStore.editComponent.componentStartBgColor"
-                          show-alpha
-                          :predefine="diyStore.predefineColors"
-                        />
-                        <icon
-                          name="iconfont iconmap-connect"
-                          size="20px"
-                          class="block !text-gray-400 mx-[5px]"
-                        />
-                        <el-color-picker
-                          v-model="diyStore.editComponent.componentEndBgColor"
-                          show-alpha
-                          :predefine="diyStore.predefineColors"
-                        />
-                      </el-form-item>
-
-                      <el-form-item
-                        :label="t('bgGradientAngle')"
-                        v-if="
-                          diyStore.editComponent.ignore.indexOf(
-                            'componentBgColor'
-                          ) == -1
-                        "
-                      >
-                        <el-radio-group
-                          v-model="
-                            diyStore.editComponent.componentGradientAngle
-                          "
-                        >
-                          <el-radio label="to bottom">{{
-                            t('topToBottom')
-                          }}</el-radio>
-                          <el-radio label="to right">{{
-                            t('leftToRight')
-                          }}</el-radio>
-                        </el-radio-group>
-                      </el-form-item>
-
-                      <el-form-item
-                        :label="t('marginTop')"
-                        v-if="
-                          diyStore.editComponent.ignore.indexOf('marginTop') ==
-                          -1
-                        "
-                      >
-                        <el-slider
-                          v-model="diyStore.editComponent.margin.top"
-                          show-input
-                          size="small"
-                          :min="-100"
-                          class="ml-[10px] diy-nav-slider"
-                        />
-                      </el-form-item>
-                      <el-form-item
-                        :label="t('marginBottom')"
-                        v-if="
-                          diyStore.editComponent.ignore.indexOf(
-                            'marginBottom'
-                          ) == -1
-                        "
-                      >
-                        <el-slider
-                          v-model="diyStore.editComponent.margin.bottom"
-                          show-input
-                          size="small"
-                          class="ml-[10px] diy-nav-slider"
-                        />
-                      </el-form-item>
-                      <el-form-item
-                        :label="t('marginBoth')"
-                        v-if="
-                          diyStore.editComponent.ignore.indexOf('marginBoth') ==
-                          -1
-                        "
-                      >
-                        <el-slider
-                          v-model="diyStore.editComponent.margin.both"
-                          show-input
-                          size="small"
-                          class="ml-[10px] diy-nav-slider"
-                        />
-                      </el-form-item>
-                      <el-form-item
-                        :label="t('topRounded')"
-                        v-if="
-                          diyStore.editComponent.ignore.indexOf('topRounded') ==
-                          -1
-                        "
-                      >
-                        <el-slider
-                          v-model="diyStore.editComponent.topRounded"
-                          show-input
-                          size="small"
-                          class="ml-[10px] diy-nav-slider"
-                          :max="100"
-                        />
-                      </el-form-item>
-                      <el-form-item
-                        :label="t('bottomRounded')"
-                        v-if="
-                          diyStore.editComponent.ignore.indexOf(
-                            'bottomRounded'
-                          ) == -1
-                        "
-                      >
-                        <el-slider
-                          v-model="diyStore.editComponent.bottomRounded"
-                          show-input
-                          size="small"
-                          class="ml-[10px] diy-nav-slider"
-                          :max="100"
-                        />
-                      </el-form-item>
-                    </el-form>
-                  </div>
-                </template>
-              </component>
+                    </div>
+                </el-scrollbar>
+
+            </div>
+
+            <div class="edit-attribute-wrap w-[400px]">
+
+                <!-- 编辑组件属性区域 -->
+                <el-scrollbar>
+                    <el-card class="box-card" shadow="never">
+                        <template #header>
+                            <div class="card-header flex justify-between items-center">
+                                <span class="title flex-1">{{ diyStore.currentIndex == -99 ? t('pageSet') : diyStore.editComponent.componentTitle }}</span>
+                                <div class="tab-wrap flex rounded-[50px] bg-gray-100 text-[14px]" v-if="diyStore.currentComponent">
+                                    <span class="cursor-pointer rounded-[50px] py-[5px] px-[15px]" :class="{ 'bg-primary text-white': diyStore.editTab == 'content' }" @click="diyStore.editTab = 'content'">{{ t('tabEditContent') }}</span>
+                                    <span class="cursor-pointer rounded-[50px] py-[5px] px-[15px]" :class="{ 'bg-primary text-white': diyStore.editTab == 'style' }" @click="diyStore.editTab = 'style'">{{ t('tabEditStyle') }}</span>
+                                </div>
+                            </div>
+                        </template>
+
+                        <div class="edit-component-wrap">
+
+                            <component v-if="diyStore.currentComponent" :is="modules[diyStore.currentComponent]" :value="diyStore.value[diyStore.currentIndex]">
+                                <template #style>
+                                    <div class="edit-attr-item-wrap">
+                                        <h3 class="mb-[10px]">{{ t('componentStyleTitle') }}</h3>
+                                        <el-form label-width="90px" class="px-[10px]">
+
+                                            <template v-if="diyStore.editComponent.ignore.indexOf('pageBgColor') == -1">
+                                                <el-form-item :label="t('bottomBgColor')">
+                                                    <el-color-picker v-model="diyStore.editComponent.pageStartBgColor" show-alpha :predefine="diyStore.predefineColors" />
+                                                    <icon name="iconfont iconmap-connect" size="20px" class="block !text-gray-400 mx-[5px]"/>
+                                                    <el-color-picker v-model="diyStore.editComponent.pageEndBgColor" show-alpha :predefine="diyStore.predefineColors" />
+                                                </el-form-item>
+                                                <div class="text-sm text-gray-400 ml-[90px] mb-[10px]">{{ t('bottomBgTips') }}</div>
+                                            </template>
+
+                                            <el-form-item :label="t('bgGradientAngle')" v-if="diyStore.editComponent.ignore.indexOf('pageBgColor') == -1">
+                                                <el-radio-group v-model="diyStore.editComponent.pageGradientAngle">
+                                                    <el-radio label="to bottom">{{ t('topToBottom') }}</el-radio>
+                                                    <el-radio label="to right">{{ t('leftToRight') }}</el-radio>
+                                                </el-radio-group>
+                                            </el-form-item>
+
+                                            <el-form-item :label="t('componentBgUrl')" v-if="diyStore.editComponent.ignore.indexOf('componentBgUrl') == -1">
+                                                <upload-image v-model="diyStore.editComponent.componentBgUrl" :limit="1"/>
+                                            </el-form-item>
+
+                                            <el-form-item :label="t('componentBgAlpha')" v-if="diyStore.editComponent.ignore.indexOf('componentBgUrl') == -1 && diyStore.editComponent.componentBgUrl">
+                                                <el-slider v-model="diyStore.editComponent.componentBgAlpha" show-input size="small" :min="0" :max="10" class="ml-[10px] diy-nav-slider" />
+                                            </el-form-item>
+
+                                            <el-form-item :label="t('componentBgColor')" v-if="diyStore.editComponent.ignore.indexOf('componentBgColor') == -1">
+                                                <el-color-picker v-model="diyStore.editComponent.componentStartBgColor" show-alpha :predefine="diyStore.predefineColors" />
+                                                <icon name="iconfont iconmap-connect" size="20px" class="block !text-gray-400 mx-[5px]"/>
+                                                <el-color-picker v-model="diyStore.editComponent.componentEndBgColor" show-alpha :predefine="diyStore.predefineColors" />
+                                            </el-form-item>
+
+                                            <el-form-item :label="t('bgGradientAngle')" v-if="diyStore.editComponent.ignore.indexOf('componentBgColor') == -1">
+                                                <el-radio-group v-model="diyStore.editComponent.componentGradientAngle">
+                                                    <el-radio label="to bottom">{{ t('topToBottom') }}</el-radio>
+                                                    <el-radio label="to right">{{ t('leftToRight') }}</el-radio>
+                                                </el-radio-group>
+                                            </el-form-item>
+
+                                            <el-form-item :label="t('marginTop')" v-if="diyStore.editComponent.ignore.indexOf('marginTop') == -1">
+                                                <el-slider v-model="diyStore.editComponent.margin.top" show-input size="small" :min="-100" class="ml-[10px] diy-nav-slider" />
+                                            </el-form-item>
+                                            <el-form-item :label="t('marginBottom')" v-if="diyStore.editComponent.ignore.indexOf('marginBottom') == -1">
+                                                <el-slider v-model="diyStore.editComponent.margin.bottom" show-input size="small" class="ml-[10px] diy-nav-slider" />
+                                            </el-form-item>
+                                            <el-form-item :label="t('marginBoth')" v-if="diyStore.editComponent.ignore.indexOf('marginBoth') == -1">
+                                                <el-slider v-model="diyStore.editComponent.margin.both" show-input size="small" class="ml-[10px] diy-nav-slider" />
+                                            </el-form-item>
+                                            <el-form-item :label="t('topRounded')" v-if="diyStore.editComponent.ignore.indexOf('topRounded') == -1">
+                                                <el-slider v-model="diyStore.editComponent.topRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="100" />
+                                            </el-form-item>
+                                            <el-form-item :label="t('bottomRounded')" v-if="diyStore.editComponent.ignore.indexOf('bottomRounded') == -1">
+                                                <el-slider v-model="diyStore.editComponent.bottomRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="100" />
+                                            </el-form-item>
+                                        </el-form>
+                                    </div>
+                                </template>
+                            </component>
+
+                        </div>
+
+                    </el-card>
+                </el-scrollbar>
+
             </div>
-          </el-card>
-        </el-scrollbar>
-      </div>
+
+        </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
 import { ref, reactive, toRaw, watch, inject } from 'vue'
 import { t } from '@/lang'
 import { img } from '@/utils/common'
-import {
-  getDiyTemplatePages,
-  addDiyPage,
-  editDiyPage,
-  initPage,
-} from '@/app/api/diy'
+import { getDiyTemplatePages, addDiyPage, editDiyPage, initPage } from '@/app/api/diy'
 import { useRoute, useRouter } from 'vue-router'
 import { cloneDeep } from 'lodash-es'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -586,8 +238,8 @@ route.query.title = route.query.title || ''
 route.query.back = route.query.back || '/admin/diy/list'
 
 const backPath = route.query.back
-const template = ref('')
-const oldTemplate = ref('')
+const template = ref('');
+const oldTemplate = ref('');
 const wapUrl = ref('')
 const wapDomain = ref('')
 const wapPreview = ref('')
@@ -602,582 +254,577 @@ const componentType: string[] = reactive([])
 const page = ref('')
 
 const activeNames = ref(componentType)
-const handleChange = (val: string[]) => {}
+const handleChange = (val: string[]) => {
+}
 
 // 初始化原数据
 const originData = reactive({
-  id: diyStore.id,
-  name: diyStore.name,
-  pageTitle: diyStore.pageTitle,
-  title: diyStore.global.title,
-  value: JSON.stringify({
-    global: toRaw(diyStore.global),
-    value: toRaw(diyStore.value),
-  }),
+    id: diyStore.id,
+    name: diyStore.name,
+    pageTitle: diyStore.pageTitle,
+    title: diyStore.global.title,
+    value: JSON.stringify({
+        global: toRaw(diyStore.global),
+        value: toRaw(diyStore.value)
+    })
 })
 
 // 返回上一页
 const isChange = ref(true) // 数据是否发生变化，true：没变化，false：变化了
 const goBack = () => {
-  if (isChange.value) {
-    location.href = `${location.origin}${backPath}`
-    router.push(backPath)
-  } else {
-    // 数据发生变化，弹框提示：确定离开此页面
-    ElMessageBox.confirm(t('leavePageTitleTips'), t('leavePageContentTips'), {
-      confirmButtonText: t('confirm'),
-      cancelButtonText: t('cancel'),
-      type: 'warning',
-      autofocus: false,
-    })
-      .then(() => {
-        location.href = `${location.origin}${backPath}`
-      })
-      .catch(() => {})
-  }
+    if (isChange.value) {
+        location.href = `${location.origin}${backPath}`;
+        router.push(backPath)
+    } else {
+        // 数据发生变化，弹框提示：确定离开此页面
+        ElMessageBox.confirm(
+            t('leavePageTitleTips'),
+            t('leavePageContentTips'),
+            {
+                confirmButtonText: t('confirm'),
+                cancelButtonText: t('cancel'),
+                type: 'warning',
+                autofocus: false
+            }
+        ).then(() => {
+            location.href = `${location.origin}${backPath}`;
+        }).catch(() => {
+        })
+    }
 }
 
 // 动态加载后台自定义组件编辑
 const modulesFiles = import.meta.glob('./components/*.vue', { eager: true })
-const addonModulesFiles = import.meta.glob(
-  '@/addon/**/views/diy/components/*.vue',
-  { eager: true }
-)
+const addonModulesFiles = import.meta.glob('@/addon/**/views/diy/components/*.vue', { eager: true })
 addonModulesFiles && Object.assign(modulesFiles, addonModulesFiles)
 
 const modules = {}
 for (const [key, value] of Object.entries(modulesFiles)) {
-  const moduleName = key.split('/').pop()
-  const name = moduleName.split('.')[0]
-  modules[name] = value.default
+    const moduleName = key.split('/').pop()
+    const name = moduleName.split('.')[0]
+    modules[name] = value.default
 }
 
 // 获取模板页面列表
 const templatePages: any = reactive({})
 
-const loadDiyTemplatePages = (type: any) => {
-  getDiyTemplatePages({
-    type,
-    mode: 'diy',
-  }).then((res) => {
-    for (const key in res.data) {
-      templatePages[key] = res.data[key]
-    }
-  })
+const loadDiyTemplatePages = (type:any)=>{
+    getDiyTemplatePages({
+        type,
+        mode: 'diy'
+    }).then(res => {
+        for (const key in res.data) {
+            templatePages[key] = res.data[key];
+        }
+    });
 }
 
 // 全局监听自定义数据变化
 watch(
-  () => template.value,
-  (newValue, oldValue) => {
-    oldTemplate.value = oldValue
-  }
+    () => template.value,
+    (newValue, oldValue) => {
+        oldTemplate.value = oldValue;
+    }
 )
 
 // 切换模板页面
-const changeTemplatePage = (value: any) => {
-  // 存在数据则弹框提示确认
-  if (diyStore.value.length) {
-    ElMessageBox.confirm(t('changeTemplatePageTips'), t('warning'), {
-      confirmButtonText: t('confirm'),
-      cancelButtonText: t('cancel'),
-      type: 'warning',
-    })
-      .then(() => {
-        diyStore.changeCurrentIndex(-99)
-        diyStore.init() // 清空
+const changeTemplatePage = (value:any)=> {
+    // 存在数据则弹框提示确认
+    if (diyStore.value.length) {
+        ElMessageBox.confirm(t('changeTemplatePageTips'), t('warning'), {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }).then(() => {
+            diyStore.changeCurrentIndex(-99)
+            diyStore.init(); // 清空
+            if (value) {
+                let data = cloneDeep(templatePages[value].data);
+                diyStore.global = data.global;
+                if (data.value.length) {
+                    diyStore.value = data.value
+                }
+            } else {
+                if (route.query.title) diyStore.global.title = diyStore.typeName
+            }
+        }).catch(() => {
+            // 还原
+            template.value = oldTemplate.value;
+        });
+    } else {
+        diyStore.init(); // 清空
         if (value) {
-          let data = cloneDeep(templatePages[value].data)
-          diyStore.global = data.global
-          if (data.value.length) {
-            diyStore.value = data.value
-          }
+            let data = cloneDeep(templatePages[value].data);
+            diyStore.global = data.global;
+            if (data.value.length) {
+                diyStore.value = data.value
+            }
         } else {
-          if (route.query.title) diyStore.global.title = diyStore.typeName
+            if (route.query.title) diyStore.global.title = diyStore.typeName
         }
-      })
-      .catch(() => {
-        // 还原
-        template.value = oldTemplate.value
-      })
-  } else {
-    diyStore.init() // 清空
-    if (value) {
-      let data = cloneDeep(templatePages[value].data)
-      diyStore.global = data.global
-      if (data.value.length) {
-        diyStore.value = data.value
-      }
-    } else {
-      if (route.query.title) diyStore.global.title = diyStore.typeName
     }
-  }
-}
+};
 
 // 全局监听自定义数据变化
 watch(
-  () => diyStore,
-  (newValue, oldValue) => {
-    const data = {
-      id: newValue.id,
-      name: newValue.name,
-      pageTitle: newValue.pageTitle,
-      title: newValue.global.title,
-      value: JSON.stringify({
-        global: toRaw(newValue.global),
-        value: toRaw(newValue.value),
-      }),
-    }
+    () => diyStore,
+    (newValue, oldValue) => {
+        const data = {
+            id: newValue.id,
+            name: newValue.name,
+            pageTitle: newValue.pageTitle,
+            title: newValue.global.title,
+            value: JSON.stringify({
+                global: toRaw(newValue.global),
+                value: toRaw(newValue.value)
+            })
+        }
 
-    diyStore.postMessage()
-    isChange.value = JSON.stringify(data) == JSON.stringify(originData)
-  },
-  { deep: true }
+        diyStore.postMessage()
+        isChange.value = JSON.stringify(data) == JSON.stringify(originData)
+    },
+    { deep: true }
 )
 
 // 根据当前页面路由查询页面初始化数据
 initPage({
-  id: route.query.id,
-  name: route.query.name,
-  url: route.query.url,
-  type: route.query.type,
-  title: route.query.title,
+    id: route.query.id,
+    name: route.query.name,
+    url: route.query.url,
+    type: route.query.type,
+    title: route.query.title
 }).then(async (res) => {
-  const data = res.data
-  diyStore.init() // 初始化清空数据
-  diyStore.id = data.id || 0
-  diyStore.name = data.name
-  diyStore.pageTitle = data.page_title
-  diyStore.type = data.type
-  diyStore.typeName = data.type_name
-  diyStore.templateName = data.template
-  template.value = data.template
-  diyStore.isDefault = data.is_default
-  diyStore.pageMode = data.mode
-  if (data.value) {
-    const sources = JSON.parse(data.value)
-    diyStore.global = sources.global
-    if (sources.value.length) {
-      diyStore.value = sources.value
-      // diyStore.changeCurrentIndex(0,diyStore.value[0]);
+    const data = res.data
+    diyStore.init() // 初始化清空数据
+    diyStore.id = data.id || 0
+    diyStore.name = data.name
+    diyStore.pageTitle = data.page_title
+    diyStore.type = data.type
+    diyStore.typeName = data.type_name
+    diyStore.templateName = data.template
+    template.value = data.template;
+    diyStore.isDefault = data.is_default
+    diyStore.pageMode = data.mode
+    if (data.value) {
+        const sources = JSON.parse(data.value)
+        diyStore.global = sources.global
+        if (sources.value.length) {
+            diyStore.value = sources.value
+            // diyStore.changeCurrentIndex(0,diyStore.value[0]);
+        }
+    } else {
+        diyStore.global.title = data.title
     }
-  } else {
-    diyStore.global.title = data.title
-  }
-
-  // 初始化原数据
-  originData.id = diyStore.id
-  originData.name = diyStore.name
-  originData.pageTitle = diyStore.pageTitle
-  originData.title = diyStore.global.title
-  originData.value = JSON.stringify({
-    global: toRaw(diyStore.global),
-    value: toRaw(diyStore.value),
-  })
-
-  component.value = data.component
-  for (const type in component.value) {
-    componentType.push(type)
-    for (const key in component.value[type].list) {
-      const com = cloneDeep(component.value[type].list[key])
-      com.id = diyStore.generateRandom()
-      com.componentName = key
-      com.componentTitle = com.title
-      Object.assign(com, com.value)
-      delete com.name
-      delete com.title
-      delete com.value
-      delete com.type
-      delete com.icon
-      diyStore.components.push(com)
+
+    // 初始化原数据
+    originData.id = diyStore.id
+    originData.name = diyStore.name
+    originData.pageTitle = diyStore.pageTitle
+    originData.title = diyStore.global.title
+    originData.value = JSON.stringify({
+        global: toRaw(diyStore.global),
+        value: toRaw(diyStore.value)
+    })
+
+    component.value = data.component
+    for (const type in component.value) {
+        componentType.push(type)
+        for (const key in component.value[type].list) {
+            const com = cloneDeep(component.value[type].list[key])
+            com.id = diyStore.generateRandom()
+            com.componentName = key
+            com.componentTitle = com.title
+            Object.assign(com, com.value)
+            delete com.name
+            delete com.title
+            delete com.value
+            delete com.type
+            delete com.icon
+            diyStore.components.push(com)
+        }
     }
-  }
 
-  loadDiyTemplatePages(data.type)
+    loadDiyTemplatePages(data.type);
+
+    // 加载预览
+    wapDomain.value = data.domain_url.wap_domain
+    wapUrl.value = data.domain_url.wap_url
+    page.value = data.page
 
-  // 加载预览
-  wapDomain.value = data.domain_url.wap_domain
-  wapUrl.value = data.domain_url.wap_url
-  page.value = data.page
+    let repeat = true; // 防重复执行
 
-  let repeat = true // 防重复执行
+    // 开发模式下执行
+    if (import.meta.env.MODE == 'development') {
 
-  // 开发模式下执行
-  if (import.meta.env.MODE == 'development') {
-    // env文件配置过wap域名
-    if (wapDomain.value) {
-      wapUrl.value = wapDomain.value + '/wap'
-      repeat = false
-      setDomain()
+        // env文件配置过wap域名
+        if (wapDomain.value) {
+            wapUrl.value = wapDomain.value + '/wap'
+            repeat = false
+            setDomain()
+        }
+
+        let wap_domain_storage = storage.get('wap_domain')
+        if (wap_domain_storage) {
+            wapUrl.value = wap_domain_storage
+            repeat = false
+            setDomain()
+        }
     }
 
-    let wap_domain_storage = storage.get('wap_domain')
-    if (wap_domain_storage) {
-      wapUrl.value = wap_domain_storage
-      repeat = false
-      setDomain()
+    if(repeat) {
+        setDomain()
     }
-  }
 
-  if (repeat) {
-    setDomain()
-  }
 })
 
 const uniAppLoadStatus = ref(false) // uni-app 加载状态，true：加载完成，false：未完成
 
 // 监听组件数据 uni-app端
-window.addEventListener(
-  'message',
-  (event) => {
+window.addEventListener('message', (event) => {
     try {
-      let data = {
-        type: '',
-      }
-      if (typeof event.data == 'string') {
-        data = JSON.parse(event.data)
-      } else if (typeof event.data == 'object') {
-        data = event.data
-      }
-      if (!data.type) return
-
-      switch (data.type) {
-        case 'appOnLaunch':
-        case 'appOnReady':
-          // uni-app 加载完成
-          loadingDev.value = false
-          loadingIframe.value = true
-          let loadTime = new Date().getTime()
-          difference.value = loadTime - timeIframe.value
-          uniAppLoadStatus.value = true // 加载完成
-          break
-        case 'init':
-          // 初始化，与uniapp建立连接传输数据
-          diyStore.load = true
-          diyStore.postMessage()
-          break
-        case 'change':
-          // 切换
-          diyStore.changeCurrentIndex(data.index, data.component)
-          break
-        case 'data':
-          // 传数据
-          diyStore.changeCurrentIndex(data.index, data.component)
-          diyStore.global = data.global
-          diyStore.value = data.value
-          break
-      }
+        let data = {
+            type: ''
+        };
+        if(typeof event.data == 'string') {
+            data = JSON.parse(event.data)
+        }else if(typeof event.data == 'object') {
+            data = event.data
+        }
+        if (!data.type) return
+
+        switch (data.type) {
+            case 'appOnLaunch':
+            case 'appOnReady':
+                // uni-app 加载完成
+                loadingDev.value = false
+                loadingIframe.value = true
+                let loadTime = new Date().getTime()
+                difference.value = loadTime - timeIframe.value
+                uniAppLoadStatus.value = true // 加载完成
+                break
+            case 'init':
+                // 初始化，与uniapp建立连接传输数据
+                diyStore.load = true
+                diyStore.postMessage()
+                break
+            case 'change':
+                // 切换
+                diyStore.changeCurrentIndex(data.index, data.component)
+                break
+            case 'data':
+                // 传数据
+                diyStore.changeCurrentIndex(data.index, data.component)
+                diyStore.global = data.global
+                diyStore.value = data.value
+                break
+        }
     } catch (e) {
-      console.log('diy edit 后台接受数据错误', e)
+        console.log('diy edit 后台接受数据错误', e)
     }
-  },
-  false
-)
+}, false)
 
 const saveWapDomain = () => {
-  if (wapDomain.value.trim().length == 0) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('wapDomainPlaceholder')}`,
-    })
-    return
-  }
-  wapUrl.value = wapDomain.value + '/wap'
-  setDomain()
-  storage.set({ key: 'wap_domain', data: wapUrl.value })
-  loadingIframe.value = true
-  loadingDev.value = false
+    if (wapDomain.value.trim().length == 0) {
+        ElMessage({
+            type: 'warning',
+            message: `${t('wapDomainPlaceholder')}`
+        })
+        return
+    }
+    wapUrl.value = wapDomain.value + '/wap'
+    setDomain()
+    storage.set({ key: 'wap_domain', data: wapUrl.value })
+    loadingIframe.value = true
+    loadingDev.value = false
 }
 
 const setDomain = () => {
-  wapPreview.value = `${wapUrl.value}${page.value}?mode=decorate` // 模式：decorate 装修 访问预览页面
-
-  const send = () => {
-    timeIframe.value = new Date().getTime()
-    postMessage()
-  }
-
-  // 同步发送一次消息
-  send()
-
-  // 如果同步发送消息的 uni-app没有接收到回应，则定时发送消息
-  let sendCount = 0
-  let timeInterVal = setInterval(() => {
-    // 接收 uni-app 发送的消息 或者 发送50次后未响应，则停止发送
-    if (uniAppLoadStatus.value || sendCount >= 50) {
-      clearInterval(timeInterVal)
-      return
+    wapPreview.value = `${wapUrl.value}${page.value}?mode=decorate` // 模式：decorate 装修 访问预览页面
+
+    const send = ()=>{
+        timeIframe.value = new Date().getTime()
+        postMessage()
     }
 
+    // 同步发送一次消息
     send()
-    sendCount++
-  }, 200)
 
-  // 如果10秒内加载不出来，则需要配置域名
-  setTimeout(() => {
-    if (difference.value == 0) initLoad()
-  }, 1000 * 10)
+    // 如果同步发送消息的 uni-app没有接收到回应，则定时发送消息
+    let sendCount = 0;
+    let timeInterVal = setInterval(()=>{
+        // 接收 uni-app 发送的消息 或者 发送50次后未响应，则停止发送
+        if(uniAppLoadStatus.value || sendCount >= 50){
+            clearInterval(timeInterVal)
+            return
+        }
+
+        send()
+        sendCount++;
+    },200)
+
+    // 如果10秒内加载不出来，则需要配置域名
+    setTimeout(() => {
+        if (difference.value == 0) initLoad()
+    }, 1000 * 10)
+
 }
 
 // 将数据发送到uniapp
 const postMessage = () => {
-  const data = JSON.stringify({
-    type: 'appOnReady',
-    message: '加载完成',
-  })
-  if (window.previewIframe)
-    window.previewIframe.contentWindow.postMessage(data, '*')
+    const data = JSON.stringify({
+        type: 'appOnReady',
+        message: '加载完成'
+    })
+    if (window.previewIframe) window.previewIframe.contentWindow.postMessage(data, '*')
 }
 
 // 初始化加载状态
 const initLoad = () => {
-  loadingDev.value = true
-  loadingIframe.value = false
-  wapPreview.value = ''
+    loadingDev.value = true
+    loadingIframe.value = false
+    wapPreview.value = ''
 }
 
 const isRepeat = ref(false)
 const save = (callback: any) => {
-  if (!diyStore.verify()) {
-    return
-  }
-
-  if (isRepeat.value) return
-  isRepeat.value = true
+    if (!diyStore.verify()) {
+        return
+    }
 
-  diyStore.templateName = template.value
+    if (isRepeat.value) return
+    isRepeat.value = true
+
+    diyStore.templateName = template.value;
+
+    let data = {
+        id: diyStore.id,
+        name: diyStore.name,
+        page_title: diyStore.pageTitle,
+        title: diyStore.global.title,
+        type: diyStore.type,
+        template: diyStore.templateName,
+        is_default: diyStore.isDefault,
+        is_change: isChange.value ? 0 : 1,
+        value: JSON.stringify({
+            global: toRaw(diyStore.global),
+            value: toRaw(diyStore.value)
+        })
+    }
 
-  let data = {
-    id: diyStore.id,
-    name: diyStore.name,
-    page_title: diyStore.pageTitle,
-    title: diyStore.global.title,
-    type: diyStore.type,
-    template: diyStore.templateName,
-    is_default: diyStore.isDefault,
-    is_change: isChange.value ? 0 : 1,
-    value: JSON.stringify({
-      global: toRaw(diyStore.global),
-      value: toRaw(diyStore.value),
-    }),
-  }
-
-  const api = diyStore.id ? editDiyPage : addDiyPage
-  api(data)
-    .then((res: any) => {
-      isRepeat.value = false
-      if (res.code == 1) {
-        if (diyStore.id) {
-          isRepeat.value = false // 不刷新
-        } else {
-          location.href = `${location.origin}${backPath}`
+    const api = diyStore.id ? editDiyPage : addDiyPage
+    api(data).then((res: any) => {
+        isRepeat.value = false
+        if (res.code == 1) {
+            if (diyStore.id) {
+                isRepeat.value = false // 不刷新
+            } else {
+                location.href = `${location.origin}${backPath}`;
+            }
+            if (callback) callback(res.data.id)
         }
-        if (callback) callback(res.data.id)
-      }
-    })
-    .catch(() => {
-      isRepeat.value = false
+    }).catch(() => {
+        isRepeat.value = false
     })
 }
 
 // 预览
 const preview = () => {
-  save((id: number) => {
-    id = diyStore.id || id
-    const url = router.resolve({
-      path: '/admin/preview/wap',
-      query: {
-        page: page.value + '?id=' + id,
-      },
+    save((id: number) => {
+        id = diyStore.id || id
+        const url = router.resolve({
+            path: '/admin/preview/wap',
+            query: {
+                page: page.value + '?id=' + id
+            }
+        })
+        window.open(url.href)
     })
-    window.open(url.href)
-  })
 }
 
 const settingTips = () => {
-  window.open('https://www.kancloud.cn/niucloud/niucloud-admin-develop/3213393')
+    window.open('https://www.kancloud.cn/niucloud/niucloud-admin-develop/3213393')
 }
 </script>
 
 <style lang="scss">
 .el-collapse-item__wrap {
-  border-bottom: none;
+    border-bottom: none;
 }
 
 .el-collapse-item__content {
-  padding-bottom: 0;
+    padding-bottom: 0;
 }
 
 .el-collapse-item__header {
-  font-size: var(--el-font-size-base);
+    font-size: var(--el-font-size-base);
 }
 
 .display-block {
-  .el-form-item__content {
-    display: block;
-  }
+    .el-form-item__content {
+        display: block;
+    }
 }
 
 .edit-component-wrap {
-  .content-wrap,
-  .style-wrap {
-    .edit-attr-item-wrap {
-      border-top: 2px solid var(--el-color-info-light-8);
-      padding-top: 20px;
-
-      &:first-of-type {
-        border-top: none;
-        padding-top: 0;
-      }
+    .content-wrap,
+    .style-wrap {
+        .edit-attr-item-wrap {
+            border-top: 2px solid var(--el-color-info-light-8);
+            padding-top: 20px;
+
+            &:first-of-type {
+                border-top: none;
+                padding-top: 0;
+            }
+        }
     }
-  }
 }
 .diy-nav-slider {
-  .el-slider__input {
-    width: 100px;
-  }
+    .el-slider__input {
+        width: 100px;
+    }
 }
 </style>
 <style lang="scss" scoped>
 .full-container {
-  height: calc(100vh - 60px);
+    height: calc(100vh - 60px);
 }
 
 .preview-iframe {
-  height: calc(100vh - 160px);
+    height: calc(100vh - 160px);
 }
 
 .component-list {
-  background: var(--el-bg-color);
+    background: var(--el-bg-color);
 }
 
 .component-list ul li {
-  &:not(.disabled):hover {
-    color: var(--el-color-primary);
-    background: var(--el-color-primary-light-9);
-  }
+    &:not(.disabled):hover {
+        color: var(--el-color-primary);
+        background: var(--el-color-primary-light-9);
+    }
 }
 
 .diy-view-wrap {
-  background: var(--el-bg-color-page);
+    background: var(--el-bg-color-page);
 }
 
 .diy-view-wrap .preview-head {
-  background-image: url(@/app/assets/images/diy_preview_head.png);
-  background-color: var(--el-bg-color);
+    background-image: url(@/app/assets/images/diy_preview_head.png);
+    background-color: var(--el-bg-color);
 }
 
 .quick-action {
-  background: var(--el-bg-color);
+    background: var(--el-bg-color);
 }
 
 .edit-attribute-wrap {
-  background: var(--el-bg-color);
+    background: var(--el-bg-color);
 }
 
 .edit-attribute-wrap .box-card {
-  border: none;
+    border: none;
 }
 
 .diy-view-wrap .preview-head {
-  padding: 28px 15px 0;
-
-  .content-wrap {
-    height: 30px;
-  }
+    padding: 28px 15px 0;
 
-  &.style-1 {
     .content-wrap {
-      .title-wrap {
         height: 30px;
-        line-height: 30px;
-      }
     }
-  }
 
-  &.style-2 {
-    .content-wrap {
-      .title-wrap {
-        display: flex;
-        align-items: center;
-
-        > div {
-          height: 30px;
-          line-height: 30px;
-          max-width: 150px;
-          font-size: 14px;
-
-          &:last-child {
-            overflow: hidden; //超出的文本隐藏
-            text-overflow: ellipsis; //用省略号显示
-            white-space: nowrap; //不换行
-            flex: 1;
-            max-width: 200px;
-          }
+    &.style-1 {
+        .content-wrap {
+            .title-wrap {
+                height: 30px;
+                line-height: 30px;
+            }
         }
-      }
     }
-  }
-
-  &.style-3 {
-    .content-wrap {
-      display: flex;
-      align-items: center;
 
-      .title-wrap {
-        height: 30px;
-        max-width: 85px;
-        margin-right: 5px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-      }
-
-      .search {
-        flex: 1;
-        padding-right: 10px;
-        padding-left: 31px;
-        position: relative;
-        background-color: #fff;
-        text-align: left;
-        border-radius: 30px;
-        height: 30px;
-        line-height: 30px;
-        border: 1px solid #eeeeee;
-        color: rgb(102, 102, 102);
-        display: flex;
-        align-items: center;
-        margin-right: 105px;
-        overflow: hidden;
-        box-sizing: border-box;
-
-        span {
-          overflow: hidden; //超出的文本隐藏
-          text-overflow: ellipsis; //用省略号显示
-          white-space: nowrap; //不换行
+    &.style-2 {
+        .content-wrap {
+            .title-wrap {
+                display: flex;
+                align-items: center;
+
+                > div {
+                    height: 30px;
+                    line-height: 30px;
+                    max-width: 150px;
+                    font-size: 14px;
+
+                    &:last-child {
+                        overflow: hidden; //超出的文本隐藏
+                        text-overflow: ellipsis; //用省略号显示
+                        white-space: nowrap; //不换行
+                        flex: 1;
+                        max-width: 200px;
+                    }
+                }
+            }
         }
+    }
 
-        .iconfont {
-          color: #909399;
-          font-size: 16px;
-          margin-right: 5px;
+    &.style-3 {
+        .content-wrap {
+            display: flex;
+            align-items: center;
+
+            .title-wrap {
+                height: 30px;
+                max-width: 85px;
+                margin-right: 5px;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+            }
+
+            .search {
+                flex: 1;
+                padding-right: 10px;
+                padding-left: 31px;
+                position: relative;
+                background-color: #fff;
+                text-align: left;
+                border-radius: 30px;
+                height: 30px;
+                line-height: 30px;
+                border: 1px solid #eeeeee;
+                color: rgb(102, 102, 102);
+                display: flex;
+                align-items: center;
+                margin-right: 105px;
+                overflow: hidden;
+                box-sizing: border-box;
+
+                span {
+                    overflow: hidden; //超出的文本隐藏
+                    text-overflow: ellipsis; //用省略号显示
+                    white-space: nowrap; //不换行
+                }
+
+                .iconfont {
+                    color: #909399;
+                    font-size: 16px;
+                    margin-right: 5px;
+                }
+            }
         }
-      }
     }
-  }
 
-  &.style-4 {
-    .content-wrap {
-      display: flex;
-      align-items: center;
-
-      .title-wrap {
-        flex: none;
-        margin: 0 5px;
-        max-width: 180px;
-        font-size: 14px;
-      }
+    &.style-4 {
+        .content-wrap {
+            display: flex;
+            align-items: center;
+
+            .title-wrap {
+                flex: none;
+                margin: 0 5px;
+                max-width: 180px;
+                font-size: 14px;
+            }
+        }
     }
-  }
 }
 </style>
diff --git a/admin/src/app/views/diy/index.vue b/admin/src/app/views/diy/index.vue
index a1896ecc..5f1472f9 100644
--- a/admin/src/app/views/diy/index.vue
+++ b/admin/src/app/views/diy/index.vue
@@ -1,137 +1,67 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex flex-wrap min-w-[1200px]" v-if="page.use_template">
-        <div
-          class="page-item relative w-[340px] mr-[40px] pt-[90px] pb-[20px] bg-[#f7f7f7] bg-no-repeat"
-        >
-          <p
-            class="absolute top-[54px] left-[50%] translate-x-[-50%] w-[130px] text-[14px] truncate text-center"
-          >
-            {{ page.use_template.title }}
-          </p>
-
-          <div
-            v-show="page.use_template.url"
-            class="w-[320px] h-[550px] mx-auto"
-          >
-            <iframe
-              :id="'previewIframe_' + type"
-              v-show="page.loadingIframe"
-              class="w-[320px] h-[550px] mx-auto"
-              :src="page.use_template.wapPreview"
-              frameborder="0"
-            ></iframe>
-            <div
-              v-show="page.loadingDev"
-              class="w-[320px] h-[550px] mx-auto bg-body pt-[20px] px-[20px]"
-            >
-              <div class="font-bold text-xl mb-[40px]">
-                {{ t('developTitle') }}
-              </div>
-              <div class="mb-[20px] flex flex-col">
-                <text class="mb-[10px]">{{ t('wapDomain') }}</text>
-                <el-input
-                  v-model.trim="wapDomain"
-                  :placeholder="t('wapDomainPlaceholder')"
-                  clearable
-                />
-              </div>
-              <div class="flex">
-                <el-button type="primary" @click="saveDomain()">{{
-                  t('confirm')
-                }}</el-button>
-                <el-button type="primary" @click="settingTips()" plain>{{
-                  t('settingTips')
-                }}</el-button>
-              </div>
-            </div>
-          </div>
-
-          <div
-            v-show="!page.use_template.wapPreview"
-            class="overflow-hidden w-[320px] h-[550px] mx-auto"
-          >
-            <img
-              class="max-w-full"
-              v-if="page.use_template.cover"
-              :src="img(page.use_template.cover)"
-            />
-          </div>
-
-          <div
-            class="popup-wrap absolute inset-x-0 inset-y-0 select-none"
-            :class="{ disabled: page.isDisabledPop }"
-          ></div>
-        </div>
-
-        <div class="w-[700px]">
-          <div class="flex flex-wrap">
-            <diy-link
-              v-model="link"
-              :ignore="[
-                'DIY_LINK',
-                'DIY_JUMP_OTHER_APPLET',
-                'DIY_MAKE_PHONE_CALL',
-              ]"
-              @success="changePage"
-            >
-              <el-button type="primary">{{ t('changePage') }}</el-button>
-            </diy-link>
-            <el-button
-              type="primary"
-              @click="toDecorate()"
-              v-show="page.use_template.action == 'decorate'"
-              class="ml-[12px]"
-              >{{ t('decorate') }}</el-button
-            >
-          </div>
-
-          <div class="info-wrap">
-            <div
-              class="mt-[20px] p-[20px] flex items-center justify-between bg"
-            >
-              <div>
-                <div class="font-bold">{{ t('H5') }}</div>
-                <el-form label-width="40px" class="mt-[5px]">
-                  <el-form-item :label="t('link')" class="mb-[5px]">
-                    <el-input
-                      readonly
-                      :value="page.shareUrl"
-                      class="!w-[390px]"
-                    >
-                      <template #append>
-                        <el-button
-                          @click="copyEvent(page.shareUrl)"
-                          class="bg-primary copy"
-                          >{{ t('copy') }}</el-button
-                        >
-                      </template>
-                    </el-input>
-                  </el-form-item>
-                </el-form>
-                <div class="text-[#999] text-base">
-                  {{ t('scanQRCodeOnRight') }}
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+
+            <div class="flex flex-wrap min-w-[1200px]" v-if="page.use_template">
+                <div class="page-item relative w-[340px] mr-[40px] pt-[90px] pb-[20px] bg-[#f7f7f7] bg-no-repeat">
+                    <p class="absolute top-[54px] left-[50%] translate-x-[-50%] w-[130px] text-[14px] truncate text-center">{{ page.use_template.title }}</p>
+
+                    <div v-show="page.use_template.url" class="w-[320px] h-[550px] mx-auto">
+                        <iframe :id="'previewIframe_' + type" v-show="page.loadingIframe" class="w-[320px] h-[550px] mx-auto" :src="page.use_template.wapPreview" frameborder="0"></iframe>
+                        <div v-show="page.loadingDev" class="w-[320px] h-[550px] mx-auto bg-body pt-[20px] px-[20px]">
+                            <div class="font-bold text-xl mb-[40px]">{{ t('developTitle') }}</div>
+                            <div class="mb-[20px] flex flex-col">
+                                <text class="mb-[10px]">{{ t('wapDomain') }}</text>
+                                <el-input v-model.trim="wapDomain" :placeholder="t('wapDomainPlaceholder')" clearable />
+                            </div>
+                            <div class="flex">
+                                <el-button type="primary" @click="saveDomain()">{{ t('confirm') }}</el-button>
+                                <el-button type="primary" @click="settingTips()" plain>{{ t('settingTips') }}</el-button>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div v-show="!page.use_template.wapPreview" class="overflow-hidden w-[320px] h-[550px] mx-auto">
+                        <img class="max-w-full" v-if="page.use_template.cover" :src="img(page.use_template.cover)" />
+                    </div>
+
+                    <div class="popup-wrap absolute inset-x-0 inset-y-0 select-none" :class="{ 'disabled': page.isDisabledPop }"></div>
+
                 </div>
-              </div>
-              <div class="text-center">
-                <el-image
-                  class="w-[100px] h-[100px] mb-[5px]"
-                  :src="wapImage"
-                />
-                <div
-                  @click="toPreview()"
-                  class="text-primary text-base cursor-pointer"
-                >
-                  {{ t('preview') }}
+
+                <div class="w-[700px]">
+                    <div class="flex flex-wrap">
+                        <diy-link v-model="link" :ignore="['DIY_LINK','DIY_JUMP_OTHER_APPLET','DIY_MAKE_PHONE_CALL']" @success="changePage">
+                            <el-button type="primary">{{ t('changePage') }}</el-button>
+                        </diy-link>
+                        <el-button type="primary" @click="toDecorate()" v-show="page.use_template.action == 'decorate'" class="ml-[12px]">{{ t('decorate') }}</el-button>
+                    </div>
+
+                    <div class="info-wrap">
+                        <div class="mt-[20px] p-[20px] flex items-center justify-between bg">
+                            <div>
+                                <div class="font-bold">{{ t('H5') }}</div>
+                                <el-form label-width="40px" class="mt-[5px]">
+                                    <el-form-item :label="t('link')" class="mb-[5px]">
+                                        <el-input readonly :value="page.shareUrl" class="!w-[390px]">
+                                            <template #append>
+                                                <el-button @click="copyEvent(page.shareUrl)" class="bg-primary copy">{{ t('copy') }}</el-button>
+                                            </template>
+                                        </el-input>
+                                    </el-form-item>
+                                </el-form>
+                                <div class="text-[#999] text-base">{{ t('scanQRCodeOnRight') }}</div>
+                            </div>
+                            <div class="text-center">
+                                <el-image class="w-[100px] h-[100px] mb-[5px]" :src="wapImage" />
+                                <div @click="toPreview()" class="text-primary text-base cursor-pointer">{{ t('preview') }}</div>
+                            </div>
+                        </div>
+                    </div>
                 </div>
-              </div>
             </div>
-          </div>
-        </div>
-      </div>
-    </el-card>
-  </div>
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -145,70 +75,70 @@ import storage from '@/utils/storage'
 import QRCode from 'qrcode'
 import { useClipboard } from '@vueuse/core'
 
-const type: any = ref('DIY_INDEX')
+const type: any = ref('DIY_INDEX');
 const page: any = reactive({})
 const router = useRouter()
 const wapDomain = ref('')
 const wapImage = ref('')
 const link: any = ref({
-  name: '',
+    name: ''
 })
 
 // 切换页面
 const formData = reactive({
-  type: '',
-  name: '',
-  parent: '',
-  page: '',
-  title: '',
-  action: '',
+    type: '',
+    name: '',
+    parent:'',
+    page: '',
+    title: '',
+    action: ''
 })
 
 // 初始化数据
 const refreshData = () => {
-  getDecoratePage({
-    type: type.value,
-  }).then((res) => {
-    for (const key in res.data) {
-      page[key] = res.data[key]
-    }
-
-    link.value.name = page.use_template.name
-    link.value.title = page.use_template.title
-    link.value.url = page.use_template.page
-    link.value.action = page.use_template.action
-    link.value.parent = page.use_template.parent
-
-    if (page.use_template.url) {
-      page.loadingIframe = false // 加载iframe
-      page.loadingDev = false // 加载开发环境配置
-      page.isDisabledPop = false // 是否禁止打开遮罩层
-      page.difference = 0 // 检测页面加载差异，小于1000毫秒，则配置wap端域名
-
-      wapDomain.value = page.domain_url.wap_domain
-      page.wapUrl = page.domain_url.wap_url
-
-      let repeat = true // 防重复执行
-
-      if (import.meta.env.MODE == 'development') {
-        // 开发模式情况下，并且未配置wap域名，则获取缓存域名
-        if (wapDomain.value && wapDomain.value.indexOf('localhost') != -1) {
-          page.wapUrl = wapDomain.value + '/wap'
-          repeat = false
-          setDomain()
-        }
-        if (storage.get('wap_domain')) {
-          page.wapUrl = storage.get('wap_domain')
-          repeat = false
-          setDomain()
+    getDecoratePage({
+        type : type.value
+    }).then(res => {
+        for (const key in res.data) {
+            page[key] = res.data[key]
         }
-      }
 
-      if (repeat) {
-        setDomain()
-      }
-    }
-  })
+        link.value.name = page.use_template.name;
+        link.value.title = page.use_template.title;
+        link.value.url = page.use_template.page;
+        link.value.action = page.use_template.action;
+        link.value.parent = page.use_template.parent;
+
+        if (page.use_template.url) {
+            page.loadingIframe = false // 加载iframe
+            page.loadingDev = false // 加载开发环境配置
+            page.isDisabledPop = false // 是否禁止打开遮罩层
+            page.difference = 0 // 检测页面加载差异，小于1000毫秒，则配置wap端域名
+
+            wapDomain.value = page.domain_url.wap_domain
+            page.wapUrl = page.domain_url.wap_url
+
+            let repeat = true; // 防重复执行
+
+            if (import.meta.env.MODE == 'development') {
+                // 开发模式情况下，并且未配置wap域名，则获取缓存域名
+                if (wapDomain.value && wapDomain.value.indexOf('localhost') != -1) {
+                    page.wapUrl = wapDomain.value + '/wap'
+                    repeat = false
+                    setDomain()
+                }
+                if (storage.get('wap_domain')) {
+                    page.wapUrl = storage.get('wap_domain')
+                    repeat = false
+                    setDomain()
+                }
+            }
+
+            if(repeat) {
+                setDomain()
+            }
+        }
+    })
 }
 
 refreshData()
@@ -216,212 +146,200 @@ refreshData()
 const uniAppLoadStatus = ref(false) // uni-app 加载状态，true：加载完成，false：未完成
 
 // 监听 uni-app 端 是否加载完成
-window.addEventListener(
-  'message',
-  (event) => {
+window.addEventListener('message', (event) => {
     try {
-      let data = {
-        type: '',
-      }
-      if (typeof event.data == 'string') {
-        data = JSON.parse(event.data)
-      } else if (typeof event.data == 'object') {
-        data = event.data
-      }
-      if (data.type && ['appOnLaunch', 'appOnReady'].indexOf(data.type) != -1) {
-        page.loadingDev = false // 禁用开发环境配置
-        page.loadingIframe = true // 加载iframe
-        let loadTime = new Date().getTime()
-        page.difference = loadTime - page.timeIframe
-        page.isDisabledPop = false // 是否禁止打开遮罩层
-        uniAppLoadStatus.value = true // 加载完成
-      }
+        let data = {
+            type :''
+        };
+        if(typeof event.data == 'string') {
+            data = JSON.parse(event.data)
+        }else if(typeof event.data == 'object') {
+            data = event.data
+        }
+        if (data.type && ['appOnLaunch', 'appOnReady'].indexOf(data.type) != -1) {
+            page.loadingDev = false // 禁用开发环境配置
+            page.loadingIframe = true // 加载iframe
+            let loadTime = new Date().getTime()
+            page.difference = loadTime - page.timeIframe
+            page.isDisabledPop = false // 是否禁止打开遮罩层
+            uniAppLoadStatus.value = true // 加载完成
+        }
     } catch (e) {
-      initLoad()
-      console.log('diy index 后台接受数据错误', e)
+        initLoad()
+        console.log('diy index 后台接受数据错误', e)
     }
-  },
-  false
-)
+}, false)
 
 // 将数据发送到uniapp
 const postMessage = () => {
-  const diyData = JSON.stringify({
-    type: 'appOnReady',
-    message: '加载完成',
-  })
-  if (window['previewIframe_' + type.value])
-    window['previewIframe_' + type.value].contentWindow.postMessage(
-      diyData,
-      '*'
-    )
+    const diyData = JSON.stringify({
+        type: 'appOnReady',
+        message: '加载完成'
+    })
+    if (window['previewIframe_' + type.value]) window['previewIframe_' + type.value].contentWindow.postMessage(diyData, '*')
 }
 
 // 初始化加载状态
 const initLoad = () => {
-  page.loadingDev = true
-  page.isDisabledPop = true
-  page.loadingIframe = false
+    page.loadingDev = true
+    page.isDisabledPop = true
+    page.loadingIframe = false
 }
 
 const saveDomain = () => {
-  if (wapDomain.value.trim().length == 0) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('wapDomainPlaceholder')}`,
-    })
-    return
-  }
-  const wapUrl = wapDomain.value + '/wap'
-  storage.set({ key: 'wap_domain', data: wapUrl })
-
-  if (page.use_template.url) {
-    page.wapUrl = wapUrl
-    setDomain()
-  }
-  setTimeout(() => {
+    if (wapDomain.value.trim().length == 0) {
+        ElMessage({
+            type: 'warning',
+            message: `${t('wapDomainPlaceholder')}`,
+        })
+        return
+    }
+    const wapUrl = wapDomain.value + '/wap'
+    storage.set({key: 'wap_domain', data: wapUrl})
+
     if (page.use_template.url) {
-      page.loadingIframe = true // 加载iframe
-      page.loadingDev = false // 加载开发环境配置
-      page.isDisabledPop = false // 是否禁止打开遮罩层
+        page.wapUrl = wapUrl
+        setDomain()
     }
-  }, 100 * 3)
+    setTimeout(() => {
+        if (page.use_template.url) {
+            page.loadingIframe = true // 加载iframe
+            page.loadingDev = false // 加载开发环境配置
+            page.isDisabledPop = false // 是否禁止打开遮罩层
+        }
+    }, 100 * 3)
 }
 
 const settingTips = () => {
-  window.open('https://www.kancloud.cn/niucloud/niucloud-admin-develop/3213393')
+    window.open('https://www.kancloud.cn/niucloud/niucloud-admin-develop/3213393')
 }
 
 const setDomain = () => {
-  page.use_template.wapPreview = page.wapUrl + page.use_template.url
-  page.shareUrl = page.wapUrl + '/'
-  QRCode.toDataURL(page.shareUrl, {
-    errorCorrectionLevel: 'L',
-    margin: 0,
-    width: 100,
-  }).then((url) => {
-    wapImage.value = url
-  })
-
-  const send = () => {
-    page.timeIframe = new Date().getTime()
-    postMessage()
-  }
-
-  // 同步发送一次消息
-  send()
-
-  // 如果同步发送消息的 uni-app没有接收到回应，则定时发送消息
-  let sendCount = 0
-  let timeInterVal = setInterval(() => {
-    // 接收 uni-app 发送的消息 或者 发送50次后未响应，则停止发送
-    if (uniAppLoadStatus.value || sendCount >= 50) {
-      clearInterval(timeInterVal)
-      return
+    page.use_template.wapPreview = page.wapUrl + page.use_template.url
+    page.shareUrl = page.wapUrl + '/';
+    QRCode.toDataURL(page.shareUrl, { errorCorrectionLevel: 'L', margin: 0, width: 100 }).then(url => {
+        wapImage.value = url
+    })
+
+    const send = ()=>{
+        page.timeIframe = new Date().getTime()
+        postMessage()
     }
 
+    // 同步发送一次消息
     send()
-    sendCount++
-  }, 200)
 
-  // 如果10秒内加载不出来，则需要配置域名
-  setTimeout(() => {
-    if (page.difference == 0) initLoad()
-  }, 1000 * 10)
+    // 如果同步发送消息的 uni-app没有接收到回应，则定时发送消息
+    let sendCount = 0;
+    let timeInterVal = setInterval(()=>{
+        // 接收 uni-app 发送的消息 或者 发送50次后未响应，则停止发送
+        if(uniAppLoadStatus.value || sendCount >= 50){
+            clearInterval(timeInterVal)
+            return
+        }
+
+        send()
+        sendCount++;
+    },200)
+
+    // 如果10秒内加载不出来，则需要配置域名
+    setTimeout(() => {
+        if (page.difference == 0) initLoad()
+    }, 1000 * 10)
 }
 
 // 跳转去装修
 const toDecorate = () => {
-  const query: any = {
-    back: '/admin/diy/index',
-  }
-  if (page.use_template.id) {
-    query.id = page.use_template.id
-  } else if (page.use_template.type) {
-    query.name = page.use_template.type
-  } else if (page.use_template.url) {
-    query.url = page.use_template.url
-  }
-  const url = router.resolve({
-    path: '/decorate/edit',
-    query,
-  })
-  window.open(url.href)
+    const query: any = {
+        back: '/admin/diy/index'
+    }
+    if (page.use_template.id) {
+        query.id = page.use_template.id
+    } else if (page.use_template.type) {
+        query.name = page.use_template.type
+    } else if (page.use_template.url) {
+        query.url = page.use_template.url
+    }
+    const url = router.resolve({
+        path: '/decorate/edit',
+        query
+    })
+    window.open(url.href)
 }
 
 // 跳转去预览
 const toPreview = () => {
-  let value = page.use_template.page
-  if (page.use_template.url) {
-    value = page.use_template.url
-  } else if (page.use_template.id) {
-    value += '?id=' + page.use_template.id
-  }
-  const url = router.resolve({
-    path: '/preview/wap',
-    query: {
-      page: value,
-    },
-  })
-  window.open(url.href)
+    let value = page.use_template.page
+    if (page.use_template.url) {
+        value = page.use_template.url
+    } else if (page.use_template.id) {
+        value += '?id=' + page.use_template.id
+    }
+    const url = router.resolve({
+        path: '/preview/wap',
+        query: {
+            page:value
+        }
+    })
+    window.open(url.href)
 }
 
 const isRepeat = ref(false)
-const changePage = () => {
-  formData.type = type.value
-  formData.name = link.value.name
-  formData.page = link.value.url
-  formData.title = link.value.title
-  formData.action = link.value.action
-  formData.parent = link.value.parent
-
-  if (isRepeat.value) return
-  isRepeat.value = true
-
-  changeTemplate({
-    ...formData,
-  }).then((res) => {
-    isRepeat.value = false
-    refreshData()
-  })
+const changePage = ()=>{
+    formData.type = type.value;
+    formData.name = link.value.name;
+    formData.page = link.value.url;
+    formData.title = link.value.title;
+    formData.action = link.value.action;
+    formData.parent = link.value.parent;
+
+    if (isRepeat.value) return
+    isRepeat.value = true
+
+    changeTemplate({
+        ...formData
+    }).then((res) => {
+        isRepeat.value = false
+        refreshData()
+    })
 }
 
 // 复制
 const { copy, isSupported, copied } = useClipboard()
 const copyEvent = (text: string) => {
-  if (!isSupported.value) {
-    ElMessage({
-      message: t('notSupportCopy'),
-      type: 'warning',
-    })
-  }
-  copy(text)
+    if (!isSupported.value) {
+        ElMessage({
+            message: t('notSupportCopy'),
+            type: 'warning'
+        })
+    }
+    copy(text)
 }
 
 watch(copied, () => {
-  if (copied.value) {
-    ElMessage({
-      message: t('copySuccess'),
-      type: 'success',
-    })
-  }
+    if (copied.value) {
+        ElMessage({
+            message: t('copySuccess'),
+            type: 'success'
+        })
+    }
 })
 </script>
 
 <style lang="scss" scoped>
-.page-item {
-  background-image: url(@/app/assets/images/iphone_bg.png);
-  background-color: var(--el-bg-color);
-  background-size: 100%;
-
-  .popup-wrap {
-    display: none;
-  }
-
-  &:hover {
-    .popup-wrap:not(.disabled) {
-      display: block !important;
+    .page-item {
+        background-image: url(@/app/assets/images/iphone_bg.png);
+        background-color: var(--el-bg-color);
+        background-size: 100%;
+
+        .popup-wrap {
+            display: none;
+        }
+
+        &:hover {
+            .popup-wrap:not(.disabled) {
+                display: block !important;
+            }
+        }
     }
-  }
-}
 </style>
diff --git a/admin/src/app/views/diy/list.vue b/admin/src/app/views/diy/list.vue
index f530259c..ac195e90 100644
--- a/admin/src/app/views/diy/list.vue
+++ b/admin/src/app/views/diy/list.vue
@@ -1,283 +1,136 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-        <el-button
-          type="primary"
-          class="w-[100px]"
-          @click="dialogVisible = true"
-          >{{ t('addDiyPage') }}</el-button
-        >
-      </div>
-
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="diyPageTableData.searchParam"
-          ref="searchFormDiyPageRef"
-        >
-          <el-form-item :label="t('title')" prop="title">
-            <el-input
-              v-model.trim="diyPageTableData.searchParam.title"
-              :placeholder="t('titlePlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('forAddon')" prop="addon_name">
-            <el-select
-              v-model="diyPageTableData.searchParam.addon_name"
-              :placeholder="t('forAddonPlaceholder')"
-              @change="handleSelectAddonChange"
-            >
-              <el-option :label="t('all')" value="" />
-              <el-option
-                v-for="(item, key) in apps"
-                :label="item.title"
-                :value="key"
-                :key="key"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="t('typeName')" prop="type">
-            <el-select
-              v-model="diyPageTableData.searchParam.type"
-              :placeholder="t('pageTypePlaceholder')"
-            >
-              <el-option :label="t('all')" value="" />
-              <el-option
-                v-for="(item, key) in pageType"
-                :label="item.title"
-                :value="key"
-                :key="key"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="loadDiyPageList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormDiyPageRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
-
-      <el-table
-        :data="diyPageTableData.data"
-        size="large"
-        v-loading="diyPageTableData.loading"
-      >
-        <template #empty>
-          <span>{{ !diyPageTableData.loading ? t('emptyData') : '' }}</span>
-        </template>
-
-        <el-table-column
-          prop="page_title"
-          :label="t('title')"
-          min-width="120"
-        />
-        <el-table-column
-          prop="addon_name"
-          :label="t('forAddon')"
-          min-width="80"
-        />
-        <el-table-column
-          prop="type_name"
-          :label="t('typeName')"
-          min-width="80"
-        />
-        <el-table-column :label="t('status')" min-width="80">
-          <template #default="{ row }">
-            <span v-if="row.type == 'DIY_PAGE'">-</span>
-            <template v-else>
-              <span v-if="row.is_default == 1" class="text-primary">{{
-                t('isUse')
-              }}</span>
-              <span v-else>{{ t('unused') }}</span>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+                <el-button type="primary" class="w-[100px]" @click="dialogVisible = true">{{ t('addDiyPage') }}</el-button>
+            </div>
+
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="diyPageTableData.searchParam" ref="searchFormDiyPageRef">
+                    <el-form-item :label="t('title')" prop="title">
+                        <el-input v-model.trim="diyPageTableData.searchParam.title" :placeholder="t('titlePlaceholder')" />
+                    </el-form-item>
+                    <el-form-item :label="t('forAddon')" prop="addon_name">
+                        <el-select v-model="diyPageTableData.searchParam.addon_name" :placeholder="t('forAddonPlaceholder')" @change="handleSelectAddonChange">
+                            <el-option :label="t('all')" value="" />
+                            <el-option v-for="(item, key) in apps" :label="item.title" :value="key" :key="key"/>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item :label="t('typeName')" prop="type">
+                        <el-select v-model="diyPageTableData.searchParam.type" :placeholder="t('pageTypePlaceholder')">
+                            <el-option :label="t('all')" value="" />
+                            <el-option v-for="(item, key) in pageType" :label="item.title" :value="key" :key="key"/>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="loadDiyPageList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormDiyPageRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+
+            <el-table :data="diyPageTableData.data" size="large" v-loading="diyPageTableData.loading">
+                <template #empty>
+                    <span>{{ !diyPageTableData.loading ? t('emptyData') : '' }}</span>
+                </template>
+
+                <el-table-column prop="page_title" :label="t('title')" min-width="120" />
+                <el-table-column prop="addon_name" :label="t('forAddon')" min-width="80" />
+                <el-table-column prop="type_name" :label="t('typeName')" min-width="80" />
+                <el-table-column :label="t('status')" min-width="80">
+                    <template #default="{ row }">
+                        <span v-if="row.type == 'DIY_PAGE'">-</span>
+                        <template v-else>
+                            <span v-if="row.is_default == 1" class="text-primary">{{ t('isUse') }}</span>
+                            <span v-else>{{ t('unused') }}</span>
+                        </template>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="update_time" :label="t('updateTime')" min-width="120" />
+
+                <el-table-column :label="t('operation')" fixed="right" align="right" min-width="160">
+                    <template #default="{ row }">
+                        <el-button type="primary" link @click="toPreview(row)">{{ t('preview') }}</el-button>
+                        <el-button v-if="row.is_default == 0" type="primary" link @click="setUse(row.id)">{{ t('use') }}</el-button>
+                        <el-button v-if="row.type == 'DIY_PAGE'" type="primary" link @click="openShare(row)">{{ t('shareSet') }}</el-button>
+                        <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+                        <el-button v-if="row.is_default == 0 || row.type == 'DIY_PAGE'" type="primary" link @click="deleteEvent(row.id)">{{ t('delete') }}</el-button>
+                        <el-button type="primary" link @click="copyEvent(row.id)">{{ t('copy') }}</el-button>
+                    </template>
+                </el-table-column>
+
+            </el-table>
+            <div class="mt-[16px] flex justify-end">
+                <el-pagination v-model:current-page="diyPageTableData.page" v-model:page-size="diyPageTableData.limit"
+                    layout="total, sizes, prev, pager, next, jumper" :total="diyPageTableData.total"
+                    @size-change="loadDiyPageList()" @current-change="loadDiyPageList" />
+            </div>
+
+        </el-card>
+
+        <!--添加页面-->
+        <el-dialog v-model="dialogVisible" :title="t('addPageTips')" width="350px">
+
+            <el-form :model="formData" label-width="90px" ref="formRef" :rules="formRules">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model.trim="formData.title" :placeholder="t('titlePlaceholder')" clearable maxlength="12" show-word-limit class="w-full" />
+                </el-form-item>
+                <el-form-item :label="t('typeName')" prop="type">
+                    <el-select v-model="formData.type" :placeholder="t('pageTypePlaceholder')" class="!w-full">
+                        <el-option v-for="(item, key) in pageType" :label="item.title" :value="key" :key="key"/>
+                    </el-select>
+                </el-form-item>
+            </el-form>
+
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="dialogVisible = false">{{ t('cancel') }}</el-button>
+                    <el-button type="primary" @click="addEvent(formRef)">{{ t('confirm') }}</el-button>
+                </span>
             </template>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="update_time"
-          :label="t('updateTime')"
-          min-width="120"
-        />
-
-        <el-table-column
-          :label="t('operation')"
-          fixed="right"
-          align="right"
-          min-width="160"
-        >
-          <template #default="{ row }">
-            <el-button type="primary" link @click="toPreview(row)">{{
-              t('preview')
-            }}</el-button>
-            <el-button
-              v-if="row.is_default == 0"
-              type="primary"
-              link
-              @click="setUse(row.id)"
-              >{{ t('use') }}</el-button
-            >
-            <el-button
-              v-if="row.type == 'DIY_PAGE'"
-              type="primary"
-              link
-              @click="openShare(row)"
-              >{{ t('shareSet') }}</el-button
-            >
-            <el-button type="primary" link @click="editEvent(row)">{{
-              t('edit')
-            }}</el-button>
-            <el-button
-              v-if="row.is_default == 0 || row.type == 'DIY_PAGE'"
-              type="primary"
-              link
-              @click="deleteEvent(row.id)"
-              >{{ t('delete') }}</el-button
-            >
-            <el-button type="primary" link @click="copyEvent(row.id)">{{
-              t('copy')
-            }}</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="mt-[16px] flex justify-end">
-        <el-pagination
-          v-model:current-page="diyPageTableData.page"
-          v-model:page-size="diyPageTableData.limit"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="diyPageTableData.total"
-          @size-change="loadDiyPageList()"
-          @current-change="loadDiyPageList"
-        />
-      </div>
-    </el-card>
-
-    <!--添加页面-->
-    <el-dialog v-model="dialogVisible" :title="t('addPageTips')" width="350px">
-      <el-form
-        :model="formData"
-        label-width="90px"
-        ref="formRef"
-        :rules="formRules"
-      >
-        <el-form-item :label="t('title')" prop="title">
-          <el-input
-            v-model.trim="formData.title"
-            :placeholder="t('titlePlaceholder')"
-            clearable
-            maxlength="12"
-            show-word-limit
-            class="w-full"
-          />
-        </el-form-item>
-        <el-form-item :label="t('typeName')" prop="type">
-          <el-select
-            v-model="formData.type"
-            :placeholder="t('pageTypePlaceholder')"
-            class="!w-full"
-          >
-            <el-option
-              v-for="(item, key) in pageType"
-              :label="item.title"
-              :value="key"
-              :key="key"
-            />
-          </el-select>
-        </el-form-item>
-      </el-form>
-
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="dialogVisible = false">{{
-            t('cancel')
-          }}</el-button>
-          <el-button type="primary" @click="addEvent(formRef)">{{
-            t('confirm')
-          }}</el-button>
-        </span>
-      </template>
-    </el-dialog>
-
-    <!-- 分享设置-->
-    <el-dialog v-model="shareDialogVisible" :title="t('shareSet')" width="30%">
-      <el-tabs v-model="tabShareType">
-        <el-tab-pane :label="t('wechat')" name="wechat"></el-tab-pane>
-        <el-tab-pane :label="t('weapp')" name="weapp"></el-tab-pane>
-      </el-tabs>
-      <el-form
-        :model="shareFormData[tabShareType]"
-        label-width="90px"
-        ref="shareFormRef"
-        :rules="shareFormRules"
-      >
-        <el-form-item :label="t('sharePage')">
-          <span>{{ sharePage }}</span>
-        </el-form-item>
-        <el-form-item :label="t('shareTitle')" prop="title">
-          <el-input
-            v-model.trim="shareFormData[tabShareType].title"
-            :placeholder="t('shareTitlePlaceholder')"
-            clearable
-            maxlength="30"
-            show-word-limit
-          />
-        </el-form-item>
-        <el-form-item
-          :label="t('shareDesc')"
-          prop="desc"
-          v-if="tabShareType == 'wechat'"
-        >
-          <el-input
-            v-model.trim="shareFormData[tabShareType].desc"
-            :placeholder="t('shareDescPlaceholder')"
-            type="textarea"
-            rows="4"
-            clearable
-            maxlength="100"
-            show-word-limit
-          />
-        </el-form-item>
-        <el-form-item :label="t('shareImageUrl')" prop="url">
-          <upload-image v-model="shareFormData[tabShareType].url" :limit="1" />
-        </el-form-item>
-      </el-form>
-
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="shareDialogVisible = false">{{
-            t('cancel')
-          }}</el-button>
-          <el-button type="primary" @click="shareEvent(shareFormRef)">{{
-            t('confirm')
-          }}</el-button>
-        </span>
-      </template>
-    </el-dialog>
-  </div>
+        </el-dialog>
+
+        <!-- 分享设置-->
+        <el-dialog v-model="shareDialogVisible" :title="t('shareSet')" width="30%">
+            <el-tabs v-model="tabShareType">
+                <el-tab-pane :label="t('wechat')" name="wechat"></el-tab-pane>
+                <el-tab-pane :label="t('weapp')" name="weapp"></el-tab-pane>
+            </el-tabs>
+            <el-form :model="shareFormData[tabShareType]" label-width="90px" ref="shareFormRef" :rules="shareFormRules">
+                <el-form-item :label="t('sharePage')">
+                    <span>{{ sharePage }}</span>
+                </el-form-item>
+                <el-form-item :label="t('shareTitle')" prop="title">
+                    <el-input v-model.trim="shareFormData[tabShareType].title" :placeholder="t('shareTitlePlaceholder')" clearable maxlength="30" show-word-limit />
+                </el-form-item>
+                <el-form-item :label="t('shareDesc')" prop="desc" v-if="tabShareType == 'wechat'">
+                    <el-input v-model.trim="shareFormData[tabShareType].desc" :placeholder="t('shareDescPlaceholder')" type="textarea" rows="4" clearable maxlength="100" show-word-limit />
+                </el-form-item>
+                <el-form-item :label="t('shareImageUrl')" prop="url">
+                    <upload-image v-model="shareFormData[tabShareType].url" :limit="1" />
+                </el-form-item>
+            </el-form>
+
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="shareDialogVisible = false">{{ t('cancel') }}</el-button>
+                    <el-button type="primary" @click="shareEvent(shareFormRef)">{{ t('confirm') }}</el-button>
+                </span>
+            </template>
+        </el-dialog>
+
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref, computed } from 'vue'
 import { t } from '@/lang'
-import {
-  getApps,
-  getDiyPageList,
-  deleteDiyPage,
-  getDiyTemplate,
-  editDiyPageShare,
-  setUseDiyPage,
-  copyDiy,
-} from '@/app/api/diy'
+import { getApps,getDiyPageList, deleteDiyPage, getDiyTemplate, editDiyPageShare, setUseDiyPage,copyDiy } from '@/app/api/diy'
 import { ElMessageBox, FormInstance } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
-import { setTablePageStorage, getTablePageStorage } from '@/utils/common'
+import { setTablePageStorage,getTablePageStorage } from "@/utils/common";
 
 const route = useRoute()
 const router = useRouter()
@@ -287,243 +140,236 @@ const pageType: any = reactive({}) // 页面类型
 
 // 添加自定义页面
 const formData = reactive({
-  title: '',
-  type: '',
+    title: '',
+    type: ''
 })
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    title: [
-      { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
-    ],
-    type: [
-      { required: true, message: t('pageTypePlaceholder'), trigger: 'blur' },
-    ],
-  }
+    return {
+        title: [
+            { required: true, message: t('titlePlaceholder'), trigger: 'blur' }
+        ],
+        type: [
+            { required: true, message: t('pageTypePlaceholder'), trigger: 'blur' }
+        ]
+    }
 })
 
 const formRef = ref<FormInstance>()
 const dialogVisible = ref(false)
 const addEvent = async (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      const query = { type: formData.type, title: formData.title }
-      const url = router.resolve({
-        path: '/decorate/edit',
-        query,
-      })
-      window.open(url.href)
-      dialogVisible.value = false
-      formData.title = ''
-      formData.type = ''
-    }
-  })
+    if (!formEl) return
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            const query = { type: formData.type, title: formData.title }
+            const url = router.resolve({
+                path: '/decorate/edit',
+                query
+            })
+            window.open(url.href)
+            dialogVisible.value = false
+            formData.title = ''
+            formData.type = ''
+        }
+    })
 }
 
 // 获取自定义页面类型
-const loadDiyTemplate = (addon = '') => {
-  getDiyTemplate({ mode: '', addon }).then((res) => {
-    for (let key in pageType) {
-      delete pageType[key]
-    }
+const loadDiyTemplate = (addon = '')=> {
+    getDiyTemplate({mode: '', addon}).then(res => {
+        for (let key in pageType) {
+            delete pageType[key];
+        }
 
-    for (const key in res.data) {
-      pageType[key] = res.data[key]
-    }
-  })
+        for (const key in res.data) {
+            pageType[key] = res.data[key]
+        }
+    })
 }
 
-loadDiyTemplate()
+loadDiyTemplate();
 
 const apps: any = reactive({}) // 应用插件列表
 
-getApps({}).then((res) => {
-  if (res.data) {
-    for (const key in res.data) {
-      apps[key] = res.data[key]
+getApps({}).then(res=>{
+    if(res.data){
+        for (const key in res.data) {
+            apps[key] = res.data[key];
+        }
     }
-  }
-})
+});
 
 // 根据所属插件，查询页面类型
 const handleSelectAddonChange = (value: any) => {
-  diyPageTableData.searchParam.type = ''
-  loadDiyTemplate(value)
+    diyPageTableData.searchParam.type = '';
+    loadDiyTemplate(value)
 }
 
 const diyPageTableData: any = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    title: '',
-    type: '',
-    mode: '',
-    addon_name: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        title: '',
+        type: '',
+        mode: '',
+        addon_name: ''
+    }
 })
 
 const searchFormDiyPageRef = ref<FormInstance>()
 
 // 获取自定义页面列表
 const loadDiyPageList = (page: number = 1) => {
-  diyPageTableData.loading = true
-  diyPageTableData.page = page
-
-  getDiyPageList({
-    page: diyPageTableData.page,
-    limit: diyPageTableData.limit,
-    ...diyPageTableData.searchParam,
-  })
-    .then((res) => {
-      diyPageTableData.loading = false
-      diyPageTableData.data = res.data.data
-      diyPageTableData.total = res.data.total
-      setTablePageStorage(
-        diyPageTableData.page,
-        diyPageTableData.limit,
-        diyPageTableData.searchParam
-      )
-    })
-    .catch(() => {
-      diyPageTableData.loading = false
+    diyPageTableData.loading = true
+    diyPageTableData.page = page
+
+    getDiyPageList({
+        page: diyPageTableData.page,
+        limit: diyPageTableData.limit,
+        ...diyPageTableData.searchParam
+    }).then(res => {
+        diyPageTableData.loading = false
+        diyPageTableData.data = res.data.data
+        diyPageTableData.total = res.data.total
+        setTablePageStorage(diyPageTableData.page, diyPageTableData.limit, diyPageTableData.searchParam);
+    }).catch(() => {
+        diyPageTableData.loading = false
     })
 }
 
-loadDiyPageList(getTablePageStorage(diyPageTableData.searchParam).page)
+loadDiyPageList(getTablePageStorage(diyPageTableData.searchParam).page);
 
 // 编辑自定义页面
 const editEvent = (data: any) => {
-  const url = router.resolve({
-    path: '/decorate/edit',
-    query: { id: data.id },
-  })
-  window.open(url.href)
+    const url = router.resolve({
+        path: '/decorate/edit',
+        query: { id: data.id }
+    })
+    window.open(url.href)
 }
 
 // 设为使用
 const setUse = (id: any) => {
-  setUseDiyPage({ id }).then(() => {
-    loadDiyPageList()
-  })
+    setUseDiyPage({id}).then(() => {
+        loadDiyPageList()
+    })
 }
 const repeat = ref(false)
 
 // 复制页面
 const copyEvent = (id: any) => {
-  ElMessageBox.confirm(t('diyPageCopyTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    if (repeat.value) return
-    repeat.value = true
-
-    copyDiy({ id: id })
-      .then((res: any) => {
-        if (res.code == 1) {
-          loadDiyPageList()
+    ElMessageBox.confirm(t('diyPageCopyTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
         }
-        repeat.value = false
-      })
-      .catch((err) => {
-        repeat.value = false
-      })
-  })
+    ).then(() => {
+        if (repeat.value) return
+        repeat.value = true
+
+        copyDiy({id: id}).then((res: any) => {
+            if (res.code == 1) {
+                loadDiyPageList()
+            }
+            repeat.value = false
+        }).catch(err => {
+            repeat.value = false
+        })
+    })
 }
 
 // 删除自定义页面
 const deleteEvent = (id: number) => {
-  ElMessageBox.confirm(t('diyPageDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    deleteDiyPage(id)
-      .then(() => {
-        loadDiyPageList()
-      })
-      .catch(() => {})
-  })
+    ElMessageBox.confirm(t('diyPageDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        deleteDiyPage(id).then(() => {
+            loadDiyPageList()
+        }).catch(() => {
+        })
+    })
 }
 
 // 跳转去预览
 const toPreview = (data: any) => {
-  const url = router.resolve({
-    path: '/preview/wap',
-    query: {
-      page: data.type_page + '?id=' + data.id,
-    },
-  })
-  window.open(url.href)
+    const url = router.resolve({
+        path: '/preview/wap',
+        query: {
+            page: data.type_page + '?id=' + data.id
+        }
+    });
+    window.open(url.href)
 }
 
 const tabShareType = ref('wechat')
 const sharePage = ref('')
 const shareFormId = ref(0)
 const shareFormData = reactive({
-  wechat: {
-    title: '',
-    desc: '',
-    url: '',
-  },
-  weapp: {
-    title: '',
-    url: '',
-  },
+    wechat: {
+        title: '',
+        desc: '',
+        url: ''
+    },
+    weapp: {
+        title: '',
+        url: ''
+    }
 })
 
 const shareDialogVisible = ref(false)
 const shareFormRules = computed(() => {
-  return {}
+    return {}
 })
 
 const shareFormRef = ref<FormInstance>()
 const openShare = async (row: any) => {
-  shareFormId.value = row.id
-  sharePage.value = row.title
-  const share = row.share
-    ? JSON.parse(row.share)
-    : {
+    shareFormId.value = row.id
+    sharePage.value = row.title
+    const share = row.share ? JSON.parse(row.share) : {
         wechat: { title: '', desc: '', url: '' },
-        weapp: { title: '', url: '' },
-      }
-  if (share) {
-    shareFormData.wechat = share.wechat
-    shareFormData.weapp = share.weapp
-  }
-
-  shareDialogVisible.value = true
+        weapp: { title: '', url: '' }
+    }
+    if (share) {
+        shareFormData.wechat = share.wechat
+        shareFormData.weapp = share.weapp
+    }
+
+    shareDialogVisible.value = true
 }
 
 const shareEvent = async (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      editDiyPageShare({
-        id: shareFormId.value,
-        share: JSON.stringify(shareFormData),
-      })
-        .then(() => {
-          loadDiyPageList()
-          shareDialogVisible.value = false
-        })
-        .catch(() => {})
-    }
-  })
+    if (!formEl) return
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            editDiyPageShare({
+                id: shareFormId.value,
+                share: JSON.stringify(shareFormData)
+            }).then(() => {
+                loadDiyPageList()
+                shareDialogVisible.value = false
+            }).catch(() => {
+            })
+        }
+    })
 }
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadDiyPageList()
+    if (!formEl) return
+    formEl.resetFields()
+    loadDiyPageList()
 }
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/diy/member.vue b/admin/src/app/views/diy/member.vue
index 9afb0a59..1bff9195 100644
--- a/admin/src/app/views/diy/member.vue
+++ b/admin/src/app/views/diy/member.vue
@@ -1,167 +1,86 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex flex-wrap min-w-[1200px]" v-if="page.use_template">
-        <div
-          class="page-item relative w-[340px] mr-[40px] pt-[90px] pb-[20px] bg-[#f7f7f7] bg-no-repeat"
-        >
-          <p
-            class="absolute top-[54px] left-[50%] translate-x-[-50%] w-[130px] text-[14px] truncate text-center"
-          >
-            {{ page.use_template.title }}
-          </p>
-
-          <div
-            v-show="page.use_template.url"
-            class="w-[320px] h-[550px] mx-auto"
-          >
-            <iframe
-              :id="'previewIframe_' + type"
-              v-show="page.loadingIframe"
-              class="w-[320px] h-[550px] mx-auto"
-              :src="page.use_template.wapPreview"
-              frameborder="0"
-            ></iframe>
-            <div
-              v-show="page.loadingDev"
-              class="w-[320px] h-[550px] mx-auto bg-body pt-[20px] px-[20px]"
-            >
-              <div class="font-bold text-xl mb-[40px]">
-                {{ t('developTitle') }}
-              </div>
-              <div class="mb-[20px] flex flex-col">
-                <text class="mb-[10px]">{{ t('wapDomain') }}</text>
-                <el-input
-                  v-model.trim="wapDomain"
-                  :placeholder="t('wapDomainPlaceholder')"
-                  clearable
-                />
-              </div>
-              <div class="flex">
-                <el-button type="primary" @click="saveDomain()">{{
-                  t('confirm')
-                }}</el-button>
-                <el-button type="primary" @click="settingTips()" plain>{{
-                  t('settingTips')
-                }}</el-button>
-              </div>
-            </div>
-          </div>
-
-          <div
-            v-show="!page.use_template.wapPreview"
-            class="overflow-hidden w-[320px] h-[550px] mx-auto"
-          >
-            <img
-              class="max-w-full"
-              v-if="page.use_template.cover"
-              :src="img(page.use_template.cover)"
-            />
-          </div>
-
-          <div
-            class="popup-wrap absolute inset-x-0 inset-y-0 select-none"
-            :class="{ disabled: page.isDisabledPop }"
-          ></div>
-        </div>
-
-        <div class="w-[700px]">
-          <div class="flex flex-wrap">
-            <!-- 多应用切换启动页 -->
-            <el-button
-              type="primary"
-              @click="showDialog = true"
-              v-if="siteApps.length > 1"
-              >{{ t('changePage') }}</el-button
-            >
-            <el-button
-              type="primary"
-              @click="toDecorate()"
-              v-show="page.use_template.action == 'decorate'"
-              class="ml-[12px]"
-              >{{ t('decorate') }}</el-button
-            >
-          </div>
-
-          <div class="info-wrap">
-            <div
-              class="mt-[20px] p-[20px] flex items-center justify-between bg"
-            >
-              <div>
-                <div class="font-bold">{{ t('H5') }}</div>
-                <el-form label-width="40px" class="mt-[5px]">
-                  <el-form-item :label="t('link')" class="mb-[5px]">
-                    <el-input
-                      readonly
-                      :value="page.shareUrl"
-                      class="!w-[400px]"
-                    >
-                      <template #append>
-                        <el-button
-                          @click="copyEvent(page.shareUrl)"
-                          class="bg-primary copy"
-                          >{{ t('copy') }}</el-button
-                        >
-                      </template>
-                    </el-input>
-                  </el-form-item>
-                </el-form>
-                <div class="text-[#999] text-base">
-                  {{ t('scanQRCodeOnRight') }}
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+            <div class="flex flex-wrap min-w-[1200px]" v-if="page.use_template">
+                <div class="page-item relative w-[340px] mr-[40px] pt-[90px] pb-[20px] bg-[#f7f7f7] bg-no-repeat">
+                    <p class="absolute top-[54px] left-[50%] translate-x-[-50%] w-[130px] text-[14px] truncate text-center">{{ page.use_template.title }}</p>
+
+                    <div v-show="page.use_template.url" class="w-[320px] h-[550px] mx-auto">
+                        <iframe :id="'previewIframe_' + type" v-show="page.loadingIframe" class="w-[320px] h-[550px] mx-auto" :src="page.use_template.wapPreview" frameborder="0"></iframe>
+                        <div v-show="page.loadingDev" class="w-[320px] h-[550px] mx-auto bg-body pt-[20px] px-[20px]">
+                            <div class="font-bold text-xl mb-[40px]">{{ t('developTitle') }}</div>
+                            <div class="mb-[20px] flex flex-col">
+                                <text class="mb-[10px]">{{ t('wapDomain') }}</text>
+                                <el-input v-model.trim="wapDomain" :placeholder="t('wapDomainPlaceholder')" clearable />
+                            </div>
+                            <div class="flex">
+                                <el-button type="primary" @click="saveDomain()">{{ t('confirm') }}</el-button>
+                                <el-button type="primary" @click="settingTips()" plain>{{ t('settingTips') }}</el-button>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div v-show="!page.use_template.wapPreview" class="overflow-hidden w-[320px] h-[550px] mx-auto">
+                        <img class="max-w-full" v-if="page.use_template.cover" :src="img(page.use_template.cover)" />
+                    </div>
+
+                    <div class="popup-wrap absolute inset-x-0 inset-y-0 select-none" :class="{ 'disabled': page.isDisabledPop }"></div>
+
                 </div>
-              </div>
-              <div class="text-center">
-                <el-image
-                  class="w-[100px] h-[100px] mb-[5px]"
-                  :src="wapImage"
-                />
-                <div
-                  @click="toPreview()"
-                  class="text-primary text-base cursor-pointer"
-                >
-                  {{ t('preview') }}
+
+                <div class="w-[700px]">
+                    <div class="flex flex-wrap">
+                        <!-- 多应用切换启动页 -->
+                        <el-button type="primary" @click="showDialog = true" v-if="siteApps.length > 1">{{ t('changePage') }}</el-button>
+                        <el-button type="primary" @click="toDecorate()" v-show="page.use_template.action == 'decorate'" class="ml-[12px]">{{ t('decorate') }}</el-button>
+                    </div>
+
+                    <div class="info-wrap">
+                        <div class="mt-[20px] p-[20px] flex items-center justify-between bg">
+                            <div>
+                                <div class="font-bold">{{ t('H5') }}</div>
+                                <el-form label-width="40px" class="mt-[5px]">
+                                    <el-form-item :label="t('link')" class="mb-[5px]">
+                                        <el-input readonly :value="page.shareUrl" class="!w-[400px]">
+                                            <template #append>
+                                                <el-button @click="copyEvent(page.shareUrl)" class="bg-primary copy">{{ t('copy') }}</el-button>
+                                            </template>
+                                        </el-input>
+                                    </el-form-item>
+                                </el-form>
+                                <div class="text-[#999] text-base">{{ t('scanQRCodeOnRight') }}</div>
+                            </div>
+                            <div class="text-center">
+                                <el-image class="w-[100px] h-[100px] mb-[5px]" :src="wapImage" />
+                                <div @click="toPreview()" class="text-primary text-base cursor-pointer">{{ t('preview') }}</div>
+                            </div>
+                        </div>
+                    </div>
                 </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-
-      <el-dialog
-        v-model="showDialog"
-        :title="t('pageSelectTips')"
-        width="400px"
-        :close-on-press-escape="false"
-        :destroy-on-close="true"
-        :close-on-click-modal="false"
-      >
-        <div class="flex items-start">
-          <el-scrollbar class="pl-4 h-[300px] flex-1">
-            <div class="flex flex-wrap">
-              <div
-                v-for="(item, key) in pageType"
-                :key="key"
-                class="border border-br rounded-[3px] mr-[10px] mb-[10px] px-4 h-[32px] leading-[32px] cursor-pointer hover:bg-primary-light-9 px-[10px] hover:text-primary"
-                :class="[key == link.name ? 'border-primary text-primary' : '']"
-                @click="changeLink(key, item)"
-              >
-                {{ item.title }}
-              </div>
             </div>
-          </el-scrollbar>
-        </div>
-
-        <template #footer>
-          <span class="dialog-footer">
-            <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-            <el-button type="primary" @click="changePage()">{{
-              t('confirm')
-            }}</el-button>
-          </span>
-        </template>
-      </el-dialog>
-    </el-card>
-  </div>
+
+            <el-dialog v-model="showDialog" :title="t('pageSelectTips')" width="400px" :close-on-press-escape="false" :destroy-on-close="true" :close-on-click-modal="false">
+                <div class="flex items-start">
+                    <el-scrollbar class="pl-4 h-[300px] flex-1">
+                        <div class="flex flex-wrap">
+                            <div v-for="(item, key) in pageType" :key="key"
+                                 class="border border-br rounded-[3px] mr-[10px] mb-[10px] px-4 h-[32px] leading-[32px] cursor-pointer hover:bg-primary-light-9 px-[10px] hover:text-primary"
+                                 :class="[key == link.name ? 'border-primary text-primary' : '']"
+                                 @click="changeLink(key,item)">{{ item.title }}
+                            </div>
+                        </div>
+                    </el-scrollbar>
+                </div>
+
+                <template #footer>
+                    <span class="dialog-footer">
+                        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                        <el-button type="primary" @click="changePage()">{{ t('confirm') }}</el-button>
+                    </span>
+                </template>
+            </el-dialog>
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -170,7 +89,7 @@ import { t } from '@/lang'
 import { img } from '@/utils/common'
 import { useRouter } from 'vue-router'
 import { ElMessage } from 'element-plus'
-import { getDecoratePage, changeTemplate, getDiyTemplate } from '@/app/api/diy'
+import { getDecoratePage, changeTemplate,getDiyTemplate } from '@/app/api/diy'
 import storage from '@/utils/storage'
 import QRCode from 'qrcode'
 import { useClipboard } from '@vueuse/core'
@@ -178,81 +97,81 @@ import useSystemStore from '@/stores/modules/system'
 
 const systemStore = useSystemStore()
 const siteApps = computed(() => {
-  return systemStore?.apps
+    return systemStore?.apps
 })
 
-const type: any = ref('DIY_MEMBER_INDEX')
+const type: any = ref('DIY_MEMBER_INDEX');
 const page: any = reactive({})
 const router = useRouter()
 const wapDomain = ref('')
 const wapImage = ref('')
 const link: any = ref({
-  name: '',
+    name: ''
 })
 
 // 切换页面
 const formData = reactive({
-  type: '',
-  name: '',
-  page: '',
-  title: '',
-  action: '',
+    type: '',
+    name: '',
+    page: '',
+    title: '',
+    action: ''
 })
 
 const showDialog = ref(false)
 const pageType: any = reactive({}) // 页面类型
 
 // 获取自定义页面类型
-getDiyTemplate({ type: 'member_index' }).then((res) => {
-  for (const key in res.data) {
-    pageType[key] = res.data[key]
-  }
+getDiyTemplate({ type: 'member_index' }).then(res => {
+    for (const key in res.data) {
+        pageType[key] = res.data[key]
+    }
 })
 
 // 初始化数据
 const refreshData = () => {
-  getDecoratePage({
-    type: type.value,
-  }).then((res) => {
-    for (const key in res.data) {
-      page[key] = res.data[key]
-    }
-
-    link.value.name = page.use_template.name
-    link.value.title = page.use_template.title
-    link.value.page = page.use_template.page
-    link.value.action = page.use_template.action
-
-    if (page.use_template.url) {
-      page.loadingIframe = false // 加载iframe
-      page.loadingDev = false // 加载开发环境配置
-      page.isDisabledPop = false // 是否禁止打开遮罩层
-      page.difference = 0 // 检测页面加载差异，小于1000毫秒，则配置wap端域名
-
-      wapDomain.value = page.domain_url.wap_domain
-      page.wapUrl = page.domain_url.wap_url
-
-      let repeat = true // 防重复执行
-
-      if (import.meta.env.MODE == 'development') {
-        // 开发模式情况下，并且未配置wap域名，则获取缓存域名
-        if (wapDomain.value && wapDomain.value.indexOf('localhost') != -1) {
-          page.wapUrl = wapDomain.value + '/wap'
-          repeat = false
-          setDomain()
-        }
-        if (storage.get('wap_domain')) {
-          page.wapUrl = storage.get('wap_domain')
-          repeat = false
-          setDomain()
+    getDecoratePage({
+        type : type.value
+    }).then(res => {
+        for (const key in res.data) {
+            page[key] = res.data[key]
         }
-      }
 
-      if (repeat) {
-        setDomain()
-      }
-    }
-  })
+        link.value.name = page.use_template.name;
+        link.value.title = page.use_template.title;
+        link.value.page = page.use_template.page;
+        link.value.action = page.use_template.action;
+
+        if (page.use_template.url) {
+            page.loadingIframe = false // 加载iframe
+            page.loadingDev = false // 加载开发环境配置
+            page.isDisabledPop = false // 是否禁止打开遮罩层
+            page.difference = 0 // 检测页面加载差异，小于1000毫秒，则配置wap端域名
+
+            wapDomain.value = page.domain_url.wap_domain
+            page.wapUrl = page.domain_url.wap_url
+
+            let repeat = true; // 防重复执行
+
+            if (import.meta.env.MODE == 'development') {
+                // 开发模式情况下，并且未配置wap域名，则获取缓存域名
+                if (wapDomain.value && wapDomain.value.indexOf('localhost') != -1) {
+                    page.wapUrl = wapDomain.value + '/wap'
+                    repeat = false
+                    setDomain()
+                }
+                if (storage.get('wap_domain')) {
+                    page.wapUrl = storage.get('wap_domain')
+                    repeat = false
+                    setDomain()
+                }
+            }
+
+            if(repeat) {
+                setDomain()
+            }
+        }
+    })
 }
 
 refreshData()
@@ -260,222 +179,210 @@ refreshData()
 const uniAppLoadStatus = ref(false) // uni-app 加载状态，true：加粗完成，false：未完成
 
 // 监听 uni-app 端 是否加载完成
-window.addEventListener(
-  'message',
-  (event) => {
+window.addEventListener('message', (event) => {
     try {
-      let data = {
-        type: '',
-      }
-      if (typeof event.data == 'string') {
-        data = JSON.parse(event.data)
-      } else if (typeof event.data == 'object') {
-        data = event.data
-      }
-
-      if (data.type && ['appOnLaunch', 'appOnReady'].indexOf(data.type) != -1) {
-        page.loadingDev = false // 禁用开发环境配置
-        page.loadingIframe = true // 加载iframe
-        let loadTime = new Date().getTime()
-        page.difference = loadTime - page.timeIframe
-        page.isDisabledPop = false // 是否禁止打开遮罩层
-        uniAppLoadStatus.value = true // 加载完成
-      }
+        let data = {
+            type: ''
+        };
+        if(typeof event.data == 'string') {
+            data = JSON.parse(event.data)
+        }else if(typeof event.data == 'object') {
+            data = event.data
+        }
+
+        if (data.type && ['appOnLaunch', 'appOnReady'].indexOf(data.type) != -1) {
+            page.loadingDev = false // 禁用开发环境配置
+            page.loadingIframe = true // 加载iframe
+            let loadTime = new Date().getTime()
+            page.difference = loadTime - page.timeIframe
+            page.isDisabledPop = false // 是否禁止打开遮罩层
+            uniAppLoadStatus.value = true // 加载完成
+        }
     } catch (e) {
-      initLoad()
-      console.log('diy member 后台接受数据错误', e)
+        initLoad()
+        console.log('diy member 后台接受数据错误', e)
     }
-  },
-  false
-)
+}, false)
 
 // 将数据发送到uniapp
 const postMessage = () => {
-  const diyData = JSON.stringify({
-    type: 'appOnReady',
-    message: '加载完成',
-  })
-  if (window['previewIframe_' + type.value])
-    window['previewIframe_' + type.value].contentWindow.postMessage(
-      diyData,
-      '*'
-    )
+    const diyData = JSON.stringify({
+        type: 'appOnReady',
+        message: '加载完成'
+    })
+    if (window['previewIframe_' + type.value]) window['previewIframe_' + type.value].contentWindow.postMessage(diyData, '*')
 }
 
 // 初始化加载状态
 const initLoad = () => {
-  page.loadingDev = true
-  page.isDisabledPop = true
-  page.loadingIframe = false
+    page.loadingDev = true
+    page.isDisabledPop = true
+    page.loadingIframe = false
 }
 
 const saveDomain = () => {
-  if (wapDomain.value.trim().length == 0) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('wapDomainPlaceholder')}`,
-    })
-    return
-  }
-  const wapUrl = wapDomain.value + '/wap'
-  storage.set({ key: 'wap_domain', data: wapUrl })
-
-  if (page.use_template.url) {
-    page.wapUrl = wapUrl
-    setDomain()
-  }
-  setTimeout(() => {
+    if (wapDomain.value.trim().length == 0) {
+        ElMessage({
+            type: 'warning',
+            message: `${t('wapDomainPlaceholder')}`,
+        })
+        return
+    }
+    const wapUrl = wapDomain.value + '/wap'
+    storage.set({key: 'wap_domain', data: wapUrl})
+
     if (page.use_template.url) {
-      page.loadingIframe = true // 加载iframe
-      page.loadingDev = false // 加载开发环境配置
-      page.isDisabledPop = false // 是否禁止打开遮罩层
+        page.wapUrl = wapUrl
+        setDomain()
     }
-  }, 100 * 3)
+    setTimeout(() => {
+        if (page.use_template.url) {
+            page.loadingIframe = true // 加载iframe
+            page.loadingDev = false // 加载开发环境配置
+            page.isDisabledPop = false // 是否禁止打开遮罩层
+        }
+    }, 100 * 3)
 }
 
 const settingTips = () => {
-  window.open('https://www.kancloud.cn/niucloud/niucloud-admin-develop/3213393')
+    window.open('https://www.kancloud.cn/niucloud/niucloud-admin-develop/3213393')
 }
 
 const setDomain = () => {
-  page.use_template.wapPreview = page.wapUrl + page.use_template.url
-  page.shareUrl = page.wapUrl + page.page
-  QRCode.toDataURL(page.shareUrl, {
-    errorCorrectionLevel: 'L',
-    margin: 0,
-    width: 100,
-  }).then((url) => {
-    wapImage.value = url
-  })
-
-  const send = () => {
-    page.timeIframe = new Date().getTime()
-    postMessage()
-  }
-
-  // 同步发送一次消息
-  send()
-
-  // 如果同步发送消息的 uni-app没有接收到回应，则定时发送消息
-  let sendCount = 0
-  let timeInterVal = setInterval(() => {
-    // 接收 uni-app 发送的消息 或者 发送50次后未响应，则停止发送
-    if (uniAppLoadStatus.value || sendCount >= 50) {
-      clearInterval(timeInterVal)
-      return
+    page.use_template.wapPreview = page.wapUrl + page.use_template.url
+    page.shareUrl = page.wapUrl + page.page;
+    QRCode.toDataURL(page.shareUrl, { errorCorrectionLevel: 'L', margin: 0, width: 100 }).then(url => {
+        wapImage.value = url
+    })
+
+    const send = ()=>{
+        page.timeIframe = new Date().getTime()
+        postMessage()
     }
 
+    // 同步发送一次消息
     send()
-    sendCount++
-  }, 200)
 
-  // 如果10秒内加载不出来，则需要配置域名
-  setTimeout(() => {
-    if (page.difference == 0) initLoad()
-  }, 1000 * 10)
+    // 如果同步发送消息的 uni-app没有接收到回应，则定时发送消息
+    let sendCount = 0;
+    let timeInterVal = setInterval(()=>{
+        // 接收 uni-app 发送的消息 或者 发送50次后未响应，则停止发送
+        if(uniAppLoadStatus.value || sendCount >= 50){
+            clearInterval(timeInterVal)
+            return
+        }
+
+        send()
+        sendCount++;
+    },200)
+
+    // 如果10秒内加载不出来，则需要配置域名
+    setTimeout(() => {
+        if (page.difference == 0) initLoad()
+    }, 1000 * 10)
 }
 
 // 跳转去装修
 const toDecorate = () => {
-  const query: any = {
-    back: '/admin/diy/member',
-  }
-  if (page.use_template.id) {
-    query.id = page.use_template.id
-  } else if (page.use_template.type) {
-    query.name = page.use_template.type
-  } else if (page.use_template.url) {
-    query.url = page.use_template.url
-  }
-  const url = router.resolve({
-    path: '/decorate/edit',
-    query,
-  })
-  window.open(url.href)
+    const query: any = {
+        back: '/admin/diy/member'
+    }
+    if (page.use_template.id) {
+        query.id = page.use_template.id
+    } else if (page.use_template.type) {
+        query.name = page.use_template.type
+    } else if (page.use_template.url) {
+        query.url = page.use_template.url
+    }
+    const url = router.resolve({
+        path: '/decorate/edit',
+        query
+    })
+    window.open(url.href)
 }
 
 // 跳转去预览
 const toPreview = () => {
-  let value = page.use_template.page
-  if (page.use_template.url) {
-    value = page.use_template.url
-  } else if (page.use_template.id) {
-    value += '?id=' + page.use_template.id
-  }
-  const url = router.resolve({
-    path: '/preview/wap',
-    query: {
-      page: value,
-    },
-  })
-  window.open(url.href)
+    let value = page.use_template.page
+    if (page.use_template.url) {
+        value = page.use_template.url
+    } else if (page.use_template.id) {
+        value += '?id=' + page.use_template.id
+    }
+    const url = router.resolve({
+        path: '/preview/wap',
+        query: {
+            page:value
+        }
+    })
+    window.open(url.href)
 }
 
 // 切换页面链接
-const changeLink = (key: any, item: any) => {
-  link.value.name = key
-  link.value.page = item.page
-  link.value.title = item.title
-  link.value.action = item.action
+const changeLink = (key:any,item: any) => {
+    link.value.name = key;
+    link.value.page = item.page;
+    link.value.title = item.title;
+    link.value.action = item.action;
 }
 
 const isRepeat = ref(false)
 
-const changePage = () => {
-  formData.type = type.value
-  formData.name = link.value.name
-  formData.page = link.value.page
-  formData.title = link.value.title
-  formData.action = link.value.action
-
-  if (isRepeat.value) return
-  isRepeat.value = true
-
-  changeTemplate({
-    ...formData,
-  }).then((res) => {
-    isRepeat.value = false
-    showDialog.value = false
-    refreshData()
-  })
+const changePage = ()=>{
+    formData.type = type.value;
+    formData.name = link.value.name;
+    formData.page = link.value.page;
+    formData.title = link.value.title;
+    formData.action = link.value.action;
+
+    if (isRepeat.value) return
+    isRepeat.value = true
+
+    changeTemplate({
+        ...formData
+    }).then((res) => {
+        isRepeat.value = false
+        showDialog.value = false;
+        refreshData()
+    })
 }
 
 // 复制
 const { copy, isSupported, copied } = useClipboard()
 const copyEvent = (text: string) => {
-  if (!isSupported.value) {
-    ElMessage({
-      message: t('notSupportCopy'),
-      type: 'warning',
-    })
-  }
-  copy(text)
+    if (!isSupported.value) {
+        ElMessage({
+            message: t('notSupportCopy'),
+            type: 'warning'
+        })
+    }
+    copy(text)
 }
 
 watch(copied, () => {
-  if (copied.value) {
-    ElMessage({
-      message: t('copySuccess'),
-      type: 'success',
-    })
-  }
+    if (copied.value) {
+        ElMessage({
+            message: t('copySuccess'),
+            type: 'success'
+        })
+    }
 })
 </script>
 
 <style lang="scss" scoped>
-.page-item {
-  background-image: url(@/app/assets/images/iphone_bg.png);
-  background-color: var(--el-bg-color);
-  background-size: 100%;
-
-  .popup-wrap {
-    display: none;
-  }
-
-  &:hover {
-    .popup-wrap:not(.disabled) {
-      display: block !important;
+    .page-item {
+        background-image: url(@/app/assets/images/iphone_bg.png);
+        background-color: var(--el-bg-color);
+        background-size: 100%;
+
+        .popup-wrap {
+            display: none;
+        }
+
+        &:hover {
+            .popup-wrap:not(.disabled) {
+                display: block !important;
+            }
+        }
     }
-  }
-}
 </style>
diff --git a/admin/src/app/views/diy/route.vue b/admin/src/app/views/diy/route.vue
index c41628b3..0dbe22dc 100644
--- a/admin/src/app/views/diy/route.vue
+++ b/admin/src/app/views/diy/route.vue
@@ -1,185 +1,100 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
-
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="diyRouteTableData.searchParam"
-          ref="searchFormDiyRouteRef"
-        >
-          <el-form-item :label="t('title')" prop="title">
-            <el-input
-              v-model.trim="diyRouteTableData.searchParam.title"
-              :placeholder="t('titlePlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('forAddon')" prop="addon_name">
-            <el-select
-              v-model="diyRouteTableData.searchParam.addon_name"
-              :placeholder="t('forAddonPlaceholder')"
-            >
-              <el-option :label="t('all')" value="" />
-              <el-option
-                v-for="(item, key) in apps"
-                :label="item.title"
-                :value="key"
-                :key="key"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="loadDiyRouteList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormDiyRouteRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
-
-      <el-table
-        :data="diyRouteTableData.data"
-        size="large"
-        v-loading="diyRouteTableData.loading"
-      >
-        <template #empty>
-          <span>{{ !diyRouteTableData.loading ? t('emptyData') : '' }}</span>
-        </template>
-
-        <el-table-column prop="title" :label="t('title')" min-width="70" />
-        <el-table-column
-          prop="addon_title"
-          :label="t('forAddon')"
-          min-width="70"
-        >
-          <template #default="{ row }">
-            <span>{{ row.addon_info.title }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="page" :label="t('wapUrl')" min-width="230">
-          <template #default="{ row }">
-            <span class="mr-[10px]">{{ wapDomain + row.page }}</span>
-            <el-button
-              type="primary"
-              link
-              @click="copyEvent(wapDomain + row.page)"
-              >{{ t('copy') }}</el-button
-            >
-          </template>
-        </el-table-column>
-        <el-table-column prop="page" :label="t('weappUrl')" min-width="120">
-          <template #default="{ row }">
-            <span class="mr-[10px]">{{ row.page }}</span>
-            <el-button type="primary" link @click="copyEvent(row.page)">{{
-              t('copy')
-            }}</el-button>
-          </template>
-        </el-table-column>
-        <el-table-column
-          :label="t('share')"
-          fixed="right"
-          align="right"
-          min-width="40"
-        >
-          <template #default="{ row }">
-            <el-button
-              v-if="row.is_share == 1"
-              type="primary"
-              link
-              @click="openShare(row)"
-              >{{ t('shareSet') }}</el-button
-            >
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="mt-[16px] flex justify-end">
-        <el-pagination
-          v-model:current-page="diyRouteTableData.page"
-          v-model:page-size="diyRouteTableData.limit"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="diyRouteTableData.total"
-          @size-change="getDiyRouteListFn"
-          @current-change="loadDiyRouteList"
-        />
-      </div>
-    </el-card>
-
-    <!-- 分享设置-->
-    <el-dialog v-model="shareDialogVisible" :title="t('shareSet')" width="30%">
-      <el-tabs v-model="tabShareType">
-        <el-tab-pane :label="t('wechat')" name="wechat"></el-tab-pane>
-        <el-tab-pane :label="t('weapp')" name="weapp"></el-tab-pane>
-      </el-tabs>
-      <el-form
-        :model="shareFormData[tabShareType]"
-        label-width="90px"
-        ref="shareFormRef"
-        :rules="shareFormRules"
-      >
-        <el-form-item :label="t('sharePage')">
-          <span>{{ sharePage }}</span>
-        </el-form-item>
-        <el-form-item :label="t('shareTitle')" prop="title">
-          <el-input
-            v-model.trim="shareFormData[tabShareType].title"
-            :placeholder="t('shareTitlePlaceholder')"
-            clearable
-            maxlength="30"
-            show-word-limit
-          />
-        </el-form-item>
-        <el-form-item
-          :label="t('shareDesc')"
-          prop="desc"
-          v-if="tabShareType == 'wechat'"
-        >
-          <el-input
-            v-model.trim="shareFormData[tabShareType].desc"
-            :placeholder="t('shareDescPlaceholder')"
-            type="textarea"
-            rows="4"
-            clearable
-            maxlength="100"
-            show-word-limit
-          />
-        </el-form-item>
-        <el-form-item :label="t('shareImageUrl')" prop="url">
-          <upload-image v-model="shareFormData[tabShareType].url" :limit="1" />
-        </el-form-item>
-      </el-form>
-
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="shareDialogVisible = false">{{
-            t('cancel')
-          }}</el-button>
-          <el-button type="primary" @click="shareEvent(shareFormRef)">{{
-            t('confirm')
-          }}</el-button>
-        </span>
-      </template>
-    </el-dialog>
-  </div>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{pageName}}</span>
+            </div>
+
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="diyRouteTableData.searchParam" ref="searchFormDiyRouteRef">
+                    <el-form-item :label="t('title')" prop="title">
+                        <el-input v-model.trim="diyRouteTableData.searchParam.title" :placeholder="t('titlePlaceholder')" />
+                    </el-form-item>
+                    <el-form-item :label="t('forAddon')" prop="addon_name">
+                        <el-select v-model="diyRouteTableData.searchParam.addon_name" :placeholder="t('forAddonPlaceholder')">
+                            <el-option :label="t('all')" value="" />
+                            <el-option v-for="(item, key) in apps" :label="item.title" :value="key" :key="key"/>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="loadDiyRouteList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormDiyRouteRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+
+            <el-table :data="diyRouteTableData.data" size="large" v-loading="diyRouteTableData.loading">
+                <template #empty>
+                    <span>{{ !diyRouteTableData.loading ? t('emptyData') : '' }}</span>
+                </template>
+
+                <el-table-column prop="title" :label="t('title')" min-width="70" />
+                <el-table-column prop="addon_title" :label="t('forAddon')" min-width="70">
+                    <template #default="{ row }">
+                        <span>{{ row.addon_info.title }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="page" :label="t('wapUrl')" min-width="230">
+                    <template #default="{ row }">
+                        <span class="mr-[10px]">{{ wapDomain + row.page }}</span>
+                        <el-button type="primary" link @click="copyEvent(wapDomain + row.page)">{{ t('copy') }}</el-button>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="page" :label="t('weappUrl')" min-width="120">
+                    <template #default="{ row }">
+                        <span class="mr-[10px]">{{ row.page }}</span>
+                        <el-button type="primary" link @click="copyEvent(row.page)">{{ t('copy') }}</el-button>
+                    </template>
+                </el-table-column>
+                <el-table-column :label="t('share')" fixed="right"  align="right" min-width="40">
+                    <template #default="{ row }">
+                        <el-button v-if="row.is_share == 1" type="primary" link @click="openShare(row)">{{ t('shareSet') }}</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <div class="mt-[16px] flex justify-end">
+                <el-pagination v-model:current-page="diyRouteTableData.page" v-model:page-size="diyRouteTableData.limit" layout="total, sizes, prev, pager, next, jumper" :total="diyRouteTableData.total" @size-change="getDiyRouteListFn" @current-change="loadDiyRouteList" />
+            </div>
+        </el-card>
+
+        <!-- 分享设置-->
+        <el-dialog v-model="shareDialogVisible" :title="t('shareSet')" width="30%">
+
+            <el-tabs v-model="tabShareType">
+                <el-tab-pane :label="t('wechat')" name="wechat"></el-tab-pane>
+                <el-tab-pane :label="t('weapp')" name="weapp"></el-tab-pane>
+            </el-tabs>
+            <el-form :model="shareFormData[tabShareType]" label-width="90px" ref="shareFormRef" :rules="shareFormRules">
+                <el-form-item :label="t('sharePage')">
+                    <span>{{ sharePage }}</span>
+                </el-form-item>
+                <el-form-item :label="t('shareTitle')" prop="title">
+                    <el-input v-model.trim="shareFormData[tabShareType].title" :placeholder="t('shareTitlePlaceholder')" clearable maxlength="30" show-word-limit />
+                </el-form-item>
+                <el-form-item :label="t('shareDesc')" prop="desc" v-if="tabShareType == 'wechat'">
+                    <el-input v-model.trim="shareFormData[tabShareType].desc" :placeholder="t('shareDescPlaceholder')" type="textarea" rows="4" clearable maxlength="100" show-word-limit />
+                </el-form-item>
+                <el-form-item :label="t('shareImageUrl')" prop="url">
+                    <upload-image v-model="shareFormData[tabShareType].url" :limit="1" />
+                </el-form-item>
+            </el-form>
+
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="shareDialogVisible = false">{{ t('cancel') }}</el-button>
+                    <el-button type="primary" @click="shareEvent(shareFormRef)">{{ t('confirm') }}</el-button>
+                </span>
+            </template>
+        </el-dialog>
+
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref, watch, computed } from 'vue'
 import { t } from '@/lang'
-import {
-  getDiyRouteAppList,
-  getDiyTemplate,
-  getDiyRouteList,
-  getDiyRouteInfo,
-  editDiyRouteShare,
-} from '@/app/api/diy'
+import { getDiyRouteAppList,getDiyTemplate, getDiyRouteList, getDiyRouteInfo, editDiyRouteShare } from '@/app/api/diy'
 import { ElMessage, FormInstance } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 import { useClipboard } from '@vueuse/core'
@@ -196,97 +111,88 @@ const formRef = ref<FormInstance>()
 const dialogVisible = ref(false)
 
 const diyRouteTableData = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    title: '',
-    addon_name: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        title: '',
+        addon_name:''
+    }
 })
 
 const diyRouteList: any = ref([])
 
 const wapDomain = ref('')
 const getDomain = async () => {
-  wapDomain.value = (await getUrl()).data.wap_url
+    wapDomain.value = (await getUrl()).data.wap_url
 }
 
 getDomain()
 
 const apps: any = reactive({}) // 应用插件列表
 
-getDiyRouteAppList().then((res) => {
-  if (res.data) {
-    for (const key in res.data) {
-      apps[key] = res.data[key]
+getDiyRouteAppList().then(res=> {
+    if (res.data) {
+        for (const key in res.data) {
+            apps[key] = res.data[key];
+        }
     }
-  }
-})
+});
 
 const getDiyRouteListFn = () => {
-  getDiyRouteList({})
-    .then((res) => {
-      diyRouteTableData.loading = false
-      diyRouteList.value = cloneDeep(res.data)
-      loadDiyRouteList(diyRouteTableData.page)
-    })
-    .catch(() => {
-      diyRouteTableData.loading = false
-    })
+    getDiyRouteList({}).then(res => {
+        diyRouteTableData.loading = false
+        diyRouteList.value = cloneDeep(res.data)
+        loadDiyRouteList(diyRouteTableData.page)
+    }).catch(() => {
+        diyRouteTableData.loading = false
+    });
 }
 
-getDiyRouteListFn()
+getDiyRouteListFn();
 
 /**
  * 获取自定义路由列表
  */
 const loadDiyRouteList = (page: number = 1) => {
-  diyRouteTableData.page = page
-
-  const tempData = cloneDeep(diyRouteList.value)
-  const data: any = []
-
-  // 筛选条件
-  for (let i = 0; i < tempData.length; i++) {
-    let isAdd = true
-    if (
-      diyRouteTableData.searchParam.title &&
-      tempData[i].title.indexOf(diyRouteTableData.searchParam.title) == -1
-    ) {
-      isAdd = false
-    }
+    diyRouteTableData.page = page
 
-    if (
-      diyRouteTableData.searchParam.addon_name &&
-      tempData[i].addon_info &&
-      tempData[i].addon_info.key != diyRouteTableData.searchParam.addon_name
-    ) {
-      isAdd = false
-    }
+    const tempData = cloneDeep(diyRouteList.value)
+    const data: any = [];
+
+    // 筛选条件
+    for (let i = 0; i < tempData.length; i++) {
+        let isAdd = true;
+        if (diyRouteTableData.searchParam.title && tempData[i].title.indexOf(diyRouteTableData.searchParam.title) == -1) {
+            isAdd = false;
+        }
 
-    if (isAdd) {
-      data.push(tempData[i])
+        if (diyRouteTableData.searchParam.addon_name && tempData[i].addon_info && tempData[i].addon_info.key != diyRouteTableData.searchParam.addon_name) {
+            isAdd = false;
+        }
+
+        if (isAdd) {
+            data.push(tempData[i]);
+        }
     }
-  }
 
-  diyRouteTableData.total = data.length
-  const len = Math.ceil(data.length / diyRouteTableData.limit)
-  const dataGather = []
+    diyRouteTableData.total = data.length
+    const len = Math.ceil(data.length / diyRouteTableData.limit)
+    const dataGather = []
 
-  for (let i = 0; i < len; i++) {
-    dataGather[i] = data.splice(0, diyRouteTableData.limit)
-  }
-  diyRouteTableData.data = dataGather[diyRouteTableData.page - 1]
+    for (let i = 0; i < len; i++) {
+        dataGather[i] = data.splice(0, diyRouteTableData.limit)
+    }
+    diyRouteTableData.data = dataGather[diyRouteTableData.page - 1]
 }
 
 // 获取自定义页面模板
-getDiyTemplate({}).then((res) => {
-  for (const key in res.data) {
-    pageTemplate[key] = res.data[key]
-  }
+getDiyTemplate({}).then(res => {
+    for (const key in res.data) {
+        pageTemplate[key] = res.data[key]
+    }
 })
 
 const searchFormDiyRouteRef = ref<FormInstance>()
@@ -296,115 +202,110 @@ const searchFormDiyRouteRef = ref<FormInstance>()
  */
 const { copy, isSupported, copied } = useClipboard()
 const copyEvent = (text: string) => {
-  if (!isSupported.value) {
-    ElMessage({
-      message: t('notSupportCopy'),
-      type: 'warning',
-    })
-  }
-  copy(text)
+    if (!isSupported.value) {
+        ElMessage({
+            message: t('notSupportCopy'),
+            type: 'warning'
+        })
+    }
+    copy(text)
 }
 
 watch(copied, () => {
-  if (copied.value) {
-    ElMessage({
-      message: t('copySuccess'),
-      type: 'success',
-    })
-  }
+    if (copied.value) {
+        ElMessage({
+            message: t('copySuccess'),
+            type: 'success'
+        })
+    }
 })
 
 const tabShareType = ref('wechat')
 const sharePage = ref('')
 const shareFormId = ref(0)
 const diyRouteData = reactive({
-  title: '',
-  name: '',
-  page: '',
-  is_share: 0,
-  sort: 0,
+    title: '',
+    name: '',
+    page: '',
+    is_share: 0,
+    sort: 0
 })
 const shareFormData = reactive({
-  wechat: {
-    title: '',
-    desc: '',
-    url: '',
-  },
-  weapp: {
-    title: '',
-    url: '',
-  },
+    wechat: {
+        title: '',
+        desc: '',
+        url: ''
+    },
+    weapp: {
+        title: '',
+        url: ''
+    }
 })
 const shareDialogVisible = ref(false)
 const shareFormRules = computed(() => {
-  return {}
+    return {}
 })
 
 const shareFormRef = ref<FormInstance>()
 const openShare = async (row: any) => {
-  // 基础页面
-  const info = (
-    await getDiyRouteInfo({
-      name: row.name,
-    })
-  ).data
-
-  if (info.title) {
-    row.id = info.id
-    row.title = info.title
-    row.name = info.name
-    row.page = info.page
-    row.is_share = info.is_share
-    row.sort = info.sort
-    row.share = info.share
-  }
-
-  diyRouteData.title = row.title
-  diyRouteData.name = row.name
-  diyRouteData.page = row.page
-  diyRouteData.is_share = row.is_share
-  diyRouteData.sort = row.sort
-
-  shareFormId.value = row.id
-  sharePage.value = row.title
-  const share = row.share
-    ? JSON.parse(row.share)
-    : {
+    // 基础页面
+    const info = (await getDiyRouteInfo({
+        name: row.name
+    })).data
+
+    if (info.title) {
+        row.id = info.id
+        row.title = info.title
+        row.name = info.name
+        row.page = info.page
+        row.is_share = info.is_share
+        row.sort = info.sort
+        row.share = info.share
+    }
+
+    diyRouteData.title = row.title
+    diyRouteData.name = row.name
+    diyRouteData.page = row.page
+    diyRouteData.is_share = row.is_share
+    diyRouteData.sort = row.sort
+
+    shareFormId.value = row.id
+    sharePage.value = row.title
+    const share = row.share ? JSON.parse(row.share) : {
         wechat: { title: '', desc: '', url: '' },
-        weapp: { title: '', url: '' },
-      }
-  if (share) {
-    shareFormData.wechat = share.wechat
-    shareFormData.weapp = share.weapp
-  }
-
-  shareDialogVisible.value = true
+        weapp: { title: '', url: '' }
+    }
+    if (share) {
+        shareFormData.wechat = share.wechat
+        shareFormData.weapp = share.weapp
+    }
+
+    shareDialogVisible.value = true
 }
 
 const shareEvent = async (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      const save = editDiyRouteShare
-      save({
-        id: shareFormId.value,
-        share: JSON.stringify(shareFormData),
-        ...diyRouteData,
-      })
-        .then(() => {
-          getDiyRouteListFn()
-          shareDialogVisible.value = false
-        })
-        .catch(() => {})
-    }
-  })
+    if (!formEl) return
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            const save = editDiyRouteShare
+            save({
+                id: shareFormId.value,
+                share: JSON.stringify(shareFormData),
+                ...diyRouteData
+            }).then(() => {
+                getDiyRouteListFn()
+                shareDialogVisible.value = false
+            }).catch(() => {
+            })
+        }
+    })
 }
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  getDiyRouteListFn()
+    if (!formEl) return
+    formEl.resetFields()
+    getDiyRouteListFn()
 }
 </script>
 
diff --git a/admin/src/app/views/diy/tabbar.vue b/admin/src/app/views/diy/tabbar.vue
index 06464fdd..bc869edf 100644
--- a/admin/src/app/views/diy/tabbar.vue
+++ b/admin/src/app/views/diy/tabbar.vue
@@ -1,111 +1,96 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
-
-      <el-table
-        class="mt-[20px]"
-        :data="bottomNavTableData.data"
-        size="large"
-        v-loading="bottomNavTableData.loading"
-      >
-        <template #empty>
-          <span>{{ !bottomNavTableData.loading ? t('emptyData') : '' }}</span>
-        </template>
-
-        <el-table-column prop="title" :label="t('title')" min-width="120">
-          <template #default="{ row }">
-            <span>{{ row.info.title }}</span>
-          </template>
-        </el-table-column>
-
-        <el-table-column prop="key" :label="t('key')" min-width="120" />
-
-        <el-table-column :label="t('type')" min-width="120">
-          <template #default="{ row }">
-            <span>{{ row.info.type === 'app' ? t('app') : t('addon') }}</span>
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          :label="t('operation')"
-          fixed="right"
-          align="right"
-          min-width="160"
-        >
-          <template #default="{ row }">
-            <el-button type="primary" link @click="editEvent(row)">{{
-              t('edit')
-            }}</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <div class="mt-[16px] flex justify-end">
-        <el-pagination
-          v-model:current-page="bottomNavTableData.page"
-          v-model:page-size="bottomNavTableData.limit"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="bottomNavTableData.total"
-          @size-change="loadbottomNavList()"
-          @current-change="loadbottomNavList"
-        />
-      </div>
-    </el-card>
-  </div>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+            </div>
+
+            <el-table class="mt-[20px]" :data="bottomNavTableData.data" size="large" v-loading="bottomNavTableData.loading">
+                <template #empty>
+                    <span>{{ !bottomNavTableData.loading ? t('emptyData') : '' }}</span>
+                </template>
+
+                <el-table-column prop="title" :label="t('title')" min-width="120" >
+                    <template #default="{ row }">
+                        <span>{{ row.info.title }}</span>
+                    </template>
+                </el-table-column>
+
+                <el-table-column prop="key" :label="t('key')" min-width="120"/>
+
+                <el-table-column :label="t('type')" min-width="120">
+                    <template #default="{ row }">
+                        <span>{{ row.info.type === 'app' ? t('app') : t('addon') }}</span>
+                    </template>
+                </el-table-column>
+
+                <el-table-column :label="t('operation')" fixed="right" align="right" min-width="160">
+                    <template #default="{ row }">
+                        <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <div class="mt-[16px] flex justify-end">
+                <el-pagination v-model:current-page="bottomNavTableData.page" v-model:page-size="bottomNavTableData.limit"
+                               layout="total, sizes, prev, pager, next, jumper" :total="bottomNavTableData.total"
+                               @size-change="loadbottomNavList()" @current-change="loadbottomNavList" />
+            </div>
+
+        </el-card>
+
+    </div>
 </template>
 
 <script lang="ts" setup>
-import { reactive, ref } from 'vue'
-import { t } from '@/lang'
-import { getDiyBottomList } from '@/app/api/diy'
-import { useRoute, useRouter } from 'vue-router'
-import { cloneDeep } from 'lodash-es'
-
-const route = useRoute()
-const router = useRouter()
-const pageName = route.meta.title
-
-const bottomNavTableData: any = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-})
-
-// 获取自定义页面列表
-const loadBottomNavList = (page: number = 1) => {
-  bottomNavTableData.loading = true
-  bottomNavTableData.page = page
-
-  getDiyBottomList({})
-    .then((res) => {
-      bottomNavTableData.loading = false
-
-      const len = Math.ceil(res.data.length / bottomNavTableData.limit)
-      const data = cloneDeep(res.data)
-      const dataGather = []
-      for (let i = 0; i < len; i++) {
-        dataGather[i] = data.splice(0, bottomNavTableData.limit)
-      }
-      bottomNavTableData.data = dataGather[bottomNavTableData.page - 1]
-
-      bottomNavTableData.total = res.data.length
+    import { reactive, ref } from 'vue'
+    import { t } from '@/lang'
+    import { getDiyBottomList } from '@/app/api/diy'
+    import { useRoute, useRouter } from 'vue-router'
+    import { cloneDeep } from 'lodash-es'
+
+    const route = useRoute()
+    const router = useRouter()
+    const pageName = route.meta.title
+
+    const bottomNavTableData: any = reactive({
+        page: 1,
+        limit: 10,
+        total: 0,
+        loading: true,
+        data: [],
     })
-    .catch(() => {
-      bottomNavTableData.loading = false
-    })
-}
 
-loadBottomNavList()
+    // 获取自定义页面列表
+    const loadBottomNavList = (page: number = 1) => {
+        bottomNavTableData.loading = true
+        bottomNavTableData.page = page
+
+        getDiyBottomList({}).then(res => {
+            bottomNavTableData.loading = false
+
+            const len = Math.ceil(res.data.length / bottomNavTableData.limit)
+            const data = cloneDeep(res.data)
+            const dataGather = []
+            for (let i = 0; i < len; i++) {
+                dataGather[i] = data.splice(0, bottomNavTableData.limit)
+            }
+            bottomNavTableData.data = dataGather[bottomNavTableData.page - 1]
+
+            bottomNavTableData.total = res.data.length
+        }).catch(() => {
+            bottomNavTableData.loading = false
+        })
+    }
+
+    loadBottomNavList()
+
+    // 编辑底部导航
+    const editEvent = (data: any) => {
+        router.push('/diy/tabbar_edit?key=' + data.key)
+    }
 
-// 编辑底部导航
-const editEvent = (data: any) => {
-  router.push('/diy/tabbar_edit?key=' + data.key)
-}
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/diy/tabbar_edit.vue b/admin/src/app/views/diy/tabbar_edit.vue
index 91660a92..ff749876 100644
--- a/admin/src/app/views/diy/tabbar_edit.vue
+++ b/admin/src/app/views/diy/tabbar_edit.vue
@@ -1,213 +1,105 @@
 <template>
-  <div class="main-container">
-    <el-card class="card !border-none" shadow="never">
-      <el-page-header :content="pageName" :icon="ArrowLeft" @back="back()" />
-    </el-card>
+    <div class="main-container">
+        <el-card class="card !border-none" shadow="never">
+            <el-page-header :content="pageName" :icon="ArrowLeft" @back="back()" />
+        </el-card>
 
-    <el-card
-      class="box-card mt-[15px] !border-none"
-      shadow="never"
-      v-loading="loading"
-    >
-      <div class="flex">
-        <div
-          class="w-[360px] h-[400px] absolute mr-[30px] border-[1px] border-gray-300"
-        >
-          <div
-            class="flex items-center justify-between absolute h-[60px] left-[0px] right-[0px] bottom-[0px] border-[1px] border-primary"
-            :style="{ backgroundColor: diyBottomData.value.backgroundColor }"
-          >
-            <div
-              class="flex flex-1 flex-col items-center justify-center"
-              v-for="(item, index) in diyBottomData.value.list"
-              :key="'b' + index"
-            >
-              <el-image
-                class="w-[22px] h-[22px] mb-[5px] leading-1"
-                :src="img(item.iconPath)"
-                :fit="contain"
-                v-if="['1', '2'].includes(diyBottomData.value.type.toString())"
-              >
-                <template #error>
-                  <div class="image-slot flex justify-center items-center mt-1">
-                    <el-icon
-                      ><Picture class="text-3xl text-gray-500"
-                    /></el-icon>
-                  </div>
-                </template>
-              </el-image>
-              <span
-                class="text-[12px]"
-                v-if="['1', '3'].includes(diyBottomData.value.type.toString())"
-                :style="{ color: diyBottomData.value.textColor }"
-                >{{ item.text }}</span
-              >
-            </div>
-          </div>
-        </div>
-        <div class="flex-1 ml-[430px]">
-          <div
-            class="flex items-center border-l-[3px] border-primary pl-[5px] leading-[1.1] mt-[10px]"
-          >
-            <span class="text-[14px]">{{ t('editing') }}</span>
-            <span class="text-[14px] text-primary mx-[3px]">{{
-              diyBottomData.info.title
-            }}</span>
-            <span class="text-[14px]">{{ t('bottomNav') }}</span>
-            <span class="text-[12px] ml-[8px] text-gray-500">{{
-              t('bottomNavHint')
-            }}</span>
-          </div>
-          <el-form
-            :model="diyBottomData.value"
-            label-width="100px"
-            ref="formRef"
-          >
-            <el-tabs v-model="activeName" class="demo-tabs mt-[15px]">
-              <el-tab-pane :label="t('navImage')" name="navPicture">
-                <div ref="navItemRef">
-                  <div
-                    v-for="(item, index) in diyBottomData.value.list"
-                    :key="'a' + index"
-                    :data-id="index"
-                    class="item-wrap border-2 border-dashed pt-[18px] m-[10px] mb-[15px] relative list-item"
-                    :class="{ 'not-sort': useDrag }"
-                  >
-                    <el-form-item :label="t('navIconOne')">
-                      <div class="flex align-center">
-                        <div class="flex flex-col justify-center items-center">
-                          <upload-image
-                            v-model="item.iconPath"
-                            width="60px"
-                            height="60px"
-                            :limit="1"
-                          />
-                          <span class="mr-[10px] text-sm">{{
-                            t('uploadImgUnselected')
-                          }}</span>
-                        </div>
-                        <div class="flex flex-col justify-center items-center">
-                          <upload-image
-                            v-model="item.iconSelectPath"
-                            width="60px"
-                            height="60px"
-                            :limit="1"
-                          />
-                          <span class="mr-[10px] text-sm">{{
-                            t('uploadImgSelected')
-                          }}</span>
+        <el-card class="box-card mt-[15px] !border-none" shadow="never" v-loading="loading">
+            <div class="flex">
+                <div class="w-[360px] h-[400px] absolute mr-[30px] border-[1px] border-gray-300">
+                    <div class="flex items-center justify-between absolute h-[60px] left-[0px] right-[0px] bottom-[0px] border-[1px] border-primary" :style="{ 'backgroundColor': diyBottomData.value.backgroundColor }">
+                        <div class="flex flex-1 flex-col items-center justify-center" v-for="(item, index) in diyBottomData.value.list" :key="'b' + index">
+                            <el-image class="w-[22px] h-[22px] mb-[5px] leading-1" :src="img(item.iconPath)" :fit="contain"  v-if="['1', '2'].includes(diyBottomData.value.type.toString())">
+                                <template #error>
+                                    <div class="image-slot flex justify-center items-center mt-1">
+                                        <el-icon><Picture class="text-3xl text-gray-500" /></el-icon>
+                                    </div>
+                                </template>
+                            </el-image>
+                            <span class="text-[12px]" v-if="['1', '3'].includes(diyBottomData.value.type.toString())" :style="{ 'color': diyBottomData.value.textColor }">{{ item.text }}</span>
                         </div>
-                      </div>
-                    </el-form-item>
-                    <el-form-item :label="t('navTitleOne')">
-                      <el-input
-                        class="!w-[215px]"
-                        v-model.trim="item.text"
-                        :placeholder="t('titleContent')"
-                        maxlength="5"
-                        show-word-limit
-                      />
-                    </el-form-item>
-                    <el-form-item :label="t('navLinkOne')">
-                      <diy-link v-model="item.link" @confirm="diyLinkFn" />
-                    </el-form-item>
-                    <el-icon
-                      class="close-icon cursor-pointer -top-[11px] -right-[8px]"
-                      @click="deleteNav(index)"
-                    >
-                      <CircleCloseFilled />
-                    </el-icon>
-                  </div>
+                    </div>
                 </div>
+                <div class="flex-1 ml-[430px]">
+                    <div class="flex items-center border-l-[3px] border-primary pl-[5px] leading-[1.1] mt-[10px]">
+                        <span class="text-[14px]">{{ t('editing') }}</span>
+                        <span class="text-[14px] text-primary mx-[3px]">{{ diyBottomData.info.title }}</span>
+                        <span class="text-[14px]">{{ t('bottomNav') }}</span>
+                        <span class="text-[12px] ml-[8px] text-gray-500">{{ t('bottomNavHint') }}</span>
+                    </div>
+                    <el-form :model="diyBottomData.value" label-width="100px" ref="formRef">
+                        <el-tabs v-model="activeName" class="demo-tabs mt-[15px]">
+                            <el-tab-pane :label="t('navImage')" name="navPicture">
+                                <div ref="navItemRef">
+                                    <div v-for="(item,index) in diyBottomData.value.list" :key="'a'+index" :data-id="index"  class="item-wrap border-2 border-dashed pt-[18px] m-[10px] mb-[15px] relative list-item" :class="{ 'not-sort': useDrag }">
+                                        <el-form-item :label="t('navIconOne')">
+                                            <div class="flex align-center">
+                                                <div class="flex flex-col justify-center items-center">
+                                                    <upload-image v-model="item.iconPath" width="60px" height="60px" :limit="1" />
+                                                    <span class="mr-[10px] text-sm">{{t('uploadImgUnselected')}}</span>
+                                                </div>
+                                                <div class="flex flex-col justify-center items-center">
+                                                    <upload-image v-model="item.iconSelectPath" width="60px" height="60px" :limit="1" />
+                                                    <span class="mr-[10px] text-sm">{{t('uploadImgSelected')}}</span>
+                                                </div>
+                                            </div>
+                                        </el-form-item>
+                                        <el-form-item :label="t('navTitleOne')">
+                                            <el-input class="!w-[215px]" v-model.trim="item.text" :placeholder="t('titleContent')" maxlength="5" show-word-limit />
+                                        </el-form-item>
+                                        <el-form-item :label="t('navLinkOne')">
+                                            <diy-link v-model="item.link" @confirm="diyLinkFn" />
+                                        </el-form-item>
+                                        <el-icon class="close-icon cursor-pointer -top-[11px] -right-[8px]" @click="deleteNav(index)">
+                                            <CircleCloseFilled />
+                                        </el-icon>
+                                    </div>
+                                </div>
 
-                <el-button
-                  type="primary"
-                  class="mt-[15px]"
-                  v-show="diyBottomData.value.list.length < 5"
-                  @click="addNav"
-                  >{{ t('addnav') }}</el-button
-                >
-              </el-tab-pane>
-              <el-tab-pane :label="t('styleSet')" name="setStyle">
-                <el-form-item :label="t('navType')">
-                  <el-radio-group
-                    v-model="diyBottomData.value.type"
-                    class="ml-4"
-                  >
-                    <el-radio label="1" size="large">{{
-                      t('imageText')
-                    }}</el-radio>
-                    <el-radio label="2" size="large">{{ t('image') }}</el-radio>
-                    <el-radio label="3" size="large">{{ t('text') }}</el-radio>
-                  </el-radio-group>
-                </el-form-item>
-                <el-form-item :label="t('textColor')">
-                  <div class="flex align-center">
-                    <el-color-picker v-model="diyBottomData.value.textColor" />
-                    <el-input
-                      class="ml-[10px]"
-                      v-model.trim="diyBottomData.value.textColor"
-                      disabled
-                    />
-                    <el-button
-                      class="ml-[10px]"
-                      type="primary"
-                      @click="diyBottomData.value.textColor = '#333333'"
-                      >{{ t('reset') }}</el-button
-                    >
-                  </div>
-                </el-form-item>
-                <el-form-item :label="t('textSelectColor')">
-                  <div class="flex align-center">
-                    <el-color-picker
-                      v-model="diyBottomData.value.textHoverColor"
-                    />
-                    <el-input
-                      class="ml-[10px]"
-                      v-model.trim="diyBottomData.value.textHoverColor"
-                      disabled
-                    />
-                    <el-button
-                      class="ml-[10px]"
-                      type="primary"
-                      @click="diyBottomData.value.textHoverColor = '#333333'"
-                      >{{ t('reset') }}</el-button
-                    >
-                  </div>
-                </el-form-item>
-                <el-form-item :label="t('backgroundColor')">
-                  <div class="flex align-center">
-                    <el-color-picker
-                      v-model="diyBottomData.value.backgroundColor"
-                    />
-                    <el-input
-                      class="ml-[10px]"
-                      v-model.trim="diyBottomData.value.backgroundColor"
-                      disabled
-                    />
-                    <el-button
-                      class="ml-[10px]"
-                      type="primary"
-                      @click="diyBottomData.value.backgroundColor = '#FFFFFF'"
-                      >{{ t('reset') }}</el-button
-                    >
-                  </div>
-                </el-form-item>
-              </el-tab-pane>
-            </el-tabs>
-          </el-form>
+                                <el-button type="primary" class="mt-[15px]" v-show="diyBottomData.value.list.length < 5" @click="addNav">{{ t('addnav') }}</el-button>
+                            </el-tab-pane>
+                            <el-tab-pane :label="t('styleSet')" name="setStyle">
+                                <el-form-item :label="t('navType')">
+                                    <el-radio-group v-model="diyBottomData.value.type" class="ml-4">
+                                        <el-radio label="1" size="large">{{ t('imageText') }}</el-radio>
+                                        <el-radio label="2" size="large">{{ t('image') }}</el-radio>
+                                        <el-radio label="3" size="large">{{ t('text') }}</el-radio>
+                                    </el-radio-group>
+                                </el-form-item>
+                                <el-form-item :label="t('textColor')">
+                                    <div class="flex align-center">
+                                        <el-color-picker v-model="diyBottomData.value.textColor" />
+                                        <el-input class="ml-[10px]" v-model.trim="diyBottomData.value.textColor" disabled />
+                                        <el-button class="ml-[10px]" type="primary" @click="diyBottomData.value.textColor = '#333333'">{{ t('reset') }}</el-button>
+                                    </div>
+                                </el-form-item>
+                                <el-form-item :label="t('textSelectColor')">
+                                    <div class="flex align-center">
+                                        <el-color-picker v-model="diyBottomData.value.textHoverColor" />
+                                        <el-input class="ml-[10px]" v-model.trim="diyBottomData.value.textHoverColor" disabled />
+                                        <el-button class="ml-[10px]" type="primary" @click="diyBottomData.value.textHoverColor = '#333333'">{{ t('reset') }}</el-button>
+                                    </div>
+                                </el-form-item>
+                                <el-form-item :label="t('backgroundColor')">
+                                    <div class="flex align-center">
+                                        <el-color-picker v-model="diyBottomData.value.backgroundColor" />
+                                        <el-input class="ml-[10px]" v-model.trim="diyBottomData.value.backgroundColor" disabled />
+                                        <el-button class="ml-[10px]" type="primary" @click="diyBottomData.value.backgroundColor = '#FFFFFF'">{{ t('reset') }}</el-button>
+                                    </div>
+                                </el-form-item>
+                            </el-tab-pane>
+                        </el-tabs>
+                    </el-form>
+                </div>
+            </div>
+        </el-card>
+        <div class="fixed-footer-wrap">
+            <div class="fixed-footer">
+                <el-button type="primary" @click="onSave(formRef)">{{ t('save') }}</el-button>
+                <el-button @click="back()">{{ t('back') }}</el-button>
+            </div>
         </div>
-      </div>
-    </el-card>
-    <div class="fixed-footer-wrap">
-      <div class="fixed-footer">
-        <el-button type="primary" @click="onSave(formRef)">{{
-          t('save')
-        }}</el-button>
-        <el-button @click="back()">{{ t('back') }}</el-button>
-      </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
@@ -219,7 +111,7 @@ import { ArrowLeft } from '@element-plus/icons-vue'
 import { getDiyBottomConfig, setDiyBottomConfig } from '@/app/api/diy'
 import Sortable from 'sortablejs'
 import { range } from 'lodash-es'
-import { useRoute, useRouter } from 'vue-router'
+import { useRoute,useRouter } from 'vue-router'
 
 const route = useRoute()
 const router = useRouter()
@@ -227,46 +119,46 @@ const pageName = route.meta.title
 
 const activeName = ref<string>('navPicture')
 const loading = ref<boolean>(false)
-route.query.key = route.query.key || ''
+route.query.key = route.query.key || '';
 
 // 底部导航数据
 const diyBottomData = reactive({
-  key: '',
-  info: {},
-  value: {
-    backgroundColor: '#FFFFFF',
-    textColor: '#333333',
-    textHoverColor: '#333333',
-    type: '1',
-    list: [],
-  },
+    key:'',
+    info:{},
+    value:{
+        backgroundColor: '#FFFFFF',
+        textColor: '#333333',
+        textHoverColor: '#333333',
+        type: '1',
+        list: []
+    }
 })
 
 // 底部导航项数据
 const diyBottomItemData = reactive({
-  text: '',
-  link: {
-    name: '',
-    title: '',
-    parent: '',
-    url: '',
-  },
-  iconSelectPath: '',
-  iconPath: '',
+    text: '',
+    link: {
+        name: '',
+        title: '',
+        parent: '',
+        url: ''
+    },
+    iconSelectPath: '',
+    iconPath: ''
 })
 
 // 添加导航
 const addNav = (): void => {
-  if (diyBottomData.value.list.length >= 5) return
-  diyBottomData.value.list.push({ ...diyBottomItemData })
+    if (diyBottomData.value.list.length >= 5) return
+    diyBottomData.value.list.push({ ...diyBottomItemData })
 }
 
 addNav()
 
 // 删除导航
-const deleteNav = (index: any): void => {
-  const data = diyBottomData.value.list
-  data.splice(index, 1)
+const deleteNav = (index:any): void => {
+    const data = diyBottomData.value.list
+    data.splice(index, 1)
 }
 
 const formRef = ref<FormInstance>()
@@ -274,116 +166,108 @@ const formRef = ref<FormInstance>()
  * 获取导航数据
  */
 const getDiyBottomFn = () => {
-  loading.value = true
+    loading.value = true
 
-  getDiyBottomConfig({
-    key: route.query.key,
-  })
-    .then((res) => {
-      loading.value = false
-      Object.keys(diyBottomData).forEach((item, index) => {
-        diyBottomData[item] = res.data[item]
-      })
-    })
-    .catch(() => {
-      loading.value = false
+    getDiyBottomConfig({
+        key:route.query.key
+    }).then(res => {
+        loading.value = false
+        Object.keys(diyBottomData).forEach((item, index) => {
+            diyBottomData[item] = res.data[item]
+        })
+    }).catch(() => {
+        loading.value = false
     })
 }
 getDiyBottomFn()
 
 // 保存导航数据
 const onSave = async (formEl: FormInstance | undefined) => {
-  if (verifyFn()) return false
+    if (verifyFn()) return false
 
-  if (loading.value || !formEl) return
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      setDiyBottomConfig({ key: diyBottomData.key, value: diyBottomData.value })
-        .then((res) => {
-          loading.value = false
-        })
-        .catch(() => {
-          loading.value = false
-        })
-    }
-  })
+    if (loading.value || !formEl) return
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+            setDiyBottomConfig({key: diyBottomData.key, value: diyBottomData.value}).then(res => {
+                loading.value = false
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
 }
 
 const back = () => {
-  router.push('/diy/tabbar')
+    router.push('/diy/tabbar')
 }
 
 // 验证
 const verifyFn = (): boolean => {
-  if (diyBottomData.value.list.length < 2) {
-    ElNotification({
-      type: 'error',
-      message: t('leastTwoNav'),
-    })
-    return true
-  }
-  try {
-    const msg = ref<string>('')
-    diyBottomData.value.list.forEach((item: any, index) => {
-      if (!item.iconPath)
-        msg.value = `${t('pleaseUpload')}${index + 1}${t('navIcon')}`
-      if (!item.iconSelectPath)
-        msg.value = `${t('pleaseUpload')}${index + 1}${t('navSelectIcon')}`
-      if (!item.text)
-        msg.value = `${t('pleaseEnter')}[${index + 1}${t('navTitle')}`
-      if (!item.link.url)
-        msg.value = `${t('pleaseChoose')}${index + 1}${t('navLink')}`
-      if (msg.value) {
+    if (diyBottomData.value.list.length < 2) {
         ElNotification({
-          type: 'error',
-          message: msg.value,
+            type: 'error',
+            message: t('leastTwoNav')
         })
-        throw Error()
-      }
-    })
-  } catch (e) {
-    return true
-  }
-  return false
+        return true
+    }
+    try {
+        const msg = ref<string>('')
+        diyBottomData.value.list.forEach((item: any, index) => {
+            if (!item.iconPath) msg.value = `${t('pleaseUpload')}${index + 1}${t('navIcon')}`
+            if (!item.iconSelectPath) msg.value = `${t('pleaseUpload')}${index + 1}${t('navSelectIcon')}`
+            if (!item.text) msg.value = `${t('pleaseEnter')}[${index + 1}${t('navTitle')}`
+            if (!item.link.url) msg.value = `${t('pleaseChoose')}${index + 1}${t('navLink')}`
+            if (msg.value) {
+                ElNotification({
+                    type: 'error',
+                    message: msg.value
+                })
+                throw Error()
+            }
+        })
+    } catch (e) {
+        return true
+    }
+    return false
 }
 
 const navItemRef = ref()
 
 onMounted(() => {
-  const sortable = Sortable.create(navItemRef.value, {
-    group: 'item-wrap',
-    animation: 200,
-    filter: '.not-sort', // 过滤.not-sort的元素
-    onEnd: (event) => {
-      const temp = diyBottomData.value.list[event.oldIndex!]
-      diyBottomData.value.list.splice(event.oldIndex!, 1)
-      diyBottomData.value.list.splice(event.newIndex!, 0, temp)
-      nextTick(() => {
-        sortable.sort(
-          range(diyBottomData.value.list.length).map((value) => {
-            return value.toString()
-          })
-        )
-      })
-    },
-  })
+    const sortable = Sortable.create(navItemRef.value, {
+        group: 'item-wrap',
+        animation: 200,
+        filter: '.not-sort', // 过滤.not-sort的元素
+        onEnd: event => {
+            const temp = diyBottomData.value.list[event.oldIndex!]
+            diyBottomData.value.list.splice(event.oldIndex!, 1)
+            diyBottomData.value.list.splice(event.newIndex!, 0, temp)
+            nextTick(() => {
+                sortable.sort(
+                    range(diyBottomData.value.list.length).map(value => {
+                        return value.toString()
+                    })
+                )
+            })
+        }
+    })
 })
 
 const useDrag = ref(false)
 const diyLinkFn = (val) => {
-  useDrag.value = val
+    useDrag.value = val
 }
 </script>
 <style lang="scss" scoped>
 .close-icon {
-  display: none;
-  position: absolute !important;
-  font-size: 20px !important;
-  color: #7d7b7b !important;
+    display: none;
+    position: absolute !important;
+    font-size: 20px !important;
+    color: #7d7b7b !important;
 }
 
 .list-item:hover .close-icon {
-  display: block;
+    display: block;
 }
 </style>
diff --git a/admin/src/app/views/diy/theme_style.vue b/admin/src/app/views/diy/theme_style.vue
index f84e6b7f..bc202703 100644
--- a/admin/src/app/views/diy/theme_style.vue
+++ b/admin/src/app/views/diy/theme_style.vue
@@ -1,83 +1,56 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
-
-      <el-table :data="data" size="large" class="mt-[20px]" v-loading="loading">
-        <template #empty>
-          <span>{{ !loading ? t('emptyData') : '' }}</span>
-        </template>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+            </div>
 
-        <el-table-column label="应用" min-width="120">
-          <template #default="{ row }">
-            <div class="flex items-center">
-              <el-image
-                class="w-[40px] h-[40px] rounded-md overflow-hidden"
-                :src="img(row.icon)"
-                fit="contain"
-              >
-                <template #error>
-                  <div class="flex items-center w-full h-full">
-                    <img
-                      class="w-full h-full"
-                      src="@/app/assets/images/icon-addon.png"
-                      alt=""
-                    />
-                  </div>
+            <el-table :data="data" size="large" class="mt-[20px]" v-loading="loading">
+                <template #empty>
+                    <span>{{ !loading ? t('emptyData') : '' }}</span>
                 </template>
-              </el-image>
-              <div class="flex-1 ml-2 truncate">{{ row.addon_title }}</div>
-            </div>
-          </template>
-        </el-table-column>
 
-        <el-table-column label="配色名称" min-width="120">
-          <template #default="{ row }">
-            <div>{{ row.color_name }}</div>
-          </template>
-        </el-table-column>
+                <el-table-column label="应用" min-width="120" >
+                    <template #default="{ row }">
+                        <div class="flex items-center">
+                            <el-image class="w-[40px] h-[40px] rounded-md overflow-hidden" :src="img(row.icon)" fit="contain">
+                                <template #error>
+                                    <div class="flex items-center w-full h-full">
+                                        <img class="w-full h-full" src="@/app/assets/images/icon-addon.png" alt="">
+                                    </div>
+                                </template>
+                            </el-image>
+                            <div class="flex-1 ml-2 truncate">{{ row.addon_title }}</div>
+                        </div>
+                    </template>
+                </el-table-column>
 
-        <el-table-column label="配色方案" min-width="120">
-          <template #default="{ row }">
-            <div
-              class="rounded-[3px] inline-flex items-center justify-center border-[1px] border-solid border-[#f2f2f2] overflow-hidden"
-              v-if="row.value"
-            >
-              <span
-                class="w-[18px] h-[18px]"
-                :style="{ backgroundColor: row.value['--primary-color'] }"
-              ></span>
-              <span
-                class="w-[18px] h-[18px]"
-                :style="{ backgroundColor: row.value['--primary-help-color'] }"
-              ></span>
-              <span
-                class="w-[18px] h-[18px]"
-                :style="{ backgroundColor: '#fff' }"
-              ></span>
-            </div>
-          </template>
-        </el-table-column>
+                <el-table-column label="配色名称" min-width="120" >
+                    <template #default="{ row }">
+                        <div>{{ row.color_name }}</div>
+                    </template>
+                </el-table-column>
+
+                <el-table-column label="配色方案" min-width="120" >
+                    <template #default="{ row }">
+                        <div class="rounded-[3px] inline-flex items-center justify-center border-[1px] border-solid border-[#f2f2f2] overflow-hidden" v-if="row.value">
+                            <span class="w-[18px] h-[18px]" :style="{backgroundColor: row.value['--primary-color']}"></span>
+                            <span class="w-[18px] h-[18px]" :style="{backgroundColor: row.value['--primary-help-color']}"></span>
+                            <span class="w-[18px] h-[18px]" :style="{backgroundColor: '#fff'}"></span>
+                        </div>
+                    </template>
+                </el-table-column>
 
-        <el-table-column
-          :label="t('operation')"
-          align="right"
-          fixed="right"
-          width="100"
-        >
-          <template #default="{ row }">
-            <el-button type="primary" link @click="editEvent(row)"
-              >编辑</el-button
-            >
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
+                <el-table-column :label="t('operation')" align="right" fixed="right" width="100">
+                    <template #default="{ row }">
+                        <el-button type="primary" link @click="editEvent(row)">编辑</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </el-card>
 
-    <theme-list ref="themeListRef" @confirm="initData()" />
-  </div>
+        <theme-list ref="themeListRef" @confirm="initData()" />
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -100,21 +73,22 @@ const themeListRef = ref(null)
 const data = ref([])
 
 const initData = () => {
-  loading.value = true
-  getDiyTheme().then((res) => {
-    let obj = cloneDeep(res.data)
-    for (let key in obj) {
-      obj[key].key = key
-    }
-    data.value = Object.values(obj)
-    loading.value = false
-  })
+    loading.value = true;
+    getDiyTheme().then((res) => {
+        let obj = cloneDeep(res.data);
+        for(let key in obj){
+            obj[key].key = key;
+        }
+        data.value = Object.values(obj);
+        loading.value = false;
+    })
 }
 initData()
 
+
 // 编辑
-const editEvent = (data) => {
-  themeListRef.value.open(data)
+const editEvent = (data)=>{
+    themeListRef.value.open(data);
 }
 </script>
 
diff --git a/admin/src/app/views/diy_form/components/detail-form-image.vue b/admin/src/app/views/diy_form/components/detail-form-image.vue
index bca9e37f..c3ab044f 100644
--- a/admin/src/app/views/diy_form/components/detail-form-image.vue
+++ b/admin/src/app/views/diy_form/components/detail-form-image.vue
@@ -1,39 +1,30 @@
 <template>
-  <div>
-    <el-image
-      v-for="(item, index) in props.data.handle_field_value"
-      :src="img(item)"
-      class="w-[70px] h-[70px]"
-      :class="{ 'mr-[5px]': index + 1 < props.data.handle_field_value.length }"
-      fit="contain"
-      :preview-src-list="imgList"
-      :zoom-rate="1.2"
-      :max-scale="7"
-      :min-scale="0.2"
-      :initial-index="index"
-      :hide-on-click-modal="true"
-    />
-  </div>
+    <div>
+        <el-image v-for="(item,index) in props.data.handle_field_value" :src="img(item)" class="w-[70px] h-[70px]" :class="{ 'mr-[5px]' : (index + 1) < props.data.handle_field_value.length }" fit="contain" :preview-src-list="imgList" :zoom-rate="1.2" :max-scale="7"
+        :min-scale="0.2" :initial-index="index" :hide-on-click-modal="true" />
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { computed, reactive, ref } from 'vue'
 import { img } from '@/utils/common'
-import { t } from '@/lang'
+import { t } from "@/lang";
 
 const props = defineProps({
-  data: {
-    type: Object,
-    default: () => {
-      return {}
-    },
-  },
+    data: {
+        type: Object,
+        default: () => {
+            return {}
+        }
+    }
 })
 const imgList = computed(() => {
-  return props.data.handle_field_value.map((item: any) => {
-    return img(item)
-  })
+    return props.data.handle_field_value.map((item: any) => {
+        return img(item)
+    })
 })
+
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
diff --git a/admin/src/app/views/diy_form/components/detail-form-render.vue b/admin/src/app/views/diy_form/components/detail-form-render.vue
index 37b9f583..851aed22 100644
--- a/admin/src/app/views/diy_form/components/detail-form-render.vue
+++ b/admin/src/app/views/diy_form/components/detail-form-render.vue
@@ -1,25 +1,25 @@
 <template>
-  <div class="form-render">{{ props.data.render_value }}</div>
+    <div class="form-render">{{ props.data.render_value }}</div>
 </template>
 
 <script lang="ts" setup>
 import { computed, reactive, ref } from 'vue'
-import { t } from '@/lang'
+import { t } from "@/lang";
 
 const props = defineProps({
-  data: {
-    type: Object,
-    default: () => {
-      return {}
-    },
-  },
+    data: {
+        type: Object,
+        default: () => {
+            return {}
+        }
+    }
 })
 </script>
 
 <style lang="scss" scoped>
 .form-render {
-  word-wrap: break-word; /* 长单词或长字符串自动换行 */
-  word-break: break-word; /* 强制断词换行 */
-  white-space: pre-wrap; /* 保持空格和换行 */
+    word-wrap: break-word; /* 长单词或长字符串自动换行 */
+    word-break: break-word; /* 强制断词换行 */
+    white-space: pre-wrap; /* 保持空格和换行 */
 }
 </style>
diff --git a/admin/src/app/views/diy_form/components/edit-form-address.vue b/admin/src/app/views/diy_form/components/edit-form-address.vue
index f355f075..7b9364e9 100644
--- a/admin/src/app/views/diy_form/components/edit-form-address.vue
+++ b/admin/src/app/views/diy_form/components/edit-form-address.vue
@@ -1,65 +1,56 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <!-- 表单组件 字段内容设置 -->
-    <slot name="field"></slot>
-    <el-form label-width="100px" class="px-[10px]">
-      <el-form-item :label="t('地址格式')">
-        <el-radio-group
-          v-model="diyStore.editComponent.addressFormat"
-          class="!block"
-        >
-          <el-radio class="!block" label="province/city/district/address">{{
-            t('省/市/区/街道/详细地址')
-          }}</el-radio>
-          <el-radio class="!block" label="province/city/district/street">{{
-            t('省/市/区/街道(镇)')
-          }}</el-radio>
-          <el-radio class="!block" label="province/city/district">{{
-            t('省/市/区(县)')
-          }}</el-radio>
-          <el-radio class="!block" label="province/city">{{
-            t('省/市')
-          }}</el-radio>
-          <el-radio class="!block" label="province">{{ t('省') }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-    </el-form>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
 
-    <!-- 表单组件 其他设置 -->
-    <slot name="other"></slot>
-    <el-form label-width="100px" class="px-[10px]">
-      <el-form-item class="display-block">
-        <template #label>
-          <div class="flex items-center">
-            <span class="mr-[3px]">{{ t('隐私保护') }}</span>
-            <el-tooltip effect="light" placement="top">
-              <template #content>
-                <p>会自动将提交的个人信息做加密展示。</p>
-                <p>适用于公开展示收集的数据且不暴露用户隐私。</p>
-              </template>
-              <el-icon>
-                <QuestionFilled color="#999999" />
-              </el-icon>
-            </el-tooltip>
-          </div>
-        </template>
-        <el-switch v-model="diyStore.editComponent.field.privacyProtection" />
-        <div class="text-sm text-gray-400">
-          {{ t('提交后自动隐藏地址，仅管理员可查看') }}
-        </div>
-      </el-form-item>
-    </el-form>
-  </div>
+		<!-- 表单组件 字段内容设置 -->
+		<slot name="field"></slot>
+		<el-form label-width="100px" class="px-[10px]">
+			<el-form-item :label="t('地址格式')">
+				<el-radio-group v-model="diyStore.editComponent.addressFormat" class="!block">
+					<el-radio class="!block" label="province/city/district/address">{{ t('省/市/区/街道/详细地址') }}</el-radio>
+					<el-radio class="!block" label="province/city/district/street">{{ t('省/市/区/街道(镇)') }}</el-radio>
+					<el-radio class="!block" label="province/city/district">{{ t('省/市/区(县)') }}</el-radio>
+					<el-radio class="!block" label="province/city">{{ t('省/市') }}</el-radio>
+					<el-radio class="!block" label="province">{{ t('省') }}</el-radio>
+				</el-radio-group>
+			</el-form-item>
+		</el-form>
 
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <!-- 表单组件 字段样式 -->
-    <slot name="style-field"></slot>
+		<!-- 表单组件 其他设置 -->
+		<slot name="other"></slot>
+		<el-form label-width="100px" class="px-[10px]">
+			<el-form-item class="display-block">
+				<template #label>
+					<div class="flex items-center">
+						<span class="mr-[3px]">{{ t('隐私保护') }}</span>
+						<el-tooltip effect="light" placement="top">
+							<template #content>
+								<p>会自动将提交的个人信息做加密展示。</p>
+								<p>适用于公开展示收集的数据且不暴露用户隐私。</p>
+							</template>
+							<el-icon>
+								<QuestionFilled color="#999999" />
+							</el-icon>
+						</el-tooltip>
+					</div>
+				</template>
+				<el-switch v-model="diyStore.editComponent.field.privacyProtection" />
+				<div class="text-sm text-gray-400">{{ t('提交后自动隐藏地址，仅管理员可查看') }}</div>
+			</el-form-item>
+		</el-form>
 
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
+	</div>
+
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+
+		<!-- 表单组件 字段样式 -->
+		<slot name="style-field"></slot>
+
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -72,11 +63,12 @@ diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
-  const res = { code: true, message: '' }
-  return res
+	const res = { code: true, message: '' }
+	return res
 }
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/diy_form/components/edit-form-checkbox.vue b/admin/src/app/views/diy_form/components/edit-form-checkbox.vue
index 0dae6047..c098f4f0 100644
--- a/admin/src/app/views/diy_form/components/edit-form-checkbox.vue
+++ b/admin/src/app/views/diy_form/components/edit-form-checkbox.vue
@@ -1,227 +1,194 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <!-- 表单组件 字段内容设置 -->
-    <slot name="field"></slot>
-    <el-form label-width="100px" class="px-[10px]">
-      <el-form-item :label="t('style')">
-        <el-radio-group v-model="diyStore.editComponent.style">
-          <el-radio label="style-1">{{ t('defaultSources') }}</el-radio>
-          <el-radio label="style-2">{{ t('listStyle') }}</el-radio>
-          <el-radio label="style-3">{{ t('dropDownStyle') }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item :label="t('option')">
-        <div ref="formCheckboxRef">
-          <div
-            v-for="(option, index) in diyStore.editComponent.options"
-            :key="option.id"
-            class="option-item flex items-center mb-[15px]"
-          >
-            <el-input
-              v-model="diyStore.editComponent.options[index].text"
-              class="!w-[215px]"
-              :placeholder="t('optionPlaceholder')"
-              maxlength="30"
-              clearable
-            />
-            <span
-              v-if="diyStore.editComponent.options.length > 1"
-              @click="removeOption(index)"
-              class="cursor-pointer ml-[5px] nc-iconfont nc-icon-shanchu-yuangaizhiV6xx"
-            ></span>
-          </div>
-        </div>
-        <span
-          class="text-primary cursor-pointer mr-[10px]"
-          @click="addOption"
-          >{{ t('addSingleOption') }}</span
-        >
-        <el-popover :visible="visible" placement="bottom" :width="300">
-          <p class="mb-[5px]">{{ t('addMultipleOption') }}</p>
-          <p class="text-[#888] text-[12px] mb-[5px]">
-            {{ t('addOptionTips') }}
-          </p>
-          <el-input
-            v-model.trim="optionsValue"
-            type="textarea"
-            clearable
-            maxlength="200"
-            show-word-limit
-          />
-          <div class="mt-[10px] text-right">
-            <el-button size="small" text @click="visible = false">{{
-              t('cancel')
-            }}</el-button>
-            <el-button size="small" type="primary" @click="batchAddOptions">{{
-              t('confirm')
-            }}</el-button>
-          </div>
-          <template #reference>
-            <span class="text-primary cursor-pointer" @click="visible = true">{{
-              t('addMultipleOption')
-            }}</span>
-          </template>
-        </el-popover>
-      </el-form-item>
-    </el-form>
-
-    <!-- 表单组件 其他设置 -->
-    <slot name="other"></slot>
-    <!--		<el-form label-width="100px" class="px-[10px]">-->
-    <!--			<el-form-item class="display-block">-->
-    <!--				<template #label>-->
-    <!--					<div class="flex items-center">-->
-    <!--						<span class="mr-[3px]">{{ t('隐私保护') }}</span>-->
-    <!--						<el-tooltip effect="light" placement="top">-->
-    <!--							<template #content>-->
-    <!--								<p>会自动将提交的个人信息做加密展示。</p>-->
-    <!--								<p>适用于公开展示收集的数据且不暴露用户隐私。</p>-->
-    <!--							</template>-->
-    <!--							<el-icon>-->
-    <!--								<QuestionFilled color="#999999" />-->
-    <!--							</el-icon>-->
-    <!--						</el-tooltip>-->
-    <!--					</div>-->
-    <!--				</template>-->
-    <!--				<el-switch v-model="diyStore.editComponent.field.privacyProtection" />-->
-    <!--				<div class="text-sm text-gray-400">{{ t('提交后自动隐藏内容，仅管理员可查看') }}</div>-->
-    <!--			</el-form-item>-->
-
-    <!--		</el-form>-->
-  </div>
-
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <!-- 表单组件 字段样式 -->
-    <slot name="style-field"></slot>
-
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
+
+		<!-- 表单组件 字段内容设置 -->
+		<slot name="field"></slot>
+		<el-form label-width="100px" class="px-[10px]">
+			<el-form-item :label="t('style')">
+				<el-radio-group v-model="diyStore.editComponent.style">
+					<el-radio label="style-1">{{ t('defaultSources') }}</el-radio>
+					<el-radio label="style-2">{{ t('listStyle') }}</el-radio>
+					<el-radio label="style-3">{{ t('dropDownStyle') }}</el-radio>
+				</el-radio-group>
+			</el-form-item>
+			<el-form-item :label="t('option')">
+                <div ref="formCheckboxRef">
+                    <div v-for="(option, index) in diyStore.editComponent.options" :key="option.id" class="option-item flex items-center mb-[15px]">
+                        <el-input v-model="diyStore.editComponent.options[index].text" class="!w-[215px]" :placeholder="t('optionPlaceholder')" maxlength="30" clearable />
+                        <span v-if="diyStore.editComponent.options.length > 1" @click="removeOption(index)" class="cursor-pointer ml-[5px] nc-iconfont nc-icon-shanchu-yuangaizhiV6xx"></span>
+                    </div>
+                </div>
+				<span class="text-primary cursor-pointer mr-[10px]" @click="addOption">{{ t('addSingleOption') }}</span>
+				<el-popover :visible="visible" placement="bottom" :width="300">
+					<p class="mb-[5px]">{{ t('addMultipleOption') }}</p>
+					<p class="text-[#888] text-[12px] mb-[5px]">{{ t('addOptionTips') }}</p>
+					<el-input v-model.trim="optionsValue" type="textarea" clearable maxlength="200" show-word-limit />
+					<div class="mt-[10px] text-right">
+						<el-button size="small" text @click="visible = false">{{ t('cancel') }}</el-button>
+						<el-button size="small" type="primary" @click="batchAddOptions">{{ t('confirm') }}</el-button>
+					</div>
+					<template #reference>
+						<span class="text-primary cursor-pointer" @click="visible = true">{{ t('addMultipleOption') }}</span>
+					</template>
+				</el-popover>
+			</el-form-item>
+		</el-form>
+
+		<!-- 表单组件 其他设置 -->
+		<slot name="other"></slot>
+<!--		<el-form label-width="100px" class="px-[10px]">-->
+<!--			<el-form-item class="display-block">-->
+<!--				<template #label>-->
+<!--					<div class="flex items-center">-->
+<!--						<span class="mr-[3px]">{{ t('隐私保护') }}</span>-->
+<!--						<el-tooltip effect="light" placement="top">-->
+<!--							<template #content>-->
+<!--								<p>会自动将提交的个人信息做加密展示。</p>-->
+<!--								<p>适用于公开展示收集的数据且不暴露用户隐私。</p>-->
+<!--							</template>-->
+<!--							<el-icon>-->
+<!--								<QuestionFilled color="#999999" />-->
+<!--							</el-icon>-->
+<!--						</el-tooltip>-->
+<!--					</div>-->
+<!--				</template>-->
+<!--				<el-switch v-model="diyStore.editComponent.field.privacyProtection" />-->
+<!--				<div class="text-sm text-gray-400">{{ t('提交后自动隐藏内容，仅管理员可查看') }}</div>-->
+<!--			</el-form-item>-->
+
+<!--		</el-form>-->
+
+	</div>
+
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+
+		<!-- 表单组件 字段样式 -->
+		<slot name="style-field"></slot>
+
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+
+	</div>
 </template>
 
 <script lang="ts" setup>
 import { t } from '@/lang'
-import { ref, onMounted, nextTick } from 'vue'
+import { ref, onMounted, nextTick} from 'vue'
 import useDiyStore from '@/stores/modules/diy'
 import Sortable from 'sortablejs'
 import { range } from 'lodash-es'
-import { ElMessage } from 'element-plus'
+import { ElMessage } from "element-plus";
 
 const diyStore = useDiyStore()
 diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
-  const res = { code: true, message: '' }
-  let pass = true
-  for (let i = 0; i < diyStore.value[index].options.length; i++) {
-    if (!diyStore.value[index].options[i].text) {
-      res.code = false
-      res.message = t('optionPlaceholder')
-      pass = false
-      break
-    }
-  }
-
-  if (!pass) return res
-
-  let uniqueOptions = uniqueByKey(diyStore.value[index].options, 'text')
-  if (uniqueOptions.length != diyStore.value[index].options.length) {
-    res.code = false
-    res.message = t('errorTipsOne')
-  }
-  return res
+	const res = { code: true, message: '' }
+	let pass = true;
+	for (let i = 0; i < diyStore.value[index].options.length; i++) {
+		if (!diyStore.value[index].options[i].text) {
+			res.code = false;
+			res.message = t('optionPlaceholder');
+			pass = false;
+			break;
+		}
+	}
+
+	if (!pass) return res;
+
+	let uniqueOptions = uniqueByKey(diyStore.value[index].options, 'text')
+	if (uniqueOptions.length != diyStore.value[index].options.length) {
+		res.code = false;
+		res.message = t('errorTipsOne')
+	}
+	return res
 }
 
 diyStore.editComponent.options.forEach((item: any) => {
-  if (!item.id) item.id = diyStore.generateRandom()
+	if (!item.id) item.id = diyStore.generateRandom()
 })
 
 const visible = ref(false)
 const optionsValue = ref()
 const addOption = () => {
-  diyStore.editComponent.options.push({
-    id: diyStore.generateRandom(),
-    text: '选项' + (diyStore.editComponent.options.length + 1),
-  })
-}
-
-const removeOption = (index: any) => {
-  diyStore.editComponent.options.splice(index, 1)
+	diyStore.editComponent.options.push({
+		id: diyStore.generateRandom(),
+		text: '选项' + (diyStore.editComponent.options.length + 1)
+	});
+};
+
+const removeOption = (index:any) => {
+    diyStore.editComponent.options.splice(index, 1);
 }
 
 // 批量添加选项
 const batchAddOptions = () => {
-  if (optionsValue.value.trim()) {
-    const newOptions = optionsValue.value
-      .split(',')
-      .map((option: any) => {
-        return {
-          id: diyStore.generateRandom(),
-          text: option.trim(),
-        }
-      })
-      .filter((option: any) => option.text !== '')
-
-    // 去除重复的选项
-    const uniqueNewOptions = uniqueByKey(newOptions, 'text')
-
-    // 过滤掉已存在的选项
-    const filteredNewOptions = uniqueNewOptions.filter(
-      (newOption: any) =>
-        !diyStore.editComponent.options.some(
-          (existingOption: any) => existingOption.text === newOption.text
-        )
-    )
-
-    // 如果有新的选项，添加到选项列表中
-    if (filteredNewOptions.length > 0) {
-      diyStore.editComponent.options.push(...filteredNewOptions)
-    } else {
-      ElMessage({
-        message: t('errorTipsTwo'),
-        type: 'error',
-      })
-    }
-
-    optionsValue.value = ''
-    visible.value = false
-  }
-}
+	if (optionsValue.value.trim()) {
+		const newOptions = optionsValue.value.split(',').map((option: any) => {
+			return {
+				id: diyStore.generateRandom(),
+				text: option.trim()
+			};
+		}).filter((option: any) => option.text !== '');
+
+		// 去除重复的选项
+		const uniqueNewOptions = uniqueByKey(newOptions, 'text');
+
+		// 过滤掉已存在的选项
+		const filteredNewOptions = uniqueNewOptions.filter((newOption: any) =>
+				!diyStore.editComponent.options.some((existingOption: any) => existingOption.text === newOption.text)
+		);
+
+		// 如果有新的选项，添加到选项列表中
+		if (filteredNewOptions.length > 0) {
+			diyStore.editComponent.options.push(...filteredNewOptions);
+		} else {
+			ElMessage({
+				message: t('errorTipsTwo'),
+				type: "error",
+			});
+		}
+
+		optionsValue.value = '';
+		visible.value = false;
+	}
+};
 
 // 数组去重
 const uniqueByKey = (arr: any, key: any) => {
-  const seen = new Set()
-  return arr.filter((item: any) => {
-    const serializedKey = JSON.stringify(item[key])
-    return seen.has(serializedKey) ? false : seen.add(serializedKey)
-  })
+	const seen = new Set();
+	return arr.filter((item: any) => {
+		const serializedKey = JSON.stringify(item[key]);
+		return seen.has(serializedKey) ? false : seen.add(serializedKey);
+	});
 }
 
 const formCheckboxRef = ref()
 
 onMounted(() => {
-  nextTick(() => {
-    const sortable = Sortable.create(formCheckboxRef.value, {
-      group: 'option-item',
-      animation: 200,
-      onEnd: (event) => {
-        const temp = diyStore.editComponent.options[event.oldIndex!]
-        diyStore.editComponent.options.splice(event.oldIndex!, 1)
-        diyStore.editComponent.options.splice(event.newIndex!, 0, temp)
-        sortable.sort(
-          range(diyStore.editComponent.options.length).map((value) => {
-            return value.toString()
-          })
-        )
-      },
+    nextTick(() => {
+        const sortable = Sortable.create(formCheckboxRef.value, {
+            group: 'option-item',
+            animation: 200,
+            onEnd: event => {
+                const temp = diyStore.editComponent.options[event.oldIndex!]
+                diyStore.editComponent.options.splice(event.oldIndex!, 1)
+                diyStore.editComponent.options.splice(event.newIndex!, 0, temp)
+                sortable.sort(
+                    range(diyStore.editComponent.options.length).map(value => {
+                        return value.toString()
+                    })
+                )
+            }
+        })
     })
-  })
 })
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/diy_form/components/edit-form-date-scope.vue b/admin/src/app/views/diy_form/components/edit-form-date-scope.vue
index d360acf5..e9166af9 100644
--- a/admin/src/app/views/diy_form/components/edit-form-date-scope.vue
+++ b/admin/src/app/views/diy_form/components/edit-form-date-scope.vue
@@ -1,133 +1,93 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <!-- 表单组件 字段内容设置 -->
-    <slot name="field"></slot>
-    <el-form label-width="100px" class="px-[10px]">
-      <el-form-item :label="t('dataFormat')">
-        <el-radio-group v-model="diyStore.editComponent.dateFormat">
-          <div class="flex flex-col">
-            <el-radio label="YYYY年M月D日">{{ dateFormat.format1 }}</el-radio>
-            <el-radio label="YYYY-MM-DD">{{ dateFormat.format2 }}</el-radio>
-            <el-radio label="YYYY/MM/DD">{{ dateFormat.format3 }}</el-radio>
-          </div>
-        </el-radio-group>
-      </el-form-item>
-    </el-form>
-
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('startDate') }}</h3>
-      <el-form label-width="100px" class="px-[10px]" @submit.prevent>
-        <el-form-item :label="t('formPlaceholder')">
-          <el-input
-            v-model.trim="diyStore.editComponent.start.placeholder"
-            :placeholder="t('formPlaceholderTips')"
-            clearable
-            maxlength="15"
-            show-word-limit
-          />
-        </el-form-item>
-        <el-form-item :label="t('defaultValue')">
-          <el-switch v-model="diyStore.editComponent.start.defaultControl" />
-        </el-form-item>
-        <el-form-item v-if="diyStore.editComponent.start.defaultControl">
-          <el-radio-group v-model="diyStore.editComponent.start.dateWay">
-            <el-radio label="current">{{ t('currentDate') }}</el-radio>
-            <el-radio label="diy">{{ t('diyDate') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item
-          v-if="
-            diyStore.editComponent.start.defaultControl &&
-            diyStore.editComponent.start.dateWay == 'diy'
-          "
-        >
-          <el-date-picker
-            v-model="diyStore.editComponent.field.default.start.date"
-            format="YYYY/MM/DD"
-            value-format="YYYY-MM-DD"
-            type="date"
-            :placeholder="t('startDataPlaceholder')"
-            @change="startDateChange"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('endDate') }}</h3>
-      <el-form label-width="100px" class="px-[10px]" @submit.prevent>
-        <el-form-item :label="t('formPlaceholder')">
-          <el-input
-            v-model.trim="diyStore.editComponent.end.placeholder"
-            :placeholder="t('formPlaceholderTips')"
-            clearable
-            maxlength="15"
-            show-word-limit
-          />
-        </el-form-item>
-        <el-form-item :label="t('defaultValue')">
-          <el-switch v-model="diyStore.editComponent.end.defaultControl" />
-        </el-form-item>
-        <el-form-item v-if="diyStore.editComponent.end.defaultControl">
-          <el-radio-group v-model="diyStore.editComponent.end.dateWay">
-            <el-radio label="current">{{ t('currentDate') }}</el-radio>
-            <el-radio label="diy">{{ t('diyDate') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item
-          v-if="
-            diyStore.editComponent.end.defaultControl &&
-            diyStore.editComponent.end.dateWay == 'diy'
-          "
-        >
-          <el-date-picker
-            :disabled-date="disabledEndDate"
-            v-model="diyStore.editComponent.field.default.end.date"
-            format="YYYY/MM/DD"
-            value-format="YYYY-MM-DD"
-            type="date"
-            :placeholder="t('endDataPlaceholder')"
-            @change="endDateChange"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <!-- 表单组件 其他设置 -->
-    <slot name="other"></slot>
-  </div>
-
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('textStyle') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('textFontSize')">
-          <el-slider
-            v-model="diyStore.editComponent.fontSize"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-            :min="12"
-            :max="18"
-          />
-        </el-form-item>
-        <el-form-item :label="t('textFontWeight')">
-          <el-radio-group v-model="diyStore.editComponent.fontWeight">
-            <el-radio :label="'normal'">{{ t('fontWeightNormal') }}</el-radio>
-            <el-radio :label="'bold'">{{ t('fontWeightBold') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item :label="t('textColor')">
-          <el-color-picker v-model="diyStore.editComponent.textColor" />
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
+
+		<!-- 表单组件 字段内容设置 -->
+		<slot name="field"></slot>
+		<el-form label-width="100px" class="px-[10px]">
+			<el-form-item :label="t('dataFormat')">
+				<el-radio-group v-model="diyStore.editComponent.dateFormat">
+					<div class="flex flex-col">
+                        <el-radio label="YYYY年M月D日">{{ dateFormat.format1 }}</el-radio>
+                        <el-radio label="YYYY-MM-DD">{{ dateFormat.format2 }}</el-radio>
+                        <el-radio label="YYYY/MM/DD">{{ dateFormat.format3 }}</el-radio>
+                    </div>
+				</el-radio-group>
+			</el-form-item>
+		</el-form>
+
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('startDate') }}</h3>
+			<el-form label-width="100px" class="px-[10px]" @submit.prevent>
+				<el-form-item :label="t('formPlaceholder')">
+					<el-input v-model.trim="diyStore.editComponent.start.placeholder" :placeholder="t('formPlaceholderTips')" clearable maxlength="15" show-word-limit />
+				</el-form-item>
+				<el-form-item :label="t('defaultValue')">
+					<el-switch v-model="diyStore.editComponent.start.defaultControl" />
+				</el-form-item>
+				<el-form-item v-if="diyStore.editComponent.start.defaultControl">
+					<el-radio-group v-model="diyStore.editComponent.start.dateWay">
+						<el-radio label="current">{{ t('currentDate') }}</el-radio>
+						<el-radio label="diy">{{ t('diyDate') }}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+				<el-form-item v-if="diyStore.editComponent.start.defaultControl && diyStore.editComponent.start.dateWay == 'diy'">
+					<el-date-picker v-model="diyStore.editComponent.field.default.start.date" format="YYYY/MM/DD" value-format="YYYY-MM-DD" type="date" :placeholder="t('startDataPlaceholder')" @change="startDateChange" />
+				</el-form-item>
+			</el-form>
+		</div>
+
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('endDate') }}</h3>
+			<el-form label-width="100px" class="px-[10px]" @submit.prevent>
+				<el-form-item :label="t('formPlaceholder')">
+					<el-input v-model.trim="diyStore.editComponent.end.placeholder" :placeholder="t('formPlaceholderTips')" clearable maxlength="15" show-word-limit />
+				</el-form-item>
+				<el-form-item :label="t('defaultValue')">
+					<el-switch v-model="diyStore.editComponent.end.defaultControl" />
+				</el-form-item>
+				<el-form-item v-if="diyStore.editComponent.end.defaultControl">
+					<el-radio-group v-model="diyStore.editComponent.end.dateWay">
+						<el-radio label="current">{{ t('currentDate') }}</el-radio>
+						<el-radio label="diy">{{ t('diyDate') }}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+				<el-form-item v-if="diyStore.editComponent.end.defaultControl && diyStore.editComponent.end.dateWay == 'diy'">
+					<el-date-picker :disabled-date="disabledEndDate" v-model="diyStore.editComponent.field.default.end.date" format="YYYY/MM/DD" value-format="YYYY-MM-DD" type="date" :placeholder="t('endDataPlaceholder')" @change="endDateChange" />
+				</el-form-item>
+			</el-form>
+		</div>
+
+		<!-- 表单组件 其他设置 -->
+		<slot name="other"></slot>
+
+	</div>
+
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('textStyle') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('textFontSize')">
+					<el-slider v-model="diyStore.editComponent.fontSize" show-input size="small" class="ml-[10px] diy-nav-slider" :min="12" :max="18" />
+				</el-form-item>
+				<el-form-item :label="t('textFontWeight')">
+					<el-radio-group v-model="diyStore.editComponent.fontWeight">
+						<el-radio :label="'normal'">{{ t('fontWeightNormal') }}</el-radio>
+						<el-radio :label="'bold'">{{ t('fontWeightBold') }}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+				<el-form-item :label="t('textColor')">
+					<el-color-picker v-model="diyStore.editComponent.textColor" />
+				</el-form-item>
+			</el-form>
+		</div>
+
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -141,130 +101,103 @@ diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
-  const res = { code: true, message: '' }
-  let starTime = diyStore.value[index].field.default.start.date
-  let endTime = diyStore.value[index].field.default.end.date
+    const res = { code: true, message: '' }
+    let starTime = diyStore.value[index].field.default.start.date
+    let endTime = diyStore.value[index].field.default.end.date
 
-  console.log(diyStore.value[index].field.default)
+    console.log(diyStore.value[index].field.default)
 
-  let today = new Date()
-  const hours = String(today.getHours()).padStart(2, '0')
-  const minutes = String(today.getMinutes()).padStart(2, '0')
+    let today = new Date()
+    const hours = String(today.getHours()).padStart(2, '0')
+    const minutes = String(today.getMinutes()).padStart(2, '0')
 
-  if (diyStore.editComponent.start.dateWay == 'current') {
-    starTime = today.toISOString().split('T')[0]
-  }
-  if (diyStore.editComponent.end.dateWay == 'current') {
-    endTime = today.toISOString().split('T')[0]
-  }
-  if (
-    diyStore.editComponent.start.defaultControl &&
-    starTime == '' &&
-    diyStore.editComponent.end.dateWay == 'diy'
-  ) {
-    res.code = false
-    res.message = t('startDataTips')
-    return res
-  }
-  if (
-    diyStore.editComponent.end.defaultControl &&
-    endTime == '' &&
-    diyStore.editComponent.end.dateWay == 'diy'
-  ) {
-    res.code = false
-    res.message = t('endDataTips')
-    return res
-  }
+    if (diyStore.editComponent.start.dateWay == 'current') {
+        starTime = today.toISOString().split('T')[0]
+    }
+    if (diyStore.editComponent.end.dateWay == 'current') {
+        endTime = today.toISOString().split('T')[0]
+    }
+    if (diyStore.editComponent.start.defaultControl && starTime == '' && diyStore.editComponent.end.dateWay == 'diy') {
+        res.code = false
+        res.message = t('startDataTips')
+        return res
+    }
+    if (diyStore.editComponent.end.defaultControl && endTime == '' && diyStore.editComponent.end.dateWay == 'diy') {
+        res.code = false
+        res.message = t('endDataTips')
+        return res
+    }
 
-  if (
-    diyStore.editComponent.start.defaultControl &&
-    diyStore.editComponent.end.defaultControl &&
-    timeTurnTimeStamp(starTime) > timeTurnTimeStamp(endTime)
-  ) {
-    res.code = false
-    res.message = t('startEndDataTips')
+    if (diyStore.editComponent.start.defaultControl && diyStore.editComponent.end.defaultControl && timeTurnTimeStamp(starTime) > timeTurnTimeStamp(endTime)) {
+        res.code = false
+        res.message = t('startEndDataTips')
+        return res
+    }
     return res
-  }
-  return res
 }
 
 const dateFormat: any = reactive({
-  format1: '',
-  format2: '',
-  format3: '',
+    format1: '',
+    format2: '',
+    format3: ''
 })
 
 // 结束日期-禁止的日期
-const disabledEndDate = (time: Date) => {
-  let cutoffDate = null
-  let bool = false
-  if (
-    diyStore.editComponent.start &&
-    diyStore.editComponent.start.defaultControl
-  ) {
-    if (diyStore.editComponent.start.dateWay == 'diy') {
-      cutoffDate = new Date(diyStore.editComponent.field.default.start.date)
-    } else {
-      cutoffDate = new Date()
+const disabledEndDate = (time:Date)=>{
+    let cutoffDate = null
+    let bool = false
+    if(diyStore.editComponent.start && diyStore.editComponent.start.defaultControl){
+        if(diyStore.editComponent.start.dateWay == 'diy'){
+            cutoffDate = new Date(diyStore.editComponent.field.default.start.date)
+        }else{
+            cutoffDate = new Date()
+        }
+        bool = time.getTime() < cutoffDate.getTime()
     }
-    bool = time.getTime() < cutoffDate.getTime()
-  }
-  return bool
+    return bool
 }
 
 onMounted(() => {
-  let today = new Date()
-  let endDate = new Date()
-  endDate.setDate(endDate.getDate() + 7) // 设置日期为7天后的日期
+    let today = new Date()
+    let endDate = new Date()
+    endDate.setDate(endDate.getDate() + 7) // 设置日期为7天后的日期
 
-  if (diyStore.editComponent.field.default.start.timestamp) {
-    diyStore.editComponent.field.default.start.date = today
-      .toISOString()
-      .split('T')[0]
-    diyStore.editComponent.field.default.start.timestamp = parseInt(
-      today.getTime() / 1000
-    )
-  }
+    if (diyStore.editComponent.field.default.start.timestamp) {
+        diyStore.editComponent.field.default.start.date = today.toISOString().split('T')[0]
+        diyStore.editComponent.field.default.start.timestamp = parseInt(today.getTime() / 1000)
+    }
 
-  if (diyStore.editComponent.field.default.end.timestamp) {
-    diyStore.editComponent.field.default.end.date = endDate
-      .toISOString()
-      .split('T')[0]
-    diyStore.editComponent.field.default.end.timestamp = parseInt(
-      endDate.getTime() / 1000
-    )
-  }
+    if (diyStore.editComponent.field.default.end.timestamp) {
+        diyStore.editComponent.field.default.end.date = endDate.toISOString().split('T')[0]
+        diyStore.editComponent.field.default.end.timestamp = parseInt(endDate.getTime() / 1000)
+    }
 
-  let year = today.getFullYear()
-  let month = String(today.getMonth() + 1).padStart(2, '0')
-  let day = String(today.getDate()).padStart(2, '0')
+    let year = today.getFullYear()
+    let month = String(today.getMonth() + 1).padStart(2, '0')
+    let day = String(today.getDate()).padStart(2, '0')
 
-  const hours = String(today.getHours()).padStart(2, '0')
-  const minutes = String(today.getMinutes()).padStart(2, '0')
-  dateFormat.format1 = `${year}年${month}月${day}日`
-  dateFormat.format2 = `${year}-${month}-${day}`
-  dateFormat.format3 = `${year}/${month}/${day}`
-  dateFormat.format4 = `${year}-${month}-${day} ${hours}:${minutes}`
+    const hours = String(today.getHours()).padStart(2, '0')
+    const minutes = String(today.getMinutes()).padStart(2, '0')
+    dateFormat.format1 = `${year}年${month}月${day}日`
+    dateFormat.format2 = `${year}-${month}-${day}`
+    dateFormat.format3 = `${year}/${month}/${day}`
+    dateFormat.format4 = `${year}-${month}-${day} ${hours}:${minutes}`
 })
 
 // 开始日期选择器
-const startDateChange = (date) => {
-  diyStore.editComponent.field.default.start.date = date
-  diyStore.editComponent.field.default.start.timestamp = timeTurnTimeStamp(date)
-
-  let endDate = new Date(date)
-  endDate.setDate(endDate.getDate() + 7)
-  diyStore.editComponent.field.default.end.date = endDate
-    .toISOString()
-    .split('T')[0]
-  diyStore.editComponent.field.default.end.timestamp = parseInt(
-    endDate.getTime() / 1000
-  )
+const startDateChange = (date)=>{
+    diyStore.editComponent.field.default.start.date = date
+    diyStore.editComponent.field.default.start.timestamp = timeTurnTimeStamp(date)
+
+    let endDate = new Date(date)
+    endDate.setDate(endDate.getDate() + 7)
+    diyStore.editComponent.field.default.end.date = endDate.toISOString().split('T')[0]
+    diyStore.editComponent.field.default.end.timestamp = parseInt(endDate.getTime() / 1000)
 }
 // 结束日期选择器
-const endDateChange = (date) => {
-  diyStore.editComponent.field.default.end.date = date
-  diyStore.editComponent.field.default.end.timestamp = timeTurnTimeStamp(date)
+const endDateChange = (date)=>{
+    diyStore.editComponent.field.default.end.date = date
+    diyStore.editComponent.field.default.end.timestamp = timeTurnTimeStamp(date)
 }
 
 defineExpose({})
diff --git a/admin/src/app/views/diy_form/components/edit-form-date.vue b/admin/src/app/views/diy_form/components/edit-form-date.vue
index c26342e6..c65d3ee1 100644
--- a/admin/src/app/views/diy_form/components/edit-form-date.vue
+++ b/admin/src/app/views/diy_form/components/edit-form-date.vue
@@ -1,90 +1,56 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <!-- 表单组件 字段内容设置 -->
-    <slot name="field"></slot>
-    <el-form label-width="100px" class="px-[10px]" @submit.prevent>
-      <el-form-item :label="t('dataFormat')">
-        <el-radio-group
-          v-model="diyStore.editComponent.dateFormat"
-          class="!block"
-        >
-          <el-radio class="!block" label="YYYY年M月D日">{{
-            dateFormat.format1
-          }}</el-radio>
-          <el-radio class="!block" label="YYYY-MM-DD">{{
-            dateFormat.format2
-          }}</el-radio>
-          <el-radio class="!block" label="YYYY/MM/DD">{{
-            dateFormat.format3
-          }}</el-radio>
-          <el-radio class="!block" label="YYYY-MM-DD HH:mm">{{
-            dateFormat.format4
-          }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item :label="t('formPlaceholder')">
-        <el-input
-          v-model.trim="diyStore.editComponent.placeholder"
-          :placeholder="t('formPlaceholderTips')"
-          clearable
-          maxlength="15"
-          show-word-limit
-        />
-      </el-form-item>
-      <el-form-item :label="t('defaultValue')">
-        <el-switch v-model="diyStore.editComponent.defaultControl" />
-      </el-form-item>
-      <el-form-item v-if="diyStore.editComponent.defaultControl">
-        <el-radio-group v-model="diyStore.editComponent.dateWay">
-          <el-radio label="current">{{ t('currentDate') }}</el-radio>
-          <el-radio label="diy">{{ t('diyDate') }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item
-        v-if="
-          diyStore.editComponent.defaultControl &&
-          diyStore.editComponent.dateWay == 'diy'
-        "
-      >
-        <el-date-picker
-          v-if="diyStore.editComponent.dateFormat != 'YYYY-MM-DD HH:mm'"
-          v-model="diyStore.editComponent.field.default.date"
-          format="YYYY/MM/DD"
-          value-format="YYYY-MM-DD"
-          type="date"
-          :placeholder="t('dataPlaceholder')"
-          @change="dateChange"
-        />
-        <el-date-picker
-          v-else
-          v-model="diyStore.editComponent.field.default.date"
-          format="YYYY/MM/DD HH:mm"
-          value-format="YYYY-MM-DD HH:mm"
-          type="datetime"
-          :placeholder="t('dataPlaceholder')"
-          @change="dateChange"
-        />
-      </el-form-item>
-    </el-form>
-
-    <!-- 表单组件 其他设置 -->
-    <slot name="other"></slot>
-  </div>
-
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <!-- 表单组件 字段样式 -->
-    <slot name="style-field"></slot>
-
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
+
+		<!-- 表单组件 字段内容设置 -->
+		<slot name="field"></slot>
+		<el-form label-width="100px" class="px-[10px]" @submit.prevent>
+			<el-form-item :label="t('dataFormat')">
+				<el-radio-group v-model="diyStore.editComponent.dateFormat" class="!block">
+					<el-radio class="!block" label="YYYY年M月D日">{{ dateFormat.format1 }}</el-radio>
+					<el-radio class="!block" label="YYYY-MM-DD">{{ dateFormat.format2 }}</el-radio>
+					<el-radio class="!block" label="YYYY/MM/DD">{{ dateFormat.format3 }}</el-radio>
+					<el-radio class="!block" label="YYYY-MM-DD HH:mm">{{ dateFormat.format4 }}</el-radio>
+				</el-radio-group>
+			</el-form-item>
+			<el-form-item :label="t('formPlaceholder')">
+				<el-input v-model.trim="diyStore.editComponent.placeholder" :placeholder="t('formPlaceholderTips')" clearable maxlength="15" show-word-limit />
+			</el-form-item>
+			<el-form-item :label="t('defaultValue')">
+				<el-switch v-model="diyStore.editComponent.defaultControl"/>
+			</el-form-item>
+			<el-form-item v-if="diyStore.editComponent.defaultControl">
+				<el-radio-group v-model="diyStore.editComponent.dateWay">
+					<el-radio label="current">{{ t('currentDate') }}</el-radio>
+					<el-radio label="diy">{{ t('diyDate') }}</el-radio>
+				</el-radio-group>
+			</el-form-item>
+			<el-form-item v-if="diyStore.editComponent.defaultControl && diyStore.editComponent.dateWay == 'diy'">
+				<el-date-picker v-if="diyStore.editComponent.dateFormat != 'YYYY-MM-DD HH:mm'" v-model="diyStore.editComponent.field.default.date" format="YYYY/MM/DD" value-format="YYYY-MM-DD" type="date" :placeholder="t('dataPlaceholder')" @change="dateChange"/>
+                <el-date-picker v-else v-model="diyStore.editComponent.field.default.date" format="YYYY/MM/DD HH:mm" value-format="YYYY-MM-DD HH:mm" type="datetime" :placeholder="t('dataPlaceholder')" @change="dateChange"/>
+			</el-form-item>
+		</el-form>
+
+		<!-- 表单组件 其他设置 -->
+		<slot name="other"></slot>
+
+	</div>
+
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+
+		<!-- 表单组件 字段样式 -->
+		<slot name="style-field"></slot>
+
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+
+	</div>
 </template>
 
 <script lang="ts" setup>
 import { t } from '@/lang'
-import { ref, reactive, watch, onMounted } from 'vue'
+import { ref,reactive,watch,onMounted } from 'vue'
 import { timeTurnTimeStamp } from '@/utils/common'
 import useDiyStore from '@/stores/modules/diy'
 
@@ -93,44 +59,43 @@ diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
-  const res = { code: true, message: '' }
-  return res
+    const res = { code: true, message: '' }
+    return res
 }
 
 const dateFormat: any = reactive({
-  format1: '',
-  format2: '',
-  format3: '',
-  format4: '',
-})
+	format1: '',
+	format2: '',
+	format3: '',
+	format4: ''
+});
 
 onMounted(() => {
-  // 初始赋值当天日期
-  const today = new Date()
-  if (!diyStore.editComponent.field.default.date) {
-    diyStore.editComponent.field.default.date = today
-      .toISOString()
-      .split('T')[0]
-    diyStore.editComponent.field.default.timestamp = today.getTime() / 1000
-  }
-  let year = today.getFullYear()
-  let month = String(today.getMonth() + 1).padStart(2, '0')
-  let day = String(today.getDate()).padStart(2, '0')
-
-  const hours = String(today.getHours()).padStart(2, '0')
-  const minutes = String(today.getMinutes()).padStart(2, '0')
-  dateFormat.format1 = `${year}年${month}月${day}日`
-  dateFormat.format2 = `${year}-${month}-${day}`
-  dateFormat.format3 = `${year}/${month}/${day}`
-  dateFormat.format4 = `${year}-${month}-${day} ${hours}:${minutes}`
-})
-
-const dateChange = (date: any) => {
-  diyStore.editComponent.field.default.date = date
-  diyStore.editComponent.field.default.timestamp = timeTurnTimeStamp(date)
+    // 初始赋值当天日期
+    const today = new Date();
+	if (!diyStore.editComponent.field.default.date) {
+        diyStore.editComponent.field.default.date = today.toISOString().split('T')[0];
+        diyStore.editComponent.field.default.timestamp = today.getTime() / 1000;
+    }
+    let year = today.getFullYear();
+    let month = String(today.getMonth() + 1).padStart(2, '0');
+    let day = String(today.getDate()).padStart(2, '0');
+
+    const hours = String(today.getHours()).padStart(2, '0');
+    const minutes = String(today.getMinutes()).padStart(2, '0');
+    dateFormat.format1 = `${year}年${month}月${day}日`;
+    dateFormat.format2 = `${year}-${month}-${day}`;
+    dateFormat.format3 = `${year}/${month}/${day}`;
+    dateFormat.format4 = `${year}-${month}-${day} ${hours}:${minutes}`;
+});
+
+const dateChange = (date: any)=>{
+    diyStore.editComponent.field.default.date = date;
+    diyStore.editComponent.field.default.timestamp = timeTurnTimeStamp(date);
 }
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/diy_form/components/edit-form-email.vue b/admin/src/app/views/diy_form/components/edit-form-email.vue
index d01d56f3..ac42c732 100644
--- a/admin/src/app/views/diy_form/components/edit-form-email.vue
+++ b/admin/src/app/views/diy_form/components/edit-form-email.vue
@@ -1,32 +1,30 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <!-- 表单组件 字段内容设置 -->
-    <slot name="field"></slot>
-    <el-form label-width="100px" class="px-[10px]" @submit.prevent>
-      <el-form-item :label="t('formPlaceholder')">
-        <el-input
-          v-model.trim="diyStore.editComponent.placeholder"
-          :placeholder="t('formPlaceholderTips')"
-          clearable
-          maxlength="15"
-          show-word-limit
-        />
-      </el-form-item>
-    </el-form>
-
-    <!-- 表单组件 其他设置 -->
-    <slot name="other"></slot>
-  </div>
-
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <!-- 表单组件 字段样式 -->
-    <slot name="style-field"></slot>
-
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
+
+		<!-- 表单组件 字段内容设置 -->
+		<slot name="field"></slot>
+		<el-form label-width="100px" class="px-[10px]" @submit.prevent>
+			<el-form-item :label="t('formPlaceholder')">
+				<el-input v-model.trim="diyStore.editComponent.placeholder" :placeholder="t('formPlaceholderTips')" clearable maxlength="15" show-word-limit />
+			</el-form-item>
+		</el-form>
+
+		<!-- 表单组件 其他设置 -->
+		<slot name="other"></slot>
+
+	</div>
+
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+
+		<!-- 表单组件 字段样式 -->
+		<slot name="style-field"></slot>
+
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -39,11 +37,12 @@ diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
-  const res = { code: true, message: '' }
-  // todo 只需要考虑该组件自身的验证
-  return res
+    const res = { code: true, message: '' }
+	// todo 只需要考虑该组件自身的验证
+    return res
 }
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/diy_form/components/edit-form-file.vue b/admin/src/app/views/diy_form/components/edit-form-file.vue
index 592ddbb9..31f1c83d 100644
--- a/admin/src/app/views/diy_form/components/edit-form-file.vue
+++ b/admin/src/app/views/diy_form/components/edit-form-file.vue
@@ -1,31 +1,31 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <!-- 表单组件 字段内容设置 -->
-    <slot name="field"></slot>
-    <el-form label-width="100px" class="px-[10px]" @submit.prevent>
-      <el-form-item :label="t('限制上传大小')">
-        <el-input
-          v-model.trim="diyStore.editComponent.limitUploadSize"
-          clearable
-          maxlength="15"
-        />
-        /单位MB，目前是Bit，要转换，*1024
-      </el-form-item>
-    </el-form>
-
-    <!-- 表单组件 其他设置 -->
-    <slot name="other"></slot>
-  </div>
-
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <!-- 表单组件 字段样式 -->
-    <slot name="style-field"></slot>
-
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
+
+		<!-- 表单组件 字段内容设置 -->
+		<slot name="field"></slot>
+		<el-form label-width="100px" class="px-[10px]" @submit.prevent>
+			<el-form-item :label="t('限制上传大小')">
+				<el-input v-model.trim="diyStore.editComponent.limitUploadSize" clearable maxlength="15" />
+				/单位MB，目前是Bit，要转换，*1024
+			</el-form-item>
+		</el-form>
+
+		<!-- 表单组件 其他设置 -->
+		<slot name="other"></slot>
+
+	</div>
+
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+
+		<!-- 表单组件 字段样式 -->
+		<slot name="style-field"></slot>
+
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -37,6 +37,7 @@ const diyStore = useDiyStore()
 diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/diy_form/components/edit-form-identity.vue b/admin/src/app/views/diy_form/components/edit-form-identity.vue
index 307d995b..d752bcb0 100644
--- a/admin/src/app/views/diy_form/components/edit-form-identity.vue
+++ b/admin/src/app/views/diy_form/components/edit-form-identity.vue
@@ -1,71 +1,67 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <!-- 表单组件 字段内容设置 -->
-    <slot name="field"></slot>
-    <el-form label-width="100px" class="px-[10px]" @submit.prevent>
-      <el-form-item :label="t('formPlaceholder')">
-        <el-input
-          v-model.trim="diyStore.editComponent.placeholder"
-          :placeholder="t('formPlaceholderTips')"
-          clearable
-          maxlength="15"
-          show-word-limit
-        />
-      </el-form-item>
-    </el-form>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
 
-    <!-- 表单组件 其他设置 -->
-    <slot name="other"></slot>
-    <el-form label-width="100px" class="px-[10px]">
-      <el-form-item>
-        <template #label>
-          <div class="flex items-center">
-            <span class="mr-[3px]">{{ t('preventDuplication') }}</span>
-            <el-tooltip effect="light" placement="top">
-              <template #content>
-                <p>{{ t('preventDuplicationTipsOne') }}</p>
-                <p>{{ t('preventDuplicationTipsTwo') }}</p>
-              </template>
-              <el-icon>
-                <QuestionFilled color="#999999" />
-              </el-icon>
-            </el-tooltip>
-          </div>
-        </template>
-        <el-switch v-model="diyStore.editComponent.field.unique" />
-      </el-form-item>
-      <el-form-item class="display-block">
-        <template #label>
-          <div class="flex items-center">
-            <span class="mr-[3px]">{{ t('privacyProtection') }}</span>
-            <el-tooltip effect="light" placement="top">
-              <template #content>
-                <p>{{ t('privacyProtectionTipsOne') }}</p>
-                <p>{{ t('privacyProtectionTipsTwo') }}</p>
-              </template>
-              <el-icon>
-                <QuestionFilled color="#999999" />
-              </el-icon>
-            </el-tooltip>
-          </div>
-        </template>
-        <el-switch v-model="diyStore.editComponent.field.privacyProtection" />
-        <div class="text-sm text-gray-400">
-          {{ t('privacyProtectionTipsThree') }}
-        </div>
-      </el-form-item>
-    </el-form>
-  </div>
+		<!-- 表单组件 字段内容设置 -->
+		<slot name="field"></slot>
+		<el-form label-width="100px" class="px-[10px]" @submit.prevent>
+			<el-form-item :label="t('formPlaceholder')">
+				<el-input v-model.trim="diyStore.editComponent.placeholder" :placeholder="t('formPlaceholderTips')" clearable maxlength="15" show-word-limit />
+			</el-form-item>
+		</el-form>
 
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <!-- 表单组件 字段样式 -->
-    <slot name="style-field"></slot>
+		<!-- 表单组件 其他设置 -->
+		<slot name="other"></slot>
+		<el-form label-width="100px" class="px-[10px]">
+			<el-form-item>
+				<template #label>
+					<div class="flex items-center">
+						<span class="mr-[3px]">{{ t('preventDuplication') }}</span>
+						<el-tooltip effect="light" placement="top">
+							<template #content>
+								<p>{{ t('preventDuplicationTipsOne') }}</p>
+								<p>{{ t('preventDuplicationTipsTwo') }}</p>
+							</template>
+							<el-icon>
+								<QuestionFilled color="#999999" />
+							</el-icon>
+						</el-tooltip>
+					</div>
+				</template>
+				<el-switch v-model="diyStore.editComponent.field.unique" />
+			</el-form-item>
+			<el-form-item class="display-block">
+				<template #label>
+					<div class="flex items-center">
+						<span class="mr-[3px]">{{ t('privacyProtection') }}</span>
+						<el-tooltip effect="light" placement="top">
+							<template #content>
+								<p>{{ t('privacyProtectionTipsOne') }}</p>
+								<p>{{ t('privacyProtectionTipsTwo') }}</p>
+							</template>
+							<el-icon>
+								<QuestionFilled color="#999999" />
+							</el-icon>
+						</el-tooltip>
+					</div>
+				</template>
+				<el-switch v-model="diyStore.editComponent.field.privacyProtection" />
+				<div class="text-sm text-gray-400">{{ t('privacyProtectionTipsThree') }}</div>
+			</el-form-item>
+		</el-form>
 
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
+	</div>
+
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+
+		<!-- 表单组件 字段样式 -->
+		<slot name="style-field"></slot>
+
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -78,11 +74,12 @@ diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
-  const res = { code: true, message: '' }
-  // todo 只需要考虑该组件自身的验证
-  return res
+    const res = { code: true, message: '' }
+	// todo 只需要考虑该组件自身的验证
+    return res
 }
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/diy_form/components/edit-form-image.vue b/admin/src/app/views/diy_form/components/edit-form-image.vue
index e11e1acf..27aff8b1 100644
--- a/admin/src/app/views/diy_form/components/edit-form-image.vue
+++ b/admin/src/app/views/diy_form/components/edit-form-image.vue
@@ -1,38 +1,37 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <!-- 表单组件 字段内容设置 -->
-    <slot name="field"></slot>
-    <el-form label-width="100px" class="px-[10px]" @submit.prevent>
-      <el-form-item :label="t('imageLimit')">
-        <el-input
-          v-model.trim="diyStore.editComponent.limit"
-          :placeholder="t('imageLimitPlaceholder')"
-          clearable
-          maxlength="2"
-        />
-      </el-form-item>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
 
-      <el-form-item :label="t('上传方式')">
-        <el-checkbox-group v-model="diyStore.editComponent.uploadMode" :min="1">
-          <el-checkbox label="拍照上传" value="take_pictures" />
-          <el-checkbox label="从相册选择" value="select_from_album" />
-        </el-checkbox-group>
-      </el-form-item>
-    </el-form>
+		<!-- 表单组件 字段内容设置 -->
+		<slot name="field"></slot>
+		<el-form label-width="100px" class="px-[10px]" @submit.prevent>
+			<el-form-item :label="t('imageLimit')">
+				<el-input v-model.trim="diyStore.editComponent.limit" :placeholder="t('imageLimitPlaceholder')" clearable maxlength="2" />
+			</el-form-item>
 
-    <!-- 表单组件 其他设置 -->
-    <slot name="other"></slot>
-  </div>
+            <el-form-item :label="t('上传方式')">
+                <el-checkbox-group v-model="diyStore.editComponent.uploadMode" :min="1">
+                    <el-checkbox label="拍照上传" value="take_pictures" />
+                    <el-checkbox label="从相册选择" value="select_from_album" />
+                </el-checkbox-group>
+            </el-form-item>
+		</el-form>
 
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <!-- 表单组件 字段样式 -->
-    <slot name="style-field"></slot>
+		<!-- 表单组件 其他设置 -->
+		<slot name="other"></slot>
 
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
+	</div>
+
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+
+		<!-- 表单组件 字段样式 -->
+		<slot name="style-field"></slot>
+
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -45,47 +44,45 @@ diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
-  const res = { code: true, message: '' }
-  if (diyStore.value[index].limit == '') {
-    res.code = false
-    res.message = t('imageLimitPlaceholder')
-    return res
-  }
-  if (
-    isNaN(diyStore.value[index].limit) ||
-    !regExp.number.test(diyStore.value[index].limit)
-  ) {
-    res.code = false
-    res.message = t('imageLimitErrorTips')
-    return res
-  }
-  if (diyStore.value[index].limit < 0) {
-    res.code = false
-    res.message = t('imageLimitErrorTipsTwo')
-    return res
-  }
-  if (diyStore.value[index].limit == 0) {
-    res.code = false
-    res.message = t('imageLimitErrorTipsThree')
-    return res
-  }
-  if (diyStore.value[index].limit > 20) {
-    res.code = false
-    res.message = t('imafeLimitErrorTipsFour')
-    return res
-  }
-  return res
+	const res = { code: true, message: '' }
+	if (diyStore.value[index].limit == '') {
+		res.code = false;
+		res.message = t('imageLimitPlaceholder')
+		return res;
+	}
+	if (isNaN(diyStore.value[index].limit) || !regExp.number.test(diyStore.value[index].limit)) {
+		res.code = false;
+		res.message = t('imageLimitErrorTips');
+		return res;
+	}
+	if (diyStore.value[index].limit < 0) {
+		res.code = false;
+		res.message = t('imageLimitErrorTipsTwo')
+		return res;
+	}
+	if (diyStore.value[index].limit == 0) {
+		res.code = false;
+		res.message = t('imageLimitErrorTipsThree')
+		return res;
+	}
+	if (diyStore.value[index].limit > 20) {
+		res.code = false;
+		res.message = t('imafeLimitErrorTipsFour')
+		return res;
+	}
+	return res
 }
 
 // 正则表达式
 const regExp: any = {
-  required: /[\S]+/,
-  number: /^\d{0,10}$/,
-  digit: /^\d{0,10}(.?\d{0,2})$/,
-  special: /^\d{0,10}(.?\d{0,3})$/,
+	required: /[\S]+/,
+	number: /^\d{0,10}$/,
+	digit: /^\d{0,10}(.?\d{0,2})$/,
+	special: /^\d{0,10}(.?\d{0,3})$/
 }
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/diy_form/components/edit-form-input.vue b/admin/src/app/views/diy_form/components/edit-form-input.vue
index 7c8e7eff..237dadc2 100644
--- a/admin/src/app/views/diy_form/components/edit-form-input.vue
+++ b/admin/src/app/views/diy_form/components/edit-form-input.vue
@@ -1,92 +1,80 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <!-- 表单组件 字段内容设置 -->
-    <slot name="field"></slot>
-    <el-form label-width="100px" class="px-[10px]" @submit.prevent>
-      <el-form-item :label="t('formPlaceholder')">
-        <el-input
-          v-model.trim="diyStore.editComponent.placeholder"
-          :placeholder="t('formPlaceholderTips')"
-          clearable
-          maxlength="15"
-          show-word-limit
-        />
-      </el-form-item>
-      <el-form-item>
-        <template #label>
-          <div class="flex items-center">
-            <span class="mr-[3px]">{{ t('defaultValue') }}</span>
-            <el-tooltip
-              effect="light"
-              :content="t('defaultValueTips')"
-              placement="top"
-            >
-              <el-icon>
-                <QuestionFilled color="#999999" />
-              </el-icon>
-            </el-tooltip>
-          </div>
-        </template>
-        <el-input
-          v-model.trim="diyStore.editComponent.field.default"
-          :placeholder="t('defaultValuePlaceholder')"
-          clearable
-          maxlength="18"
-          show-word-limit
-        />
-      </el-form-item>
-    </el-form>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
 
-    <!-- 表单组件 其他设置 -->
-    <slot name="other"></slot>
-    <el-form label-width="100px" class="px-[10px]">
-      <el-form-item>
-        <template #label>
-          <div class="flex items-center">
-            <span class="mr-[3px]">{{ t('preventDuplication') }}</span>
-            <el-tooltip effect="light" placement="top">
-              <template #content>
-                <p>{{ t('preventDuplicationTipsOne') }}</p>
-                <p>{{ t('preventDuplicationTipsTwo') }}</p>
-              </template>
-              <el-icon>
-                <QuestionFilled color="#999999" />
-              </el-icon>
-            </el-tooltip>
-          </div>
-        </template>
-        <el-switch v-model="diyStore.editComponent.field.unique" />
-      </el-form-item>
-      <!--			<el-form-item class="display-block">-->
-      <!--				<template #label>-->
-      <!--					<div class="flex items-center">-->
-      <!--						<span class="mr-[3px]">{{ t('隐私保护') }}</span>-->
-      <!--						<el-tooltip effect="light" placement="top">-->
-      <!--							<template #content>-->
-      <!--								<p>会自动将提交的个人信息做加密展示。</p>-->
-      <!--								<p>适用于公开展示收集的数据且不暴露用户隐私。</p>-->
-      <!--							</template>-->
-      <!--							<el-icon>-->
-      <!--								<QuestionFilled color="#999999" />-->
-      <!--							</el-icon>-->
-      <!--						</el-tooltip>-->
-      <!--					</div>-->
-      <!--				</template>-->
-      <!--				<el-switch v-model="diyStore.editComponent.field.privacyProtection" />-->
-      <!--				<div class="text-sm text-gray-400">{{ t('提交后自动隐藏文本，仅管理员可查看') }}</div>-->
-      <!--			</el-form-item>-->
-    </el-form>
-  </div>
+		<!-- 表单组件 字段内容设置 -->
+		<slot name="field"></slot>
+		<el-form label-width="100px" class="px-[10px]" @submit.prevent>
+			<el-form-item :label="t('formPlaceholder')">
+				<el-input v-model.trim="diyStore.editComponent.placeholder" :placeholder="t('formPlaceholderTips')" clearable maxlength="15" show-word-limit />
+			</el-form-item>
+			<el-form-item>
+				<template #label>
+					<div class="flex items-center">
+						<span class="mr-[3px]">{{ t('defaultValue') }}</span>
+						<el-tooltip effect="light" :content="t('defaultValueTips')" placement="top">
+							<el-icon>
+								<QuestionFilled color="#999999" />
+							</el-icon>
+						</el-tooltip>
+					</div>
+				</template>
+				<el-input v-model.trim="diyStore.editComponent.field.default" :placeholder="t('defaultValuePlaceholder')" clearable maxlength="18" show-word-limit />
+			</el-form-item>
+		</el-form>
 
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <!-- 表单组件 字段样式 -->
-    <slot name="style-field"></slot>
+		<!-- 表单组件 其他设置 -->
+		<slot name="other"></slot>
+		<el-form label-width="100px" class="px-[10px]">
+			<el-form-item>
+				<template #label>
+					<div class="flex items-center">
+						<span class="mr-[3px]">{{ t('preventDuplication') }}</span>
+						<el-tooltip effect="light" placement="top">
+							<template #content>
+								<p>{{ t('preventDuplicationTipsOne') }}</p>
+								<p>{{ t('preventDuplicationTipsTwo') }}</p>
+							</template>
+							<el-icon>
+								<QuestionFilled color="#999999" />
+							</el-icon>
+						</el-tooltip>
+					</div>
+				</template>
+				<el-switch v-model="diyStore.editComponent.field.unique" />
+			</el-form-item>
+<!--			<el-form-item class="display-block">-->
+<!--				<template #label>-->
+<!--					<div class="flex items-center">-->
+<!--						<span class="mr-[3px]">{{ t('隐私保护') }}</span>-->
+<!--						<el-tooltip effect="light" placement="top">-->
+<!--							<template #content>-->
+<!--								<p>会自动将提交的个人信息做加密展示。</p>-->
+<!--								<p>适用于公开展示收集的数据且不暴露用户隐私。</p>-->
+<!--							</template>-->
+<!--							<el-icon>-->
+<!--								<QuestionFilled color="#999999" />-->
+<!--							</el-icon>-->
+<!--						</el-tooltip>-->
+<!--					</div>-->
+<!--				</template>-->
+<!--				<el-switch v-model="diyStore.editComponent.field.privacyProtection" />-->
+<!--				<div class="text-sm text-gray-400">{{ t('提交后自动隐藏文本，仅管理员可查看') }}</div>-->
+<!--			</el-form-item>-->
+		</el-form>
 
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
+	</div>
+
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+
+		<!-- 表单组件 字段样式 -->
+		<slot name="style-field"></slot>
+
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -99,12 +87,13 @@ diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
-  const res = { code: true, message: '' }
-  // todo 只需要考虑该组件自身的验证
-  return res
+	const res = { code: true, message: '' }
+	// todo 只需要考虑该组件自身的验证
+	return res
 }
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/diy_form/components/edit-form-location.vue b/admin/src/app/views/diy_form/components/edit-form-location.vue
index 7115be9b..c80432f8 100644
--- a/admin/src/app/views/diy_form/components/edit-form-location.vue
+++ b/admin/src/app/views/diy_form/components/edit-form-location.vue
@@ -1,55 +1,53 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <!-- 表单组件 字段内容设置 -->
-    <slot name="field"></slot>
-    <el-form label-width="100px" class="px-[10px]">
-      <el-form-item :label="t('access')">
-        <el-radio-group v-model="diyStore.editComponent.mode">
-          <el-radio class="!mr-[20px]" label="authorized_wechat_location">{{
-            t('authorizeWeChatLocation')
-          }}</el-radio>
-          <el-radio label="open_choose_location">{{
-            t('manuallySelectPositioning')
-          }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-    </el-form>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
 
-    <!-- 表单组件 其他设置 -->
-    <slot name="other"></slot>
-    <el-form label-width="100px" class="px-[10px]">
-      <el-form-item class="display-block">
-        <template #label>
-          <div class="flex items-center">
-            <span class="mr-[3px]">{{ t('privacyProtection') }}</span>
-            <el-tooltip effect="light" placement="top">
-              <template #content>
-                <p>{{ t('privacyProtectionTipsOne') }}</p>
-                <p>{{ t('privacyProtectionTipsTwo') }}</p>
-              </template>
-              <el-icon>
-                <QuestionFilled color="#999999" />
-              </el-icon>
-            </el-tooltip>
-          </div>
-        </template>
-        <el-switch v-model="diyStore.editComponent.field.privacyProtection" />
-        <div class="text-sm text-gray-400">
-          {{ t('privacyProtectionTipsFour') }}
-        </div>
-      </el-form-item>
-    </el-form>
-  </div>
+		<!-- 表单组件 字段内容设置 -->
+		<slot name="field"></slot>
+		<el-form label-width="100px" class="px-[10px]">
+			<el-form-item :label="t('access')">
+				<el-radio-group v-model="diyStore.editComponent.mode">
+					<el-radio class="!mr-[20px]" label="authorized_wechat_location">{{ t('authorizeWeChatLocation') }}</el-radio>
+					<el-radio label="open_choose_location">{{ t('manuallySelectPositioning') }}</el-radio>
+				</el-radio-group>
+			</el-form-item>
+		</el-form>
 
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <!-- 表单组件 字段样式 -->
-    <slot name="style-field"></slot>
+		<!-- 表单组件 其他设置 -->
+		<slot name="other"></slot>
+		<el-form label-width="100px" class="px-[10px]">
+			<el-form-item class="display-block">
+				<template #label>
+					<div class="flex items-center">
+						<span class="mr-[3px]">{{ t('privacyProtection') }}</span>
+						<el-tooltip effect="light" placement="top">
+							<template #content>
+								<p>{{ t('privacyProtectionTipsOne') }}</p>
+								<p>{{ t('privacyProtectionTipsTwo') }}</p>
+							</template>
+							<el-icon>
+								<QuestionFilled color="#999999" />
+							</el-icon>
+						</el-tooltip>
+					</div>
+				</template>
+				<el-switch v-model="diyStore.editComponent.field.privacyProtection" />
+				<div class="text-sm text-gray-400">{{ t('privacyProtectionTipsFour') }}</div>
+			</el-form-item>
+		</el-form>
 
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
+	</div>
+
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+
+		<!-- 表单组件 字段样式 -->
+		<slot name="style-field"></slot>
+
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -62,11 +60,12 @@ diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
-  const res = { code: true, message: '' }
-  // todo 只需要考虑该组件自身的验证
-  return res
+    const res = { code: true, message: '' }
+	// todo 只需要考虑该组件自身的验证
+    return res
 }
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/diy_form/components/edit-form-mobile.vue b/admin/src/app/views/diy_form/components/edit-form-mobile.vue
index 72b98739..852873dd 100644
--- a/admin/src/app/views/diy_form/components/edit-form-mobile.vue
+++ b/admin/src/app/views/diy_form/components/edit-form-mobile.vue
@@ -1,71 +1,67 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <!-- 表单组件 字段内容设置 -->
-    <slot name="field"></slot>
-    <el-form label-width="100px" class="px-[10px]" @submit.prevent>
-      <el-form-item :label="t('formPlaceholder')">
-        <el-input
-          v-model.trim="diyStore.editComponent.placeholder"
-          :placeholder="t('formPlaceholderTips')"
-          clearable
-          maxlength="15"
-          show-word-limit
-        />
-      </el-form-item>
-    </el-form>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
 
-    <!-- 表单组件 其他设置 -->
-    <slot name="other"></slot>
-    <el-form label-width="100px" class="px-[10px]">
-      <el-form-item>
-        <template #label>
-          <div class="flex items-center">
-            <span class="mr-[3px]">{{ t('preventDuplication') }}</span>
-            <el-tooltip effect="light" placement="top">
-              <template #content>
-                <p>{{ t('preventDuplicationTipsOne') }}</p>
-                <p>{{ t('preventDuplicationTipsTwo') }}</p>
-              </template>
-              <el-icon>
-                <QuestionFilled color="#999999" />
-              </el-icon>
-            </el-tooltip>
-          </div>
-        </template>
-        <el-switch v-model="diyStore.editComponent.field.unique" />
-      </el-form-item>
-      <el-form-item class="display-block">
-        <template #label>
-          <div class="flex items-center">
-            <span class="mr-[3px]">{{ t('privacyProtection') }}</span>
-            <el-tooltip effect="light" placement="top">
-              <template #content>
-                <p>{{ t('privacyProtectionTipsOne') }}</p>
-                <p>{{ t('privacyProtectionTipsTwo') }}</p>
-              </template>
-              <el-icon>
-                <QuestionFilled color="#999999" />
-              </el-icon>
-            </el-tooltip>
-          </div>
-        </template>
-        <el-switch v-model="diyStore.editComponent.field.privacyProtection" />
-        <div class="text-sm text-gray-400">
-          {{ t('privacyProtectionTipsFive') }}
-        </div>
-      </el-form-item>
-    </el-form>
-  </div>
+		<!-- 表单组件 字段内容设置 -->
+		<slot name="field"></slot>
+		<el-form label-width="100px" class="px-[10px]" @submit.prevent>
+			<el-form-item :label="t('formPlaceholder')">
+				<el-input v-model.trim="diyStore.editComponent.placeholder" :placeholder="t('formPlaceholderTips')" clearable maxlength="15" show-word-limit />
+			</el-form-item>
+		</el-form>
 
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <!-- 表单组件 字段样式 -->
-    <slot name="style-field"></slot>
+		<!-- 表单组件 其他设置 -->
+		<slot name="other"></slot>
+		<el-form label-width="100px" class="px-[10px]">
+			<el-form-item>
+				<template #label>
+					<div class="flex items-center">
+						<span class="mr-[3px]">{{ t('preventDuplication') }}</span>
+						<el-tooltip effect="light" placement="top">
+							<template #content>
+								<p>{{ t('preventDuplicationTipsOne') }}</p>
+								<p>{{ t('preventDuplicationTipsTwo') }}</p>
+							</template>
+							<el-icon>
+								<QuestionFilled color="#999999" />
+							</el-icon>
+						</el-tooltip>
+					</div>
+				</template>
+				<el-switch v-model="diyStore.editComponent.field.unique" />
+			</el-form-item>
+			<el-form-item class="display-block">
+				<template #label>
+					<div class="flex items-center">
+						<span class="mr-[3px]">{{ t('privacyProtection') }}</span>
+						<el-tooltip effect="light" placement="top">
+							<template #content>
+								<p>{{ t('privacyProtectionTipsOne') }}</p>
+								<p>{{ t('privacyProtectionTipsTwo') }}</p>
+							</template>
+							<el-icon>
+								<QuestionFilled color="#999999" />
+							</el-icon>
+						</el-tooltip>
+					</div>
+				</template>
+				<el-switch v-model="diyStore.editComponent.field.privacyProtection" />
+				<div class="text-sm text-gray-400">{{ t('privacyProtectionTipsFive') }}</div>
+			</el-form-item>
+		</el-form>
 
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
+	</div>
+
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+
+		<!-- 表单组件 字段样式 -->
+		<slot name="style-field"></slot>
+
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -78,11 +74,12 @@ diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
-  const res = { code: true, message: '' }
-  // todo 只需要考虑该组件自身的验证
-  return res
+    const res = { code: true, message: '' }
+	// todo 只需要考虑该组件自身的验证
+    return res
 }
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/diy_form/components/edit-form-number.vue b/admin/src/app/views/diy_form/components/edit-form-number.vue
index 269eeccb..012d45fd 100644
--- a/admin/src/app/views/diy_form/components/edit-form-number.vue
+++ b/admin/src/app/views/diy_form/components/edit-form-number.vue
@@ -1,102 +1,83 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <!-- 表单组件 字段内容设置 -->
-    <slot name="field"></slot>
-    <el-form label-width="100px" class="px-[10px]" @submit.prevent>
-      <el-form-item :label="t('formPlaceholder')">
-        <el-input
-          v-model.trim="diyStore.editComponent.placeholder"
-          :placeholder="t('formPlaceholderTips')"
-          clearable
-          maxlength="15"
-          show-word-limit
-        />
-      </el-form-item>
-      <el-form-item :label="t('unit')">
-        <el-input
-          v-model.trim="diyStore.editComponent.unit"
-          :placeholder="t('unitPlaceholder')"
-          clearable
-          maxlength="5"
-          show-word-limit
-        />
-      </el-form-item>
-      <el-form-item>
-        <template #label>
-          <div class="flex items-center">
-            <span class="mr-[3px]">{{ t('defaultValue') }}</span>
-            <el-tooltip
-              effect="light"
-              :content="t('defaultValueTips')"
-              placement="top"
-            >
-              <el-icon>
-                <QuestionFilled color="#999999" />
-              </el-icon>
-            </el-tooltip>
-          </div>
-        </template>
-        <el-input
-          v-model.trim="diyStore.editComponent.field.default"
-          :placeholder="t('defaultValuePlaceholder')"
-          @keyup="filterDigit($event)"
-          clearable
-          maxlength="18"
-          show-word-limit
-        />
-      </el-form-item>
-    </el-form>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
 
-    <!-- 表单组件 其他设置 -->
-    <slot name="other"></slot>
-    <el-form label-width="100px" class="px-[10px]">
-      <!--			<el-form-item>-->
-      <!--				<template #label>-->
-      <!--					<div class="flex items-center">-->
-      <!--						<span class="mr-[3px]">{{ t('内容防重复') }}</span>-->
-      <!--						<el-tooltip effect="light" placement="top">-->
-      <!--							<template #content>-->
-      <!--								<p>该组件填写的内容不能与已提交的数据重复。</p>-->
-      <!--								<p>极端情况下可能存在延时导致限制失效。</p>-->
-      <!--							</template>-->
-      <!--							<el-icon>-->
-      <!--								<QuestionFilled color="#999999" />-->
-      <!--							</el-icon>-->
-      <!--						</el-tooltip>-->
-      <!--					</div>-->
-      <!--				</template>-->
-      <!--				<el-switch v-model="diyStore.editComponent.field.unique" />-->
-      <!--			</el-form-item>-->
-      <!--			<el-form-item class="display-block">-->
-      <!--				<template #label>-->
-      <!--					<div class="flex items-center">-->
-      <!--						<span class="mr-[3px]">{{ t('隐私保护') }}</span>-->
-      <!--						<el-tooltip effect="light" placement="top">-->
-      <!--							<template #content>-->
-      <!--								<p>会自动将提交的个人信息做加密展示。</p>-->
-      <!--								<p>适用于公开展示收集的数据且不暴露用户隐私。</p>-->
-      <!--							</template>-->
-      <!--							<el-icon>-->
-      <!--								<QuestionFilled color="#999999" />-->
-      <!--							</el-icon>-->
-      <!--						</el-tooltip>-->
-      <!--					</div>-->
-      <!--				</template>-->
-      <!--				<el-switch v-model="diyStore.editComponent.field.privacyProtection" />-->
-      <!--				<div class="text-sm text-gray-400">{{ t('提交后自动隐藏数字，仅管理员可查看') }}</div>-->
-      <!--			</el-form-item>-->
-    </el-form>
-  </div>
+		<!-- 表单组件 字段内容设置 -->
+		<slot name="field"></slot>
+		<el-form label-width="100px" class="px-[10px]" @submit.prevent>
+			<el-form-item :label="t('formPlaceholder')">
+				<el-input v-model.trim="diyStore.editComponent.placeholder" :placeholder="t('formPlaceholderTips')" clearable maxlength="15" show-word-limit />
+			</el-form-item>
+            <el-form-item :label="t('unit')">
+				<el-input v-model.trim="diyStore.editComponent.unit" :placeholder="t('unitPlaceholder')" clearable maxlength="5" show-word-limit />
+			</el-form-item>
+			<el-form-item>
+				<template #label>
+					<div class="flex items-center">
+						<span class="mr-[3px]">{{ t('defaultValue') }}</span>
+						<el-tooltip effect="light" :content="t('defaultValueTips')" placement="top">
+							<el-icon>
+								<QuestionFilled color="#999999" />
+							</el-icon>
+						</el-tooltip>
+					</div>
+				</template>
+				<el-input v-model.trim="diyStore.editComponent.field.default" :placeholder="t('defaultValuePlaceholder')" @keyup="filterDigit($event)" clearable maxlength="18" show-word-limit />
+			</el-form-item>
+		</el-form>
 
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <!-- 表单组件 字段样式 -->
-    <slot name="style-field"></slot>
+		<!-- 表单组件 其他设置 -->
+		<slot name="other"></slot>
+		<el-form label-width="100px" class="px-[10px]">
+<!--			<el-form-item>-->
+<!--				<template #label>-->
+<!--					<div class="flex items-center">-->
+<!--						<span class="mr-[3px]">{{ t('内容防重复') }}</span>-->
+<!--						<el-tooltip effect="light" placement="top">-->
+<!--							<template #content>-->
+<!--								<p>该组件填写的内容不能与已提交的数据重复。</p>-->
+<!--								<p>极端情况下可能存在延时导致限制失效。</p>-->
+<!--							</template>-->
+<!--							<el-icon>-->
+<!--								<QuestionFilled color="#999999" />-->
+<!--							</el-icon>-->
+<!--						</el-tooltip>-->
+<!--					</div>-->
+<!--				</template>-->
+<!--				<el-switch v-model="diyStore.editComponent.field.unique" />-->
+<!--			</el-form-item>-->
+<!--			<el-form-item class="display-block">-->
+<!--				<template #label>-->
+<!--					<div class="flex items-center">-->
+<!--						<span class="mr-[3px]">{{ t('隐私保护') }}</span>-->
+<!--						<el-tooltip effect="light" placement="top">-->
+<!--							<template #content>-->
+<!--								<p>会自动将提交的个人信息做加密展示。</p>-->
+<!--								<p>适用于公开展示收集的数据且不暴露用户隐私。</p>-->
+<!--							</template>-->
+<!--							<el-icon>-->
+<!--								<QuestionFilled color="#999999" />-->
+<!--							</el-icon>-->
+<!--						</el-tooltip>-->
+<!--					</div>-->
+<!--				</template>-->
+<!--				<el-switch v-model="diyStore.editComponent.field.privacyProtection" />-->
+<!--				<div class="text-sm text-gray-400">{{ t('提交后自动隐藏数字，仅管理员可查看') }}</div>-->
+<!--			</el-form-item>-->
+		</el-form>
 
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
+	</div>
+
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+
+		<!-- 表单组件 字段样式 -->
+		<slot name="style-field"></slot>
+
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -110,31 +91,29 @@ diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
-  const res = { code: true, message: '' }
-  if (diyStore.value[index].field.default) {
-    if (
-      isNaN(diyStore.value[index].field.default) ||
-      !regExp.digit.test(diyStore.value[index].field.default)
-    ) {
-      res.code = false
-      res.message = t('defaultErrorTips')
-    } else if (diyStore.value[index].field.default < 0) {
-      res.code = false
-      res.message = t('defaultMustZeroTips')
-    }
-  }
-  return res
+    const res = { code: true, message: '' }
+	if(diyStore.value[index].field.default){
+		if (isNaN(diyStore.value[index].field.default) || !regExp.digit.test(diyStore.value[index].field.default)) {
+			res.code = false;
+			res.message = t('defaultErrorTips');
+		} else if (diyStore.value[index].field.default < 0) {
+			res.code = false;
+			res.message = t('defaultMustZeroTips')
+		}
+	}
+	return res
 }
 
 // 正则表达式
 const regExp: any = {
-  required: /[\S]+/,
-  number: /^\d{0,10}$/,
-  digit: /^\d{0,10}(.?\d{0,2})$/,
-  special: /^\d{0,10}(.?\d{0,3})$/,
+	required: /[\S]+/,
+	number: /^\d{0,10}$/,
+	digit: /^\d{0,10}(.?\d{0,2})$/,
+	special: /^\d{0,10}(.?\d{0,3})$/
 }
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/diy_form/components/edit-form-radio.vue b/admin/src/app/views/diy_form/components/edit-form-radio.vue
index 3ef3ab63..98a17364 100644
--- a/admin/src/app/views/diy_form/components/edit-form-radio.vue
+++ b/admin/src/app/views/diy_form/components/edit-form-radio.vue
@@ -1,70 +1,39 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <!-- 表单组件 字段内容设置 -->
-    <slot name="field"></slot>
-    <el-form label-width="100px" class="px-[10px]">
-      <el-form-item :label="t('style')">
-        <el-radio-group v-model="diyStore.editComponent.style">
-          <el-radio label="style-1">{{ t('defaultSources') }}</el-radio>
-          <el-radio label="style-2">{{ t('listStyle') }}</el-radio>
-          <el-radio label="style-3">{{ t('dropDownStyle') }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item :label="t('option')">
-        <div ref="formRadioRef">
-          <div
-            v-for="(option, index) in diyStore.editComponent.options"
-            :key="option.id"
-            class="option-item flex items-center mb-[15px]"
-          >
-            <el-input
-              v-model="diyStore.editComponent.options[index].text"
-              class="!w-[215px]"
-              :placeholder="t('optionPlaceholder')"
-              clearable
-              maxlength="30"
-            />
-            <span
-              v-if="diyStore.editComponent.options.length > 1"
-              @click="removeOption(index)"
-              class="cursor-pointer ml-[5px] nc-iconfont nc-icon-shanchu-yuangaizhiV6xx"
-            ></span>
-          </div>
-        </div>
-        <span
-          class="text-primary cursor-pointer mr-[10px]"
-          @click="addOption"
-          >{{ t('addSingleOption') }}</span
-        >
-        <el-popover :visible="visible" placement="bottom" :width="300">
-          <p class="mb-[5px]">{{ t('addMultipleOption') }}</p>
-          <p class="text-[#888] text-[12px] mb-[5px]">
-            {{ t('addOptionTips') }}
-          </p>
-          <el-input
-            v-model.trim="optionsValue"
-            type="textarea"
-            clearable
-            maxlength="200"
-            show-word-limit
-          />
-          <div class="mt-[10px] text-right">
-            <el-button size="small" text @click="visible = false">{{
-              t('cancel')
-            }}</el-button>
-            <el-button size="small" type="primary" @click="batchAddOptions">{{
-              t('confirm')
-            }}</el-button>
-          </div>
-          <template #reference>
-            <span class="text-primary cursor-pointer" @click="visible = true">{{
-              t('addMultipleOption')
-            }}</span>
-          </template>
-        </el-popover>
-      </el-form-item>
-      <!-- <el-form-item class="display-block">
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
+
+		<!-- 表单组件 字段内容设置 -->
+		<slot name="field"></slot>
+		<el-form label-width="100px" class="px-[10px]">
+			<el-form-item :label="t('style')">
+				<el-radio-group v-model="diyStore.editComponent.style">
+					<el-radio label="style-1">{{ t('defaultSources') }}</el-radio>
+					<el-radio label="style-2">{{ t('listStyle') }}</el-radio>
+					<el-radio label="style-3">{{ t('dropDownStyle') }}</el-radio>
+				</el-radio-group>
+			</el-form-item>
+			<el-form-item :label="t('option')">
+                <div ref="formRadioRef">
+                    <div v-for="(option, index) in diyStore.editComponent.options" :key="option.id" class="option-item flex items-center mb-[15px]">
+                        <el-input v-model="diyStore.editComponent.options[index].text" class="!w-[215px]" :placeholder="t('optionPlaceholder')" clearable maxlength="30" />
+                        <span v-if="diyStore.editComponent.options.length > 1" @click="removeOption(index)" class="cursor-pointer ml-[5px] nc-iconfont nc-icon-shanchu-yuangaizhiV6xx"></span>
+                    </div>
+                </div>
+				<span class="text-primary cursor-pointer mr-[10px]" @click="addOption">{{ t('addSingleOption') }}</span>
+				<el-popover :visible="visible" placement="bottom" :width="300">
+					<p class="mb-[5px]">{{ t('addMultipleOption') }}</p>
+					<p class="text-[#888] text-[12px] mb-[5px]">{{ t('addOptionTips') }}</p>
+					<el-input v-model.trim="optionsValue" type="textarea"  clearable maxlength="200" show-word-limit />
+					<div class="mt-[10px] text-right">
+						<el-button size="small" text @click="visible = false">{{ t('cancel') }}</el-button>
+						<el-button size="small" type="primary" @click="batchAddOptions">{{ t('confirm') }}</el-button>
+					</div>
+					<template #reference>
+						<span class="text-primary cursor-pointer" @click="visible = true">{{ t('addMultipleOption') }}</span>
+					</template>
+				</el-popover>
+			</el-form-item>
+			<!-- <el-form-item class="display-block">
 				<template #label>
 					<div class="flex items-center">
 						<span class="mr-[3px]">{{ t('逻辑规则') }}</span>
@@ -84,164 +53,162 @@
 					<span class="text-primary cursor-pointer" @click="">设置</span>
 				</div>
 			</el-form-item> -->
-    </el-form>
-
-    <!-- 表单组件 其他设置 -->
-    <slot name="other"></slot>
-    <!--		<el-form label-width="100px" class="px-[10px]">-->
-    <!--			<el-form-item class="display-block">-->
-    <!--				<template #label>-->
-    <!--					<div class="flex items-center">-->
-    <!--						<span class="mr-[3px]">{{ t('隐私保护') }}</span>-->
-    <!--						<el-tooltip effect="light" placement="top">-->
-    <!--							<template #content>-->
-    <!--								<p>会自动将提交的个人信息做加密展示。</p>-->
-    <!--								<p>适用于公开展示收集的数据且不暴露用户隐私。</p>-->
-    <!--							</template>-->
-    <!--							<el-icon>-->
-    <!--								<QuestionFilled color="#999999" />-->
-    <!--							</el-icon>-->
-    <!--						</el-tooltip>-->
-    <!--					</div>-->
-    <!--				</template>-->
-    <!--				<el-switch v-model="diyStore.editComponent.field.privacyProtection" />-->
-    <!--				<div class="text-sm text-gray-400">{{ t('提交后自动隐藏内容，仅管理员可查看') }}</div>-->
-    <!--			</el-form-item>-->
-
-    <!--		</el-form>-->
-  </div>
-
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <!-- 表单组件 字段样式 -->
-    <slot name="style-field"></slot>
-
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
+		</el-form>
+
+		<!-- 表单组件 其他设置 -->
+		<slot name="other"></slot>
+<!--		<el-form label-width="100px" class="px-[10px]">-->
+<!--			<el-form-item class="display-block">-->
+<!--				<template #label>-->
+<!--					<div class="flex items-center">-->
+<!--						<span class="mr-[3px]">{{ t('隐私保护') }}</span>-->
+<!--						<el-tooltip effect="light" placement="top">-->
+<!--							<template #content>-->
+<!--								<p>会自动将提交的个人信息做加密展示。</p>-->
+<!--								<p>适用于公开展示收集的数据且不暴露用户隐私。</p>-->
+<!--							</template>-->
+<!--							<el-icon>-->
+<!--								<QuestionFilled color="#999999" />-->
+<!--							</el-icon>-->
+<!--						</el-tooltip>-->
+<!--					</div>-->
+<!--				</template>-->
+<!--				<el-switch v-model="diyStore.editComponent.field.privacyProtection" />-->
+<!--				<div class="text-sm text-gray-400">{{ t('提交后自动隐藏内容，仅管理员可查看') }}</div>-->
+<!--			</el-form-item>-->
+
+<!--		</el-form>-->
+
+	</div>
+
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+
+		<!-- 表单组件 字段样式 -->
+		<slot name="style-field"></slot>
+
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+
+	</div>
 </template>
 
 <script lang="ts" setup>
 import { t } from '@/lang'
-import { ref, onMounted, nextTick } from 'vue'
+import { ref, onMounted, nextTick} from 'vue'
 import useDiyStore from '@/stores/modules/diy'
 import Sortable from 'sortablejs'
 import { range } from 'lodash-es'
-import { FormInstance, ElMessage } from 'element-plus'
+import { FormInstance, ElMessage } from "element-plus";
 
 const diyStore = useDiyStore()
 diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
-  const res = { code: true, message: '' }
-  let pass = true
-  for (let i = 0; i < diyStore.value[index].options.length; i++) {
-    if (!diyStore.value[index].options[i].text) {
-      res.code = false
-      res.message = t('optionPlaceholder')
-      pass = false
-      break
-    }
-  }
-
-  if (!pass) return res
-
-  let uniqueOptions = uniqueByKey(diyStore.value[index].options, 'text')
-
-  if (uniqueOptions.length != diyStore.value[index].options.length) {
-    res.code = false
-    res.message = t('errorTipsOne')
-  }
-  return res
+	const res = { code: true, message: '' }
+	let pass = true;
+	for (let i = 0; i < diyStore.value[index].options.length; i++) {
+		if (!diyStore.value[index].options[i].text) {
+			res.code = false;
+			res.message = t('optionPlaceholder');
+			pass = false;
+			break;
+		}
+	}
+
+	if (!pass) return res;
+
+	let uniqueOptions = uniqueByKey(diyStore.value[index].options, 'text')
+
+	if (uniqueOptions.length != diyStore.value[index].options.length) {
+		res.code = false;
+		res.message = t('errorTipsOne')
+	}
+	return res
 }
 
 diyStore.editComponent.options.forEach((item: any) => {
-  if (!item.id) item.id = diyStore.generateRandom()
+	if (!item.id) item.id = diyStore.generateRandom()
 })
 
 const visible = ref(false)
 const optionsValue = ref()
 const addOption = () => {
-  diyStore.editComponent.options.push({
-    id: diyStore.generateRandom(),
-    text: '选项' + (diyStore.editComponent.options.length + 1),
-  })
-}
-
-const removeOption = (index: any) => {
-  diyStore.editComponent.options.splice(index, 1)
+	diyStore.editComponent.options.push({
+		id: diyStore.generateRandom(),
+		text: '选项' + (diyStore.editComponent.options.length + 1)
+	});
+};
+
+const removeOption = (index:any) => {
+    diyStore.editComponent.options.splice(index, 1);
 }
 
 const batchAddOptions = () => {
-  if (optionsValue.value.trim()) {
-    const newOptions = optionsValue.value
-      .split(',')
-      .map((option: any) => {
-        return {
-          id: diyStore.generateRandom(),
-          text: option.trim(),
-        }
-      })
-      .filter((option: any) => option.text !== '')
-
-    // 去除重复的选项
-    const uniqueNewOptions = uniqueByKey(newOptions, 'text')
-
-    // 过滤掉已存在的选项
-    const filteredNewOptions = uniqueNewOptions.filter(
-      (newOption) =>
-        !diyStore.editComponent.options.some(
-          (existingOption) => existingOption.text === newOption.text
-        )
-    )
-
-    // 如果有新的选项，添加到选项列表中
-    if (filteredNewOptions.length > 0) {
-      diyStore.editComponent.options.push(...filteredNewOptions)
-    } else {
-      ElMessage({
-        message: t('errorTipsTwo'),
-        type: 'warning',
-      })
-    }
-
-    optionsValue.value = ''
-    visible.value = false
-  }
-}
+	if (optionsValue.value.trim()) {
+		const newOptions = optionsValue.value.split(',').map((option: any) => {
+			return {
+				id: diyStore.generateRandom(),
+				text: option.trim()
+			};
+		}).filter((option: any) => option.text !== '');
+
+		// 去除重复的选项
+		const uniqueNewOptions = uniqueByKey(newOptions, 'text');
+
+		// 过滤掉已存在的选项
+		const filteredNewOptions = uniqueNewOptions.filter(newOption =>
+				!diyStore.editComponent.options.some(existingOption => existingOption.text === newOption.text)
+		);
+
+		// 如果有新的选项，添加到选项列表中
+		if (filteredNewOptions.length > 0) {
+			diyStore.editComponent.options.push(...filteredNewOptions);
+		} else {
+			ElMessage({
+				message: t('errorTipsTwo'),
+				type: "warning",
+			});
+		}
+
+		optionsValue.value = '';
+		visible.value = false;
+	}
+};
 
 // 数组去重
 const uniqueByKey = (arr: any, key: any) => {
-  const seen = new Set()
-  return arr.filter((item: any) => {
-    const serializedKey = JSON.stringify(item[key])
-    return seen.has(serializedKey) ? false : seen.add(serializedKey)
-  })
+	const seen = new Set();
+	return arr.filter((item: any) => {
+		const serializedKey = JSON.stringify(item[key]);
+		return seen.has(serializedKey) ? false : seen.add(serializedKey);
+	});
 }
 
 const formRadioRef = ref()
 
 onMounted(() => {
-  nextTick(() => {
-    const sortable = Sortable.create(formRadioRef.value, {
-      group: 'option-item',
-      animation: 200,
-      onEnd: (event) => {
-        const temp = diyStore.editComponent.options[event.oldIndex!]
-        diyStore.editComponent.options.splice(event.oldIndex!, 1)
-        diyStore.editComponent.options.splice(event.newIndex!, 0, temp)
-        sortable.sort(
-          range(diyStore.editComponent.options.length).map((value) => {
-            return value.toString()
-          })
-        )
-      },
+    nextTick(() => {
+        const sortable = Sortable.create(formRadioRef.value, {
+            group: 'option-item',
+            animation: 200,
+            onEnd: event => {
+                const temp = diyStore.editComponent.options[event.oldIndex!]
+                diyStore.editComponent.options.splice(event.oldIndex!, 1)
+                diyStore.editComponent.options.splice(event.newIndex!, 0, temp)
+                sortable.sort(
+                    range(diyStore.editComponent.options.length).map(value => {
+                        return value.toString()
+                    })
+                )
+            }
+        })
     })
-  })
 })
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/diy_form/components/edit-form-submit.vue b/admin/src/app/views/diy_form/components/edit-form-submit.vue
index e73732b1..7a0cb6f5 100644
--- a/admin/src/app/views/diy_form/components/edit-form-submit.vue
+++ b/admin/src/app/views/diy_form/components/edit-form-submit.vue
@@ -1,112 +1,75 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <div class="edit-attr-item-wrap">
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('floatBtnBtton')" class="display-block">
-          <el-radio-group
-            v-model="diyStore.editComponent.btnPosition"
-            @change="btnPositionChangeFn"
-          >
-            <el-radio label="follow_content">{{ t('followContent') }}</el-radio>
-            <el-radio label="hover_screen_bottom">{{
-              t('hoverScreenBottom')
-            }}</el-radio>
-          </el-radio-group>
-          <div
-            class="text-sm text-gray-400 mb-[5px] leading-[1.4]"
-            v-show="diyStore.editComponent.btnPosition == 'follow_content'"
-          >
-            {{ t('btnTips') }}
-          </div>
-          <div
-            class="text-sm text-gray-400 mb-[5px]"
-            v-show="diyStore.editComponent.btnPosition == 'hover_screen_bottom'"
-          >
-            {{ t('btnTipsTwo') }}
-          </div>
-          <div class="text-sm text-gray-400 mb-[10px] leading-[1.4]">
-            {{ t('btnTipsThree') }}
-          </div>
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('submitBtn') }}</h3>
-      <el-form label-width="80px" class="px-[10px]" @submit.prevent>
-        <el-form-item :label="t('submitBtnName')">
-          <el-input
-            v-model.trim="diyStore.editComponent.submitBtn.text"
-            :placeholder="t('btnNamePlaceholder')"
-            clearable
-            maxlength="10"
-            show-word-limit
-          />
-        </el-form-item>
-        <el-form-item :label="t('textColor')">
-          <el-color-picker v-model="diyStore.editComponent.submitBtn.color" />
-        </el-form-item>
-        <el-form-item :label="t('subTextBgColor')">
-          <el-color-picker v-model="diyStore.editComponent.submitBtn.bgColor" />
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('resetBtn') }}</h3>
-      <el-form label-width="80px" class="px-[10px]" @submit.prevent>
-        <el-form-item :label="t('carouselSearchTabControl')">
-          <el-switch v-model="diyStore.editComponent.resetBtn.control" />
-        </el-form-item>
-        <el-form-item :label="t('submitBtnName')">
-          <el-input
-            v-model.trim="diyStore.editComponent.resetBtn.text"
-            :placeholder="t('btnNamePlaceholder')"
-            clearable
-            maxlength="10"
-            show-word-limit
-          />
-        </el-form-item>
-        <el-form-item :label="t('textColor')">
-          <el-color-picker v-model="diyStore.editComponent.resetBtn.color" />
-        </el-form-item>
-        <el-form-item :label="t('subTextBgColor')">
-          <el-color-picker v-model="diyStore.editComponent.resetBtn.bgColor" />
-        </el-form-item>
-      </el-form>
-    </div>
-  </div>
-
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('btnStyle') }}</h3>
-      <el-form label-width="100px" class="px-[10px]">
-        <el-form-item :label="t('topRounded')">
-          <el-slider
-            v-model="diyStore.editComponent.topElementRounded"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-            :max="50"
-          />
-        </el-form-item>
-        <el-form-item :label="t('bottomRounded')">
-          <el-slider
-            v-model="diyStore.editComponent.bottomElementRounded"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-            :max="50"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
+		<div class="edit-attr-item-wrap">
+            <el-form label-width="80px" class="px-[10px]">
+	            <el-form-item :label="t('floatBtnBtton')" class="display-block">
+		            <el-radio-group v-model="diyStore.editComponent.btnPosition" @change="btnPositionChangeFn">
+			            <el-radio label="follow_content">{{ t('followContent') }}</el-radio>
+			            <el-radio label="hover_screen_bottom">{{ t('hoverScreenBottom') }}</el-radio>
+		            </el-radio-group>
+		            <div class="text-sm text-gray-400 mb-[5px] leading-[1.4]" v-show="diyStore.editComponent.btnPosition == 'follow_content'">{{ t('btnTips') }}</div>
+		            <div class="text-sm text-gray-400 mb-[5px]" v-show="diyStore.editComponent.btnPosition == 'hover_screen_bottom'">{{ t('btnTipsTwo') }}</div>
+                    <div class="text-sm text-gray-400 mb-[10px] leading-[1.4]">{{ t('btnTipsThree') }}</div>
+	            </el-form-item>
+			</el-form>
+
+		</div>
+
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('submitBtn') }}</h3>
+			<el-form label-width="80px" class="px-[10px]" @submit.prevent>
+				<el-form-item :label="t('submitBtnName')">
+					<el-input v-model.trim="diyStore.editComponent.submitBtn.text" :placeholder="t('btnNamePlaceholder')" clearable maxlength="10" show-word-limit />
+				</el-form-item>
+				<el-form-item :label="t('textColor')">
+					<el-color-picker v-model="diyStore.editComponent.submitBtn.color" />
+				</el-form-item>
+				<el-form-item :label="t('subTextBgColor')">
+					<el-color-picker v-model="diyStore.editComponent.submitBtn.bgColor" />
+				</el-form-item>
+			</el-form>
+		</div>
+
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('resetBtn') }}</h3>
+			<el-form label-width="80px" class="px-[10px]" @submit.prevent>
+				<el-form-item :label="t('carouselSearchTabControl')">
+					<el-switch v-model="diyStore.editComponent.resetBtn.control" />
+				</el-form-item>
+				<el-form-item :label="t('submitBtnName')">
+					<el-input v-model.trim="diyStore.editComponent.resetBtn.text" :placeholder="t('btnNamePlaceholder')" clearable maxlength="10" show-word-limit />
+				</el-form-item>
+				<el-form-item :label="t('textColor')">
+					<el-color-picker v-model="diyStore.editComponent.resetBtn.color" />
+				</el-form-item>
+				<el-form-item :label="t('subTextBgColor')">
+					<el-color-picker v-model="diyStore.editComponent.resetBtn.bgColor" />
+				</el-form-item>
+			</el-form>
+		</div>
+
+	</div>
+
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('btnStyle') }}</h3>
+				<el-form label-width="100px" class="px-[10px]">
+				<el-form-item :label="t('topRounded')">
+					<el-slider v-model="diyStore.editComponent.topElementRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+				</el-form-item>
+				<el-form-item :label="t('bottomRounded')">
+					<el-slider v-model="diyStore.editComponent.bottomElementRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+				</el-form-item>
+			</el-form>
+		</div>
+
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -118,32 +81,33 @@ const diyStore = useDiyStore()
 diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
 
 // 单选
-const btnPositionChangeFn = (e) => {
-  if (e == 'hover_screen_bottom') {
-    diyStore.editComponent.margin.bottom = 0
-    diyStore.editComponent.margin.both = 0
-    diyStore.editComponent.margin.top = 0
-  }
+const btnPositionChangeFn = (e)=>{
+    if(e == 'hover_screen_bottom'){
+        diyStore.editComponent.margin.bottom = 0;
+        diyStore.editComponent.margin.both = 0;
+        diyStore.editComponent.margin.top = 0;
+    }
 }
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
-  const res = { code: true, message: '' }
-  if (diyStore.value[index].submitBtn.text == '') {
-    res.code = false
-    res.message = t('submitBtnNamePlaceholder')
-    return res
-  }
-  if (diyStore.value[index].resetBtn.text == '') {
-    res.code = false
-    res.message = t('resetBtnNamePlaceholder')
-    return res
-  }
-
-  return res
+	const res = { code: true, message: '' }
+	if (diyStore.value[index].submitBtn.text == '') {
+		res.code = false;
+		res.message = t('submitBtnNamePlaceholder');
+		return res;
+	}
+	if (diyStore.value[index].resetBtn.text == '') {
+		res.code = false;
+		res.message = t('resetBtnNamePlaceholder');
+		return res;
+	}
+
+	return res
 }
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/diy_form/components/edit-form-table.vue b/admin/src/app/views/diy_form/components/edit-form-table.vue
index 0667e562..94c0bc2c 100644
--- a/admin/src/app/views/diy_form/components/edit-form-table.vue
+++ b/admin/src/app/views/diy_form/components/edit-form-table.vue
@@ -1,22 +1,26 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <!-- 表单组件 字段内容设置 -->
-    <slot name="field"></slot>
-    todo 此处编写表格组件的属性
-
-    <!-- 表单组件 其他设置 -->
-    <slot name="other"></slot>
-  </div>
-
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <!-- 表单组件 字段样式 -->
-    <slot name="style-field"></slot>
-
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
+
+		<!-- 表单组件 字段内容设置 -->
+		<slot name="field"></slot>
+		todo 此处编写表格组件的属性
+
+		<!-- 表单组件 其他设置 -->
+		<slot name="other"></slot>
+
+	</div>
+
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+
+		<!-- 表单组件 字段样式 -->
+		<slot name="style-field"></slot>
+
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -29,11 +33,12 @@ diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
-  const res = { code: true, message: '' }
-  // todo 只需要考虑该组件自身的验证
-  return res
+    const res = { code: true, message: '' }
+	// todo 只需要考虑该组件自身的验证
+    return res
 }
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/diy_form/components/edit-form-textarea.vue b/admin/src/app/views/diy_form/components/edit-form-textarea.vue
index 1b815fe4..4ba95202 100644
--- a/admin/src/app/views/diy_form/components/edit-form-textarea.vue
+++ b/admin/src/app/views/diy_form/components/edit-form-textarea.vue
@@ -1,55 +1,34 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <!-- 表单组件 字段内容设置 -->
-    <slot name="field"></slot>
-    <el-form label-width="100px" class="px-[10px]" @submit.prevent>
-      <el-form-item :label="t('formPlaceholder')">
-        <el-input
-          v-model.trim="diyStore.editComponent.placeholder"
-          :placeholder="t('formPlaceholderTips')"
-          clearable
-          maxlength="15"
-          show-word-limit
-        />
-      </el-form-item>
-      <el-form-item>
-        <template #label>
-          <div class="flex items-center">
-            <span class="mr-[3px]">{{ t('defaultValue') }}</span>
-            <el-tooltip
-              effect="light"
-              :content="t('defaultValueTips')"
-              placement="top"
-            >
-              <el-icon>
-                <QuestionFilled color="#999999" />
-              </el-icon>
-            </el-tooltip>
-          </div>
-        </template>
-        <el-input
-          v-model.trim="diyStore.editComponent.field.default"
-          :placeholder="t('defaultValuePlaceholder')"
-          clearable
-          maxlength="18"
-          show-word-limit
-        />
-      </el-form-item>
-      <el-form-item :label="t('rowCount')">
-        <el-input
-          v-model.trim="diyStore.editComponent.rowCount"
-          :placeholder="t('rowCountPlaceholder')"
-          clearable
-          maxlength="2"
-          show-word-limit
-        />
-      </el-form-item>
-    </el-form>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
 
-    <!-- 表单组件 其他设置 -->
-    <slot name="other"></slot>
-    <!--<el-form label-width="100px" class="px-[10px]">
+		<!-- 表单组件 字段内容设置 -->
+		<slot name="field"></slot>
+		<el-form label-width="100px" class="px-[10px]" @submit.prevent>
+			<el-form-item :label="t('formPlaceholder')">
+				<el-input v-model.trim="diyStore.editComponent.placeholder" :placeholder="t('formPlaceholderTips')" clearable maxlength="15" show-word-limit />
+			</el-form-item>
+			<el-form-item>
+				<template #label>
+					<div class="flex items-center">
+						<span class="mr-[3px]">{{ t('defaultValue') }}</span>
+						<el-tooltip effect="light" :content="t('defaultValueTips')" placement="top">
+							<el-icon>
+								<QuestionFilled color="#999999" />
+							</el-icon>
+						</el-tooltip>
+					</div>
+				</template>
+				<el-input v-model.trim="diyStore.editComponent.field.default" :placeholder="t('defaultValuePlaceholder')" clearable maxlength="18" show-word-limit />
+			</el-form-item>
+			<el-form-item :label="t('rowCount')">
+				<el-input v-model.trim="diyStore.editComponent.rowCount" :placeholder="t('rowCountPlaceholder')" clearable maxlength="2" show-word-limit />
+			</el-form-item>
+		</el-form>
+
+		<!-- 表单组件 其他设置 -->
+		<slot name="other"></slot>
+		<!--<el-form label-width="100px" class="px-[10px]">
 			<el-form-item class="display-block">
 				<template #label>
 					<div class="flex items-center">
@@ -69,16 +48,19 @@
 				<div class="text-sm text-gray-400">{{ t('提交后自动隐藏文本，仅管理员可查看') }}</div>
 			</el-form-item>
 		</el-form>-->
-  </div>
 
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <!-- 表单组件 字段样式 -->
-    <slot name="style-field"></slot>
+	</div>
 
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+
+		<!-- 表单组件 字段样式 -->
+		<slot name="style-field"></slot>
+
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -91,11 +73,12 @@ diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
-  const res = { code: true, message: '' }
-  // todo 只需要考虑该组件自身的验证
-  return res
+    const res = { code: true, message: '' }
+	// todo 只需要考虑该组件自身的验证
+    return res
 }
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/diy_form/components/edit-form-time-scope.vue b/admin/src/app/views/diy_form/components/edit-form-time-scope.vue
index 93a39941..a188b4aa 100644
--- a/admin/src/app/views/diy_form/components/edit-form-time-scope.vue
+++ b/admin/src/app/views/diy_form/components/edit-form-time-scope.vue
@@ -1,125 +1,86 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <!-- 表单组件 字段内容设置 -->
-    <slot name="field"></slot>
-
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('startTime') }}</h3>
-      <el-form label-width="100px" class="px-[10px]" @submit.prevent>
-        <el-form-item :label="t('formPlaceholder')">
-          <el-input
-            v-model.trim="diyStore.editComponent.start.placeholder"
-            :placeholder="t('formPlaceholderTips')"
-            clearable
-            maxlength="15"
-            show-word-limit
-          />
-        </el-form-item>
-        <el-form-item :label="t('defaultValue')">
-          <el-switch v-model="diyStore.editComponent.start.defaultControl" />
-        </el-form-item>
-        <el-form-item v-if="diyStore.editComponent.start.defaultControl">
-          <el-radio-group v-model="diyStore.editComponent.start.timeWay">
-            <el-radio label="current">{{ t('currentTime') }}</el-radio>
-            <el-radio label="diy">{{ t('diyTime') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item
-          v-if="
-            diyStore.editComponent.start.defaultControl &&
-            diyStore.editComponent.start.timeWay == 'diy'
-          "
-        >
-          <el-time-picker
-            v-model="diyStore.editComponent.field.default.start.date"
-            :placeholder="t('startTimePlaceholder')"
-            format="HH:mm"
-            value-format="HH:mm"
-            @change="startTimePickerChange"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('endTime') }}</h3>
-      <el-form label-width="100px" class="px-[10px]" @submit.prevent>
-        <el-form-item :label="t('formPlaceholder')">
-          <el-input
-            v-model.trim="diyStore.editComponent.end.placeholder"
-            :placeholder="t('formPlaceholderTips')"
-            clearable
-            maxlength="15"
-            show-word-limit
-          />
-        </el-form-item>
-        <el-form-item :label="t('defaultValue')">
-          <el-switch v-model="diyStore.editComponent.end.defaultControl" />
-        </el-form-item>
-        <el-form-item v-if="diyStore.editComponent.end.defaultControl">
-          <el-radio-group v-model="diyStore.editComponent.end.timeWay">
-            <el-radio label="current">{{ t('currentTime') }}</el-radio>
-            <el-radio label="diy">{{ t('diyTime') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item
-          v-if="
-            diyStore.editComponent.end.defaultControl &&
-            diyStore.editComponent.end.timeWay == 'diy'
-          "
-        >
-          <el-time-picker
-            :disabled-hours="disabledHours"
-            :disabled-minutes="disabledMinutes"
-            v-model="diyStore.editComponent.field.default.end.date"
-            :placeholder="t('endTimePlaceholder')"
-            format="HH:mm"
-            value-format="HH:mm"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <!-- 表单组件 其他设置 -->
-    <slot name="other"></slot>
-  </div>
-
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('textStyle') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('textFontSize')">
-          <el-slider
-            v-model="diyStore.editComponent.fontSize"
-            show-input
-            size="small"
-            class="ml-[10px] diy-nav-slider"
-            :min="12"
-            :max="18"
-          />
-        </el-form-item>
-        <el-form-item :label="t('textFontWeight')">
-          <el-radio-group v-model="diyStore.editComponent.fontWeight">
-            <el-radio :label="'normal'">{{ t('fontWeightNormal') }}</el-radio>
-            <el-radio :label="'bold'">{{ t('fontWeightBold') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item :label="t('textColor')">
-          <el-color-picker v-model="diyStore.editComponent.textColor" />
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
+
+		<!-- 表单组件 字段内容设置 -->
+		<slot name="field"></slot>
+
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('startTime') }}</h3>
+			<el-form label-width="100px" class="px-[10px]" @submit.prevent>
+				<el-form-item :label="t('formPlaceholder')">
+					<el-input v-model.trim="diyStore.editComponent.start.placeholder" :placeholder="t('formPlaceholderTips')" clearable maxlength="15" show-word-limit />
+				</el-form-item>
+				<el-form-item :label="t('defaultValue')">
+					<el-switch v-model="diyStore.editComponent.start.defaultControl"/>
+				</el-form-item>
+				<el-form-item v-if="diyStore.editComponent.start.defaultControl">
+					<el-radio-group v-model="diyStore.editComponent.start.timeWay">
+						<el-radio label="current">{{ t('currentTime') }}</el-radio>
+						<el-radio label="diy">{{ t('diyTime') }}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+				<el-form-item v-if="diyStore.editComponent.start.defaultControl && diyStore.editComponent.start.timeWay == 'diy'">
+                    <el-time-picker v-model="diyStore.editComponent.field.default.start.date" :placeholder="t('startTimePlaceholder')" format="HH:mm" value-format="HH:mm" @change="startTimePickerChange" />
+				</el-form-item>
+			</el-form>
+		</div>
+
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('endTime') }}</h3>
+			<el-form label-width="100px" class="px-[10px]" @submit.prevent>
+				<el-form-item :label="t('formPlaceholder')">
+					<el-input v-model.trim="diyStore.editComponent.end.placeholder" :placeholder="t('formPlaceholderTips')" clearable maxlength="15" show-word-limit />
+				</el-form-item>
+				<el-form-item :label="t('defaultValue')">
+					<el-switch v-model="diyStore.editComponent.end.defaultControl"  />
+				</el-form-item>
+				<el-form-item v-if="diyStore.editComponent.end.defaultControl">
+					<el-radio-group v-model="diyStore.editComponent.end.timeWay">
+						<el-radio label="current">{{ t('currentTime') }}</el-radio>
+						<el-radio label="diy">{{ t('diyTime') }}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+				<el-form-item v-if="diyStore.editComponent.end.defaultControl && diyStore.editComponent.end.timeWay == 'diy'">
+                    <el-time-picker  :disabled-hours="disabledHours" :disabled-minutes="disabledMinutes" v-model="diyStore.editComponent.field.default.end.date" :placeholder="t('endTimePlaceholder')" format="HH:mm" value-format="HH:mm" />
+				</el-form-item>
+			</el-form>
+		</div>
+
+		<!-- 表单组件 其他设置 -->
+		<slot name="other"></slot>
+	</div>
+
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('textStyle') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('textFontSize')">
+					<el-slider v-model="diyStore.editComponent.fontSize" show-input size="small" class="ml-[10px] diy-nav-slider" :min="12" :max="18" />
+				</el-form-item>
+				<el-form-item :label="t('textFontWeight')">
+					<el-radio-group v-model="diyStore.editComponent.fontWeight">
+						<el-radio :label="'normal'">{{ t('fontWeightNormal') }}</el-radio>
+						<el-radio :label="'bold'">{{ t('fontWeightBold') }}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+				<el-form-item :label="t('textColor')">
+					<el-color-picker v-model="diyStore.editComponent.textColor" />
+				</el-form-item>
+			</el-form>
+		</div>
+
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+
+	</div>
 </template>
 
 <script lang="ts" setup>
 import { t } from '@/lang'
-import { ref, onMounted } from 'vue'
+import { ref,onMounted } from 'vue'
 import useDiyStore from '@/stores/modules/diy'
 
 const diyStore = useDiyStore()
@@ -127,118 +88,111 @@ diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
-  const res = { code: true, message: '' }
-  let starTime = diyStore.value[index].field.default.start.date
-  let endTime = diyStore.value[index].field.default.end.date
-
-  const today = new Date()
-  const hours = String(today.getHours()).padStart(2, '0')
-  const minutes = String(today.getMinutes()).padStart(2, '0')
-
-  if (diyStore.editComponent.start.timeWay == 'current') {
-    starTime = `${hours}:${minutes}`
-  }
-  if (diyStore.editComponent.end.timeWay == 'current') {
-    endTime = `${hours}:${minutes}`
-  }
-
-  if (diyStore.editComponent.start.defaultControl && starTime == '') {
-    res.code = false
-    res.message = t('startTimeTips')
+    const res = { code: true, message: '' }
+    let starTime = diyStore.value[index].field.default.start.date;
+    let endTime = diyStore.value[index].field.default.end.date;
+
+    const today = new Date();
+    const hours = String(today.getHours()).padStart(2, '0');
+    const minutes = String(today.getMinutes()).padStart(2, '0');
+
+    if(diyStore.editComponent.start.timeWay == 'current'){
+        starTime = `${hours}:${minutes}`;
+    }
+    if(diyStore.editComponent.end.timeWay == 'current'){
+        endTime = `${hours}:${minutes}`;
+    }
+
+    if(diyStore.editComponent.start.defaultControl && starTime == ''){
+        res.code = false
+        res.message = t('startTimeTips')
+        return res
+    }
+    if(diyStore.editComponent.end.defaultControl && endTime == ''){
+        res.code = false
+        res.message = t('endTimeTips')
+        return res
+    }
+
+    if(diyStore.editComponent.start.defaultControl && diyStore.editComponent.end.defaultControl && timeInvertSecond(starTime)  > timeInvertSecond(endTime)){
+        res.code = false
+        res.message = t('startEndTimeTips')
+        return res
+    }
     return res
-  }
-  if (diyStore.editComponent.end.defaultControl && endTime == '') {
-    res.code = false
-    res.message = t('endTimeTips')
-    return res
-  }
-
-  if (
-    diyStore.editComponent.start.defaultControl &&
-    diyStore.editComponent.end.defaultControl &&
-    timeInvertSecond(starTime) > timeInvertSecond(endTime)
-  ) {
-    res.code = false
-    res.message = t('startEndTimeTips')
-    return res
-  }
-  return res
 }
 
+
 onMounted(() => {
-  const today = new Date()
-  const hours = String(today.getHours()).padStart(2, '0')
-  const minutes = String(today.getMinutes()).padStart(2, '0')
-
-  if (!diyStore.editComponent.field.default.start.date) {
-    diyStore.editComponent.field.default.start.date = `${hours}:${minutes}`
-    diyStore.editComponent.field.default.start.timestamp = timeInvertSecond(
-      `${hours}:${minutes}`
-    )
-  }
-  if (!diyStore.editComponent.field.default.end.date) {
-    let endDate = new Date()
-    endDate.setHours(today.getHours(), today.getMinutes() + 10, 0, 0) // 在当前时间基础上加 10 分钟
-    const endHours = String(endDate.getHours()).padStart(2, '0')
-    const endMinutes = String(endDate.getMinutes()).padStart(2, '0')
-
-    diyStore.editComponent.field.default.end.date = `${endHours}:${endMinutes}`
-    diyStore.editComponent.field.default.end.timestamp = timeInvertSecond(
-      `${endHours}:${endMinutes}`
-    )
-  }
-})
+    const today = new Date();
+    const hours = String(today.getHours()).padStart(2, '0');
+    const minutes = String(today.getMinutes()).padStart(2, '0');
+
+    if(!diyStore.editComponent.field.default.start.date){
+        diyStore.editComponent.field.default.start.date = `${hours}:${minutes}`;
+        diyStore.editComponent.field.default.start.timestamp = timeInvertSecond(`${hours}:${minutes}`);
+    }
+    if(!diyStore.editComponent.field.default.end.date){
+        let endDate = new Date();
+        endDate.setHours(today.getHours(), today.getMinutes() + 10, 0, 0); // 在当前时间基础上加 10 分钟
+        const endHours = String(endDate.getHours()).padStart(2, '0');
+        const endMinutes = String(endDate.getMinutes()).padStart(2, '0');
+
+        diyStore.editComponent.field.default.end.date = `${endHours}:${endMinutes}`;
+        diyStore.editComponent.field.default.end.timestamp = timeInvertSecond(`${endHours}:${endMinutes}`);
+    }
+});
+
 
 // 开始时间选择器
 const startTimePickerChange = (e) => {
-  diyStore.editComponent.field.default.start.timestamp = timeInvertSecond(e)
-
-  const startTimeArr = e.split(':')
-  const date = new Date()
-  date.setHours(parseInt(startTimeArr[0]), parseInt(startTimeArr[1]), 0, 0)
-  date.setMinutes(date.getMinutes() + 10)
-  const updatedEndTime = `${String(date.getHours()).padStart(2, '0')}:${String(date.getMinutes()).padStart(2, '0')}`
-  diyStore.editComponent.field.default.end.date = updatedEndTime
-  diyStore.editComponent.field.default.end.timestamp =
-    timeInvertSecond(updatedEndTime)
+    diyStore.editComponent.field.default.start.timestamp = timeInvertSecond(e);
+
+    const startTimeArr = e.split(":");
+    const date = new Date();
+    date.setHours(parseInt(startTimeArr[0]), parseInt(startTimeArr[1]), 0, 0);
+    date.setMinutes(date.getMinutes() + 10);
+    const updatedEndTime = `${String(date.getHours()).padStart(2, '0')}:${String(date.getMinutes()).padStart(2, '0')}`;
+    diyStore.editComponent.field.default.end.date = updatedEndTime;
+    diyStore.editComponent.field.default.end.timestamp = timeInvertSecond(updatedEndTime);
 }
 
 // 结束时间选择器
-const endTimePickerChange = (e) => {
-  diyStore.editComponent.field.default.end.timestamp = timeInvertSecond(e)
+const endTimePickerChange = (e)=>{
+    diyStore.editComponent.field.default.end.timestamp = timeInvertSecond(e);
 }
 
 const disabledHours = () => {
-  let timeArr = diyStore.editComponent.field.default.start.date.split(':')
-  return makeRange(0, timeArr[0])
+    let timeArr = diyStore.editComponent.field.default.start.date.split(":")
+    return makeRange(0,timeArr[0]);
 }
 
 const disabledMinutes = (hour: number) => {
-  let timeArr = diyStore.editComponent.field.default.start.date.split(':')
-  return makeRange(0, timeArr[1])
+    let timeArr = diyStore.editComponent.field.default.start.date.split(":")
+    return makeRange(0,timeArr[1]);
 }
 
 const makeRange = (start: number, end: number) => {
-  const result: number[] = []
-  for (let i = start; i < end; i++) {
-    result.push(i)
-  }
-  return result
+    const result: number[] = []
+    for (let i = start; i < end; i++) {
+        result.push(i)
+    }
+    return result
 }
 
-const timeInvertSecond = (time: any) => {
-  let arr = time.split(':')
-  let num = 0
-  if (arr[0]) {
-    num += arr[0] * 60 * 60
-  }
-  if (arr[1]) {
-    num += arr[1] * 60
-  }
-  if (arr[2]) {
-    num += arr[2]
-  }
-  return num
+const timeInvertSecond = (time:any)=>{
+    let arr = time.split(":");
+    let num = 0;
+    if(arr[0]){
+        num += arr[0] * 60 * 60;
+    }
+    if(arr[1]){
+        num += arr[1] * 60;
+    }
+    if(arr[2]){
+        num += arr[2];
+    }
+    return num;
 }
 
 defineExpose({})
diff --git a/admin/src/app/views/diy_form/components/edit-form-time.vue b/admin/src/app/views/diy_form/components/edit-form-time.vue
index ead7e55d..a8e46c82 100644
--- a/admin/src/app/views/diy_form/components/edit-form-time.vue
+++ b/admin/src/app/views/diy_form/components/edit-form-time.vue
@@ -1,62 +1,47 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <!-- 表单组件 字段内容设置 -->
-    <slot name="field"></slot>
-    <el-form label-width="100px" class="px-[10px]" @submit.prevent>
-      <el-form-item :label="t('formPlaceholder')">
-        <el-input
-          v-model.trim="diyStore.editComponent.placeholder"
-          :placeholder="t('formPlaceholderTips')"
-          clearable
-          maxlength="15"
-          show-word-limit
-        />
-      </el-form-item>
-      <el-form-item :label="t('defaultValue')">
-        <el-switch
-          v-model="diyStore.editComponent.defaultControl"
-          @change="changeDateDefaultControl"
-        />
-      </el-form-item>
-      <el-form-item v-if="diyStore.editComponent.defaultControl">
-        <el-radio-group v-model="diyStore.editComponent.timeWay">
-          <el-radio label="current">{{ t('currentTime') }}</el-radio>
-          <el-radio label="diy">{{ t('diyTime') }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item
-        v-if="
-          diyStore.editComponent.defaultControl &&
-          diyStore.editComponent.timeWay == 'diy'
-        "
-      >
-        <el-time-picker
-          v-model="diyStore.editComponent.field.default"
-          :placeholder="t('timePlaceholder')"
-          format="HH:mm"
-          value-format="HH:mm"
-        />
-      </el-form-item>
-    </el-form>
-
-    <!-- 表单组件 其他设置 -->
-    <slot name="other"></slot>
-  </div>
-
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <!-- 表单组件 字段样式 -->
-    <slot name="style-field"></slot>
-
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
+
+		<!-- 表单组件 字段内容设置 -->
+		<slot name="field"></slot>
+		<el-form label-width="100px" class="px-[10px]" @submit.prevent>
+			<el-form-item :label="t('formPlaceholder')">
+				<el-input v-model.trim="diyStore.editComponent.placeholder" :placeholder="t('formPlaceholderTips')" clearable maxlength="15" show-word-limit />
+			</el-form-item>
+			<el-form-item :label="t('defaultValue')">
+				<el-switch v-model="diyStore.editComponent.defaultControl" @change="changeDateDefaultControl" />
+			</el-form-item>
+			<el-form-item v-if="diyStore.editComponent.defaultControl">
+				<el-radio-group v-model="diyStore.editComponent.timeWay">
+					<el-radio label="current">{{ t('currentTime') }}</el-radio>
+					<el-radio label="diy">{{ t('diyTime') }}</el-radio>
+				</el-radio-group>
+			</el-form-item>
+			<el-form-item v-if="diyStore.editComponent.defaultControl && diyStore.editComponent.timeWay == 'diy'">
+                <el-time-picker v-model="diyStore.editComponent.field.default" :placeholder="t('timePlaceholder')" format="HH:mm" value-format="HH:mm" />
+			</el-form-item>
+		</el-form>
+
+		<!-- 表单组件 其他设置 -->
+		<slot name="other"></slot>
+
+	</div>
+
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+
+		<!-- 表单组件 字段样式 -->
+		<slot name="style-field"></slot>
+
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+
+	</div>
 </template>
 
 <script lang="ts" setup>
 import { t } from '@/lang'
-import { ref, watch, onMounted } from 'vue'
+import { ref,watch,onMounted } from 'vue'
 import useDiyStore from '@/stores/modules/diy'
 
 const diyStore = useDiyStore()
@@ -64,40 +49,41 @@ diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
-  const res = { code: true, message: '' }
-  return res
+    const res = { code: true, message: '' }
+    return res
 }
 
 onMounted(() => {
-  // 初始赋值当天时间
-  if (!diyStore.editComponent.field.default) {
-    const today = new Date()
-    const hours = String(today.getHours()).padStart(2, '0')
-    const minutes = String(today.getMinutes()).padStart(2, '0')
-    diyStore.editComponent.field.default = `${hours}:${minutes}`
-  }
-})
+	// 初始赋值当天时间
+	if (!diyStore.editComponent.field.default) {
+        const today = new Date();
+		const hours = String(today.getHours()).padStart(2, '0');
+		const minutes = String(today.getMinutes()).padStart(2, '0');
+        diyStore.editComponent.field.default = `${hours}:${minutes}`;
+	}
+});
 
 const changeDateDefaultControl = (val: any) => {
-  if (val) {
-    const today = new Date()
-    const hours = String(today.getHours()).padStart(2, '0')
-    const minutes = String(today.getMinutes()).padStart(2, '0')
-    diyStore.editComponent.field.default = `${hours}:${minutes}`
-  }
+	if (val) {
+        const today = new Date();
+		const hours = String(today.getHours()).padStart(2, '0');
+		const minutes = String(today.getMinutes()).padStart(2, '0');
+        diyStore.editComponent.field.default = `${hours}:${minutes}`;
+	}
 }
 
 watch(
-  () => diyStore.editComponent.timeWay,
-  (newVal) => {
-    const today = new Date()
-    const hours = String(today.getHours()).padStart(2, '0')
-    const minutes = String(today.getMinutes()).padStart(2, '0')
-    diyStore.editComponent.field.default = `${hours}:${minutes}`
-  }
-)
+	() => diyStore.editComponent.timeWay,
+	(newVal) => {
+        const today = new Date();
+        const hours = String(today.getHours()).padStart(2, '0');
+        const minutes = String(today.getMinutes()).padStart(2, '0');
+        diyStore.editComponent.field.default = `${hours}:${minutes}`;
+	}
+);
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/diy_form/components/edit-form-video.vue b/admin/src/app/views/diy_form/components/edit-form-video.vue
index c8309f6b..c33bc200 100644
--- a/admin/src/app/views/diy_form/components/edit-form-video.vue
+++ b/admin/src/app/views/diy_form/components/edit-form-video.vue
@@ -1,26 +1,30 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <!-- 表单组件 字段内容设置 -->
-    <slot name="field"></slot>
-    <el-form label-width="100px" class="px-[10px]">
-      <el-form-item :label="t('上传方式')">
-        <el-radio-group v-model="diyStore.editComponent.uploadMode">
-          <el-radio label="shoot_and_album">{{ t('拍摄和相册') }}</el-radio>
-          <el-radio label="shoot_only">{{ t('只允许拍摄') }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-    </el-form>
-  </div>
-
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <!-- 表单组件 字段样式 -->
-    <slot name="style-field"></slot>
-
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
+
+		<!-- 表单组件 字段内容设置 -->
+		<slot name="field"></slot>
+		<el-form label-width="100px" class="px-[10px]">
+			<el-form-item :label="t('上传方式')">
+				<el-radio-group v-model="diyStore.editComponent.uploadMode">
+					<el-radio label="shoot_and_album">{{ t('拍摄和相册') }}</el-radio>
+					<el-radio label="shoot_only">{{ t('只允许拍摄') }}</el-radio>
+				</el-radio-group>
+			</el-form-item>
+		</el-form>
+
+	</div>
+
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+
+		<!-- 表单组件 字段样式 -->
+		<slot name="style-field"></slot>
+
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -32,6 +36,7 @@ const diyStore = useDiyStore()
 diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/diy_form/components/edit-form-wechat-name.vue b/admin/src/app/views/diy_form/components/edit-form-wechat-name.vue
index d01d56f3..ac42c732 100644
--- a/admin/src/app/views/diy_form/components/edit-form-wechat-name.vue
+++ b/admin/src/app/views/diy_form/components/edit-form-wechat-name.vue
@@ -1,32 +1,30 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-    <!-- 表单组件 字段内容设置 -->
-    <slot name="field"></slot>
-    <el-form label-width="100px" class="px-[10px]" @submit.prevent>
-      <el-form-item :label="t('formPlaceholder')">
-        <el-input
-          v-model.trim="diyStore.editComponent.placeholder"
-          :placeholder="t('formPlaceholderTips')"
-          clearable
-          maxlength="15"
-          show-word-limit
-        />
-      </el-form-item>
-    </el-form>
-
-    <!-- 表单组件 其他设置 -->
-    <slot name="other"></slot>
-  </div>
-
-  <!-- 样式 -->
-  <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-    <!-- 表单组件 字段样式 -->
-    <slot name="style-field"></slot>
-
-    <!-- 组件样式 -->
-    <slot name="style"></slot>
-  </div>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
+
+		<!-- 表单组件 字段内容设置 -->
+		<slot name="field"></slot>
+		<el-form label-width="100px" class="px-[10px]" @submit.prevent>
+			<el-form-item :label="t('formPlaceholder')">
+				<el-input v-model.trim="diyStore.editComponent.placeholder" :placeholder="t('formPlaceholderTips')" clearable maxlength="15" show-word-limit />
+			</el-form-item>
+		</el-form>
+
+		<!-- 表单组件 其他设置 -->
+		<slot name="other"></slot>
+
+	</div>
+
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+
+		<!-- 表单组件 字段样式 -->
+		<slot name="style-field"></slot>
+
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -39,11 +37,12 @@ diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
-  const res = { code: true, message: '' }
-  // todo 只需要考虑该组件自身的验证
-  return res
+    const res = { code: true, message: '' }
+	// todo 只需要考虑该组件自身的验证
+    return res
 }
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/diy_form/components/form-spread-popup.vue b/admin/src/app/views/diy_form/components/form-spread-popup.vue
index 9c2c113e..cf60e34d 100644
--- a/admin/src/app/views/diy_form/components/form-spread-popup.vue
+++ b/admin/src/app/views/diy_form/components/form-spread-popup.vue
@@ -1,75 +1,47 @@
 <template>
-  <div>
-    <el-dialog
-      v-model="showDialog"
-      :title="t('formPromotion')"
-      width="500px"
-      :destroy-on-close="true"
-    >
-      <el-tabs v-model="channel" class="mb-[10px]">
-        <el-tab-pane label="H5" name="h5"></el-tab-pane>
-        <el-tab-pane label="微信小程序" name="weapp"></el-tab-pane>
-      </el-tabs>
-
-      <div class="promote-flex flex" v-if="channel == 'h5'">
-        <div
-          class="promote-img flex justify-center items-center bg-[#f8f8f8] w-[150px] h-[150px]"
-        >
-          <el-image :src="wapImage" />
-        </div>
-
-        <div class="px-[20px] flex-1">
-          <div class="mb-[10px]">{{ t('promoteUrl') }}</div>
-          <el-input class="mb-[10px]" readonly :value="wapPreview">
-            <template #append>
-              <el-button @click="copyEvent(wapPreview)">{{
-                t('copy')
-              }}</el-button>
-            </template>
-          </el-input>
-          <a class="text-primary" :href="wapImage" download>{{
-            t('downLoadQRCode')
-          }}</a>
-        </div>
-      </div>
-
-      <div class="promote-flex flex" v-if="channel == 'weapp'">
-        <div
-          class="promote-img flex justify-center items-center bg-[#f8f8f8] w-[150px] h-[150px]"
-        >
-          <el-image
-            :src="img(weappData.path)"
-            v-if="weappData.path"
-            class="w-[150px] h-[150px]"
-          >
-            <template #error>
-              <div
-                class="w-[150px] h-[150px] text-[14px] text-center leading-[150px]"
-              >
-                {{ t('configureFailed') }}
-              </div>
-            </template>
-          </el-image>
-          <div
-            v-else
-            class="w-[150px] h-[150px] text-[14px] text-center leading-[150px]"
-          >
-            {{ t('configureFailed') }}
-          </div>
-        </div>
-
-        <div class="px-[20px] flex-1">
-          <a
-            class="text-primary"
-            :href="img(weappData.path)"
-            target="_blank"
-            download
-            >{{ t('downLoadQRCode') }}</a
-          >
-        </div>
-      </div>
-    </el-dialog>
-  </div>
+    <div>
+        <el-dialog v-model="showDialog" :title="t('formPromotion')" width="500px" :destroy-on-close="true">
+
+            <el-tabs v-model="channel" class="mb-[10px]">
+                <el-tab-pane label="H5" name="h5"></el-tab-pane>
+                <el-tab-pane label="微信小程序" name="weapp"></el-tab-pane>
+            </el-tabs>
+
+            <div class="promote-flex flex" v-if="channel == 'h5'">
+                <div class="promote-img flex justify-center items-center bg-[#f8f8f8] w-[150px] h-[150px]">
+                    <el-image :src="wapImage" />
+                </div>
+
+                <div class="px-[20px] flex-1">
+                    <div class="mb-[10px]">{{ t('promoteUrl') }}</div>
+                    <el-input class="mb-[10px]" readonly :value="wapPreview">
+                        <template #append>
+                            <el-button @click="copyEvent(wapPreview)">{{ t('copy') }}</el-button>
+                        </template>
+                    </el-input>
+                    <a class="text-primary" :href="wapImage" download>{{ t('downLoadQRCode') }}</a>
+                </div>
+
+            </div>
+
+            <div class="promote-flex flex" v-if="channel == 'weapp'">
+                <div class="promote-img flex justify-center items-center bg-[#f8f8f8] w-[150px] h-[150px]">
+                    <el-image :src="img(weappData.path)" v-if="weappData.path" class="w-[150px] h-[150px]">
+                        <template #error>
+                            <div class="w-[150px] h-[150px] text-[14px] text-center leading-[150px]">{{ t('configureFailed') }}</div>
+                        </template>
+                    </el-image>
+                    <div v-else class="w-[150px] h-[150px] text-[14px] text-center leading-[150px]">{{ t('configureFailed') }}</div>
+                </div>
+
+                <div class="px-[20px] flex-1">
+                    <a class="text-primary" :href="img(weappData.path)" target="_blank" download>{{ t('downLoadQRCode') }}</a>
+                </div>
+
+            </div>
+
+        </el-dialog>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -92,84 +64,80 @@ const wapImage = ref('')
 const wapPreview = ref('')
 const page = ref('')
 const weappData = reactive({
-  path: '',
+    path: ''
 })
 
 getUrl().then((res: any) => {
-  wapUrl.value = res.data.wap_url
+    wapUrl.value = res.data.wap_url
 
-  // 生产模式禁止
-  if (import.meta.env.MODE == 'production') return
+    // 生产模式禁止
+    if (import.meta.env.MODE == 'production') return
 
-  wapDomain.value = res.data.wap_domain
+    wapDomain.value = res.data.wap_domain
 
-  // env文件配置过wap域名
-  if (wapDomain.value) {
-    wapUrl.value = wapDomain.value + '/wap'
-  }
+    // env文件配置过wap域名
+    if (wapDomain.value) {
+        wapUrl.value = wapDomain.value + '/wap'
+    }
 
-  const wapDomainStorage = storage.get('wap_domain')
-  if (wapDomainStorage) {
-    wapUrl.value = wapDomainStorage
-  }
+    const wapDomainStorage = storage.get('wap_domain')
+    if (wapDomainStorage) {
+        wapUrl.value = wapDomainStorage
+    }
 })
 
 const loadQrcode = () => {
-  wapPreview.value = `${wapUrl.value}${page.value}`
-  // errorCorrectionLevel：密度容错率L（低）H(高)
-  QRCode.toDataURL(wapPreview.value, {
-    errorCorrectionLevel: 'L',
-    margin: 0,
-    width: 120,
-  }).then((url) => {
-    wapImage.value = url
-  })
+    wapPreview.value = `${wapUrl.value}${page.value}`
+    // errorCorrectionLevel：密度容错率L（低）H(高)
+    QRCode.toDataURL(wapPreview.value, { errorCorrectionLevel: 'L', margin: 0, width: 120 }).then(url => {
+        wapImage.value = url
+    })
 }
 
 const show = (data: any) => {
-  channel.value = 'h5'
-  Object.assign(form, data)
-  page.value = `/app/pages/index/diy_form?form_id=${form.form_id}`
+    channel.value = 'h5';
+    Object.assign(form, data)
+    page.value = `/app/pages/index/diy_form?form_id=${form.form_id}`
 
-  loadQrcode()
-  getDiyFormQrcodeFn()
-  showDialog.value = true
+    loadQrcode()
+    getDiyFormQrcodeFn();
+    showDialog.value = true
 }
 
-const getDiyFormQrcodeFn = () => {
-  getDiyFormQrcode({
-    form_id: form.form_id,
-  }).then((res: any) => {
-    if (res.data) {
-      weappData.path = res.data.path
-    }
-  })
+const getDiyFormQrcodeFn = ()=>{
+    getDiyFormQrcode({
+        form_id:form.form_id
+    }).then((res:any)=>{
+        if(res.data) {
+            weappData.path = res.data.path;
+        }
+    })
 }
 
 // 复制
 const { copy, isSupported, copied } = useClipboard()
 const copyEvent = (text: string) => {
-  if (!isSupported.value) {
-    ElMessage({
-      message: t('notSupportCopy'),
-      type: 'warning',
-    })
-  }
-  copy(text)
+    if (!isSupported.value) {
+        ElMessage({
+            message: t('notSupportCopy'),
+            type: 'warning'
+        })
+    }
+    copy(text)
 }
 
 watch(copied, () => {
-  if (copied.value) {
-    ElMessage({
-      message: t('copySuccess'),
-      type: 'success',
-    })
-  }
+    if (copied.value) {
+        ElMessage({
+            message: t('copySuccess'),
+            type: 'success'
+        })
+    }
 })
 
 defineExpose({
-  showDialog,
-  show,
+    showDialog,
+    show
 })
 </script>
 
diff --git a/admin/src/app/views/diy_form/components/form-submit-popup.vue b/admin/src/app/views/diy_form/components/form-submit-popup.vue
index 24872f76..49e77d4e 100644
--- a/admin/src/app/views/diy_form/components/form-submit-popup.vue
+++ b/admin/src/app/views/diy_form/components/form-submit-popup.vue
@@ -1,371 +1,221 @@
 <template>
-  <div>
-    <el-dialog
-      v-model="showDialog"
-      :title="t('submirSuccess')"
-      width="850px"
-      :close-on-press-escape="true"
-      :destroy-on-close="true"
-      :close-on-click-modal="false"
-    >
-      <div class="flex flex-1 mt-[24px] mx-[24px] mb-0">
-        <div class="preview-wrap">
-          <div class="absolute z-1 left-0 top-0">
-            <img
-              src="@/app/assets/images/diy_form/mobile_tabbar.png"
-              class="w-[324px]"
-            />
-          </div>
-          <div class="absolute z-1 left-0 bottom-0">
-            <img
-              src="@/app/assets/images/diy_form/mobile_bottom.png"
-              class="w-[324px]"
-            />
-          </div>
-
-          <div class="page-wrap">
-            <div class="px-[13px] flex flex-col items-center flex-1">
-              <div
-                class="flex items-center justify-center w-[48px] h-[48px] text-[40px] p-[4px] mt-[32px] mb-[16px] mx-auto rounded-[50%]"
-              >
-                <el-icon><SuccessFilled color="#20bf64" /></el-icon>
-              </div>
-              <div class="record-name">
-                <span
-                  class="text-[#1E1E1E] font-bold text-[24px]"
-                  v-if="formData.tips_type == 'default'"
-                  >{{ t('writeSuccess') }}</span
-                >
-                <span
-                  class="text-[#1E1E1E] font-bold text-[16px]"
-                  v-else-if="formData.tips_type == 'diy'"
-                  >{{
-                    formData.tips_text ? formData.tips_text : '填写成功'
-                  }}</span
-                >
-              </div>
-              <div class="to-detail">
-                <div
-                  class="text-[14px] mt-[16px] py-[4px] px[8px] text-[#576b95]"
-                >
-                  {{ t('viewFillingDetails') }}
-                </div>
-              </div>
-            </div>
-            <div class="relative pt-[8px] pb-[48px] h-[112px]">
-              <div
-                v-if="formData.success_after_action.finish"
-                class="!mt-[16px] rounded-[3px] mx-auto text-[15px] w-[100px] min-w-[160px] h-[32px] leading-[32px] text-center max-w-[274px] truncate bg-[#20bf64] text-[#ffffff]"
-              >
-                <div class="text-[15px]">{{ t('finish') }}</div>
-              </div>
-              <div
-                v-if="formData.success_after_action.goback"
-                class="!mt-[16px] rounded-[3px] mx-auto text-[15px] w-[100px] min-w-[160px] h-[32px] leading-[32px] text-center max-w-[274px] truncate bg-[#f2f2f2] text-[#353535]"
-              >
-                <div class="text-[14px]">{{ t('back') }}</div>
-              </div>
-            </div>
-          </div>
-
-          <!-- 核销凭证 todo 后续完善 -->
-          <!--                    <div class="page-wrap verify-voucher-wrap" style="display:none;">-->
-
-          <!--                        <div class="tips-wrap">感谢你的填写，以下是你的核销凭证</div>-->
-          <!--                        <div class="qrcode-wrap">-->
-          <!--                            <div class="text-[14px] text-[#333]">请妥善保存你的核销凭证</div>-->
-          <!--                            <div class="text-[20px] font-bold text-[#333] my-[10px]">现场出示凭证</div>-->
-          <!--                            <el-image class="w-[180px]" :src="wapImage" />-->
-          <!--                            <div class="text-primary mt-[10px]">保存凭证</div>-->
-          <!--                        </div>-->
-          <!--                        <div class="relative pt-[8px] pb-[48px] h-[112px]">-->
-          <!--                            <div class="!mt-[16px] rounded-[3px] mx-auto text-[15px] w-[100px] min-w-[160px] h-[32px] leading-[32px] text-center max-w-[274px] truncate bg-[#20bf64] text-[#ffffff]">-->
-          <!--                                <div class="text-[15px]">返回二维码</div>-->
-          <!--                            </div>-->
-          <!--                            <div class="!mt-[16px] rounded-[3px] mx-auto text-[15px] w-[100px] min-w-[160px] h-[32px] leading-[32px] text-center max-w-[274px] truncate bg-[#fff] text-[#353535]">-->
-          <!--                                <div class="text-[14px]">完成</div>-->
-          <!--                            </div>-->
-          <!--                        </div>-->
-          <!--                        <div class="text-[14px] mt-[16px] py-[4px] px[8px] text-[#576b95]">查看填写详情</div>-->
-
-          <!--                    </div>-->
-        </div>
-
-        <div class="flex-1">
-          <div class="item-wrap">
-            <div
-              class="text-[16px] h-[24px] font-bold text-[#262626] mb-[16px] w-[140px] mr-[32px] flex-shrink-0"
-            >
-              {{ t('afterSubmission') }}
-            </div>
-            <el-radio-group
-              v-model="formData.submit_after_action"
-              class="!block"
-            >
-              <el-radio label="text" class="!flex">
-                <span class="mr-[3px]">{{ t('displayTextMessages') }}</span>
-                <el-tooltip effect="light" placement="top">
-                  <template #content>
-                    <p>{{ t('displayTextMessagesTips') }}</p>
-                  </template>
-                  <el-icon>
-                    <QuestionFilled color="#999999" />
-                  </el-icon>
-                </el-tooltip>
-              </el-radio>
-              <!--  todo 后续完善 -->
-              <!--                            <el-radio label="voucher" class="!flex">-->
-              <!--                                <span class="mr-[3px]">{{ t('获取核销凭证') }}</span>-->
-              <!--                                <el-tooltip effect="light" placement="top">-->
-              <!--                                    <template #content>-->
-              <!--                                        <p>{{ t('提交后页面会将提交的表单记录内容生成二维码并展示，可选择设置两种不同的二维码内容。适合核销、数据录入等场景。') }}</p>-->
-              <!--                                    </template>-->
-              <!--                                    <el-icon>-->
-              <!--                                        <QuestionFilled color="#999999" />-->
-              <!--                                    </el-icon>-->
-              <!--                                </el-tooltip>-->
-              <!--                            </el-radio>-->
-            </el-radio-group>
-          </div>
-
-          <div class="item-wrap" v-if="formData.submit_after_action == 'text'">
-            <div
-              class="text-[16px] h-[24px] font-bold text-[#262626] mb-[16px] w-[140px] mr-[32px] flex-shrink-0"
-            >
-              {{ t('promptText') }}
-            </div>
-            <div>
-              <el-radio-group v-model="formData.tips_type" class="!block">
-                <el-radio label="default" class="!block">
-                  <span class="mr-[3px]">{{ t('defaultPrompt') }}</span>
-                  <span class="!text-[#999] text-[12px] ml-[8px]">{{
-                    t('defaultPromptTips')
-                  }}</span>
-                </el-radio>
-                <el-radio label="diy" class="!block">{{
-                  t('diyPrompt')
-                }}</el-radio>
-              </el-radio-group>
-              <el-input
-                v-if="formData.tips_type == 'diy'"
-                v-model.trim="formData.tips_text"
-                :placeholder="t('tipsTextPlaceholder')"
-                class="w-[350px]"
-                maxlength="30"
-                clearable
-                show-word-limit
-              />
-            </div>
-          </div>
-
-          <!-- 核销凭证 todo 后续完善 -->
-          <template v-else-if="formData.submit_after_action == 'voucher'">
-            <div class="item-wrap">
-              <div
-                class="text-[16px] h-[24px] font-bold text-[#262626] mb-[16px] w-[140px] mr-[32px] flex-shrink-0"
-              >
-                {{ t('validityPeriodOfVoucher') }}
-              </div>
-              <div>
-                <el-radio-group
-                  v-model="formData.time_limit_type"
-                  class="!block"
-                >
-                  <el-radio label="no_limit" class="!block">{{
-                    t('noLimit')
-                  }}</el-radio>
-                  <el-radio label="specify_time" class="!block">
-                    <span class="mr-[3px]">{{ t('specifyTime') }}</span>
-                    <el-tooltip effect="light" placement="top">
-                      <template #content>
-                        <p>{{ t('specifyTimeTips') }}</p>
-                      </template>
-                      <el-icon>
-                        <QuestionFilled color="#999999" />
-                      </el-icon>
-                    </el-tooltip>
-                  </el-radio>
-                  <el-radio label="submission_time" class="!block">
-                    <span class="mr-[3px]">{{ t('submissionTime') }}</span>
-                    <el-tooltip effect="light" placement="top">
-                      <template #content>
-                        <p class="w-[250px]">{{ t('submissionTimeTips') }}</p>
-                      </template>
-                      <el-icon>
-                        <QuestionFilled color="#999999" />
-                      </el-icon>
-                    </el-tooltip>
-                  </el-radio>
-                </el-radio-group>
-                <el-date-picker
-                  v-if="formData.time_limit_type == 'specify_time'"
-                  v-model="formData.validity_time"
-                  type="datetimerange"
-                  range-separator="至"
-                  start-placeholder="开始时间"
-                  end-placeholder="结束时间"
-                />
-                <div
-                  class="flex items-center mt-[5px]"
-                  v-if="formData.time_limit_type == 'submission_time'"
-                >
-                  <span>{{ t('afterSubmissionRecords') }}</span>
-                  <!--                                <div class="flex items-center px-[5px]">-->
-                  <!--                                    v-model.trim="formData.length"-->
-                  <el-input
-                    v-model.trim="formData.submission_time_value"
-                    @keyup="filterNumber($event)"
-                    size="small"
-                    clearable
-                    class="!w-[100px] px-[5px]"
-                    maxlength="3"
-                  />
-                  <el-select
-                    v-model="formData.timeUnit"
-                    clearable
-                    class="!w-[100px] pr-[5px]"
-                    size="small"
-                  >
-                    <el-option
-                      v-for="(item, index) in validityOptions"
-                      :key="item.value"
-                      :label="item.text"
-                      :value="item.value"
-                    ></el-option>
-                  </el-select>
-                  <span>{{ t('effective') }}</span>
+    <div>
+        <el-dialog v-model="showDialog" :title="t('submirSuccess')" width="850px" :close-on-press-escape="true" :destroy-on-close="true" :close-on-click-modal="false">
+
+            <div class="flex flex-1 mt-[24px] mx-[24px] mb-0">
+                <div class="preview-wrap">
+                    <div class="absolute z-1 left-0 top-0">
+                        <img src="@/app/assets/images/diy_form/mobile_tabbar.png" class="w-[324px]" />
+                    </div>
+                    <div class="absolute z-1 left-0 bottom-0">
+                        <img src="@/app/assets/images/diy_form/mobile_bottom.png" class="w-[324px]" />
+                    </div>
+
+                    <div class="page-wrap">
+                        <div class="px-[13px] flex flex-col items-center flex-1">
+                            <div class="flex items-center justify-center w-[48px] h-[48px] text-[40px] p-[4px] mt-[32px] mb-[16px] mx-auto rounded-[50%]">
+                                <el-icon><SuccessFilled color="#20bf64" /></el-icon>
+                            </div>
+                            <div class="record-name">
+                                <span class="text-[#1E1E1E] font-bold text-[24px]" v-if="formData.tips_type == 'default'">{{ t('writeSuccess') }}</span>
+                                <span class="text-[#1E1E1E] font-bold text-[16px]" v-else-if="formData.tips_type == 'diy'">{{ formData.tips_text ? formData.tips_text : '填写成功' }}</span>
+                            </div>
+                            <div class="to-detail">
+                                <div class="text-[14px] mt-[16px] py-[4px] px[8px] text-[#576b95]">{{ t('viewFillingDetails') }}</div>
+                            </div>
+                        </div>
+                        <div class="relative pt-[8px] pb-[48px] h-[112px]">
+                            <div v-if="formData.success_after_action.finish" class="!mt-[16px] rounded-[3px] mx-auto text-[15px] w-[100px] min-w-[160px] h-[32px] leading-[32px] text-center max-w-[274px] truncate bg-[#20bf64] text-[#ffffff]">
+                                <div class="text-[15px]">{{ t('finish') }}</div>
+                            </div>
+                            <div v-if="formData.success_after_action.goback" class="!mt-[16px] rounded-[3px] mx-auto text-[15px] w-[100px] min-w-[160px] h-[32px] leading-[32px] text-center max-w-[274px] truncate bg-[#f2f2f2] text-[#353535]">
+                                <div class="text-[14px]">{{ t('back') }}</div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <!-- 核销凭证 todo 后续完善 -->
+<!--                    <div class="page-wrap verify-voucher-wrap" style="display:none;">-->
+
+<!--                        <div class="tips-wrap">感谢你的填写，以下是你的核销凭证</div>-->
+<!--                        <div class="qrcode-wrap">-->
+<!--                            <div class="text-[14px] text-[#333]">请妥善保存你的核销凭证</div>-->
+<!--                            <div class="text-[20px] font-bold text-[#333] my-[10px]">现场出示凭证</div>-->
+<!--                            <el-image class="w-[180px]" :src="wapImage" />-->
+<!--                            <div class="text-primary mt-[10px]">保存凭证</div>-->
+<!--                        </div>-->
+<!--                        <div class="relative pt-[8px] pb-[48px] h-[112px]">-->
+<!--                            <div class="!mt-[16px] rounded-[3px] mx-auto text-[15px] w-[100px] min-w-[160px] h-[32px] leading-[32px] text-center max-w-[274px] truncate bg-[#20bf64] text-[#ffffff]">-->
+<!--                                <div class="text-[15px]">返回二维码</div>-->
+<!--                            </div>-->
+<!--                            <div class="!mt-[16px] rounded-[3px] mx-auto text-[15px] w-[100px] min-w-[160px] h-[32px] leading-[32px] text-center max-w-[274px] truncate bg-[#fff] text-[#353535]">-->
+<!--                                <div class="text-[14px]">完成</div>-->
+<!--                            </div>-->
+<!--                        </div>-->
+<!--                        <div class="text-[14px] mt-[16px] py-[4px] px[8px] text-[#576b95]">查看填写详情</div>-->
+
+<!--                    </div>-->
+
                 </div>
-              </div>
-            </div>
 
-            <div class="item-wrap">
-              <div
-                class="text-[16px] h-[24px] font-bold text-[#262626] mb-[16px] w-[140px] mr-[32px] flex-shrink-0"
-              >
-                {{ t('voucherStyle') }}
-              </div>
-              <div>
-                <el-form-item :label="t('titleAboveTheCode')">
-                  <!--                                    v-model.trim="formData.active_name"-->
-                  <el-input
-                    clearable
-                    :placeholder="t('titleAboveTheCodePlaceholder')"
-                    class="input-width"
-                    :maxlength="20"
-                  />
-                </el-form-item>
-                <el-form-item :label="t('contentAboveTheCode')">
-                  <el-input
-                    clearable
-                    :placeholder="t('contentAboveTheCodePlaceholder')"
-                    class="input-width"
-                    :maxlength="20"
-                  />
-                  <div>
-                    <span class="text-primary cursor-pointer mr-[10px]">{{
-                      t('addLinefeeds')
-                    }}</span>
-                    <span class="text-primary cursor-pointer">{{
-                      t('addFields')
-                    }}</span>
-                  </div>
-                </el-form-item>
-                <el-form-item :label="t('contentBelowTheCode')">
-                  <div class="block">
-                    <el-checkbox
-                      class="!block"
-                      :label="t('submissionRecordTime')"
-                      value=""
-                    />
-
-                    <el-checkbox
-                      class="!block !h-[20px]"
-                      :label="t('currentTime')"
-                      value=""
-                    />
-                    <div class="text-[#999] ml-[22px]">
-                      {{ t('currentTimeTips') }}
+                <div class="flex-1">
+                    <div class="item-wrap">
+                        <div class="text-[16px] h-[24px] font-bold text-[#262626] mb-[16px] w-[140px] mr-[32px] flex-shrink-0">{{ t('afterSubmission') }}</div>
+                        <el-radio-group v-model="formData.submit_after_action" class="!block">
+                            <el-radio label="text" class="!flex">
+                                <span class="mr-[3px]">{{ t('displayTextMessages') }}</span>
+                                <el-tooltip effect="light" placement="top">
+                                    <template #content>
+                                        <p>{{ t('displayTextMessagesTips') }}</p>
+                                    </template>
+                                    <el-icon>
+                                        <QuestionFilled color="#999999" />
+                                    </el-icon>
+                                </el-tooltip>
+                            </el-radio>
+                            <!--  todo 后续完善 -->
+<!--                            <el-radio label="voucher" class="!flex">-->
+<!--                                <span class="mr-[3px]">{{ t('获取核销凭证') }}</span>-->
+<!--                                <el-tooltip effect="light" placement="top">-->
+<!--                                    <template #content>-->
+<!--                                        <p>{{ t('提交后页面会将提交的表单记录内容生成二维码并展示，可选择设置两种不同的二维码内容。适合核销、数据录入等场景。') }}</p>-->
+<!--                                    </template>-->
+<!--                                    <el-icon>-->
+<!--                                        <QuestionFilled color="#999999" />-->
+<!--                                    </el-icon>-->
+<!--                                </el-tooltip>-->
+<!--                            </el-radio>-->
+                        </el-radio-group>
                     </div>
 
-                    <el-checkbox
-                      class="!block"
-                      :label="t('dispalyPromptText')"
-                      value=""
-                    />
-                    <el-input
-                      class="ml-[22px]"
-                      :rows="4"
-                      type="textarea"
-                      :placeholder="t('tipsTextPlaceholder')"
-                      maxlength="100"
-                    />
-
-                    <el-checkbox
-                      class="!block"
-                      :label="t('voucherDeadline')"
-                      value=""
-                    />
-                    <el-checkbox
-                      class="!block"
-                      :label="t('saveVoucher')"
-                      value=""
-                    />
-                  </div>
-                </el-form-item>
-              </div>
-            </div>
-          </template>
-
-          <!-- todo 后续完善 -->
-          <div class="item-wrap">
-            <div
-              class="text-[16px] h-[24px] font-bold text-[#262626] mb-[16px] w-[140px] mr-[32px] flex-shrink-0"
-            >
-              <span>{{ t('subsequentPperationButtons') }}</span>
-              <!--                            <p class="text-[12px] text-[#999] mt-[4px] font-normal">最多选择2个</p>-->
-            </div>
-            <div class="content-list-wrap">
-              <!--                                            <el-checkbox-group :min="1" :max="2">-->
-              <!--                            <el-checkbox v-model="formData.success_after_action.share" label="转发填写内容" value="share">-->
-              <!--                                <div class="text-[#333]">转发填写内容</div>-->
-              <!--                            </el-checkbox>-->
-              <!--                            <p class="text-[#999] text-[12px] pl-[24px] mt-[4px]">提交表单后，可转发给微信好友查看。支持按钮文案自定义，提醒填表人转发给特定人员查看</p>-->
-
-              <el-checkbox
-                v-model="formData.success_after_action.finish"
-                :label="t('finish')"
-                value="finish"
-              >
-                <div class="text-[#333]">{{ t('finish') }}</div>
-              </el-checkbox>
-              <p class="text-[#999] text-[12px] pl-[24px] mt-[4px]">
-                {{ t('finishTips') }}
-              </p>
-
-              <el-checkbox
-                v-model="formData.success_after_action.goback"
-                :label="t('back')"
-                value="goback"
-              >
-                <div class="text-[#333]">{{ t('back') }}</div>
-              </el-checkbox>
-              <p class="text-[#999] text-[12px] pl-[24px] mt-[4px]">
-                {{ t('backTips') }}
-              </p>
-              <!--                                            </el-checkbox-group>-->
+                    <div class="item-wrap" v-if="formData.submit_after_action == 'text'">
+                        <div class="text-[16px] h-[24px] font-bold text-[#262626] mb-[16px] w-[140px] mr-[32px] flex-shrink-0">{{ t('promptText') }}</div>
+                        <div>
+                            <el-radio-group v-model="formData.tips_type" class="!block">
+                                <el-radio label="default" class="!block">
+                                    <span class="mr-[3px]">{{ t('defaultPrompt') }}</span>
+                                    <span class="!text-[#999] text-[12px] ml-[8px]">{{ t('defaultPromptTips') }}</span>
+                                </el-radio>
+                                <el-radio label="diy" class="!block">{{ t('diyPrompt') }}</el-radio>
+                            </el-radio-group>
+                            <el-input v-if="formData.tips_type == 'diy'" v-model.trim="formData.tips_text" :placeholder="t('tipsTextPlaceholder')" class="w-[350px]" maxlength="30" clearable show-word-limit />
+                        </div>
+                    </div>
+
+                    <!-- 核销凭证 todo 后续完善 -->
+                    <template v-else-if="formData.submit_after_action == 'voucher'">
+
+                        <div class="item-wrap">
+                            <div class="text-[16px] h-[24px] font-bold text-[#262626] mb-[16px] w-[140px] mr-[32px] flex-shrink-0">{{ t('validityPeriodOfVoucher') }}</div>
+                            <div>
+                                <el-radio-group v-model="formData.time_limit_type" class="!block">
+                                    <el-radio label="no_limit" class="!block">{{ t('noLimit') }}</el-radio>
+                                    <el-radio label="specify_time" class="!block">
+                                        <span class="mr-[3px]">{{ t('specifyTime') }}</span>
+                                        <el-tooltip effect="light" placement="top">
+                                            <template #content>
+                                                <p>{{ t('specifyTimeTips') }}</p>
+                                            </template>
+                                            <el-icon>
+                                                <QuestionFilled color="#999999" />
+                                            </el-icon>
+                                        </el-tooltip> 
+                                    </el-radio>
+                                    <el-radio label="submission_time" class="!block">
+                                        <span class="mr-[3px]">{{ t('submissionTime') }}</span>
+                                        <el-tooltip effect="light" placement="top">
+                                            <template #content>
+                                                <p class="w-[250px]">{{ t('submissionTimeTips') }}</p>
+                                            </template>
+                                            <el-icon>
+                                                <QuestionFilled color="#999999" />
+                                            </el-icon>
+                                        </el-tooltip>
+                                    </el-radio>
+                                </el-radio-group>
+                                <el-date-picker v-if="formData.time_limit_type == 'specify_time'" v-model="formData.validity_time" type="datetimerange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" />
+                                <div class="flex items-center mt-[5px]" v-if="formData.time_limit_type == 'submission_time'">
+                                    <span>{{ t('afterSubmissionRecords') }}</span>
+    <!--                                <div class="flex items-center px-[5px]">-->
+    <!--                                    v-model.trim="formData.length"-->
+                                    <el-input v-model.trim="formData.submission_time_value" @keyup="filterNumber($event)" size="small" clearable class="!w-[100px] px-[5px]" maxlength="3" />
+                                    <el-select v-model="formData.timeUnit" clearable class="!w-[100px] pr-[5px]" size="small">
+                                        <el-option v-for="(item, index) in validityOptions" :key="item.value" :label="item.text" :value="item.value"></el-option>
+                                    </el-select>
+                                    <span>{{ t('effective') }}</span>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="item-wrap">
+                            <div class="text-[16px] h-[24px] font-bold text-[#262626] mb-[16px] w-[140px] mr-[32px] flex-shrink-0">{{ t('voucherStyle') }}</div>
+                            <div>
+                                <el-form-item :label="t('titleAboveTheCode')">
+    <!--                                    v-model.trim="formData.active_name"-->
+                                    <el-input clearable :placeholder="t('titleAboveTheCodePlaceholder')" class="input-width" :maxlength="20" />
+                                </el-form-item>
+                                <el-form-item :label="t('contentAboveTheCode')">
+                                    <el-input clearable :placeholder="t('contentAboveTheCodePlaceholder')" class="input-width" :maxlength="20" />
+                                    <div>
+                                        <span class="text-primary cursor-pointer mr-[10px]">{{ t('addLinefeeds') }}</span>
+                                        <span class="text-primary cursor-pointer">{{ t('addFields') }}</span>
+                                    </div>
+                                </el-form-item>
+                                <el-form-item :label="t('contentBelowTheCode')">
+                                    <div class="block">
+                                        <el-checkbox class="!block" :label="t('submissionRecordTime')" value="" />
+
+                                        <el-checkbox class="!block !h-[20px]" :label="t('currentTime')" value="" />
+                                        <div class="text-[#999] ml-[22px]">{{ t('currentTimeTips') }}</div>
+
+                                        <el-checkbox class="!block" :label="t('dispalyPromptText')" value="" />
+                                        <el-input class="ml-[22px]" :rows="4" type="textarea" :placeholder="t('tipsTextPlaceholder')" maxlength="100" />
+
+                                        <el-checkbox class="!block" :label="t('voucherDeadline')" value="" />
+                                        <el-checkbox class="!block" :label="t('saveVoucher')" value="" />
+                                    </div>
+                                </el-form-item>
+                            </div>
+                        </div>
+                    </template>
+
+                    <!-- todo 后续完善 -->
+                    <div class="item-wrap">
+                        <div class="text-[16px] h-[24px] font-bold text-[#262626] mb-[16px] w-[140px] mr-[32px] flex-shrink-0">
+                            <span>{{ t('subsequentPperationButtons') }}</span>
+<!--                            <p class="text-[12px] text-[#999] mt-[4px] font-normal">最多选择2个</p>-->
+                        </div>
+                        <div class="content-list-wrap">
+<!--                                            <el-checkbox-group :min="1" :max="2">-->
+<!--                            <el-checkbox v-model="formData.success_after_action.share" label="转发填写内容" value="share">-->
+<!--                                <div class="text-[#333]">转发填写内容</div>-->
+<!--                            </el-checkbox>-->
+<!--                            <p class="text-[#999] text-[12px] pl-[24px] mt-[4px]">提交表单后，可转发给微信好友查看。支持按钮文案自定义，提醒填表人转发给特定人员查看</p>-->
+
+                            <el-checkbox v-model="formData.success_after_action.finish" :label="t('finish')" value="finish">
+                                <div class="text-[#333]">{{ t('finish') }}</div>
+                            </el-checkbox>
+                            <p class="text-[#999] text-[12px] pl-[24px] mt-[4px]">{{ t('finishTips') }}</p>
+
+                            <el-checkbox v-model="formData.success_after_action.goback" :label="t('back')" value="goback">
+                                <div class="text-[#333]">{{ t('back') }}</div>
+                            </el-checkbox>
+                            <p class="text-[#999] text-[12px] pl-[24px] mt-[4px]">{{ t('backTips') }}</p>
+                            <!--                                            </el-checkbox-group>-->
+                        </div>
+                    </div>
+                </div>
             </div>
-          </div>
-        </div>
-      </div>
-
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-          <el-button type="primary" @click="confirm">{{ t('save') }}</el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </div>
+
+            <template #footer>
+                <div class="dialog-footer">
+                    <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                    <el-button type="primary" @click="confirm">{{ t('save') }}</el-button>
+                </div>
+            </template>
+
+        </el-dialog>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -376,10 +226,7 @@ import QRCode from 'qrcode'
 import storage from '@/utils/storage'
 import { filterNumber } from '@/utils/common'
 import { getUrl } from '@/app/api/sys'
-import {
-  getFormSubmitConfig,
-  editDiyFormSubmitConfig,
-} from '@/app/api/diy_form'
+import { getFormSubmitConfig,editDiyFormSubmitConfig } from '@/app/api/diy_form'
 
 const showDialog = ref(false)
 const repeat = ref(false)
@@ -388,26 +235,26 @@ const repeat = ref(false)
  * 表单数据
  */
 const initialFormData = {
-  id: 0,
-  form_id: 0,
-  submit_after_action: 'text', // 填表人提交后操作，text：文字信息，voucher：核销凭证
-  tips_type: 'default', // 提示内容类型，default：默认提示，diy：自定义提示
-  tips_text: '', // 自定义提示内容
-  time_limit_type: 'no_limit', // 核销凭证有效期限制类型，no_limit：不限制，specify_time：指定固定开始结束时间，submission_time：按提交时间设置有效期
-  // 核销凭证时间限制规则，json格式 todo 结构待定，后续完善
-  time_limit_rule: {
-    validity_time: [], // 指定固定开始结束时间
-    submission_time_value: '', // 按提交时间设置有效期
-    timeUnit: 'day', // 提交时间单位
-  },
-  // 核销凭证内容，json格式 todo 结构待定，后续完善
-  voucher_content_rule: {},
-  // 填写成功后续操作
-  success_after_action: {
-    share: false, // 转发填写内容
-    finish: true, // 完成
-    goback: true, // 返回
-  },
+    id: 0,
+    form_id: 0,
+    submit_after_action: 'text', // 填表人提交后操作，text：文字信息，voucher：核销凭证
+    tips_type: 'default', // 提示内容类型，default：默认提示，diy：自定义提示
+    tips_text: '', // 自定义提示内容
+    time_limit_type: 'no_limit', // 核销凭证有效期限制类型，no_limit：不限制，specify_time：指定固定开始结束时间，submission_time：按提交时间设置有效期
+    // 核销凭证时间限制规则，json格式 todo 结构待定，后续完善
+    time_limit_rule: {
+        validity_time: [], // 指定固定开始结束时间
+        submission_time_value: '', // 按提交时间设置有效期
+        timeUnit: 'day', // 提交时间单位
+    },
+    // 核销凭证内容，json格式 todo 结构待定，后续完善
+    voucher_content_rule: {},
+    // 填写成功后续操作
+    success_after_action: {
+        share: false, // 转发填写内容
+        finish: true, // 完成
+        goback: true, // 返回
+    }
 }
 
 const formData: Record<string, any> = reactive({ ...initialFormData })
@@ -420,26 +267,26 @@ const page = ref('')
 
 // 核销凭证有效期
 const validityOptions = reactive([
-  {
-    text: '天',
-    value: 'day',
-  },
-  {
-    text: '周',
-    value: 'week',
-  },
-  {
-    text: '月',
-    value: 'month',
-  },
-  {
-    text: '年',
-    value: 'year',
-  },
-  {
-    text: '分钟',
-    value: 'minutes',
-  },
+    {
+        text:'天',
+        value:'day'
+    },
+    {
+        text:'周',
+        value:'week'
+    },
+    {
+        text:'月',
+        value:'month'
+    },
+    {
+        text:'年',
+        value:'year'
+    },
+    {
+        text:'分钟',
+        value:'minutes'
+    }
 ])
 
 // getUrl().then((res: any) => {
@@ -462,132 +309,127 @@ const validityOptions = reactive([
 // })
 
 const loadQrcode = () => {
-  wapPreview.value = `${wapUrl.value}${page.value}`
-  // errorCorrectionLevel：密度容错率L（低）H(高)
-  QRCode.toDataURL(wapPreview.value, {
-    errorCorrectionLevel: 'L',
-    margin: 0,
-    width: 120,
-  }).then((url) => {
-    wapImage.value = url
-  })
+    wapPreview.value = `${wapUrl.value}${page.value}`
+    // errorCorrectionLevel：密度容错率L（低）H(高)
+    QRCode.toDataURL(wapPreview.value, { errorCorrectionLevel: 'L', margin: 0, width: 120 }).then(url => {
+        wapImage.value = url
+    })
 }
 
 const emit = defineEmits(['complete'])
 
 const setFormData = async (row: any = null) => {
-  Object.assign(formData, initialFormData)
-  if (row) {
-    const data = await (await getFormSubmitConfig(row.form_id)).data
-    if (data) {
-      Object.keys(formData).forEach((key: string) => {
-        if (data[key] != undefined) formData[key] = data[key]
-      })
+    Object.assign(formData, initialFormData)
+    if (row) {
+        const data = await (await getFormSubmitConfig(row.form_id)).data
+        if (data) {
+            Object.keys(formData).forEach((key: string) => {
+                if (data[key] != undefined) formData[key] = data[key]
+            })
+        }
+        // todo 靠后完善
+        // page.value = `/app/pages/index/diy_form?form_id=${formData.form_id}`
+        // loadQrcode()
     }
-    // todo 靠后完善
-    // page.value = `/app/pages/index/diy_form?form_id=${formData.form_id}`
-    // loadQrcode()
-  }
 }
 
 /**
  * 确认
  */
 const confirm = () => {
-  if (formData.tips_type == 'diy' && !formData.tips_text) {
-    ElMessage.error('提示不能为空')
-    return
-  }
+    if(formData.tips_type == 'diy' && !formData.tips_text){
+        ElMessage.error('提示不能为空')
+        return
+    }
 
-  if (repeat.value) return
-  repeat.value = true
+    if (repeat.value) return;
+    repeat.value = true
 
-  const data = formData
+    const data = formData
 
-  editDiyFormSubmitConfig(data)
-    .then((res) => {
-      repeat.value = false
-      showDialog.value = false
-      emit('complete')
-    })
-    .catch((err) => {
-      repeat.value = false
+    editDiyFormSubmitConfig(data).then(res => {
+        repeat.value = false
+        showDialog.value = false
+        emit('complete')
+    }).catch(err => {
+        repeat.value = false
     })
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
 <style lang="scss" scoped>
-.preview-wrap {
-  position: relative;
-  width: 324px;
-  min-height: 555px;
-  padding: 82px 12px 20px;
-  background-size: 100%;
-  background-repeat: repeat-y;
-  background-image: url(../../../../app/assets/images/diy_form/mobile_line.png);
-  border-radius: 38px;
-  overflow: hidden;
-  box-shadow: none;
-  background-color: #fff !important;
-  margin-right: 24px;
-  overflow-y: auto;
-
-  .page-wrap {
-    position: relative;
-    display: -ms-flexbox;
-    display: flex;
-    -ms-flex-direction: column;
-    flex-direction: column;
-    overflow-y: auto;
-    overflow-x: hidden;
-    text-align: center;
-    min-height: 548px;
-    height: auto;
-  }
-
-  .verify-voucher-wrap {
-    background-color: #f4f4f4;
-    .tips-wrap {
-      font-size: 15px;
-      font-weight: 400;
-      line-height: 21px;
-      color: rgba(0, 0, 0, 0.65);
-      margin: 20px 10px;
+    .preview-wrap {
+        position: relative;
+        width: 324px;
+        min-height: 555px;
+        padding: 82px 12px 20px;
+        background-size: 100%;
+        background-repeat: repeat-y;
+        background-image: url(../../../../app/assets/images/diy_form/mobile_line.png);
+        border-radius: 38px;
+        overflow: hidden;
+        box-shadow: none;
+        background-color: #fff !important;
+        margin-right: 24px;
+        overflow-y: auto;
+
+        .page-wrap {
+            position: relative;
+            display: -ms-flexbox;
+            display: flex;
+            -ms-flex-direction: column;
+            flex-direction: column;
+            overflow-y: auto;
+            overflow-x: hidden;
+            text-align: center;
+            min-height: 548px;
+            height: auto;
+        }
+
+        .verify-voucher-wrap {
+            background-color: #f4f4f4;
+            .tips-wrap{
+                font-size: 15px;
+                font-weight: 400;
+                line-height: 21px;
+                color: rgba(0,0,0,.65);
+                margin: 20px 10px;
+            }
+            .qrcode-wrap{
+                border-radius: 12px;
+                margin: 0 20px;
+                background: #fff;
+                padding: 20px 10px 10px;
+            }
+        }
     }
-    .qrcode-wrap {
-      border-radius: 12px;
-      margin: 0 20px;
-      background: #fff;
-      padding: 20px 10px 10px;
+
+    .item-wrap {
+        padding: 20px 24px 24px;
+        background-color: #fff;
+        border-radius: 2px;
+        display: flex;
+        position: relative;
+
+        &:after {
+            content: "";
+            display: block;
+            height: 1px;
+            width: calc(100% - 48px);
+            background-color: hsla(210, 8%, 51%, .13);
+            position: absolute;
+            left: 24px;
+            bottom: 0;
+        }
+
+        &:last-child:after {
+            display: none;
+        }
     }
-  }
-}
 
-.item-wrap {
-  padding: 20px 24px 24px;
-  background-color: #fff;
-  border-radius: 2px;
-  display: flex;
-  position: relative;
-
-  &:after {
-    content: '';
-    display: block;
-    height: 1px;
-    width: calc(100% - 48px);
-    background-color: hsla(210, 8%, 51%, 0.13);
-    position: absolute;
-    left: 24px;
-    bottom: 0;
-  }
-
-  &:last-child:after {
-    display: none;
-  }
-}
 </style>
diff --git a/admin/src/app/views/diy_form/components/form-write-popup.vue b/admin/src/app/views/diy_form/components/form-write-popup.vue
index 6070e87b..e69c9ce5 100644
--- a/admin/src/app/views/diy_form/components/form-write-popup.vue
+++ b/admin/src/app/views/diy_form/components/form-write-popup.vue
@@ -1,244 +1,118 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="t('writeSet')"
-    width="600px"
-    class="diy-dialog-wrap"
-    :close-on-press-escape="true"
-    :destroy-on-close="true"
-    :close-on-click-modal="false"
-  >
-    <el-form
-      :model="formData"
-      label-width="120px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <!--            <el-form-item :label="t('填写方式')">-->
-      <!--                <el-radio-group v-model="formData.write_way">-->
-      <!--                    <el-radio label="no_limit">{{t('不限制')}}</el-radio>-->
-      <!--                    <el-radio label="scan">{{t('仅限扫一扫')}}</el-radio>-->
-      <!--                    <el-radio label="url">{{t('仅限链接进入')}}</el-radio>-->
-      <!--                </el-radio-group>-->
-      <!--            </el-form-item>-->
-
-      <el-form-item :label="t('joinMemberType')">
-        <el-radio-group v-model="formData.join_member_type">
-          <el-radio label="all_member">{{ t('allMember') }}</el-radio>
-          <el-radio label="selected_member_level">{{
-            t('selectedMemberLevel')
-          }}</el-radio>
-          <el-radio label="selected_member_label">{{
-            t('selectedMemberLabel')
-          }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-
-      <!-- 会员标签 -->
-      <el-form-item
-        :label="t('memberLabel')"
-        prop="label_ids"
-        v-if="formData.join_member_type == 'selected_member_label'"
-      >
-        <el-select
-          v-model="formData.label_ids"
-          clearable
-          multiple
-          :placeholder="t('memberLabelPlaceholder')"
-          class="input-width"
-        >
-          <el-option
-            :label="item['label_name']"
-            :value="item['label_id']"
-            v-for="(item, index) in labelSelectData"
-            :key="index"
-          />
-        </el-select>
-      </el-form-item>
-
-      <!-- 会员等级 -->
-      <el-form-item
-        :label="t('memberLevel')"
-        prop="level_ids"
-        v-if="formData.join_member_type == 'selected_member_level'"
-      >
-        <el-select
-          v-model="formData.level_ids"
-          clearable
-          multiple
-          :placeholder="t('memberLevelPlaceholder')"
-          class="input-width"
-        >
-          <el-option
-            :label="item['level_name']"
-            :value="item['level_id']"
-            v-for="(item, index) in levelSelectData"
-            :key="index"
-          />
-        </el-select>
-      </el-form-item>
-
-      <el-form-item
-        :label="t('apieceFillQuantity')"
-        :class="{ '!mb-[5px]': formData.member_write_type == 'diy' }"
-      >
-        <el-radio-group v-model="formData.member_write_type">
-          <el-radio label="no_limit">{{ t('noLimit') }}</el-radio>
-          <el-radio label="diy">{{ t('diy') }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-
-      <el-form-item
-        label=" "
-        v-if="formData.member_write_type == 'diy'"
-        prop="member_write_rule"
-      >
-        <div class="flex items-center">
-          <span>每</span>
-          <el-input
-            v-model.trim="formData.member_write_rule.time_value"
-            @keyup="filterNumber($event)"
-            size="small"
-            class="!w-[50px] px-[5px]"
-            maxlength="3"
-          />
-          <el-select
-            v-model="formData.member_write_rule.time_unit"
-            class="!w-[60px] pr-[5px]"
-            size="small"
-          >
-            <el-option
-              v-for="(item, index) in validityOptions"
-              :key="item.value"
-              :label="item.text"
-              :value="item.value"
-            ></el-option>
-          </el-select>
-          <span>可填写</span>
-          <el-input
-            v-model.trim="formData.member_write_rule.num"
-            @keyup="filterNumber($event)"
-            size="small"
-            class="!w-[50px] px-[5px]"
-            maxlength="3"
-          />
-          <span>次</span>
-        </div>
-      </el-form-item>
-
-      <el-form-item
-        :label="t('fillQuantityTotal')"
-        :class="{ '!mb-[5px]': formData.form_write_type == 'diy' }"
-      >
-        <el-radio-group v-model="formData.form_write_type">
-          <el-radio label="no_limit">{{ t('noLimit') }}</el-radio>
-          <el-radio label="diy">{{ t('diy') }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-
-      <el-form-item
-        label=" "
-        v-if="formData.form_write_type == 'diy'"
-        prop="form_write_rule"
-      >
-        <div class="flex items-center">
-          <span>每</span>
-          <el-input
-            v-model.trim="formData.form_write_rule.time_value"
-            @keyup="filterNumber($event)"
-            size="small"
-            class="!w-[50px] px-[5px]"
-            maxlength="3"
-          />
-          <el-select
-            v-model="formData.form_write_rule.time_unit"
-            class="!w-[60px] pr-[5px]"
-            size="small"
-          >
-            <el-option
-              v-for="(item, index) in validityOptions"
-              :key="item.value"
-              :label="item.text"
-              :value="item.value"
-            ></el-option>
-          </el-select>
-          <span>可填写</span>
-          <el-input
-            v-model.trim="formData.form_write_rule.num"
-            @keyup="filterNumber($event)"
-            size="small"
-            class="!w-[50px] px-[5px]"
-            maxlength="3"
-          />
-          <span class="mr-[5px]">次</span>
-          <el-tooltip effect="light" placement="top">
-            <template #content>
-              <p class="w-[250px]">{{ t('writeTips') }}</p>
-            </template>
-            <el-icon>
-              <QuestionFilled color="#999999" />
-            </el-icon>
-          </el-tooltip>
-        </div>
-      </el-form-item>
-
-      <el-form-item :label="t('fillInTheTimePeriod')" prop="time_limit_rule">
-        <el-radio-group v-model="formData.time_limit_type">
-          <el-radio label="no_limit">{{ t('noLimit') }}</el-radio>
-          <el-radio label="specify_time">{{ t('setSpecifyTime') }}</el-radio>
-          <el-radio label="open_day_time">{{ t('openDayTime') }}</el-radio>
-        </el-radio-group>
-        <el-date-picker
-          v-if="formData.time_limit_type == 'specify_time'"
-          v-model="formData.time_limit_rule.specify_time"
-          type="datetimerange"
-          range-separator="至"
-          start-placeholder="开始时间"
-          end-placeholder="结束时间"
-        />
-        <div
-          class="flex items-center mt-[5px]"
-          v-if="formData.time_limit_type == 'open_day_time'"
-        >
-          <span class="mr-[5px]">每天</span>
-          <el-time-picker
-            class="!w-[180px]"
-            v-model="formData.time_limit_rule.open_day_time"
-            format="HH:mm"
-            value-format="HH:mm"
-            is-range
-            range-separator="-"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-          />
-          <span class="ml-[5px]">可填写</span>
-        </div>
-      </el-form-item>
-
-      <!--            <el-form-item :label="t('允许修改内容')" class="display-block">-->
-      <!--                <el-switch v-model="formData.is_allow_update_content" :active-value="1" :inactive-value="0" />-->
-      <!--                <div class="text-sm text-gray-400">{{ t('开启后，填表人可以修改自己填写的内容。') }}</div>-->
-      <!--            </el-form-item>-->
-
-      <!--            <el-form-item :label="t('填写须知')">-->
-      <!--                <el-input v-model.trim="formData.write_instruction" :placeholder="t('请输入填写须知')" type="textarea" maxlength="500" show-word-limit rows="5" class="w-[400px]" clearable />-->
-      <!--            </el-form-item>-->
-    </el-form>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+    <el-dialog v-model="showDialog" :title="t('writeSet')" width="600px" class="diy-dialog-wrap" :close-on-press-escape="true" :destroy-on-close="true" :close-on-click-modal="false">
+
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+
+<!--            <el-form-item :label="t('填写方式')">-->
+<!--                <el-radio-group v-model="formData.write_way">-->
+<!--                    <el-radio label="no_limit">{{t('不限制')}}</el-radio>-->
+<!--                    <el-radio label="scan">{{t('仅限扫一扫')}}</el-radio>-->
+<!--                    <el-radio label="url">{{t('仅限链接进入')}}</el-radio>-->
+<!--                </el-radio-group>-->
+<!--            </el-form-item>-->
+
+            <el-form-item :label="t('joinMemberType')">
+                <el-radio-group v-model="formData.join_member_type">
+                    <el-radio label="all_member">{{t('allMember')}}</el-radio>
+                    <el-radio label="selected_member_level">{{t('selectedMemberLevel')}}</el-radio>
+                    <el-radio label="selected_member_label">{{t('selectedMemberLabel')}}</el-radio>
+                </el-radio-group>
+            </el-form-item>
+
+            <!-- 会员标签 -->
+            <el-form-item :label="t('memberLabel')" prop="label_ids" v-if="formData.join_member_type=='selected_member_label'">
+                <el-select v-model="formData.label_ids" clearable multiple :placeholder="t('memberLabelPlaceholder')" class="input-width">
+                    <el-option :label="item['label_name']" :value="item['label_id']" v-for="(item, index) in labelSelectData" :key="index" />
+                </el-select>
+            </el-form-item>
+
+            <!-- 会员等级 -->
+            <el-form-item :label="t('memberLevel')" prop="level_ids" v-if="formData.join_member_type=='selected_member_level'">
+                <el-select v-model="formData.level_ids" clearable multiple :placeholder="t('memberLevelPlaceholder')" class="input-width">
+                    <el-option :label="item['level_name']" :value="item['level_id']" v-for="(item, index) in levelSelectData" :key="index" />
+                </el-select>
+            </el-form-item>
+
+            <el-form-item :label="t('apieceFillQuantity')" :class="{ '!mb-[5px]' : formData.member_write_type == 'diy' }">
+                <el-radio-group v-model="formData.member_write_type">
+                    <el-radio label="no_limit">{{t('noLimit')}}</el-radio>
+                    <el-radio label="diy">{{t('diy')}}</el-radio>
+                </el-radio-group>
+            </el-form-item>
+
+            <el-form-item label=" " v-if="formData.member_write_type == 'diy'" prop="member_write_rule">
+                <div class="flex items-center">
+                    <span>每</span>
+                    <el-input v-model.trim="formData.member_write_rule.time_value" @keyup="filterNumber($event)" size="small" class="!w-[50px] px-[5px]" maxlength="3" />
+                    <el-select v-model="formData.member_write_rule.time_unit" class="!w-[60px] pr-[5px]" size="small">
+                        <el-option v-for="(item, index) in validityOptions" :key="item.value" :label="item.text" :value="item.value"></el-option>
+                    </el-select>
+                    <span>可填写</span>
+                    <el-input v-model.trim="formData.member_write_rule.num" @keyup="filterNumber($event)" size="small" class="!w-[50px] px-[5px]" maxlength="3" />
+                    <span>次</span>
+                </div>
+            </el-form-item>
+
+            <el-form-item :label="t('fillQuantityTotal')" :class="{ '!mb-[5px]' : formData.form_write_type == 'diy' }">
+                <el-radio-group v-model="formData.form_write_type">
+                    <el-radio label="no_limit">{{t('noLimit')}}</el-radio>
+                    <el-radio label="diy">{{t('diy')}}</el-radio>
+                </el-radio-group>
+            </el-form-item>
+
+            <el-form-item label=" " v-if="formData.form_write_type == 'diy'" prop="form_write_rule">
+                <div class="flex items-center">
+                    <span>每</span>
+                    <el-input v-model.trim="formData.form_write_rule.time_value" @keyup="filterNumber($event)" size="small" class="!w-[50px] px-[5px]" maxlength="3" />
+                    <el-select v-model="formData.form_write_rule.time_unit" class="!w-[60px] pr-[5px]" size="small">
+                        <el-option v-for="(item, index) in validityOptions" :key="item.value" :label="item.text" :value="item.value"></el-option>
+                    </el-select>
+                    <span>可填写</span>
+                    <el-input v-model.trim="formData.form_write_rule.num" @keyup="filterNumber($event)" size="small" class="!w-[50px] px-[5px]" maxlength="3" />
+                    <span class="mr-[5px]">次</span>
+                    <el-tooltip effect="light" placement="top">
+                        <template #content>
+                            <p class="w-[250px]">{{ t('writeTips') }}</p>
+                        </template>
+                        <el-icon>
+                            <QuestionFilled color="#999999" />
+                        </el-icon>
+                    </el-tooltip>
+                </div>
+            </el-form-item>
+
+            <el-form-item :label="t('fillInTheTimePeriod')" prop="time_limit_rule">
+                <el-radio-group v-model="formData.time_limit_type">
+                    <el-radio label="no_limit">{{t('noLimit')}}</el-radio>
+                    <el-radio label="specify_time">{{t('setSpecifyTime')}}</el-radio>
+                    <el-radio label="open_day_time">{{t('openDayTime')}}</el-radio>
+                </el-radio-group>
+                <el-date-picker v-if="formData.time_limit_type == 'specify_time'" v-model="formData.time_limit_rule.specify_time" type="datetimerange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" />
+                <div class="flex items-center mt-[5px]" v-if="formData.time_limit_type == 'open_day_time'">
+                    <span class="mr-[5px]">每天</span>
+                    <el-time-picker class="!w-[180px]" v-model="formData.time_limit_rule.open_day_time" format="HH:mm" value-format="HH:mm" is-range range-separator="-" start-placeholder="开始时间" end-placeholder="结束时间" />
+                    <span class="ml-[5px]">可填写</span>
+                </div>
+            </el-form-item>
+
+<!--            <el-form-item :label="t('允许修改内容')" class="display-block">-->
+<!--                <el-switch v-model="formData.is_allow_update_content" :active-value="1" :inactive-value="0" />-->
+<!--                <div class="text-sm text-gray-400">{{ t('开启后，填表人可以修改自己填写的内容。') }}</div>-->
+<!--            </el-form-item>-->
+
+<!--            <el-form-item :label="t('填写须知')">-->
+<!--                <el-input v-model.trim="formData.write_instruction" :placeholder="t('请输入填写须知')" type="textarea" maxlength="500" show-word-limit rows="5" class="w-[400px]" clearable />-->
+<!--            </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -246,8 +120,8 @@ import { ref, reactive, computed } from 'vue'
 import { t } from '@/lang'
 import type { FormInstance } from 'element-plus'
 import { filterNumber } from '@/utils/common'
-import { getMemberLabelAll, getMemberLevelAll } from '@/app/api/member'
-import { getFormWriteConfig, editDiyFormWriteConfig } from '@/app/api/diy_form'
+import {getMemberLabelAll,getMemberLevelAll } from '@/app/api/member'
+import { getFormWriteConfig,editDiyFormWriteConfig } from '@/app/api/diy_form'
 
 const showDialog = ref(false)
 const loading = ref(false)
@@ -256,34 +130,34 @@ const loading = ref(false)
  * 表单数据
  */
 const initialFormData = {
-  id: 0,
-  form_id: 0, // 万能表单id
-  write_way: 'no_limit', // 填写方式，no_limit：不限制，scan：仅限微信扫一扫，url：仅限链接进入
-  join_member_type: 'all_member', // 参与会员，all_member：所有会员参与，selected_member_level：指定会员等级，selected_member_label：指定会员标签
-  level_ids: [], // 会员等级id集合
-  label_ids: [], // 会员标签id集合
-  member_write_type: 'no_limit', // 每人可填写次数，no_limit：不限制，diy：自定义
-  // 每人可填写次数自定义规则
-  member_write_rule: {
-    time_value: 1, // 时间
-    time_unit: 'day', // 时间单位
-    num: 1, // 可填写次数
-  },
-  form_write_type: 'no_limit', // 表单可填写数量，no_limit：不限制，diy：自定义
-  // 表单可填写总数自定义规则
-  form_write_rule: {
-    time_value: 1, // 时间
-    time_unit: 'day', // 时间单位
-    num: 1, // 可填写次数
-  },
-  time_limit_type: 'no_limit', // 填写时间限制类型，no_limit：不限制，specify_time：指定开始结束时间，open_day_time：设置每日开启时间
-  // 填写时间限制规则
-  time_limit_rule: {
-    specify_time: [], // 指定开始结束时间
-    open_day_time: [], // 设置每日开启时间
-  },
-  is_allow_update_content: 0, // 是否允许修改自己填写的内容，0：否，1：是
-  write_instruction: '', // 表单填写须知
+    id: 0,
+    form_id: 0, // 万能表单id
+    write_way: 'no_limit', // 填写方式，no_limit：不限制，scan：仅限微信扫一扫，url：仅限链接进入
+    join_member_type: 'all_member', // 参与会员，all_member：所有会员参与，selected_member_level：指定会员等级，selected_member_label：指定会员标签
+    level_ids: [], // 会员等级id集合
+    label_ids: [], // 会员标签id集合
+    member_write_type: 'no_limit', // 每人可填写次数，no_limit：不限制，diy：自定义
+    // 每人可填写次数自定义规则
+    member_write_rule: {
+        time_value: 1, // 时间
+        time_unit: 'day', // 时间单位
+        num: 1 // 可填写次数
+    },
+    form_write_type: 'no_limit', // 表单可填写数量，no_limit：不限制，diy：自定义
+    // 表单可填写总数自定义规则
+    form_write_rule: {
+        time_value: 1, // 时间
+        time_unit: 'day', // 时间单位
+        num: 1 // 可填写次数
+    },
+    time_limit_type: 'no_limit', // 填写时间限制类型，no_limit：不限制，specify_time：指定开始结束时间，open_day_time：设置每日开启时间
+    // 填写时间限制规则
+    time_limit_rule: {
+        specify_time: [], // 指定开始结束时间
+        open_day_time: [], // 设置每日开启时间
+    },
+    is_allow_update_content: 0, // 是否允许修改自己填写的内容，0：否，1：是
+    write_instruction: '', // 表单填写须知
 }
 
 const formData: Record<string, any> = reactive({ ...initialFormData })
@@ -292,88 +166,82 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    label_ids: [{ required: true, message: t('labelTips'), trigger: 'blur' }],
-    level_ids: [{ required: true, message: t('levelTips'), trigger: 'blur' }],
-    member_write_rule: [
-      {
-        validator: (rule: any, value: string, callback: any) => {
-          let unit = ''
-          validityOptions.forEach((item, index) => {
-            if (item.value == value.time_unit) {
-              unit = item.text
+    return {
+        label_ids: [
+            { required: true, message: t('labelTips'), trigger: 'blur' }
+        ],
+        level_ids: [
+            { required: true, message: t('levelTips'), trigger: 'blur' }
+        ],
+        member_write_rule: [
+            {
+                validator: (rule: any, value: string, callback: any) => {
+                    let unit = ''
+                    validityOptions.forEach((item,index)=>{
+                        if(item.value == value.time_unit){
+                            unit = item.text;
+                        }
+                    })
+                    if(formData.member_write_type == 'diy'){
+                        if(!value.time_value){
+                            callback(new Error(`${unit}数不能为空`))
+                        }else if(!value.num){
+                            callback(new Error(t('numCannotNull')))
+                        }else{
+                            callback()
+                        }
+                    }else{
+                        callback()
+                    }
+                },
+                trigger: ['blur', 'change']
             }
-          })
-          if (formData.member_write_type == 'diy') {
-            if (!value.time_value) {
-              callback(new Error(`${unit}数不能为空`))
-            } else if (!value.num) {
-              callback(new Error(t('numCannotNull')))
-            } else {
-              callback()
+        ],
+        form_write_rule: [
+            {
+                validator: (rule: any, value: string, callback: any) => {
+                    let unit = ''
+                    validityOptions.forEach((item,index)=>{
+                        if(item.value == value.time_unit){
+                            unit = item.text;
+                        }
+                    })
+                   if(formData.member_write_type == 'diy'){
+                        if(!value.time_value){
+                            callback(new Error(`${unit}数不能为空`))
+                        }else if(!value.num){
+                            callback(new Error(t('numCannotNull')))
+                        }else{
+                            callback()
+                        }
+                    }else{
+                        callback()
+                    }
+                },
+                trigger: ['blur', 'change']
             }
-          } else {
-            callback()
-          }
-        },
-        trigger: ['blur', 'change'],
-      },
-    ],
-    form_write_rule: [
-      {
-        validator: (rule: any, value: string, callback: any) => {
-          let unit = ''
-          validityOptions.forEach((item, index) => {
-            if (item.value == value.time_unit) {
-              unit = item.text
+        ],
+        time_limit_rule: [
+            {
+                validator: (rule: any, value: string, callback: any) => {
+                    if (formData.time_limit_type == 'specify_time' && (!value.specify_time || !value.specify_time.length)) {
+                        callback(new Error(t('timeLimitRuleOne')))
+                    } else if (formData.time_limit_type == 'open_day_time' && (!value.open_day_time || !value.open_day_time.length)) {
+                        callback(new Error(t('timeLimitRuleTwo')))
+                    } else if (formData.time_limit_type == 'open_day_time' && value.open_day_time && value.open_day_time.length) {
+                        if (value.open_day_time[0] == value.open_day_time[1]) {
+                            callback(new Error(t('timeLimitRuleThree')))
+                        } else {
+                            callback()
+                        }
+                    } else {
+                        callback()
+                    }
+                },
+                trigger: ['blur', 'change']
             }
-          })
-          if (formData.member_write_type == 'diy') {
-            if (!value.time_value) {
-              callback(new Error(`${unit}数不能为空`))
-            } else if (!value.num) {
-              callback(new Error(t('numCannotNull')))
-            } else {
-              callback()
-            }
-          } else {
-            callback()
-          }
-        },
-        trigger: ['blur', 'change'],
-      },
-    ],
-    time_limit_rule: [
-      {
-        validator: (rule: any, value: string, callback: any) => {
-          if (
-            formData.time_limit_type == 'specify_time' &&
-            (!value.specify_time || !value.specify_time.length)
-          ) {
-            callback(new Error(t('timeLimitRuleOne')))
-          } else if (
-            formData.time_limit_type == 'open_day_time' &&
-            (!value.open_day_time || !value.open_day_time.length)
-          ) {
-            callback(new Error(t('timeLimitRuleTwo')))
-          } else if (
-            formData.time_limit_type == 'open_day_time' &&
-            value.open_day_time &&
-            value.open_day_time.length
-          ) {
-            if (value.open_day_time[0] == value.open_day_time[1]) {
-              callback(new Error(t('timeLimitRuleThree')))
-            } else {
-              callback()
-            }
-          } else {
-            callback()
-          }
-        },
-        trigger: ['blur', 'change'],
-      },
-    ],
-  }
+        ]
+    }
 })
 
 const levelSelectData = ref([])
@@ -381,48 +249,48 @@ const labelSelectData = ref([])
 
 // 获取全部标签
 getMemberLabelAll().then(({ data }) => {
-  labelSelectData.value = data
+    labelSelectData.value = data
 })
 
 getMemberLevelAll().then(({ data }) => {
-  levelSelectData.value = data
+    levelSelectData.value = data
 })
 
 const validityOptions = reactive([
-  {
-    text: '天',
-    value: 'day',
-  },
-  {
-    text: '周',
-    value: 'week',
-  },
-  {
-    text: '月',
-    value: 'month',
-  },
-  {
-    text: '年',
-    value: 'year',
-  },
+    {
+        text:'天',
+        value:'day'
+    },
+    {
+        text:'周',
+        value:'week'
+    },
+    {
+        text:'月',
+        value:'month'
+    },
+    {
+        text:'年',
+        value:'year'
+    }
 ])
 
 const emit = defineEmits(['complete'])
 
 const setFormData = async (row: any = null) => {
-  Object.assign(formData, initialFormData)
-  loading.value = true
-  if (row) {
-    const data = await (await getFormWriteConfig(row.form_id)).data
-    if (data && Object.keys(data).length) {
-      Object.keys(formData).forEach((key: string) => {
-        if (data[key] != undefined) formData[key] = data[key]
-      })
-    } else {
-      formData.form_id = row.form_id
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if (row) {
+        const data = await (await getFormWriteConfig(row.form_id)).data
+        if (data && Object.keys(data).length) {
+            Object.keys(formData).forEach((key: string) => {
+                if (data[key] != undefined) formData[key] = data[key]
+            })
+        }else{
+            formData.form_id = row.form_id;
+        }
     }
-  }
-  loading.value = false
+    loading.value = false
 }
 
 /**
@@ -430,52 +298,44 @@ const setFormData = async (row: any = null) => {
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-
-      const data = formData
-
-      editDiyFormWriteConfig(data)
-        .then((res) => {
-          loading.value = false
-          showDialog.value = false
-          emit('complete')
-        })
-        .catch((err) => {
-          loading.value = false
-        })
-    }
-  })
+    if (loading.value || !formEl) return
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            const data = formData
+
+            editDiyFormWriteConfig(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
 }
 
-const filterSpecial = (event: any) => {
-  event.target.value = event.target.value.replace(
-    /[^\u4e00-\u9fa5a-zA-Z0-9]/g,
-    ''
-  )
-  event.target.value = event.target.value.replace(
-    /[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]/g,
-    ''
-  )
+const filterSpecial = (event:any) => {
+    event.target.value = event.target.value.replace(/[^\u4e00-\u9fa5a-zA-Z0-9]/g, '')
+    event.target.value = event.target.value.replace(/[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]/g, '')
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
 <style lang="scss" scoped></style>
 <style lang="scss">
-.diy-dialog-wrap .el-form-item__label {
-  height: auto !important;
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
 }
 
 .display-block {
-  .el-form-item__content {
-    display: block;
-  }
+    .el-form-item__content {
+        display: block;
+    }
 }
 </style>
diff --git a/admin/src/app/views/diy_form/edit.vue b/admin/src/app/views/diy_form/edit.vue
index 13212dc9..8d643c7b 100644
--- a/admin/src/app/views/diy_form/edit.vue
+++ b/admin/src/app/views/diy_form/edit.vue
@@ -1,813 +1,377 @@
 <template>
-  <div class="main-container flex-1">
-    <el-header class="flex items-center h-[60px] bg-primary px-[20px]">
-      <div class="text-white cursor-pointer flex items-center" @click="goBack">
-        <el-icon size="14">
-          <ArrowLeft />
-        </el-icon>
-        <span class="pl-[5px] text-[14px]">{{ t('back') }}</span>
-      </div>
-      <div class="text-white ml-[10px] mr-[20px] flex items-center">
-        <span class="mr-[5px] text-[rgba(255,255,255,.5)]">｜</span>
-        <span class="mr-[5px] text-[14px]"
-          >{{ t('decorating') }}：{{ diyStore.typeName }}</span
-        >
-      </div>
-
-      <!--            v-if="diyStore.type && diyStore.type != 'DIY_FORM'"-->
-      <div class="flex items-center">
-        <span class="text-white mr-[10px] text-base">{{
-          t('templatePagePlaceholder')
-        }}</span>
-        <div class="w-[180px]">
-          <el-select
-            size="small"
-            v-model="template"
-            :placeholder="t('templatePagePlaceholder')"
-            @change="changeTemplatePage"
-          >
-            <el-option :label="t('templatePageEmpty')" value="" />
-            <el-option
-              v-for="(item, key) in templatePages"
-              :label="item.title"
-              :value="key"
-              :key="key"
-            />
-          </el-select>
-        </div>
-      </div>
-      <div class="flex-1"></div>
-      <el-button @click="preview()">{{ t('preview') }}</el-button>
-      <el-button @click="save()">{{ t('save') }}</el-button>
-    </el-header>
-
-    <div class="full-container flex flex-row flex-1 bg-page">
-      <div class="component-list w-[290px]">
-        <!-- 组件列表区域 -->
-        <el-scrollbar class="px-[10px]">
-          <el-collapse v-model="activeNames" @change="handleChange">
-            <el-collapse-item
-              v-for="(item, key) in component"
-              :key="key"
-              :title="item.title"
-              :name="key"
-            >
-              <ul class="flex flex-row flex-wrap">
-                <li
-                  v-for="(compItem, compKey) in item.list"
-                  :key="compKey"
-                  class="w-2/6 text-center cursor-pointer h-[65px]"
-                  :title="compItem.title"
-                  @click="diyStore.addComponent(compKey, compItem)"
-                >
-                  <icon
-                    v-if="compItem.icon"
-                    :name="compItem.icon"
-                    size="20px"
-                    class="inline-block mt-[3px]"
-                  />
-                  <icon
-                    v-else
-                    name="iconfont iconkaifazujian"
-                    size="20px"
-                    class="inline-block mt-[3px]"
-                  />
-                  <span class="block text-[12px] truncate">{{
-                    compItem.title
-                  }}</span>
-                </li>
-              </ul>
-            </el-collapse-item>
-          </el-collapse>
-        </el-scrollbar>
-      </div>
-
-      <div class="preview-wrap flex-1 relative mt-[20px]">
-        <el-scrollbar>
-          <el-button
-            class="page-btn absolute right-[20px]"
-            @click="diyStore.changeCurrentIndex(-99)"
-            >{{ t('pageSet') }}</el-button
-          >
-          <div class="diy-view-wrap w-[375px] shadow-lg mx-auto">
-            <div
-              class="preview-head bg-no-repeat bg-center bg-cover cursor-pointer h-[64px]"
-              :class="[diyStore.global.topStatusBar.style]"
-              :style="{ backgroundColor: diyStore.global.topStatusBar.bgColor }"
-              @click="diyStore.changeCurrentIndex(-99)"
-            >
-              <div
-                v-if="
-                  diyStore.global.topStatusBar.style == 'style-1' &&
-                  diyStore.global.topStatusBar.isShow
-                "
-                class="content-wrap"
-              >
-                <div
-                  class="title-wrap"
-                  :style="{
-                    fontSize: '14px',
-                    color: diyStore.global.topStatusBar.textColor,
-                    textAlign: diyStore.global.topStatusBar.textAlign,
-                  }"
-                >
-                  {{ diyStore.global.title }}
-                </div>
-              </div>
-              <div
-                v-if="
-                  diyStore.global.topStatusBar.style == 'style-2' &&
-                  diyStore.global.topStatusBar.isShow
-                "
-                class="content-wrap"
-              >
-                <div
-                  class="title-wrap"
-                  :style="{ color: diyStore.global.topStatusBar.textColor }"
-                >
-                  <div
-                    class="h-[28px] max-w-[150px] mr-[8px]"
-                    v-if="diyStore.global.topStatusBar.imgUrl"
-                  >
-                    <img
-                      class="max-w-[100%] max-h-[100%]"
-                      :src="img(diyStore.global.topStatusBar.imgUrl)"
-                      mode="heightFix"
-                    />
-                  </div>
-                  <div
-                    :style="{ color: diyStore.global.topStatusBar.textColor }"
-                  >
-                    {{ diyStore.global.title }}
-                  </div>
-                </div>
-              </div>
-              <div
-                v-if="
-                  diyStore.global.topStatusBar.style == 'style-3' &&
-                  diyStore.global.topStatusBar.isShow
-                "
-                class="content-wrap"
-              >
-                <div
-                  class="title-wrap"
-                  v-if="diyStore.global.topStatusBar.imgUrl"
-                >
-                  <img
-                    class="max-w-[100%] max-h-[100%]"
-                    :src="img(diyStore.global.topStatusBar.imgUrl)"
-                  />
-                </div>
-                <div class="search">
-                  <span
-                    class="nc-iconfont nc-icon-sousuo-duanV6xx1 !text-[12px] absolute left-[10px]"
-                  ></span>
-                  <span class="text-[12px]">{{
-                    diyStore.global.topStatusBar.inputPlaceholder
-                  }}</span>
-                </div>
-              </div>
-              <div
-                v-if="
-                  diyStore.global.topStatusBar.style == 'style-4' &&
-                  diyStore.global.topStatusBar.isShow
-                "
-                class="content-wrap"
-              >
-                <span
-                  class="iconfont iconxiazai19 !text-[14px]"
-                  :style="{ color: diyStore.global.topStatusBar.textColor }"
-                ></span>
-                <div
-                  class="title-wrap"
-                  :style="{ color: diyStore.global.topStatusBar.textColor }"
-                >
-                  我的位置
-                </div>
-                <span
-                  class="iconfont iconxiangyoujiantou !text-[12px]"
-                  :style="{ color: diyStore.global.topStatusBar.textColor }"
-                ></span>
-              </div>
+    <div class="main-container flex-1">
+        <el-header class="flex items-center h-[60px] bg-primary px-[20px]">
+            <div class="text-white cursor-pointer flex items-center" @click="goBack">
+                <el-icon size="14">
+                    <ArrowLeft />
+                </el-icon>
+                <span class="pl-[5px] text-[14px]">{{ t('back') }}</span>
             </div>
-            <div class="preview-block relative">
-              <ul
-                class="quick-action absolute text-center -right-[70px] top-[20px] w-[42px] rounded shadow-md"
-              >
-                <el-tooltip
-                  effect="light"
-                  :content="t('moveUpComponent')"
-                  placement="right"
-                >
-                  <icon
-                    name="iconfont iconjiantoushang"
-                    size="20px"
-                    class="block cursor-pointer leading-[40px]"
-                    @click="diyStore.moveUpComponent"
-                  />
-                </el-tooltip>
-                <el-tooltip
-                  effect="light"
-                  :content="t('moveDownComponent')"
-                  placement="right"
-                >
-                  <icon
-                    name="iconfont iconjiantouxia"
-                    size="20px"
-                    class="block cursor-pointer leading-[40px]"
-                    @click="diyStore.moveDownComponent"
-                  />
-                </el-tooltip>
-                <el-tooltip
-                  effect="light"
-                  :content="t('copyComponent')"
-                  placement="right"
-                >
-                  <icon
-                    name="iconfont iconcopy-line"
-                    size="20px"
-                    class="block cursor-pointer leading-[40px]"
-                    @click="diyStore.copyComponent"
-                  />
-                </el-tooltip>
-                <el-tooltip
-                  effect="light"
-                  :content="t('delComponent')"
-                  placement="right"
-                >
-                  <icon
-                    name="iconfont icondelete-line"
-                    size="20px"
-                    class="block cursor-pointer leading-[40px]"
-                    @click="diyStore.delComponent"
-                  />
-                </el-tooltip>
-                <el-tooltip
-                  effect="light"
-                  :content="t('resetComponent')"
-                  placement="right"
-                >
-                  <icon
-                    name="iconfont iconloader-line"
-                    size="20px"
-                    class="block cursor-pointer leading-[40px]"
-                    @click="diyStore.resetComponent"
-                  />
-                </el-tooltip>
-              </ul>
-
-              <!-- 组件预览渲染区域 -->
-              <iframe
-                id="previewIframe"
-                v-show="loadingIframe"
-                :src="wapPreview"
-                frameborder="0"
-                class="preview-iframe w-[375px]"
-              ></iframe>
-
-              <div
-                v-show="loadingDev"
-                class="preview-iframe w-[375px] pt-[20px] px-[20px]"
-              >
-                <div class="font-bold text-xl mb-[40px]">
-                  {{ t('developTitle') }}
-                </div>
-                <div class="mb-[20px] flex flex-col">
-                  <text class="mb-[10px]">{{ t('wapDomain') }}</text>
-                  <el-input
-                    v-model.trim="wapDomain"
-                    :placeholder="t('wapDomainPlaceholder')"
-                    clearable
-                  />
-                </div>
-                <el-button type="primary" @click="saveWapDomain">{{
-                  t('confirm')
-                }}</el-button>
-                <el-button type="primary" @click="settingTips()" plain>{{
-                  t('settingTips')
-                }}</el-button>
-              </div>
+            <div class="text-white ml-[10px] mr-[20px] flex items-center">
+                <span class="mr-[5px] text-[rgba(255,255,255,.5)]">｜</span>
+                <span class="mr-[5px] text-[14px]">{{ t('decorating') }}：{{ diyStore.typeName }}</span>
             </div>
-          </div>
-        </el-scrollbar>
-      </div>
-
-      <div class="edit-attribute-wrap w-[400px]">
-        <!-- 编辑组件属性区域 -->
-        <el-scrollbar>
-          <el-card class="box-card" shadow="never">
-            <template #header>
-              <div class="card-header flex justify-between items-center">
-                <span class="title flex-1">{{
-                  diyStore.currentIndex == -99
-                    ? t('pageSet')
-                    : diyStore.editComponent.componentTitle
-                }}</span>
-                <div
-                  class="tab-wrap flex rounded-[50px] bg-gray-100 text-[14px]"
-                  v-if="diyStore.currentComponent"
-                >
-                  <span
-                    class="cursor-pointer rounded-[50px] py-[5px] px-[15px]"
-                    :class="{
-                      'bg-primary text-white': diyStore.editTab == 'content',
-                    }"
-                    @click="diyStore.editTab = 'content'"
-                    >{{ t('tabEditContent') }}</span
-                  >
-                  <span
-                    class="cursor-pointer rounded-[50px] py-[5px] px-[15px]"
-                    :class="{
-                      'bg-primary text-white': diyStore.editTab == 'style',
-                    }"
-                    @click="diyStore.editTab = 'style'"
-                    >{{ t('tabEditStyle') }}</span
-                  >
+
+<!--            v-if="diyStore.type && diyStore.type != 'DIY_FORM'"-->
+            <div class="flex items-center">
+                <span class="text-white mr-[10px] text-base">{{ t('templatePagePlaceholder') }}</span>
+                <div class="w-[180px]">
+                    <el-select size="small" v-model="template" :placeholder="t('templatePagePlaceholder')" @change="changeTemplatePage">
+                        <el-option :label="t('templatePageEmpty')" value="" />
+                        <el-option v-for="(item, key) in templatePages" :label="item.title" :value="key" :key="key"/>
+                    </el-select>
                 </div>
-              </div>
-            </template>
-
-            <div class="edit-component-wrap">
-              <component
-                v-if="diyStore.currentComponent"
-                :is="modules[diyStore.currentComponent]"
-                :key="diyStore.currentIndex"
-                :value="diyStore.value[diyStore.currentIndex]"
-              >
-                <template #content>
-                  <!-- 表单布局 页面设置 -->
-                  <div
-                    class="edit-attr-item-wrap"
-                    v-if="diyStore.currentComponent == 'edit-page'"
-                  >
-                    <h3 class="mb-[10px]">{{ t('formLayout') }}</h3>
-                    <el-form label-width="90px" class="px-[10px]">
-                      <el-form-item class="display-block">
-                        <template #label>
-                          <div class="flex items-center">
-                            <span class="mr-[3px]">{{ t('layoutStyle') }}</span>
-                            <el-tooltip effect="light" placement="top">
-                              <template #content>
-                                <h6 class="font-bold text-[13px] mb-[5px]">
-                                  {{ t('singleTiling') }}
-                                </h6>
-                                <p class="ml-[10px]">
-                                  {{ t('singleTilingTipsOne') }}
-                                </p>
-                                <p class="ml-[10px]">
-                                  {{ t('singleTilingTipsTwo') }}
-                                </p>
-                                <p class="ml-[10px]">
-                                  {{ t('singleTilingTipsThree') }}
-                                </p>
-                                <p class="ml-[10px]">
-                                  {{ t('singleTilingTipsFour') }}
-                                </p>
-
-                                <h6
-                                  class="font-bold text-[13px] mb-[5px] mt-[10px]"
-                                >
-                                  {{ t('arrangeSideBySide') }}
-                                </h6>
-                                <p class="ml-[10px]">
-                                  {{ t('arrangeSideBySideTipsOne') }}
-                                </p>
-                                <p class="ml-[10px]">
-                                  {{ t('arrangeSideBySideTipsTwo') }}
-                                </p>
-                              </template>
-                              <el-icon>
-                                <QuestionFilled color="#999999" />
-                              </el-icon>
-                            </el-tooltip>
-                          </div>
-                        </template>
-                        <el-radio-group
-                          v-model="diyStore.global.completeLayout"
-                          @change="completeLayoutChange"
-                        >
-                          <el-radio label="style-1">{{
-                            t('singleTiling')
-                          }}</el-radio>
-                          <el-radio label="style-2">{{
-                            t('arrangeSideBySide')
-                          }}</el-radio>
-                        </el-radio-group>
-                        <div class="text-sm text-gray-400">
-                          {{ t('layoutStyleTips') }}
+            </div>
+            <div class="flex-1"></div>
+            <el-button @click="preview()">{{ t('preview') }}</el-button>
+            <el-button @click="save()">{{ t('save') }}</el-button>
+        </el-header>
+
+        <div class="full-container flex flex-row flex-1 bg-page">
+
+            <div class="component-list w-[290px]">
+
+                <!-- 组件列表区域 -->
+                <el-scrollbar class="px-[10px]">
+                    <el-collapse v-model="activeNames" @change="handleChange">
+                        <el-collapse-item v-for="(item, key) in component" :key="key" :title="item.title" :name="key">
+                            <ul class="flex flex-row flex-wrap">
+                                <li v-for="(compItem, compKey) in item.list" :key="compKey" class="w-2/6 text-center cursor-pointer h-[65px]" :title="compItem.title" @click="diyStore.addComponent(compKey, compItem)">
+                                    <icon v-if="compItem.icon" :name="compItem.icon" size="20px" class="inline-block mt-[3px]" />
+                                    <icon v-else name="iconfont iconkaifazujian" size="20px" class="inline-block mt-[3px]" />
+                                    <span class="block text-[12px] truncate">{{ compItem.title }}</span>
+                                </li>
+                            </ul>
+                        </el-collapse-item>
+                    </el-collapse>
+                </el-scrollbar>
+
+            </div>
+
+            <div class="preview-wrap flex-1 relative mt-[20px]">
+
+                <el-scrollbar>
+                    <el-button class="page-btn absolute right-[20px]" @click="diyStore.changeCurrentIndex(-99)">{{ t('pageSet') }}</el-button>
+                    <div class="diy-view-wrap w-[375px] shadow-lg mx-auto">
+                        <div class="preview-head bg-no-repeat bg-center bg-cover cursor-pointer h-[64px]" :class="[diyStore.global.topStatusBar.style]" :style="{backgroundColor :diyStore.global.topStatusBar.bgColor}" @click="diyStore.changeCurrentIndex(-99)">
+                            <div v-if="diyStore.global.topStatusBar.style == 'style-1' && diyStore.global.topStatusBar.isShow" class="content-wrap">
+                                <div class="title-wrap" :style="{ fontSize: '14px', color: diyStore.global.topStatusBar.textColor, textAlign: diyStore.global.topStatusBar.textAlign }">
+                                    {{ diyStore.global.title }}
+                                </div>
+                            </div>
+                            <div v-if="diyStore.global.topStatusBar.style == 'style-2' && diyStore.global.topStatusBar.isShow" class="content-wrap">
+                                <div class="title-wrap" :style="{ color: diyStore.global.topStatusBar.textColor }">
+                                    <div class="h-[28px] max-w-[150px] mr-[8px]" v-if="diyStore.global.topStatusBar.imgUrl">
+                                        <img class="max-w-[100%] max-h-[100%]" :src="img(diyStore.global.topStatusBar.imgUrl)" mode="heightFix" />
+                                    </div>
+                                    <div :style="{ color: diyStore.global.topStatusBar.textColor }">{{ diyStore.global.title }}</div>
+                                </div>
+                            </div>
+                            <div v-if="diyStore.global.topStatusBar.style == 'style-3' && diyStore.global.topStatusBar.isShow" class="content-wrap">
+                                <div class="title-wrap" v-if="diyStore.global.topStatusBar.imgUrl">
+                                    <img class="max-w-[100%] max-h-[100%]" :src="img(diyStore.global.topStatusBar.imgUrl)" />
+                                </div>
+                                <div class="search">
+                                    <span class="nc-iconfont nc-icon-sousuo-duanV6xx1 !text-[12px] absolute left-[10px]"></span>
+                                    <span class="text-[12px]">{{diyStore.global.topStatusBar.inputPlaceholder}}</span>
+                                </div>
+                            </div>
+                            <div v-if="diyStore.global.topStatusBar.style == 'style-4' && diyStore.global.topStatusBar.isShow" class="content-wrap">
+                                <span class="iconfont iconxiazai19 !text-[14px]" :style="{ color: diyStore.global.topStatusBar.textColor }"></span>
+                                <div class="title-wrap" :style="{ color: diyStore.global.topStatusBar.textColor }">我的位置</div>
+                                <span class="iconfont iconxiangyoujiantou !text-[12px]" :style="{ color: diyStore.global.topStatusBar.textColor }"></span>
+                            </div>
                         </div>
-                      </el-form-item>
-                      <el-form-item
-                        :label="t('textAlign')"
-                        v-show="diyStore.global.completeLayout == 'style-2'"
-                      >
-                        <el-radio-group v-model="diyStore.global.completeAlign">
-                          <el-radio :label="'left'">{{
-                            t('textAlignLeft')
-                          }}</el-radio>
-                          <el-radio :label="'right'">{{
-                            t('textAlignRight')
-                          }}</el-radio>
-                        </el-radio-group>
-                      </el-form-item>
-                      <el-form-item
-                        :label="t('borderControl')"
-                        v-show="diyStore.global.completeLayout == 'style-2'"
-                      >
-                        <el-switch v-model="diyStore.global.borderControl" />
-                      </el-form-item>
-                    </el-form>
-                  </div>
-                </template>
-                <template #field>
-                  <!-- 表单组件 字段内容设置 -->
-                  <div
-                    class="edit-attr-item-wrap"
-                    v-if="diyStore.editComponent.componentType == 'diy_form'"
-                  >
-                    <h3 class="mb-[10px]">{{ t('fieleContent') }}</h3>
-                    <el-form label-width="100px" class="px-[10px]">
-                      <el-form-item :label="t('fieldName')">
-                        <el-input
-                          v-model.trim="diyStore.editComponent.field.name"
-                          :placeholder="t('fieldNamePlaceholder')"
-                          clearable
-                          :maxlength="inputMaxLength"
-                          show-word-limit
-                        />
-                      </el-form-item>
-                      <el-form-item :label="t('filedRemark')">
-                        <el-input
-                          v-model.trim="
-                            diyStore.editComponent.field.remark.text
-                          "
-                          :placeholder="t('fieldRemarkPlaceholder')"
-                          clearable
-                          maxlength="60"
-                          show-word-limit
-                        />
-                      </el-form-item>
-                    </el-form>
-                  </div>
-                </template>
-                <template #other>
-                  <!-- 表单组件 其他设置 -->
-                  <div
-                    class="edit-attr-item-wrap"
-                    v-if="diyStore.editComponent.componentType == 'diy_form'"
-                  >
-                    <h3 class="mb-[10px]">{{ t('otherSetting') }}</h3>
-                    <el-form label-width="100px" class="px-[10px]">
-                      <el-form-item :label="t('isRequired')">
-                        <el-switch
-                          v-model="diyStore.editComponent.field.required"
-                        />
-                      </el-form-item>
-                      <!--                                            <el-form-item>-->
-                      <!--                                                <template #label>-->
-                      <!--                                                    <div class="flex items-center">-->
-                      <!--                                                        <span class="mr-[3px]">{{ t('内容防重复') }}</span>-->
-                      <!--                                                        <el-tooltip effect="light" placement="top">-->
-                      <!--                                                            <template #content>-->
-                      <!--                                                                <p>该组件填写的内容不能与已提交的数据重复。</p>-->
-                      <!--                                                                <p>极端情况下可能存在延时导致限制失效。</p>-->
-                      <!--                                                                <p>不建议商品限时抢购等场景使用该功能。</p>-->
-                      <!--                                                            </template>-->
-                      <!--                                                            <el-icon>-->
-                      <!--                                                                <QuestionFilled color="#999999" />-->
-                      <!--                                                            </el-icon>-->
-                      <!--                                                        </el-tooltip>-->
-                      <!--                                                    </div>-->
-                      <!--                                                </template>-->
-                      <!--                                                <el-switch v-model="diyStore.editComponent.field.unique" />-->
-                      <!--                                            </el-form-item>-->
-                      <!--                                            <el-form-item>-->
-                      <!--                                                <template #label>-->
-                      <!--                                                    <div class="flex items-center">-->
-                      <!--                                                        <span class="mr-[3px]">{{ t('自动填充') }}</span>-->
-                      <!--                                                        <el-tooltip effect="light" placement="top">-->
-                      <!--                                                            <template #content>-->
-                      <!--                                                                <div class="max-w-[250px]">自动填充上次填写的内容，填表人填写表单时，会自动填入他上次填写的内容，提高填表效率。</div>-->
-                      <!--                                                            </template>-->
-                      <!--                                                            <el-icon>-->
-                      <!--                                                                <QuestionFilled color="#999999" />-->
-                      <!--                                                            </el-icon>-->
-                      <!--                                                        </el-tooltip>-->
-                      <!--                                                    </div>-->
-                      <!--                                                </template>-->
-                      <!--                                                <el-switch v-model="diyStore.editComponent.field.autofill" />-->
-                      <!--                                            </el-form-item>-->
-                      <el-form-item>
-                        <template #label>
-                          <div class="flex items-center">
-                            <span class="mr-[3px]">{{ t('hideControl') }}</span>
-                            <el-tooltip effect="light" placement="top">
-                              <template #content>
-                                <p>{{ t('hideControlTipsOne') }}</p>
-                                <p>{{ t('hideControlTipsTwo') }}</p>
-                              </template>
-                              <el-icon>
-                                <QuestionFilled color="#999999" />
-                              </el-icon>
-                            </el-tooltip>
-                          </div>
-                        </template>
-                        <el-switch v-model="diyStore.editComponent.isHidden" />
-                      </el-form-item>
-                    </el-form>
-                  </div>
-                </template>
-                <template #style-field>
-                  <!-- 表单组件 字段样式设置 -->
-                  <template
-                    v-if="diyStore.editComponent.componentType == 'diy_form'"
-                  >
-                    <div class="edit-attr-item-wrap">
-                      <h3 class="mb-[10px]">{{ t('textStyle') }}</h3>
-                      <el-form label-width="80px" class="px-[10px]">
-                        <el-form-item :label="t('textFontSize')">
-                          <el-slider
-                            v-model="diyStore.editComponent.fontSize"
-                            show-input
-                            size="small"
-                            class="ml-[10px] diy-nav-slider"
-                            :min="12"
-                            :max="18"
-                          />
-                        </el-form-item>
-                        <el-form-item :label="t('textFontWeight')">
-                          <el-radio-group
-                            v-model="diyStore.editComponent.fontWeight"
-                          >
-                            <el-radio :label="'normal'">{{
-                              t('fontWeightNormal')
-                            }}</el-radio>
-                            <el-radio :label="'bold'">{{
-                              t('fontWeightBold')
-                            }}</el-radio>
-                          </el-radio-group>
-                        </el-form-item>
-                        <el-form-item :label="t('textColor')">
-                          <el-color-picker
-                            v-model="diyStore.editComponent.textColor"
-                          />
-                        </el-form-item>
-                      </el-form>
-                    </div>
+                        <div class="preview-block relative">
+
+                            <ul class="quick-action absolute text-center -right-[70px] top-[20px] w-[42px] rounded shadow-md">
+                                <el-tooltip effect="light" :content="t('moveUpComponent')" placement="right">
+                                    <icon name="iconfont iconjiantoushang" size="20px" class="block cursor-pointer leading-[40px]" @click="diyStore.moveUpComponent" />
+                                </el-tooltip>
+                                <el-tooltip effect="light" :content="t('moveDownComponent')" placement="right">
+                                    <icon name="iconfont iconjiantouxia" size="20px" class="block cursor-pointer leading-[40px]" @click="diyStore.moveDownComponent" />
+                                </el-tooltip>
+                                <el-tooltip effect="light" :content="t('copyComponent')" placement="right">
+                                    <icon name="iconfont iconcopy-line" size="20px" class="block cursor-pointer leading-[40px]" @click="diyStore.copyComponent" />
+                                </el-tooltip>
+                                <el-tooltip effect="light" :content="t('delComponent')" placement="right">
+                                    <icon name="iconfont icondelete-line" size="20px" class="block cursor-pointer leading-[40px]" @click="diyStore.delComponent" />
+                                </el-tooltip>
+                                <el-tooltip effect="light" :content="t('resetComponent')" placement="right">
+                                    <icon name="iconfont iconloader-line" size="20px" class="block cursor-pointer leading-[40px]" @click="diyStore.resetComponent" />
+                                </el-tooltip>
+                            </ul>
+
+                            <!-- 组件预览渲染区域 -->
+                            <iframe id="previewIframe" v-show="loadingIframe" :src="wapPreview" frameborder="0" class="preview-iframe w-[375px]"></iframe>
+
+                            <div v-show="loadingDev" class="preview-iframe w-[375px] pt-[20px] px-[20px]">
+                                <div class="font-bold text-xl mb-[40px]">{{ t('developTitle') }}</div>
+                                <div class="mb-[20px] flex flex-col">
+                                    <text class="mb-[10px]">{{ t('wapDomain') }}</text>
+                                    <el-input v-model.trim="wapDomain" :placeholder="t('wapDomainPlaceholder')" clearable />
+                                </div>
+                                <el-button type="primary" @click="saveWapDomain">{{ t('confirm') }}</el-button>
+                                <el-button type="primary" @click="settingTips()" plain>{{ t('settingTips') }}</el-button>
+                            </div>
 
-                    <div class="edit-attr-item-wrap">
-                      <h3 class="mb-[10px]">{{ t('filedRemarkStyle') }}</h3>
-                      <el-form label-width="80px" class="px-[10px]">
-                        <el-form-item :label="t('textFontSize')">
-                          <el-slider
-                            v-model="
-                              diyStore.editComponent.field.remark.fontSize
-                            "
-                            show-input
-                            size="small"
-                            class="ml-[10px] diy-nav-slider"
-                            :min="12"
-                            :max="18"
-                          />
-                        </el-form-item>
-                        <el-form-item :label="t('textColor')">
-                          <el-color-picker
-                            v-model="diyStore.editComponent.field.remark.color"
-                          />
-                        </el-form-item>
-                      </el-form>
+                        </div>
                     </div>
-                  </template>
-                </template>
-                <template #style>
-                  <div class="edit-attr-item-wrap">
-                    <h3 class="mb-[10px]">{{ t('componentStyleTitle') }}</h3>
-                    <el-form label-width="90px" class="px-[10px]">
-                      <template
-                        v-if="
-                          diyStore.editComponent.ignore.indexOf(
-                            'pageBgColor'
-                          ) == -1
-                        "
-                      >
-                        <el-form-item :label="t('bottomBgColor')">
-                          <el-color-picker
-                            v-model="diyStore.editComponent.pageStartBgColor"
-                            show-alpha
-                            :predefine="diyStore.predefineColors"
-                          />
-                          <icon
-                            name="iconfont iconmap-connect"
-                            size="20px"
-                            class="block !text-gray-400 mx-[5px]"
-                          />
-                          <el-color-picker
-                            v-model="diyStore.editComponent.pageEndBgColor"
-                            show-alpha
-                            :predefine="diyStore.predefineColors"
-                          />
-                        </el-form-item>
-                        <div class="text-sm text-gray-400 ml-[90px] mb-[10px]">
-                          {{ t('bottomBgTips') }}
+                </el-scrollbar>
+
+            </div>
+
+            <div class="edit-attribute-wrap w-[400px]">
+
+                <!-- 编辑组件属性区域 -->
+                <el-scrollbar>
+                    <el-card class="box-card" shadow="never">
+                        <template #header>
+                            <div class="card-header flex justify-between items-center">
+                                <span class="title flex-1">{{ diyStore.currentIndex == -99 ? t('pageSet') : diyStore.editComponent.componentTitle }}</span>
+                                <div class="tab-wrap flex rounded-[50px] bg-gray-100 text-[14px]" v-if="diyStore.currentComponent">
+                                    <span class="cursor-pointer rounded-[50px] py-[5px] px-[15px]" :class="{ 'bg-primary text-white': diyStore.editTab == 'content' }" @click="diyStore.editTab = 'content'">{{ t('tabEditContent') }}</span>
+                                    <span class="cursor-pointer rounded-[50px] py-[5px] px-[15px]" :class="{ 'bg-primary text-white': diyStore.editTab == 'style' }" @click="diyStore.editTab = 'style'">{{ t('tabEditStyle') }}</span>
+                                </div>
+                            </div>
+                        </template>
+
+                        <div class="edit-component-wrap">
+
+                            <component v-if="diyStore.currentComponent" :is="modules[diyStore.currentComponent]" :key="diyStore.currentIndex" :value="diyStore.value[diyStore.currentIndex]">
+                                <template #content>
+                                    <!-- 表单布局 页面设置 -->
+                                    <div class="edit-attr-item-wrap" v-if="diyStore.currentComponent == 'edit-page'">
+                                        <h3 class="mb-[10px]">{{ t('formLayout') }}</h3>
+                                        <el-form label-width="90px" class="px-[10px]">
+                                            <el-form-item class="display-block">
+                                                <template #label>
+                                                    <div class="flex items-center">
+                                                        <span class="mr-[3px]">{{ t('layoutStyle') }}</span>
+                                                        <el-tooltip effect="light" placement="top">
+                                                            <template #content>
+                                                                <h6 class="font-bold text-[13px] mb-[5px]">{{ t('singleTiling') }}</h6>
+                                                                <p class="ml-[10px]">{{ t('singleTilingTipsOne') }}</p>
+                                                                <p class="ml-[10px]">{{ t('singleTilingTipsTwo') }}</p>
+                                                                <p class="ml-[10px]">{{ t('singleTilingTipsThree') }}</p>
+                                                                <p class="ml-[10px]">{{ t('singleTilingTipsFour') }}</p>
+
+                                                                <h6 class="font-bold text-[13px] mb-[5px] mt-[10px]">{{ t('arrangeSideBySide') }}</h6>
+                                                                <p class="ml-[10px]">{{ t('arrangeSideBySideTipsOne') }}</p>
+                                                                <p class="ml-[10px]">{{ t('arrangeSideBySideTipsTwo') }}</p>
+                                                            </template>
+                                                            <el-icon>
+                                                                <QuestionFilled color="#999999" />
+                                                            </el-icon>
+                                                        </el-tooltip>
+                                                    </div>
+                                                </template>
+                                                <el-radio-group v-model="diyStore.global.completeLayout" @change="completeLayoutChange">
+                                                    <el-radio label="style-1">{{ t('singleTiling') }}</el-radio>
+                                                    <el-radio label="style-2">{{ t('arrangeSideBySide') }}</el-radio>
+                                                </el-radio-group>
+                                                <div class="text-sm text-gray-400">{{ t('layoutStyleTips') }}</div>
+                                            </el-form-item>
+                                            <el-form-item :label="t('textAlign')" v-show="diyStore.global.completeLayout == 'style-2'">
+                                                <el-radio-group v-model="diyStore.global.completeAlign">
+                                                    <el-radio :label="'left'">{{ t('textAlignLeft') }}</el-radio>
+                                                    <el-radio :label="'right'">{{ t('textAlignRight') }}</el-radio>
+                                                </el-radio-group>
+                                            </el-form-item>
+                                            <el-form-item :label="t('borderControl')" v-show="diyStore.global.completeLayout == 'style-2'">
+                                                <el-switch v-model="diyStore.global.borderControl" />
+                                            </el-form-item>
+                                        </el-form>
+                                    </div>
+                                </template>
+                                <template #field>
+                                    <!-- 表单组件 字段内容设置 -->
+                                    <div class="edit-attr-item-wrap" v-if="diyStore.editComponent.componentType == 'diy_form'">
+                                        <h3 class="mb-[10px]">{{ t('fieleContent') }}</h3>
+                                        <el-form label-width="100px" class="px-[10px]">
+                                            <el-form-item :label="t('fieldName')">
+                                                <el-input v-model.trim="diyStore.editComponent.field.name" :placeholder="t('fieldNamePlaceholder')" clearable :maxlength="inputMaxLength" show-word-limit />
+                                            </el-form-item>
+                                            <el-form-item :label="t('filedRemark')">
+                                                <el-input v-model.trim="diyStore.editComponent.field.remark.text" :placeholder="t('fieldRemarkPlaceholder')" clearable maxlength="60" show-word-limit />
+                                            </el-form-item>
+                                        </el-form>
+                                    </div>
+                                </template>
+                                <template #other>
+                                    <!-- 表单组件 其他设置 -->
+                                    <div class="edit-attr-item-wrap" v-if="diyStore.editComponent.componentType == 'diy_form'">
+                                        <h3 class="mb-[10px]">{{ t('otherSetting') }}</h3>
+                                        <el-form label-width="100px" class="px-[10px]">
+                                            <el-form-item :label="t('isRequired')">
+                                                <el-switch v-model="diyStore.editComponent.field.required" />
+                                            </el-form-item>
+<!--                                            <el-form-item>-->
+<!--                                                <template #label>-->
+<!--                                                    <div class="flex items-center">-->
+<!--                                                        <span class="mr-[3px]">{{ t('内容防重复') }}</span>-->
+<!--                                                        <el-tooltip effect="light" placement="top">-->
+<!--                                                            <template #content>-->
+<!--                                                                <p>该组件填写的内容不能与已提交的数据重复。</p>-->
+<!--                                                                <p>极端情况下可能存在延时导致限制失效。</p>-->
+<!--                                                                <p>不建议商品限时抢购等场景使用该功能。</p>-->
+<!--                                                            </template>-->
+<!--                                                            <el-icon>-->
+<!--                                                                <QuestionFilled color="#999999" />-->
+<!--                                                            </el-icon>-->
+<!--                                                        </el-tooltip>-->
+<!--                                                    </div>-->
+<!--                                                </template>-->
+<!--                                                <el-switch v-model="diyStore.editComponent.field.unique" />-->
+<!--                                            </el-form-item>-->
+<!--                                            <el-form-item>-->
+<!--                                                <template #label>-->
+<!--                                                    <div class="flex items-center">-->
+<!--                                                        <span class="mr-[3px]">{{ t('自动填充') }}</span>-->
+<!--                                                        <el-tooltip effect="light" placement="top">-->
+<!--                                                            <template #content>-->
+<!--                                                                <div class="max-w-[250px]">自动填充上次填写的内容，填表人填写表单时，会自动填入他上次填写的内容，提高填表效率。</div>-->
+<!--                                                            </template>-->
+<!--                                                            <el-icon>-->
+<!--                                                                <QuestionFilled color="#999999" />-->
+<!--                                                            </el-icon>-->
+<!--                                                        </el-tooltip>-->
+<!--                                                    </div>-->
+<!--                                                </template>-->
+<!--                                                <el-switch v-model="diyStore.editComponent.field.autofill" />-->
+<!--                                            </el-form-item>-->
+                                            <el-form-item>
+                                                <template #label>
+                                                    <div class="flex items-center">
+                                                        <span class="mr-[3px]">{{ t('hideControl') }}</span>
+                                                        <el-tooltip effect="light" placement="top">
+                                                            <template #content>
+                                                                <p>{{ t('hideControlTipsOne') }}</p>
+                                                                <p>{{ t('hideControlTipsTwo') }}</p>
+                                                            </template>
+                                                            <el-icon>
+                                                                <QuestionFilled color="#999999" />
+                                                            </el-icon>
+                                                        </el-tooltip>
+                                                    </div>
+                                                </template>
+                                                <el-switch v-model="diyStore.editComponent.isHidden" />
+                                            </el-form-item>
+                                        </el-form>
+                                    </div>
+                                </template>
+                                <template #style-field>
+                                    <!-- 表单组件 字段样式设置 -->
+                                    <template v-if="diyStore.editComponent.componentType == 'diy_form'">
+                                        <div class="edit-attr-item-wrap">
+                                            <h3 class="mb-[10px]">{{ t('textStyle') }}</h3>
+                                            <el-form label-width="80px" class="px-[10px]">
+                                                <el-form-item :label="t('textFontSize')">
+                                                    <el-slider v-model="diyStore.editComponent.fontSize" show-input size="small" class="ml-[10px] diy-nav-slider" :min="12" :max="18" />
+                                                </el-form-item>
+                                                <el-form-item :label="t('textFontWeight')">
+                                                    <el-radio-group v-model="diyStore.editComponent.fontWeight">
+                                                        <el-radio :label="'normal'">{{ t('fontWeightNormal') }}</el-radio>
+                                                        <el-radio :label="'bold'">{{ t('fontWeightBold') }}</el-radio>
+                                                    </el-radio-group>
+                                                </el-form-item>
+                                                <el-form-item :label="t('textColor')">
+                                                    <el-color-picker v-model="diyStore.editComponent.textColor" />
+                                                </el-form-item>
+                                            </el-form>
+                                        </div>
+
+                                        <div class="edit-attr-item-wrap">
+                                            <h3 class="mb-[10px]">{{ t('filedRemarkStyle') }}</h3>
+                                            <el-form label-width="80px" class="px-[10px]">
+                                                <el-form-item :label="t('textFontSize')">
+                                                    <el-slider v-model="diyStore.editComponent.field.remark.fontSize" show-input size="small" class="ml-[10px] diy-nav-slider" :min="12" :max="18" />
+                                                </el-form-item>
+                                                <el-form-item :label="t('textColor')">
+                                                    <el-color-picker v-model="diyStore.editComponent.field.remark.color" />
+                                                </el-form-item>
+                                            </el-form>
+                                        </div>
+                                    </template>
+                                </template>
+                                <template #style>
+                                    <div class="edit-attr-item-wrap">
+                                        <h3 class="mb-[10px]">{{ t('componentStyleTitle') }}</h3>
+                                        <el-form label-width="90px" class="px-[10px]">
+
+                                            <template v-if="diyStore.editComponent.ignore.indexOf('pageBgColor') == -1">
+                                                <el-form-item :label="t('bottomBgColor')">
+                                                    <el-color-picker v-model="diyStore.editComponent.pageStartBgColor" show-alpha :predefine="diyStore.predefineColors" />
+                                                    <icon name="iconfont iconmap-connect" size="20px" class="block !text-gray-400 mx-[5px]"/>
+                                                    <el-color-picker v-model="diyStore.editComponent.pageEndBgColor" show-alpha :predefine="diyStore.predefineColors" />
+                                                </el-form-item>
+                                                <div class="text-sm text-gray-400 ml-[90px] mb-[10px]">{{ t('bottomBgTips') }}</div>
+                                            </template>
+
+                                            <el-form-item :label="t('bgGradientAngle')" v-if="diyStore.editComponent.ignore.indexOf('pageBgColor') == -1">
+                                                <el-radio-group v-model="diyStore.editComponent.pageGradientAngle">
+                                                    <el-radio label="to bottom">{{ t('topToBottom') }}</el-radio>
+                                                    <el-radio label="to right">{{ t('leftToRight') }}</el-radio>
+                                                </el-radio-group>
+                                            </el-form-item>
+
+                                            <el-form-item :label="t('componentBgUrl')" v-if="diyStore.editComponent.ignore.indexOf('componentBgUrl') == -1">
+                                                <upload-image v-model="diyStore.editComponent.componentBgUrl" :limit="1"/>
+                                            </el-form-item>
+
+                                            <el-form-item :label="t('componentBgAlpha')" v-if="diyStore.editComponent.ignore.indexOf('componentBgUrl') == -1 && diyStore.editComponent.componentBgUrl">
+                                                <el-slider v-model="diyStore.editComponent.componentBgAlpha" show-input size="small" :min="0" :max="10" class="ml-[10px] diy-nav-slider" />
+                                            </el-form-item>
+
+                                            <el-form-item :label="t('componentBgColor')" v-if="diyStore.editComponent.ignore.indexOf('componentBgColor') == -1">
+                                                <el-color-picker v-model="diyStore.editComponent.componentStartBgColor" show-alpha :predefine="diyStore.predefineColors" />
+                                                <icon name="iconfont iconmap-connect" size="20px" class="block !text-gray-400 mx-[5px]"/>
+                                                <el-color-picker v-model="diyStore.editComponent.componentEndBgColor" show-alpha :predefine="diyStore.predefineColors" />
+                                            </el-form-item>
+
+                                            <el-form-item :label="t('bgGradientAngle')" v-if="diyStore.editComponent.ignore.indexOf('componentBgColor') == -1">
+                                                <el-radio-group v-model="diyStore.editComponent.componentGradientAngle">
+                                                    <el-radio label="to bottom">{{ t('topToBottom') }}</el-radio>
+                                                    <el-radio label="to right">{{ t('leftToRight') }}</el-radio>
+                                                </el-radio-group>
+                                            </el-form-item>
+
+                                            <el-form-item :label="t('marginTop')" v-if="diyStore.editComponent.ignore.indexOf('marginTop') == -1">
+                                                <el-slider v-model="diyStore.editComponent.margin.top" show-input size="small" :min="-100" class="ml-[10px] diy-nav-slider" />
+                                            </el-form-item>
+                                            <el-form-item :label="t('marginBottom')" v-if="diyStore.editComponent.ignore.indexOf('marginBottom') == -1">
+                                                <el-slider v-model="diyStore.editComponent.margin.bottom" show-input size="small" class="ml-[10px] diy-nav-slider" />
+                                            </el-form-item>
+                                            <el-form-item :label="t('marginBoth')" v-if="diyStore.editComponent.ignore.indexOf('marginBoth') == -1">
+                                                <el-slider v-model="diyStore.editComponent.margin.both" show-input size="small" class="ml-[10px] diy-nav-slider" />
+                                            </el-form-item>
+                                            <el-form-item :label="t('topRounded')" v-if="diyStore.editComponent.ignore.indexOf('topRounded') == -1">
+                                                <el-slider v-model="diyStore.editComponent.topRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="100" />
+                                            </el-form-item>
+                                            <el-form-item :label="t('bottomRounded')" v-if="diyStore.editComponent.ignore.indexOf('bottomRounded') == -1">
+                                                <el-slider v-model="diyStore.editComponent.bottomRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="100" />
+                                            </el-form-item>
+                                        </el-form>
+                                    </div>
+                                </template>
+                            </component>
+
                         </div>
-                      </template>
-
-                      <el-form-item
-                        :label="t('bgGradientAngle')"
-                        v-if="
-                          diyStore.editComponent.ignore.indexOf(
-                            'pageBgColor'
-                          ) == -1
-                        "
-                      >
-                        <el-radio-group
-                          v-model="diyStore.editComponent.pageGradientAngle"
-                        >
-                          <el-radio label="to bottom">{{
-                            t('topToBottom')
-                          }}</el-radio>
-                          <el-radio label="to right">{{
-                            t('leftToRight')
-                          }}</el-radio>
-                        </el-radio-group>
-                      </el-form-item>
-
-                      <el-form-item
-                        :label="t('componentBgUrl')"
-                        v-if="
-                          diyStore.editComponent.ignore.indexOf(
-                            'componentBgUrl'
-                          ) == -1
-                        "
-                      >
-                        <upload-image
-                          v-model="diyStore.editComponent.componentBgUrl"
-                          :limit="1"
-                        />
-                      </el-form-item>
-
-                      <el-form-item
-                        :label="t('componentBgAlpha')"
-                        v-if="
-                          diyStore.editComponent.ignore.indexOf(
-                            'componentBgUrl'
-                          ) == -1 && diyStore.editComponent.componentBgUrl
-                        "
-                      >
-                        <el-slider
-                          v-model="diyStore.editComponent.componentBgAlpha"
-                          show-input
-                          size="small"
-                          :min="0"
-                          :max="10"
-                          class="ml-[10px] diy-nav-slider"
-                        />
-                      </el-form-item>
-
-                      <el-form-item
-                        :label="t('componentBgColor')"
-                        v-if="
-                          diyStore.editComponent.ignore.indexOf(
-                            'componentBgColor'
-                          ) == -1
-                        "
-                      >
-                        <el-color-picker
-                          v-model="diyStore.editComponent.componentStartBgColor"
-                          show-alpha
-                          :predefine="diyStore.predefineColors"
-                        />
-                        <icon
-                          name="iconfont iconmap-connect"
-                          size="20px"
-                          class="block !text-gray-400 mx-[5px]"
-                        />
-                        <el-color-picker
-                          v-model="diyStore.editComponent.componentEndBgColor"
-                          show-alpha
-                          :predefine="diyStore.predefineColors"
-                        />
-                      </el-form-item>
-
-                      <el-form-item
-                        :label="t('bgGradientAngle')"
-                        v-if="
-                          diyStore.editComponent.ignore.indexOf(
-                            'componentBgColor'
-                          ) == -1
-                        "
-                      >
-                        <el-radio-group
-                          v-model="
-                            diyStore.editComponent.componentGradientAngle
-                          "
-                        >
-                          <el-radio label="to bottom">{{
-                            t('topToBottom')
-                          }}</el-radio>
-                          <el-radio label="to right">{{
-                            t('leftToRight')
-                          }}</el-radio>
-                        </el-radio-group>
-                      </el-form-item>
-
-                      <el-form-item
-                        :label="t('marginTop')"
-                        v-if="
-                          diyStore.editComponent.ignore.indexOf('marginTop') ==
-                          -1
-                        "
-                      >
-                        <el-slider
-                          v-model="diyStore.editComponent.margin.top"
-                          show-input
-                          size="small"
-                          :min="-100"
-                          class="ml-[10px] diy-nav-slider"
-                        />
-                      </el-form-item>
-                      <el-form-item
-                        :label="t('marginBottom')"
-                        v-if="
-                          diyStore.editComponent.ignore.indexOf(
-                            'marginBottom'
-                          ) == -1
-                        "
-                      >
-                        <el-slider
-                          v-model="diyStore.editComponent.margin.bottom"
-                          show-input
-                          size="small"
-                          class="ml-[10px] diy-nav-slider"
-                        />
-                      </el-form-item>
-                      <el-form-item
-                        :label="t('marginBoth')"
-                        v-if="
-                          diyStore.editComponent.ignore.indexOf('marginBoth') ==
-                          -1
-                        "
-                      >
-                        <el-slider
-                          v-model="diyStore.editComponent.margin.both"
-                          show-input
-                          size="small"
-                          class="ml-[10px] diy-nav-slider"
-                        />
-                      </el-form-item>
-                      <el-form-item
-                        :label="t('topRounded')"
-                        v-if="
-                          diyStore.editComponent.ignore.indexOf('topRounded') ==
-                          -1
-                        "
-                      >
-                        <el-slider
-                          v-model="diyStore.editComponent.topRounded"
-                          show-input
-                          size="small"
-                          class="ml-[10px] diy-nav-slider"
-                          :max="100"
-                        />
-                      </el-form-item>
-                      <el-form-item
-                        :label="t('bottomRounded')"
-                        v-if="
-                          diyStore.editComponent.ignore.indexOf(
-                            'bottomRounded'
-                          ) == -1
-                        "
-                      >
-                        <el-slider
-                          v-model="diyStore.editComponent.bottomRounded"
-                          show-input
-                          size="small"
-                          class="ml-[10px] diy-nav-slider"
-                          :max="100"
-                        />
-                      </el-form-item>
-                    </el-form>
-                  </div>
-                </template>
-              </component>
+
+                    </el-card>
+                </el-scrollbar>
+
             </div>
-          </el-card>
-        </el-scrollbar>
-      </div>
+
+        </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
 import { ref, reactive, toRaw, watch, inject, computed } from 'vue'
 import { t } from '@/lang'
 import { img } from '@/utils/common'
-import {
-  getDiyTemplatePages,
-  addDiyForm,
-  editDiyForm,
-  initPage,
-} from '@/app/api/diy_form'
+import { getDiyTemplatePages, addDiyForm, editDiyForm, initPage } from '@/app/api/diy_form'
 import { useRoute, useRouter } from 'vue-router'
 import { cloneDeep } from 'lodash-es'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -826,8 +390,8 @@ route.query.type = route.query.type || '' // 表单类型
 route.query.back = route.query.back || '/admin/diy_form/list'
 
 const backPath = route.query.back
-const template = ref('')
-const oldTemplate = ref('')
+const template = ref('');
+const oldTemplate = ref('');
 const wapUrl = ref('')
 const wapDomain = ref('')
 const wapPreview = ref('')
@@ -842,636 +406,616 @@ const componentType: string[] = reactive([])
 const page = ref('/app/pages/index/diy_form')
 
 const activeNames = ref(componentType)
-const handleChange = (val: string[]) => {}
+const handleChange = (val: string[]) => {
+}
 
 // 初始化原数据
 const originData = reactive({
-  form_id: diyStore.id,
-  name: diyStore.name,
-  pageTitle: diyStore.pageTitle,
-  title: diyStore.global.title,
-  value: JSON.stringify({
-    global: toRaw(diyStore.global),
-    value: toRaw(diyStore.value),
-  }),
+    form_id: diyStore.id,
+    name: diyStore.name,
+    pageTitle: diyStore.pageTitle,
+    title: diyStore.global.title,
+    value: JSON.stringify({
+        global: toRaw(diyStore.global),
+        value: toRaw(diyStore.value)
+    })
 })
 
 // input框长度
 const inputMaxLength = computed(() => {
-  let len = 15
-  if (diyStore.global.completeLayout == 'style-2') {
-    len = 5
-    diyStore.editComponent.field.name = diyStore.editComponent.field.name.slice(
-      0,
-      5
-    )
-  }
-  return len
+    let len = 15;
+    if(diyStore.global.completeLayout == "style-2"){
+        len = 5;
+        diyStore.editComponent.field.name = diyStore.editComponent.field.name.slice(0,5)
+    }
+    return len;
 })
 
 // 返回上一页
 const isChange = ref(true) // 数据是否发生变化，true：没变化，false：变化了
 const goBack = () => {
-  if (isChange.value) {
-    location.href = `${location.origin}${backPath}`
-    router.push(backPath)
-  } else {
-    // 数据发生变化，弹框提示：确定离开此页面
-    ElMessageBox.confirm(t('leavePageTitleTips'), t('leavePageContentTips'), {
-      confirmButtonText: t('confirm'),
-      cancelButtonText: t('cancel'),
-      type: 'warning',
-      autofocus: false,
-    })
-      .then(() => {
-        location.href = `${location.origin}${backPath}`
-      })
-      .catch(() => {})
-  }
+    if (isChange.value) {
+        location.href = `${location.origin}${backPath}`;
+        router.push(backPath)
+    } else {
+        // 数据发生变化，弹框提示：确定离开此页面
+        ElMessageBox.confirm(
+            t('leavePageTitleTips'),
+            t('leavePageContentTips'),
+            {
+                confirmButtonText: t('confirm'),
+                cancelButtonText: t('cancel'),
+                type: 'warning',
+                autofocus: false
+            }
+        ).then(() => {
+            location.href = `${location.origin}${backPath}`;
+        }).catch(() => {
+        })
+    }
 }
 
 // 动态加载后台表单组件编辑
 const modulesFiles = import.meta.glob('./components/*.vue', { eager: true })
-const addonModulesFiles = import.meta.glob(
-  '@/addon/**/views/diy_form/components/*.vue',
-  { eager: true }
-)
+const addonModulesFiles = import.meta.glob('@/addon/**/views/diy_form/components/*.vue', { eager: true })
 addonModulesFiles && Object.assign(modulesFiles, addonModulesFiles)
 
 // 动态加载后台自定义组件编辑
-const diyModulesFiles = import.meta.glob('../diy/components/*.vue', {
-  eager: true,
-})
-const diyAddonModulesFiles = import.meta.glob(
-  '@/addon/**/views/diy/components/*.vue',
-  { eager: true }
-)
+const diyModulesFiles = import.meta.glob('../diy/components/*.vue', { eager: true })
+const diyAddonModulesFiles = import.meta.glob('@/addon/**/views/diy/components/*.vue', { eager: true })
 diyModulesFiles && Object.assign(modulesFiles, diyModulesFiles)
 diyAddonModulesFiles && Object.assign(modulesFiles, diyAddonModulesFiles)
 
 const modules = {}
 for (const [key, value] of Object.entries(modulesFiles)) {
-  const moduleName = key.split('/').pop()
-  const name = moduleName.split('.')[0]
-  modules[name] = value.default
+    const moduleName = key.split('/').pop()
+    const name = moduleName.split('.')[0]
+    modules[name] = value.default
 }
 
 // 获取模板页面列表
 const templatePages: any = reactive({})
 
-const loadDiyTemplatePages = (type: any) => {
-  getDiyTemplatePages({
-    type,
-  }).then((res) => {
-    for (const key in res.data) {
-      templatePages[key] = res.data[key]
-    }
-  })
+const loadDiyTemplatePages = (type:any)=>{
+    getDiyTemplatePages({
+        type
+    }).then(res => {
+        for (const key in res.data) {
+            templatePages[key] = res.data[key];
+        }
+    });
 }
 
 // 全局监听自定义数据变化
 watch(
-  () => template.value,
-  (newValue, oldValue) => {
-    oldTemplate.value = oldValue
-  }
+    () => template.value,
+    (newValue, oldValue) => {
+        oldTemplate.value = oldValue;
+    }
 )
 
 // 切换模板页面
-const changeTemplatePage = (value: any) => {
-  // 存在数据则弹框提示确认
-  if (diyStore.value.length) {
-    ElMessageBox.confirm(t('changeTemplatePageTips'), t('warning'), {
-      confirmButtonText: t('confirm'),
-      cancelButtonText: t('cancel'),
-      type: 'warning',
-    })
-      .then(() => {
-        diyStore.changeCurrentIndex(-99)
-        diyStore.init() // 清空
+const changeTemplatePage = (value:any)=> {
+    // 存在数据则弹框提示确认
+    if (diyStore.value.length) {
+        ElMessageBox.confirm(t('changeTemplatePageTips'), t('warning'), {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }).then(() => {
+            diyStore.changeCurrentIndex(-99)
+            diyStore.init(); // 清空
+            if (value) {
+                let data = cloneDeep(templatePages[value].data);
+                diyStore.global = data.global;
+                if (data.value.length) {
+                    diyStore.value = data.value
+                }
+            } else {
+                // if (route.query.title) diyStore.global.title = diyStore.typeName // todo 考虑是否需要
+            }
+        }).catch(() => {
+            // 还原
+            template.value = oldTemplate.value;
+        });
+    } else {
+        diyStore.init(); // 清空
         if (value) {
-          let data = cloneDeep(templatePages[value].data)
-          diyStore.global = data.global
-          if (data.value.length) {
-            diyStore.value = data.value
-          }
+            let data = cloneDeep(templatePages[value].data);
+            diyStore.global = data.global;
+            if (data.value.length) {
+                diyStore.value = data.value
+            }
         } else {
-          // if (route.query.title) diyStore.global.title = diyStore.typeName // todo 考虑是否需要
+            // if (route.query.title) diyStore.global.title = diyStore.typeName // todo 考虑是否需要
         }
-      })
-      .catch(() => {
-        // 还原
-        template.value = oldTemplate.value
-      })
-  } else {
-    diyStore.init() // 清空
-    if (value) {
-      let data = cloneDeep(templatePages[value].data)
-      diyStore.global = data.global
-      if (data.value.length) {
-        diyStore.value = data.value
-      }
-    } else {
-      // if (route.query.title) diyStore.global.title = diyStore.typeName // todo 考虑是否需要
     }
-  }
-}
+};
 
 // 全局监听自定义数据变化
 watch(
-  () => diyStore,
-  (newValue, oldValue) => {
-    const data = {
-      form_id: newValue.id,
-      name: newValue.name,
-      pageTitle: newValue.pageTitle,
-      title: newValue.global.title,
-      value: JSON.stringify({
-        global: toRaw(newValue.global),
-        value: toRaw(newValue.value),
-      }),
-    }
+    () => diyStore,
+    (newValue, oldValue) => {
+        const data = {
+            form_id: newValue.id,
+            name: newValue.name,
+            pageTitle: newValue.pageTitle,
+            title: newValue.global.title,
+            value: JSON.stringify({
+                global: toRaw(newValue.global),
+                value: toRaw(newValue.value)
+            })
+        }
 
-    diyStore.postMessage()
-    isChange.value = JSON.stringify(data) == JSON.stringify(originData)
-  },
-  { deep: true }
+        diyStore.postMessage()
+        isChange.value = JSON.stringify(data) == JSON.stringify(originData)
+    },
+    { deep: true }
 )
 
 // 根据当前页面路由查询页面初始化数据
 initPage({
-  form_id: route.query.form_id,
-  type: route.query.type,
+    form_id: route.query.form_id,
+    type: route.query.type,
 }).then(async (res) => {
-  const data = res.data
-  diyStore.init() // 初始化清空数据
-  diyStore.id = data.form_id || 0
-  diyStore.pageTitle = data.page_title
-  diyStore.type = data.type
-  diyStore.typeName = data.type_name
-  diyStore.templateName = data.template
-  template.value = data.template
-  if (data.value) {
-    const sources = data.value
-    diyStore.global = sources.global
-    if (sources.value.length) {
-      diyStore.value = sources.value
-      // diyStore.changeCurrentIndex(0,diyStore.value[0]);
+    const data = res.data
+    diyStore.init() // 初始化清空数据
+    diyStore.id = data.form_id || 0
+    diyStore.pageTitle = data.page_title
+    diyStore.type = data.type
+    diyStore.typeName = data.type_name
+    diyStore.templateName = data.template
+    template.value = data.template;
+    if (data.value) {
+        const sources = data.value
+        diyStore.global = sources.global
+        if (sources.value.length) {
+            diyStore.value = sources.value
+            // diyStore.changeCurrentIndex(0,diyStore.value[0]);
+        }
+    } else {
+        diyStore.global.title = data.title
     }
-  } else {
-    diyStore.global.title = data.title
-  }
-
-  // 初始化原数据
-  originData.form_id = diyStore.id
-  originData.pageTitle = diyStore.pageTitle
-  originData.title = diyStore.global.title
-  originData.value = JSON.stringify({
-    global: toRaw(diyStore.global),
-    value: toRaw(diyStore.value),
-  })
-
-  component.value = data.component
-  for (const type in component.value) {
-    componentType.push(type)
-    for (const key in component.value[type].list) {
-      const com = cloneDeep(component.value[type].list[key])
-      com.id = diyStore.generateRandom()
-      com.componentName = key
-      com.componentTitle = com.title
-      Object.assign(com, com.value)
-      delete com.name
-      delete com.title
-      delete com.value
-      delete com.icon
-      diyStore.components.push(com)
+
+    // 初始化原数据
+    originData.form_id = diyStore.id
+    originData.pageTitle = diyStore.pageTitle
+    originData.title = diyStore.global.title
+    originData.value = JSON.stringify({
+        global: toRaw(diyStore.global),
+        value: toRaw(diyStore.value)
+    })
+
+    component.value = data.component
+    for (const type in component.value) {
+        componentType.push(type)
+        for (const key in component.value[type].list) {
+            const com = cloneDeep(component.value[type].list[key])
+            com.id = diyStore.generateRandom()
+            com.componentName = key
+            com.componentTitle = com.title
+            Object.assign(com, com.value)
+            delete com.name
+            delete com.title
+            delete com.value
+            delete com.icon
+            diyStore.components.push(com)
+        }
     }
-  }
 
-  loadDiyTemplatePages(data.type)
+    loadDiyTemplatePages(data.type);
 
-  // 加载预览
-  wapDomain.value = data.domain_url.wap_domain
-  wapUrl.value = data.domain_url.wap_url
+    // 加载预览
+    wapDomain.value = data.domain_url.wap_domain
+    wapUrl.value = data.domain_url.wap_url
 
-  let repeat = true // 防重复执行
+    let repeat = true; // 防重复执行
 
-  // 开发模式下执行
-  if (import.meta.env.MODE == 'development') {
-    // env文件配置过wap域名
-    if (wapDomain.value) {
-      wapUrl.value = wapDomain.value + '/wap'
-      repeat = false
-      setDomain()
+    // 开发模式下执行
+    if (import.meta.env.MODE == 'development') {
+
+        // env文件配置过wap域名
+        if (wapDomain.value) {
+            wapUrl.value = wapDomain.value + '/wap'
+            repeat = false
+            setDomain()
+        }
+
+        let wap_domain_storage = storage.get('wap_domain')
+        if (wap_domain_storage) {
+            wapUrl.value = wap_domain_storage
+            repeat = false
+            setDomain()
+        }
     }
 
-    let wap_domain_storage = storage.get('wap_domain')
-    if (wap_domain_storage) {
-      wapUrl.value = wap_domain_storage
-      repeat = false
-      setDomain()
+    if(repeat) {
+        setDomain()
     }
-  }
 
-  if (repeat) {
-    setDomain()
-  }
 })
 
 const uniAppLoadStatus = ref(false) // uni-app 加载状态，true：加载完成，false：未完成
 
 // 监听组件数据 uni-app端
-window.addEventListener(
-  'message',
-  (event) => {
+window.addEventListener('message', (event) => {
     try {
-      let data = {
-        type: '',
-      }
-      if (typeof event.data == 'string') {
-        data = JSON.parse(event.data)
-      } else if (typeof event.data == 'object') {
-        data = event.data
-      }
-      if (!data.type) return
-
-      switch (data.type) {
-        case 'appOnLaunch':
-        case 'appOnReady':
-          // uni-app 加载完成
-          loadingDev.value = false
-          loadingIframe.value = true
-          let loadTime = new Date().getTime()
-          difference.value = loadTime - timeIframe.value
-          uniAppLoadStatus.value = true // 加载完成
-          break
-        case 'init':
-          // 初始化，与uniapp建立连接传输数据
-          diyStore.load = true
-          diyStore.postMessage()
-          break
-        case 'change':
-          // 切换
-          diyStore.changeCurrentIndex(data.index, data.component)
-          break
-        case 'data':
-          // 传数据
-          diyStore.changeCurrentIndex(data.index, data.component)
-          diyStore.global = data.global
-          diyStore.value = data.value
-          break
-      }
+        let data = {
+            type: ''
+        };
+        if(typeof event.data == 'string') {
+            data = JSON.parse(event.data)
+        }else if(typeof event.data == 'object') {
+            data = event.data
+        }
+        if (!data.type) return
+
+        switch (data.type) {
+            case 'appOnLaunch':
+            case 'appOnReady':
+                // uni-app 加载完成
+                loadingDev.value = false
+                loadingIframe.value = true
+                let loadTime = new Date().getTime()
+                difference.value = loadTime - timeIframe.value
+                uniAppLoadStatus.value = true // 加载完成
+                break
+            case 'init':
+                // 初始化，与uniapp建立连接传输数据
+                diyStore.load = true
+                diyStore.postMessage()
+                break
+            case 'change':
+                // 切换
+                diyStore.changeCurrentIndex(data.index, data.component)
+                break
+            case 'data':
+                // 传数据
+                diyStore.changeCurrentIndex(data.index, data.component)
+                diyStore.global = data.global
+                diyStore.value = data.value
+                break
+        }
     } catch (e) {
-      console.log('diy edit 后台接受数据错误', e)
+        console.log('diy edit 后台接受数据错误', e)
     }
-  },
-  false
-)
+}, false)
 
 const saveWapDomain = () => {
-  if (wapDomain.value.trim().length == 0) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('wapDomainPlaceholder')}`,
-    })
-    return
-  }
-  wapUrl.value = wapDomain.value + '/wap'
-  setDomain()
-  storage.set({ key: 'wap_domain', data: wapUrl.value })
-  loadingIframe.value = true
-  loadingDev.value = false
+    if (wapDomain.value.trim().length == 0) {
+        ElMessage({
+            type: 'warning',
+            message: `${t('wapDomainPlaceholder')}`
+        })
+        return
+    }
+    wapUrl.value = wapDomain.value + '/wap'
+    setDomain()
+    storage.set({ key: 'wap_domain', data: wapUrl.value })
+    loadingIframe.value = true
+    loadingDev.value = false
 }
 
 const setDomain = () => {
-  wapPreview.value = `${wapUrl.value}${page.value}?mode=decorate` // 模式：decorate 装修 访问预览页面
-
-  const send = () => {
-    timeIframe.value = new Date().getTime()
-    postMessage()
-  }
-
-  // 同步发送一次消息
-  send()
-
-  // 如果同步发送消息的 uni-app没有接收到回应，则定时发送消息
-  let sendCount = 0
-  let timeInterVal = setInterval(() => {
-    // 接收 uni-app 发送的消息 或者 发送50次后未响应，则停止发送
-    if (uniAppLoadStatus.value || sendCount >= 50) {
-      clearInterval(timeInterVal)
-      return
+    wapPreview.value = `${wapUrl.value}${page.value}?mode=decorate` // 模式：decorate 装修 访问预览页面
+
+    const send = ()=>{
+        timeIframe.value = new Date().getTime()
+        postMessage()
     }
 
+    // 同步发送一次消息
     send()
-    sendCount++
-  }, 200)
 
-  // 如果10秒内加载不出来，则需要配置域名
-  setTimeout(() => {
-    if (difference.value == 0) initLoad()
-  }, 1000 * 10)
+    // 如果同步发送消息的 uni-app没有接收到回应，则定时发送消息
+    let sendCount = 0;
+    let timeInterVal = setInterval(()=>{
+        // 接收 uni-app 发送的消息 或者 发送50次后未响应，则停止发送
+        if(uniAppLoadStatus.value || sendCount >= 50){
+            clearInterval(timeInterVal)
+            return
+        }
+
+        send()
+        sendCount++;
+    },200)
+
+    // 如果10秒内加载不出来，则需要配置域名
+    setTimeout(() => {
+        if (difference.value == 0) initLoad()
+    }, 1000 * 10)
+
 }
 
 // 将数据发送到uniapp
 const postMessage = () => {
-  const data = JSON.stringify({
-    type: 'appOnReady',
-    message: '加载完成',
-  })
-  if (window.previewIframe)
-    window.previewIframe.contentWindow.postMessage(data, '*')
+    const data = JSON.stringify({
+        type: 'appOnReady',
+        message: '加载完成'
+    })
+    if (window.previewIframe) window.previewIframe.contentWindow.postMessage(data, '*')
 }
 
 // 初始化加载状态
 const initLoad = () => {
-  loadingDev.value = true
-  loadingIframe.value = false
-  wapPreview.value = ''
+    loadingDev.value = true
+    loadingIframe.value = false
+    wapPreview.value = ''
 }
 
 // 验证表单组件公共属性
 const verifyFormComponent = () => {
-  for (var i = 0; i < diyStore.value.length; i++) {
-    try {
-      if (
-        diyStore.value[i].componentType == 'diy_form' &&
-        diyStore.value[i].componentName != 'FormSubmit' &&
-        diyStore.value[i].field.name == ''
-      ) {
-        diyStore.changeCurrentIndex(i, diyStore.value[i])
-        ElMessage({
-          message: t('fieldNamePlaceholder'),
-          type: 'warning',
-        })
-        return false
-      }
-    } catch (e) {
-      console.log('verifyFormComponent Error:', e, i, diyStore.value[i])
+    for (var i = 0; i < diyStore.value.length; i++) {
+        try {
+            if (diyStore.value[i].componentType == 'diy_form' && diyStore.value[i].componentName != 'FormSubmit' && diyStore.value[i].field.name == '') {
+                diyStore.changeCurrentIndex(i, diyStore.value[i])
+                ElMessage({
+                    message: t('fieldNamePlaceholder'),
+                    type: 'warning'
+                })
+                return false;
+            }
+        } catch (e) {
+            console.log("verifyFormComponent Error:", e, i, diyStore.value[i]);
+        }
     }
-  }
-  return true
+    return true;
 }
 
 const isRepeat = ref(false)
 const save = (callback: any) => {
-  if (!diyStore.verify()) {
-    return
-  }
-
-  // 验证表单组件公共属性
-  if (!verifyFormComponent()) {
-    return
-  }
+    if (!diyStore.verify()) {
+        return
+    }
 
-  if (isRepeat.value) return
-  isRepeat.value = true
+    // 验证表单组件公共属性
+    if(!verifyFormComponent()){
+        return;
+    }
 
-  diyStore.templateName = template.value
+    if (isRepeat.value) return
+    isRepeat.value = true
+
+    diyStore.templateName = template.value;
+
+    let data = {
+        form_id: diyStore.id,
+        name: diyStore.name,
+        page_title: diyStore.pageTitle,
+        title: diyStore.global.title,
+        type: diyStore.type,
+        template: diyStore.templateName,
+        value: JSON.stringify({
+            global: toRaw(diyStore.global),
+            value: toRaw(diyStore.value)
+        })
+    }
 
-  let data = {
-    form_id: diyStore.id,
-    name: diyStore.name,
-    page_title: diyStore.pageTitle,
-    title: diyStore.global.title,
-    type: diyStore.type,
-    template: diyStore.templateName,
-    value: JSON.stringify({
-      global: toRaw(diyStore.global),
-      value: toRaw(diyStore.value),
-    }),
-  }
-
-  const api = diyStore.id ? editDiyForm : addDiyForm
-  api(data)
-    .then((res: any) => {
-      isRepeat.value = false
-      if (res.code == 1) {
-        if (diyStore.id) {
-          isRepeat.value = false // 不刷新
-        } else {
-          location.href = `${location.origin}${backPath}`
+    const api = diyStore.id ? editDiyForm : addDiyForm
+    api(data).then((res: any) => {
+        isRepeat.value = false
+        if (res.code == 1) {
+            if (diyStore.id) {
+                isRepeat.value = false // 不刷新
+            } else {
+                location.href = `${location.origin}${backPath}`;
+            }
+            if (callback) callback(res.data.form_id)
         }
-        if (callback) callback(res.data.form_id)
-      }
-    })
-    .catch(() => {
-      isRepeat.value = false
+    }).catch(() => {
+        isRepeat.value = false
     })
 }
 
 // 预览
 const preview = () => {
-  save((form_id: number) => {
-    form_id = diyStore.id || form_id
-    const url = router.resolve({
-      path: '/admin/preview/wap',
-      query: {
-        page: `${page.value}?form_id=` + form_id,
-      },
+    save((form_id: number) => {
+        form_id = diyStore.id || form_id
+        const url = router.resolve({
+            path: '/admin/preview/wap',
+            query: {
+                page: `${page.value}?form_id=` + form_id
+            }
+        })
+        window.open(url.href)
     })
-    window.open(url.href)
-  })
 }
 
 // 排版风格change
-const completeLayoutChange = (e) => {
-  if (e == 'style-2') {
-    diyStore.value.forEach((item, index) => {
-      if (
-        item.componentType == 'diy_form' &&
-        item.componentName != 'FormSubmit'
-      ) {
-        item.field.name = item.field.name.slice(0, 5)
-      }
-    })
-  }
+const completeLayoutChange = (e)=>{
+    if(e == 'style-2'){
+        diyStore.value.forEach((item,index) => {
+            if(item.componentType == 'diy_form' && item.componentName != 'FormSubmit'){
+                item.field.name = item.field.name.slice(0,5)
+            }
+        });
+    }
 }
 
 const settingTips = () => {
-  window.open('https://www.kancloud.cn/niucloud/niucloud-admin-develop/3213393')
+    window.open('https://www.kancloud.cn/niucloud/niucloud-admin-develop/3213393')
 }
 </script>
 
 <style lang="scss">
 .el-collapse-item__wrap {
-  border-bottom: none;
+    border-bottom: none;
 }
 
 .el-collapse-item__content {
-  padding-bottom: 0;
+    padding-bottom: 0;
 }
 
 .el-collapse-item__header {
-  font-size: var(--el-font-size-base);
+    font-size: var(--el-font-size-base);
 }
 
 .display-block {
-  .el-form-item__content {
-    display: block;
-  }
+    .el-form-item__content {
+        display: block;
+    }
 }
 
 .edit-component-wrap {
-  .content-wrap,
-  .style-wrap {
-    .edit-attr-item-wrap {
-      border-top: 2px solid var(--el-color-info-light-8);
-      padding-top: 20px;
-
-      &:first-of-type {
-        border-top: none;
-        padding-top: 0;
-      }
+    .content-wrap,
+    .style-wrap {
+        .edit-attr-item-wrap {
+            border-top: 2px solid var(--el-color-info-light-8);
+            padding-top: 20px;
+
+            &:first-of-type {
+                border-top: none;
+                padding-top: 0;
+            }
+        }
     }
-  }
 }
 .diy-nav-slider {
-  .el-slider__input {
-    width: 100px;
-  }
+    .el-slider__input {
+        width: 100px;
+    }
 }
 </style>
 <style lang="scss" scoped>
 .full-container {
-  height: calc(100vh - 60px);
+    height: calc(100vh - 60px);
 }
 
 .preview-iframe {
-  height: calc(100vh - 160px);
+    height: calc(100vh - 160px);
 }
 
 .component-list {
-  background: var(--el-bg-color);
+    background: var(--el-bg-color);
 }
 
 .component-list ul li {
-  &:not(.disabled):hover {
-    color: var(--el-color-primary);
-    background: var(--el-color-primary-light-9);
-  }
+    &:not(.disabled):hover {
+        color: var(--el-color-primary);
+        background: var(--el-color-primary-light-9);
+    }
 }
 
 .diy-view-wrap {
-  background: var(--el-bg-color-page);
+    background: var(--el-bg-color-page);
 }
 
 .diy-view-wrap .preview-head {
-  background-image: url(@/app/assets/images/diy_preview_head.png);
-  background-color: var(--el-bg-color);
+    background-image: url(@/app/assets/images/diy_preview_head.png);
+    background-color: var(--el-bg-color);
 }
 
 .quick-action {
-  background: var(--el-bg-color);
+    background: var(--el-bg-color);
 }
 
 .edit-attribute-wrap {
-  background: var(--el-bg-color);
+    background: var(--el-bg-color);
 }
 
 .edit-attribute-wrap .box-card {
-  border: none;
+    border: none;
 }
 
 .diy-view-wrap .preview-head {
-  padding: 28px 15px 0;
+    padding: 28px 15px 0;
 
-  .content-wrap {
-    height: 30px;
-  }
-
-  &.style-1 {
     .content-wrap {
-      .title-wrap {
         height: 30px;
-        line-height: 30px;
-      }
     }
-  }
 
-  &.style-2 {
-    .content-wrap {
-      .title-wrap {
-        display: flex;
-        align-items: center;
-
-        > div {
-          height: 30px;
-          line-height: 30px;
-          max-width: 150px;
-          font-size: 14px;
-
-          &:last-child {
-            overflow: hidden; //超出的文本隐藏
-            text-overflow: ellipsis; //用省略号显示
-            white-space: nowrap; //不换行
-            flex: 1;
-            max-width: 200px;
-          }
+    &.style-1 {
+        .content-wrap {
+            .title-wrap {
+                height: 30px;
+                line-height: 30px;
+            }
         }
-      }
     }
-  }
 
-  &.style-3 {
-    .content-wrap {
-      display: flex;
-      align-items: center;
-
-      .title-wrap {
-        height: 30px;
-        max-width: 85px;
-        margin-right: 5px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-      }
-
-      .search {
-        flex: 1;
-        padding-right: 10px;
-        padding-left: 31px;
-        position: relative;
-        background-color: #fff;
-        text-align: left;
-        border-radius: 30px;
-        height: 30px;
-        line-height: 30px;
-        border: 1px solid #eeeeee;
-        color: rgb(102, 102, 102);
-        display: flex;
-        align-items: center;
-        margin-right: 105px;
-        overflow: hidden;
-        box-sizing: border-box;
-
-        span {
-          overflow: hidden; //超出的文本隐藏
-          text-overflow: ellipsis; //用省略号显示
-          white-space: nowrap; //不换行
+    &.style-2 {
+        .content-wrap {
+            .title-wrap {
+                display: flex;
+                align-items: center;
+
+                > div {
+                    height: 30px;
+                    line-height: 30px;
+                    max-width: 150px;
+                    font-size: 14px;
+
+                    &:last-child {
+                        overflow: hidden; //超出的文本隐藏
+                        text-overflow: ellipsis; //用省略号显示
+                        white-space: nowrap; //不换行
+                        flex: 1;
+                        max-width: 200px;
+                    }
+                }
+            }
         }
+    }
 
-        .iconfont {
-          color: #909399;
-          font-size: 16px;
-          margin-right: 5px;
+    &.style-3 {
+        .content-wrap {
+            display: flex;
+            align-items: center;
+
+            .title-wrap {
+                height: 30px;
+                max-width: 85px;
+                margin-right: 5px;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+            }
+
+            .search {
+                flex: 1;
+                padding-right: 10px;
+                padding-left: 31px;
+                position: relative;
+                background-color: #fff;
+                text-align: left;
+                border-radius: 30px;
+                height: 30px;
+                line-height: 30px;
+                border: 1px solid #eeeeee;
+                color: rgb(102, 102, 102);
+                display: flex;
+                align-items: center;
+                margin-right: 105px;
+                overflow: hidden;
+                box-sizing: border-box;
+
+                span {
+                    overflow: hidden; //超出的文本隐藏
+                    text-overflow: ellipsis; //用省略号显示
+                    white-space: nowrap; //不换行
+                }
+
+                .iconfont {
+                    color: #909399;
+                    font-size: 16px;
+                    margin-right: 5px;
+                }
+            }
         }
-      }
     }
-  }
 
-  &.style-4 {
-    .content-wrap {
-      display: flex;
-      align-items: center;
-
-      .title-wrap {
-        flex: none;
-        margin: 0 5px;
-        max-width: 180px;
-        font-size: 14px;
-      }
+    &.style-4 {
+        .content-wrap {
+            display: flex;
+            align-items: center;
+
+            .title-wrap {
+                flex: none;
+                margin: 0 5px;
+                max-width: 180px;
+                font-size: 14px;
+            }
+        }
     }
-  }
 }
 </style>
diff --git a/admin/src/app/views/diy_form/list.vue b/admin/src/app/views/diy_form/list.vue
index b529cbcc..1e65b748 100644
--- a/admin/src/app/views/diy_form/list.vue
+++ b/admin/src/app/views/diy_form/list.vue
@@ -1,346 +1,184 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-        <el-button
-          type="primary"
-          class="w-[100px]"
-          @click="dialogVisible = true"
-          >{{ t('addDiyForm') }}</el-button
-        >
-      </div>
-
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="diyFormTableData.searchParam"
-          ref="searchFormDiyFormRef"
-        >
-          <el-form-item :label="t('title')" prop="title">
-            <el-input
-              v-model.trim="diyFormTableData.searchParam.title"
-              :placeholder="t('titlePlaceholder')"
-            />
-          </el-form-item>
-          <!--                    <el-form-item :label="t('forAddon')" prop="addon_name">-->
-          <!--                        <el-select v-model="diyFormTableData.searchParam.addon_name" :placeholder="t('forAddonPlaceholder')" @change="handleSelectAddonChange">-->
-          <!--                            <el-option :label="t('all')" value="" />-->
-          <!--                            <el-option v-for="(item, key) in apps" :label="item.title" :value="key" :key="key"/>-->
-          <!--                        </el-select>-->
-          <!--                    </el-form-item>-->
-          <el-form-item :label="t('typeName')" prop="type">
-            <el-select
-              v-model="diyFormTableData.searchParam.type"
-              :placeholder="t('formTypePlaceholder')"
-            >
-              <el-option :label="t('all')" value="" />
-              <el-option
-                v-for="(item, key) in formType"
-                :label="item.title"
-                :value="key"
-                :key="key"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="loadDiyFormList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormDiyFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
-      <div class="mb-[10px] flex items-center">
-        <el-checkbox
-          v-model="toggleCheckbox"
-          size="large"
-          class="px-[14px]"
-          @change="toggleChange"
-          :indeterminate="isIndeterminate"
-        />
-        <el-button @click="batchDeleteForms" size="small">{{
-          t('batchDeletion')
-        }}</el-button>
-      </div>
-      <el-table
-        :data="diyFormTableData.data"
-        size="large"
-        ref="diyFormListTableRef"
-        v-loading="diyFormTableData.loading"
-        @selection-change="handleSelectionChange"
-      >
-        <template #empty>
-          <span>{{ !diyFormTableData.loading ? t('emptyData') : '' }}</span>
-        </template>
-        <el-table-column type="selection" width="55" />
-        <el-table-column
-          prop="page_title"
-          :label="t('title')"
-          min-width="120"
-        />
-        <!--                <el-table-column prop="addon_name" :label="t('forAddon')" min-width="80" />-->
-        <el-table-column
-          prop="type_name"
-          :label="t('typeName')"
-          min-width="80"
-        />
-        <el-table-column :label="t('status')" min-width="80">
-          <template #default="{ row }">
-            <el-tag
-              type="success"
-              v-if="row.status == 1"
-              class="cursor-pointer"
-              @click="showClick(row)"
-              >{{ t('statusOn') }}</el-tag
-            >
-            <el-tag
-              type="info"
-              v-else
-              class="cursor-pointer"
-              @click="showClick(row)"
-              >{{ t('statusOff') }}</el-tag
-            >
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="update_time"
-          :label="t('updateTime')"
-          min-width="120"
-        />
-
-        <el-table-column
-          :label="t('operation')"
-          fixed="right"
-          align="right"
-          min-width="100"
-        >
-          <template #default="{ row }">
-            <div class="flex items-center justify-end">
-              <el-button
-                type="primary"
-                v-if="row.status == 1 && row.type == 'DIY_FORM'"
-                link
-                @click="spreadEvent(row)"
-                >{{ t('promotion') }}</el-button
-              >
-              <!--                            <el-button type="primary" link @click="toPreview(row)">{{ t('preview') }}</el-button>-->
-              <el-button type="primary" link @click="editEvent(row)">{{
-                t('edit')
-              }}</el-button>
-              <el-button
-                v-if="row.status == 0"
-                type="primary"
-                link
-                @click="deleteEvent(row.form_id)"
-                >{{ t('delete') }}</el-button
-              >
-              <el-button type="primary" link @click="detailEvent(row)">{{
-                t('detail')
-              }}</el-button>
-              <el-dropdown placement="bottom" trigger="click" class="ml-[12px]">
-                <el-button type="primary" link>{{ t('more') }}</el-button>
-                <template #dropdown>
-                  <el-dropdown-menu>
-                    <el-dropdown-item v-if="row.type == 'DIY_FORM'">
-                      <el-button
-                        type="primary"
-                        class="w-full"
-                        link
-                        @click="submitConfigEvent(row)"
-                        >{{ t('submirSuccess') }}</el-button
-                      >
-                    </el-dropdown-item>
-                    <el-dropdown-item>
-                      <el-button
-                        type="primary"
-                        class="w-full"
-                        link
-                        @click="writeConfigEvent(row)"
-                        >{{ t('writeSet') }}</el-button
-                      >
-                    </el-dropdown-item>
-                    <el-dropdown-item v-if="row.type == 'DIY_FORM'">
-                      <el-button
-                        type="primary"
-                        class="w-full"
-                        link
-                        @click="openShare(row)"
-                        >{{ t('shareSet') }}</el-button
-                      >
-                    </el-dropdown-item>
-                    <el-dropdown-item>
-                      <el-button
-                        type="primary"
-                        class="w-full"
-                        link
-                        @click="exportEvent(row)"
-                        >{{ t('export') }}</el-button
-                      >
-                    </el-dropdown-item>
-                    <el-dropdown-item>
-                      <el-button
-                        type="primary"
-                        class="w-full"
-                        link
-                        @click="copyEvent(row.form_id)"
-                        >{{ t('copy') }}</el-button
-                      >
-                    </el-dropdown-item>
-                  </el-dropdown-menu>
-                </template>
-              </el-dropdown>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+                <el-button type="primary" class="w-[100px]" @click="dialogVisible = true">{{ t('addDiyForm') }}</el-button>
             </div>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="mt-[16px] flex justify-end">
-        <el-pagination
-          v-model:current-page="diyFormTableData.page"
-          v-model:page-size="diyFormTableData.limit"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="diyFormTableData.total"
-          @size-change="loadDiyFormList()"
-          @current-change="loadDiyFormList"
-        />
-      </div>
-    </el-card>
-
-    <!--添加表单-->
-    <el-dialog v-model="dialogVisible" :title="t('addFormTips')" width="980px">
-      <el-form :model="formData" ref="formRef" :rules="formRules">
-        <!--                <el-form-item :label="t('title')" prop="title">-->
-        <!--                    <el-input v-model.trim="formData.title" :placeholder="t('titlePlaceholder')" clearable maxlength="12" show-word-limit class="w-full" />-->
-        <!--                </el-form-item>-->
-        <el-form-item prop="type">
-          <div class="image-selection-container">
-            <div
-              v-for="(item, key) in formType"
-              :key="key"
-              class="image-option"
-              :class="{ selected: formData.type === key }"
-              @click="selectType(key)"
-            >
-              <img :src="img(item.preview)" class="option-image" />
-              <div class="option-title">{{ item.title }}</div>
+
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="diyFormTableData.searchParam" ref="searchFormDiyFormRef">
+                    <el-form-item :label="t('title')" prop="title">
+                        <el-input v-model.trim="diyFormTableData.searchParam.title" :placeholder="t('titlePlaceholder')" />
+                    </el-form-item>
+<!--                    <el-form-item :label="t('forAddon')" prop="addon_name">-->
+<!--                        <el-select v-model="diyFormTableData.searchParam.addon_name" :placeholder="t('forAddonPlaceholder')" @change="handleSelectAddonChange">-->
+<!--                            <el-option :label="t('all')" value="" />-->
+<!--                            <el-option v-for="(item, key) in apps" :label="item.title" :value="key" :key="key"/>-->
+<!--                        </el-select>-->
+<!--                    </el-form-item>-->
+                    <el-form-item :label="t('typeName')" prop="type">
+                        <el-select v-model="diyFormTableData.searchParam.type" :placeholder="t('formTypePlaceholder')">
+                            <el-option :label="t('all')" value="" />
+                            <el-option v-for="(item, key) in formType" :label="item.title" :value="key" :key="key"/>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="loadDiyFormList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormDiyFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+            <div class="mb-[10px] flex items-center">
+                <el-checkbox v-model="toggleCheckbox" size="large" class="px-[14px]" @change="toggleChange" :indeterminate="isIndeterminate" />
+                <el-button @click="batchDeleteForms" size="small">{{t("batchDeletion")}}</el-button>
             </div>
-          </div>
-          <!-- <el-select v-model="formData.type" :placeholder="t('formTypePlaceholder')" class="!w-full">
+            <el-table :data="diyFormTableData.data" size="large" ref="diyFormListTableRef" v-loading="diyFormTableData.loading" @selection-change="handleSelectionChange">
+                <template #empty>
+                    <span>{{ !diyFormTableData.loading ? t('emptyData') : '' }}</span>
+                </template>
+                <el-table-column type="selection" width="55" />
+                <el-table-column prop="page_title" :label="t('title')" min-width="120" />
+<!--                <el-table-column prop="addon_name" :label="t('forAddon')" min-width="80" />-->
+                <el-table-column prop="type_name" :label="t('typeName')" min-width="80" />
+                <el-table-column :label="t('status')" min-width="80">
+                    <template #default="{ row }">
+                        <el-tag type="success" v-if="row.status == 1" class="cursor-pointer" @click="showClick(row)">{{ t('statusOn') }}</el-tag>
+                        <el-tag type="info" v-else class="cursor-pointer" @click="showClick(row)">{{ t('statusOff') }}</el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="update_time" :label="t('updateTime')" min-width="120" />
+
+                <el-table-column :label="t('operation')" fixed="right" align="right" min-width="100">
+                    <template #default="{ row }">
+                        <div class="flex items-center justify-end">
+                            <el-button type="primary" v-if="row.status == 1 && row.type=='DIY_FORM'" link @click="spreadEvent(row)">{{ t('promotion') }}</el-button>
+<!--                            <el-button type="primary" link @click="toPreview(row)">{{ t('preview') }}</el-button>-->
+                            <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+                            <el-button v-if="row.status == 0" type="primary" link @click="deleteEvent(row.form_id)">{{ t('delete') }}</el-button>
+                            <el-button type="primary" link @click="detailEvent(row)">{{ t('detail') }}</el-button>
+                            <el-dropdown placement="bottom" trigger="click" class="ml-[12px]">
+                                <el-button type="primary" link>{{ t('more') }}</el-button>
+                                <template #dropdown>
+                                    <el-dropdown-menu>
+                                        <el-dropdown-item v-if="row.type=='DIY_FORM'">
+                                            <el-button type="primary" class="w-full" link @click="submitConfigEvent(row)">{{ t('submirSuccess') }}</el-button>
+                                        </el-dropdown-item>
+                                        <el-dropdown-item>
+                                            <el-button type="primary" class="w-full" link @click="writeConfigEvent(row)">{{ t('writeSet') }}</el-button>
+                                        </el-dropdown-item>
+                                        <el-dropdown-item v-if="row.type=='DIY_FORM'">
+                                            <el-button type="primary" class="w-full" link @click="openShare(row)">{{ t('shareSet') }}</el-button>
+                                        </el-dropdown-item>
+                                        <el-dropdown-item>
+                                            <el-button type="primary" class="w-full" link @click="exportEvent(row)">{{ t('export') }}</el-button>
+                                        </el-dropdown-item>
+                                        <el-dropdown-item>
+                                            <el-button type="primary" class="w-full" link @click="copyEvent(row.form_id)">{{ t('copy') }}</el-button>
+                                        </el-dropdown-item>
+                                    </el-dropdown-menu>
+                                </template>
+                            </el-dropdown>
+                        </div>
+                    </template>
+                </el-table-column>
+
+            </el-table>
+            <div class="mt-[16px] flex justify-end">
+                <el-pagination v-model:current-page="diyFormTableData.page" v-model:page-size="diyFormTableData.limit"
+                    layout="total, sizes, prev, pager, next, jumper" :total="diyFormTableData.total"
+                    @size-change="loadDiyFormList()" @current-change="loadDiyFormList" />
+            </div>
+
+        </el-card>
+
+        <!--添加表单-->
+        <el-dialog v-model="dialogVisible" :title="t('addFormTips')" width="980px">
+            <el-form :model="formData" ref="formRef" :rules="formRules">
+            <!--                <el-form-item :label="t('title')" prop="title">-->
+            <!--                    <el-input v-model.trim="formData.title" :placeholder="t('titlePlaceholder')" clearable maxlength="12" show-word-limit class="w-full" />-->
+            <!--                </el-form-item>-->
+                <el-form-item  prop="type">
+                    <div class="image-selection-container">
+                        <div
+                            v-for="(item, key) in formType"
+                            :key="key"
+                            class="image-option"
+                            :class="{ selected: formData.type === key }"
+                            @click="selectType(key)"
+                        >
+                            <img :src="img(item.preview)" class="option-image" />
+                            <div class="option-title">{{ item.title }}</div>
+                        </div>
+                    </div>
+                    <!-- <el-select v-model="formData.type" :placeholder="t('formTypePlaceholder')" class="!w-full">
                         <el-option v-for="(item, key) in formType" :label="item.title" :value="key" :key="key"/>
                     </el-select> -->
-        </el-form-item>
-      </el-form>
-
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="dialogVisible = false">{{
-            t('cancel')
-          }}</el-button>
-          <el-button type="primary" @click="addEvent(formRef)">{{
-            t('confirm')
-          }}</el-button>
-        </span>
-      </template>
-    </el-dialog>
-
-    <!-- 分享设置-->
-    <el-dialog v-model="shareDialogVisible" :title="t('shareSet')" width="30%">
-      <el-tabs v-model="tabShareType">
-        <el-tab-pane :label="t('wechat')" name="wechat"></el-tab-pane>
-        <el-tab-pane :label="t('weapp')" name="weapp"></el-tab-pane>
-      </el-tabs>
-      <el-form
-        :model="shareFormData[tabShareType]"
-        label-width="90px"
-        ref="shareFormRef"
-        :rules="shareFormRules"
-      >
-        <el-form-item :label="t('sharePage')">
-          <span>{{ sharePage }}</span>
-        </el-form-item>
-        <el-form-item :label="t('shareTitle')" prop="title">
-          <el-input
-            v-model.trim="shareFormData[tabShareType].title"
-            :placeholder="t('shareTitlePlaceholder')"
-            clearable
-            maxlength="30"
-            show-word-limit
-          />
-        </el-form-item>
-        <el-form-item
-          :label="t('shareDesc')"
-          prop="desc"
-          v-if="tabShareType == 'wechat'"
-        >
-          <el-input
-            v-model.trim="shareFormData[tabShareType].desc"
-            :placeholder="t('shareDescPlaceholder')"
-            type="textarea"
-            rows="4"
-            clearable
-            maxlength="100"
-            show-word-limit
-          />
-        </el-form-item>
-        <el-form-item :label="t('shareImageUrl')" prop="url">
-          <upload-image v-model="shareFormData[tabShareType].url" :limit="1" />
-        </el-form-item>
-      </el-form>
-
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="shareDialogVisible = false">{{
-            t('cancel')
-          }}</el-button>
-          <el-button type="primary" @click="shareEvent(shareFormRef)">{{
-            t('confirm')
-          }}</el-button>
-        </span>
-      </template>
-    </el-dialog>
-
-    <!-- 推广弹出框 -->
-    <form-spread-popup ref="formSpreadPopupRef" />
-
-    <!-- 表单提交成功页弹出框 -->
-    <form-submit-popup ref="formSubmitPopupRef" @complete="loadDiyFormList" />
-
-    <!-- 表单填写设置弹出框 -->
-    <form-write-popup ref="formWritePopupRef" @complete="loadDiyFormList" />
-
-    <records-detail ref="recordsDetailDialog" />
-
-    <!-- 表单明细导出弹出框 -->
-    <export-sure
-      ref="exportSureDialog"
-      :show="flag"
-      type="diy_form_records"
-      :searchParam="diyFormDetailData"
-      @close="handleExportClose"
-    />
-  </div>
+                </el-form-item>
+            </el-form>
+
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="dialogVisible = false">{{ t('cancel') }}</el-button>
+                    <el-button type="primary" @click="addEvent(formRef)">{{ t('confirm') }}</el-button>
+                </span>
+            </template>
+        </el-dialog>
+
+        <!-- 分享设置-->
+        <el-dialog v-model="shareDialogVisible" :title="t('shareSet')" width="30%">
+            <el-tabs v-model="tabShareType">
+                <el-tab-pane :label="t('wechat')" name="wechat"></el-tab-pane>
+                <el-tab-pane :label="t('weapp')" name="weapp"></el-tab-pane>
+            </el-tabs>
+            <el-form :model="shareFormData[tabShareType]" label-width="90px" ref="shareFormRef" :rules="shareFormRules">
+                <el-form-item :label="t('sharePage')">
+                    <span>{{ sharePage }}</span>
+                </el-form-item>
+                <el-form-item :label="t('shareTitle')" prop="title">
+                    <el-input v-model.trim="shareFormData[tabShareType].title" :placeholder="t('shareTitlePlaceholder')" clearable maxlength="30" show-word-limit />
+                </el-form-item>
+                <el-form-item :label="t('shareDesc')" prop="desc" v-if="tabShareType == 'wechat'">
+                    <el-input v-model.trim="shareFormData[tabShareType].desc" :placeholder="t('shareDescPlaceholder')" type="textarea" rows="4" clearable maxlength="100" show-word-limit />
+                </el-form-item>
+                <el-form-item :label="t('shareImageUrl')" prop="url">
+                    <upload-image v-model="shareFormData[tabShareType].url" :limit="1" />
+                </el-form-item>
+            </el-form>
+
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="shareDialogVisible = false">{{ t('cancel') }}</el-button>
+                    <el-button type="primary" @click="shareEvent(shareFormRef)">{{ t('confirm') }}</el-button>
+                </span>
+            </template>
+        </el-dialog>
+
+        <!-- 推广弹出框 -->
+        <form-spread-popup ref="formSpreadPopupRef" />
+
+        <!-- 表单提交成功页弹出框 -->
+        <form-submit-popup ref="formSubmitPopupRef" @complete="loadDiyFormList" />
+
+        <!-- 表单填写设置弹出框 -->
+        <form-write-popup ref="formWritePopupRef" @complete="loadDiyFormList" />
+
+        <records-detail ref="recordsDetailDialog"/>
+
+        <!-- 表单明细导出弹出框 -->
+        <export-sure ref="exportSureDialog" :show="flag" type="diy_form_records" :searchParam="diyFormDetailData" @close="handleExportClose" />
+
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref, computed } from 'vue'
 import { t } from '@/lang'
-import {
-  getFormType,
-  getApps,
-  getDiyFormPageList,
-  deleteDiyForm,
-  editDiyFormShare,
-  editFormStatus,
-  copyForm,
-} from '@/app/api/diy_form'
-import { FormInstance, ElMessage, ElMessageBox } from 'element-plus'
+import { getFormType, getApps, getDiyFormPageList, deleteDiyForm, editDiyFormShare, editFormStatus, copyForm } from '@/app/api/diy_form'
+import { FormInstance, ElMessage, ElMessageBox } from "element-plus";
 import { useRoute, useRouter } from 'vue-router'
-import { setTablePageStorage, getTablePageStorage } from '@/utils/common'
+import { setTablePageStorage,getTablePageStorage } from "@/utils/common";
 import { img } from '@/utils/common'
 import recordsDetail from '@/app/views/diy_form/records.vue'
 import formSpreadPopup from '@/app/views/diy_form/components/form-spread-popup.vue'
@@ -356,76 +194,76 @@ const formType: any = reactive({}) // 表单类型
 
 // 添加自定义表单
 const formData = reactive({
-  title: '',
-  type: '',
+    title: '',
+    type: ''
 })
 
 //详情
 const recordsDetailDialog: Record<string, any> | null = ref(null)
-const detailEvent = (row: any) => {
-  let data = { form_id: row.form_id }
-  recordsDetailDialog.value.setFormData(data)
-  recordsDetailDialog.value.showDialog = true
+const detailEvent=(row: any)=>{
+    let data = {form_id: row.form_id};
+    recordsDetailDialog.value.setFormData(data);
+    recordsDetailDialog.value.showDialog = true;
 }
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    title: [
-      { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
-    ],
-    type: [
-      { required: true, message: t('formTypePlaceholder'), trigger: 'blur' },
-    ],
-  }
+    return {
+        title: [
+            { required: true, message: t('titlePlaceholder'), trigger: 'blur' }
+        ],
+        type: [
+            { required: true, message: t('formTypePlaceholder'), trigger: 'blur' }
+        ]
+    }
 })
 
 const formRef = ref<FormInstance>()
 const dialogVisible = ref(false)
 const addEvent = async (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      const query = { type: formData.type } // , title: formData.title
-      const url = router.resolve({
-        path: '/decorate/form/edit',
-        query,
-      })
-      window.open(url.href)
-      dialogVisible.value = false
-      formData.title = ''
-      formData.type = ''
-    }
-  })
+    if (!formEl) return
+
+    await formEl.validate(async(valid) => {
+        if (valid) {
+            const query = { type: formData.type } // , title: formData.title
+            const url = router.resolve({
+                path: '/decorate/form/edit',
+                query
+            })
+            window.open(url.href)
+            dialogVisible.value = false
+            formData.title = ''
+            formData.type = ''
+        }
+    })
 }
 
 const showClick = (row: any) => {
-  const data = row.status === 1 ? 0 : 1
-  const obj = {
-    form_id: row.form_id,
-    status: data,
-  }
-  editFormStatus(obj).then((res) => {
-    row.status = data
-  })
+    const data = row.status === 1 ? 0 : 1
+    const obj = {
+        form_id: row.form_id,
+        status: data
+    }
+    editFormStatus(obj).then((res) => {
+        row.status = data
+    })
 }
 
 // 获取万能表单类型
-const loadFormType = (addon = '') => {
-  getFormType({}).then((res) => {
-    for (let key in formType) {
-      delete formType[key]
-    }
+const loadFormType = (addon = '')=> {
+    getFormType({}).then(res => {
+        for (let key in formType) {
+            delete formType[key];
+        }
 
-    for (const key in res.data) {
-      formType[key] = res.data[key]
-    }
-    formData.type = Object.keys(formType)[0]
-  })
+        for (const key in res.data) {
+            formType[key] = res.data[key]
+        }
+        formData.type = Object.keys(formType)[0]
+    })
 }
 
-loadFormType()
+loadFormType();
 
 const apps: any = reactive({}) // 应用插件列表
 
@@ -440,262 +278,254 @@ const apps: any = reactive({}) // 应用插件列表
 
 // 根据所属插件，查询表单类型
 const handleSelectAddonChange = (value: any) => {
-  diyFormTableData.searchParam.type = ''
-  loadFormType(value)
+    diyFormTableData.searchParam.type = '';
+    loadFormType(value)
 }
 
 const diyFormTableData: any = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    title: '',
-    type: '',
-    mode: '',
-    addon_name: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        title: '',
+        type: '',
+        mode: '',
+        addon_name: ''
+    }
 })
 
 const searchFormDiyFormRef = ref<FormInstance>()
 
 // 获取自定义表单列表
 const loadDiyFormList = (page: number = 1) => {
-  diyFormTableData.loading = true
-  diyFormTableData.page = page
-
-  getDiyFormPageList({
-    page: diyFormTableData.page,
-    limit: diyFormTableData.limit,
-    ...diyFormTableData.searchParam,
-  })
-    .then((res) => {
-      diyFormTableData.loading = false
-      diyFormTableData.data = res.data.data
-      diyFormTableData.total = res.data.total
-      setTablePageStorage(
-        diyFormTableData.page,
-        diyFormTableData.limit,
-        diyFormTableData.searchParam
-      )
-    })
-    .catch(() => {
-      diyFormTableData.loading = false
+    diyFormTableData.loading = true
+    diyFormTableData.page = page
+
+    getDiyFormPageList({
+        page: diyFormTableData.page,
+        limit: diyFormTableData.limit,
+        ...diyFormTableData.searchParam
+    }).then(res => {
+        diyFormTableData.loading = false
+        diyFormTableData.data = res.data.data
+        diyFormTableData.total = res.data.total
+        setTablePageStorage(diyFormTableData.page, diyFormTableData.limit, diyFormTableData.searchParam);
+    }).catch(() => {
+        diyFormTableData.loading = false
     })
 }
 
-loadDiyFormList(getTablePageStorage(diyFormTableData.searchParam).page)
+loadDiyFormList(getTablePageStorage(diyFormTableData.searchParam).page);
 
 const selectType = (index: number) => {
-  formData.type = index.toString()
+    formData.type = index.toString();
 }
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadDiyFormList()
+    if (!formEl) return
+    formEl.resetFields()
+    loadDiyFormList()
 }
 
 // 编辑自定义表单
 const editEvent = (data: any) => {
-  const url = router.resolve({
-    path: '/decorate/form/edit',
-    query: { form_id: data.form_id },
-  })
-  window.open(url.href)
+    const url = router.resolve({
+        path: '/decorate/form/edit',
+        query: { form_id: data.form_id }
+    })
+    window.open(url.href)
 }
 
 // 复制页面
 const copyEvent = (id: any) => {
-  ElMessageBox.confirm(t('diyFormCopyTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    if (repeat.value) return
-    repeat.value = true
-
-    copyForm({ form_id: id })
-      .then((res: any) => {
-        if (res.code == 1) {
-          loadDiyFormList()
+    ElMessageBox.confirm(t('diyFormCopyTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
         }
-        repeat.value = false
-      })
-      .catch(() => {
-        repeat.value = false
-      })
-  })
+    ).then(() => {
+        if (repeat.value) return
+        repeat.value = true
+
+        copyForm({form_id: id}).then((res: any) => {
+            if (res.code == 1) {
+                loadDiyFormList()
+            }
+            repeat.value = false
+        }).catch(() => {
+            repeat.value = false
+        })
+    })
 }
 
 // 删除自定义表单
 const deleteEvent = (form_id: number) => {
-  ElMessageBox.confirm(t('diyFormDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    deleteDiyForm({ form_ids: [form_id] })
-      .then(() => {
-        loadDiyFormList()
-      })
-      .catch(() => {})
-  })
+    ElMessageBox.confirm(t('diyFormDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        deleteDiyForm({ form_ids: [form_id] }).then(() => {
+            loadDiyFormList()
+        }).catch(() => {
+        })
+    })
 }
 // 批量复选框
-const toggleCheckbox = ref()
+const toggleCheckbox = ref();
 
 // 复选框中间状态
-const isIndeterminate = ref(false)
+const isIndeterminate = ref(false);
 
 // 监听批量复选框事件
 const toggleChange = (value: any) => {
-  isIndeterminate.value = false
-  diyFormListTableRef.value.toggleAllSelection()
-}
+  isIndeterminate.value = false;
+  diyFormListTableRef.value.toggleAllSelection();
+};
 
-const diyFormListTableRef = ref()
+const diyFormListTableRef = ref();
 
 // 选中数据
-const multipleSelection: any = ref([])
+const multipleSelection: any = ref([]);
 
 // 监听表格单行选中
 const handleSelectionChange = (val: []) => {
-  multipleSelection.value = val
-
-  toggleCheckbox.value = false
-  if (
-    multipleSelection.value.length > 0 &&
-    multipleSelection.value.length < diyFormTableData.data.length
-  ) {
-    isIndeterminate.value = true
-  } else {
-    isIndeterminate.value = false
-  }
-
-  if (multipleSelection.value.length == diyFormTableData.data.length) {
-    toggleCheckbox.value = true
-  }
-}
+    multipleSelection.value = val;
+
+    toggleCheckbox.value = false;
+    if (
+        multipleSelection.value.length > 0 &&
+        multipleSelection.value.length < diyFormTableData.data.length
+    ) {
+        isIndeterminate.value = true;
+    } else {
+        isIndeterminate.value = false;
+    }
+
+    if (multipleSelection.value.length == diyFormTableData.data.length) {
+        toggleCheckbox.value = true;
+    }
+};
 
 // 批量删除
 const batchDeleteForms = () => {
-  if (multipleSelection.value.length == 0) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('batchEmptySelectedFormsTips')}`,
-    })
-    return
-  }
-
-  ElMessageBox.confirm(t('batchFormsDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    if (repeat.value) return
-    repeat.value = true
-
-    const form_ids: any = []
-    multipleSelection.value.forEach((item: any) => {
-      form_ids.push(item.form_id)
-    })
+    if (multipleSelection.value.length == 0) {
+        ElMessage({
+        type: "warning",
+        message: `${t("batchEmptySelectedFormsTips")}`,
+        });
+        return;
+    }
 
-    deleteDiyForm({
-      form_ids: form_ids,
-    })
-      .then(() => {
-        loadDiyFormList()
-        repeat.value = false
-      })
-      .catch(() => {
-        repeat.value = false
-      })
-  })
-}
+    ElMessageBox.confirm(t("batchFormsDeleteTips"), t("warning"), {
+        confirmButtonText: t("confirm"),
+        cancelButtonText: t("cancel"),
+        type: "warning",
+    }).then(() => {
+        if (repeat.value) return;
+        repeat.value = true;
+
+        const form_ids: any = [];
+        multipleSelection.value.forEach((item: any) => {
+            form_ids.push(item.form_id);
+        });
+
+        deleteDiyForm({
+            form_ids: form_ids,
+        }).then(() => {
+            loadDiyFormList();
+        repeat.value = false;
+        }).catch(() => {
+        repeat.value = false;
+        });
+    });
+};
 
 // 跳转去预览
 const toPreview = (data: any) => {
-  const url = router.resolve({
-    path: '/preview/wap',
-    query: {
-      page: '/app/pages/index/diy_form?form_id=' + data.form_id,
-    },
-  })
-  window.open(url.href)
+    const url = router.resolve({
+        path: '/preview/wap',
+        query: {
+            page: '/app/pages/index/diy_form?form_id=' + data.form_id
+        }
+    });
+    window.open(url.href)
 }
 
 const tabShareType = ref('wechat')
 const sharePage = ref('')
 const shareFormId = ref(0)
 const shareFormData = reactive({
-  wechat: {
-    title: '',
-    desc: '',
-    url: '',
-  },
-  weapp: {
-    title: '',
-    url: '',
-  },
+    wechat: {
+        title: '',
+        desc: '',
+        url: ''
+    },
+    weapp: {
+        title: '',
+        url: ''
+    }
 })
 
 const shareDialogVisible = ref(false)
 const shareFormRules = computed(() => {
-  return {}
+    return {}
 })
 
 const shareFormRef = ref<FormInstance>()
 const openShare = async (row: any) => {
-  shareFormId.value = row.form_id
-  sharePage.value = row.title
-  const share = row.share
-  shareFormData.wechat = share.wechat
-  shareFormData.weapp = share.weapp
+    shareFormId.value = row.form_id
+    sharePage.value = row.title
+    const share = row.share
+    shareFormData.wechat = share.wechat
+    shareFormData.weapp = share.weapp
 
-  shareDialogVisible.value = true
+    shareDialogVisible.value = true
 }
 
 const shareEvent = async (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      editDiyFormShare({
-        form_id: shareFormId.value,
-        share: JSON.stringify(shareFormData),
-      })
-        .then(() => {
-          loadDiyFormList()
-          shareDialogVisible.value = false
-        })
-        .catch(() => {})
-    }
-  })
+    if (!formEl) return
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            editDiyFormShare({
+                form_id: shareFormId.value,
+                share: JSON.stringify(shareFormData)
+            }).then(() => {
+                loadDiyFormList()
+                shareDialogVisible.value = false
+            }).catch(() => {
+            })
+        }
+    })
 }
 
 // 表单推广
 const formSpreadPopupRef: any = ref(null)
 
 const spreadEvent = (data: any) => {
-  formSpreadPopupRef.value.show(data)
+    formSpreadPopupRef.value.show(data)
 }
 
 // 表单提交成功页弹出框
 const formSubmitPopupRef: any = ref(null)
 
 const submitConfigEvent = (data: any) => {
-  formSubmitPopupRef.value.setFormData(data)
-  formSubmitPopupRef.value.showDialog = true
+    formSubmitPopupRef.value.setFormData(data)
+    formSubmitPopupRef.value.showDialog = true
 }
 
 // 表单填写设置弹出框
 const formWritePopupRef: any = ref(null)
 
 const writeConfigEvent = (data: any) => {
-  formWritePopupRef.value.setFormData(data)
-  formWritePopupRef.value.showDialog = true
+    formWritePopupRef.value.setFormData(data)
+    formWritePopupRef.value.showDialog = true
 }
 
 /**
@@ -704,52 +534,51 @@ const writeConfigEvent = (data: any) => {
 const exportSureDialog = ref(null)
 const flag = ref(false)
 const handleExportClose = (val) => {
-  flag.value = val
+    flag.value = val
 }
 
 const diyFormDetailData: any = reactive({
-  form_id: 0,
+    form_id: 0,
 })
 const exportEvent = (data: any) => {
-  diyFormDetailData.form_id = data.form_id
-  flag.value = true
+    diyFormDetailData.form_id = data.form_id
+    flag.value = true
 }
+
 </script>
 
 <style lang="scss" scoped>
 .image-selection-container {
-  width: 100%;
-  display: flex;
-  gap: 20px;
-  justify-content: center;
+    width: 100%;
+    display: flex;
+    gap: 20px;
+    justify-content: center;
 }
 .image-option {
-  cursor: pointer;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  width: 300px;
-  border: 2px solid transparent;
-  border-radius: 10px;
-  transition:
-    border-color 0.3s ease,
-    box-shadow 0.3s ease;
-  overflow: hidden;
+    cursor: pointer;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    width: 300px;
+    border: 2px solid transparent;
+    border-radius: 10px;
+    transition: border-color 0.3s ease, box-shadow 0.3s ease;
+    overflow: hidden;
 }
 .image-option.selected {
-  border-color: var(--el-color-primary);
-  box-shadow: 0 0 10px var(--el-color-primary-light-9);
+    border-color: var(--el-color-primary);
+    box-shadow: 0 0 10px var(--el-color-primary-light-9);
 }
 .option-image {
-  width: 100%;
-  height: auto;
-  object-fit: cover;
+    width: 100%;
+    height: auto;
+    object-fit: cover;
 }
 .option-title {
-  margin-top: 10px;
-  font-size: 14px;
-  color: #303133;
-  font-weight: bold;
-  text-align: center;
+    margin-top: 10px;
+    font-size: 14px;
+    color: #303133;
+    font-weight: bold;
+    text-align: center;
 }
 </style>
diff --git a/admin/src/app/views/diy_form/records.vue b/admin/src/app/views/diy_form/records.vue
index 916077be..c509828d 100644
--- a/admin/src/app/views/diy_form/records.vue
+++ b/admin/src/app/views/diy_form/records.vue
@@ -1,372 +1,179 @@
 <template>
-  <el-drawer
-    v-model="showDialog"
-    :title="t('dataAndStatistics')"
-    direction="rtl"
-    size="70%"
-    :before-close="handleClose"
-    class="member-detail-drawer"
-  >
-    <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-      <el-tab-pane :label="t('detailData')" name="detail_data">
-        <el-card
-          class="box-card !border-none my-[10px] table-search-wrap"
-          shadow="never"
-        >
-          <el-form
-            :inline="true"
-            :model="formData.searchParam"
-            ref="searchFormDiyFormRef"
-          >
-            <el-form-item :label="t('fillInFormPerson')" prop="keyword">
-              <el-input
-                v-model.trim="formData.searchParam.keyword"
-                :placeholder="t('fillInFormPersonplaceholder')"
-              />
-            </el-form-item>
-            <el-form-item :label="t('fillInFormDate')" prop="create_time">
-              <el-date-picker
-                v-model="formData.searchParam.create_time"
-                type="datetimerange"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                :start-placeholder="t('startDate')"
-                :end-placeholder="t('endDate')"
-              />
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" @click="loadFormRecordsListFn()">{{
-                t('search')
-              }}</el-button>
-              <el-button @click="resetForm(searchFormDiyFormRef)">{{
-                t('reset')
-              }}</el-button>
-              <el-button type="primary" @click="exportEvent">{{
-                t('export')
-              }}</el-button>
-            </el-form-item>
-          </el-form>
-        </el-card>
+    <el-drawer v-model="showDialog" :title="t('dataAndStatistics')" direction="rtl" size="70%" :before-close="handleClose" class="member-detail-drawer">
+        <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
+            <el-tab-pane :label="t('detailData')" name="detail_data">
+                <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                    <el-form :inline="true" :model="formData.searchParam" ref="searchFormDiyFormRef">
+                        <el-form-item :label="t('fillInFormPerson')" prop="keyword">
+                            <el-input v-model.trim="formData.searchParam.keyword" :placeholder="t('fillInFormPersonplaceholder')" />
+                        </el-form-item>
+                        <el-form-item :label="t('fillInFormDate')" prop="create_time">
+                            <el-date-picker v-model="formData.searchParam.create_time" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+                        </el-form-item>
+                        <el-form-item>
+                            <el-button type="primary" @click="loadFormRecordsListFn()">{{ t('search') }}</el-button>
+                            <el-button @click="resetForm(searchFormDiyFormRef)">{{ t('reset') }}</el-button>
+                            <el-button type="primary" @click="exportEvent">{{ t('export') }}</el-button>
+                        </el-form-item>
+                    </el-form>
+                </el-card>
 
-        <el-table
-          :data="formData.data"
-          size="large"
-          v-loading="formData.loading"
-        >
-          <template #empty>
-            <span>{{ !formData.loading ? t('emptyData') : '' }}</span>
-          </template>
-          <el-table-column
-            fixed
-            :label="t('fillInFormPersonInfo')"
-            min-width="160"
-          >
-            <template #default="{ row }">
-              <div
-                class="flex items-center cursor-pointer"
-                @click="detailEvent(row.member.member_id)"
-              >
-                <div
-                  class="min-w-[50px] h-[50px] flex items-center justify-center"
-                >
-                  <el-image
-                    v-if="row.member.headimg"
-                    class="w-[50px] h-[50px]"
-                    :src="img(row.member.headimg)"
-                    fit="contain"
-                  >
-                    <template #error>
-                      <div class="image-slot">
-                        <img
-                          class="w-[50px] h-[50px] rounded-full"
-                          src="@/app/assets/images/member_head.png"
-                          alt=""
-                        />
-                      </div>
+                <el-table :data="formData.data" size="large" v-loading="formData.loading">
+                    <template #empty>
+                        <span>{{ !formData.loading ? t('emptyData') : '' }}</span>
                     </template>
-                  </el-image>
-                  <img
-                    class="w-[50px] h-[50px] rounded-full"
-                    v-else
-                    src="@/app/assets/images/member_head.png"
-                    alt=""
-                  />
-                </div>
-                <div class="ml-2">
-                  <span
-                    :title="row.member.nickname || row.member.username"
-                    class="multi-hidden"
-                    >{{ row.member.nickname || row.member.username }}</span
-                  >
-                  <span class="text-primary text-[12px]">{{
-                    row.member.mobile || ''
-                  }}</span>
-                </div>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            fixed
-            prop="create_time"
-            :label="t('fillInFormDate')"
-            min-width="120"
-          />
+                    <el-table-column fixed :label="t('fillInFormPersonInfo')" min-width="160">
+                        <template #default="{ row }">
+                            <div class="flex items-center cursor-pointer" @click="detailEvent(row.member.member_id)">
+                                <div class="min-w-[50px] h-[50px] flex items-center justify-center">
+                                    <el-image v-if="row.member.headimg" class="w-[50px] h-[50px]" :src="img(row.member.headimg)" fit="contain">
+                                        <template #error>
+                                            <div class="image-slot">
+                                                <img class="w-[50px] h-[50px] rounded-full" src="@/app/assets/images/member_head.png" alt="">
+                                            </div>
+                                        </template>
+                                    </el-image>
+                                    <img class="w-[50px] h-[50px] rounded-full" v-else src="@/app/assets/images/member_head.png" alt="">
+                                </div>
+                                <div class="ml-2">
+                                    <span :title="(row.member.nickname || row.member.username)" class="multi-hidden">{{row.member.nickname || row.member.username}}</span>
+                                    <span class="text-primary text-[12px]">{{row.member.mobile || ''}}</span>
+                                </div>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column fixed prop="create_time" :label="t('fillInFormDate')" min-width="120" />
 
-          <el-table-column
-            v-for="item in formFieldsList"
-            :key="item.field_key"
-            :label="item.field_name"
-            min-width="200"
-          >
-            <template #default="{ row }">
-              <!-- 动态渲染表单组件内容 -->
-              <template v-if="row.recordsFieldList[item.field_key]">
-                <component
-                  :is="row.recordsFieldList[item.field_key].detailComponent"
-                  :data="row.recordsFieldList[item.field_key]"
-                />
-              </template>
-            </template>
-          </el-table-column>
+                    <el-table-column v-for="item in formFieldsList" :key="item.field_key" :label="item.field_name" min-width="200">
+                        <template #default="{ row }">
+                            <!-- 动态渲染表单组件内容 -->
+                            <template v-if="row.recordsFieldList[item.field_key]">
+                                <component :is="row.recordsFieldList[item.field_key].detailComponent" :data="row.recordsFieldList[item.field_key]"/>
+                            </template>
+                        </template>
+                    </el-table-column>
 
-          <el-table-column
-            :label="t('operation')"
-            fixed="right"
-            align="right"
-            min-width="70"
-          >
-            <template #default="{ row }">
-              <!-- <el-button type="primary" link @click="formDetailEvent(row)">{{ t('详情') }}</el-button> -->
-              <el-button type="primary" link @click="deleteEvent(row)">{{
-                t('delete')
-              }}</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="formData.page"
-            v-model:page-size="formData.limit"
-            :page-sizes="[6, 10, 20, 30, 50, 100]"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="formData.total"
-            @size-change="loadFormRecordsListFn()"
-            @current-change="loadFormRecordsListFn"
-          />
-        </div>
-      </el-tab-pane>
-      <el-tab-pane :label="t('fillInFormPersonStatics')" name="member_stat">
-        <el-card
-          class="box-card !border-none my-[10px] table-search-wrap"
-          shadow="never"
-        >
-          <el-form
-            :inline="true"
-            :model="formMemberList.searchParam"
-            ref="searchFormDiyMemberRef"
-          >
-            <el-form-item :label="t('fillInFormPerson')" prop="keyword">
-              <el-input
-                v-model.trim="formMemberList.searchParam.keyword"
-                :placeholder="t('fillInFormPersonplaceholder')"
-              />
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" @click="getFormRecordsMemberFn()">{{
-                t('search')
-              }}</el-button>
-              <el-button @click="resetFormMember(searchFormDiyMemberRef)">{{
-                t('reset')
-              }}</el-button>
-              <el-button type="primary" @click="exportMemberEvent">{{
-                t('export')
-              }}</el-button>
-            </el-form-item>
-          </el-form>
-        </el-card>
-        <el-table
-          :data="formMemberList.data"
-          size="large"
-          v-loading="formMemberList.loading"
-        >
-          <template #empty>
-            <span>{{ !formMemberList.loading ? t('emptyData') : '' }}</span>
-          </template>
-          <el-table-column
-            fixed
-            :label="t('fillInFormPersonInfo')"
-            min-width="200"
-          >
-            <template #default="{ row }">
-              <div
-                class="flex items-center cursor-pointer"
-                @click="detailEvent(row.member.member_id)"
-              >
-                <div
-                  class="min-w-[50px] h-[50px] flex items-center justify-center"
-                >
-                  <el-image
-                    v-if="row.member.headimg"
-                    class="w-[50px] h-[50px]"
-                    :src="img(row.member.headimg)"
-                    fit="contain"
-                  >
-                    <template #error>
-                      <div class="image-slot">
-                        <img
-                          class="w-[50px] h-[50px] rounded-full"
-                          src="@/app/assets/images/member_head.png"
-                          alt=""
-                        />
-                      </div>
-                    </template>
-                  </el-image>
-                  <img
-                    class="w-[50px] h-[50px] rounded-full"
-                    v-else
-                    src="@/app/assets/images/member_head.png"
-                    alt=""
-                  />
+                    <el-table-column :label="t('operation')" fixed="right" align="right" min-width="70">
+                        <template #default="{ row }">
+                            <!-- <el-button type="primary" link @click="formDetailEvent(row)">{{ t('详情') }}</el-button> -->
+                            <el-button type="primary" link @click="deleteEvent(row)">{{ t('delete') }}</el-button>
+                        </template>
+                    </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="formData.page" v-model:page-size="formData.limit" :page-sizes="[6,10,20,30,50,100]"
+                                   layout="total, sizes, prev, pager, next, jumper" :total="formData.total"
+                                   @size-change="loadFormRecordsListFn()" @current-change="loadFormRecordsListFn" />
                 </div>
-                <div class="ml-2">
-                  <span
-                    :title="row.member.nickname || row.member.username"
-                    class="multi-hidden"
-                    >{{ row.member.nickname || row.member.username }}</span
-                  >
-                  <span class="text-primary text-[12px]">{{
-                    row.member.mobile || ''
-                  }}</span>
+            </el-tab-pane>
+            <el-tab-pane :label="t('fillInFormPersonStatics')" name="member_stat">
+                <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                    <el-form :inline="true" :model="formMemberList.searchParam" ref="searchFormDiyMemberRef">
+                        <el-form-item :label="t('fillInFormPerson')" prop="keyword">
+                            <el-input v-model.trim="formMemberList.searchParam.keyword" :placeholder="t('fillInFormPersonplaceholder')" />
+                        </el-form-item>
+                        <el-form-item>
+                            <el-button type="primary" @click="getFormRecordsMemberFn()">{{ t('search') }}</el-button>
+                            <el-button @click="resetFormMember(searchFormDiyMemberRef)">{{ t('reset') }}</el-button>
+                            <el-button type="primary" @click="exportMemberEvent">{{ t('export') }}</el-button>
+                        </el-form-item>
+                    </el-form>
+                </el-card>
+                <el-table :data="formMemberList.data" size="large" v-loading="formMemberList.loading">
+                    <template #empty>
+                        <span>{{ !formMemberList.loading ? t('emptyData') : '' }}</span>
+                    </template>
+                    <el-table-column fixed :label="t('fillInFormPersonInfo')" min-width="200">
+                        <template #default="{ row }">
+                            <div class="flex items-center cursor-pointer" @click="detailEvent(row.member.member_id)">
+                                <div class="min-w-[50px] h-[50px] flex items-center justify-center">
+                                    <el-image v-if="row.member.headimg" class="w-[50px] h-[50px]" :src="img(row.member.headimg)" fit="contain">
+                                        <template #error>
+                                            <div class="image-slot">
+                                                <img class="w-[50px] h-[50px] rounded-full" src="@/app/assets/images/member_head.png" alt="">
+                                            </div>
+                                        </template>
+                                    </el-image>
+                                    <img class="w-[50px] h-[50px] rounded-full" v-else src="@/app/assets/images/member_head.png" alt="">
+                                </div>
+                                <div class="ml-2">
+                                    <span :title="(row.member.nickname || row.member.username)" class="multi-hidden">{{row.member.nickname || row.member.username}}</span>
+                                    <span class="text-primary text-[12px]">{{row.member.mobile || ''}}</span>
+                                </div>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <!-- <el-table-column fixed prop="create_time" :label="t('填表时间')" min-width="120" /> -->
+                    <el-table-column fixed prop="create_time" :label="t('fillInFormTotal')" min-width="500">
+                        <template #default="{ row }" @click="">
+                            {{ row.write_count }}
+                        </template>
+                     </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="formMemberList.page" v-model:page-size="formMemberList.limit"
+                                   layout="total, sizes, prev, pager, next, jumper" :total="formMemberList.total"
+                                   @size-change="getFormRecordsMemberFn()" @current-change="getFormRecordsMemberFn()" />
                 </div>
-              </div>
-            </template>
-          </el-table-column>
-          <!-- <el-table-column fixed prop="create_time" :label="t('填表时间')" min-width="120" /> -->
-          <el-table-column
-            fixed
-            prop="create_time"
-            :label="t('fillInFormTotal')"
-            min-width="500"
-          >
-            <template #default="{ row }" @click="">
-              {{ row.write_count }}
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="formMemberList.page"
-            v-model:page-size="formMemberList.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="formMemberList.total"
-            @size-change="getFormRecordsMemberFn()"
-            @current-change="getFormRecordsMemberFn()"
-          />
-        </div>
-      </el-tab-pane>
-      <el-tab-pane :label="t('fieldStatistics')" name="field_stat">
-        <el-card
-          class="box-card !border-none my-[10px] table-search-wrap"
-          shadow="never"
-        >
-          <el-form
-            :inline="true"
-            :model="formData.searchParam"
-            ref="searchFormDiyFieldsRef"
-          >
-            <el-form-item>
-              <el-button type="primary" @click="exportFieldsEvent">{{
-                t('export')
-              }}</el-button>
-            </el-form-item>
-          </el-form>
-        </el-card>
-        <el-collapse v-model="activeNames" class="diy-collapse mt-[15px]">
-          <el-collapse-item
-            :title="item.field_name"
-            :name="item.field_id"
-            v-for="(item, index) in formFieldsStat"
-            :key="index"
-          >
-            <template #title>
-              <div class="text-[16px] font-bold">{{ item.field_name }}</div>
-            </template>
-            <el-table :data="item.value_list" border>
-              <el-table-column :label="item.field_name" prop="render_value">
-                <template #default="{ row }">
-                  {{ row.render_value ? row.render_value : '未填写' }}
-                </template>
-              </el-table-column>
-              <el-table-column
-                label="小计"
-                prop="write_count"
-              ></el-table-column>
-              <el-table-column label="比例">
-                <template #default="{ row }">
-                  <el-progress :percentage="row.write_percent"></el-progress>
-                </template>
-              </el-table-column>
-            </el-table>
-          </el-collapse-item>
-        </el-collapse>
-      </el-tab-pane>
-    </el-tabs>
 
-    <el-dialog
-      v-model="dialogVisible"
-      :title="t('viewInformation')"
-      width="400px"
-    >
-      <div class="flex flex-col">
-        <div
-          class="flex mb-[10px]"
-          v-for="(item, index) in formDetail"
-          :key="index"
-        >
-          <div class="flex justify-end w-[100px]">{{ item.label }}：</div>
-          <div class="flex ml-[20px]">
-            <div
-              v-if="Array.isArray(item.text)"
-              class="mr-[10px]"
-              v-for="(textItem, i) in item.text"
-              :key="i"
-            >
-              {{ textItem }}
+            </el-tab-pane>
+            <el-tab-pane :label="t('fieldStatistics')" name="field_stat">
+                <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                    <el-form :inline="true" :model="formData.searchParam" ref="searchFormDiyFieldsRef">
+                        <el-form-item>
+                            <el-button type="primary" @click="exportFieldsEvent">{{ t('export') }}</el-button>
+                        </el-form-item>
+                    </el-form>
+                </el-card>
+                <el-collapse v-model="activeNames" class="diy-collapse mt-[15px]">
+                    <el-collapse-item :title="item.field_name" :name="item.field_id" v-for="(item, index) in formFieldsStat" :key="index">
+                        <template #title>
+                            <div class="text-[16px] font-bold">{{item.field_name}}</div>
+                        </template>
+                        <el-table :data="item.value_list" border>
+                            <el-table-column :label="item.field_name" prop="render_value">
+                                <template #default="{ row }">
+                                    {{row.render_value ? row.render_value : '未填写'}}
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="小计" prop="write_count"></el-table-column>
+                            <el-table-column label="比例">
+                                <template #default="{ row }">
+                                    <el-progress :percentage="row.write_percent"></el-progress>
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                    </el-collapse-item>
+                </el-collapse>
+            </el-tab-pane>
+        </el-tabs>
+
+        <el-dialog v-model="dialogVisible" :title="t('viewInformation')" width="400px">
+            <div class="flex flex-col">
+                <div class="flex mb-[10px]"  v-for="(item, index) in formDetail"  :key="index">
+                    <div class="flex justify-end w-[100px]">{{ item.label }}：</div>
+                    <div class="flex ml-[20px]">
+                        <div v-if="Array.isArray(item.text)" class="mr-[10px]" v-for="(textItem, i) in item.text" :key="i">
+                            {{ textItem }}
+                        </div>
+                        <div v-else>{{ item.text }}</div>
+                    </div>
+                </div>
             </div>
-            <div v-else>{{ item.text }}</div>
-          </div>
-        </div>
-      </div>
 
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button type="primary" @click="dialogVisible = false">{{
-            t('confirm')
-          }}</el-button>
-        </span>
-      </template>
-    </el-dialog>
-  </el-drawer>
-  <export-sure
-    ref="exportSureDialog"
-    :show="flag"
-    type="diy_form_records"
-    :searchParam="formData.searchParam"
-    @close="handleExportClose"
-  />
-  <export-sure
-    ref="exportSureDialog"
-    :show="flagMember"
-    type="diy_form_records_member"
-    :searchParam="formMemberList.searchParam"
-    @close="handleMemberExportClose"
-  />
-  <export-sure
-    ref="exportSureDialog"
-    :show="flagFields"
-    type="diy_form_records_fields"
-    :searchParam="formData.searchParam"
-    @close="handleFieldsExportClose"
-  />
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button type="primary" @click="dialogVisible = false">{{ t('confirm') }}</el-button>
+                </span>
+            </template>
+        </el-dialog>
+
+    </el-drawer>
+    <export-sure ref="exportSureDialog" :show="flag" type="diy_form_records" :searchParam="formData.searchParam" @close="handleExportClose" />
+    <export-sure ref="exportSureDialog" :show="flagMember" type="diy_form_records_member" :searchParam="formMemberList.searchParam" @close="handleMemberExportClose" />
+    <export-sure ref="exportSureDialog" :show="flagFields" type="diy_form_records_fields" :searchParam="formData.searchParam" @close="handleFieldsExportClose" />
 </template>
 
 <script lang="ts" setup>
@@ -571,13 +378,14 @@ defineExpose({
 })
 </script>
 <style lang="scss">
-.diy-collapse .el-collapse-item__header {
-  display: flex;
-  flex-direction: row-reverse;
-  justify-content: flex-end;
-  .el-icon.el-collapse-item__arrow {
-    margin-left: inherit;
-    margin-right: 10px;
-  }
+.diy-collapse .el-collapse-item__header{
+    display: flex;
+    flex-direction: row-reverse;
+    justify-content: flex-end;
+    .el-icon.el-collapse-item__arrow{
+        margin-left: inherit;
+        margin-right: 10px;
+    }
 }
+
 </style>
diff --git a/admin/src/app/views/error/404.vue b/admin/src/app/views/error/404.vue
index 66aeb74d..474fcc0e 100644
--- a/admin/src/app/views/error/404.vue
+++ b/admin/src/app/views/error/404.vue
@@ -1,27 +1,22 @@
 <template>
-  <div class="error">
-    <div class="flex items-center">
-      <slot name="content">
-        <div>
-          <img class="w-[240px]" src="@/app/assets/images/error.png" />
-        </div>
-      </slot>
-      <div class="text-left ml-[100px]">
-        <div class="error-text text-[28px] font-bold">404错误！</div>
-        <div class="text-[#222] text-[20px] mt-[15px]">
-          哎呀，出错了！您访问的页面不存在...
-        </div>
-        <div class="text-[#c4c2c2] text-[12px] mt-[5px]">
-          尝试检查URL的错误，然后点击浏览器刷新按钮。
-        </div>
-        <div class="mt-[40px]">
-          <el-button class="bottom" @click="router.go(-1)"
-            >{{ second }} 秒后返回上一页</el-button
-          >
+    <div class="error">
+        <div class="flex items-center">
+            <slot name="content">
+                <div>
+                    <img class="w-[240px]" src="@/app/assets/images/error.png" />
+                </div>
+            </slot>
+            <div class="text-left ml-[100px]">
+                <div class="error-text text-[28px] font-bold">404错误！</div>
+                <div class="text-[#222] text-[20px] mt-[15px]">哎呀，出错了！您访问的页面不存在...</div>
+                <div class="text-[#c4c2c2] text-[12px] mt-[5px]">尝试检查URL的错误，然后点击浏览器刷新按钮。</div>
+                <div class="mt-[40px]">
+                    <el-button class="bottom" @click="router.go(-1)">{{ second }} 秒后返回上一页</el-button>
+                </div>
+            </div>
+
         </div>
-      </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
@@ -33,40 +28,40 @@ const second = ref(5)
 const router = useRouter()
 
 timer = setInterval(() => {
-  if (second.value === 0) {
-    clearInterval(timer)
-    router.go(-1)
-  } else {
-    second.value--
-  }
+    if (second.value === 0) {
+        clearInterval(timer)
+        router.go(-1)
+    } else {
+        second.value--
+    }
 }, 1000)
 
 onUnmounted(() => {
-  timer && clearInterval(timer)
+    timer && clearInterval(timer)
 })
 </script>
 
 <style lang="scss" scoped>
 .error {
-  text-align: center;
-  height: 100vh;
-  display: flex;
-  justify-content: center;
-  align-items: center;
+    text-align: center;
+    height: 100vh;
+    display: flex;
+    justify-content: center;
+    align-items: center;
 
-  .error-code {
-    @apply text-primary;
-    font-size: 150px;
-  }
+    .error-code {
+        @apply text-primary;
+        font-size: 150px;
+    }
 
-  .error-text {
-    color: #0e77fd;
-  }
+    .error-text {
+        color: #0e77fd;
+    }
 
-  .el-button {
-    width: 176px;
-    background-color: #0e77fd;
-    color: #fff;
-  }
+    .el-button {
+        width: 176px;
+        background-color: #0e77fd;
+        color: #fff
+    }
 }
 </style>
diff --git a/admin/src/app/views/finance/account.vue b/admin/src/app/views/finance/account.vue
index 34d8de5b..95d15a70 100644
--- a/admin/src/app/views/finance/account.vue
+++ b/admin/src/app/views/finance/account.vue
@@ -1,252 +1,169 @@
 <template>
-  <!--财务流水-->
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
+    <!--财务流水-->
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
 
-      <el-card class="box-card !border-none !px-[35px]" shadow="never">
-        <el-row class="flex">
-          <el-col :span="8" class="min-w-[100px]">
-            <div class="statistic-card">
-              <el-statistic
-                :value="accountStat.pay ? accountStat.pay.toFixed(2) : '0.00'"
-              ></el-statistic>
-              <div class="statistic-footer">
-                <div class="footer-item text-[14px] text-[#666]">
-                  <span>{{ t('totalPay') }}</span>
-                </div>
-              </div>
-            </div>
-          </el-col>
-          <el-col :span="8" class="min-w-[100px]">
-            <div class="statistic-card">
-              <el-statistic
-                :value="
-                  accountStat.refund ? accountStat.refund.toFixed(2) : '0.00'
-                "
-              ></el-statistic>
-              <div class="statistic-footer">
-                <div class="footer-item text-[14px] text-[#666]">
-                  <span>{{ t('totalRefund') }}</span>
-                </div>
-              </div>
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
             </div>
-          </el-col>
-          <el-col :span="8" class="min-w-[100px]">
-            <div class="statistic-card">
-              <el-statistic
-                :value="
-                  accountStat.transfer
-                    ? accountStat.transfer.toFixed(2)
-                    : '0.00'
-                "
-              ></el-statistic>
-              <div class="statistic-footer">
-                <div class="footer-item text-[14px] text-[#666]">
-                  <span>{{ t('totalTransfer') }}</span>
-                </div>
-              </div>
-            </div>
-          </el-col>
-        </el-row>
-      </el-card>
 
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="siteAccountLogTable.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('type')" class="items-center" prop="type">
-            <el-select
-              v-model="siteAccountLogTable.searchParam.type"
-              class="m-2"
-              :placeholder="t('accountType')"
-            >
-              <el-option :label="t('all')" value="" />
-              <el-option
-                v-for="(item, index) in accountType"
-                :key="index"
-                :label="item"
-                :value="index"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="t('tradeNo')" prop="trade_no">
-            <el-input
-              v-model.trim="siteAccountLogTable.searchParam.trade_no"
-              :placeholder="t('tradeNoPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('createTime')" prop="create_time">
-            <el-date-picker
-              v-model="siteAccountLogTable.searchParam.create_time"
-              type="datetimerange"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              :start-placeholder="t('startDate')"
-              :end-placeholder="t('endDate')"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="loadSiteAccountLogList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
+            <el-card class="box-card !border-none !px-[35px]" shadow="never">
+                <el-row class="flex">
+                    <el-col :span="8" class="min-w-[100px]">
+                        <div class="statistic-card">
+                            <el-statistic :value="accountStat.pay ? accountStat.pay.toFixed(2) : '0.00'"></el-statistic>
+                            <div class="statistic-footer">
+                                <div class="footer-item text-[14px] text-[#666]">
+                                    <span>{{ t('totalPay') }}</span>
+                                </div>
+                            </div>
+                        </div>
+                    </el-col>
+                    <el-col :span="8" class="min-w-[100px]">
+                        <div class="statistic-card">
+                            <el-statistic :value="accountStat.refund ? accountStat.refund.toFixed(2) : '0.00'"></el-statistic>
+                            <div class="statistic-footer">
+                                <div class="footer-item text-[14px] text-[#666]">
+                                    <span>{{ t('totalRefund') }}</span>
+                                </div>
+                            </div>
+                        </div>
+                    </el-col>
+                    <el-col :span="8" class="min-w-[100px]">
+                        <div class="statistic-card">
+                            <el-statistic :value="accountStat.transfer ? accountStat.transfer.toFixed(2) : '0.00'"></el-statistic>
+                            <div class="statistic-footer">
+                                <div class="footer-item text-[14px] text-[#666]">
+                                    <span>{{ t('totalTransfer') }}</span>
+                                </div>
+                            </div>
+                        </div>
+                    </el-col>
+                </el-row>
+            </el-card>
 
-      <div class="mt-[10px]">
-        <el-table
-          :data="siteAccountLogTable.data"
-          size="large"
-          v-loading="siteAccountLogTable.loading"
-        >
-          <template #empty>
-            <span>{{
-              !siteAccountLogTable.loading ? t('emptyData') : ''
-            }}</span>
-          </template>
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="siteAccountLogTable.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('type')" class="items-center" prop="type">
+                        <el-select v-model="siteAccountLogTable.searchParam.type" class="m-2" :placeholder="t('accountType')">
+                            <el-option :label="t('all')" value="" />
+                            <el-option v-for="(item, index) in accountType" :key="index" :label="item" :value="index" />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item :label="t('tradeNo')" prop="trade_no">
+                        <el-input v-model.trim="siteAccountLogTable.searchParam.trade_no" :placeholder="t('tradeNoPlaceholder')" />
+                    </el-form-item>
+                    <el-form-item :label="t('createTime')" prop="create_time">
+                        <el-date-picker v-model="siteAccountLogTable.searchParam.create_time" type="datetimerange"
+                            value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')"
+                            :end-placeholder="t('endDate')" />
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="loadSiteAccountLogList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
 
-          <el-table-column
-            prop="trade_no"
-            :label="t('tradeNo')"
-            min-width="120"
-          />
-          <el-table-column
-            prop="type_name"
-            :label="t('type')"
-            min-width="120"
-          />
-          <el-table-column
-            prop="money"
-            :label="t('money')"
-            min-width="120"
-            align="right"
-          />
-          <el-table-column
-            :label="t('createTime')"
-            min-width="150"
-            align="center"
-          >
-            <template #default="{ row }">
-              {{ row.create_time || '' }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            :label="t('operation')"
-            align="right"
-            fixed="right"
-            min-width="120"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="detailEvent(row)">{{
-                t('detail')
-              }}</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+            <div class="mt-[10px]">
+                <el-table :data="siteAccountLogTable.data" size="large" v-loading="siteAccountLogTable.loading">
+                    <template #empty>
+                        <span>{{ !siteAccountLogTable.loading ? t('emptyData') : '' }}</span>
+                    </template>
+
+                    <el-table-column prop="trade_no" :label="t('tradeNo')" min-width="120" />
+                    <el-table-column prop="type_name" :label="t('type')" min-width="120" />
+                    <el-table-column prop="money" :label="t('money')" min-width="120" align="right" />
+                    <el-table-column :label="t('createTime')" min-width="150" align="center">
+                        <template #default="{ row }">
+                            {{ row.create_time || '' }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('operation')" align="right" fixed="right" min-width="120">
+                        <template #default="{ row }">
+                            <el-button type="primary" link @click="detailEvent(row)">{{ t('detail') }}</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
 
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="siteAccountLogTable.page"
-            v-model:page-size="siteAccountLogTable.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="siteAccountLogTable.total"
-            @size-change="loadSiteAccountLogList()"
-            @current-change="loadSiteAccountLogList"
-          />
-        </div>
-      </div>
-    </el-card>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="siteAccountLogTable.page"
+                        v-model:page-size="siteAccountLogTable.limit" layout="total, sizes, prev, pager, next, jumper"
+                        :total="siteAccountLogTable.total" @size-change="loadSiteAccountLogList()"
+                        @current-change="loadSiteAccountLogList" />
+                </div>
+            </div>
+        </el-card>
 
-    <el-dialog
-      v-model="showDialog"
-      :title="t('accountDetail')"
-      width="550px"
-      :destroy-on-close="true"
-    >
-      <el-form
-        :model="formData"
-        label-width="110px"
-        ref="formRef"
-        class="page-form"
-      >
-        <!--				<el-form-item :label="t('tradeNo')">-->
-        <!--					<div class="input-width"> {{ formData.trade_no }} </div>-->
-        <!--				</el-form-item>-->
-        <el-form-item :label="t('type')">
-          <div class="input-width">{{ formData.type_name }}</div>
-        </el-form-item>
-        <el-form-item :label="t('money')">
-          <div class="input-width">{{ formData.money }}</div>
-        </el-form-item>
-        <el-form-item :label="t('createTime')">
-          <div class="input-width">{{ formData.create_time }}</div>
-        </el-form-item>
-        <div v-if="formData.type == 'transfer'">
-          <el-form-item :label="t('transferNo')">
-            <div class="input-width">{{ formData.pay_info.transfer_no }}</div>
-          </el-form-item>
-          <el-form-item :label="t('transferTime')">
-            <div class="input-width">{{ formData.pay_info.transfer_time }}</div>
-          </el-form-item>
-          <el-form-item :label="t('transferType')">
-            <div class="input-width">{{ formData.pay_info.transfer_type }}</div>
-          </el-form-item>
-          <el-form-item :label="t('transferMoney')">
-            <div class="input-width">{{ formData.pay_info.money }}</div>
-          </el-form-item>
-          <el-form-item :label="t('transferRemark')">
-            <div class="input-width">{{ formData.pay_info.remark }}</div>
-          </el-form-item>
-        </div>
-        <div v-if="formData.type == 'refund'">
-          <el-form-item :label="t('outTradeNo')">
-            <div class="input-width">{{ formData.pay_info.out_trade_no }}</div>
-          </el-form-item>
-          <el-form-item :label="t('createTime')">
-            <div class="input-width">{{ formData.pay_info.create_time }}</div>
-          </el-form-item>
-          <el-form-item :label="t('refundMoney')">
-            <div class="input-width">{{ formData.pay_info.money }}</div>
-          </el-form-item>
-          <el-form-item :label="t('failReason')">
-            <div class="input-width">{{ formData.pay_info.fail_reason }}</div>
-          </el-form-item>
-        </div>
-        <div v-if="formData.type == 'pay'">
-          <el-form-item :label="t('outTradeNo')">
-            <div class="input-width">{{ formData.pay_info.out_trade_no }}</div>
-          </el-form-item>
-          <el-form-item :label="t('createTime')">
-            <div class="input-width">{{ formData.pay_info.create_time }}</div>
-          </el-form-item>
-          <el-form-item :label="t('money')">
-            <div class="input-width">{{ formData.pay_info.money }}</div>
-          </el-form-item>
-          <el-form-item :label="t('body')">
-            <div class="input-width">{{ formData.pay_info.body }}</div>
-          </el-form-item>
-        </div>
-      </el-form>
+        <el-dialog v-model="showDialog" :title="t('accountDetail')" width="550px" :destroy-on-close="true">
+            <el-form :model="formData" label-width="110px" ref="formRef" class="page-form">
 
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button type="primary" @click="showDialog = false">{{
-            t('confirm')
-          }}</el-button>
-        </span>
-      </template>
-    </el-dialog>
-  </div>
+<!--				<el-form-item :label="t('tradeNo')">-->
+<!--					<div class="input-width"> {{ formData.trade_no }} </div>-->
+<!--				</el-form-item>-->
+                <el-form-item :label="t('type')">
+                    <div class="input-width"> {{ formData.type_name }} </div>
+                </el-form-item>
+                <el-form-item :label="t('money')">
+                    <div class="input-width"> {{ formData.money }} </div>
+                </el-form-item>
+                <el-form-item :label="t('createTime')">
+                    <div class="input-width"> {{ formData.create_time }} </div>
+                </el-form-item>
+                <div v-if="formData.type == 'transfer'">
+                    <el-form-item :label="t('transferNo')">
+                        <div class="input-width"> {{ formData.pay_info.transfer_no }} </div>
+                    </el-form-item>
+                    <el-form-item :label="t('transferTime')">
+                        <div class="input-width"> {{ formData.pay_info.transfer_time }} </div>
+                    </el-form-item>
+                    <el-form-item :label="t('transferType')">
+                        <div class="input-width"> {{ formData.pay_info.transfer_type }} </div>
+                    </el-form-item>
+                    <el-form-item :label="t('transferMoney')">
+                        <div class="input-width"> {{ formData.pay_info.money }} </div>
+                    </el-form-item>
+                    <el-form-item :label="t('transferRemark')">
+                        <div class="input-width"> {{ formData.pay_info.remark }} </div>
+                    </el-form-item>
+                </div>
+                <div v-if="formData.type == 'refund'">
+                    <el-form-item :label="t('outTradeNo')">
+                        <div class="input-width"> {{ formData.pay_info.out_trade_no }} </div>
+                    </el-form-item>
+                    <el-form-item :label="t('createTime')">
+                        <div class="input-width"> {{ formData.pay_info.create_time }} </div>
+                    </el-form-item>
+                    <el-form-item :label="t('refundMoney')">
+                        <div class="input-width"> {{ formData.pay_info.money }} </div>
+                    </el-form-item>
+                    <el-form-item :label="t('failReason')">
+                        <div class="input-width"> {{ formData.pay_info.fail_reason }} </div>
+                    </el-form-item>
+                </div>
+                <div v-if="formData.type == 'pay'">
+                    <el-form-item :label="t('outTradeNo')">
+                        <div class="input-width"> {{ formData.pay_info.out_trade_no }} </div>
+                    </el-form-item>
+                    <el-form-item :label="t('createTime')">
+                        <div class="input-width"> {{ formData.pay_info.create_time }} </div>
+                    </el-form-item>
+                    <el-form-item :label="t('money')">
+                        <div class="input-width"> {{ formData.pay_info.money }} </div>
+                    </el-form-item>
+                    <el-form-item :label="t('body')">
+                        <div class="input-width"> {{ formData.pay_info.body }} </div>
+                    </el-form-item>
+                </div>
+            </el-form>
+
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button type="primary" @click="showDialog = false">{{ t('confirm') }}</el-button>
+                </span>
+            </template>
+        </el-dialog>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -260,102 +177,97 @@ const route = useRoute()
 const pageName = route.meta.title
 
 const siteAccountLogTable = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    type: '',
-    money: '',
-    trade_no: '',
-    create_time: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        type: '',
+        money: '',
+        trade_no: '',
+        create_time: ''
+    }
 })
 
 const searchFormRef = ref<FormInstance>()
 
 // 去空操作
-watch(
-  () => siteAccountLogTable.searchParam.trade_no,
-  (nval) => {
-    siteAccountLogTable.searchParam.trade_no = nval.trim()
-  }
-)
+watch(() => siteAccountLogTable.searchParam.trade_no, (nval) => {
+    siteAccountLogTable.searchParam.trade_no = nval.trim();
+})
 
 /**
  * 获取站点账单记录列表
  */
 const loadSiteAccountLogList = (page: number = 1) => {
-  siteAccountLogTable.loading = true
-  siteAccountLogTable.page = page
+    siteAccountLogTable.loading = true
+    siteAccountLogTable.page = page
 
-  getAccountList({
-    page: siteAccountLogTable.page,
-    limit: siteAccountLogTable.limit,
-    ...siteAccountLogTable.searchParam,
-  })
-    .then((res) => {
-      siteAccountLogTable.loading = false
-      siteAccountLogTable.data = res.data.data
-      siteAccountLogTable.total = res.data.total
-    })
-    .catch(() => {
-      siteAccountLogTable.loading = false
+    getAccountList({
+        page: siteAccountLogTable.page,
+        limit: siteAccountLogTable.limit,
+        ...siteAccountLogTable.searchParam
+    }).then(res => {
+        siteAccountLogTable.loading = false
+        siteAccountLogTable.data = res.data.data
+        siteAccountLogTable.total = res.data.total
+    }).catch(() => {
+        siteAccountLogTable.loading = false
     })
 }
 loadSiteAccountLogList()
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadSiteAccountLogList()
+    if (!formEl) return
+    formEl.resetFields()
+    loadSiteAccountLogList()
 }
 
 const accountType = ref([])
 const checkAccountType = () => {
-  getAccountType().then((res) => {
-    accountType.value = res.data
-  })
+    getAccountType().then(res => {
+        accountType.value = res.data
+    })
 }
 checkAccountType()
 const showDialog = ref(false)
 const formData = ref({
-  trade_no: '',
-  type_name: '',
-  money: 0,
-  create_time: '',
-  type: '',
-  pay_info: {
-    transfer_no: '',
-    transfer_time: '',
-    transfer_type: '',
+    trade_no: '',
+    type_name: '',
     money: 0,
-    remark: '',
-    out_trade_no: '',
     create_time: '',
-    fail_reason: '',
-    body: '',
-  },
+    type: '',
+    pay_info: {
+        transfer_no: '',
+        transfer_time: '',
+        transfer_type: '',
+        money: 0,
+        remark: '',
+        out_trade_no: '',
+        create_time: '',
+        fail_reason: '',
+        body: ''
+    }
 })
-const detailEvent = (info: any) => {
-  showDialog.value = true
-  formData.value = info
+const detailEvent = (info:any) => {
+    showDialog.value = true
+    formData.value = info
 }
 
-interface AccountStat {
-  pay: number
-  refund: number
-  transfer: number
+interface AccountStat{
+    pay: number,
+    refund: number,
+    transfer: number
 }
 
 const accountStat = ref<AccountStat>({
-  pay: 0,
-  refund: 0,
-  transfer: 0,
+    pay: 0,
+    refund: 0,
+    transfer: 0
 })
 const checkAccountStat = async () => {
-  accountStat.value = await (await getAccountStat()).data
+    accountStat.value = await (await getAccountStat()).data
 }
 checkAccountStat()
 </script>
diff --git a/admin/src/app/views/finance/cash_out.vue b/admin/src/app/views/finance/cash_out.vue
index ab3cfd79..c3e21eac 100644
--- a/admin/src/app/views/finance/cash_out.vue
+++ b/admin/src/app/views/finance/cash_out.vue
@@ -1,858 +1,488 @@
 <template>
-  <!--会员提现-->
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
+    <!--会员提现-->
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
 
-      <el-card class="box-card !border-none !px-[35px]" shadow="never">
-        <el-row class="flex">
-          <el-col :span="12">
-            <div class="statistic-card">
-              <el-statistic
-                :value="
-                  statistics.transfered
-                    ? statistics.transfered.toFixed(2)
-                    : '0.00'
-                "
-              ></el-statistic>
-              <div class="statistic-footer">
-                <div class="footer-item text-[14px] text-[#666]">
-                  <span>{{ t('totalTransfered') }}</span>
-                </div>
-              </div>
-            </div>
-          </el-col>
-          <el-col :span="12">
-            <div class="statistic-card">
-              <el-statistic
-                :value="
-                  statistics.cash_outing
-                    ? statistics.cash_outing.toFixed(2)
-                    : '0'
-                "
-              ></el-statistic>
-              <div class="statistic-footer">
-                <div class="footer-item text-[14px] text-[#666]">
-                  <span>{{ t('totalCashOuting') }}</span>
-                </div>
-              </div>
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
             </div>
-          </el-col>
-        </el-row>
-      </el-card>
-
-      <el-card
-        class="box-card !border-none mb-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="orderTableData.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('applyTime')" prop="create_time">
-            <el-date-picker
-              v-model="orderTableData.searchParam.create_time"
-              type="datetimerange"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              :start-placeholder="t('startDate')"
-              :end-placeholder="t('endDate')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('cashOutNumber')" prop="cash_out_no">
-            <el-input
-              v-model.trim="orderTableData.searchParam.cash_out_no"
-              class="w-[240px]"
-              :placeholder="t('cashOutNumberPlaceholder')"
-            />
-          </el-form-item>
 
-          <el-form-item :label="t('memberInfo')" prop="keywords">
-            <el-input
-              v-model.trim="orderTableData.searchParam.keywords"
-              class="w-[240px]"
-              :placeholder="t('memberInfoPlaceholder')"
-            />
-          </el-form-item>
-
-          <el-form-item :label="t('cashOutMethod')" prop="transfer_type">
-            <el-select
-              v-model="orderTableData.searchParam.transfer_type"
-              clearable
-              class="input-width"
-            >
-              <el-option :label="t('selectPlaceholder')" value="" />
-              <el-option
-                :label="item.name"
-                :value="key"
-                v-for="(item, key) in Transfertype"
-                :key="key"
-              />
-            </el-select>
-          </el-form-item>
-
-          <el-form-item :label="t('cashOutStatus')" prop="status">
-            <el-select
-              v-model="orderTableData.searchParam.status"
-              clearable
-              class="input-width"
-            >
-              <el-option :label="t('selectPlaceholder')" value="" />
-              <el-option
-                :label="item"
-                :value="key"
-                v-for="(item, key) in cashOutStatusList"
-                :key="key"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="t('auditTime')" prop="audit_time">
-            <el-date-picker
-              v-model="orderTableData.searchParam.audit_time"
-              type="datetimerange"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              :start-placeholder="t('startDate')"
-              :end-placeholder="t('endDate')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('transferTime')" prop="transfer_time">
-            <el-date-picker
-              v-model="orderTableData.searchParam.transfer_time"
-              type="datetimerange"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              :start-placeholder="t('startDate')"
-              :end-placeholder="t('endDate')"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="loadOrderList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
-
-      <div class="mt-[10px]">
-        <el-table :data="orderTableData.data" size="large" class="table-top">
-          <el-table-column :label="t('memberInfo')" min-width="180" />
-          <el-table-column
-            :label="t('cashOutMethod')"
-            align="center"
-            min-width="100"
-          />
-          <el-table-column :label="t('cashOutInfo')" min-width="180" />
-          <el-table-column
-            :label="t('applicationForWithdrawalAmount')"
-            align="center"
-            min-width="120"
-          />
-          <el-table-column
-            :label="t('actualTransferAmount')"
-            align="center"
-            min-width="120"
-          />
-          <el-table-column
-            :label="t('cashOutCommission')"
-            align="center"
-            min-width="110"
-          />
-          <el-table-column
-            :label="t('cashOutStatus')"
-            align="center"
-            min-width="100"
-          />
-          <el-table-column
-            :label="t('applyTime')"
-            align="center"
-            min-width="160"
-          />
-          <el-table-column
-            :label="t('auditTime')"
-            align="center"
-            min-width="160"
-          />
-          <el-table-column
-            :label="t('transferTime')"
-            align="center"
-            min-width="160"
-          />
-          <el-table-column
-            :label="t('operation')"
-            fixed="right"
-            align="right"
-            min-width="120"
-          />
-        </el-table>
-        <div
-          class="table-body min-h-[150px]"
-          v-loading="orderTableData.loading"
-        >
-          <div v-if="!orderTableData.loading">
-            <template v-if="orderTableData.data.length">
-              <div v-for="(item, index) in orderTableData.data" :key="index">
-                <el-table :data="[item]" size="large" :show-header="false">
-                  <el-table-column
-                    :show-overflow-tooltip="true"
-                    min-width="180"
-                  >
-                    <template #default="{ row }">
-                      <div
-                        class="flex items-center cursor-pointer"
-                        @click="toMember(row.member.member_id)"
-                      >
-                        <img
-                          class="w-[50px] h-[50px] mr-[10px]"
-                          v-if="row.member.headimg"
-                          :src="img(row.member.headimg)"
-                          alt=""
-                        />
-                        <img
-                          class="w-[50px] h-[50px] mr-[10px] rounded-full"
-                          v-else
-                          src="@/app/assets/images/member_head.png"
-                          alt=""
-                        />
-                        <div
-                          class="flex flex flex-col items-baseline"
-                          style="width: calc(100% - 60px)"
-                        >
-                          <span class="w-[100%] truncate text-left">{{
-                            row.member.nickname || row.member.username || ''
-                          }}</span>
-                          <span class="w-[100%] truncate">{{
-                            row.member.mobile || ''
-                          }}</span>
-                        </div>
-                      </div>
-                    </template>
-                  </el-table-column>
-                  <el-table-column align="center" min-width="100">
-                    <template #default="{ row }">
-                      {{ row.transfer_type_name }}
-                    </template>
-                  </el-table-column>
-                  <el-table-column min-width="180">
-                    <template #default="{ row }">
-                      <div
-                        class="flex flex-col"
-                        v-if="
-                          row.transfer_type == 'wechat_code' ||
-                          row.transfer_type == 'alipay'
-                        "
-                      >
-                        <div class="flex items-center">
-                          <span class="w-[70px] flex-shrink-0 text-right"
-                            >{{ t('realname') }}：</span
-                          >
-                          <span class="using-hidden">{{
-                            row.transfer_realname
-                          }}</span>
+            <el-card class="box-card !border-none !px-[35px]" shadow="never">
+                <el-row class="flex">
+                    <el-col :span="12">
+                        <div class="statistic-card">
+                            <el-statistic :value="statistics.transfered ? statistics.transfered.toFixed(2) : '0.00'"></el-statistic>
+                            <div class="statistic-footer">
+                                <div class="footer-item text-[14px] text-[#666]">
+                                    <span>{{ t('totalTransfered') }}</span>
+                                </div>
+                            </div>
                         </div>
-                        <div class="flex items-center">
-                          <span class="w-[70px] flex-shrink-0 text-right"
-                            >{{ t('account') }}：</span
-                          >
-                          <span>{{ row.transfer_account }}</span>
+                    </el-col>
+                    <el-col :span="12">
+                        <div class="statistic-card">
+                            <el-statistic :value="statistics.cash_outing ? statistics.cash_outing.toFixed(2) : '0'"></el-statistic>
+                            <div class="statistic-footer">
+                                <div class="footer-item text-[14px] text-[#666]">
+                                    <span>{{ t('totalCashOuting') }}</span>
+                                </div>
+                            </div>
                         </div>
-                        <div
-                          class="flex items-center"
-                          v-if="row.transfer_payment_code"
-                        >
-                          <span class="w-[70px] flex-shrink-0 text-right"
-                            >{{ t('transferCode') }}：</span
-                          >
-                          <el-image
-                            :src="img(row.transfer_payment_code)"
-                            :preview-src-list="[img(row.transfer_payment_code)]"
-                            :hide-on-click-modal="true"
-                            class="w-[50px] h-[50px]"
-                          ></el-image>
-                        </div>
-                      </div>
-                      <div
-                        class="flex flex-col"
-                        v-else-if="row.transfer_type == 'bank'"
-                      >
-                        <span
-                          >{{ t('bankRealname') }}：{{
-                            row.transfer_realname
-                          }}</span
-                        >
-                        <span
-                          >{{ t('bankAccount') }}：{{
-                            row.transfer_account
-                          }}</span
-                        >
-                        <span
-                          >{{ t('bankName') }}：{{ row.transfer_bank }}</span
-                        >
-                      </div>
-                    </template>
-                  </el-table-column>
-                  <el-table-column
-                    prop="apply_money"
-                    min-width="120"
-                    align="center"
-                  />
-
-                  <el-table-column
-                    prop="money"
-                    min-width="120"
-                    align="center"
-                  />
-
-                  <el-table-column
-                    prop="service_money"
-                    align="center"
-                    min-width="110"
-                  />
-
-                  <el-table-column
-                    prop="status_name"
-                    align="center"
-                    min-width="100"
-                  />
+                    </el-col>
+                </el-row>
+            </el-card>
+
+            <el-card class="box-card !border-none mb-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="orderTableData.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('applyTime')" prop="create_time">
+                        <el-date-picker v-model="orderTableData.searchParam.create_time" type="datetimerange"
+                            value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')"
+                            :end-placeholder="t('endDate')" />
+                    </el-form-item>
+                    <el-form-item :label="t('cashOutNumber')" prop="cash_out_no">
+                        <el-input v-model.trim="orderTableData.searchParam.cash_out_no" class="w-[240px]"
+                            :placeholder="t('cashOutNumberPlaceholder')" />
+                    </el-form-item>
+
+                    <el-form-item :label="t('memberInfo')" prop="keywords">
+                        <el-input v-model.trim="orderTableData.searchParam.keywords" class="w-[240px]"
+                            :placeholder="t('memberInfoPlaceholder')" />
+                    </el-form-item>
+
+                    <el-form-item :label="t('cashOutMethod')" prop="transfer_type">
+                        <el-select v-model="orderTableData.searchParam.transfer_type" clearable class="input-width">
+                            <el-option :label="t('selectPlaceholder')" value="" />
+                            <el-option :label="item.name" :value="key" v-for="(item, key) in Transfertype" :key="key"/>
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item :label="t('cashOutStatus')" prop="status">
+                        <el-select v-model="orderTableData.searchParam.status" clearable class="input-width">
+                            <el-option :label="t('selectPlaceholder')" value="" />
+                            <el-option :label="item" :value="key" v-for="(item, key) in cashOutStatusList" :key="key"/>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item :label="t('auditTime')" prop="audit_time">
+                        <el-date-picker v-model="orderTableData.searchParam.audit_time" type="datetimerange"
+                            value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')"
+                            :end-placeholder="t('endDate')" />
+                    </el-form-item>
+                    <el-form-item :label="t('transferTime')" prop="transfer_time">
+                        <el-date-picker v-model="orderTableData.searchParam.transfer_time" type="datetimerange"
+                            value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')"
+                            :end-placeholder="t('endDate')" />
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="loadOrderList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+
+            <div class="mt-[10px]">
+                <el-table :data="orderTableData.data" size="large" class="table-top">
+					<el-table-column :label="t('memberInfo')" min-width="180" />
+					<el-table-column :label="t('cashOutMethod')" align="center" min-width="100" />
+					<el-table-column :label="t('cashOutInfo')" min-width="180" />
+					<el-table-column :label="t('applicationForWithdrawalAmount')" align="center" min-width="120" />
+					<el-table-column :label="t('actualTransferAmount')" align="center" min-width="120" />
+					<el-table-column :label="t('cashOutCommission')" align="center" min-width="110" />
+					<el-table-column :label="t('cashOutStatus')" align="center" min-width="100" />
+                    <el-table-column :label="t('applyTime')" align="center" min-width="160" />
+                    <el-table-column :label="t('auditTime')" align="center" min-width="160" />
+                    <el-table-column :label="t('transferTime')" align="center" min-width="160" />
+					<el-table-column :label="t('operation')" fixed="right" align="right" min-width="120" />
+				</el-table>
+                <div class="table-body min-h-[150px]" v-loading="orderTableData.loading">
+                    <div v-if="!orderTableData.loading">
+                        <template v-if="orderTableData.data.length">
+                            <div v-for="(item, index) in orderTableData.data" :key="index">
+                                <el-table :data="[item]" size="large" :show-header="false">
+                                    <el-table-column :show-overflow-tooltip="true"  min-width="180">
+                                        <template #default="{ row }">
+                                            <div class="flex items-center cursor-pointer " @click="toMember(row.member.member_id)">
+                                                <img class="w-[50px] h-[50px] mr-[10px]" v-if="row.member.headimg" :src="img(row.member.headimg)" alt="">
+                                                <img class="w-[50px] h-[50px] mr-[10px] rounded-full" v-else src="@/app/assets/images/member_head.png" alt="">
+                                                <div class="flex flex flex-col items-baseline" style="width: calc(100% - 60px);">
+                                                    <span class="w-[100%] truncate text-left">{{ row.member.nickname || row.member.username || '' }}</span>
+                                                    <span class="w-[100%] truncate">{{ row.member.mobile || '' }}</span>
+                                                </div>
+                                            </div>
+                                        </template>
+                                    </el-table-column>
+                                    <el-table-column  align="center" min-width="100">
+                                        <template #default="{ row }">
+                                            {{ row.transfer_type_name }}
+                                        </template>
+                                    </el-table-column>
+                                    <el-table-column  min-width="180">
+                                        <template #default="{ row }">
+                                            <div class="flex flex-col" v-if="row.transfer_type=='wechat_code' || row.transfer_type=='alipay'">
+                                                <div class="flex items-center">
+                                                    <span class="w-[70px] flex-shrink-0 text-right">{{t('realname') }}：</span>
+                                                    <span class="using-hidden">{{ row.transfer_realname }}</span>
+                                                </div>
+                                                <div class="flex items-center">
+                                                    <span class="w-[70px] flex-shrink-0 text-right">{{t('account') }}：</span>
+                                                    <span>{{ row.transfer_account }}</span>
+                                                </div>
+                                                <div class="flex items-center" v-if="row.transfer_payment_code">
+                                                    <span class="w-[70px] flex-shrink-0 text-right">{{ t('transferCode') }}：</span>
+                                                    <el-image   :src="img(row.transfer_payment_code)" :preview-src-list="[img(row.transfer_payment_code)]" :hide-on-click-modal="true" class="w-[50px] h-[50px]"></el-image>
+                                                </div>
+                                            </div>
+                                            <div class="flex flex-col" v-else-if="row.transfer_type=='bank'">
+                                                <span>{{t('bankRealname') }}：{{ row.transfer_realname }}</span>
+                                                <span>{{ t('bankAccount') }}：{{ row.transfer_account }}</span>
+                                                <span>{{ t('bankName') }}：{{ row.transfer_bank }}</span>
+                                            </div>
+                                        </template>
+                                    </el-table-column>
+                                    <el-table-column prop="apply_money"  min-width="120" align="center" />
+
+                                    <el-table-column prop="money" min-width="120" align="center" />
+
+                                    <el-table-column prop="service_money" align="center" min-width="110" />
+
+                                    <el-table-column prop="status_name" align="center" min-width="100" />
+
+                                    <el-table-column  min-width="160" align="center">
+                                        <template #default="{ row }">
+                                            {{ row.create_time || '' }}
+                                        </template>
+                                    </el-table-column>
+
+                                    <el-table-column  min-width="160" align="center">
+                                        <template #default="{ row }">
+                                            {{ row.audit_time || '' }}
+                                        </template>
+                                    </el-table-column>
+
+                                    <el-table-column  min-width="160" align="center">
+                                        <template #default="{ row }">
+                                            {{ row.transfer_time || '' }}
+                                        </template>
+                                    </el-table-column>
+
+                                    <el-table-column  align="right" fixed="right" width="120">
+                                        <template #default="{ row }">
+                                            <el-button v-for="(item, index) in operationBtn[row.status.toString()].value" :key="index + 'a'"
+                                                @click="fnProcessing(operationBtn[row.status.toString()].clickArr[index], row)"
+                                                type="primary" link>{{ item }}</el-button>
+                                            <el-button  type="primary" link @click="handleRemark(row)"> {{ t('remark') }}</el-button>
+                                        </template>
+                                    </el-table-column>
+                                </el-table>
+                                <div v-if="item.remark" class="text-[14px] min-h-[30px] leading-[30px] px-3 bg-[#fff0e5] text-[#ff7f5b] mb-[10px] relative remark">
+									<span class="mr-[5px]">{{ t('notes') }}：</span>
+									<span>{{ item.remark }}</span>
+								</div>
+                            </div>
+                        </template>
+                        <el-empty v-else :image-size="1" :description="t('emptyData')" />
+                    </div>
+                </div>
 
-                  <el-table-column min-width="160" align="center">
-                    <template #default="{ row }">
-                      {{ row.create_time || '' }}
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="orderTableData.page" v-model:page-size="orderTableData.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="orderTableData.total"
+                        @size-change="loadOrderList()" @current-change="loadOrderList" />
+                </div>
+            </div>
+        </el-card>
+
+        <!-- 详情 -->
+        <el-dialog v-model="cashOutShowDialog" :title="t('cashOutDetail')" width="650px" :destroy-on-close="true">
+            <el-form :model="cashOutInfo" label-width="120px" ref="formRef"  class="page-form" v-loading="cashOutLoading">
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item :label="t('nickname')">
+                            <div class="input-width"> {{ cashOutInfo.nickname|| cashOutInfo.username }} </div>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item :label="t('cashOutAccountType')">
+                            <div class="input-width"> {{ cashOutInfo.account_type_name }} </div>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item :label="t('cashOutMethod')">
+                            <div class="input-width"> {{ Transfertype[cashOutInfo.transfer_type].name }} </div>
+                        </el-form-item>
+                    </el-col>
+                    <template v-if="cashOutInfo.transfer_type == 'alipay' || cashOutInfo.transfer_type == 'wechat_code'">
+                        <el-col :span="12">
+                            <el-form-item :label="t('realname')">
+                                <div class="input-width"> {{ cashOutInfo.transfer_realname }} </div>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item :label="t('alipayAccount')">
+                                <div class="input-width"> {{ cashOutInfo.transfer_account }} </div>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item :label="t('transferCode')">
+                                <el-image  :src="img(cashOutInfo.transfer_payment_code)" :preview-src-list="[img(cashOutInfo.transfer_payment_code)]" :hide-on-click-modal="true" class="mr-[10px] w-[50px] h-[50px]"></el-image>
+                            </el-form-item>
+                        </el-col>
                     </template>
-                  </el-table-column>
-
-                  <el-table-column min-width="160" align="center">
-                    <template #default="{ row }">
-                      {{ row.audit_time || '' }}
+                    <template v-if="cashOutInfo.transfer_type == 'bank'">
+                        <el-col :span="12">
+                            <el-form-item :label="t('bankName')">
+                                <div class="input-width"> {{ cashOutInfo.transfer_bank }} </div>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item :label="t('bankAccount')">
+                                <div class="input-width"> {{ cashOutInfo.transfer_account }} </div>
+                            </el-form-item>
+                        </el-col>
                     </template>
-                  </el-table-column>
-
-                  <el-table-column min-width="160" align="center">
-                    <template #default="{ row }">
-                      {{ row.transfer_time || '' }}
+                    <el-col :span="12">
+                        <el-form-item :label="t('applicationForWithdrawalAmount')">
+                            <div class="input-width"> {{ cashOutInfo.apply_money }} </div>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item :label="t('cashOutCommission')">
+                            <div class="input-width"> {{ cashOutInfo.service_money }} </div>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item :label="t('actualTransferAmount')">
+                            <div class="input-width"> {{ cashOutInfo.money }} </div>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item :label="t('cashOutStatus')">
+                            <div class="input-width"> {{ cashOutInfo.status_name }} </div>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item :label="t('applyTime')">
+                            <div class="input-width"> {{ cashOutInfo.create_time }} </div>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item :label="t('auditTime')">
+                            <div class="input-width"> {{ cashOutInfo.audit_time }} </div>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12" v-if="cashOutInfo.remark">
+                        <el-form-item :label="t('remark')">
+                            <div class="input-width"> {{ cashOutInfo.remark }} </div>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12" v-if="cashOutInfo.transfer && cashOutInfo.transfer.transfer_voucher">
+                        <el-form-item :label="t('transferVoucher')">
+                            <el-image  :src="img(cashOutInfo.transfer.transfer_voucher)" :preview-src-list="[img(cashOutInfo.transfer.transfer_voucher)]" :hide-on-click-modal="true" class="w-[50px] h-[50px]"></el-image>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12" v-if="cashOutInfo.transfer && cashOutInfo.transfer.transfer_remark">
+                        <el-form-item :label="t('transferRemark')">
+                            <div class="input-width"> {{ cashOutInfo.transfer.transfer_remark }} </div>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button type="primary" @click="cashOutShowDialog = false">{{ t('confirm') }}</el-button>
+                </span>
+            </template>
+        </el-dialog>
+        <!-- 审核通过 -->
+        <el-dialog v-model="auditPassShowDialog" :title="t('passAudit')" width="650px" :destroy-on-close="true">
+            <el-form :model="curData" label-width="120px" ref="formRef"  class="page-form">
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item :label="t('nickname')">
+                            <div class="input-width"> {{ curData.member.nickname ||curData.member.username }} </div>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item :label="t('cashOutAccountType')">
+                            <div class="input-width"> {{ curData.account_type_name }} </div>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item :label="t('cashOutMethod')">
+                            <div class="input-width"> {{ curData.transfer_type_name }} </div>
+                        </el-form-item>
+                    </el-col>
+                    <template v-if="curData.transfer_type == 'alipay' || curData.transfer_type == 'wechat_code'">
+                        <el-col :span="12">
+                            <el-form-item :label="t('realname')">
+                                <div class="input-width"> {{ curData.transfer_realname }} </div>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item :label="t('account')">
+                                <div class="input-width"> {{ curData.transfer_account }} </div>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item :label="t('transferCode')">
+                                <el-image  :src="img(curData.transfer_payment_code)" :preview-src-list="[img(curData.transfer_payment_code)]" :hide-on-click-modal="true" class="w-[50px] h-[50px]"></el-image>
+                            </el-form-item>
+                        </el-col>
                     </template>
-                  </el-table-column>
-
-                  <el-table-column align="right" fixed="right" width="120">
-                    <template #default="{ row }">
-                      <el-button
-                        v-for="(item, index) in operationBtn[
-                          row.status.toString()
-                        ].value"
-                        :key="index + 'a'"
-                        @click="
-                          fnProcessing(
-                            operationBtn[row.status.toString()].clickArr[index],
-                            row
-                          )
-                        "
-                        type="primary"
-                        link
-                        >{{ item }}</el-button
-                      >
-                      <el-button type="primary" link @click="handleRemark(row)">
-                        {{ t('remark') }}</el-button
-                      >
+                    <template v-if="curData.transfer_type == 'bank'">
+                        <el-col :span="12">
+                            <el-form-item :label="t('bankName')">
+                                <div class="input-width"> {{ curData.transfer_bank }} </div>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item :label="t('bankRealname')">
+                                <div class="input-width"> {{ curData.transfer_realname }} </div>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item :label="t('bankAccount')">
+                                <div class="input-width"> {{ curData.transfer_account }} </div>
+                            </el-form-item>
+                        </el-col>
                     </template>
-                  </el-table-column>
-                </el-table>
-                <div
-                  v-if="item.remark"
-                  class="text-[14px] min-h-[30px] leading-[30px] px-3 bg-[#fff0e5] text-[#ff7f5b] mb-[10px] relative remark"
-                >
-                  <span class="mr-[5px]">{{ t('notes') }}：</span>
-                  <span>{{ item.remark }}</span>
-                </div>
-              </div>
+                    <el-col :span="12">
+                        <el-form-item :label="t('applicationForWithdrawalAmount')">
+                            <div class="input-width"> {{ curData.apply_money }} </div>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item :label="t('cashOutCommission')">
+                            <div class="input-width"> {{ curData.service_money }} </div>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item :label="t('actualTransferAmount')">
+                            <div class="input-width"> {{ curData.money }} </div>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item :label="t('applyTime')">
+                            <div class="input-width"> {{ curData.create_time }} </div>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="auditPassShowDialog = false">{{ t('cancel') }}</el-button>
+                    <el-button type="primary"  @click="handlePass()">{{ t('confirm') }}</el-button>
+                </span>
             </template>
-            <el-empty v-else :image-size="1" :description="t('emptyData')" />
-          </div>
-        </div>
-
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="orderTableData.page"
-            v-model:page-size="orderTableData.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="orderTableData.total"
-            @size-change="loadOrderList()"
-            @current-change="loadOrderList"
-          />
-        </div>
-      </div>
-    </el-card>
-
-    <!-- 详情 -->
-    <el-dialog
-      v-model="cashOutShowDialog"
-      :title="t('cashOutDetail')"
-      width="650px"
-      :destroy-on-close="true"
-    >
-      <el-form
-        :model="cashOutInfo"
-        label-width="120px"
-        ref="formRef"
-        class="page-form"
-        v-loading="cashOutLoading"
-      >
-        <el-row>
-          <el-col :span="12">
-            <el-form-item :label="t('nickname')">
-              <div class="input-width">
-                {{ cashOutInfo.nickname || cashOutInfo.username }}
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item :label="t('cashOutAccountType')">
-              <div class="input-width">{{ cashOutInfo.account_type_name }}</div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item :label="t('cashOutMethod')">
-              <div class="input-width">
-                {{ Transfertype[cashOutInfo.transfer_type].name }}
-              </div>
-            </el-form-item>
-          </el-col>
-          <template
-            v-if="
-              cashOutInfo.transfer_type == 'alipay' ||
-              cashOutInfo.transfer_type == 'wechat_code'
-            "
-          >
-            <el-col :span="12">
-              <el-form-item :label="t('realname')">
-                <div class="input-width">
-                  {{ cashOutInfo.transfer_realname }}
-                </div>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item :label="t('alipayAccount')">
-                <div class="input-width">
-                  {{ cashOutInfo.transfer_account }}
-                </div>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item :label="t('transferCode')">
-                <el-image
-                  :src="img(cashOutInfo.transfer_payment_code)"
-                  :preview-src-list="[img(cashOutInfo.transfer_payment_code)]"
-                  :hide-on-click-modal="true"
-                  class="mr-[10px] w-[50px] h-[50px]"
-                ></el-image>
-              </el-form-item>
-            </el-col>
-          </template>
-          <template v-if="cashOutInfo.transfer_type == 'bank'">
-            <el-col :span="12">
-              <el-form-item :label="t('bankName')">
-                <div class="input-width">{{ cashOutInfo.transfer_bank }}</div>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item :label="t('bankAccount')">
-                <div class="input-width">
-                  {{ cashOutInfo.transfer_account }}
-                </div>
-              </el-form-item>
-            </el-col>
-          </template>
-          <el-col :span="12">
-            <el-form-item :label="t('applicationForWithdrawalAmount')">
-              <div class="input-width">{{ cashOutInfo.apply_money }}</div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item :label="t('cashOutCommission')">
-              <div class="input-width">{{ cashOutInfo.service_money }}</div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item :label="t('actualTransferAmount')">
-              <div class="input-width">{{ cashOutInfo.money }}</div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item :label="t('cashOutStatus')">
-              <div class="input-width">{{ cashOutInfo.status_name }}</div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item :label="t('applyTime')">
-              <div class="input-width">{{ cashOutInfo.create_time }}</div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item :label="t('auditTime')">
-              <div class="input-width">{{ cashOutInfo.audit_time }}</div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" v-if="cashOutInfo.remark">
-            <el-form-item :label="t('remark')">
-              <div class="input-width">{{ cashOutInfo.remark }}</div>
-            </el-form-item>
-          </el-col>
-          <el-col
-            :span="12"
-            v-if="cashOutInfo.transfer && cashOutInfo.transfer.transfer_voucher"
-          >
-            <el-form-item :label="t('transferVoucher')">
-              <el-image
-                :src="img(cashOutInfo.transfer.transfer_voucher)"
-                :preview-src-list="[img(cashOutInfo.transfer.transfer_voucher)]"
-                :hide-on-click-modal="true"
-                class="w-[50px] h-[50px]"
-              ></el-image>
-            </el-form-item>
-          </el-col>
-          <el-col
-            :span="12"
-            v-if="cashOutInfo.transfer && cashOutInfo.transfer.transfer_remark"
-          >
-            <el-form-item :label="t('transferRemark')">
-              <div class="input-width">
-                {{ cashOutInfo.transfer.transfer_remark }}
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button type="primary" @click="cashOutShowDialog = false">{{
-            t('confirm')
-          }}</el-button>
-        </span>
-      </template>
-    </el-dialog>
-    <!-- 审核通过 -->
-    <el-dialog
-      v-model="auditPassShowDialog"
-      :title="t('passAudit')"
-      width="650px"
-      :destroy-on-close="true"
-    >
-      <el-form
-        :model="curData"
-        label-width="120px"
-        ref="formRef"
-        class="page-form"
-      >
-        <el-row>
-          <el-col :span="12">
-            <el-form-item :label="t('nickname')">
-              <div class="input-width">
-                {{ curData.member.nickname || curData.member.username }}
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item :label="t('cashOutAccountType')">
-              <div class="input-width">{{ curData.account_type_name }}</div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item :label="t('cashOutMethod')">
-              <div class="input-width">{{ curData.transfer_type_name }}</div>
-            </el-form-item>
-          </el-col>
-          <template
-            v-if="
-              curData.transfer_type == 'alipay' ||
-              curData.transfer_type == 'wechat_code'
-            "
-          >
-            <el-col :span="12">
-              <el-form-item :label="t('realname')">
-                <div class="input-width">{{ curData.transfer_realname }}</div>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item :label="t('account')">
-                <div class="input-width">{{ curData.transfer_account }}</div>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item :label="t('transferCode')">
-                <el-image
-                  :src="img(curData.transfer_payment_code)"
-                  :preview-src-list="[img(curData.transfer_payment_code)]"
-                  :hide-on-click-modal="true"
-                  class="w-[50px] h-[50px]"
-                ></el-image>
-              </el-form-item>
-            </el-col>
-          </template>
-          <template v-if="curData.transfer_type == 'bank'">
-            <el-col :span="12">
-              <el-form-item :label="t('bankName')">
-                <div class="input-width">{{ curData.transfer_bank }}</div>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item :label="t('bankRealname')">
-                <div class="input-width">{{ curData.transfer_realname }}</div>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item :label="t('bankAccount')">
-                <div class="input-width">{{ curData.transfer_account }}</div>
-              </el-form-item>
-            </el-col>
-          </template>
-          <el-col :span="12">
-            <el-form-item :label="t('applicationForWithdrawalAmount')">
-              <div class="input-width">{{ curData.apply_money }}</div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item :label="t('cashOutCommission')">
-              <div class="input-width">{{ curData.service_money }}</div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item :label="t('actualTransferAmount')">
-              <div class="input-width">{{ curData.money }}</div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item :label="t('applyTime')">
-              <div class="input-width">{{ curData.create_time }}</div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="auditPassShowDialog = false">{{
-            t('cancel')
-          }}</el-button>
-          <el-button type="primary" @click="handlePass()">{{
-            t('confirm')
-          }}</el-button>
-        </span>
-      </template>
-    </el-dialog>
-    <!-- 是否审核拒绝 -->
-    <el-dialog
-      v-model="auditShowDialog"
-      :title="t('rejectionAudit')"
-      width="500px"
-      :destroy-on-close="true"
-    >
-      <el-form
-        :model="auditFailure"
-        label-width="90px"
-        ref="formRef"
-        :rules="formRules"
-        class="page-form"
-        v-loading="loading"
-      >
-        <el-form-item :label="t('reasonsRefusal')" prop="refuse_reason">
-          <el-input
-            v-model.trim="auditFailure.refuse_reason"
-            clearable
-            maxlength="200"
-            :show-word-limit="true"
-            :placeholder="t('reasonsRefusalPlaceholder')"
-            :rows="4"
-            class="input-width"
-            type="textarea"
-          />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="auditShowDialog = false">{{
-            t('cancel')
-          }}</el-button>
-          <el-button type="primary" :loading="loading" @click="confirm()">{{
-            t('confirm')
-          }}</el-button>
-        </span>
-      </template>
-    </el-dialog>
-
-    <!-- 是否转账 -->
-    <el-dialog
-      v-model="transferShowDialog"
-      :title="t('transfer')"
-      width="650px"
-      :destroy-on-close="true"
-    >
-      <el-form
-        :model="transferData"
-        label-width="120px"
-        ref="formRef"
-        class="page-form"
-      >
-        <el-row>
-          <template
-            v-if="
-              transferData.transfer_type == 'alipay' ||
-              transferData.transfer_type == 'wechat_code'
-            "
-          >
-            <el-col :span="12">
-              <el-form-item :label="t('realname')">
-                <div class="input-width">
-                  {{ transferData.transfer_realname }}
-                </div>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item :label="t('account')">
-                <div class="input-width">
-                  {{ transferData.transfer_account }}
-                </div>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item :label="t('transferCode')">
-                <el-image
-                  :src="img(transferData.transfer_payment_code)"
-                  :preview-src-list="[img(transferData.transfer_payment_code)]"
-                  :hide-on-click-modal="true"
-                  class="w-[50px] h-[50px]"
-                ></el-image>
-              </el-form-item>
-            </el-col>
-          </template>
-          <template v-if="transferData.transfer_type == 'bank'">
-            <el-col :span="12">
-              <el-form-item :label="t('bankName')">
-                <div class="input-width">{{ transferData.transfer_bank }}</div>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item :label="t('bankRealname')">
-                <div class="input-width">
-                  {{ transferData.transfer_realname }}
-                </div>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item :label="t('bankAccount')">
-                <div class="input-width">
-                  {{ transferData.transfer_account }}
-                </div>
-              </el-form-item>
-            </el-col>
-          </template>
-          <el-col :span="12">
-            <el-form-item :label="t('applicationForWithdrawalAmount')">
-              <div class="input-width">{{ transferData.apply_money }}</div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item :label="t('cashOutCommission')">
-              <div class="input-width">{{ transferData.service_money }}</div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item :label="t('actualTransferAmount')">
-              <div class="input-width">{{ transferData.money }}</div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <el-form
-        :model="formTransfer"
-        label-width="120px"
-        ref="formTransferRef"
-        :rules="formTransferRules"
-        class="page-form"
-      >
-        <el-form-item :label="t('transferVoucher')" prop="transfer_voucher">
-          <upload-image v-model="formTransfer.transfer_voucher" :limit="1" />
-        </el-form-item>
-        <el-form-item :label="t('transferRemark')" prop="transfer_remark">
-          <el-input
-            v-model.trim="formTransfer.transfer_remark"
-            type="textarea"
-            rows="4"
-            clearable
-            :placeholder="t('transferRemarkPlaceholder')"
-            class="input-width"
-            maxlength="200"
-            show-word-limit
-          />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="transferShowDialog = false">{{
-            t('cancel')
-          }}</el-button>
-          <el-button type="primary" @click="handleTransfer(formTransferRef)">{{
-            t('confirm')
-          }}</el-button>
-        </span>
-      </template>
-    </el-dialog>
-    <!-- 备注 -->
-    <el-dialog
-      v-model="remarkShowDialog"
-      :title="t('remark')"
-      width="500px"
-      :destroy-on-close="true"
-    >
-      <el-form
-        :model="formData"
-        label-width="90px"
-        ref="formRemarkRef"
-        :rules="formRemarkRules"
-        class="page-form"
-      >
-        <el-form-item :label="t('remark')" prop="remark">
-          <el-input
-            v-model.trim="formData.remark"
-            type="textarea"
-            rows="4"
-            clearable
-            :placeholder="t('remarkPlaceholder')"
-            class="input-width"
-            maxlength="200"
-            show-word-limit
-          />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="remarkShowDialog = false">{{
-            t('cancel')
-          }}</el-button>
-          <el-button type="primary" @click="save(formRemarkRef)">{{
-            t('confirm')
-          }}</el-button>
-        </span>
-      </template>
-    </el-dialog>
-  </div>
+        </el-dialog>
+        <!-- 是否审核拒绝 -->
+        <el-dialog v-model="auditShowDialog" :title="t('rejectionAudit')" width="500px" :destroy-on-close="true">
+            <el-form :model="auditFailure" label-width="90px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('reasonsRefusal')" prop="refuse_reason">
+                    <el-input v-model.trim="auditFailure.refuse_reason" clearable maxlength="200" :show-word-limit="true" :placeholder="t('reasonsRefusalPlaceholder')" :rows="4" class="input-width" type="textarea" />
+                </el-form-item>
+            </el-form>
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="auditShowDialog = false">{{ t('cancel') }}</el-button>
+                    <el-button type="primary" :loading="loading" @click="confirm()">{{ t('confirm') }}</el-button>
+                </span>
+            </template>
+        </el-dialog>
+
+        <!-- 是否转账 -->
+        <el-dialog v-model="transferShowDialog" :title="t('transfer')" width="650px" :destroy-on-close="true">
+            <el-form :model="transferData" label-width="120px" ref="formRef"  class="page-form">
+                <el-row>
+                    <template v-if="transferData.transfer_type == 'alipay' || transferData.transfer_type == 'wechat_code'">
+                        <el-col :span="12">
+                            <el-form-item :label="t('realname')">
+                                <div class="input-width"> {{ transferData.transfer_realname }} </div>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item :label="t('account')">
+                                <div class="input-width"> {{ transferData.transfer_account }} </div>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item :label="t('transferCode')">
+                                <el-image  :src="img(transferData.transfer_payment_code)" :preview-src-list="[img(transferData.transfer_payment_code)]" :hide-on-click-modal="true" class="w-[50px] h-[50px]"></el-image>
+                            </el-form-item>
+                        </el-col>
+                    </template>
+                    <template v-if="transferData.transfer_type == 'bank'">
+                        <el-col :span="12">
+                            <el-form-item :label="t('bankName')">
+                                <div class="input-width"> {{ transferData.transfer_bank }} </div>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item :label="t('bankRealname')">
+                                <div class="input-width"> {{ transferData.transfer_realname }} </div>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item :label="t('bankAccount')">
+                                <div class="input-width"> {{ transferData.transfer_account }} </div>
+                            </el-form-item>
+                        </el-col>
+                    </template>
+                    <el-col :span="12">
+                        <el-form-item :label="t('applicationForWithdrawalAmount')">
+                            <div class="input-width"> {{ transferData.apply_money }} </div>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item :label="t('cashOutCommission')">
+                            <div class="input-width"> {{ transferData.service_money }} </div>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item :label="t('actualTransferAmount')">
+                            <div class="input-width"> {{ transferData.money }} </div>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <el-form :model="formTransfer" label-width="120px" ref="formTransferRef" :rules="formTransferRules" class="page-form">
+                <el-form-item :label="t('transferVoucher')" prop="transfer_voucher">
+                    <upload-image v-model="formTransfer.transfer_voucher" :limit="1" />
+                </el-form-item>
+                <el-form-item :label="t('transferRemark')" prop="transfer_remark">
+                    <el-input v-model.trim="formTransfer.transfer_remark" type="textarea" rows="4" clearable
+                        :placeholder="t('transferRemarkPlaceholder')" class="input-width" maxlength="200" show-word-limit />
+                </el-form-item>
+            </el-form>
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="transferShowDialog = false">{{ t('cancel') }}</el-button>
+                    <el-button type="primary" @click="handleTransfer(formTransferRef)">{{ t('confirm') }}</el-button>
+                </span>
+            </template>
+        </el-dialog>
+        <!-- 备注 -->
+        <el-dialog v-model="remarkShowDialog" :title="t('remark')" width="500px" :destroy-on-close="true">
+            <el-form :model="formData" label-width="90px" ref="formRemarkRef" :rules="formRemarkRules" class="page-form">
+                <el-form-item :label="t('remark')" prop="remark">
+                    <el-input v-model.trim="formData.remark" type="textarea" rows="4" clearable
+                        :placeholder="t('remarkPlaceholder')" class="input-width" maxlength="200" show-word-limit />
+                </el-form-item>
+            </el-form>
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="remarkShowDialog = false">{{ t('cancel') }}</el-button>
+                    <el-button type="primary" @click="save(formRemarkRef)">{{ t('confirm') }}</el-button>
+                </span>
+            </template>
+        </el-dialog>
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref, computed } from 'vue'
 import { t } from '@/lang'
-import {
-  getCashOutList,
-  getTransfertype,
-  memberTransfer,
-  memberAudit,
-  getCashOutDetail,
-  getCashOutStatusList,
-  getCashOutStat,
-  memberRemark,
-  memberCheck,
-} from '@/app/api/member'
+import { getCashOutList, getTransfertype, memberTransfer, memberAudit, getCashOutDetail, getCashOutStatusList, getCashOutStat, memberRemark, memberCheck } from '@/app/api/member'
 import { img } from '@/utils/common'
 import { ElMessageBox, FormInstance, FormRules } from 'element-plus'
 import { useRouter, useRoute } from 'vue-router'
@@ -860,106 +490,104 @@ import { AnyObject } from '@/types/global'
 
 const cashOutStatusList = ref([])
 const checkStatusList = async () => {
-  cashOutStatusList.value = await (await getCashOutStatusList()).data
+    cashOutStatusList.value = await (await getCashOutStatusList()).data
 }
 checkStatusList()
 const route = useRoute()
 const router = useRouter()
 const pageName = route.meta.title
 const operationBtn = ref<AnyObject>({
-  1: {
-    value: [t('successfulAudit'), t('auditFailure'), t('detail')],
-    clickArr: ['successfulAuditFn', 'auditFailureFn', 'detailFn'],
-  },
-  2: {
-    value: [t('transfer'), t('detail')],
-    clickArr: ['transferFn', 'detailFn'],
-  },
-  3: {
-    value: [t('detail')],
-    clickArr: ['detailFn'],
-  },
-  4: {
-    value: [t('detail')],
-    clickArr: ['detailFn'],
-  },
-  '-1': {
-    value: [t('detail')],
-    clickArr: ['detailFn'],
-  },
-  '-2': {
-    value: [t('detail')],
-    clickArr: ['detailFn'],
-  },
+    1: {
+        value: [t('successfulAudit'), t('auditFailure'), t('detail')],
+        clickArr: ['successfulAuditFn', 'auditFailureFn', 'detailFn']
+    },
+    2: {
+        value: [t('transfer'), t('detail')],
+        clickArr: ['transferFn', 'detailFn']
+    },
+    3: {
+        value: [t('detail')],
+        clickArr: ['detailFn']
+    },
+    4: {
+        value: [t('detail')],
+        clickArr: ['detailFn']
+    },
+    '-1': {
+        value: [t('detail')],
+        clickArr: ['detailFn']
+    },
+    '-2': {
+        value: [t('detail')],
+        clickArr: ['detailFn']
+    }
 })
 
 // 表单验证规则
 const formRules = reactive<FormRules>({})
 
 const orderTableData = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    order_no: '',
-    member_id: 0,
-    create_time: [],
-    status: '',
-    cash_out_no: '',
-    keywords: '',
-    audit_time: '',
-    transfer_time: '',
-    transfer_type: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        order_no: '',
+        member_id: 0,
+        create_time: [],
+        status: '',
+        cash_out_no: '',
+        keywords: '',
+        audit_time: '',
+        transfer_time: '',
+        transfer_type: ''
+    }
 })
 
 const statistics = ref({
-  transfered: 0,
-  cash_outing: 0,
+    transfered: 0,
+    cash_outing: 0
 })
 const checkStatInfo = () => {
-  getCashOutStat().then((res) => {
-    statistics.value = res.data
-  })
+    getCashOutStat().then(res => {
+        statistics.value = res.data
+    })
 }
 checkStatInfo()
 
 // 获取会员转账方式
-const Transfertype = ref<Array<Object | any>>([])
+const Transfertype = ref<Array<Object|any>>([])
 const getTransfertypeFn = async () => {
-  Transfertype.value = await (await getTransfertype()).data
+    Transfertype.value = await (await getTransfertype()).data
 }
 getTransfertypeFn()
 
 const searchFormRef = ref<FormInstance>()
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
+    if (!formEl) return
 
-  formEl.resetFields()
-  loadOrderList()
+    formEl.resetFields()
+    loadOrderList()
 }
 
 /**
  * 获取提现列表
  */
 const loadOrderList = (page: number = 1) => {
-  orderTableData.loading = true
-  orderTableData.page = page
-
-  getCashOutList({
-    page: orderTableData.page,
-    limit: orderTableData.limit,
-    ...orderTableData.searchParam,
-  })
-    .then((res) => {
-      orderTableData.loading = false
-      orderTableData.data = res.data.data
-      orderTableData.total = res.data.total
-    })
-    .catch(() => {
-      orderTableData.loading = false
+    orderTableData.loading = true
+    orderTableData.page = page
+
+    getCashOutList({
+        page: orderTableData.page,
+        limit: orderTableData.limit,
+        ...orderTableData.searchParam
+    }).then(res => {
+        orderTableData.loading = false
+        orderTableData.data = res.data.data
+        orderTableData.total = res.data.total
+    }).catch(() => {
+        orderTableData.loading = false
     })
 }
 loadOrderList()
@@ -968,36 +596,34 @@ loadOrderList()
 const auditFailure = ref({ refuse_reason: '', id: 0, action: 0 })
 const auditShowDialog = ref(false)
 const fnProcessing = (type: string, data: any) => {
-  const obj = {}
-  if (['successfulAuditFn', 'auditFailureFn'].includes(type)) {
-    obj.id = data.id
-    if (type == 'successfulAuditFn') {
-      obj.action = 'agree'
-      curData.value = data
-      auditPassShowDialog.value = true
-    } else {
-      obj.action = 'refuse'
-      auditFailure.value = Object.assign(auditFailure.value, obj)
-      auditShowDialog.value = true
-    }
-  } else if (type == 'transferFn') {
-    if (data.transfer_type == 'wechatpay') {
-      obj.id = data.id
-      ElMessageBox.confirm(`${t('isTransfer')}`, `${t('transfer')}`).then(
-        () => {
-          transferFn(obj)
+    const obj = {}
+    if (['successfulAuditFn', 'auditFailureFn'].includes(type)) {
+        obj.id = data.id
+        if (type == 'successfulAuditFn') {
+            obj.action = 'agree'
+            curData.value = data
+            auditPassShowDialog.value = true
+        } else {
+            obj.action = 'refuse'
+            auditFailure.value = Object.assign(auditFailure.value, obj)
+            auditShowDialog.value = true
+        }
+    } else if (type == 'transferFn') {
+        if (data.transfer_type == 'wechatpay') {
+            obj.id = data.id
+            ElMessageBox.confirm(`${t('isTransfer')}`, `${t('transfer')}`).then(() => {
+                transferFn(obj)
+            })
+        } else {
+            transferData.value = data
+            formTransfer.id = data.id
+            transferShowDialog.value = true
         }
-      )
+    } else if (type == 'checkFn') {
+        checkFn(data.id)
     } else {
-      transferData.value = data
-      formTransfer.id = data.id
-      transferShowDialog.value = true
+        detailFn(data.id)
     }
-  } else if (type == 'checkFn') {
-    checkFn(data.id)
-  } else {
-    detailFn(data.id)
-  }
 }
 
 /**
@@ -1008,39 +634,33 @@ const transferData = ref({})
 const transferShowDialog = ref(false)
 const formTransferRef = ref<FormInstance>()
 const formTransfer = reactive({
-  id: 0,
-  transfer_voucher: '',
-  transfer_remark: '',
+    id: 0,
+    transfer_voucher: '',
+    transfer_remark: ''
 })
 const formTransferRules = computed(() => {
-  return {
-    transfer_voucher: [
-      {
-        required: true,
-        message: t('transferVoucherPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-  }
+    return {
+        transfer_voucher: [
+            { required: true, message: t('transferVoucherPlaceholder'), trigger: 'blur' }
+        ]
+    }
 })
 
 const handleTransfer = async (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      transferFn(formTransfer)
-    }
-  })
-}
-const transferFn = (data: any) => {
-  memberTransfer({ ...data })
-    .then((res) => {
-      transferShowDialog.value = false
-      loadOrderList()
+    if (!formEl) return
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            transferFn(formTransfer)
+        }
     })
-    .catch(() => {
-      transferShowDialog.value = false
-      loadOrderList()
+}
+const transferFn = (data:any) => {
+    memberTransfer({ ...data }).then(res => {
+        transferShowDialog.value = false
+        loadOrderList()
+    }).catch(() => {
+        transferShowDialog.value = false
+        loadOrderList()
     })
 }
 
@@ -1050,24 +670,22 @@ const transferFn = (data: any) => {
  */
 const cashOutShowDialog = ref(false)
 const cashOutInfo = ref({
-  nickname: '',
-  account_type_name: '',
-  transfer_type: '',
-  apply_money: 0,
-  service_money: 0,
-  money: 0,
-  status_name: '',
+    nickname: '',
+    account_type_name: '',
+    transfer_type: '',
+    apply_money: 0,
+    service_money: 0,
+    money: 0,
+    status_name: ''
 })
 const cashOutLoading = ref(true)
-const detailFn = (id: any) => {
-  getCashOutDetail(id)
-    .then((res) => {
-      cashOutInfo.value = res.data
-      cashOutShowDialog.value = true
-      cashOutLoading.value = false
-    })
-    .catch(() => {
-      loadOrderList()
+const detailFn = (id:any) => {
+    getCashOutDetail(id).then(res => {
+        cashOutInfo.value = res.data
+        cashOutShowDialog.value = true
+        cashOutLoading.value = false
+    }).catch(() => {
+        loadOrderList()
     })
 }
 
@@ -1079,23 +697,21 @@ const detailFn = (id: any) => {
 const auditPassShowDialog = ref(false)
 const curData = ref<any>({})
 const handlePass = () => {
-  const obj = {
-    id: curData.value.id,
-    action: 'agree',
-  }
-  cashOutAuditFn(obj)
+    const obj = {
+        id: curData.value.id,
+        action: 'agree'
+    }
+    cashOutAuditFn(obj)
 }
-const cashOutAuditFn = (data: any) => {
-  memberAudit({
-    ...data,
-  })
-    .then((res) => {
-      auditPassShowDialog.value = false
-      loadOrderList()
-    })
-    .catch(() => {
-      auditPassShowDialog.value = false
-      loadOrderList()
+const cashOutAuditFn = (data:any) => {
+    memberAudit({
+        ...data
+    }).then(res => {
+        auditPassShowDialog.value = false
+        loadOrderList()
+    }).catch(() => {
+        auditPassShowDialog.value = false
+        loadOrderList()
     })
 }
 
@@ -1103,8 +719,8 @@ const cashOutAuditFn = (data: any) => {
  *  拒绝审核
  */
 const confirm = () => {
-  auditShowDialog.value = false
-  cashOutAuditFn(auditFailure.value)
+    auditShowDialog.value = false
+    cashOutAuditFn(auditFailure.value)
 }
 
 /**
@@ -1114,65 +730,65 @@ const confirm = () => {
 const formRemarkRef = ref<FormInstance>()
 const remarkShowDialog = ref(false)
 const formData = reactive({
-  id: 0,
-  remark: '',
+    id: 0,
+    remark: ''
 })
 const formRemarkRules = computed(() => {
-  return {
-    remark: [
-      { required: true, message: t('remarkPlaceholder'), trigger: 'blur' },
-    ],
-  }
+    return {
+        remark: [
+            { required: true, message: t('remarkPlaceholder'), trigger: 'blur' }
+        ]
+    }
 })
 const handleRemark = (data: any) => {
-  formData.id = data.id
-  formData.remark = ''
-  remarkShowDialog.value = true
+    formData.id = data.id
+    formData.remark = ''
+    remarkShowDialog.value = true
 }
 const save = async (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      memberRemark(formData)
-        .then((res: any) => {
-          loadOrderList()
-          remarkShowDialog.value = false
-        })
-        .catch(() => {
-          remarkShowDialog.value = false
-        })
-    }
-  })
+    if (!formEl) return
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            memberRemark(formData).then((res: any) => {
+                loadOrderList()
+                remarkShowDialog.value = false
+            }).catch(() => {
+                remarkShowDialog.value = false
+            })
+        }
+    })
 }
 /**
  * 会员详情
  */
 const toMember = (memberId: number) => {
-  router.push(`/member/detail?id=${memberId}`)
+    router.push(`/member/detail?id=${memberId}`)
 }
 
 // 检测打款进度
 const checkFn = (id: number) => {
-  memberCheck(id).then((res) => {})
+    memberCheck(id).then(res => {
+
+    })
 }
 </script>
 
 <style lang="scss" scoped>
 .table-top :deep(.el-table__body-wrapper) {
-  display: none;
+	display: none;
 }
 
 :deep(.el-table) {
-  --el-table-row-hover-bg-color: var(--el-transfer-border-color);
+	--el-table-row-hover-bg-color: var(--el-transfer-border-color);
 }
-.remark {
-  &::after {
-    content: '';
-    border-bottom: solid 1px var(--el-border-color-light);
-    width: 100%;
-    position: absolute;
-    bottom: -10px;
-    left: 0;
-  }
+.remark{
+    &::after{
+        content: '';
+        border-bottom: solid 1px var(--el-border-color-light);
+        width: 100%;
+        position: absolute;
+        bottom: -10px;
+        left: 0;
+    }
 }
 </style>
diff --git a/admin/src/app/views/finance/components/refund-detail.vue b/admin/src/app/views/finance/components/refund-detail.vue
index 8cd720c6..18860d51 100644
--- a/admin/src/app/views/finance/components/refund-detail.vue
+++ b/admin/src/app/views/finance/components/refund-detail.vue
@@ -1,129 +1,60 @@
 <template>
-  <el-drawer
-    v-model="showDialog"
-    title="退款详情"
-    direction="rtl"
-    :before-close="handleClose"
-    class="member-detail-drawer"
-  >
-    <div class="main-container" v-loading="loading">
-      <div class="relative" v-if="formData">
-        <div class="flex mb-[20px] justify-between text-[15px]">
-          <span
-            >{{ t('refundMoney') }}：<span>￥{{ formData.money }}</span></span
-          >
-          <span
-            >{{ t('refundNo') }}：<span>{{ formData.refund_no }}</span></span
-          >
+    <el-drawer v-model="showDialog" title="退款详情" direction="rtl" :before-close="handleClose" class="member-detail-drawer">
+        <div class="main-container" v-loading="loading">
+            <div class="relative" v-if="formData">
+                <div class="flex mb-[20px] justify-between text-[15px]">
+                    <span>{{ t('refundMoney') }}：<span>￥{{ formData.money }}</span></span>
+                    <span>{{ t('refundNo') }}：<span>{{ formData.refund_no }}</span></span>
+                </div>
+
+                <el-table :data="refundList" size="large">
+                    <el-table-column prop="out_trade_no" :label="t('outTradeNo')" min-width="200" />
+                    <el-table-column prop="create_time" :label="t('createTime')" min-width="160" />
+                    <el-table-column prop="refund_type_name" :label="t('refundTypeName')" min-width="120" />
+                    <el-table-column :label="t('refundMoney')" min-width="120">
+                        <template #default="{ row }">
+                            <span>￥{{ row.money }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="status_name" :label="t('statusName')" min-width="120" />
+                    <el-table-column :label="t('operation')" fixed="right" align="right" min-width="120">
+                        <template #default="{ row }">
+                            <el-button type="primary" v-if="row.status == 'wait'" link @click="transferEvent(row)">{{ t('transfer') }}</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+
+            <el-dialog v-model="transferDialog" :title="title" width="500px" class="diy-dialog-wrap" :destroy-on-close="true">
+                <el-form :model="transferFormData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                    <el-form-item :label="t('transferType')">
+                        <el-radio-group v-model="transferFormData.refund_type">
+                            <el-radio :label="item.value" v-for="(item, index) in refundTypeData" :key="index">{{ item.name }}</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+                    <el-form-item :label="t('refundMoney')">
+                        <span>{{ transferFormData.refund_money }}</span>
+                    </el-form-item>
+                    <el-form-item :label="t('voucher')" v-if="transferFormData.refund_type == 'offline'">
+                        <upload-image v-model="transferFormData.voucher" />
+                    </el-form-item>
+                </el-form>
+
+                <template #footer>
+                    <span class="dialog-footer">
+                        <el-button @click="transferDialog = false">{{ t('cancel') }}</el-button>
+                        <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+                    </span>
+                </template>
+            </el-dialog>
         </div>
-
-        <el-table :data="refundList" size="large">
-          <el-table-column
-            prop="out_trade_no"
-            :label="t('outTradeNo')"
-            min-width="200"
-          />
-          <el-table-column
-            prop="create_time"
-            :label="t('createTime')"
-            min-width="160"
-          />
-          <el-table-column
-            prop="refund_type_name"
-            :label="t('refundTypeName')"
-            min-width="120"
-          />
-          <el-table-column :label="t('refundMoney')" min-width="120">
-            <template #default="{ row }">
-              <span>￥{{ row.money }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="status_name"
-            :label="t('statusName')"
-            min-width="120"
-          />
-          <el-table-column
-            :label="t('operation')"
-            fixed="right"
-            align="right"
-            min-width="120"
-          >
-            <template #default="{ row }">
-              <el-button
-                type="primary"
-                v-if="row.status == 'wait'"
-                link
-                @click="transferEvent(row)"
-                >{{ t('transfer') }}</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-
-      <el-dialog
-        v-model="transferDialog"
-        :title="title"
-        width="500px"
-        class="diy-dialog-wrap"
-        :destroy-on-close="true"
-      >
-        <el-form
-          :model="transferFormData"
-          label-width="120px"
-          ref="formRef"
-          :rules="formRules"
-          class="page-form"
-          v-loading="loading"
-        >
-          <el-form-item :label="t('transferType')">
-            <el-radio-group v-model="transferFormData.refund_type">
-              <el-radio
-                :label="item.value"
-                v-for="(item, index) in refundTypeData"
-                :key="index"
-                >{{ item.name }}</el-radio
-              >
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item :label="t('refundMoney')">
-            <span>{{ transferFormData.refund_money }}</span>
-          </el-form-item>
-          <el-form-item
-            :label="t('voucher')"
-            v-if="transferFormData.refund_type == 'offline'"
-          >
-            <upload-image v-model="transferFormData.voucher" />
-          </el-form-item>
-        </el-form>
-
-        <template #footer>
-          <span class="dialog-footer">
-            <el-button @click="transferDialog = false">{{
-              t('cancel')
-            }}</el-button>
-            <el-button
-              type="primary"
-              :loading="loading"
-              @click="confirm(formRef)"
-              >{{ t('confirm') }}</el-button
-            >
-          </span>
-        </template>
-      </el-dialog>
-    </div>
-  </el-drawer>
+    </el-drawer>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref, computed } from 'vue'
 import { t } from '@/lang'
-import {
-  getPayRefundInfo,
-  getRefundType,
-  getRefundTransfer,
-} from '@/app/api/pay'
+import { getPayRefundInfo, getRefundType, getRefundTransfer } from '@/app/api/pay'
 import { FormInstance, ElMessage } from 'element-plus'
 import { useRouter, useRoute } from 'vue-router'
 import { img, filterNumber } from '@/utils/common'
@@ -131,17 +62,18 @@ import useAppStore from '@/stores/modules/app'
 
 const route = useRoute()
 const router = useRouter()
-let popTitle: string = '退款详情'
+let popTitle: string = '退款详情';
 
 const showDialog = ref(false)
 const loading = ref(false)
-let refundNo = ''
+let refundNo = '';
 
 const refundList = ref([])
 const formData: Record<string, any> = ref(null)
 
+
 const handleClose = (done: () => void) => {
-  showDialog.value = false
+    showDialog.value = false;
 }
 
 /**
@@ -150,80 +82,78 @@ const handleClose = (done: () => void) => {
 const formRef = ref<FormInstance>()
 
 const setFormData = async (row: any = null) => {
-  refundNo = row.no
-  getRefundListInfo(refundNo)
+    refundNo = row.no;
+    getRefundListInfo(refundNo)
 }
 
 const getRefundListInfo = async (no) => {
-  loading.value = true
-  formData.value = null
-  refundList.value = []
-  await getPayRefundInfo(no).then(({ data }) => {
-    formData.value = data
-    refundList.value.push(data)
-  })
-  loading.value = false
+    loading.value = true
+    formData.value = null
+    refundList.value = [];
+    await getPayRefundInfo(no).then(({ data }) => {
+        formData.value = data
+        refundList.value.push(data)
+    })
+    loading.value = false
 }
 
 const refundTypeData = ref([])
 getRefundType().then((data) => {
-  Object.keys(data.data).forEach((key: string) => {
-    refundTypeData.value.push({ value: key, name: data.data[key] })
-  })
+    Object.keys(data.data).forEach((key: string) => {
+        refundTypeData.value.push({ value: key, name: data.data[key] })
+    })
 })
 
 const transferDialog = ref(false)
-const transferEvent = (data: any) => {
-  transferDialog.value = true
-  transferFormData.refund_no = data.refund_no
-  transferFormData.refund_money = data.money
+const transferEvent = (data:any) => {
+    transferDialog.value = true
+    transferFormData.refund_no = data.refund_no
+    transferFormData.refund_money = data.money
 }
 
 const initialFormData = {
-  refund_no: '',
-  refund_type: 'back',
-  voucher: '',
-  refund_money: 0.0,
+    refund_no: '',
+    refund_type: 'back',
+    voucher: '',
+    refund_money: 0.00
 }
 const transferFormData: Record<string, any> = reactive({ ...initialFormData })
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    label_name: [
-      { required: true, message: t('labelNamePlaceholder'), trigger: 'blur' },
-    ],
-  }
+    return {
+        label_name: [
+            { required: true, message: t('labelNamePlaceholder'), trigger: 'blur' }
+        ]
+    }
 })
 
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      const data = transferFormData
-      getRefundTransfer(data)
-        .then((res) => {
-          loading.value = false
-          transferDialog.value = false
-          refundList.value = []
-          getRefundListInfo(refundNo)
-        })
-        .catch(() => {
-          transferDialog.value = false
-          loading.value = false
-        })
-    }
-  })
+    if (loading.value || !formEl) return
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+            const data = transferFormData
+            getRefundTransfer(data).then(res => {
+                loading.value = false
+                transferDialog.value = false
+                refundList.value = []
+                getRefundListInfo(refundNo)
+            }).catch(() => {
+                transferDialog.value = false
+                loading.value = false
+            })
+        }
+    })
 }
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 <style lang="scss">
-.member-detail-drawer {
-  width: 1300px !important;
+.member-detail-drawer{
+    width: 1300px !important;
 }
 </style>
diff --git a/admin/src/app/views/finance/offlinepay.vue b/admin/src/app/views/finance/offlinepay.vue
index 78f94808..fbb8cf76 100644
--- a/admin/src/app/views/finance/offlinepay.vue
+++ b/admin/src/app/views/finance/offlinepay.vue
@@ -1,150 +1,79 @@
 <template>
-  <el-card class="box-card !border-none" shadow="never" v-loading="payLoading">
-    <!-- 设置支付配置 -->
-    <div class="flex justify-between items-center">
-      <span class="text-page-title">{{ pageName }}</span>
-    </div>
-
-    <div class="mt-[10px]">
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="payListTable.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('outTradeNo')" prop="trade_no">
-            <el-input
-              v-model.trim="payListTable.searchParam.out_trade_no"
-              :placeholder="t('outTradeNoPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('createTime')" prop="create_time">
-            <el-date-picker
-              v-model="payListTable.searchParam.create_time"
-              type="datetimerange"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              :start-placeholder="t('startDate')"
-              :end-placeholder="t('endDate')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('status')" prop="status">
-            <el-select
-              v-model="payListTable.searchParam.status"
-              :placeholder="t('status')"
-            >
-              <el-option :label="t('all')" value="" />
-              <el-option :label="t('waitAudit')" value="3" />
-              <el-option :label="t('passed')" value="2" />
-              <el-option :label="t('notPass')" value="-1" />
-            </el-select>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="loadPayList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
-
-      <el-table
-        :data="payListTable.data"
-        size="large"
-        v-loading="payListTable.loading"
-      >
-        <template #empty>
-          <span>{{ !payListTable.loading ? t('emptyData') : '' }}</span>
-        </template>
-        <el-table-column
-          prop="out_trade_no"
-          :label="t('outTradeNo')"
-          min-width="230"
-          :show-overflow-tooltip="true"
-        />
-        <el-table-column
-          prop="body"
-          :label="t('body')"
-          min-width="150"
-          :show-overflow-tooltip="true"
-        />
-        <el-table-column
-          prop="money"
-          :label="t('money')"
-          min-width="120"
-          align="right"
-        />
-        <el-table-column
-          :label="t('createTime')"
-          min-width="150"
-          align="center"
-          :show-overflow-tooltip="true"
-        >
-          <template #default="{ row }">
-            {{ row.create_time || '' }}
-          </template>
-        </el-table-column>
-
-        <el-table-column :label="t('status')" min-width="150" align="center">
-          <template #default="{ row }">
-            <span v-if="row.status == 3">{{ t('waitAudit') }}</span>
-            <span v-if="row.status == 2" class="text-success">{{
-              t('passed')
-            }}</span>
-            <span v-if="row.status == -1" class="text-error">{{
-              t('notPass')
-            }}</span>
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          :label="t('operation')"
-          fixed="right"
-          width="240"
-          align="right"
-        >
-          <template #default="{ row }">
-            <el-button type="primary" link @click="detailEvent(row)">{{
-              t('detail')
-            }}</el-button>
-            <span v-if="row.status == 3">
-              <el-button type="success" link @click="passEvent(row)">{{
-                t('pass')
-              }}</el-button>
-              <el-button type="primary" link @click="refuseEvent(row)">{{
-                t('refuse')
-              }}</el-button>
-            </span>
-            <el-button type="primary" link @click="voucherEvent(row)">{{
-              t('voucher')
-            }}</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="mt-[16px] flex justify-end">
-        <el-pagination
-          v-model:current-page="payListTable.page"
-          v-model:page-size="payListTable.limit"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="payListTable.total"
-          @size-change="loadPayList()"
-          @current-change="loadPayList"
-        />
-      </div>
-    </div>
-  </el-card>
-
-  <el-image-viewer
-    :url-list="previewImageList"
-    v-if="imageViewerShow"
-    @close="imageViewerShow = false"
-    :initial-index="0"
-    :zoom-rate="1"
-  />
+    <el-card class="box-card !border-none" shadow="never" v-loading="payLoading">
+        <!-- 设置支付配置 -->
+        <div class="flex justify-between items-center">
+            <span class="text-page-title">{{ pageName }}</span>
+        </div>
+
+        <div class="mt-[10px]">
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="payListTable.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('outTradeNo')" prop="trade_no">
+                        <el-input v-model.trim="payListTable.searchParam.out_trade_no" :placeholder="t('outTradeNoPlaceholder')" />
+                    </el-form-item>
+                    <el-form-item :label="t('createTime')" prop="create_time">
+                        <el-date-picker v-model="payListTable.searchParam.create_time" type="datetimerange"
+                            value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')"
+                            :end-placeholder="t('endDate')" />
+                    </el-form-item>
+                    <el-form-item :label="t('status')" prop="status">
+                        <el-select v-model="payListTable.searchParam.status" :placeholder="t('status')">
+                            <el-option :label="t('all')" value="" />
+                            <el-option :label="t('waitAudit')" value="3" />
+                            <el-option :label="t('passed')" value="2" />
+                            <el-option :label="t('notPass')" value="-1" />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="loadPayList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+
+            <el-table :data="payListTable.data" size="large" v-loading="payListTable.loading">
+                <template #empty>
+                    <span>{{ !payListTable.loading ? t('emptyData') : '' }}</span>
+                </template>
+                <el-table-column prop="out_trade_no" :label="t('outTradeNo')" min-width="230" :show-overflow-tooltip="true" />
+                <el-table-column prop="body" :label="t('body')" min-width="150" :show-overflow-tooltip="true" />
+                <el-table-column prop="money" :label="t('money')" min-width="120" align="right" />
+                <el-table-column :label="t('createTime')" min-width="150" align="center" :show-overflow-tooltip="true">
+                    <template #default="{ row }">
+                        {{ row.create_time || '' }}
+                    </template>
+                </el-table-column>
+
+                <el-table-column :label="t('status')" min-width="150" align="center">
+                    <template #default="{ row }">
+                        <span v-if="row.status == 3">{{ t('waitAudit') }}</span>
+                        <span v-if="row.status == 2" class="text-success">{{ t('passed') }}</span>
+                        <span v-if="row.status == -1" class="text-error">{{ t('notPass') }}</span>
+                    </template>
+                </el-table-column>
+
+                <el-table-column :label="t('operation')" fixed="right" width="240" align="right">
+                    <template #default="{ row }">
+                        <el-button type="primary" link @click="detailEvent(row)">{{ t('detail') }}</el-button>
+                        <span v-if="row.status == 3">
+                            <el-button type="success" link @click="passEvent(row)">{{ t('pass') }}</el-button>
+                            <el-button type="primary" link @click="refuseEvent(row)">{{ t('refuse') }}</el-button>
+                        </span>
+                        <el-button type="primary" link @click="voucherEvent(row)">{{ t('voucher') }}</el-button>
+                    </template>
+                </el-table-column>
+
+            </el-table>
+            <div class="mt-[16px] flex justify-end">
+                <el-pagination v-model:current-page="payListTable.page" v-model:page-size="payListTable.limit"
+                    layout="total, sizes, prev, pager, next, jumper" :total="payListTable.total"
+                    @size-change="loadPayList()" @current-change="loadPayList" />
+            </div>
+        </div>
+    </el-card>
+
+    <el-image-viewer :url-list="previewImageList" v-if="imageViewerShow" @close="imageViewerShow = false" :initial-index="0"
+        :zoom-rate="1" />
 </template>
 
 <script lang="ts" setup>
@@ -164,84 +93,84 @@ const previewImageList = ref<string[]>([])
 const imageViewerShow = ref(false)
 
 const payListTable = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    out_trade_no: '',
-    create_time: '',
-    status: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        out_trade_no: '',
+        create_time: '',
+        status: ''
+    }
 })
 
 const searchFormRef = ref<FormInstance>()
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadPayList()
+    if (!formEl) return
+    formEl.resetFields()
+    loadPayList()
 }
 
 /**
  * 获取站点账单记录列表
  */
 const loadPayList = (page: number = 1) => {
-  payListTable.loading = true
-  payListTable.page = page
-
-  getPayAuditList({
-    page: payListTable.page,
-    limit: payListTable.limit,
-    ...payListTable.searchParam,
-  })
-    .then((res) => {
-      payListTable.loading = false
-      payListTable.data = res.data.data
-      payListTable.total = res.data.total
-    })
-    .catch(() => {
-      payListTable.loading = false
+    payListTable.loading = true
+    payListTable.page = page
+
+    getPayAuditList({
+        page: payListTable.page,
+        limit: payListTable.limit,
+        ...payListTable.searchParam
+    }).then(res => {
+        payListTable.loading = false
+        payListTable.data = res.data.data
+        payListTable.total = res.data.total
+    }).catch(() => {
+        payListTable.loading = false
     })
 }
 loadPayList()
 
 const passEvent = (row: AnyObject) => {
-  ElMessageBox.confirm(t('passTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(({ value }) => {
-    payAuditPass(row.out_trade_no).then(() => {
-      loadPayList()
+    ElMessageBox.confirm(
+            t('passTips'),
+            t('warning'),
+            {
+                confirmButtonText: t('confirm'),
+                cancelButtonText: t('cancel'),
+                type: 'warning'
+            }
+    ).then(({ value }) => {
+        payAuditPass(row.out_trade_no).then(() => {
+            loadPayList()
+        })
     })
-  })
 }
 
 const refuseEvent = (row: AnyObject) => {
-  ElMessageBox.prompt(t('refuseReason'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    inputErrorMessage: t('refuseReason'),
-    inputPattern: /\S/,
-    inputType: 'textarea',
-  }).then(({ value }) => {
-    payAuditRefuse({ out_trade_no: row.out_trade_no, reason: value }).then(
-      () => {
-        loadPayList()
-      }
-    )
-  })
+    ElMessageBox.prompt(t('refuseReason'), t('warning'), {
+        confirmButtonText: t('confirm'),
+        cancelButtonText: t('cancel'),
+        inputErrorMessage: t('refuseReason'),
+        inputPattern: /\S/,
+        inputType: 'textarea'
+    }).then(({ value }) => {
+        payAuditRefuse({ out_trade_no: row.out_trade_no, reason: value }).then(() => {
+            loadPayList()
+        })
+    })
 }
 
 const voucherEvent = (row: AnyObject) => {
-  previewImageList.value[0] = img(row.voucher)
-  imageViewerShow.value = true
+    previewImageList.value[0] = img(row.voucher)
+    imageViewerShow.value = true
 }
 
 const detailEvent = (row: AnyObject) => {
-  router.push(`/finance/pay/detail?id=${row.id}`)
+    router.push(`/finance/pay/detail?id=${row.id}`)
 }
 </script>
 
diff --git a/admin/src/app/views/finance/pay_detail.vue b/admin/src/app/views/finance/pay_detail.vue
index 6d4da340..194e31a6 100644
--- a/admin/src/app/views/finance/pay_detail.vue
+++ b/admin/src/app/views/finance/pay_detail.vue
@@ -1,90 +1,56 @@
 <template>
-  <!--支付详情-->
-  <div class="main-container">
-    <el-card class="card !border-none" shadow="never">
-      <el-page-header
-        :content="pageName"
-        :icon="ArrowLeft"
-        @back="$router.back()"
-      />
-    </el-card>
+    <!--支付详情-->
+    <div class="main-container">
 
-    <el-card
-      class="box-card mt-[15px] !border-none"
-      shadow="never"
-      v-loading="loading"
-    >
-      <el-form
-        :model="formData"
-        label-width="150px"
-        ref="formRef"
-        class="page-form mt-[10px]"
-        v-if="!loading"
-      >
-        <el-form-item :label="t('outTradeNo')">
-          <div class="input-width">{{ formData.out_trade_no }}</div>
-        </el-form-item>
-        <el-form-item :label="t('createTime')">
-          <div class="input-width">{{ formData.create_time }}</div>
-        </el-form-item>
-        <el-form-item :label="t('money')">
-          <div class="input-width">{{ formData.money }}</div>
-        </el-form-item>
-        <el-form-item :label="t('body')">
-          <div class="input-width">{{ formData.body }}</div>
-        </el-form-item>
-        <el-form-item :label="t('channel')">
-          <div class="input-width">{{ formData.channel_name }}</div>
-        </el-form-item>
-        <el-form-item :label="t('payStatus')">
-          <div class="input-width">{{ formData.status_name }}</div>
-        </el-form-item>
-        <el-form-item :label="t('payType')" v-if="formData.type_name">
-          <div class="input-width">{{ formData.type_name }}</div>
-        </el-form-item>
-        <el-form-item :label="t('payTime')" v-if="formData.pay_time">
-          <div class="input-width">{{ formData.pay_time }}</div>
-        </el-form-item>
-        <el-form-item :label="t('failTime')" v-if="formData.close_time">
-          <div class="input-width">{{ formData.close_time }}</div>
-        </el-form-item>
-        <el-form-item :label="t('failReason')" v-if="formData.fail_reason">
-          <div class="input-width">{{ formData.fail_reason }}</div>
-        </el-form-item>
-        <el-form-item
-          :label="t('voucher')"
-          v-if="formData.type == 'offlinepay' && formData.voucher"
-        >
-          <div class="input-width cursor-pointer">
-            <el-image
-              style="width: 100%"
-              :src="img(formData.voucher)"
-              fit="cover"
-              @click="voucherEvent"
-            />
-          </div>
-        </el-form-item>
-        <el-form-item
-          :label="t('auditVoucher')"
-          v-if="formData.type == 'offlinepay' && formData.status == 3"
-        >
-          <el-button type="primary" @click="passEvent">{{
-            t('pass')
-          }}</el-button>
-          <el-button type="primary" @click="refuseEvent">{{
-            t('refuse')
-          }}</el-button>
-        </el-form-item>
-      </el-form>
-    </el-card>
-  </div>
-  <el-image-viewer
-    :url-list="previewImageList"
-    v-if="imageViewerShow"
-    @close="imageViewerShow = false"
-    :initial-index="0"
-    :zoom-rate="1"
-  />
+        <el-card class="card !border-none" shadow="never">
+            <el-page-header :content="pageName" :icon="ArrowLeft" @back="$router.back()" />
+        </el-card>
+
+        <el-card class="box-card mt-[15px] !border-none" shadow="never" v-loading="loading">
+            <el-form :model="formData" label-width="150px" ref="formRef" class="page-form mt-[10px]" v-if="!loading">
+                <el-form-item :label="t('outTradeNo')">
+                    <div class="input-width">{{ formData.out_trade_no }}</div>
+                </el-form-item>
+                <el-form-item :label="t('createTime')">
+                    <div class="input-width">{{ formData.create_time }}</div>
+                </el-form-item>
+                <el-form-item :label="t('money')">
+                    <div class="input-width">{{ formData.money }}</div>
+                </el-form-item>
+                <el-form-item :label="t('body')">
+                    <div class="input-width">{{ formData.body }}</div>
+                </el-form-item>
+                <el-form-item :label="t('channel')">
+                    <div class="input-width">{{ formData.channel_name }}</div>
+                </el-form-item>
+                <el-form-item :label="t('payStatus')">
+                    <div class="input-width">{{ formData.status_name }}</div>
+                </el-form-item>
+                <el-form-item :label="t('payType')" v-if="formData.type_name">
+                    <div class="input-width">{{ formData.type_name }}</div>
+                </el-form-item>
+                <el-form-item :label="t('payTime')" v-if="formData.pay_time">
+                    <div class="input-width">{{ formData.pay_time }}</div>
+                </el-form-item>
+                <el-form-item :label="t('failTime')" v-if="formData.close_time">
+                    <div class="input-width">{{ formData.close_time }}</div>
+                </el-form-item>
+                <el-form-item :label="t('failReason')" v-if="formData.fail_reason">
+                    <div class="input-width">{{ formData.fail_reason }}</div>
+                </el-form-item>
+                <el-form-item :label="t('voucher')" v-if="formData.type == 'offlinepay' && formData.voucher">
+                    <div class="input-width cursor-pointer">
+                        <el-image style="width: 100%;" :src="img(formData.voucher)" fit="cover" @click="voucherEvent" />
+                    </div>
+                </el-form-item>
+                <el-form-item :label="t('auditVoucher')" v-if="formData.type == 'offlinepay' && formData.status == 3">
+                    <el-button type="primary" @click="passEvent">{{ t('pass') }}</el-button>
+                    <el-button type="primary" @click="refuseEvent">{{ t('refuse') }}</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+    </div>
+    <el-image-viewer :url-list="previewImageList" v-if="imageViewerShow" @close="imageViewerShow = false" :initial-index="0" :zoom-rate="1" />
 </template>
 
 <script lang="ts" setup>
@@ -99,54 +65,55 @@ import { ArrowLeft } from '@element-plus/icons-vue'
 const route = useRoute()
 const router = useRouter()
 const pageName = route.meta.title
-const id: number = parseInt(route.query.id || 0)
+const id: number = parseInt((route.query.id || 0))
 const loading = ref(true)
 const formData: Record<string, any> | null = ref(null)
 
 const setFormData = async () => {
-  loading.value = true
-  formData.value = null
-  await getPayDetail(id).then(({ data }) => {
-    formData.value = data
-  })
-  loading.value = false
+    loading.value = true
+    formData.value = null
+    await getPayDetail(id).then(({ data }) => {
+        formData.value = data
+    })
+    loading.value = false
 }
 setFormData()
 
 const passEvent = () => {
-  ElMessageBox.confirm(t('passTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(({ value }) => {
-    payAuditPass(formData.value.out_trade_no).then(() => {
-      setFormData()
+    ElMessageBox.confirm(
+            t('passTips'),
+            t('warning'),
+            {
+                confirmButtonText: t('confirm'),
+                cancelButtonText: t('cancel'),
+                type: 'warning'
+            }
+    ).then(({ value }) => {
+        payAuditPass(formData.value.out_trade_no).then(() => {
+            setFormData()
+        })
     })
-  })
 }
 
 const refuseEvent = () => {
-  ElMessageBox.prompt(t('refuseReason'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    inputErrorMessage: t('refuseReason'),
-    inputPattern: /\S/,
-    inputType: 'textarea',
-  }).then(({ value }) => {
-    payAuditRefuse({
-      out_trade_no: formData.value.out_trade_no,
-      reason: value,
-    }).then(() => {
-      setFormData()
+    ElMessageBox.prompt(t('refuseReason'), t('warning'), {
+        confirmButtonText: t('confirm'),
+        cancelButtonText: t('cancel'),
+        inputErrorMessage: t('refuseReason'),
+        inputPattern: /\S/,
+        inputType: 'textarea'
+    }).then(({ value }) => {
+        payAuditRefuse({ out_trade_no: formData.value.out_trade_no, reason: value }).then(() => {
+            setFormData()
+        })
     })
-  })
 }
 
 const previewImageList = ref<string[]>([])
 const imageViewerShow = ref(false)
 const voucherEvent = () => {
-  previewImageList.value[0] = img(formData.value.voucher)
-  imageViewerShow.value = true
+    previewImageList.value[0] = img(formData.value.voucher)
+    imageViewerShow.value = true
 }
 </script>
 
diff --git a/admin/src/app/views/finance/pay_refund.vue b/admin/src/app/views/finance/pay_refund.vue
index fcc8ff9f..1f1a810a 100644
--- a/admin/src/app/views/finance/pay_refund.vue
+++ b/admin/src/app/views/finance/pay_refund.vue
@@ -1,109 +1,56 @@
 <template>
-  <!--会员退款-->
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
+    <!--会员退款-->
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
 
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="payRefundTable.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('refundNo')" prop="refund_no">
-            <el-input
-              v-model.trim="payRefundTable.searchParam.refund_no"
-              :placeholder="t('refundNoPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('createTime')" prop="create_time">
-            <el-date-picker
-              v-model="payRefundTable.searchParam.create_time"
-              type="datetimerange"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              :start-placeholder="t('startDate')"
-              :end-placeholder="t('endDate')"
-            />
-          </el-form-item>
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+            </div>
 
-          <el-form-item>
-            <el-button type="primary" @click="loadPayRefundList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="payRefundTable.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('refundNo')" prop="refund_no">
+                        <el-input v-model.trim="payRefundTable.searchParam.refund_no" :placeholder="t('refundNoPlaceholder')" />
+                    </el-form-item>
+                    <el-form-item :label="t('createTime')" prop="create_time">
+                        <el-date-picker v-model="payRefundTable.searchParam.create_time" type="datetimerange"
+                            value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')"
+                            :end-placeholder="t('endDate')" />
+                    </el-form-item>
 
-      <div class="mt-[10px]">
-        <el-table
-          :data="payRefundTable.data"
-          size="large"
-          v-loading="payRefundTable.loading"
-        >
-          <template #empty>
-            <span>{{ !payRefundTable.loading ? t('emptyData') : '' }}</span>
-          </template>
-          <el-table-column
-            prop="refund_no"
-            :label="t('refundNo')"
-            min-width="200"
-          />
-          <el-table-column
-            prop="money"
-            :label="t('refundMoney')"
-            min-width="120"
-          />
-          <el-table-column
-            prop="type_name"
-            :label="t('payType')"
-            min-width="120"
-          />
-          <el-table-column
-            prop="status_name"
-            :label="t('status')"
-            min-width="120"
-          />
-          <el-table-column
-            prop="create_time"
-            :label="t('createTime')"
-            min-width="160"
-          />
-          <el-table-column
-            :label="t('operation')"
-            fixed="right"
-            align="right"
-            min-width="120"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="infoEvent(row)">{{
-                t('info')
-              }}</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+                    <el-form-item>
+                        <el-button type="primary" @click="loadPayRefundList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
 
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="payRefundTable.page"
-            v-model:page-size="payRefundTable.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="payRefundTable.total"
-            @size-change="loadPayRefundList()"
-            @current-change="loadPayRefundList"
-          />
-        </div>
-      </div>
-    </el-card>
-    <refund-detail ref="refundDetailDialog"></refund-detail>
-  </div>
+            <div class="mt-[10px]">
+                <el-table :data="payRefundTable.data" size="large" v-loading="payRefundTable.loading">
+                    <template #empty>
+                        <span>{{ !payRefundTable.loading ? t('emptyData') : '' }}</span>
+                    </template>
+                    <el-table-column prop="refund_no" :label="t('refundNo')" min-width="200" />
+                    <el-table-column prop="money" :label="t('refundMoney')" min-width="120" />
+                    <el-table-column prop="type_name" :label="t('payType')" min-width="120" />
+                    <el-table-column prop="status_name" :label="t('status')" min-width="120" />
+                    <el-table-column prop="create_time" :label="t('createTime')" min-width="160" />
+                    <el-table-column :label="t('operation')" fixed="right" align="right" min-width="120">
+                       <template #default="{ row }">
+                           <el-button type="primary" link @click="infoEvent(row)">{{ t('info') }}</el-button>
+                       </template>
+                    </el-table-column>
+                </el-table>
+
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="payRefundTable.page" v-model:page-size="payRefundTable.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="payRefundTable.total"
+                        @size-change="loadPayRefundList()" @current-change="loadPayRefundList" />
+                </div>
+            </div>
+        </el-card>
+        <refund-detail ref="refundDetailDialog"></refund-detail>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -119,15 +66,15 @@ const router = useRouter()
 const pageName = route.meta.title
 
 const payRefundTable = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    refund_no: '',
-    create_time: [],
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        refund_no: '',
+        create_time: []
+    }
 })
 
 const searchFormRef = ref<FormInstance>()
@@ -136,35 +83,33 @@ const searchFormRef = ref<FormInstance>()
  * 获取商品标签列表
  */
 const loadPayRefundList = (page: number = 1) => {
-  payRefundTable.loading = true
-  payRefundTable.page = page
+    payRefundTable.loading = true
+    payRefundTable.page = page
 
-  getPayRefundPages({
-    page: payRefundTable.page,
-    limit: payRefundTable.limit,
-    ...payRefundTable.searchParam,
-  })
-    .then((res) => {
-      payRefundTable.loading = false
-      payRefundTable.data = res.data.data
-      payRefundTable.total = res.data.total
-    })
-    .catch(() => {
-      payRefundTable.loading = false
+    getPayRefundPages({
+        page: payRefundTable.page,
+        limit: payRefundTable.limit,
+        ...payRefundTable.searchParam
+    }).then(res => {
+        payRefundTable.loading = false
+        payRefundTable.data = res.data.data
+        payRefundTable.total = res.data.total
+    }).catch(() => {
+        payRefundTable.loading = false
     })
 }
 loadPayRefundList()
 const refundDetailDialog: Record<string, any> | null = ref(null)
-const infoEvent = (res: any) => {
-  let data = { no: res.refund_no }
-  refundDetailDialog.value.setFormData(data)
-  refundDetailDialog.value.showDialog = true
+const infoEvent = (res:any) => {
+    let data = {no: res.refund_no};
+    refundDetailDialog.value.setFormData(data);
+    refundDetailDialog.value.showDialog = true;
 }
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadPayRefundList()
+    if (!formEl) return
+    formEl.resetFields()
+    loadPayRefundList()
 }
 </script>
 
diff --git a/admin/src/app/views/finance/refund_detail.vue b/admin/src/app/views/finance/refund_detail.vue
index 9a96686d..d35bcc54 100644
--- a/admin/src/app/views/finance/refund_detail.vue
+++ b/admin/src/app/views/finance/refund_detail.vue
@@ -1,130 +1,64 @@
 <template>
-  <!--退款详情-->
-  <div class="main-container">
-    <el-card class="card !border-none" shadow="never">
-      <el-page-header :content="pageName" :icon="ArrowLeft" @back="back()" />
-    </el-card>
-
-    <el-card
-      class="box-card mt-[15px] !border-none relative"
-      shadow="never"
-      v-if="formData"
-    >
-      <div class="flex mt-[5px] mb-[20px] justify-between">
-        <span
-          >{{ t('refundMoney') }}：<span>￥{{ formData.money }}</span></span
-        >
-        <span
-          >{{ t('refundNo') }}：<span>{{ formData.refund_no }}</span></span
-        >
-      </div>
-
-      <el-table :data="refundList" size="large">
-        <el-table-column
-          prop="out_trade_no"
-          :label="t('outTradeNo')"
-          min-width="200"
-        />
-        <el-table-column
-          prop="create_time"
-          :label="t('createTime')"
-          min-width="160"
-        />
-        <el-table-column
-          prop="refund_type_name"
-          :label="t('refundTypeName')"
-          min-width="120"
-        />
-        <el-table-column :label="t('refundMoney')" min-width="120">
-          <template #default="{ row }">
-            <span>￥{{ row.money }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="status_name"
-          :label="t('statusName')"
-          min-width="120"
-        />
-        <el-table-column
-          :label="t('operation')"
-          fixed="right"
-          align="right"
-          min-width="120"
-        >
-          <template #default="{ row }">
-            <el-button
-              type="primary"
-              link
-              @click="transferEvent(row)"
-              v-if="row.status == 'wait'"
-              >{{ t('transfer') }}</el-button
-            >
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
-
-    <el-dialog
-      v-model="transferDialog"
-      :title="title"
-      width="500px"
-      class="diy-dialog-wrap"
-      :destroy-on-close="true"
-    >
-      <el-form
-        :model="transferFormData"
-        label-width="120px"
-        ref="formRef"
-        :rules="formRules"
-        class="page-form"
-        v-loading="loading"
-      >
-        <el-form-item :label="t('transferType')">
-          <el-radio-group v-model="transferFormData.refund_type">
-            <el-radio
-              :label="item.value"
-              v-for="(item, index) in refundTypeData"
-              :key="index"
-              >{{ item.name }}</el-radio
-            >
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item :label="t('refundMoney')">
-          <span>{{ transferFormData.refund_money }}</span>
-        </el-form-item>
-        <el-form-item
-          :label="t('voucher')"
-          v-if="transferFormData.refund_type == 'offline'"
-        >
-          <upload-image v-model="transferFormData.voucher" />
-        </el-form-item>
-      </el-form>
-
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="transferDialog = false">{{
-            t('cancel')
-          }}</el-button>
-          <el-button
-            type="primary"
-            :loading="loading"
-            @click="confirm(formRef)"
-            >{{ t('confirm') }}</el-button
-          >
-        </span>
-      </template>
-    </el-dialog>
-  </div>
+    <!--退款详情-->
+    <div class="main-container">
+
+        <el-card class="card !border-none" shadow="never">
+            <el-page-header :content="pageName" :icon="ArrowLeft" @back="back()" />
+        </el-card>
+
+        <el-card class="box-card mt-[15px] !border-none relative" shadow="never" v-if="formData">
+            <div class="flex mt-[5px] mb-[20px] justify-between">
+                <span>{{ t('refundMoney') }}：<span>￥{{ formData.money }}</span></span>
+                <span>{{ t('refundNo') }}：<span>{{ formData.refund_no }}</span></span>
+            </div>
+
+            <el-table :data="refundList" size="large">
+                <el-table-column prop="out_trade_no" :label="t('outTradeNo')" min-width="200" />
+                <el-table-column prop="create_time" :label="t('createTime')" min-width="160" />
+                <el-table-column prop="refund_type_name" :label="t('refundTypeName')" min-width="120" />
+                <el-table-column :label="t('refundMoney')" min-width="120">
+                    <template #default="{ row }">
+                        <span>￥{{ row.money }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="status_name" :label="t('statusName')" min-width="120" />
+                <el-table-column :label="t('operation')" fixed="right" align="right" min-width="120">
+                    <template #default="{ row }">
+                        <el-button type="primary" link @click="transferEvent(row)" v-if="row.status == 'wait'">{{ t('transfer') }}</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </el-card>
+
+        <el-dialog v-model="transferDialog" :title="title" width="500px" class="diy-dialog-wrap" :destroy-on-close="true">
+            <el-form :model="transferFormData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('transferType')">
+                    <el-radio-group v-model="transferFormData.refund_type">
+                        <el-radio :label="item.value" v-for="(item, index) in refundTypeData" :key="index">{{ item.name }}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item :label="t('refundMoney')">
+                    <span>{{ transferFormData.refund_money }}</span>
+                </el-form-item>
+                <el-form-item :label="t('voucher')" v-if="transferFormData.refund_type == 'offline'">
+                    <upload-image v-model="transferFormData.voucher" />
+                </el-form-item>
+            </el-form>
+
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="transferDialog = false">{{ t('cancel') }}</el-button>
+                    <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+                </span>
+            </template>
+        </el-dialog>
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { ref, reactive, computed } from 'vue'
 import { t } from '@/lang'
-import {
-  getPayRefundInfo,
-  getRefundType,
-  getRefundTransfer,
-} from '@/app/api/pay'
+import { getPayRefundInfo, getRefundType, getRefundTransfer } from '@/app/api/pay'
 import { useRoute, useRouter } from 'vue-router'
 import { FormInstance } from 'element-plus'
 import { ArrowLeft } from '@element-plus/icons-vue'
@@ -133,7 +67,7 @@ const route = useRoute()
 const router = useRouter()
 const pageName = route.meta.title
 const back = () => {
-  router.push('/finance/refund')
+    router.push('/finance/refund')
 }
 
 const refundNo: any = route.query.refund_no
@@ -143,36 +77,36 @@ const refundList = ref([])
 const formData: Record<string, any> | null = ref(null)
 
 const setFormData = async (refundNo: string = '') => {
-  loading.value = true
-  formData.value = null
-  await getPayRefundInfo(refundNo).then(({ data }) => {
-    formData.value = data
-    refundList.value.push(data)
-  })
-  loading.value = false
+    loading.value = true
+    formData.value = null
+    await getPayRefundInfo(refundNo).then(({ data }) => {
+        formData.value = data
+        refundList.value.push(data)
+    })
+    loading.value = false
 }
 if (refundNo) setFormData(refundNo)
 else loading.value = false
 
 const refundTypeData = ref([])
 getRefundType().then((data) => {
-  Object.keys(data.data).forEach((key: string) => {
-    refundTypeData.value.push({ value: key, name: data.data[key] })
-  })
+    Object.keys(data.data).forEach((key: string) => {
+        refundTypeData.value.push({ value: key, name: data.data[key] })
+    })
 })
 
 const transferDialog = ref(false)
-const transferEvent = (data: any) => {
-  transferDialog.value = true
-  transferFormData.refund_no = data.refund_no
-  transferFormData.refund_money = data.money
+const transferEvent = (data:any) => {
+    transferDialog.value = true
+    transferFormData.refund_no = data.refund_no
+    transferFormData.refund_money = data.money
 }
 
 const initialFormData = {
-  refund_no: '',
-  refund_type: 'back',
-  voucher: '',
-  refund_money: 0.0,
+    refund_no: '',
+    refund_type: 'back',
+    voucher: '',
+    refund_money: 0.00
 }
 const transferFormData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -180,33 +114,31 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    label_name: [
-      { required: true, message: t('labelNamePlaceholder'), trigger: 'blur' },
-    ],
-  }
+    return {
+        label_name: [
+            { required: true, message: t('labelNamePlaceholder'), trigger: 'blur' }
+        ]
+    }
 })
 
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      const data = transferFormData
-      getRefundTransfer(data)
-        .then((res) => {
-          loading.value = false
-          transferDialog.value = false
-          refundList.value = []
-          setFormData(refundNo)
-        })
-        .catch(() => {
-          transferDialog.value = false
-          loading.value = false
-        })
-    }
-  })
+    if (loading.value || !formEl) return
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+            const data = transferFormData
+            getRefundTransfer(data).then(res => {
+                loading.value = false
+                transferDialog.value = false
+                refundList.value = []
+                setFormData(refundNo)
+            }).catch(() => {
+                transferDialog.value = false
+                loading.value = false
+            })
+        }
+    })
 }
 </script>
 
diff --git a/admin/src/app/views/future_ontent/components/Jump-lesson-library-edit.vue b/admin/src/app/views/future_ontent/components/Jump-lesson-library-edit.vue
new file mode 100644
index 00000000..4d2a4439
--- /dev/null
+++ b/admin/src/app/views/future_ontent/components/Jump-lesson-library-edit.vue
@@ -0,0 +1,229 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('updateJumpLessonLibrary') : t('addJumpLessonLibrary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addJumpLessonLibrary, editJumpLessonLibrary, getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+import { addPublicLibraryList, editPublicLibraryList } from '@/app/api/future_ontent'
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: '',
+  table_type: 14
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+// ,
+//     user_permission: [
+//         { required: true, message: t('userPermissionPlaceholder'), trigger: 'blur' },
+//
+//     ]
+
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editPublicLibraryList : addPublicLibraryList
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+          data.table_type = 14
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/future_ontent/components/basketball-course-teaching-edit.vue b/admin/src/app/views/future_ontent/components/basketball-course-teaching-edit.vue
new file mode 100644
index 00000000..4fbdd47f
--- /dev/null
+++ b/admin/src/app/views/future_ontent/components/basketball-course-teaching-edit.vue
@@ -0,0 +1,223 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('editBasketballTeachingLibrary') : t('addBasketballTeachingLibrary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addBasketballTeachingLibrary, editBasketballTeachingLibrary, getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: ''
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editBasketballTeachingLibrary : addBasketballTeachingLibrary
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/future_ontent/components/en-course-teaching-edit.vue b/admin/src/app/views/future_ontent/components/en-course-teaching-edit.vue
new file mode 100644
index 00000000..3458b8d4
--- /dev/null
+++ b/admin/src/app/views/future_ontent/components/en-course-teaching-edit.vue
@@ -0,0 +1,223 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('editEnTeachingLibrary') : t('addEnTeachingLibrary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addEnTeachingLibrary, editEnTeachingLibrary, getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+import { addPublicLibraryList, editPublicLibraryList } from '@/app/api/future_ontent'
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: '',
+  table_type: 15
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editPublicLibraryList : addPublicLibraryList
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+          data.table_type = 15
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/future_ontent/components/lesson-course-teaching-edit.vue b/admin/src/app/views/future_ontent/components/lesson-course-teaching-edit.vue
new file mode 100644
index 00000000..d059e8cf
--- /dev/null
+++ b/admin/src/app/views/future_ontent/components/lesson-course-teaching-edit.vue
@@ -0,0 +1,224 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('updateLessonCourseTeaching') : t('addLessonCourseTeaching')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+
+import { addPublicLibraryList, editPublicLibraryList } from '@/app/api/future_ontent'
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: ''
+    // user_permission: [],
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editPublicLibraryList : addPublicLibraryList
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+            data.table_type = 13
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/future_ontent/components/ninja-teaching-edit.vue b/admin/src/app/views/future_ontent/components/ninja-teaching-edit.vue
new file mode 100644
index 00000000..b9dbc94d
--- /dev/null
+++ b/admin/src/app/views/future_ontent/components/ninja-teaching-edit.vue
@@ -0,0 +1,223 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('editNinjaTeachingLibrary') : t('addNinjaTeachingLibrary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addNinjaTeachingLibrary, editNinjaTeachingLibrary, getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: ''
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editNinjaTeachingLibrary : addNinjaTeachingLibrary
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/future_ontent/components/physical-teaching-edit.vue b/admin/src/app/views/future_ontent/components/physical-teaching-edit.vue
new file mode 100644
index 00000000..2c53ea49
--- /dev/null
+++ b/admin/src/app/views/future_ontent/components/physical-teaching-edit.vue
@@ -0,0 +1,223 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('editPhysicalTeachingLibrary') : t('addPhysicalTeachingLibrary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addPhysicalTeachingLibrary, editPhysicalTeachingLibrary, getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: ''
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editPhysicalTeachingLibrary : addPhysicalTeachingLibrary
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/future_ontent/components/security-teaching-edit.vue b/admin/src/app/views/future_ontent/components/security-teaching-edit.vue
new file mode 100644
index 00000000..c7a768b5
--- /dev/null
+++ b/admin/src/app/views/future_ontent/components/security-teaching-edit.vue
@@ -0,0 +1,223 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('editSecurityTeachingLibrary') : t('addSecurityTeachingLibrary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addSecurityTeachingLibrary, editSecurityTeachingLibrary, getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: ''
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editSecurityTeachingLibrary : addSecurityTeachingLibrary
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/future_ontent/components/strengthen-course-teaching-edit.vue b/admin/src/app/views/future_ontent/components/strengthen-course-teaching-edit.vue
new file mode 100644
index 00000000..e67bb334
--- /dev/null
+++ b/admin/src/app/views/future_ontent/components/strengthen-course-teaching-edit.vue
@@ -0,0 +1,222 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('editStrengthenTeachingLibrary') : t('addStrengthenTeachingLibrary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addStrengTeachingLibrary, editStrengTeachingLibrary, getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: ''
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editStrengTeachingLibrary : addStrengTeachingLibrary
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/future_ontent/future_ontent.vue b/admin/src/app/views/future_ontent/future_ontent.vue
new file mode 100644
index 00000000..91cd7c34
--- /dev/null
+++ b/admin/src/app/views/future_ontent/future_ontent.vue
@@ -0,0 +1,567 @@
+<template>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+          <el-tabs v-model="active">
+            <el-tab-pane label="训练内容" name="CourseSyllabus">
+              <div class="flex justify-between items-center">
+                <el-button type="primary" @click="addEvent">
+                  {{ t('addLessonCourseTeaching') }}
+                </el-button>
+              </div>
+              <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="lessonCourseTeachingTable.searchParam" ref="searchFormRef">
+                  <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="lessonCourseTeachingTable.searchParam.title" :placeholder="t('titlePlaceholder')" />
+                  </el-form-item>
+
+                  <el-form-item :label="t('status')" prop="status">
+                    <el-select class="w-[280px]" v-model="lessonCourseTeachingTable.searchParam.status" clearable :placeholder="t('statusPlaceholder')">
+                      <el-option label="全部" value=""></el-option>
+                      <el-option
+                          v-for="(item, index) in statusList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.value"
+                      />
+                    </el-select>
+                  </el-form-item>
+
+                  <el-form-item :label="t('createTime')" prop="create_time">
+                    <el-date-picker v-model="lessonCourseTeachingTable.searchParam.create_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                    :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+                  </el-form-item>
+
+                  <el-form-item :label="t('updateTime')" prop="update_time">
+                    <el-date-picker v-model="lessonCourseTeachingTable.searchParam.update_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                    :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+                  </el-form-item>
+
+                  <el-form-item>
+                    <el-button type="primary" @click="loadLessonCourseTeachingList()">{{ t('search') }}</el-button>
+                    <el-button @click="resetForm(searchFormRef, 13)">{{ t('reset') }}</el-button>
+                  </el-form-item>
+                </el-form>
+              </el-card>
+
+              <div class="mt-[10px]">
+                <el-table :data="lessonCourseTeachingTable.data" size="large" v-loading="lessonCourseTeachingTable.loading">
+                  <template #empty>
+                    <span>{{ !lessonCourseTeachingTable.loading ? t('emptyData') : '' }}</span>
+                  </template>
+                  <el-table-column prop="title" :label="t('title')" min-width="120" :show-overflow-tooltip="true"/>
+
+                  <el-table-column :label="t('image')" width="100" align="left">
+                    <template #default="{ row }">
+                      <el-avatar v-if="row.image" :src="img(row.image)" />
+                      <el-avatar v-else icon="UserFilled" />
+                    </template>
+                  </el-table-column>
+                  <el-table-column :label="t('type')" min-width="180" align="center" :show-overflow-tooltip="true">
+                    <template #default="{ row }">
+                      <div v-for="(item, index) in typeList">
+                        <div v-if="item.value == row.type">{{ item.name }}</div>
+                      </div>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column :label="t('status')" min-width="180" align="center" :show-overflow-tooltip="true">
+                    <template #default="{ row }">
+                      <div v-for="(item, index) in statusList">
+                        <div v-if="item.value == row.status">{{ item.name }}</div>
+                      </div>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column :label="t('operation')" fixed="right" min-width="120">
+                    <template #default="{ row }">
+                      <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+                      <el-button type="primary" link @click="deleteEvent(row.id, 13)">{{ t('delete') }}</el-button>
+                    </template>
+                  </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                  <el-pagination v-model:current-page="lessonCourseTeachingTable.page" v-model:page-size="lessonCourseTeachingTable.limit"
+                                 layout="total, sizes, prev, pager, next, jumper" :total="lessonCourseTeachingTable.total"
+                                 @size-change="loadLessonCourseTeachingList()" @current-change="loadLessonCourseTeachingList" />
+                </div>
+              </div>
+
+              <edit ref="editLessonCourseTeachingDialog" @complete="loadLessonCourseTeachingList" />
+            </el-tab-pane>
+            <el-tab-pane label="训练视频" name="JumpLessonLibrary">
+              <div class="flex justify-between items-center">
+                <el-button type="primary" @click="addJumpLessonLibrary">
+                  {{ t('addJumpLessonLibrary') }}
+                </el-button>
+              </div>
+              <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="JumpLessonLibraryTable.searchParam" ref="searchFormRef">
+                  <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="JumpLessonLibraryTable.searchParam.title" :placeholder="t('titlePlaceholder')" />
+                  </el-form-item>
+
+                  <el-form-item :label="t('status')" prop="status">
+                    <el-select class="w-[280px]" v-model="JumpLessonLibraryTable.searchParam.status" clearable :placeholder="t('statusPlaceholder')">
+                      <el-option label="全部" value=""></el-option>
+                      <el-option
+                          v-for="(item, index) in statusList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.value"
+                      />
+                    </el-select>
+                  </el-form-item>
+
+                  <el-form-item :label="t('createTime')" prop="create_time">
+                    <el-date-picker v-model="JumpLessonLibraryTable.searchParam.create_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                    :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+                  </el-form-item>
+
+                  <el-form-item :label="t('updateTime')" prop="update_time">
+                    <el-date-picker v-model="JumpLessonLibraryTable.searchParam.update_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                    :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+                  </el-form-item>
+
+                  <el-form-item>
+                    <el-button type="primary" @click="loadJumpLessonLibraryList()">{{ t('search') }}</el-button>
+                    <el-button @click="resetForm(searchFormRef, 14)">{{ t('reset') }}</el-button>
+                  </el-form-item>
+                </el-form>
+              </el-card>
+
+              <div class="mt-[10px]">
+                <el-table :data="JumpLessonLibraryTable.data" size="large" v-loading="JumpLessonLibraryTable.loading">
+                  <template #empty>
+                    <span>{{ !JumpLessonLibraryTable.loading ? t('emptyData') : '' }}</span>
+                  </template>
+                  <el-table-column prop="title" :label="t('title')" min-width="120" :show-overflow-tooltip="true"/>
+
+                  <el-table-column :label="t('image')" width="100" align="left">
+                    <template #default="{ row }">
+                      <el-avatar v-if="row.image" :src="img(row.image)" />
+                      <el-avatar v-else icon="UserFilled" />
+                    </template>
+                  </el-table-column>
+                  <el-table-column :label="t('type')" min-width="180" align="center" :show-overflow-tooltip="true">
+                    <template #default="{ row }">
+                      <div v-for="(item, index) in typeList">
+                        <div v-if="item.value == row.type">{{ item.name }}</div>
+                      </div>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column :label="t('status')" min-width="180" align="center" :show-overflow-tooltip="true">
+                    <template #default="{ row }">
+                      <div v-for="(item, index) in statusList">
+                        <div v-if="item.value == row.status">{{ item.name }}</div>
+                      </div>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column :label="t('operation')" fixed="right" min-width="120">
+                    <template #default="{ row }">
+                      <el-button type="primary" link @click="editJumpLessonLibrary(row)">{{ t('edit') }}</el-button>
+                      <el-button type="primary" link @click="deleteEvent(row.id, 14)">{{ t('delete') }}</el-button>
+                    </template>
+                  </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                  <el-pagination v-model:current-page="JumpLessonLibraryTable.page" v-model:page-size="JumpLessonLibraryTable.limit"
+                                 layout="total, sizes, prev, pager, next, jumper" :total="JumpLessonLibraryTable.total"
+                                 @size-change="loadJumpLessonLibraryList()" @current-change="loadJumpLessonLibraryList" />
+                </div>
+              </div>
+
+              <edit-jump ref="editJumpLessonLibraryDialog" @complete="loadJumpLessonLibraryList" />
+            </el-tab-pane>
+            <el-tab-pane label="课后作业" name="EnTeachingLibrary">
+              <div class="flex justify-between items-center">
+                <el-button type="primary" @click="addEnTeachingLibrary">
+                  {{ t('addEnTeachingLibrary') }}
+                </el-button>
+              </div>
+              <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="EnTeachingLibraryTable.searchParam" ref="searchFormRef">
+                  <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="EnTeachingLibraryTable.searchParam.title" :placeholder="t('titlePlaceholder')" />
+                  </el-form-item>
+
+                  <el-form-item :label="t('status')" prop="status">
+                    <el-select class="w-[280px]" v-model="EnTeachingLibraryTable.searchParam.status" clearable :placeholder="t('statusPlaceholder')">
+                      <el-option label="全部" value=""></el-option>
+                      <el-option
+                          v-for="(item, index) in statusList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.value"
+                      />
+                    </el-select>
+                  </el-form-item>
+
+                  <el-form-item :label="t('createTime')" prop="create_time">
+                    <el-date-picker v-model="EnTeachingLibraryTable.searchParam.create_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                    :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+                  </el-form-item>
+
+                  <el-form-item :label="t('updateTime')" prop="update_time">
+                    <el-date-picker v-model="EnTeachingLibraryTable.searchParam.update_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                    :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+                  </el-form-item>
+
+                  <el-form-item>
+                    <el-button type="primary" @click="loadEnTeachingLibraryList()">{{ t('search') }}</el-button>
+                    <el-button @click="resetForm(searchFormRef, 15)">{{ t('reset') }}</el-button>
+                  </el-form-item>
+                </el-form>
+              </el-card>
+
+              <div class="mt-[10px]">
+                <el-table :data="EnTeachingLibraryTable.data" size="large" v-loading="EnTeachingLibraryTable.loading">
+                  <template #empty>
+                    <span>{{ !EnTeachingLibraryTable.loading ? t('emptyData') : '' }}</span>
+                  </template>
+                  <el-table-column prop="title" :label="t('title')" min-width="120" :show-overflow-tooltip="true"/>
+
+                  <el-table-column :label="t('image')" width="100" align="left">
+                    <template #default="{ row }">
+                      <el-avatar v-if="row.image" :src="img(row.image)" />
+                      <el-avatar v-else icon="UserFilled" />
+                    </template>
+                  </el-table-column>
+                  <el-table-column :label="t('type')" min-width="180" align="center" :show-overflow-tooltip="true">
+                    <template #default="{ row }">
+                      <div v-for="(item, index) in typeList">
+                        <div v-if="item.value == row.type">{{ item.name }}</div>
+                      </div>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column :label="t('status')" min-width="180" align="center" :show-overflow-tooltip="true">
+                    <template #default="{ row }">
+                      <div v-for="(item, index) in statusList">
+                        <div v-if="item.value == row.status">{{ item.name }}</div>
+                      </div>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column :label="t('operation')" fixed="right" min-width="120">
+                    <template #default="{ row }">
+                      <el-button type="primary" link @click="editEnTeachingLibrary(row)">{{ t('edit') }}</el-button>
+                      <el-button type="primary" link @click="deleteEvent(row.id, 15)">{{ t('delete') }}</el-button>
+                    </template>
+                  </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                  <el-pagination v-model:current-page="EnTeachingLibraryTable.page" v-model:page-size="EnTeachingLibraryTable.limit"
+                                 layout="total, sizes, prev, pager, next, jumper" :total="EnTeachingLibraryTable.total"
+                                 @size-change="loadEnTeachingLibraryList()" @current-change="loadEnTeachingLibraryList" />
+                </div>
+              </div>
+
+              <edit-en ref="editEnTeachingLibraryDialog" @complete="loadEnTeachingLibraryList" />
+            </el-tab-pane>
+          </el-tabs>
+        </el-card>
+    </div>
+</template>
+
+ addPublicLibraryList editPublicLibraryList
+
+
+<script lang="ts" setup>
+import { reactive, ref, watch } from 'vue'
+import { t } from '@/lang'
+import { useDictionary } from '@/app/api/dict'
+import { getLessonCourseTeachingList, deleteLessonCourseTeaching, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+import { getPublicLibraryList } from '@/app/api/future_ontent'
+import { img } from '@/utils/common'
+import { ElMessageBox,FormInstance } from 'element-plus'
+import Edit from '@/app/views/future_ontent/components/lesson-course-teaching-edit.vue'
+import EditJump from '@/app/views/future_ontent/components/Jump-lesson-library-edit.vue'
+import EditEn from '@/app/views/future_ontent/components/en-course-teaching-edit.vue'
+import { useRoute } from 'vue-router'
+const route = useRoute()
+const pageName = route.meta.title;
+const active = 'CourseSyllabus'
+
+let lessonCourseTeachingTable = reactive({
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam:{
+      "title":"",
+      "status":"",
+      "create_time":[],
+      "update_time":[],
+      "table_type":13
+    }
+})
+let JumpLessonLibraryTable = reactive({
+  page: 1,
+  limit: 10,
+  total: 0,
+  loading: true,
+  data: [],
+  searchParam:{
+    "title":"",
+    "status":"",
+    "create_time":[],
+    "update_time":[],
+    "table_type":14
+  }
+})
+let EnTeachingLibraryTable = reactive({
+  page: 1,
+  limit: 10,
+  total: 0,
+  loading: true,
+  data: [],
+  searchParam:{
+    "title":"",
+    "status":"",
+    "create_time":[],
+    "update_time":[],
+    "table_type":15
+  }
+})
+
+const searchFormRef = ref<FormInstance>()
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 字典数据
+const typeList = ref([] as any[])
+const typeDictList = async () => {
+typeList.value = await (await useDictionary('material_type')).data.dictionary
+}
+typeDictList();
+const statusList = ref([] as any[])
+const statusDictList = async () => {
+statusList.value = await (await useDictionary('course_status')).data.dictionary
+}
+statusDictList();
+
+const editLessonCourseTeachingDialog: Record<string, any> | null = ref(null)
+const editJumpLessonLibraryDialog: Record<string, any> | null = ref(null)
+const editEnTeachingLibraryDialog: Record<string, any> | null = ref(null)
+
+/**
+ * 获取课程教学大纲列表
+ */
+const loadLessonCourseTeachingList = (page: number = 1) => {
+    lessonCourseTeachingTable.loading = true
+    lessonCourseTeachingTable.page = page
+
+  getPublicLibraryList({
+        page: lessonCourseTeachingTable.page,
+        limit: lessonCourseTeachingTable.limit,
+         ...lessonCourseTeachingTable.searchParam
+    }).then(res => {
+        lessonCourseTeachingTable.loading = false
+        lessonCourseTeachingTable.data = res.data.data
+        lessonCourseTeachingTable.total = res.data.total
+    }).catch(() => {
+        lessonCourseTeachingTable.loading = false
+    })
+}
+loadLessonCourseTeachingList()
+
+/**
+ * 添加课程教学大纲
+ */
+const addEvent = () => {
+    editLessonCourseTeachingDialog.value.setFormData()
+    editLessonCourseTeachingDialog.value.showDialog = true
+}
+
+/**
+ * 编辑课程教学大纲
+ * @param data
+ */
+const editEvent = (data: any) => {
+    editLessonCourseTeachingDialog.value.setFormData(data)
+    editLessonCourseTeachingDialog.value.showDialog = true
+}
+
+
+/**
+ * 获取跳绳教案库列表
+ */
+const loadJumpLessonLibraryList = (page: number = 1) => {
+  JumpLessonLibraryTable.loading = true
+  JumpLessonLibraryTable.page = page
+
+  getPublicLibraryList({
+    page: JumpLessonLibraryTable.page,
+    limit: JumpLessonLibraryTable.limit,
+    ...JumpLessonLibraryTable.searchParam
+  }).then(res => {
+    JumpLessonLibraryTable.loading = false
+    JumpLessonLibraryTable.data = res.data.data
+    JumpLessonLibraryTable.total = res.data.total
+  }).catch(() => {
+    JumpLessonLibraryTable.loading = false
+  })
+}
+loadJumpLessonLibraryList()
+
+/**
+ * 添加跳绳教案库
+ */
+const addJumpLessonLibrary = () => {
+  editJumpLessonLibraryDialog.value.setFormData()
+  editJumpLessonLibraryDialog.value.showDialog = true
+}
+
+/**
+ * 编辑跳绳教案库
+ * @param data
+ */
+const editJumpLessonLibrary = (data: any) => {
+  editJumpLessonLibraryDialog.value.setFormData(data)
+  editJumpLessonLibraryDialog.value.showDialog = true
+}
+
+
+/**
+ * 获取增高教案库列表
+ */
+const loadEnTeachingLibraryList = (page: number = 1) => {
+  EnTeachingLibraryTable.loading = true
+  EnTeachingLibraryTable.page = page
+
+  getPublicLibraryList({
+    page: EnTeachingLibraryTable.page,
+    limit: EnTeachingLibraryTable.limit,
+    ...EnTeachingLibraryTable.searchParam
+  }).then(res => {
+    EnTeachingLibraryTable.loading = false
+    EnTeachingLibraryTable.data = res.data.data
+    EnTeachingLibraryTable.total = res.data.total
+  }).catch(() => {
+    EnTeachingLibraryTable.loading = false
+  })
+}
+loadEnTeachingLibraryList()
+
+/**
+ * 添加增高教案库
+ */
+const addEnTeachingLibrary = () => {
+  editEnTeachingLibraryDialog.value.setFormData()
+  editEnTeachingLibraryDialog.value.showDialog = true
+}
+
+/**
+ * 编辑增高教案库
+ * @param data
+ */
+const editEnTeachingLibrary = (data: any) => {
+  editEnTeachingLibraryDialog.value.setFormData(data)
+  editEnTeachingLibraryDialog.value.showDialog = true
+}
+
+
+/**
+ * 删除教研管理
+ */
+const deleteEvent = (id: number, type: number) => {
+    ElMessageBox.confirm(t('lessonCourseTeachingDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning',
+        }
+    ).then(() => {
+        deleteLessonCourseTeaching(id).then(() => {
+          if (type === 13) {
+            loadLessonCourseTeachingList()
+          } else if (type === 14) {
+            loadJumpLessonLibraryList()
+          } else if (type === 15) {
+            loadEnTeachingLibraryList()
+          }
+        }).catch(() => {
+        })
+    })
+}
+
+
+    const userPermissionList = ref([])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+
+const resetForm = (formEl: FormInstance | undefined, type: number) => {
+    if (!formEl) return
+    formEl.resetFields()
+    if (type === 13) {
+      lessonCourseTeachingTable = reactive({
+        page: 1,
+        limit: 10,
+        total: 0,
+        loading: true,
+        data: [],
+        searchParam: {
+          "title": "",
+          "status": "",
+          "create_time": [],
+          "update_time": [],
+          "table_type":13
+        }
+      })
+      loadLessonCourseTeachingList()
+    } else if (type === 14) {
+      JumpLessonLibraryTable = reactive({
+        page: 1,
+        limit: 10,
+        total: 0,
+        loading: true,
+        data: [],
+        searchParam: {
+          "title": "",
+          "status": "",
+          "create_time": [],
+          "update_time": [],
+          "table_type":14
+        }
+      })
+      loadJumpLessonLibraryList()
+    } else if (type === 15) {
+      EnTeachingLibraryTable = reactive({
+        page: 1,
+        limit: 10,
+        total: 0,
+        loading: true,
+        data: [],
+        searchParam: {
+          "title": "",
+          "status": "",
+          "create_time": [],
+          "update_time": [],
+          "table_type":15
+        }
+      })
+      loadEnTeachingLibraryList()
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+/* 多行超出隐藏 */
+.multi-hidden {
+		word-break: break-all;
+		text-overflow: ellipsis;
+		overflow: hidden;
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		-webkit-box-orient: vertical;
+	}
+</style>
diff --git a/admin/src/app/views/index/app_manage.vue b/admin/src/app/views/index/app_manage.vue
index 22a76ab5..74c5f58e 100644
--- a/admin/src/app/views/index/app_manage.vue
+++ b/admin/src/app/views/index/app_manage.vue
@@ -1,93 +1,56 @@
 <template>
-  <div class="box-border pt-[68px] px-[76px] overview-top" v-loading="loading">
-    <div v-if="detail.appList && !loading">
-      <div class="flex justify-between items-center">
-        <div>
-          <div class="font-[600] text-[26px] text-[#222] leading-[37px]">
-            {{ t('app') }}
-          </div>
-          <div
-            class="font-[500] text-[14px] text-[#222] leading-[20px] mt-[12px]"
-          >
-            {{ t('versionInfo') }}&nbsp;{{ t('currentVersion') }}
-          </div>
-        </div>
-        <el-button @click="toAppStore" class="px-[15px]">
-          <div class="mr-[9px] text-[#3F3F3F] iconfont iconxiazai01"></div>
-          <span class="font-[600] text-[14px] text-[#222] leading-[20px]">{{
-            t('appStore')
-          }}</span>
-        </el-button>
-      </div>
-      <div class="flex flex-wrap mt-[40px]">
-        <template v-for="(item, index) in detail.appList" :key="index">
-          <div
-            class="app-item w-[280px] box-border !bg-[#fff] rounded-[6px] cursor-pointer mr-[20px] mb-[20px] overflow-hidden"
-            @click="itemPath(item)"
-          >
-            <div
-              class="bg-[#F7FAFB] py-[18px] px-[24px] flex items-center app-item-head"
-            >
-              <el-image
-                class="w-[44px] h-[44px] rounded-[8px]"
-                :src="img(item.icon)"
-                fit="contain"
-              >
-                <template #error>
-                  <div class="image-slot">
-                    <img
-                      class="w-[40px] h-[40px] rounded-[8px]"
-                      src="@/app/assets/images/app_store/app_store_default.png"
-                    />
-                  </div>
-                </template>
-              </el-image>
-            </div>
-            <div class="py-[18px] px-[24px]">
-              <div class="font-[600] leading-[1] text-[14px] text-[#222]">
-                {{ item.title }}
-              </div>
-              <el-tooltip
-                class="box-item"
-                effect="light"
-                :content="item.desc"
-                placement="bottom-start"
-              >
-                <div
-                  class="text-[13px] text-[#6D7278] leading-[18px] mt-[6px] truncate"
-                >
-                  {{ item.desc }}
+    <div class="box-border pt-[68px] px-[76px] overview-top" v-loading="loading">
+        <div v-if="detail.appList && !loading">
+            <div class="flex justify-between items-center">
+                <div>
+                    <div class="font-[600] text-[26px] text-[#222] leading-[37px]">{{ t('app') }}</div>
+                    <div class="font-[500] text-[14px] text-[#222] leading-[20px] mt-[12px]">{{ t('versionInfo') }}&nbsp;{{ t('currentVersion') }}</div>
                 </div>
-              </el-tooltip>
+                <el-button @click="toAppStore" class="px-[15px]">
+                    <div class="mr-[9px] text-[#3F3F3F] iconfont iconxiazai01"></div>
+                    <span class="font-[600] text-[14px] text-[#222] leading-[20px]">{{ t('appStore') }}</span>
+                </el-button>
             </div>
-          </div>
-        </template>
-        <el-empty
-          class="mx-auto overview-empty"
-          v-if="!detail.appList.length && !loading"
-        >
-          <template #image>
-            <div class="w-[230px] mx-auto">
-              <img
-                src="@/app/assets/images/index/apply_empty.png"
-                class="max-w-full"
-                alt=""
-              />
+            <div class="flex flex-wrap mt-[40px]">
+                <template v-for="(item, index) in detail.appList" :key="index">
+                    <div class="app-item w-[280px] box-border !bg-[#fff] rounded-[6px] cursor-pointer mr-[20px] mb-[20px] overflow-hidden" @click="itemPath(item)">
+                        <div class="bg-[#F7FAFB] py-[18px] px-[24px] flex items-center app-item-head">
+                            <el-image class="w-[44px] h-[44px]  rounded-[8px]" :src="img(item.icon)" fit="contain">
+                                <template #error>
+                                    <div class="image-slot">
+                                        <img class="w-[40px] h-[40px] rounded-[8px]" src="@/app/assets/images/app_store/app_store_default.png" />
+                                    </div>
+                                </template>
+                            </el-image>
+                        </div>
+                        <div class="py-[18px] px-[24px]">
+                            <div class="font-[600] leading-[1] text-[14px] text-[#222]">{{ item.title }}</div>
+                            <el-tooltip class="box-item" effect="light" :content="item.desc" placement="bottom-start">
+                                <div class="text-[13px] text-[#6D7278] leading-[18px] mt-[6px] truncate">
+                                    {{ item.desc }}
+                                </div>
+                            </el-tooltip>
+                        </div>
+                    </div>
+                </template>
+                <el-empty class="mx-auto overview-empty" v-if="!detail.appList.length && !loading">
+                    <template #image>
+                        <div class="w-[230px] mx-auto">
+                            <img src="@/app/assets/images/index/apply_empty.png" class="max-w-full" alt="">
+                        </div>
+                    </template>
+                    <template #description>
+                        <p class="flex items-center">
+                            <span>{{ t('descriptionLeft') }}</span>
+                            <el-link type="primary" @click="toAppStore" class="mx-[5px]">{{ t('link') }}</el-link>
+                            <span>{{ t('descriptionRight') }}</span>
+                        </p>
+                    </template>
+                </el-empty>
+
             </div>
-          </template>
-          <template #description>
-            <p class="flex items-center">
-              <span>{{ t('descriptionLeft') }}</span>
-              <el-link type="primary" @click="toAppStore" class="mx-[5px]">{{
-                t('link')
-              }}</el-link>
-              <span>{{ t('descriptionRight') }}</span>
-            </p>
-          </template>
-        </el-empty>
-      </div>
+        </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
@@ -102,87 +65,82 @@ import useUserStore from '@/stores/modules/user'
 import { AnyObject } from '@/types/global'
 
 const router = useRouter()
-const userStore: AnyObject = useUserStore()
+const userStore:AnyObject = useUserStore()
 const loading = ref(true)
-const detail: {
-  appList: {
-    title: string
-    desc: string
-    icon: string
-  }[]
+const detail:{
+    appList: {
+        title: string,
+        desc: string,
+        icon: string
+    }[]
 } = reactive({
-  appList: [],
+    appList: []
 })
 const appLink: any = ref({})
 
 const getAuthaddonFn = () => {
-  loading.value = true
-  getInstalledAddonList()
-    .then((res) => {
-      Object.values(res.data).forEach((item: any, index) => {
-        if (item.type == 'app') {
-          detail.appList.push(item)
-        }
-      })
-      userStore.routers.forEach((item: any, index: number) => {
-        if (item.children && item.children.length) {
-          item.name = findFirstValidRoute(item.children)
-          appLink.value[item.meta.app] = findFirstValidRoute(item.children)
-        } else {
-          appLink.value[item.meta.app] = item.name
-        }
-      })
-      loading.value = false
-    })
-    .catch(() => {
-      loading.value = false
+    loading.value = true
+    getInstalledAddonList().then(res => {
+        Object.values(res.data).forEach((item: any, index) => {
+            if (item.type == 'app') {
+                detail.appList.push(item)
+            }
+        })
+        userStore.routers.forEach((item:any, index:number) => {
+            if (item.children && item.children.length) {
+                item.name = findFirstValidRoute(item.children)
+                appLink.value[item.meta.app] = findFirstValidRoute(item.children)
+            } else {
+                appLink.value[item.meta.app] = item.name
+            }
+        })
+        loading.value = false
+    }).catch(() => {
+        loading.value = false
     })
 }
 
 getAuthaddonFn()
 
 const itemPath = (data: any) => {
-  storage.set({ key: 'menuAppStorage', data: data.key })
-  storage.set({ key: 'plugMenuTypeStorage', data: '' })
-  const appMenuList = userStore.appMenuList
-  appMenuList.push(data.key)
-  userStore.setAppMenuList(appMenuList)
-  const name: any = appLink.value[data.key]
-  router.push({ name })
+    storage.set({ key: 'menuAppStorage', data: data.key })
+    storage.set({ key: 'plugMenuTypeStorage', data: '' })
+    const appMenuList = userStore.appMenuList
+    appMenuList.push(data.key)
+    userStore.setAppMenuList(appMenuList)
+    const name: any = appLink.value[data.key]
+    router.push({ name })
 }
 
 // 跳转至开发者
 const toAppStore = () => {
-  router.push('/app_manage/app_store')
+    router.push('/app_manage/app_store')
 }
 </script>
 
 <style lang="scss" scoped>
 .main-container {
-  background: linear-gradient(
-    180deg,
-    rgba(253, 253, 253, 0.24) 0%,
-    #fafafa 100%
-  );
-  min-height: calc(100vh - 64px);
+    background: linear-gradient(180deg, rgba(253, 253, 253, 0.24) 0%, #FAFAFA 100%);
+    min-height: calc(100vh - 64px);
 }
 
 .overview-top {
-  background-image: url('@/app/assets/images/index/overview.png');
-  background-repeat: no-repeat;
-  background-size: cover;
-  height: calc(100vh - 120px);
+    background-image: url('@/app/assets/images/index/overview.png');
+    background-repeat: no-repeat;
+    background-size: cover;
+    height: calc(100vh - 120px);
 }
 
 .app-item {
-  box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.18);
+    box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.18);
 }
-.app-item:hover .app-item-head {
-  background-color: #fdf4ef;
+.app-item:hover .app-item-head{
+    background-color: #FDF4EF;
 }
+
 </style>
 <style>
 .overview-empty .el-empty__image {
-  width: auto !important;
+    width: auto !important;
 }
 </style>
diff --git a/admin/src/app/views/index/edit_personal.vue b/admin/src/app/views/index/edit_personal.vue
index baa37b0d..45a616fc 100644
--- a/admin/src/app/views/index/edit_personal.vue
+++ b/admin/src/app/views/index/edit_personal.vue
@@ -1,42 +1,27 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never" v-loading="loading">
-      <div class="flex justify-between items-center h-[32px] mb-4">
-        <span class="text-page-title">{{ t('personal') }}</span>
-      </div>
-      <el-form
-        :model="saveInfo"
-        label-width="90px"
-        ref="formRef"
-        class="page-form"
-      >
-        <el-form-item :label="t('headImg')">
-          <upload-image v-model="saveInfo.head_img" :limit="1" />
-        </el-form-item>
-        <el-form-item :label="t('userName')">
-          <span>{{ saveInfo.username }}</span>
-        </el-form-item>
-        <el-form-item :label="t('realName')">
-          <el-input
-            v-model="saveInfo.real_name"
-            :placeholder="t('realNamePlaceholder')"
-            clearable
-            class="input-width"
-          />
-        </el-form-item>
-      </el-form>
-    </el-card>
-    <div class="fixed-footer-wrap">
-      <div class="fixed-footer">
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="submitForm(formRef)"
-          >{{ t('save') }}</el-button
-        >
-      </div>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never" v-loading="loading">
+            <div class="flex justify-between items-center h-[32px] mb-4">
+                <span class="text-page-title">{{ t('personal') }}</span>
+            </div>
+            <el-form :model="saveInfo" label-width="90px" ref="formRef" class="page-form">
+                <el-form-item :label="t('headImg')">
+                    <upload-image v-model="saveInfo.head_img" :limit="1" />
+                </el-form-item>
+				<el-form-item :label="t('userName')">
+                    <span>{{saveInfo.username}}</span>
+				</el-form-item>
+                <el-form-item :label="t('realName')">
+                    <el-input v-model="saveInfo.real_name" :placeholder="t('realNamePlaceholder')" clearable class="input-width" />
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <div class="fixed-footer-wrap">
+            <div class="fixed-footer">
+                <el-button type="primary" :loading="loading" @click="submitForm(formRef)">{{ t('save') }}</el-button>
+            </div>
+        </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
@@ -50,9 +35,9 @@ import { useRouter } from 'vue-router'
 const router = useRouter()
 // 提交信息
 const saveInfo = reactive({
-  head_img: '',
-  real_name: '',
-  username: '',
+    head_img: '',
+    real_name: '',
+    username: ''
 })
 
 const formRef = ref<FormInstance>()
@@ -62,57 +47,53 @@ const loading = ref(true)
  * 获取用户信息
  */
 const getUserInfoFn = () => {
-  loading.value = true
-  getUserInfo()
-    .then((res) => {
-      loading.value = false
-      const data = res.data
-      saveInfo.head_img = data.head_img
-      saveInfo.real_name = data.real_name
-      saveInfo.username = data.username
-    })
-    .catch(() => {
-      loading.value = false
+    loading.value = true
+    getUserInfo().then(res => {
+        loading.value = false
+        const data = res.data
+        saveInfo.head_img = data.head_img
+        saveInfo.real_name = data.real_name
+        saveInfo.username = data.username
+    }).catch(() => {
+        loading.value = false
     })
 }
 getUserInfoFn()
 
 const submitForm = (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  formEl.validate((valid) => {
-    if (valid) {
-      loading.value = true
+    if (loading.value || !formEl) return
+    formEl.validate((valid) => {
+        if (valid) {
+            loading.value = true
 
-      setUserInfo(saveInfo)
-        .then((res: any) => {
-          loading.value = false
-        })
-        .catch(() => {
-          loading.value = false
-        })
-    } else {
-      return false
-    }
-  })
+            setUserInfo(saveInfo).then((res: any) => {
+                loading.value = false
+            }).catch(() => {
+                loading.value = false
+            })
+        } else {
+            return false
+        }
+    })
 }
 </script>
 
 <style lang="scss" scoped>
-:deep(.personal-body) {
-  background-color: #fff;
-  .el-form-item__content {
-    .el-input {
-      width: 250px;
-    }
-    .el-form-item__content {
-      justify-content: space-between;
-    }
-    .el-button {
-      margin-left: auto;
-    }
-    .personal-option {
-      margin-right: auto;
+:deep(.personal-body){
+    background-color: #fff;
+    .el-form-item__content{
+        .el-input{
+            width: 250px;
+        }
+        .el-form-item__content{
+            justify-content: space-between;
+        }
+        .el-button{
+            margin-left: auto;
+        }
+        .personal-option{
+            margin-right: auto;
+        }
     }
-  }
 }
 </style>
diff --git a/admin/src/app/views/index/personal.vue b/admin/src/app/views/index/personal.vue
index b1766259..37489477 100644
--- a/admin/src/app/views/index/personal.vue
+++ b/admin/src/app/views/index/personal.vue
@@ -1,46 +1,32 @@
 <template>
-  <div class="main-container w-full pt-[64px] bg-white" v-loading="loading">
-    <div class="flex justify-between items-center h-[32px] mb-4">
-      <span class="text-page-title">{{ t('personal') }}</span>
-      <span
-        class="text-[14px] text-[#999] cursor-pointer"
-        @click="toEditPersonal"
-        >{{ t('editPersonal') }}</span
-      >
+    <div class="main-container w-full pt-[64px] bg-white" v-loading="loading">
+        <div class="flex justify-between items-center h-[32px] mb-4">
+            <span class="text-page-title">{{ t('personal') }}</span>
+            <span class="text-[14px] text-[#999] cursor-pointer" @click="toEditPersonal">{{ t('editPersonal') }}</span>
+        </div>
+        <el-card class="box-card !border-none" shadow="never">
+            <el-form :model="saveInfo" label-width="90px" ref="formRef" class="page-form">
+                <el-form-item :label="t('headImg')">
+                    <el-image class="w-[70px] h-[70px]" :src="img(saveInfo.head_img)" fit="contain">
+                        <template #error>
+                            <div
+                                class="image-slot bg-[#c0c4cc] flex items-center justify-center w-[70px] h-[70px] rounded-full">
+                                <el-icon class="!text-[#fff] !text-[45px]">
+                                    <UserFilled />
+                                </el-icon>
+                            </div>
+                        </template>
+                    </el-image>
+                </el-form-item>
+                <el-form-item :label="t('userName')">
+                    <div>{{ saveInfo.username }}</div>
+                </el-form-item>
+                <el-form-item :label="t('realName')">
+                    <div>{{ saveInfo.real_name }}</div>
+                </el-form-item>
+            </el-form>
+        </el-card>
     </div>
-    <el-card class="box-card !border-none" shadow="never">
-      <el-form
-        :model="saveInfo"
-        label-width="90px"
-        ref="formRef"
-        class="page-form"
-      >
-        <el-form-item :label="t('headImg')">
-          <el-image
-            class="w-[70px] h-[70px]"
-            :src="img(saveInfo.head_img)"
-            fit="contain"
-          >
-            <template #error>
-              <div
-                class="image-slot bg-[#c0c4cc] flex items-center justify-center w-[70px] h-[70px] rounded-full"
-              >
-                <el-icon class="!text-[#fff] !text-[45px]">
-                  <UserFilled />
-                </el-icon>
-              </div>
-            </template>
-          </el-image>
-        </el-form-item>
-        <el-form-item :label="t('userName')">
-          <div>{{ saveInfo.username }}</div>
-        </el-form-item>
-        <el-form-item :label="t('realName')">
-          <div>{{ saveInfo.real_name }}</div>
-        </el-form-item>
-      </el-form>
-    </el-card>
-  </div>
 </template>
 
 <script lang="ts" setup>
@@ -54,12 +40,12 @@ import { useRouter } from 'vue-router'
 const router = useRouter()
 // 提交信息
 const saveInfo = reactive({
-  head_img: '',
-  real_name: '',
-  original_password: '',
-  password: '',
-  password_copy: '',
-  username: '',
+    head_img: '',
+    real_name: '',
+    original_password: '',
+    password: '',
+    password_copy: '',
+    username: ''
 })
 
 const formRef = ref<FormInstance>()
@@ -69,51 +55,48 @@ const loading = ref(true)
  * 获取用户信息
  */
 const getUserInfoFn = () => {
-  loading.value = true
-  getUserInfo()
-    .then((res) => {
-      loading.value = false
+    loading.value = true
+    getUserInfo().then(res => {
+        loading.value = false
 
-      const data = res.data
-      saveInfo.head_img = data.head_img
-      saveInfo.real_name = data.real_name
-      saveInfo.original_password = data.original_password
-      saveInfo.password = data.password
-      saveInfo.password_copy = data.password
-      saveInfo.username = data.username
-    })
-    .catch(() => {
-      loading.value = false
+        const data = res.data
+        saveInfo.head_img = data.head_img
+        saveInfo.real_name = data.real_name
+        saveInfo.original_password = data.original_password
+        saveInfo.password = data.password
+        saveInfo.password_copy = data.password
+        saveInfo.username = data.username
+    }).catch(() => {
+        loading.value = false
     })
 }
 getUserInfoFn()
 
 // 编辑个人中心
 const toEditPersonal = () => {
-  router.push('/user/edit_center')
+    router.push('/user/edit_center')
 }
 </script>
 
 <style lang="scss" scoped>
 :deep(.personal-body) {
-  background-color: #fff;
-
-  .el-form-item__content {
-    .el-input {
-      width: 250px;
-    }
+    background-color: #fff;
 
     .el-form-item__content {
-      justify-content: space-between;
-    }
+        .el-input {
+            width: 250px;
+        }
 
-    .el-button {
-      margin-left: auto;
-    }
+        .el-form-item__content {
+            justify-content: space-between;
+        }
+
+        .el-button {
+            margin-left: auto;
+        }
 
-    .personal-option {
-      margin-right: auto;
+        .personal-option {
+            margin-right: auto;
+        }
     }
-  }
-}
-</style>
+}</style>
diff --git a/admin/src/app/views/index/preview.vue b/admin/src/app/views/index/preview.vue
index 8375100c..170a9d17 100644
--- a/admin/src/app/views/index/preview.vue
+++ b/admin/src/app/views/index/preview.vue
@@ -1,71 +1,55 @@
 <template>
-  <div class="main-container w-[375px] mx-auto mt-[20px] mb-[40px] relative">
-    <div class="flex full-container h-[800px]">
-      <iframe
-        v-show="loadingIframe"
-        class="w-[375px]"
-        :src="wapPreview"
-        frameborder="0"
-        id="previewIframe"
-      ></iframe>
-      <div
-        v-show="loadingDev"
-        class="w-[375px] border border-slate-100 bg-body pt-[20px] px-[20px]"
-      >
-        <div class="font-bold text-xl mb-[40px]">{{ t('developTitle') }}</div>
-        <div class="mb-[20px] flex flex-col">
-          <text class="mb-[10px]">{{ t('wapDomain') }}</text>
-          <el-input
-            v-model.trim="wapDomain"
-            :placeholder="t('wapDomainPlaceholder')"
-            clearable
-          />
-        </div>
-        <el-button type="primary" @click="save">{{ t('confirm') }}</el-button>
-      </div>
-
-      <div
-        class="w-[400px] absolute bg-body top-[10%] -right-[450px]"
-        v-if="loadingIframe"
-      >
-        <div class="info-wrap mt-[20px]">
-          <div class="px-[20px] pb-[10px] font-bold">{{ t('h5') }}</div>
-          <el-form label-width="40px" class="px-[20px]">
-            <el-form-item :label="t('link')" v-show="wapPreview">
-              <el-input readonly :value="wapPreview">
-                <template #append>
-                  <el-button
-                    @click="copyEvent(wapPreview)"
-                    class="bg-primary copy"
-                    >{{ t('copy') }}</el-button
-                  >
-                </template>
-              </el-input>
-            </el-form-item>
-
-            <el-form-item label=" " v-show="wapImage">
-              <el-image :src="wapImage" />
-            </el-form-item>
-          </el-form>
-
-          <div class="px-[20px] pb-[10px] font-bold mt-[40px]">
-            {{ t('weapp') }}
-          </div>
-          <el-form label-width="40px" class="px-[20px]">
-            <el-form-item label=" " v-if="weappConfig.qr_code">
-              <el-image
-                class="w-[100px] h-[100px]"
-                :src="img(weappConfig.qr_code)"
-              />
-            </el-form-item>
-            <el-form-item label=" " v-else>
-              <span class="text-gray-400">{{ t('weappNotSet') }}</span>
-            </el-form-item>
-          </el-form>
+    <div class="main-container w-[375px] mx-auto mt-[20px] mb-[40px] relative">
+
+        <div class="flex full-container h-[800px]">
+            <iframe v-show="loadingIframe" class="w-[375px]" :src="wapPreview" frameborder="0" id="previewIframe"></iframe>
+            <div v-show="loadingDev" class="w-[375px] border border-slate-100 bg-body pt-[20px] px-[20px]">
+                <div class="font-bold text-xl mb-[40px]">{{ t('developTitle') }}</div>
+                <div class="mb-[20px] flex flex-col">
+                    <text class="mb-[10px]">{{ t('wapDomain') }}</text>
+                    <el-input v-model.trim="wapDomain" :placeholder="t('wapDomainPlaceholder')" clearable />
+                </div>
+                <el-button type="primary" @click="save">{{ t('confirm') }}</el-button>
+            </div>
+
+            <div class="w-[400px] absolute bg-body top-[10%] -right-[450px]" v-if="loadingIframe">
+
+                <div class="info-wrap mt-[20px]">
+
+                    <div class="px-[20px] pb-[10px] font-bold">{{ t('h5') }}</div>
+                    <el-form label-width="40px" class="px-[20px]">
+
+                        <el-form-item :label="t('link')" v-show="wapPreview">
+                            <el-input readonly :value="wapPreview">
+                                <template #append>
+                                    <el-button @click="copyEvent(wapPreview)" class="bg-primary copy">{{ t('copy') }}</el-button>
+                                </template>
+                            </el-input>
+                        </el-form-item>
+
+                        <el-form-item label=" " v-show="wapImage">
+                            <el-image :src="wapImage" />
+                        </el-form-item>
+
+                    </el-form>
+
+                    <div class="px-[20px] pb-[10px] font-bold mt-[40px]">{{ t('weapp') }}</div>
+                    <el-form label-width="40px" class="px-[20px]">
+                        <el-form-item label=" " v-if="weappConfig.qr_code">
+                            <el-image class="w-[100px] h-[100px]" :src="img(weappConfig.qr_code)" />
+                        </el-form-item>
+                        <el-form-item label=" " v-else>
+                            <span class="text-gray-400">{{ t('weappNotSet') }}</span>
+                        </el-form-item>
+                    </el-form>
+
+                </div>
+
+            </div>
+
         </div>
-      </div>
+
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
@@ -97,183 +81,177 @@ const setLayout = inject('setLayout')
 setLayout('decorate')
 
 getUrl().then((res: any) => {
-  wapUrl.value = res.data.wap_url
+    wapUrl.value = res.data.wap_url
+
+    let repeat = true; // 防重复执行
 
-  let repeat = true // 防重复执行
+    // 开发模式下执行
+    if (import.meta.env.MODE == 'development') {
 
-  // 开发模式下执行
-  if (import.meta.env.MODE == 'development') {
-    wapDomain.value = res.data.wap_domain
+        wapDomain.value = res.data.wap_domain
 
-    // env文件配置过wap域名
-    if (wapDomain.value) {
-      wapUrl.value = wapDomain.value + '/wap'
-      repeat = false
-      setDomain()
+        // env文件配置过wap域名
+        if (wapDomain.value) {
+            wapUrl.value = wapDomain.value + '/wap'
+            repeat = false
+            setDomain()
+        }
+
+        const wap_domain_storage = storage.get('wap_domain')
+        if (wap_domain_storage) {
+            wapUrl.value = wap_domain_storage
+            repeat = false
+            setDomain()
+        }
     }
 
-    const wap_domain_storage = storage.get('wap_domain')
-    if (wap_domain_storage) {
-      wapUrl.value = wap_domain_storage
-      repeat = false
-      setDomain()
+    if(repeat) {
+        setDomain()
     }
-  }
 
-  if (repeat) {
-    setDomain()
-  }
 })
 
 const save = () => {
-  if (wapDomain.value.trim().length == 0) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('wapDomainPlaceholder')}`,
-    })
-    return
-  }
-  wapUrl.value = wapDomain.value + '/wap'
-  setDomain()
-  storage.set({ key: 'wap_domain', data: wapUrl.value })
-  loadingIframe.value = true
-  loadingDev.value = false
+    if (wapDomain.value.trim().length == 0) {
+        ElMessage({
+            type: 'warning',
+            message: `${t('wapDomainPlaceholder')}`
+        })
+        return
+    }
+    wapUrl.value = wapDomain.value + '/wap'
+    setDomain()
+    storage.set({ key: 'wap_domain', data: wapUrl.value })
+    loadingIframe.value = true
+    loadingDev.value = false
 }
 
 const setDomain = () => {
-  if (route.query.page) {
-    wapPreview.value = `${wapUrl.value}${route.query.page}`
-    // errorCorrectionLevel：密度容错率L（低）H(高)
-    QRCode.toDataURL(wapPreview.value, {
-      errorCorrectionLevel: 'L',
-      margin: 0,
-      width: 100,
-    }).then((url) => {
-      wapImage.value = url
-    })
+    if (route.query.page) {
+        wapPreview.value = `${wapUrl.value}${route.query.page}`
+        // errorCorrectionLevel：密度容错率L（低）H(高)
+        QRCode.toDataURL(wapPreview.value, { errorCorrectionLevel: 'L', margin: 0, width: 100 }).then(url => {
+            wapImage.value = url
+        })
 
-    const send = () => {
-      timeIframe.value = new Date().getTime()
-      postMessage()
-    }
+        const send = ()=>{
+            timeIframe.value = new Date().getTime()
+            postMessage()
+        }
 
-    // 同步发送一次消息
-    send()
+        // 同步发送一次消息
+        send()
 
-    // 如果同步发送消息的 uni-app没有接收到回应，则定时发送消息
-    let sendCount = 0
-    let timeInterVal = setInterval(() => {
-      // 接收 uni-app 发送的消息 或者 发送50次后未响应，则停止发送
-      if (uniAppLoadStatus.value || sendCount >= 50) {
-        clearInterval(timeInterVal)
-        return
-      }
+        // 如果同步发送消息的 uni-app没有接收到回应，则定时发送消息
+        let sendCount = 0;
+        let timeInterVal = setInterval(()=>{
+            // 接收 uni-app 发送的消息 或者 发送50次后未响应，则停止发送
+            if(uniAppLoadStatus.value || sendCount >= 50){
+                clearInterval(timeInterVal)
+                return
+            }
 
-      send()
-      sendCount++
-    }, 200)
+            send()
+            sendCount++;
+        },200)
 
-    // 如果10秒内加载不出来，则需要配置域名
-    setTimeout(() => {
-      if (difference.value == 0) initLoad()
-    }, 1000 * 10)
-  }
+        // 如果10秒内加载不出来，则需要配置域名
+        setTimeout(() => {
+            if (difference.value == 0) initLoad()
+        }, 1000 * 10)
+    }
 }
 
 const uniAppLoadStatus = ref(false) // uni-app 加载状态，true：加载完成，false：未完成
 
 // 监听 uni-app 端 是否加载完成
-window.addEventListener(
-  'message',
-  (event) => {
+window.addEventListener('message', (event) => {
     try {
-      let data = {
-        type: '',
-      }
-      if (typeof event.data == 'string') {
-        data = JSON.parse(event.data)
-      } else if (typeof event.data == 'object') {
-        data = event.data
-      }
-      if (data.type && ['appOnLaunch', 'appOnReady'].indexOf(data.type) != -1) {
-        loadingDev.value = false
-        loadingIframe.value = true
-        let loadTime = new Date().getTime()
-        uniAppLoadStatus.value = true // 加载完成
-        difference.value = loadTime - timeIframe.value
-      }
+        let data = {
+            type :''
+        };
+        if(typeof event.data == 'string') {
+            data = JSON.parse(event.data)
+        }else if(typeof event.data == 'object') {
+            data = event.data
+        }
+        if (data.type && ['appOnLaunch', 'appOnReady'].indexOf(data.type) != -1) {
+            loadingDev.value = false
+            loadingIframe.value = true
+            let loadTime = new Date().getTime()
+            uniAppLoadStatus.value = true // 加载完成
+            difference.value = loadTime - timeIframe.value
+        }
     } catch (e) {
-      initLoad()
-      console.log('preview 后台接受数据错误', e)
+        initLoad()
+        console.log('preview 后台接受数据错误', e)
     }
-  },
-  false
-)
+}, false)
 
 // 将数据发送到uniapp
 const postMessage = () => {
-  const data = JSON.stringify({
-    type: 'appOnReady',
-    message: '加载完成',
-  })
-  if (window.previewIframe)
-    window.previewIframe.contentWindow.postMessage(data, '*')
+    const data = JSON.stringify({
+        type: 'appOnReady',
+        message: '加载完成'
+    })
+    if (window.previewIframe) window.previewIframe.contentWindow.postMessage(data, '*')
 }
 
 // 初始化加载状态
 const initLoad = () => {
-  loadingDev.value = true
-  loadingIframe.value = false
-  wapPreview.value = ''
-  wapImage.value = ''
+    loadingDev.value = true
+    loadingIframe.value = false
+    wapPreview.value = ''
+    wapImage.value = ''
 }
 
 const weappConfig = reactive({
-  qr_code: '',
+    qr_code: ''
 })
 
 // 获取微信配置
 getWeappConfig().then((res: any) => {
-  if (res.code == 1) {
-    const data = res.data
-    weappConfig.qr_code = data.qr_code
-  }
+    if (res.code == 1) {
+        const data = res.data
+        weappConfig.qr_code = data.qr_code
+    }
 })
 
 // 复制
 const { copy, isSupported, copied } = useClipboard()
 const copyEvent = (text: string) => {
-  if (!isSupported.value) {
-    ElMessage({
-      message: t('notSupportCopy'),
-      type: 'warning',
-    })
-  }
-  copy(text)
+    if (!isSupported.value) {
+        ElMessage({
+            message: t('notSupportCopy'),
+            type: 'warning'
+        })
+    }
+    copy(text)
 }
 
 watch(copied, () => {
-  if (copied.value) {
-    ElMessage({
-      message: t('copySuccess'),
-      type: 'success',
-    })
-  }
+    if (copied.value) {
+        ElMessage({
+            message: t('copySuccess'),
+            type: 'success'
+        })
+    }
 })
+
 </script>
 
 <style lang="scss">
 body {
-  background: #edf0f3;
+    background: #edf0f3;
 }
-.main-container {
-  overflow: inherit !important;
-  border-radius: inherit;
-  background: inherit;
+.main-container{
+    overflow: inherit !important;
+    border-radius: inherit;
+    background: inherit;
 }
 .copy {
-  background: var(--el-color-primary) !important;
-  color: var(--el-color-white) !important;
+    background: var(--el-color-primary) !important;
+    color: var(--el-color-white) !important;
 }
 </style>
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/index/store.vue b/admin/src/app/views/index/store.vue
index d061877f..f1b774b6 100644
--- a/admin/src/app/views/index/store.vue
+++ b/admin/src/app/views/index/store.vue
@@ -1,782 +1,383 @@
 <template>
-  <!--应用市场-->
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ t('localAppText') }}</span>
-
-        <el-input
-          class="!w-[250px]"
-          :placeholder="t('search')"
-          v-model.trim="search_name"
-          @keyup.enter="query"
-        >
-          <template #suffix>
-            <el-icon
-              class="el-input__icon cursor-pointer"
-              size="14px"
-              @click="query"
-            >
-              <search />
-            </el-icon>
-          </template>
-        </el-input>
-      </div>
-
-      <div class="flex justify-between my-[20px]">
-        <div class="flex">
-          <div
-            :class="[
-              'flex items-center text-[14px] h-[32px] text-[#a6a9ad] border-[1px] border-solid my-[3px] border-[var(--el-color-info-light-8)] rounded-full px-[20px] mr-[24px] cursor-pointer hover:bg-[var(--el-color-info-light-8)]',
-              {
-                '!text-[#fff] !bg-[#000] !border-[#000]':
-                  activeName === 'installed',
-              },
-            ]"
-            @click="activeNameTabFn('installed')"
-          >
-            {{ t('installLabel') }}
-          </div>
-          <div
-            :class="[
-              'flex items-center text-[14px] h-[32px] text-[#a6a9ad] border-[1px] border-solid my-[3px] border-[var(--el-color-info-light-8)] rounded-full px-[20px] mr-[24px] cursor-pointer hover:bg-[var(--el-color-info-light-8)]',
-              {
-                '!text-[#fff] !bg-[#000] !border-[#000]':
-                  activeName === 'uninstalled',
-              },
-            ]"
-            @click="activeNameTabFn('uninstalled')"
-          >
-            {{ t('uninstalledLabel') }}
-          </div>
-          <div
-            :class="[
-              'flex items-center text-[14px] h-[32px] text-[#a6a9ad] border-[1px] border-solid my-[3px] border-[var(--el-color-info-light-8)] rounded-full px-[20px] mr-[24px] cursor-pointer hover:bg-[var(--el-color-info-light-8)]',
-              {
-                '!text-[#fff] !bg-[#000] !border-[#000]': activeName === 'all',
-              },
-            ]"
-            @click="activeNameTabFn('all')"
-          >
-            {{ t('buyLabel') }}
-          </div>
-        </div>
-        <el-button
-          type="primary"
-          round
-          @click="handleCloudBuild"
-          :loading="cloudBuildRef?.loading"
-          >{{ t('cloudBuild') }}</el-button
-        >
-      </div>
-
-      <div>
-        <el-table
-          v-if="localList[activeName].length && !authLoading"
-          :data="info[activeName]"
-          size="large"
-          class="pt-[5px]"
-        >
-          <el-table-column :label="t('appName')" align="left" width="320">
-            <template #default="{ row }">
-              <div class="flex items-center cursor-pointer" @click="handleTips">
-                <el-image
-                  class="w-[54px] h-[54px]"
-                  :src="row.icon"
-                  fit="contain"
-                >
-                  <template #error>
-                    <div class="flex items-center w-full h-full">
-                      <img
-                        class="max-w-full max-h-full"
-                        src="@/app/assets/images/icon-addon.png"
-                        alt=""
-                      />
-                    </div>
-                  </template>
-                </el-image>
-                <div
-                  class="flex flex-col justify-center pl-[20px] font-500 text-[13px]"
-                >
-                  <div class="w-[236px] truncate leading-[18px]">
-                    {{ row.title }}
-                  </div>
-                  <div
-                    class="w-[236px] truncate leading-[18px] mt-[6px]"
-                    v-if="
-                      row.install_info && Object.keys(row.install_info)?.length
-                    "
-                  >
-                    {{ row.install_info.version }}
-                  </div>
-                  <div
-                    class="w-[236px] truncate leading-[18px] mt-[6px]"
-                    v-else
-                  >
-                    {{ row.version }}
-                  </div>
-                  <div
-                    class="mt-[3px]"
-                    v-if="
-                      row.install_info &&
-                      Object.keys(row.install_info)?.length &&
-                      row.install_info.version != row.version
-                    "
-                  >
-                    <el-tag type="danger" size="small"
-                      >{{ t('newVersion') }}{{ row.version }}</el-tag
-                    >
-                  </div>
-                </div>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column align="left" min-width="120">
-            <template #header>
-              <div class="flex items-center">
-                <span class="font-500 text-[13px] mr-[5px]">{{
-                  t('appIdentification')
-                }}</span>
-                <el-tooltip
-                  class="box-item"
-                  effect="light"
-                  :content="t('tipText')"
-                  placement="bottom"
-                >
-                  <el-icon class="cursor-pointer text-[16px] text-[#a9a9a9]">
-                    <QuestionFilled />
-                  </el-icon>
-                </el-tooltip>
-              </div>
-            </template>
-            <template #default="{ row }">
-              <span class="font-500 text-[13px]">{{ row.key }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop=""
-            :label="t('introduction')"
-            align="left"
-            min-width="200"
-          >
-            <template #default="{ row }">
-              <span class="font-500 text-[13px] multi-hidden">{{
-                row.desc
-              }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('type')" align="left" min-width="100">
-            <template #default="{ row }">
-              <span class="font-500 text-[13px]">{{
-                row.type === 'app' ? t('app') : t('addon')
-              }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop=""
-            :label="t('author')"
-            align="left"
-            min-width="100"
-          >
-            <template #default="{ row }">
-              <span class="font-500 text-[13px]">{{ row.author }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            :label="t('operation')"
-            fixed="right"
-            align="right"
-            width="200"
-          >
-            <template #default="{ row }">
-              <el-button
-                class="!text-[13px]"
-                v-if="
-                  row.install_info &&
-                  Object.keys(row.install_info)?.length &&
-                  row.install_info.version != row.version
-                "
-                type="primary"
-                link
-                @click="upgradeAddonFn(row.key)"
-                >{{ t('upgrade') }}</el-button
-              >
-              <el-button
-                class="!text-[13px]"
-                v-if="row.install_info && Object.keys(row.install_info)?.length"
-                type="primary"
-                link
-                @click="uninstallAddonFn(row.key)"
-                >{{ t('unload') }}</el-button
-              >
-              <template
-                v-if="
-                  row.is_download &&
-                  (!row.install_info || !Object.keys(row.install_info).length)
-                "
-              >
-                <el-button
-                  class="!text-[13px]"
-                  type="primary"
-                  link
-                  @click="installAddonFn(row.key)"
-                  >{{ t('install') }}</el-button
-                >
-                <el-button
-                  class="!text-[13px]"
-                  type="primary"
-                  link
-                  @click="deleteAddonFn(row.key)"
-                  >{{ t('delete') }}</el-button
-                >
-              </template>
-              <el-button
-                class="!text-[13px]"
-                v-if="!row.is_download"
-                :loading="downloading == row.key"
-                :disabled="downloading != ''"
-                type="primary"
-                link
-                @click.stop="downEvent(row)"
-              >
-                <span>{{ t('down') }}</span>
-              </el-button>
-              <el-button
-                class="!text-[13px]"
-                type="primary"
-                link
-                @click="getAddonDetialFn(row)"
-                >{{ t('detail') }}</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-        <div
-          class="data-loading"
-          v-if="authLoading || !localList[activeName].length"
-        >
-          <el-table :data="[]" size="large" class="pt-[5px]">
-            <el-table-column
-              :label="t('appName')"
-              align="left"
-              width="320"
-            ></el-table-column>
-            <el-table-column align="left" min-width="120"></el-table-column>
-            <el-table-column
-              prop=""
-              :label="t('introduction')"
-              align="left"
-              min-width="200"
-            ></el-table-column>
-            <el-table-column
-              :label="t('type')"
-              align="left"
-              min-width="100"
-            ></el-table-column>
-            <el-table-column
-              prop=""
-              :label="t('author')"
-              align="left"
-              min-width="100"
-            ></el-table-column>
-            <el-table-column
-              :label="t('operation')"
-              fixed="right"
-              align="right"
-              width="150"
-            ></el-table-column>
-            <template #empty><span></span></template>
-          </el-table>
-          <div
-            class="h-[100px]"
-            v-loading="authLoading"
-            v-if="authLoading"
-          ></div>
-        </div>
-        <el-empty
-          class="mx-auto overview-empty"
-          v-if="
-            !localList.installed.length &&
-            !loading &&
-            activeName == 'installed' &&
-            !authLoading
-          "
-        >
-          <template #image>
-            <div class="w-[230px] mx-auto">
-              <img
-                src="@/app/assets/images/index/apply_empty.png"
-                class="max-w-full"
-                alt=""
-              />
-            </div>
-          </template>
-          <template #description>
-            <p class="flex items-center">{{ t('installed-empty') }}</p>
-          </template>
-        </el-empty>
-        <el-empty
-          class="mx-auto overview-empty"
-          v-if="
-            !localList.uninstalled.length &&
-            !loading &&
-            activeName == 'uninstalled' &&
-            !authLoading
-          "
-        >
-          <template #image>
-            <div class="w-[230px] mx-auto">
-              <img
-                src="@/app/assets/images/index/apply_empty.png"
-                class="max-w-full"
-                alt=""
-              />
-            </div>
-          </template>
-          <template #description>
-            <p class="flex items-center">
-              <span>{{ t('descriptionLeft') }}</span>
-              <el-link type="primary" @click="goRouter" class="mx-[5px]">{{
-                t('link')
-              }}</el-link>
-              <span>{{ t('descriptionRight') }}</span>
-            </p>
-          </template>
-        </el-empty>
-        <div
-          v-if="
-            !localList.all.length &&
-            !loading &&
-            !authinfo &&
-            activeName == 'all' &&
-            !authLoading
-          "
-          class="mx-auto overview-empty flex flex-col items-center pt-14 pb-6"
-        >
-          <div class="mb-[20px] text-sm text-[#888]">
-            检测到当前账号尚未绑定授权，请先绑定授权！
-          </div>
-          <div class="flex flex-1 flex-wrap justify-center relative">
-            <el-button
-              class="w-[154px] !h-[48px] mt-[8px]"
-              type="primary"
-              @click="authCodeApproveFn"
-              >授权码认证</el-button
-            >
-            <el-popover
-              ref="getAuthCodeDialog"
-              placement="bottom"
-              :width="478"
-              trigger="click"
-              class="mt-[8px]"
-            >
-              <div class="px-[18px] py-[8px]">
-                <p class="leading-[32px] text-[14px]">
-                  您在官方应用市场购买任意一款应用，即可获得授权码。输入正确授权码认证通过后，即可支持在线升级和其它相关服务
-                </p>
-                <div class="flex justify-end mt-[36px]">
-                  <el-button class="w-[182px] !h-[48px]" plain @click="market"
-                    >去应用市场逛逛</el-button
-                  >
-                  <el-button
-                    class="w-[100px] !h-[48px]"
-                    plain
-                    @click="getAuthCodeDialog.hide()"
-                    >关闭</el-button
-                  >
-                </div>
-              </div>
-              <template #reference>
-                <el-button
-                  class="w-[154px] !h-[48px] mt-[8px] !text-[var(--el-color-primary)] hover:!text-[var(--el-color-primary)] !bg-transparent"
-                  plain
-                  type="primary"
-                  >如何获取授权码?</el-button
-                >
-              </template>
-            </el-popover>
-          </div>
-        </div>
-        <el-empty
-          class="mx-auto overview-empty"
-          v-if="
-            !localList.all.length &&
-            !loading &&
-            authinfo &&
-            activeName == 'all' &&
-            !authLoading
-          "
-        >
-          <template #image>
-            <div class="w-[230px] mx-auto">
-              <img
-                src="@/app/assets/images/index/apply_empty.png"
-                class="max-w-full"
-                alt=""
-              />
-            </div>
-          </template>
-          <template #description>
-            <p class="flex items-center">
-              <span>{{ t('buyDescriptionLeft') }}</span>
-              <el-link type="primary" @click="goRouter" class="mx-[5px]">{{
-                t('link')
-              }}</el-link>
-              <span>{{ t('descriptionRight') }}</span>
-            </p>
-          </template>
-        </el-empty>
-      </div>
-
-      <el-dialog
-        v-model="authCodeApproveDialog"
-        title="授权码认证"
-        width="400px"
-      >
-        <el-form
-          :model="formData"
-          label-width="0"
-          ref="formRef"
-          :rules="formRules"
-          class="page-form"
-        >
-          <el-card class="box-card !border-none" shadow="never">
-            <el-form-item prop="auth_code">
-              <el-input
-                v-model.trim="formData.auth_code"
-                :placeholder="t('authCodePlaceholder')"
-                class="input-width"
-                clearable
-                size="large"
-              />
-            </el-form-item>
-
-            <div class="mt-[20px]">
-              <el-form-item prop="auth_secret">
-                <el-input
-                  v-model.trim="formData.auth_secret"
-                  clearable
-                  :placeholder="t('authSecretPlaceholder')"
-                  class="input-width"
-                  size="large"
-                />
-              </el-form-item>
-            </div>
+    <!--应用市场-->
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
 
-            <div class="text-sm mt-[10px] text-info">
-              {{ t('authInfoTips') }}
-            </div>
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ t('localAppText') }}</span>
 
-            <div class="mt-[20px]">
-              <el-button
-                type="primary"
-                class="w-full"
-                size="large"
-                :loading="saveLoading"
-                @click="save(formRef)"
-                >{{ t('confirm') }}</el-button
-              >
+                <el-input class="!w-[250px]" :placeholder="t('search')" v-model.trim="search_name" @keyup.enter="query">
+                    <template #suffix>
+                        <el-icon class="el-input__icon  cursor-pointer" size="14px" @click="query">
+                            <search />
+                        </el-icon>
+                    </template>
+                </el-input>
             </div>
-            <div class="mt-[10px] text-right">
-              <el-button type="primary" link @click="market">{{
-                t('notHaveAuth')
-              }}</el-button>
+
+            <div class="flex justify-between my-[20px]">
+                <div class="flex">
+                    <div :class="['flex items-center text-[14px] h-[32px] text-[#a6a9ad] border-[1px] border-solid my-[3px] border-[var(--el-color-info-light-8)] rounded-full px-[20px] mr-[24px] cursor-pointer hover:bg-[var(--el-color-info-light-8)]', { '!text-[#fff] !bg-[#000] !border-[#000]': activeName === 'installed' }]" @click="activeNameTabFn('installed')">
+                        {{ t('installLabel') }}
+                    </div>
+                    <div :class="['flex items-center text-[14px] h-[32px] text-[#a6a9ad] border-[1px] border-solid my-[3px] border-[var(--el-color-info-light-8)] rounded-full px-[20px] mr-[24px] cursor-pointer hover:bg-[var(--el-color-info-light-8)]', { '!text-[#fff] !bg-[#000] !border-[#000]': activeName === 'uninstalled' }]" @click="activeNameTabFn('uninstalled')">
+                        {{ t('uninstalledLabel') }}
+                    </div>
+                    <div :class="['flex items-center text-[14px] h-[32px] text-[#a6a9ad] border-[1px] border-solid my-[3px] border-[var(--el-color-info-light-8)] rounded-full px-[20px] mr-[24px] cursor-pointer hover:bg-[var(--el-color-info-light-8)]', { '!text-[#fff] !bg-[#000] !border-[#000]': activeName === 'all' }]" @click="activeNameTabFn('all')">
+                        {{ t('buyLabel') }}
+                    </div>
+                </div>
+                <el-button type="primary" round @click="handleCloudBuild" :loading="cloudBuildRef?.loading">{{ t('cloudBuild') }}</el-button>
             </div>
-          </el-card>
-        </el-form>
-      </el-dialog>
-      <!-- 详情 -->
-      <el-dialog
-        v-model="appStoreShowDialog"
-        :title="t('plugDetail')"
-        width="500px"
-        :destroy-on-close="true"
-      >
-        <el-form
-          :model="appStoreInfo"
-          label-width="120px"
-          ref="formRef"
-          class="page-form"
-        >
-          <el-form-item :label="t('title')">
-            <div class="input-width">{{ appStoreInfo.title }}</div>
-          </el-form-item>
-          <el-form-item :label="t('desc')">
-            <div class="input-width">{{ appStoreInfo.desc }}</div>
-          </el-form-item>
-          <el-form-item :label="t('author')">
-            <div class="input-width">{{ appStoreInfo.author }}</div>
-          </el-form-item>
-          <el-form-item :label="t('version')">
-            <div class="input-width">{{ appStoreInfo.version }}</div>
-          </el-form-item>
-        </el-form>
-        <template #footer>
-          <span class="dialog-footer">
-            <el-button type="primary" @click="appStoreShowDialog = false">{{
-              t('confirm')
-            }}</el-button>
-          </span>
-        </template>
-      </el-dialog>
-
-      <!-- 安装弹窗 -->
-      <el-dialog
-        v-model="installShowDialog"
-        :title="t('addonInstall')"
-        width="850px"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        :before-close="installShowDialogClose"
-      >
-        <el-steps
-          :space="200"
-          :active="installStep"
-          finish-status="success"
-          align-center
-        >
-          <el-step :title="t('envCheck')" class="flex-1" />
-          <el-step :title="t('installProgress')" class="flex-1" />
-          <el-step :title="t('installComplete')" class="flex-1" />
-        </el-steps>
-        <div v-show="installStep == 1" v-loading="!installCheckResult.dir">
-          <el-scrollbar max-height="50vh">
-            <div class="min-h-[150px]">
-              <div class="my-3" v-if="installCheckResult.dir">
-                <p class="pt-[20px] pl-[20px]">{{ t('dirPermission') }}</p>
-                <div class="px-[20px] pt-[10px] text-[14px]">
-                  <el-row
-                    class="py-[10px] items table-head-bg pl-[15px] mb-[10px]"
-                  >
-                    <el-col :span="12">
-                      <span>{{ t('path') }}</span>
-                    </el-col>
-                    <el-col :span="6">
-                      <span>{{ t('demand') }}</span>
-                    </el-col>
-                    <el-col :span="6">
-                      <span>{{ t('status') }}</span>
-                    </el-col>
-                  </el-row>
-                  <el-row
-                    class="pb-[10px] items pl-[15px]"
-                    v-for="(item, index) in installCheckResult.dir.is_readable"
-                    :key="index"
-                  >
-                    <el-col :span="12">
-                      <span>{{ item.dir }}</span>
-                    </el-col>
-                    <el-col :span="6">
-                      <span>{{ t('readable') }}</span>
-                    </el-col>
-                    <el-col :span="6">
-                      <span v-if="item.status"
-                        ><el-icon color="green"><Select /></el-icon
-                      ></span>
-                      <span v-else>
-                        <el-icon color="red">
-                          <CloseBold />
-                        </el-icon>
-                      </span>
-                    </el-col>
-                  </el-row>
-                  <el-row
-                    class="pb-[10px] items pl-[15px]"
-                    v-for="(item, index) in installCheckResult.dir.is_write"
-                    :key="index"
-                  >
-                    <el-col :span="12">
-                      <span>{{ item.dir }}</span>
-                    </el-col>
-                    <el-col :span="6">
-                      <span>{{ t('write') }}</span>
-                    </el-col>
-                    <el-col :span="6">
-                      <span v-if="item.status"
-                        ><el-icon color="green"><Select /></el-icon
-                      ></span>
-                      <span v-else>
-                        <el-icon color="red">
-                          <CloseBold />
-                        </el-icon>
-                      </span>
-                    </el-col>
-                  </el-row>
+
+            <div>
+                <el-table v-if="localList[activeName].length&&!authLoading" :data="info[activeName]" size="large" class="pt-[5px]">
+                    <el-table-column :label="t('appName')" align="left" width="320">
+                        <template #default="{ row }">
+                            <div class="flex items-center cursor-pointer" @click = "handleTips">
+                                <el-image class="w-[54px] h-[54px]" :src="row.icon" fit="contain">
+                                    <template #error>
+                                        <div class="flex items-center w-full h-full">
+                                            <img class="max-w-full max-h-full" src="@/app/assets/images/icon-addon.png" alt="">
+                                        </div>
+                                    </template>
+                                </el-image>
+                                <div class="flex flex-col justify-center pl-[20px] font-500 text-[13px]">
+                                    <div class="w-[236px] truncate leading-[18px]">{{ row.title }}</div>
+                                    <div class="w-[236px] truncate leading-[18px] mt-[6px]" v-if="row.install_info && Object.keys(row.install_info)?.length">{{ row.install_info.version }}</div>
+                                    <div class="w-[236px] truncate leading-[18px] mt-[6px]" v-else>{{ row.version }}</div>
+                                    <div class="mt-[3px]" v-if="row.install_info && Object.keys(row.install_info)?.length && row.install_info.version != row.version">
+                                        <el-tag type="danger" size="small">{{ t('newVersion') }}{{ row.version }}</el-tag>
+                                    </div>
+                                </div>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column align="left" min-width="120">
+                        <template #header>
+                            <div class="flex items-center">
+                                <span class="font-500 text-[13px] mr-[5px]">{{ t('appIdentification') }}</span>
+                                <el-tooltip class="box-item" effect="light" :content="t('tipText')" placement="bottom">
+                                    <el-icon class="cursor-pointer text-[16px] text-[#a9a9a9]">
+                                        <QuestionFilled />
+                                    </el-icon>
+                                </el-tooltip>
+                            </div>
+                        </template>
+                        <template #default="{ row }">
+                            <span class="font-500 text-[13px]">{{ row.key }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="" :label="t('introduction')" align="left" min-width="200">
+                        <template #default="{ row }">
+                            <span class="font-500 text-[13px] multi-hidden">{{ row.desc }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('type')" align="left" min-width="100">
+                        <template #default="{ row }">
+                            <span class="font-500 text-[13px]">{{ row.type === 'app' ? t('app') : t('addon') }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="" :label="t('author')" align="left" min-width="100">
+                        <template #default="{ row }">
+                            <span class="font-500 text-[13px]">{{ row.author }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('operation')" fixed="right" align="right" width="200">
+                        <template #default="{ row }">
+                            <el-button class="!text-[13px]" v-if="row.install_info && Object.keys(row.install_info)?.length && row.install_info.version != row.version" type="primary" link @click="upgradeAddonFn(row.key)">{{ t('upgrade') }}</el-button>
+                            <el-button class="!text-[13px]" v-if="row.install_info && Object.keys(row.install_info)?.length" type="primary" link @click="uninstallAddonFn(row.key)">{{ t('unload') }}</el-button>
+                            <template v-if="row.is_download && (!row.install_info || !Object.keys(row.install_info).length)">
+                                <el-button class="!text-[13px]" type="primary" link @click="installAddonFn(row.key)">{{ t('install') }}</el-button>
+                                <el-button class="!text-[13px]" type="primary" link @click="deleteAddonFn(row.key)">{{ t('delete') }}</el-button>
+                            </template>
+                            <el-button class="!text-[13px]" v-if="!row.is_download" :loading="downloading == row.key" :disabled="downloading != ''" type="primary" link @click.stop="downEvent(row)">
+                                <span>{{ t('down') }}</span>
+                            </el-button>
+                            <el-button class="!text-[13px]" type="primary" link @click="getAddonDetialFn(row)">{{ t('detail') }}</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <div class="data-loading" v-if="authLoading || !localList[activeName].length">
+                    <el-table :data="[]" size="large" class="pt-[5px]">
+                        <el-table-column :label="t('appName')" align="left" width="320"></el-table-column>
+                        <el-table-column align="left" min-width="120"></el-table-column>
+                        <el-table-column prop="" :label="t('introduction')" align="left" min-width="200"></el-table-column>
+                        <el-table-column :label="t('type')" align="left" min-width="100"></el-table-column>
+                        <el-table-column prop="" :label="t('author')" align="left" min-width="100"></el-table-column>
+                        <el-table-column :label="t('operation')" fixed="right" align="right" width="150"></el-table-column>
+                        <template #empty><span></span></template>
+                    </el-table>
+                    <div class="h-[100px]" v-loading="authLoading" v-if="authLoading">
+                    </div>
+                </div>
+                <el-empty class="mx-auto overview-empty" v-if="!localList.installed.length && !loading && activeName == 'installed'&&!authLoading">
+                    <template #image>
+                        <div class="w-[230px] mx-auto">
+                            <img src="@/app/assets/images/index/apply_empty.png" class="max-w-full" alt="">
+                        </div>
+                    </template>
+                    <template #description>
+                        <p class="flex items-center">{{ t('installed-empty') }}</p>
+                    </template>
+                </el-empty>
+                <el-empty class="mx-auto overview-empty" v-if="!localList.uninstalled.length && !loading && activeName == 'uninstalled'&&!authLoading">
+                    <template #image>
+                        <div class="w-[230px] mx-auto">
+                            <img src="@/app/assets/images/index/apply_empty.png" class="max-w-full" alt="">
+                        </div>
+                    </template>
+                    <template #description>
+                        <p class="flex items-center">
+                            <span>{{ t('descriptionLeft') }}</span>
+                            <el-link type="primary" @click="goRouter" class="mx-[5px]">{{ t('link') }}</el-link>
+                            <span>{{ t('descriptionRight') }}</span>
+                        </p>
+                    </template>
+                </el-empty>
+                <div v-if="!localList.all.length && !loading && !authinfo && activeName == 'all'&&!authLoading" class="mx-auto overview-empty flex flex-col items-center pt-14 pb-6">
+                    <div class="mb-[20px] text-sm text-[#888]">检测到当前账号尚未绑定授权，请先绑定授权！</div>
+                    <div class="flex flex-1  flex-wrap justify-center relative">
+                        <el-button class="w-[154px] !h-[48px] mt-[8px]" type="primary" @click="authCodeApproveFn">授权码认证</el-button>
+                        <el-popover ref="getAuthCodeDialog" placement="bottom" :width="478" trigger="click" class="mt-[8px]">
+                            <div class="px-[18px] py-[8px]">
+                                <p class="leading-[32px] text-[14px]">
+                                    您在官方应用市场购买任意一款应用，即可获得授权码。输入正确授权码认证通过后，即可支持在线升级和其它相关服务</p>
+                                <div class="flex justify-end mt-[36px]">
+                                    <el-button class="w-[182px] !h-[48px]" plain @click="market">去应用市场逛逛</el-button>
+                                    <el-button class="w-[100px] !h-[48px]" plain @click="getAuthCodeDialog.hide()">关闭</el-button>
+                                </div>
+                            </div>
+                            <template #reference>
+                                <el-button class="w-[154px] !h-[48px] mt-[8px] !text-[var(--el-color-primary)] hover:!text-[var(--el-color-primary)] !bg-transparent" plain type="primary">如何获取授权码?</el-button>
+                            </template>
+                        </el-popover>
+                    </div>
                 </div>
-              </div>
+                <el-empty class="mx-auto overview-empty" v-if="!localList.all.length && !loading && authinfo && activeName == 'all'&&!authLoading">
+                    <template #image>
+                        <div class="w-[230px] mx-auto">
+                            <img src="@/app/assets/images/index/apply_empty.png" class="max-w-full" alt="">
+                        </div>
+                    </template>
+                    <template #description>
+                        <p class="flex items-center">
+                            <span>{{ t('buyDescriptionLeft') }}</span>
+                            <el-link type="primary" @click="goRouter" class="mx-[5px]">{{ t('link') }}</el-link>
+                            <span>{{ t('descriptionRight') }}</span>
+                        </p>
+                    </template>
+                </el-empty>
             </div>
-          </el-scrollbar>
-          <div class="flex justify-end">
-            <el-tooltip
-              effect="dark"
-              :content="t('installTips')"
-              placement="top"
-            >
-              <el-button
-                type="default"
-                :disabled="!installCheckResult.is_pass || cloudInstalling"
-                :loading="localInstalling"
-                @click="handleInstall"
-                >{{ t('localInstall') }}</el-button
-              >
-            </el-tooltip>
-            <el-tooltip
-              effect="dark"
-              :content="t('cloudInstallTips')"
-              placement="top"
-            >
-              <el-button
-                type="primary"
-                :disabled="!installCheckResult.is_pass || localInstalling"
-                :loading="cloudInstalling"
-                @click="handleCloudInstall"
-                >{{ t('cloudInstall') }}</el-button
-              >
-            </el-tooltip>
-          </div>
-        </div>
-        <div v-show="installStep == 2" class="h-[50vh] mt-[20px]">
-          <terminal
-            ref="terminalRef"
-            :context="currAddon"
-            :init-log="null"
-            :show-header="false"
-            :show-log-time="true"
-            @exec-cmd="onExecCmd"
-          />
-        </div>
-        <div v-show="installStep == 3" class="h-[50vh] mt-[20px] flex flex-col">
-          <el-result
-            icon="success"
-            :title="t('addonInstallSuccess')"
-          ></el-result>
-          <!-- 提示信息 -->
-          <div
-            v-for="(item, index) in installAfterTips"
-            class="mb-[10px]"
-            :key="index"
-          >
-            <el-alert :title="item" type="error" :closable="false" />
-          </div>
-        </div>
-      </el-dialog>
-
-      <el-dialog
-        v-model="uninstallShowDialog"
-        :title="t('addonUninstall')"
-        width="850px"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-      >
-        <el-scrollbar max-height="50vh">
-          <div class="min-h-[150px]">
-            <div class="bg-[#fff] my-3" v-if="uninstallCheckResult.dir">
-              <p class="pt-[20px] pl-[20px]">{{ t('dirPermission') }}</p>
-              <div class="px-[20px] pt-[10px] text-[14px]">
-                <el-row
-                  class="py-[10px] items table-head-bg pl-[15px] mb-[10px]"
-                >
-                  <el-col :span="12">
-                    <span>{{ t('path') }}</span>
-                  </el-col>
-                  <el-col :span="6">
-                    <span>{{ t('demand') }}</span>
-                  </el-col>
-                  <el-col :span="6">
-                    <span>{{ t('status') }}</span>
-                  </el-col>
-                </el-row>
-                <el-row
-                  class="pb-[10px] items pl-[15px]"
-                  v-for="(item, index) in uninstallCheckResult.dir.is_readable"
-                  :key="index"
-                >
-                  <el-col :span="12">
-                    <span>{{ item.dir }}</span>
-                  </el-col>
-                  <el-col :span="6">
-                    <span>{{ t('readable') }}</span>
-                  </el-col>
-                  <el-col :span="6">
-                    <span v-if="item.status"
-                      ><el-icon color="green"><Select /></el-icon
-                    ></span>
-                    <span v-else>
-                      <el-icon color="red">
-                        <CloseBold />
-                      </el-icon>
+
+            <el-dialog v-model="authCodeApproveDialog" title="授权码认证" width="400px">
+                <el-form :model="formData" label-width="0" ref="formRef" :rules="formRules" class="page-form">
+                    <el-card class="box-card !border-none" shadow="never">
+                        <el-form-item prop="auth_code">
+                            <el-input v-model.trim="formData.auth_code" :placeholder="t('authCodePlaceholder')" class="input-width" clearable size="large" />
+                        </el-form-item>
+
+                        <div class="mt-[20px]">
+                            <el-form-item prop="auth_secret">
+                                <el-input v-model.trim="formData.auth_secret" clearable :placeholder="t('authSecretPlaceholder')" class="input-width" size="large" />
+                            </el-form-item>
+                        </div>
+
+                        <div class="text-sm mt-[10px] text-info">{{ t('authInfoTips') }}</div>
+
+                        <div class="mt-[20px]">
+                            <el-button type="primary" class="w-full" size="large" :loading="saveLoading" @click="save(formRef)">{{ t('confirm') }}</el-button>
+                        </div>
+                        <div class="mt-[10px] text-right">
+                            <el-button type="primary" link @click="market">{{ t('notHaveAuth') }}</el-button>
+                        </div>
+                    </el-card>
+                </el-form>
+            </el-dialog>
+            <!-- 详情 -->
+            <el-dialog v-model="appStoreShowDialog" :title="t('plugDetail')" width="500px" :destroy-on-close="true">
+                <el-form :model="appStoreInfo" label-width="120px" ref="formRef" class="page-form">
+                    <el-form-item :label="t('title')">
+                        <div class="input-width"> {{ appStoreInfo.title }} </div>
+                    </el-form-item>
+                    <el-form-item :label="t('desc')">
+                        <div class="input-width"> {{ appStoreInfo.desc }} </div>
+                    </el-form-item>
+                    <el-form-item :label="t('author')">
+                        <div class="input-width"> {{ appStoreInfo.author }} </div>
+                    </el-form-item>
+                    <el-form-item :label="t('version')">
+                        <div class="input-width"> {{ appStoreInfo.version }} </div>
+                    </el-form-item>
+                </el-form>
+                <template #footer>
+                    <span class="dialog-footer">
+                        <el-button type="primary" @click="appStoreShowDialog = false">{{ t('confirm') }}</el-button>
                     </span>
-                  </el-col>
-                </el-row>
-                <el-row
-                  class="pb-[10px] items pl-[15px]"
-                  v-for="(item, index) in uninstallCheckResult.dir.is_write"
-                  :key="index"
-                >
-                  <el-col :span="12">
-                    <span>{{ item.dir }}</span>
-                  </el-col>
-                  <el-col :span="6">
-                    <span>{{ t('write') }}</span>
-                  </el-col>
-                  <el-col :span="6">
-                    <span v-if="item.status"
-                      ><el-icon color="green"><Select /></el-icon
-                    ></span>
-                    <span v-else>
-                      <el-icon color="red">
-                        <CloseBold />
-                      </el-icon>
+                </template>
+            </el-dialog>
+
+            <!-- 安装弹窗 -->
+            <el-dialog v-model="installShowDialog" :title="t('addonInstall')" width="850px" :close-on-click-modal="false" :close-on-press-escape="false" :before-close="installShowDialogClose">
+                <el-steps :space="200" :active="installStep" finish-status="success" align-center>
+                    <el-step :title="t('envCheck')" class="flex-1" />
+                    <el-step :title="t('installProgress')" class="flex-1" />
+                    <el-step :title="t('installComplete')" class="flex-1" />
+                </el-steps>
+                <div v-show="installStep == 1" v-loading="!installCheckResult.dir">
+                    <el-scrollbar max-height="50vh">
+                        <div class="min-h-[150px]">
+                            <div class="my-3" v-if="installCheckResult.dir">
+                                <p class="pt-[20px] pl-[20px] ">{{ t('dirPermission') }}</p>
+                                <div class="px-[20px] pt-[10px] text-[14px]">
+                                    <el-row class="py-[10px] items table-head-bg pl-[15px] mb-[10px]">
+                                        <el-col :span="12">
+                                            <span>{{ t('path') }}</span>
+                                        </el-col>
+                                        <el-col :span="6">
+                                            <span>{{ t('demand') }}</span>
+                                        </el-col>
+                                        <el-col :span="6">
+                                            <span>{{ t('status') }}</span>
+                                        </el-col>
+                                    </el-row>
+                                    <el-row class="pb-[10px] items pl-[15px]" v-for="(item,index) in installCheckResult.dir.is_readable" :key="index">
+                                        <el-col :span="12">
+                                            <span>{{ item.dir }}</span>
+                                        </el-col>
+                                        <el-col :span="6">
+                                            <span>{{ t('readable') }}</span>
+                                        </el-col>
+                                        <el-col :span="6">
+                                            <span v-if="item.status"><el-icon color="green"><Select /></el-icon></span>
+                                            <span v-else>
+                                                <el-icon color="red">
+                                                    <CloseBold />
+                                                </el-icon>
+                                            </span>
+                                        </el-col>
+                                    </el-row>
+                                    <el-row class="pb-[10px] items pl-[15px]" v-for="(item,index) in installCheckResult.dir.is_write" :key="index">
+                                        <el-col :span="12">
+                                            <span>{{ item.dir }}</span>
+                                        </el-col>
+                                        <el-col :span="6">
+                                            <span>{{ t('write') }}</span>
+                                        </el-col>
+                                        <el-col :span="6">
+                                            <span v-if="item.status"><el-icon color="green"><Select /></el-icon></span>
+                                            <span v-else>
+                                                <el-icon color="red">
+                                                    <CloseBold />
+                                                </el-icon>
+                                            </span>
+                                        </el-col>
+                                    </el-row>
+                                </div>
+                            </div>
+                        </div>
+                    </el-scrollbar>
+                    <div class="flex justify-end">
+                        <el-tooltip effect="dark" :content="t('installTips')" placement="top">
+                            <el-button type="default" :disabled="!installCheckResult.is_pass || cloudInstalling" :loading="localInstalling" @click="handleInstall">{{ t('localInstall') }}</el-button>
+                        </el-tooltip>
+                        <el-tooltip effect="dark" :content="t('cloudInstallTips')" placement="top">
+                            <el-button type="primary" :disabled="!installCheckResult.is_pass || localInstalling" :loading="cloudInstalling" @click="handleCloudInstall">{{ t('cloudInstall') }}</el-button>
+                        </el-tooltip>
+                    </div>
+                </div>
+                <div v-show="installStep == 2" class="h-[50vh] mt-[20px]">
+                    <terminal ref="terminalRef" :context="currAddon" :init-log="null" :show-header="false" :show-log-time="true" @exec-cmd="onExecCmd"/>
+                </div>
+                <div v-show="installStep == 3" class="h-[50vh] mt-[20px] flex flex-col">
+                    <el-result icon="success" :title="t('addonInstallSuccess')"></el-result>
+                    <!-- 提示信息 -->
+                    <div v-for="(item,index) in installAfterTips" class="mb-[10px]" :key="index">
+                        <el-alert :title="item" type="error" :closable="false" />
+                    </div>
+                </div>
+            </el-dialog>
+
+            <el-dialog v-model="uninstallShowDialog" :title="t('addonUninstall')" width="850px" :close-on-click-modal="false" :close-on-press-escape="false">
+                <el-scrollbar max-height="50vh">
+                    <div class="min-h-[150px]">
+                        <div class="bg-[#fff] my-3" v-if="uninstallCheckResult.dir">
+                            <p class="pt-[20px] pl-[20px] ">{{ t('dirPermission') }}</p>
+                            <div class="px-[20px] pt-[10px] text-[14px]">
+                                <el-row class="py-[10px] items table-head-bg pl-[15px] mb-[10px]">
+                                    <el-col :span="12">
+                                        <span>{{ t('path') }}</span>
+                                    </el-col>
+                                    <el-col :span="6">
+                                        <span>{{ t('demand') }}</span>
+                                    </el-col>
+                                    <el-col :span="6">
+                                        <span>{{ t('status') }}</span>
+                                    </el-col>
+                                </el-row>
+                                <el-row class="pb-[10px] items pl-[15px]" v-for="(item,index) in uninstallCheckResult.dir.is_readable" :key="index">
+                                    <el-col :span="12">
+                                        <span>{{ item.dir }}</span>
+                                    </el-col>
+                                    <el-col :span="6">
+                                        <span>{{ t('readable') }}</span>
+                                    </el-col>
+                                    <el-col :span="6">
+                                        <span v-if="item.status"><el-icon color="green"><Select /></el-icon></span>
+                                        <span v-else>
+                                            <el-icon color="red">
+                                                <CloseBold />
+                                            </el-icon>
+                                        </span>
+                                    </el-col>
+                                </el-row>
+                                <el-row class="pb-[10px] items pl-[15px]" v-for="(item,index) in uninstallCheckResult.dir.is_write" :key="index">
+                                    <el-col :span="12">
+                                        <span>{{ item.dir }}</span>
+                                    </el-col>
+                                    <el-col :span="6">
+                                        <span>{{ t('write') }}</span>
+                                    </el-col>
+                                    <el-col :span="6">
+                                        <span v-if="item.status"><el-icon color="green"><Select /></el-icon></span>
+                                        <span v-else>
+                                            <el-icon color="red">
+                                                <CloseBold />
+                                            </el-icon>
+                                        </span>
+                                    </el-col>
+                                </el-row>
+                            </div>
+                        </div>
+                    </div>
+                </el-scrollbar>
+            </el-dialog>
+
+            <!-- 下载提示 -->
+            <el-dialog v-model="unloadHintDialog" title="下载提示" width="30%">
+                <span>本地已经存在该插件/应用，再次下载会覆盖该插件/应用。</span>
+                <template #footer>
+                    <span class="dialog-footer">
+                        <el-button @click="unloadHintDialog = false">取消</el-button>
+                        <el-button type="primary" @click="downEventHintFn">确定</el-button>
                     </span>
-                  </el-col>
-                </el-row>
-              </div>
-            </div>
-          </div>
-        </el-scrollbar>
-      </el-dialog>
-
-      <!-- 下载提示 -->
-      <el-dialog v-model="unloadHintDialog" title="下载提示" width="30%">
-        <span>本地已经存在该插件/应用，再次下载会覆盖该插件/应用。</span>
-        <template #footer>
-          <span class="dialog-footer">
-            <el-button @click="unloadHintDialog = false">取消</el-button>
-            <el-button type="primary" @click="downEventHintFn">确定</el-button>
-          </span>
-        </template>
-      </el-dialog>
-    </el-card>
-  </div>
-
-  <upgrade ref="upgradeRef" @complete="localListFn" />
-  <cloud-build ref="cloudBuildRef" />
+                </template>
+            </el-dialog>
+        </el-card>
+    </div>
+
+    <upgrade ref="upgradeRef" @complete="localListFn"/>
+    <cloud-build ref="cloudBuildRef" />
 </template>
 
 <script lang="ts" setup>
 import { ref, reactive, watch, h } from 'vue'
 import { t } from '@/lang'
-import {
-  getAddonLocal,
-  uninstallAddon,
-  installAddon,
-  preInstallCheck,
-  cloudInstallAddon,
-  getAddonInstalltask,
-  getAddonCloudInstallLog,
-  preUninstallCheck,
-  cancelInstall,
-} from '@/app/api/addon'
+import { getAddonLocal, uninstallAddon, installAddon, preInstallCheck, cloudInstallAddon, getAddonInstalltask, getAddonCloudInstallLog, preUninstallCheck, cancelInstall } from '@/app/api/addon'
 import { deleteAddonDevelop } from '@/app/api/tools'
 import { getInstallConfig } from '@/app/api/sys'
 import { downloadVersion, getAuthInfo, setAuthInfo } from '@/app/api/module'
-import {
-  ElMessage,
-  ElMessageBox,
-  ElNotification,
-  FormInstance,
-  FormRules,
-} from 'element-plus'
+import { ElMessage, ElMessageBox, ElNotification, FormInstance, FormRules } from 'element-plus'
 import 'vue-web-terminal/lib/theme/dark.css'
 import { Terminal, TerminalFlash } from 'vue-web-terminal'
 import { findFirstValidRoute } from '@/router/routers'
@@ -799,54 +400,49 @@ const unloadHintDialog = ref(false)
 const terminalRef = ref(null)
 const installPhpConfig = ref(null)
 
-getInstallConfig()
-  .then(({ data }) => {
+getInstallConfig().then(({ data }) => {
     installPhpConfig.value = data
-  })
-  .catch()
+}).catch()
 
 const currDownData = ref()
 const downEventHintFn = () => {
-  downEvent(currDownData.value, true)
+    downEvent(currDownData.value, true)
 }
 
-const activeNameTabFn = (data: any) => {
-  activeName.value = data
-  storage.set({ key: 'storeActiveName', data })
+const activeNameTabFn = (data:any) => {
+    activeName.value = data
+    storage.set({ key: 'storeActiveName', data })
 }
 if (route.query.id) {
-  activeNameTabFn(route.query.id)
+    activeNameTabFn(route.query.id)
 }
 const downEvent = (param: Record<string, any>, isDown = false) => {
-  if (param.is_download && activeName.value == 'all' && !isDown) {
-    unloadHintDialog.value = true
-    currDownData.value = param
-    return false
-  }
-
-  if (downloading.value) return
-  downloading.value = param.key
-
-  downloadVersion({ addon: param.key, version: param.version })
-    .then(() => {
-      unloadHintDialog.value = false
-      installAddonFn(param.key)
-      localListFn()
-      downloading.value = ''
-    })
-    .catch(() => {
-      downloading.value = ''
+    if (param.is_download && activeName.value == 'all' && !isDown) {
+        unloadHintDialog.value = true
+        currDownData.value = param
+        return false
+    }
+
+    if (downloading.value) return
+    downloading.value = param.key
+
+    downloadVersion({ addon: param.key, version: param.version }).then(() => {
+        unloadHintDialog.value = false
+        installAddonFn(param.key)
+        localListFn()
+        downloading.value = ''
+    }).catch(() => {
+        downloading.value = ''
     })
 }
 
 const authCode = ref('')
-getAuthInfo()
-  .then((res) => {
+getAuthInfo().then(res => {
     if (res.data.data && res.data.data.auth_code) {
-      authCode.value = res.data.data.auth_code
+        authCode.value = res.data.data.auth_code
     }
-  })
-  .catch(() => {})
+}).catch(() => {
+})
 
 /**
  * 本地下载的插件列表
@@ -854,66 +450,57 @@ getAuthInfo()
 const search_name = ref('')
 // 表格展示数据
 const info = ref({
-  installed: [],
-  uninstalled: [],
-  all: [],
+    installed: [],
+    uninstalled: [],
+    all: []
 })
 const query = () => {
-  if (search_name.value == '' || search_name.value == null) {
-    info.value.installed = localList.value.installed
-    info.value.uninstalled = localList.value.uninstalled
-    info.value.all = localList.value.all
-    return false
-  }
-  info.value.installed = localList.value.installed.filter(
-    (el: any) => el.title.indexOf(search_name.value) != -1
-  )
-  info.value.uninstalled = localList.value.uninstalled.filter(
-    (el: any) => el.title.indexOf(search_name.value) != -1
-  )
-  info.value.all = localList.value.all.filter(
-    (el: any) => el.title.indexOf(search_name.value) != -1
-  )
+    if (search_name.value == '' || search_name.value == null) {
+        info.value.installed = localList.value.installed
+        info.value.uninstalled = localList.value.uninstalled
+        info.value.all = localList.value.all
+        return false
+    }
+    info.value.installed = localList.value.installed.filter((el: any) => el.title.indexOf(search_name.value) != -1)
+    info.value.uninstalled = localList.value.uninstalled.filter((el: any) => el.title.indexOf(search_name.value) != -1)
+    info.value.all = localList.value.all.filter((el: any) => el.title.indexOf(search_name.value) != -1)
 }
 const localList = ref({
-  installed: [],
-  uninstalled: [],
-  all: [],
-  error: '',
+    installed: [],
+    uninstalled: [],
+    all: [],
+    error: ''
 })
 
 const localListFn = () => {
-  loading.value = true
-  getAddonLocal({})
-    .then((res) => {
-      const data = res.data.list
-      localList.value.error = res.data.error
-      localList.value.installed = []
-      localList.value.uninstalled = []
-      localList.value.all = []
-      for (const i in data) {
-        if (data[i].is_local == false) localList.value.all.push(data[i])
-
-        if (data[i].install_info && Object.keys(data[i].install_info)?.length) {
-          localList.value.installed.push(data[i])
-        } else {
-          if (data[i].is_download == true)
-            localList.value.uninstalled.push(data[i])
-        }
-      }
-      query()
-      userStore.routers.forEach((item, index) => {
-        if (item.children && item.children.length) {
-          item.name = findFirstValidRoute(item.children)
-          appLink.value[item.meta.app] = findFirstValidRoute(item.children)
-        } else {
-          appLink.value[item.meta.app] = item.name
+    loading.value = true
+    getAddonLocal({}).then(res => {
+        const data = res.data.list
+        localList.value.error = res.data.error
+        localList.value.installed = []
+        localList.value.uninstalled = []
+        localList.value.all = []
+        for (const i in data) {
+            if (data[i].is_local == false) localList.value.all.push(data[i])
+
+            if (data[i].install_info && Object.keys(data[i].install_info)?.length) {
+                localList.value.installed.push(data[i])
+            } else {
+                if (data[i].is_download == true) localList.value.uninstalled.push(data[i])
+            }
         }
-      })
-      loading.value = false
-    })
-    .catch(() => {
-      loading.value = false
+        query()
+        userStore.routers.forEach((item, index) => {
+            if (item.children && item.children.length) {
+                item.name = findFirstValidRoute(item.children)
+                appLink.value[item.meta.app] = findFirstValidRoute(item.children)
+            } else {
+                appLink.value[item.meta.app] = item.name
+            }
+        })
+        loading.value = false
+    }).catch(() => {
+        loading.value = false
     })
 }
 
@@ -921,22 +508,22 @@ localListFn()
 
 // 点击应用提示到站点
 const handleTips = () => {
-  ElMessage('请在站点中运行程序!')
+    ElMessage('请在站点中运行程序!')
 }
 
 // 点击应用可以进系统
 
 const appLink: any = ref({})
 const itemPath = (data: any) => {
-  if (data.type == 'app' && Object.keys(data.install_info).length) {
-    storage.set({ key: 'menuAppStorage', data: data.key })
-    storage.set({ key: 'plugMenuTypeStorage', data: '' })
-    const appMenuList = userStore.appMenuList
-    appMenuList.push(data.key)
-    userStore.setAppMenuList(appMenuList)
-    const name: any = appLink.value[data.key]
-    router.push({ name })
-  }
+    if (data.type == 'app' && Object.keys(data.install_info).length) {
+        storage.set({ key: 'menuAppStorage', data: data.key })
+        storage.set({ key: 'plugMenuTypeStorage', data: '' })
+        const appMenuList = userStore.appMenuList
+        appMenuList.push(data.key)
+        userStore.setAppMenuList(appMenuList)
+        const name: any = appLink.value[data.key]
+        router.push({ name })
+    }
 }
 
 const currAddon = ref('')
@@ -952,26 +539,26 @@ const installCheckResult = ref({})
 
 let flashInterval = null
 const terminalFlash = new TerminalFlash()
-const onExecCmd = (key, command, success, failed, name) => {
-  if (command == '开始安装插件') {
-    success(terminalFlash)
-    const frames = makeIterator(['/', '——', '\\', '|'])
-    flashInterval = setInterval(() => {
-      terminalFlash.flush('> ' + frames.next().value)
-    }, 150)
-  }
+const onExecCmd = (key, command, success, failed, name)=> {
+    if (command == '开始安装插件') {
+        success(terminalFlash)
+        const frames = makeIterator(['/', '——', '\\', '|'])
+        flashInterval = setInterval(() => {
+            terminalFlash.flush('> ' + frames.next().value)
+        }, 150)
+    }
 }
 
 function makeIterator(array: string[]) {
-  let nextIndex = 0
-  return {
-    next() {
-      if (nextIndex + 1 == array.length) {
-        nextIndex = 0
-      }
-      return { value: array[nextIndex++] }
-    },
-  }
+    let nextIndex = 0
+    return {
+        next() {
+            if ((nextIndex + 1) == array.length) {
+                nextIndex = 0
+            }
+            return { value: array[nextIndex++] }
+        }
+    }
 }
 
 /**
@@ -979,17 +566,15 @@ function makeIterator(array: string[]) {
  * @param key
  */
 const installAddonFn = (key: string) => {
-  currAddon.value = key
-
-  preInstallCheck(key)
-    .then((res) => {
-      installStep.value = 1
-      installShowDialog.value = true
-      installAfterTips.value = []
-      installCheckResult.value = res.data
-      userStore.clearRouters()
-    })
-    .catch(() => {})
+    currAddon.value = key
+
+    preInstallCheck(key).then(res => {
+        installStep.value = 1
+        installShowDialog.value = true
+        installAfterTips.value = []
+        installCheckResult.value = res.data
+        userStore.clearRouters()
+    }).catch(() => { })
 }
 
 /**
@@ -997,61 +582,52 @@ const installAddonFn = (key: string) => {
  */
 let notificationEl = null
 const getInstallTask = (first: boolean = true) => {
-  getAddonInstalltask()
-    .then((res) => {
-      if (res.data) {
-        if (first) {
-          installLog = []
-          currAddon.value = res.data.addon
-          if (!installShowDialog.value) {
-            notificationEl = ElNotification.success({
-              title: t('warning'),
-              dangerouslyUseHTMLString: true,
-              message: h('div', {}, [
-                t('installingTips'),
-                h(
-                  'span',
-                  {
-                    class: 'text-primary cursor-pointer',
-                    onClick: checkInstallTask,
-                  },
-                  [t('installPercent')]
-                ),
-              ]),
-              duration: 0,
-              showClose: false,
-            })
-          }
-        }
-        if (res.data.error) {
-          ElMessage({ message: '插件安装失败', type: 'error', duration: 5000 })
-          return
-        }
-        if (res.data.mode == 'cloud') {
-          getCloudInstallLog()
-        }
-        setTimeout(() => {
-          getInstallTask(false)
-        }, 2000)
-      } else {
-        if (!first) {
-          installStep.value = 3
-          localListFn()
-          userStore.clearRouters()
-          notificationEl.close()
+    getAddonInstalltask().then(res => {
+        if (res.data) {
+            if (first) {
+                installLog = []
+                currAddon.value = res.data.addon
+                if (!installShowDialog.value) {
+                    notificationEl = ElNotification.success({
+                        title: t('warning'),
+                        dangerouslyUseHTMLString: true,
+                        message: h('div', {}, [
+                            t('installingTips'),
+                            h('span', { class: 'text-primary cursor-pointer', onClick: checkInstallTask }, [t('installPercent')])
+                        ]),
+                        duration: 0,
+                        showClose: false
+                    })
+                }
+            }
+            if (res.data.error) {
+                ElMessage({ message: '插件安装失败', type: 'error', duration: 5000 })
+                return
+            }
+            if (res.data.mode == 'cloud') {
+                getCloudInstallLog()
+            }
+            setTimeout(() => {
+                getInstallTask(false)
+            }, 2000)
+        } else {
+            if (!first) {
+                installStep.value = 3
+                localListFn()
+                userStore.clearRouters()
+                notificationEl.close()
+            }
         }
-      }
-    })
-    .catch((e) => {
-      terminalRef.value.pushMessage({ content: e.message, class: 'error' })
+    }).catch((e) => {
+        terminalRef.value.pushMessage({ content: e.message, class: 'error' })
     })
 }
 
 getInstallTask()
 
 const checkInstallTask = () => {
-  installShowDialog.value = true
-  installStep.value = 2
+    installShowDialog.value = true
+    installStep.value = 2
 }
 
 const localInstalling = ref(false)
@@ -1059,18 +635,16 @@ const localInstalling = ref(false)
  * 安装插件
  */
 const handleInstall = () => {
-  if (!installCheckResult.value.is_pass || localInstalling.value) return
-  localInstalling.value = true
-
-  installAddon({ addon: currAddon.value })
-    .then((res) => {
-      installStep.value = 3
-      localListFn()
-      localInstalling.value = false
-      if (res.data.length) installAfterTips.value = res.data
-    })
-    .catch((res) => {
-      localInstalling.value = false
+    if (!installCheckResult.value.is_pass || localInstalling.value) return
+    localInstalling.value = true
+
+    installAddon({ addon: currAddon.value }).then(res => {
+        installStep.value = 3
+        localListFn()
+        localInstalling.value = false
+        if (res.data.length) installAfterTips.value = res.data
+    }).catch((res) => {
+        localInstalling.value = false
     })
 }
 
@@ -1080,73 +654,68 @@ const cloudInstalling = ref(false)
  * 云安装插件
  */
 const handleCloudInstall = () => {
-  if (!authCode.value) {
-    authElMessageBox()
-    return
-  }
-
-  if (!installCheckResult.value.is_pass || cloudInstalling.value) return
-  cloudInstalling.value = true
-
-  cloudInstallAddon({ addon: currAddon.value })
-    .then((res) => {
-      installStep.value = 2
-      terminalRef.value.execute('clear')
-      terminalRef.value.execute('开始安装插件')
-      getInstallTask()
-      cloudInstalling.value = false
-    })
-    .catch((res) => {
-      cloudInstalling.value = false
+    if (!authCode.value) {
+        authElMessageBox()
+        return
+    }
+
+    if (!installCheckResult.value.is_pass || cloudInstalling.value) return
+    cloudInstalling.value = true
+
+    cloudInstallAddon({ addon: currAddon.value }).then(res => {
+        installStep.value = 2
+        terminalRef.value.execute('clear')
+        terminalRef.value.execute('开始安装插件')
+        getInstallTask()
+        cloudInstalling.value = false
+    }).catch((res) => {
+        cloudInstalling.value = false
     })
 }
 
 const authElMessageBox = () => {
-  ElMessageBox.confirm(t('authTips'), t('warning'), {
-    distinguishCancelAndClose: true,
-    confirmButtonText: t('toBind'),
-    cancelButtonText: t('toNiucloud'),
-  })
-    .then(() => {
-      authCodeApproveFn()
-    })
-    .catch((action: string) => {
-      if (action === 'cancel') {
-        window.open('https://www.niucloud.com/app')
-      }
+    ElMessageBox.confirm(
+        t('authTips'),
+        t('warning'),
+        {
+            distinguishCancelAndClose: true,
+            confirmButtonText: t('toBind'),
+            cancelButtonText: t('toNiucloud')
+        }
+    ).then(() => {
+        authCodeApproveFn()
+    }).catch((action: string) => {
+        if (action === 'cancel') {
+            window.open('https://www.niucloud.com/app')
+        }
     })
 }
 
 let installLog: string[] = []
 const getCloudInstallLog = () => {
-  getAddonCloudInstallLog(currAddon.value)
-    .then((res) => {
-      const data = res.data.data ?? []
-      if (data[0] && data[0].length && installShowDialog.value == true) {
-        data[0].forEach((item) => {
-          if (!installLog.includes(item.action)) {
-            terminalRef.value.pushMessage({
-              content: `正在执行：${item.action}`,
-            })
-            installLog.push(item.action)
-
-            if (item.code == 0) {
-              terminalRef.value.pushMessage({
-                content: item.msg,
-                class: 'error',
-              })
+    getAddonCloudInstallLog(currAddon.value)
+        .then(res => {
+            const data = res.data.data ?? []
+            if (data[0] && data[0].length && installShowDialog.value == true) {
+                data[0].forEach(item => {
+                    if (!installLog.includes(item.action)) {
+                        terminalRef.value.pushMessage({ content: `正在执行：${item.action}` })
+                        installLog.push(item.action)
+
+                        if (item.code == 0) {
+                            terminalRef.value.pushMessage({ content: item.msg, class: 'error' })
+                        }
+                    }
+                })
             }
-          }
         })
-      }
-    })
-    .catch(() => {
-      notificationEl?.close()
-    })
+        .catch(() => {
+            notificationEl?.close()
+        })
 }
 
 watch(currAddon, (nval) => {
-  installCheckResult.value = {}
+    installCheckResult.value = {}
 })
 
 // 卸载面板弹窗
@@ -1160,15 +729,17 @@ const uninstallCheckResult = ref({})
  * @param key
  */
 const uninstallAddonFn = (key: string) => {
-  ElMessageBox.confirm(t('uninstallTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  })
-    .then(() => {
-      handleUninstallAddon(key)
-    })
-    .catch(() => {})
+    ElMessageBox.confirm(
+        t('uninstallTips'),
+        t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        handleUninstallAddon(key)
+    }).catch(() => { })
 }
 
 /**
@@ -1176,51 +747,51 @@ const uninstallAddonFn = (key: string) => {
  * @param key
  */
 const upgradeAddonFn = (key: string) => {
-  upgradeRef.value?.open(key)
+    upgradeRef.value?.open(key)
 }
 
 /**
  * 云编译
  */
 const handleCloudBuild = () => {
-  if (!authCode.value) {
-    authElMessageBox()
-    return
-  }
-  if (cloudBuildRef.value.cloudBuildTask) {
-    cloudBuildRef.value?.open()
-    return
-  }
-  ElMessageBox.confirm(t('cloudBuildTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    cloudBuildRef.value?.open()
-  })
+    if (!authCode.value) {
+        authElMessageBox()
+        return
+    }
+    if (cloudBuildRef.value.cloudBuildTask) {
+        cloudBuildRef.value?.open()
+        return
+    }
+    ElMessageBox.confirm(t('cloudBuildTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        cloudBuildRef.value?.open()
+    })
 }
 
 const handleUninstallAddon = (key: string) => {
-  preUninstallCheck(key).then(({ data }) => {
-    if (data.is_pass) {
-      uninstallAddon({ addon: key })
-        .then((res) => {
-          localListFn()
-          userStore.clearRouters()
-          loading.value = false
-        })
-        .catch(() => {
-          loading.value = false
-        })
-    } else {
-      uninstallCheckResult.value = data
-      uninstallShowDialog.value = true
-    }
-  })
+    preUninstallCheck(key).then(({ data }) => {
+        if (data.is_pass) {
+            uninstallAddon({ addon: key }).then(res => {
+                localListFn()
+                userStore.clearRouters()
+                loading.value = false
+            }).catch(() => {
+                loading.value = false
+            })
+        } else {
+            uninstallCheckResult.value = data
+            uninstallShowDialog.value = true
+        }
+    })
 }
 
 const market = () => {
-  window.open(installPhpConfig.value.website_url)
+    window.open(installPhpConfig.value.website_url)
 }
 
 /**
@@ -1228,31 +799,33 @@ const market = () => {
  * @param done
  */
 const installShowDialogClose = (done: () => {}) => {
-  if (installStep.value == 2) {
-    ElMessageBox.confirm(t('installShowDialogCloseTips'), t('warning'), {
-      confirmButtonText: t('confirm'),
-      cancelButtonText: t('cancel'),
-      type: 'warning',
-    })
-      .then(() => {
-        cancelInstall(currAddon.value)
-        done()
-      })
-      .catch(() => {})
-  } else if (installStep.value == 3) {
-    activeNameTabFn('installed')
-    location.reload()
-  } else done()
-
-  flashInterval && clearInterval(flashInterval)
+    if (installStep.value == 2) {
+        ElMessageBox.confirm(
+            t('installShowDialogCloseTips'),
+            t('warning'),
+            {
+                confirmButtonText: t('confirm'),
+                cancelButtonText: t('cancel'),
+                type: 'warning'
+            }
+        ).then(() => {
+            cancelInstall(currAddon.value)
+            done()
+        }).catch(() => { })
+    } else if (installStep.value == 3) {
+        activeNameTabFn('installed')
+        location.reload()
+    } else done()
+
+    flashInterval && clearInterval(flashInterval)
 }
 
 // 插件详情
 const appStoreShowDialog = ref(false)
 const appStoreInfo = ref<AnyObject>({})
 const getAddonDetialFn = (data: AnyObject) => {
-  appStoreShowDialog.value = true
-  appStoreInfo.value = data
+    appStoreShowDialog.value = true
+    appStoreInfo.value = data
 }
 
 // 授权
@@ -1262,165 +835,167 @@ const getAuthCodeDialog = ref(null)
 const saveLoading = ref(false)
 const authLoading = ref(true)
 const checkAppMange = () => {
-  authLoading.value = true
-  getAuthInfo()
-    .then((res) => {
-      authLoading.value = false
-      if (res.data.data && res.data.data.length != 0) {
-        authinfo.value = res.data.data
-      }
-    })
-    .catch(() => {
-      authLoading.value = false
-      authCodeApproveDialog.value = false
-    })
+    authLoading.value = true
+    getAuthInfo()
+        .then((res) => {
+            authLoading.value = false
+            if (res.data.data && res.data.data.length != 0) {
+                authinfo.value = res.data.data
+            }
+        })
+        .catch(() => {
+            authLoading.value = false
+            authCodeApproveDialog.value = false
+        })
 }
 checkAppMange()
 const authCodeApproveFn = () => {
-  authCodeApproveDialog.value = true
+    authCodeApproveDialog.value = true
 }
 
 const formData = reactive<Record<string, string>>({
-  auth_code: '',
-  auth_secret: '',
+    auth_code: '',
+    auth_secret: ''
 })
 const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = reactive<FormRules>({
-  auth_code: [
-    { required: true, message: t('authCodePlaceholder'), trigger: 'blur' },
-  ],
-  auth_secret: [
-    { required: true, message: t('authSecretPlaceholder'), trigger: 'blur' },
-  ],
+    auth_code: [
+        { required: true, message: t('authCodePlaceholder'), trigger: 'blur' }
+    ],
+    auth_secret: [
+        { required: true, message: t('authSecretPlaceholder'), trigger: 'blur' }
+    ]
 })
 
 const save = async (formEl: FormInstance | undefined) => {
-  if (saveLoading.value || !formEl) return
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      saveLoading.value = true
-
-      setAuthInfo(formData)
-        .then(() => {
-          saveLoading.value = false
-          setTimeout(() => {
-            location.reload()
-          }, 1000)
-        })
-        .catch(() => {
-          saveLoading.value = false
-        })
-    }
-  })
+    if (saveLoading.value || !formEl) return
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            saveLoading.value = true
+
+            setAuthInfo(formData)
+                .then(() => {
+                    saveLoading.value = false
+                    setTimeout(() => {
+                        location.reload()
+                    }, 1000)
+                })
+                .catch(() => {
+                    saveLoading.value = false
+                })
+        }
+    })
 }
 
 const goRouter = () => {
-  window.open('https://www.niucloud.com/app')
+    window.open('https://www.niucloud.com/app')
 }
 
 const deleteAddonFn = (key: string) => {
-  ElMessageBox.confirm(t('deleteAddonTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  })
-    .then(() => {
-      deleteAddonDevelop(key).then(() => {
-        localListFn()
-      })
-    })
-    .catch(() => {})
+    ElMessageBox.confirm(
+        t('deleteAddonTips'),
+        t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        deleteAddonDevelop(key).then(() => {
+            localListFn()
+        })
+    }).catch(() => { })
 }
 </script>
 
 <style lang="scss" scoped>
 /* 多行超出隐藏 */
 .multi-hidden {
-  word-break: break-all;
-  text-overflow: ellipsis;
-  overflow: hidden;
-  display: -webkit-box;
-  -webkit-line-clamp: 2;
-  -webkit-box-orient: vertical;
+    word-break: break-all;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
 }
 
-.demo-tabs > .el-tabs__content {
-  padding: 32px;
-  color: #6b778c;
-  font-size: 32px;
-  font-weight: 600;
+.demo-tabs>.el-tabs__content {
+    padding: 32px;
+    color: #6b778c;
+    font-size: 32px;
+    font-weight: 600;
 }
 
 .plug-item {
-  .plug-item-operate {
-    color: var(--el-color-primary);
-    border-color: var(--el-color-primary);
-    font-size: var(--el-font-size-extra-small);
-  }
+    .plug-item-operate {
+        color: var(--el-color-primary);
+        border-color: var(--el-color-primary);
+        font-size: var(--el-font-size-extra-small);
+    }
 }
 
 :deep(.t-container) {
-  box-shadow: none !important;
+    box-shadow: none !important;
 
-  .t-window {
-    padding: 10px 20px !important;
-  }
+    .t-window {
+        padding: 10px 20px !important;
+    }
 }
 
 .switch-btn.active {
-  border-color: var(--el-color-primary);
-  color: #fff;
-  background-color: var(--el-color-primary);
+    border-color: var(--el-color-primary);
+    color: #fff;
+    background-color: var(--el-color-primary);
 }
 
 .plug-large {
-  .plug-item-operate {
-    color: var(--el-color-primary);
-    border-color: var(--el-color-primary);
-    font-size: var(--el-font-size-extra-small);
-  }
+    .plug-item-operate {
+        color: var(--el-color-primary);
+        border-color: var(--el-color-primary);
+        font-size: var(--el-font-size-extra-small);
+    }
 }
 
 .app-text {
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  -o-text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    -o-text-overflow: ellipsis;
 }
 
 // 插件安装-弹窗-表格样式
 .table-head-bg {
-  background: #f5f7f9;
+    background: #f5f7f9;
 }
 
 html.dark .table-head-bg {
-  background: #141414;
+    background: #141414;
 }
 
 .el-alert .el-alert__title {
-  font-size: 16px;
-  line-height: 18px;
+    font-size: 16px;
+    line-height: 18px;
 }
 
 .app-store {
-  height: calc(100vh - 120px);
-  box-sizing: border-box;
+    height: calc(100vh - 120px);
+    box-sizing: border-box;
 }
 :deep(.terminal .t-log-box span) {
-  white-space: pre-wrap;
+    white-space: pre-wrap;
 }
 :deep(.data-loading) {
-  .el-table__body-wrapper {
-    display: none !important;
-  }
+    .el-table__body-wrapper {
+        display: none!important;
+    }
 }
 </style>
 
 <style>
 .el-empty .el-empty__image {
-  width: auto;
+    width: auto;
 }
 </style>
diff --git a/admin/src/app/views/instructional_material/components/Jump-lesson-library-edit.vue b/admin/src/app/views/instructional_material/components/Jump-lesson-library-edit.vue
new file mode 100644
index 00000000..23fcbcd6
--- /dev/null
+++ b/admin/src/app/views/instructional_material/components/Jump-lesson-library-edit.vue
@@ -0,0 +1,228 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('updateJumpLessonLibrary') : t('addJumpLessonLibrary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+import { addFitnessLibrary, editFitnessLibrary } from '@/app/api/instructional_material'
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: ''
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+// ,
+//     user_permission: [
+//         { required: true, message: t('userPermissionPlaceholder'), trigger: 'blur' },
+//
+//     ]
+
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editFitnessLibrary : addFitnessLibrary
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/instructional_material/components/basketball-course-teaching-edit.vue b/admin/src/app/views/instructional_material/components/basketball-course-teaching-edit.vue
new file mode 100644
index 00000000..52e52da6
--- /dev/null
+++ b/admin/src/app/views/instructional_material/components/basketball-course-teaching-edit.vue
@@ -0,0 +1,223 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('editBasketballTeachingLibrary') : t('addBasketballTeachingLibrary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addBasketballTeachingLibrary, editBasketballTeachingLibrary, getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+import { addRelaxationLibrary, editRelaxationLibrary } from '@/app/api/instructional_material'
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: ''
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editRelaxationLibrary : addRelaxationLibrary
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/instructional_material/components/en-course-teaching-edit.vue b/admin/src/app/views/instructional_material/components/en-course-teaching-edit.vue
new file mode 100644
index 00000000..8200d7c2
--- /dev/null
+++ b/admin/src/app/views/instructional_material/components/en-course-teaching-edit.vue
@@ -0,0 +1,222 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('editEnTeachingLibrary') : t('addEnTeachingLibrary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+import { addGamesLibrary, editGamesLibrary } from '@/app/api/instructional_material'
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: ''
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editGamesLibrary : addGamesLibrary
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/instructional_material/components/lesson-course-teaching-edit.vue b/admin/src/app/views/instructional_material/components/lesson-course-teaching-edit.vue
new file mode 100644
index 00000000..9c90df46
--- /dev/null
+++ b/admin/src/app/views/instructional_material/components/lesson-course-teaching-edit.vue
@@ -0,0 +1,224 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('updateActionLibrary') : t('addActionLibrary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+import { addActionLibrary, editActionLibrary } from '@/app/api/instructional_material'
+
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: ''
+    // user_permission: [],
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editActionLibrary : addActionLibrary
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/instructional_material/components/ninja-teaching-edit.vue b/admin/src/app/views/instructional_material/components/ninja-teaching-edit.vue
new file mode 100644
index 00000000..b9dbc94d
--- /dev/null
+++ b/admin/src/app/views/instructional_material/components/ninja-teaching-edit.vue
@@ -0,0 +1,223 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('editNinjaTeachingLibrary') : t('addNinjaTeachingLibrary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addNinjaTeachingLibrary, editNinjaTeachingLibrary, getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: ''
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editNinjaTeachingLibrary : addNinjaTeachingLibrary
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/instructional_material/components/physical-teaching-edit.vue b/admin/src/app/views/instructional_material/components/physical-teaching-edit.vue
new file mode 100644
index 00000000..2c53ea49
--- /dev/null
+++ b/admin/src/app/views/instructional_material/components/physical-teaching-edit.vue
@@ -0,0 +1,223 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('editPhysicalTeachingLibrary') : t('addPhysicalTeachingLibrary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addPhysicalTeachingLibrary, editPhysicalTeachingLibrary, getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: ''
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editPhysicalTeachingLibrary : addPhysicalTeachingLibrary
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/instructional_material/components/security-teaching-edit.vue b/admin/src/app/views/instructional_material/components/security-teaching-edit.vue
new file mode 100644
index 00000000..c7a768b5
--- /dev/null
+++ b/admin/src/app/views/instructional_material/components/security-teaching-edit.vue
@@ -0,0 +1,223 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('editSecurityTeachingLibrary') : t('addSecurityTeachingLibrary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addSecurityTeachingLibrary, editSecurityTeachingLibrary, getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: ''
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editSecurityTeachingLibrary : addSecurityTeachingLibrary
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/instructional_material/components/strengthen-course-teaching-edit.vue b/admin/src/app/views/instructional_material/components/strengthen-course-teaching-edit.vue
new file mode 100644
index 00000000..e67bb334
--- /dev/null
+++ b/admin/src/app/views/instructional_material/components/strengthen-course-teaching-edit.vue
@@ -0,0 +1,222 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('editStrengthenTeachingLibrary') : t('addStrengthenTeachingLibrary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addStrengTeachingLibrary, editStrengTeachingLibrary, getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: ''
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editStrengTeachingLibrary : addStrengTeachingLibrary
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/instructional_material/instructional_material.vue b/admin/src/app/views/instructional_material/instructional_material.vue
new file mode 100644
index 00000000..6d591eae
--- /dev/null
+++ b/admin/src/app/views/instructional_material/instructional_material.vue
@@ -0,0 +1,713 @@
+<template>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+          <el-tabs v-model="active">
+            <el-tab-pane label="热身动作库" name="ActionLibrary">
+              <div class="flex justify-between items-center">
+                <el-button type="primary" @click="addActionLibrary">
+                  {{ t('addActionLibrary') }}
+                </el-button>
+              </div>
+              <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="ActionLibraryTable.searchParam" ref="searchFormRef">
+                  <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="ActionLibraryTable.searchParam.title" :placeholder="t('titlePlaceholder')" />
+                  </el-form-item>
+
+                  <el-form-item :label="t('status')" prop="status">
+                    <el-select class="w-[280px]" v-model="ActionLibraryTable.searchParam.status" clearable :placeholder="t('statusPlaceholder')">
+                      <el-option label="全部" value=""></el-option>
+                      <el-option
+                          v-for="(item, index) in statusList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.value"
+                      />
+                    </el-select>
+                  </el-form-item>
+
+                  <el-form-item :label="t('createTime')" prop="create_time">
+                    <el-date-picker v-model="ActionLibraryTable.searchParam.create_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                    :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+                  </el-form-item>
+
+                  <el-form-item :label="t('updateTime')" prop="update_time">
+                    <el-date-picker v-model="ActionLibraryTable.searchParam.update_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                    :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+                  </el-form-item>
+
+                  <el-form-item>
+                    <el-button type="primary" @click="loadActionLibraryList()">{{ t('search') }}</el-button>
+                    <el-button @click="resetForm(searchFormRef, 9)">{{ t('reset') }}</el-button>
+                  </el-form-item>
+                </el-form>
+              </el-card>
+
+              <div class="mt-[10px]">
+                <el-table :data="ActionLibraryTable.data" size="large" v-loading="ActionLibraryTable.loading">
+                  <template #empty>
+                    <span>{{ !ActionLibraryTable.loading ? t('emptyData') : '' }}</span>
+                  </template>
+                  <el-table-column prop="title" :label="t('title')" min-width="120" :show-overflow-tooltip="true"/>
+
+                  <el-table-column :label="t('image')" width="100" align="left">
+                    <template #default="{ row }">
+                      <el-avatar v-if="row.image" :src="img(row.image)" />
+                      <el-avatar v-else icon="UserFilled" />
+                    </template>
+                  </el-table-column>
+                  <el-table-column :label="t('type')" min-width="180" align="center" :show-overflow-tooltip="true">
+                    <template #default="{ row }">
+                      <div v-for="(item, index) in typeList">
+                        <div v-if="item.value == row.type">{{ item.name }}</div>
+                      </div>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column :label="t('status')" min-width="180" align="center" :show-overflow-tooltip="true">
+                    <template #default="{ row }">
+                      <div v-for="(item, index) in statusList">
+                        <div v-if="item.value == row.status">{{ item.name }}</div>
+                      </div>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column :label="t('operation')" fixed="right" min-width="120">
+                    <template #default="{ row }">
+                      <el-button type="primary" link @click="updateActionLibrary(row)">{{ t('edit') }}</el-button>
+                      <el-button type="primary" link @click="deleteEvent(row.id, 9)">{{ t('delete') }}</el-button>
+                    </template>
+                  </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                  <el-pagination v-model:current-page="ActionLibraryTable.page" v-model:page-size="ActionLibraryTable.limit"
+                                 layout="total, sizes, prev, pager, next, jumper" :total="ActionLibraryTable.total"
+                                 @size-change="loadActionLibraryList()" @current-change="loadActionLibraryList" />
+                </div>
+              </div>
+              <edit ref="editActionLibraryDialog" @complete="loadActionLibraryList" />
+            </el-tab-pane>
+            <el-tab-pane label="体能动作库" name="PhysicalActionLibrary">
+              <div class="flex justify-between items-center">
+                <el-button type="primary" @click="addJumpLessonLibrary">
+                  {{ t('addJumpLessonLibrary') }}
+                </el-button>
+              </div>
+              <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="JumpLessonLibraryTable.searchParam" ref="searchFormRef">
+                  <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="JumpLessonLibraryTable.searchParam.title" :placeholder="t('titlePlaceholder')" />
+                  </el-form-item>
+
+                  <el-form-item :label="t('status')" prop="status">
+                    <el-select class="w-[280px]" v-model="JumpLessonLibraryTable.searchParam.status" clearable :placeholder="t('statusPlaceholder')">
+                      <el-option label="全部" value=""></el-option>
+                      <el-option
+                          v-for="(item, index) in statusList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.value"
+                      />
+                    </el-select>
+                  </el-form-item>
+
+                  <el-form-item :label="t('createTime')" prop="create_time">
+                    <el-date-picker v-model="JumpLessonLibraryTable.searchParam.create_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                    :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+                  </el-form-item>
+
+                  <el-form-item :label="t('updateTime')" prop="update_time">
+                    <el-date-picker v-model="JumpLessonLibraryTable.searchParam.update_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                    :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+                  </el-form-item>
+
+                  <el-form-item>
+                    <el-button type="primary" @click="loadJumpLessonLibraryList()">{{ t('search') }}</el-button>
+                    <el-button @click="resetForm(searchFormRef, 10)">{{ t('reset') }}</el-button>
+                  </el-form-item>
+                </el-form>
+              </el-card>
+
+              <div class="mt-[10px]">
+                <el-table :data="JumpLessonLibraryTable.data" size="large" v-loading="JumpLessonLibraryTable.loading">
+                  <template #empty>
+                    <span>{{ !JumpLessonLibraryTable.loading ? t('emptyData') : '' }}</span>
+                  </template>
+                  <el-table-column prop="title" :label="t('title')" min-width="120" :show-overflow-tooltip="true"/>
+
+                  <el-table-column :label="t('image')" width="100" align="left">
+                    <template #default="{ row }">
+                      <el-avatar v-if="row.image" :src="img(row.image)" />
+                      <el-avatar v-else icon="UserFilled" />
+                    </template>
+                  </el-table-column>
+                  <el-table-column :label="t('type')" min-width="180" align="center" :show-overflow-tooltip="true">
+                    <template #default="{ row }">
+                      <div v-for="(item, index) in typeList">
+                        <div v-if="item.value == row.type">{{ item.name }}</div>
+                      </div>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column :label="t('status')" min-width="180" align="center" :show-overflow-tooltip="true">
+                    <template #default="{ row }">
+                      <div v-for="(item, index) in statusList">
+                        <div v-if="item.value == row.status">{{ item.name }}</div>
+                      </div>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column :label="t('operation')" fixed="right" min-width="120">
+                    <template #default="{ row }">
+                      <el-button type="primary" link @click="editJumpLessonLibrary(row)">{{ t('edit') }}</el-button>
+                      <el-button type="primary" link @click="deleteEvent(row.id, 10)">{{ t('delete') }}</el-button>
+                    </template>
+                  </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                  <el-pagination v-model:current-page="JumpLessonLibraryTable.page" v-model:page-size="JumpLessonLibraryTable.limit"
+                                 layout="total, sizes, prev, pager, next, jumper" :total="JumpLessonLibraryTable.total"
+                                 @size-change="loadJumpLessonLibraryList()" @current-change="loadJumpLessonLibraryList" />
+                </div>
+              </div>
+
+              <edit-jump ref="editJumpLessonLibraryDialog" @complete="loadJumpLessonLibraryList" />
+            </el-tab-pane>
+            <el-tab-pane label="趣味游戏库" name="FunGameLibraryLibrary">
+              <div class="flex justify-between items-center">
+                <el-button type="primary" @click="addEnTeachingLibrary">
+                  {{ t('addEnTeachingLibrary') }}
+                </el-button>
+              </div>
+              <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="EnTeachingLibraryTable.searchParam" ref="searchFormRef">
+                  <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="EnTeachingLibraryTable.searchParam.title" :placeholder="t('titlePlaceholder')" />
+                  </el-form-item>
+
+                  <el-form-item :label="t('status')" prop="status">
+                    <el-select class="w-[280px]" v-model="EnTeachingLibraryTable.searchParam.status" clearable :placeholder="t('statusPlaceholder')">
+                      <el-option label="全部" value=""></el-option>
+                      <el-option
+                          v-for="(item, index) in statusList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.value"
+                      />
+                    </el-select>
+                  </el-form-item>
+
+                  <el-form-item :label="t('createTime')" prop="create_time">
+                    <el-date-picker v-model="EnTeachingLibraryTable.searchParam.create_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                    :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+                  </el-form-item>
+
+                  <el-form-item :label="t('updateTime')" prop="update_time">
+                    <el-date-picker v-model="EnTeachingLibraryTable.searchParam.update_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                    :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+                  </el-form-item>
+
+                  <el-form-item>
+                    <el-button type="primary" @click="loadEnTeachingLibraryList()">{{ t('search') }}</el-button>
+                    <el-button @click="resetForm(searchFormRef, 11)">{{ t('reset') }}</el-button>
+                  </el-form-item>
+                </el-form>
+              </el-card>
+
+              <div class="mt-[10px]">
+                <el-table :data="EnTeachingLibraryTable.data" size="large" v-loading="EnTeachingLibraryTable.loading">
+                  <template #empty>
+                    <span>{{ !EnTeachingLibraryTable.loading ? t('emptyData') : '' }}</span>
+                  </template>
+                  <el-table-column prop="title" :label="t('title')" min-width="120" :show-overflow-tooltip="true"/>
+
+                  <el-table-column :label="t('image')" width="100" align="left">
+                    <template #default="{ row }">
+                      <el-avatar v-if="row.image" :src="img(row.image)" />
+                      <el-avatar v-else icon="UserFilled" />
+                    </template>
+                  </el-table-column>
+                  <el-table-column :label="t('type')" min-width="180" align="center" :show-overflow-tooltip="true">
+                    <template #default="{ row }">
+                      <div v-for="(item, index) in typeList">
+                        <div v-if="item.value == row.type">{{ item.name }}</div>
+                      </div>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column :label="t('status')" min-width="180" align="center" :show-overflow-tooltip="true">
+                    <template #default="{ row }">
+                      <div v-for="(item, index) in statusList">
+                        <div v-if="item.value == row.status">{{ item.name }}</div>
+                      </div>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column :label="t('operation')" fixed="right" min-width="120">
+                    <template #default="{ row }">
+                      <el-button type="primary" link @click="editEnTeachingLibrary(row)">{{ t('edit') }}</el-button>
+                      <el-button type="primary" link @click="deleteEvent(row.id, 11)">{{ t('delete') }}</el-button>
+                    </template>
+                  </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                  <el-pagination v-model:current-page="EnTeachingLibraryTable.page" v-model:page-size="EnTeachingLibraryTable.limit"
+                                 layout="total, sizes, prev, pager, next, jumper" :total="EnTeachingLibraryTable.total"
+                                 @size-change="loadEnTeachingLibraryList()" @current-change="loadEnTeachingLibraryList" />
+                </div>
+              </div>
+
+              <edit-en ref="editEnTeachingLibraryDialog" @complete="loadEnTeachingLibraryList" />
+            </el-tab-pane>
+            <el-tab-pane label="放松动作库" name="RelaxationActionLibrary">
+              <div class="flex justify-between items-center">
+                <el-button type="primary" @click="addBasketballTeachingLibrary">
+                  {{ t('addBasketballTeachingLibrary') }}
+                </el-button>
+              </div>
+              <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="BasketballTeachingLibraryTable.searchParam" ref="searchFormRef">
+                  <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="BasketballTeachingLibraryTable.searchParam.title" :placeholder="t('titlePlaceholder')" />
+                  </el-form-item>
+
+                  <el-form-item :label="t('status')" prop="status">
+                    <el-select class="w-[280px]" v-model="BasketballTeachingLibraryTable.searchParam.status" clearable :placeholder="t('statusPlaceholder')">
+                      <el-option label="全部" value=""></el-option>
+                      <el-option
+                          v-for="(item, index) in statusList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.value"
+                      />
+                    </el-select>
+                  </el-form-item>
+
+                  <el-form-item :label="t('createTime')" prop="create_time">
+                    <el-date-picker v-model="BasketballTeachingLibraryTable.searchParam.create_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                    :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+                  </el-form-item>
+
+                  <el-form-item :label="t('updateTime')" prop="update_time">
+                    <el-date-picker v-model="BasketballTeachingLibraryTable.searchParam.update_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                    :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+                  </el-form-item>
+
+                  <el-form-item>
+                    <el-button type="primary" @click="loadBasketballTeachingLibraryList()">{{ t('search') }}</el-button>
+                    <el-button @click="resetForm(searchFormRef, 12)">{{ t('reset') }}</el-button>
+                  </el-form-item>
+                </el-form>
+              </el-card>
+
+              <div class="mt-[10px]">
+                <el-table :data="BasketballTeachingLibraryTable.data" size="large" v-loading="BasketballTeachingLibraryTable.loading">
+                  <template #empty>
+                    <span>{{ !BasketballTeachingLibraryTable.loading ? t('emptyData') : '' }}</span>
+                  </template>
+                  <el-table-column prop="title" :label="t('title')" min-width="120" :show-overflow-tooltip="true"/>
+
+                  <el-table-column :label="t('image')" width="100" align="left">
+                    <template #default="{ row }">
+                      <el-avatar v-if="row.image" :src="img(row.image)" />
+                      <el-avatar v-else icon="UserFilled" />
+                    </template>
+                  </el-table-column>
+                  <el-table-column :label="t('type')" min-width="180" align="center" :show-overflow-tooltip="true">
+                    <template #default="{ row }">
+                      <div v-for="(item, index) in typeList">
+                        <div v-if="item.value == row.type">{{ item.name }}</div>
+                      </div>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column :label="t('status')" min-width="180" align="center" :show-overflow-tooltip="true">
+                    <template #default="{ row }">
+                      <div v-for="(item, index) in statusList">
+                        <div v-if="item.value == row.status">{{ item.name }}</div>
+                      </div>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column :label="t('operation')" fixed="right" min-width="120">
+                    <template #default="{ row }">
+                      <el-button type="primary" link @click="editBasketballTeachingLibrary(row)">{{ t('edit') }}</el-button>
+                      <el-button type="primary" link @click="deleteEvent(row.id, 12)">{{ t('delete') }}</el-button>
+                    </template>
+                  </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                  <el-pagination v-model:current-page="BasketballTeachingLibraryTable.page" v-model:page-size="BasketballTeachingLibraryTable.limit"
+                                 layout="total, sizes, prev, pager, next, jumper" :total="BasketballTeachingLibraryTable.total"
+                                 @size-change="loadBasketballTeachingLibraryList()" @current-change="loadBasketballTeachingLibraryList" />
+                </div>
+              </div>
+
+              <edit-basketball ref="editBasketballTeachingLibraryDialog" @complete="loadBasketballTeachingLibraryList" />
+            </el-tab-pane>
+          </el-tabs>
+        </el-card>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { reactive, ref, watch } from 'vue'
+import { t } from '@/lang'
+import { useDictionary } from '@/app/api/dict'
+import { deleteLessonCourseTeaching, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+import { getActionLibraryList, getFitnessLibraryList, getGamesLibraryList, getRelaxationLibraryList } from '@/app/api/instructional_material'
+import { img } from '@/utils/common'
+import { ElMessageBox,FormInstance } from 'element-plus'
+import Edit from '@/app/views/instructional_material/components/lesson-course-teaching-edit.vue'
+import EditJump from '@/app/views/instructional_material/components/Jump-lesson-library-edit.vue'
+import EditEn from '@/app/views/instructional_material/components/en-course-teaching-edit.vue'
+import EditBasketball from '@/app/views/instructional_material/components/basketball-course-teaching-edit.vue'
+import { useRoute } from 'vue-router'
+const route = useRoute()
+const pageName = route.meta.title;
+const active = 'ActionLibrary'
+
+let ActionLibraryTable = reactive({
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam:{
+      "title":"",
+      "status":"",
+      "create_time":[],
+      "update_time":[]
+    }
+})
+let JumpLessonLibraryTable = reactive({
+  page: 1,
+  limit: 10,
+  total: 0,
+  loading: true,
+  data: [],
+  searchParam:{
+    "title":"",
+    "status":"",
+    "create_time":[],
+    "update_time":[]
+  }
+})
+let EnTeachingLibraryTable = reactive({
+  page: 1,
+  limit: 10,
+  total: 0,
+  loading: true,
+  data: [],
+  searchParam:{
+    "title":"",
+    "status":"",
+    "create_time":[],
+    "update_time":[]
+  }
+})
+let BasketballTeachingLibraryTable = reactive({
+  page: 1,
+  limit: 10,
+  total: 0,
+  loading: true,
+  data: [],
+  searchParam:{
+    "title":"",
+    "status":"",
+    "create_time":[],
+    "update_time":[]
+  }
+})
+
+const searchFormRef = ref<FormInstance>()
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 字典数据
+const typeList = ref([] as any[])
+const typeDictList = async () => {
+typeList.value = await (await useDictionary('material_type')).data.dictionary
+}
+typeDictList();
+const statusList = ref([] as any[])
+const statusDictList = async () => {
+statusList.value = await (await useDictionary('course_status')).data.dictionary
+}
+statusDictList();
+
+const editActionLibraryDialog: Record<string, any> | null = ref(null)
+const editJumpLessonLibraryDialog: Record<string, any> | null = ref(null)
+const editEnTeachingLibraryDialog: Record<string, any> | null = ref(null)
+const editBasketballTeachingLibraryDialog: Record<string, any> | null = ref(null)
+const editStrengthenTeachingLibraryDialog: Record<string, any> | null = ref(null)
+
+/**
+ * 获取热身动作库列表
+ */
+const loadActionLibraryList = (page: number = 1) => {
+  ActionLibraryTable.loading = true
+  ActionLibraryTable.page = page
+  getActionLibraryList({
+    page: ActionLibraryTable.page,
+    limit: ActionLibraryTable.limit,
+     ...ActionLibraryTable.searchParam
+  }).then(res => {
+    ActionLibraryTable.loading = false
+    ActionLibraryTable.data = res.data.data
+    ActionLibraryTable.total = res.data.total
+  }).catch(() => {
+    ActionLibraryTable.loading = false
+  })
+}
+loadActionLibraryList()
+
+/**
+ * 添加热身动作库
+ */
+const addActionLibrary = () => {
+    editActionLibraryDialog.value.setFormData()
+    editActionLibraryDialog.value.showDialog = true
+}
+
+/**
+ * 编辑热身动作库
+ * @param data
+ */
+const editActionLibrary = (data: any) => {
+    editActionLibraryDialog.value.setFormData(data)
+    editActionLibraryDialog.value.showDialog = true
+}
+
+
+/**
+ * 获取体能动作库列表
+ */
+const loadJumpLessonLibraryList = (page: number = 1) => {
+  JumpLessonLibraryTable.loading = true
+  JumpLessonLibraryTable.page = page
+
+  getFitnessLibraryList({
+    page: JumpLessonLibraryTable.page,
+    limit: JumpLessonLibraryTable.limit,
+    ...JumpLessonLibraryTable.searchParam
+  }).then(res => {
+    JumpLessonLibraryTable.loading = false
+    JumpLessonLibraryTable.data = res.data.data
+    JumpLessonLibraryTable.total = res.data.total
+  }).catch(() => {
+    JumpLessonLibraryTable.loading = false
+  })
+}
+loadJumpLessonLibraryList()
+
+/**
+ * 添加体能动作库
+ */
+const addJumpLessonLibrary = () => {
+  editJumpLessonLibraryDialog.value.setFormData()
+  editJumpLessonLibraryDialog.value.showDialog = true
+}
+
+/**
+ * 编辑体能动作库
+ * @param data
+ */
+const editJumpLessonLibrary = (data: any) => {
+  editJumpLessonLibraryDialog.value.setFormData(data)
+  editJumpLessonLibraryDialog.value.showDialog = true
+}
+
+
+/**
+ * 获取趣味游戏库列表
+ */
+const loadEnTeachingLibraryList = (page: number = 1) => {
+  EnTeachingLibraryTable.loading = true
+  EnTeachingLibraryTable.page = page
+
+  getGamesLibraryList({
+    page: EnTeachingLibraryTable.page,
+    limit: EnTeachingLibraryTable.limit,
+    ...EnTeachingLibraryTable.searchParam
+  }).then(res => {
+    EnTeachingLibraryTable.loading = false
+    EnTeachingLibraryTable.data = res.data.data
+    EnTeachingLibraryTable.total = res.data.total
+  }).catch(() => {
+    EnTeachingLibraryTable.loading = false
+  })
+}
+loadEnTeachingLibraryList()
+
+/**
+ * 添加趣味游戏
+ */
+const addEnTeachingLibrary = () => {
+  editEnTeachingLibraryDialog.value.setFormData()
+  editEnTeachingLibraryDialog.value.showDialog = true
+}
+
+/**
+ * 编辑趣味游戏
+ * @param data
+ */
+const editEnTeachingLibrary = (data: any) => {
+  editEnTeachingLibraryDialog.value.setFormData(data)
+  editEnTeachingLibraryDialog.value.showDialog = true
+}
+
+/**
+ * 获取篮球教案库列表
+ */
+const loadBasketballTeachingLibraryList = (page: number = 1) => {
+  BasketballTeachingLibraryTable.loading = true
+  BasketballTeachingLibraryTable.page = page
+
+  getRelaxationLibraryList({
+    page: BasketballTeachingLibraryTable.page,
+    limit: BasketballTeachingLibraryTable.limit,
+    ...BasketballTeachingLibraryTable.searchParam
+  }).then(res => {
+    BasketballTeachingLibraryTable.loading = false
+    BasketballTeachingLibraryTable.data = res.data.data
+    BasketballTeachingLibraryTable.total = res.data.total
+  }).catch(() => {
+    BasketballTeachingLibraryTable.loading = false
+  })
+}
+loadBasketballTeachingLibraryList()
+
+/**
+ * 添加篮球教案库
+ */
+const addBasketballTeachingLibrary = () => {
+  editBasketballTeachingLibraryDialog.value.setFormData()
+  editBasketballTeachingLibraryDialog.value.showDialog = true
+}
+
+/**
+ * 编辑篮球教案库
+ * @param data
+ */
+const editBasketballTeachingLibrary = (data: any) => {
+  editBasketballTeachingLibraryDialog.value.setFormData(data)
+  editBasketballTeachingLibraryDialog.value.showDialog = true
+}
+
+/**
+ * 删除教研管理
+ */
+const deleteEvent = (id: number, type: number) => {
+    ElMessageBox.confirm(t('lessonCourseTeachingDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning',
+        }
+    ).then(() => {
+        deleteLessonCourseTeaching(id).then(() => {
+          if (type === 9) {
+            loadActionLibraryList()
+          } else if (type === 10) {
+            loadJumpLessonLibraryList()
+          } else if (type === 11) {
+            loadEnTeachingLibraryList()
+          } else if (type === 12) {
+            loadBasketballTeachingLibraryList()
+          }
+        }).catch(() => {
+        })
+    })
+}
+
+
+    const userPermissionList = ref([])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+
+const resetForm = (formEl: FormInstance | undefined, type: number) => {
+    if (!formEl) return
+    formEl.resetFields()
+    if (type === 9) {
+      ActionLibraryTable = reactive({
+        page: 1,
+        limit: 10,
+        total: 0,
+        loading: true,
+        data: [],
+        searchParam: {
+          "title": "",
+          "status": "",
+          "create_time": [],
+          "update_time": []
+        }
+      })
+      loadActionLibraryList()
+    } else if (type === 10) {
+      JumpLessonLibraryTable = reactive({
+        page: 1,
+        limit: 10,
+        total: 0,
+        loading: true,
+        data: [],
+        searchParam: {
+          "title": "",
+          "status": "",
+          "create_time": [],
+          "update_time": []
+        }
+      })
+      loadJumpLessonLibraryList()
+    } else if (type === 11) {
+      EnTeachingLibraryTable = reactive({
+        page: 1,
+        limit: 10,
+        total: 0,
+        loading: true,
+        data: [],
+        searchParam: {
+          "title": "",
+          "status": "",
+          "create_time": [],
+          "update_time": []
+        }
+      })
+      loadEnTeachingLibraryList()
+    } else if (type === 12) {
+      BasketballTeachingLibraryTable = reactive({
+        page: 1,
+        limit: 10,
+        total: 0,
+        loading: true,
+        data: [],
+        searchParam: {
+          "title": "",
+          "status": "",
+          "create_time": [],
+          "update_time": []
+        }
+      })
+      loadBasketballTeachingLibraryList()
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+/* 多行超出隐藏 */
+.multi-hidden {
+		word-break: break-all;
+		text-overflow: ellipsis;
+		overflow: hidden;
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		-webkit-box-orient: vertical;
+	}
+</style>
diff --git a/admin/src/app/views/lesson_course_teaching/components/Jump-lesson-library-edit.vue b/admin/src/app/views/lesson_course_teaching/components/Jump-lesson-library-edit.vue
new file mode 100644
index 00000000..1db4a751
--- /dev/null
+++ b/admin/src/app/views/lesson_course_teaching/components/Jump-lesson-library-edit.vue
@@ -0,0 +1,227 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('updateJumpLessonLibrary') : t('addJumpLessonLibrary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addJumpLessonLibrary, editJumpLessonLibrary, getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: ''
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+// ,
+//     user_permission: [
+//         { required: true, message: t('userPermissionPlaceholder'), trigger: 'blur' },
+//
+//     ]
+
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editJumpLessonLibrary : addJumpLessonLibrary
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/lesson_course_teaching/components/basketball-course-teaching-edit.vue b/admin/src/app/views/lesson_course_teaching/components/basketball-course-teaching-edit.vue
new file mode 100644
index 00000000..4fbdd47f
--- /dev/null
+++ b/admin/src/app/views/lesson_course_teaching/components/basketball-course-teaching-edit.vue
@@ -0,0 +1,223 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('editBasketballTeachingLibrary') : t('addBasketballTeachingLibrary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addBasketballTeachingLibrary, editBasketballTeachingLibrary, getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: ''
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editBasketballTeachingLibrary : addBasketballTeachingLibrary
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/lesson_course_teaching/components/en-course-teaching-edit.vue b/admin/src/app/views/lesson_course_teaching/components/en-course-teaching-edit.vue
new file mode 100644
index 00000000..a225b1e9
--- /dev/null
+++ b/admin/src/app/views/lesson_course_teaching/components/en-course-teaching-edit.vue
@@ -0,0 +1,222 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('editEnTeachingLibrary') : t('addEnTeachingLibrary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addEnTeachingLibrary, editEnTeachingLibrary, getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: ''
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editEnTeachingLibrary : addEnTeachingLibrary
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/lesson_course_teaching/components/lesson-course-teaching-edit.vue b/admin/src/app/views/lesson_course_teaching/components/lesson-course-teaching-edit.vue
new file mode 100644
index 00000000..6f238466
--- /dev/null
+++ b/admin/src/app/views/lesson_course_teaching/components/lesson-course-teaching-edit.vue
@@ -0,0 +1,223 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('updateLessonCourseTeaching') : t('addLessonCourseTeaching')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addLessonCourseTeaching, editLessonCourseTeaching, getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: ''
+    // user_permission: [],
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editLessonCourseTeaching : addLessonCourseTeaching
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/lesson_course_teaching/components/ninja-teaching-edit.vue b/admin/src/app/views/lesson_course_teaching/components/ninja-teaching-edit.vue
new file mode 100644
index 00000000..b9dbc94d
--- /dev/null
+++ b/admin/src/app/views/lesson_course_teaching/components/ninja-teaching-edit.vue
@@ -0,0 +1,223 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('editNinjaTeachingLibrary') : t('addNinjaTeachingLibrary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addNinjaTeachingLibrary, editNinjaTeachingLibrary, getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: ''
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editNinjaTeachingLibrary : addNinjaTeachingLibrary
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/lesson_course_teaching/components/physical-teaching-edit.vue b/admin/src/app/views/lesson_course_teaching/components/physical-teaching-edit.vue
new file mode 100644
index 00000000..2c53ea49
--- /dev/null
+++ b/admin/src/app/views/lesson_course_teaching/components/physical-teaching-edit.vue
@@ -0,0 +1,223 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('editPhysicalTeachingLibrary') : t('addPhysicalTeachingLibrary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addPhysicalTeachingLibrary, editPhysicalTeachingLibrary, getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: ''
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editPhysicalTeachingLibrary : addPhysicalTeachingLibrary
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/lesson_course_teaching/components/security-teaching-edit.vue b/admin/src/app/views/lesson_course_teaching/components/security-teaching-edit.vue
new file mode 100644
index 00000000..c7a768b5
--- /dev/null
+++ b/admin/src/app/views/lesson_course_teaching/components/security-teaching-edit.vue
@@ -0,0 +1,223 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('editSecurityTeachingLibrary') : t('addSecurityTeachingLibrary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addSecurityTeachingLibrary, editSecurityTeachingLibrary, getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: ''
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editSecurityTeachingLibrary : addSecurityTeachingLibrary
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/lesson_course_teaching/components/strengthen-course-teaching-edit.vue b/admin/src/app/views/lesson_course_teaching/components/strengthen-course-teaching-edit.vue
new file mode 100644
index 00000000..e67bb334
--- /dev/null
+++ b/admin/src/app/views/lesson_course_teaching/components/strengthen-course-teaching-edit.vue
@@ -0,0 +1,222 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('editStrengthenTeachingLibrary') : t('addStrengthenTeachingLibrary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addStrengTeachingLibrary, editStrengTeachingLibrary, getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: ''
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editStrengTeachingLibrary : addStrengTeachingLibrary
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/lesson_course_teaching/lesson_course_teaching.vue b/admin/src/app/views/lesson_course_teaching/lesson_course_teaching.vue
new file mode 100644
index 00000000..a4b90f4f
--- /dev/null
+++ b/admin/src/app/views/lesson_course_teaching/lesson_course_teaching.vue
@@ -0,0 +1,1341 @@
+<template>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+          <el-tabs v-model="active">
+            <el-tab-pane label="课程教学大纲" name="CourseSyllabus">
+              <div class="flex justify-between items-center">
+                <el-button type="primary" @click="addEvent">
+                  {{ t('addLessonCourseTeaching') }}
+                </el-button>
+              </div>
+              <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="lessonCourseTeachingTable.searchParam" ref="searchFormRef">
+                  <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="lessonCourseTeachingTable.searchParam.title" :placeholder="t('titlePlaceholder')" />
+                  </el-form-item>
+
+                  <el-form-item :label="t('status')" prop="status">
+                    <el-select class="w-[280px]" v-model="lessonCourseTeachingTable.searchParam.status" clearable :placeholder="t('statusPlaceholder')">
+                      <el-option label="全部" value=""></el-option>
+                      <el-option
+                          v-for="(item, index) in statusList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.value"
+                      />
+                    </el-select>
+                  </el-form-item>
+
+                  <el-form-item :label="t('createTime')" prop="create_time">
+                    <el-date-picker v-model="lessonCourseTeachingTable.searchParam.create_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                    :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+                  </el-form-item>
+
+                  <el-form-item :label="t('updateTime')" prop="update_time">
+                    <el-date-picker v-model="lessonCourseTeachingTable.searchParam.update_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                    :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+                  </el-form-item>
+
+                  <el-form-item>
+                    <el-button type="primary" @click="loadLessonCourseTeachingList()">{{ t('search') }}</el-button>
+                    <el-button @click="resetForm(searchFormRef, 1)">{{ t('reset') }}</el-button>
+                  </el-form-item>
+                </el-form>
+              </el-card>
+
+              <div class="mt-[10px]">
+                <el-table :data="lessonCourseTeachingTable.data" size="large" v-loading="lessonCourseTeachingTable.loading">
+                  <template #empty>
+                    <span>{{ !lessonCourseTeachingTable.loading ? t('emptyData') : '' }}</span>
+                  </template>
+                  <el-table-column prop="title" :label="t('title')" min-width="120" :show-overflow-tooltip="true"/>
+
+                  <el-table-column :label="t('image')" width="100" align="left">
+                    <template #default="{ row }">
+                      <el-avatar v-if="row.image" :src="img(row.image)" />
+                      <el-avatar v-else icon="UserFilled" />
+                    </template>
+                  </el-table-column>
+                  <el-table-column :label="t('type')" min-width="180" align="center" :show-overflow-tooltip="true">
+                    <template #default="{ row }">
+                      <div v-for="(item, index) in typeList">
+                        <div v-if="item.value == row.type">{{ item.name }}</div>
+                      </div>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column :label="t('status')" min-width="180" align="center" :show-overflow-tooltip="true">
+                    <template #default="{ row }">
+                      <div v-for="(item, index) in statusList">
+                        <div v-if="item.value == row.status">{{ item.name }}</div>
+                      </div>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column :label="t('operation')" fixed="right" min-width="120">
+                    <template #default="{ row }">
+                      <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+                      <el-button type="primary" link @click="deleteEvent(row.id, 1)">{{ t('delete') }}</el-button>
+                    </template>
+                  </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                  <el-pagination v-model:current-page="lessonCourseTeachingTable.page" v-model:page-size="lessonCourseTeachingTable.limit"
+                                 layout="total, sizes, prev, pager, next, jumper" :total="lessonCourseTeachingTable.total"
+                                 @size-change="loadLessonCourseTeachingList()" @current-change="loadLessonCourseTeachingList" />
+                </div>
+              </div>
+
+              <edit ref="editLessonCourseTeachingDialog" @complete="loadLessonCourseTeachingList" />
+            </el-tab-pane>
+            <el-tab-pane label="跳绳教案库" name="JumpLessonLibrary">
+              <div class="flex justify-between items-center">
+                <el-button type="primary" @click="addJumpLessonLibrary">
+                  {{ t('addJumpLessonLibrary') }}
+                </el-button>
+              </div>
+              <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="JumpLessonLibraryTable.searchParam" ref="searchFormRef">
+                  <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="JumpLessonLibraryTable.searchParam.title" :placeholder="t('titlePlaceholder')" />
+                  </el-form-item>
+
+                  <el-form-item :label="t('status')" prop="status">
+                    <el-select class="w-[280px]" v-model="JumpLessonLibraryTable.searchParam.status" clearable :placeholder="t('statusPlaceholder')">
+                      <el-option label="全部" value=""></el-option>
+                      <el-option
+                          v-for="(item, index) in statusList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.value"
+                      />
+                    </el-select>
+                  </el-form-item>
+
+                  <el-form-item :label="t('createTime')" prop="create_time">
+                    <el-date-picker v-model="JumpLessonLibraryTable.searchParam.create_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                    :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+                  </el-form-item>
+
+                  <el-form-item :label="t('updateTime')" prop="update_time">
+                    <el-date-picker v-model="JumpLessonLibraryTable.searchParam.update_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                    :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+                  </el-form-item>
+
+                  <el-form-item>
+                    <el-button type="primary" @click="loadJumpLessonLibraryList()">{{ t('search') }}</el-button>
+                    <el-button @click="resetForm(searchFormRef, 2)">{{ t('reset') }}</el-button>
+                  </el-form-item>
+                </el-form>
+              </el-card>
+
+              <div class="mt-[10px]">
+                <el-table :data="JumpLessonLibraryTable.data" size="large" v-loading="JumpLessonLibraryTable.loading">
+                  <template #empty>
+                    <span>{{ !JumpLessonLibraryTable.loading ? t('emptyData') : '' }}</span>
+                  </template>
+                  <el-table-column prop="title" :label="t('title')" min-width="120" :show-overflow-tooltip="true"/>
+
+                  <el-table-column :label="t('image')" width="100" align="left">
+                    <template #default="{ row }">
+                      <el-avatar v-if="row.image" :src="img(row.image)" />
+                      <el-avatar v-else icon="UserFilled" />
+                    </template>
+                  </el-table-column>
+                  <el-table-column :label="t('type')" min-width="180" align="center" :show-overflow-tooltip="true">
+                    <template #default="{ row }">
+                      <div v-for="(item, index) in typeList">
+                        <div v-if="item.value == row.type">{{ item.name }}</div>
+                      </div>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column :label="t('status')" min-width="180" align="center" :show-overflow-tooltip="true">
+                    <template #default="{ row }">
+                      <div v-for="(item, index) in statusList">
+                        <div v-if="item.value == row.status">{{ item.name }}</div>
+                      </div>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column :label="t('operation')" fixed="right" min-width="120">
+                    <template #default="{ row }">
+                      <el-button type="primary" link @click="editJumpLessonLibrary(row)">{{ t('edit') }}</el-button>
+                      <el-button type="primary" link @click="deleteEvent(row.id, 2)">{{ t('delete') }}</el-button>
+                    </template>
+                  </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                  <el-pagination v-model:current-page="JumpLessonLibraryTable.page" v-model:page-size="JumpLessonLibraryTable.limit"
+                                 layout="total, sizes, prev, pager, next, jumper" :total="JumpLessonLibraryTable.total"
+                                 @size-change="loadJumpLessonLibraryList()" @current-change="loadJumpLessonLibraryList" />
+                </div>
+              </div>
+
+              <edit-jump ref="editJumpLessonLibraryDialog" @complete="loadJumpLessonLibraryList" />
+            </el-tab-pane>
+            <el-tab-pane label="增高教案库" name="EnTeachingLibrary">
+              <div class="flex justify-between items-center">
+                <el-button type="primary" @click="addEnTeachingLibrary">
+                  {{ t('addEnTeachingLibrary') }}
+                </el-button>
+              </div>
+              <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="EnTeachingLibraryTable.searchParam" ref="searchFormRef">
+                  <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="EnTeachingLibraryTable.searchParam.title" :placeholder="t('titlePlaceholder')" />
+                  </el-form-item>
+
+                  <el-form-item :label="t('status')" prop="status">
+                    <el-select class="w-[280px]" v-model="EnTeachingLibraryTable.searchParam.status" clearable :placeholder="t('statusPlaceholder')">
+                      <el-option label="全部" value=""></el-option>
+                      <el-option
+                          v-for="(item, index) in statusList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.value"
+                      />
+                    </el-select>
+                  </el-form-item>
+
+                  <el-form-item :label="t('createTime')" prop="create_time">
+                    <el-date-picker v-model="EnTeachingLibraryTable.searchParam.create_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                    :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+                  </el-form-item>
+
+                  <el-form-item :label="t('updateTime')" prop="update_time">
+                    <el-date-picker v-model="EnTeachingLibraryTable.searchParam.update_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                    :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+                  </el-form-item>
+
+                  <el-form-item>
+                    <el-button type="primary" @click="loadEnTeachingLibraryList()">{{ t('search') }}</el-button>
+                    <el-button @click="resetForm(searchFormRef, 3)">{{ t('reset') }}</el-button>
+                  </el-form-item>
+                </el-form>
+              </el-card>
+
+              <div class="mt-[10px]">
+                <el-table :data="EnTeachingLibraryTable.data" size="large" v-loading="EnTeachingLibraryTable.loading">
+                  <template #empty>
+                    <span>{{ !EnTeachingLibraryTable.loading ? t('emptyData') : '' }}</span>
+                  </template>
+                  <el-table-column prop="title" :label="t('title')" min-width="120" :show-overflow-tooltip="true"/>
+
+                  <el-table-column :label="t('image')" width="100" align="left">
+                    <template #default="{ row }">
+                      <el-avatar v-if="row.image" :src="img(row.image)" />
+                      <el-avatar v-else icon="UserFilled" />
+                    </template>
+                  </el-table-column>
+                  <el-table-column :label="t('type')" min-width="180" align="center" :show-overflow-tooltip="true">
+                    <template #default="{ row }">
+                      <div v-for="(item, index) in typeList">
+                        <div v-if="item.value == row.type">{{ item.name }}</div>
+                      </div>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column :label="t('status')" min-width="180" align="center" :show-overflow-tooltip="true">
+                    <template #default="{ row }">
+                      <div v-for="(item, index) in statusList">
+                        <div v-if="item.value == row.status">{{ item.name }}</div>
+                      </div>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column :label="t('operation')" fixed="right" min-width="120">
+                    <template #default="{ row }">
+                      <el-button type="primary" link @click="editEnTeachingLibrary(row)">{{ t('edit') }}</el-button>
+                      <el-button type="primary" link @click="deleteEvent(row.id, 3)">{{ t('delete') }}</el-button>
+                    </template>
+                  </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                  <el-pagination v-model:current-page="EnTeachingLibraryTable.page" v-model:page-size="EnTeachingLibraryTable.limit"
+                                 layout="total, sizes, prev, pager, next, jumper" :total="EnTeachingLibraryTable.total"
+                                 @size-change="loadEnTeachingLibraryList()" @current-change="loadEnTeachingLibraryList" />
+                </div>
+              </div>
+
+              <edit-en ref="editEnTeachingLibraryDialog" @complete="loadEnTeachingLibraryList" />
+            </el-tab-pane>
+            <el-tab-pane label="篮球教案库" name="BasketballTeachingLibrary">
+              <div class="flex justify-between items-center">
+                <el-button type="primary" @click="addBasketballTeachingLibrary">
+                  {{ t('addBasketballTeachingLibrary') }}
+                </el-button>
+              </div>
+              <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="BasketballTeachingLibraryTable.searchParam" ref="searchFormRef">
+                  <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="BasketballTeachingLibraryTable.searchParam.title" :placeholder="t('titlePlaceholder')" />
+                  </el-form-item>
+
+                  <el-form-item :label="t('status')" prop="status">
+                    <el-select class="w-[280px]" v-model="BasketballTeachingLibraryTable.searchParam.status" clearable :placeholder="t('statusPlaceholder')">
+                      <el-option label="全部" value=""></el-option>
+                      <el-option
+                          v-for="(item, index) in statusList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.value"
+                      />
+                    </el-select>
+                  </el-form-item>
+
+                  <el-form-item :label="t('createTime')" prop="create_time">
+                    <el-date-picker v-model="BasketballTeachingLibraryTable.searchParam.create_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                    :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+                  </el-form-item>
+
+                  <el-form-item :label="t('updateTime')" prop="update_time">
+                    <el-date-picker v-model="BasketballTeachingLibraryTable.searchParam.update_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                    :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+                  </el-form-item>
+
+                  <el-form-item>
+                    <el-button type="primary" @click="loadBasketballTeachingLibraryList()">{{ t('search') }}</el-button>
+                    <el-button @click="resetForm(searchFormRef, 4)">{{ t('reset') }}</el-button>
+                  </el-form-item>
+                </el-form>
+              </el-card>
+
+              <div class="mt-[10px]">
+                <el-table :data="BasketballTeachingLibraryTable.data" size="large" v-loading="BasketballTeachingLibraryTable.loading">
+                  <template #empty>
+                    <span>{{ !BasketballTeachingLibraryTable.loading ? t('emptyData') : '' }}</span>
+                  </template>
+                  <el-table-column prop="title" :label="t('title')" min-width="120" :show-overflow-tooltip="true"/>
+
+                  <el-table-column :label="t('image')" width="100" align="left">
+                    <template #default="{ row }">
+                      <el-avatar v-if="row.image" :src="img(row.image)" />
+                      <el-avatar v-else icon="UserFilled" />
+                    </template>
+                  </el-table-column>
+                  <el-table-column :label="t('type')" min-width="180" align="center" :show-overflow-tooltip="true">
+                    <template #default="{ row }">
+                      <div v-for="(item, index) in typeList">
+                        <div v-if="item.value == row.type">{{ item.name }}</div>
+                      </div>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column :label="t('status')" min-width="180" align="center" :show-overflow-tooltip="true">
+                    <template #default="{ row }">
+                      <div v-for="(item, index) in statusList">
+                        <div v-if="item.value == row.status">{{ item.name }}</div>
+                      </div>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column :label="t('operation')" fixed="right" min-width="120">
+                    <template #default="{ row }">
+                      <el-button type="primary" link @click="editBasketballTeachingLibrary(row)">{{ t('edit') }}</el-button>
+                      <el-button type="primary" link @click="deleteEvent(row.id, 4)">{{ t('delete') }}</el-button>
+                    </template>
+                  </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                  <el-pagination v-model:current-page="BasketballTeachingLibraryTable.page" v-model:page-size="BasketballTeachingLibraryTable.limit"
+                                 layout="total, sizes, prev, pager, next, jumper" :total="BasketballTeachingLibraryTable.total"
+                                 @size-change="loadBasketballTeachingLibraryList()" @current-change="loadBasketballTeachingLibraryList" />
+                </div>
+              </div>
+
+              <edit-basketball ref="editBasketballTeachingLibraryDialog" @complete="loadBasketballTeachingLibraryList" />
+            </el-tab-pane>
+            <el-tab-pane label="强化教案库" name="StrengthenTeachingLibrary">
+              <div class="flex justify-between items-center">
+                <el-button type="primary" @click="addStrengthenTeachingLibrary">
+                  {{ t('addStrengthenTeachingLibrary') }}
+                </el-button>
+              </div>
+              <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="StrengTeachingLibraryTable.searchParam" ref="searchFormRef">
+                  <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="StrengTeachingLibraryTable.searchParam.title" :placeholder="t('titlePlaceholder')" />
+                  </el-form-item>
+
+                  <el-form-item :label="t('status')" prop="status">
+                    <el-select class="w-[280px]" v-model="StrengTeachingLibraryTable.searchParam.status" clearable :placeholder="t('statusPlaceholder')">
+                      <el-option label="全部" value=""></el-option>
+                      <el-option
+                          v-for="(item, index) in statusList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.value"
+                      />
+                    </el-select>
+                  </el-form-item>
+
+                  <el-form-item :label="t('createTime')" prop="create_time">
+                    <el-date-picker v-model="StrengTeachingLibraryTable.searchParam.create_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                    :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+                  </el-form-item>
+
+                  <el-form-item :label="t('updateTime')" prop="update_time">
+                    <el-date-picker v-model="StrengTeachingLibraryTable.searchParam.update_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                    :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+                  </el-form-item>
+
+                  <el-form-item>
+                    <el-button type="primary" @click="loadStrengthenTeachingLibraryList()">{{ t('search') }}</el-button>
+                    <el-button @click="resetForm(searchFormRef, 5)">{{ t('reset') }}</el-button>
+                  </el-form-item>
+                </el-form>
+              </el-card>
+
+              <div class="mt-[10px]">
+                <el-table :data="StrengTeachingLibraryTable.data" size="large" v-loading="StrengTeachingLibraryTable.loading">
+                  <template #empty>
+                    <span>{{ !StrengTeachingLibraryTable.loading ? t('emptyData') : '' }}</span>
+                  </template>
+                  <el-table-column prop="title" :label="t('title')" min-width="120" :show-overflow-tooltip="true"/>
+
+                  <el-table-column :label="t('image')" width="100" align="left">
+                    <template #default="{ row }">
+                      <el-avatar v-if="row.image" :src="img(row.image)" />
+                      <el-avatar v-else icon="UserFilled" />
+                    </template>
+                  </el-table-column>
+                  <el-table-column :label="t('type')" min-width="180" align="center" :show-overflow-tooltip="true">
+                    <template #default="{ row }">
+                      <div v-for="(item, index) in typeList">
+                        <div v-if="item.value == row.type">{{ item.name }}</div>
+                      </div>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column :label="t('status')" min-width="180" align="center" :show-overflow-tooltip="true">
+                    <template #default="{ row }">
+                      <div v-for="(item, index) in statusList">
+                        <div v-if="item.value == row.status">{{ item.name }}</div>
+                      </div>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column :label="t('operation')" fixed="right" min-width="120">
+                    <template #default="{ row }">
+                      <el-button type="primary" link @click="editStrengthenTeachingLibrary(row)">{{ t('edit') }}</el-button>
+                      <el-button type="primary" link @click="deleteEvent(row.id, 5)">{{ t('delete') }}</el-button>
+                    </template>
+                  </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                  <el-pagination v-model:current-page="StrengTeachingLibraryTable.page" v-model:page-size="StrengTeachingLibraryTable.limit"
+                                 layout="total, sizes, prev, pager, next, jumper" :total="StrengTeachingLibraryTable.total"
+                                 @size-change="loadStrengthenTeachingLibraryList()" @current-change="loadStrengthenTeachingLibraryList" />
+                </div>
+              </div>
+
+              <edit-strengthen ref="editStrengthenTeachingLibraryDialog" @complete="loadStrengthenTeachingLibraryList" />
+            </el-tab-pane>
+            <el-tab-pane label="空中忍者教案库" name="NinjaTeachingLibrary">
+              <div class="flex justify-between items-center">
+                <el-button type="primary" @click="addNinjaTeachingLibrary">
+                  {{ t('addNinjaTeachingLibrary') }}
+                </el-button>
+              </div>
+              <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="NinjaTeachingLibraryTable.searchParam" ref="searchFormRef">
+                  <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="NinjaTeachingLibraryTable.searchParam.title" :placeholder="t('titlePlaceholder')" />
+                  </el-form-item>
+
+                  <el-form-item :label="t('status')" prop="status">
+                    <el-select class="w-[280px]" v-model="NinjaTeachingLibraryTable.searchParam.status" clearable :placeholder="t('statusPlaceholder')">
+                      <el-option label="全部" value=""></el-option>
+                      <el-option
+                          v-for="(item, index) in statusList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.value"
+                      />
+                    </el-select>
+                  </el-form-item>
+
+                  <el-form-item :label="t('createTime')" prop="create_time">
+                    <el-date-picker v-model="NinjaTeachingLibraryTable.searchParam.create_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                    :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+                  </el-form-item>
+
+                  <el-form-item :label="t('updateTime')" prop="update_time">
+                    <el-date-picker v-model="NinjaTeachingLibraryTable.searchParam.update_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                    :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+                  </el-form-item>
+
+                  <el-form-item>
+                    <el-button type="primary" @click="loadNinjaTeachingLibraryList()">{{ t('search') }}</el-button>
+                    <el-button @click="resetForm(searchFormRef, 6)">{{ t('reset') }}</el-button>
+                  </el-form-item>
+                </el-form>
+              </el-card>
+
+              <div class="mt-[10px]">
+                <el-table :data="NinjaTeachingLibraryTable.data" size="large" v-loading="NinjaTeachingLibraryTable.loading">
+                  <template #empty>
+                    <span>{{ !NinjaTeachingLibraryTable.loading ? t('emptyData') : '' }}</span>
+                  </template>
+                  <el-table-column prop="title" :label="t('title')" min-width="120" :show-overflow-tooltip="true"/>
+
+                  <el-table-column :label="t('image')" width="100" align="left">
+                    <template #default="{ row }">
+                      <el-avatar v-if="row.image" :src="img(row.image)" />
+                      <el-avatar v-else icon="UserFilled" />
+                    </template>
+                  </el-table-column>
+                  <el-table-column :label="t('type')" min-width="180" align="center" :show-overflow-tooltip="true">
+                    <template #default="{ row }">
+                      <div v-for="(item, index) in typeList">
+                        <div v-if="item.value == row.type">{{ item.name }}</div>
+                      </div>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column :label="t('status')" min-width="180" align="center" :show-overflow-tooltip="true">
+                    <template #default="{ row }">
+                      <div v-for="(item, index) in statusList">
+                        <div v-if="item.value == row.status">{{ item.name }}</div>
+                      </div>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column :label="t('operation')" fixed="right" min-width="120">
+                    <template #default="{ row }">
+                      <el-button type="primary" link @click="editNinjaTeachingLibrary(row)">{{ t('edit') }}</el-button>
+                      <el-button type="primary" link @click="deleteEvent(row.id, 6)">{{ t('delete') }}</el-button>
+                    </template>
+                  </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                  <el-pagination v-model:current-page="NinjaTeachingLibraryTable.page" v-model:page-size="NinjaTeachingLibraryTable.limit"
+                                 layout="total, sizes, prev, pager, next, jumper" :total="NinjaTeachingLibraryTable.total"
+                                 @size-change="loadNinjaTeachingLibraryList()" @current-change="loadNinjaTeachingLibraryList" />
+                </div>
+              </div>
+
+              <edit-ninja ref="editNinjaTeachingLibraryDialog" @complete="loadNinjaTeachingLibraryList" />
+            </el-tab-pane>
+            <el-tab-pane label="少儿安防教案库" name="SecurityTeachingLibrary">
+              <div class="flex justify-between items-center">
+                <el-button type="primary" @click="addSecurityTeachingLibrary">
+                  {{ t('addSecurityTeachingLibrary') }}
+                </el-button>
+              </div>
+              <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="SecurityTeachingLibraryTable.searchParam" ref="searchFormRef">
+                  <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="SecurityTeachingLibraryTable.searchParam.title" :placeholder="t('titlePlaceholder')" />
+                  </el-form-item>
+
+                  <el-form-item :label="t('status')" prop="status">
+                    <el-select class="w-[280px]" v-model="SecurityTeachingLibraryTable.searchParam.status" clearable :placeholder="t('statusPlaceholder')">
+                      <el-option label="全部" value=""></el-option>
+                      <el-option
+                          v-for="(item, index) in statusList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.value"
+                      />
+                    </el-select>
+                  </el-form-item>
+
+                  <el-form-item :label="t('createTime')" prop="create_time">
+                    <el-date-picker v-model="SecurityTeachingLibraryTable.searchParam.create_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                    :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+                  </el-form-item>
+
+                  <el-form-item :label="t('updateTime')" prop="update_time">
+                    <el-date-picker v-model="SecurityTeachingLibraryTable.searchParam.update_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                    :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+                  </el-form-item>
+
+                  <el-form-item>
+                    <el-button type="primary" @click="loadSecurityTeachingLibraryList()">{{ t('search') }}</el-button>
+                    <el-button @click="resetForm(searchFormRef, 7)">{{ t('reset') }}</el-button>
+                  </el-form-item>
+                </el-form>
+              </el-card>
+
+              <div class="mt-[10px]">
+                <el-table :data="SecurityTeachingLibraryTable.data" size="large" v-loading="SecurityTeachingLibraryTable.loading">
+                  <template #empty>
+                    <span>{{ !SecurityTeachingLibraryTable.loading ? t('emptyData') : '' }}</span>
+                  </template>
+                  <el-table-column prop="title" :label="t('title')" min-width="120" :show-overflow-tooltip="true"/>
+
+                  <el-table-column :label="t('image')" width="100" align="left">
+                    <template #default="{ row }">
+                      <el-avatar v-if="row.image" :src="img(row.image)" />
+                      <el-avatar v-else icon="UserFilled" />
+                    </template>
+                  </el-table-column>
+                  <el-table-column :label="t('type')" min-width="180" align="center" :show-overflow-tooltip="true">
+                    <template #default="{ row }">
+                      <div v-for="(item, index) in typeList">
+                        <div v-if="item.value == row.type">{{ item.name }}</div>
+                      </div>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column :label="t('status')" min-width="180" align="center" :show-overflow-tooltip="true">
+                    <template #default="{ row }">
+                      <div v-for="(item, index) in statusList">
+                        <div v-if="item.value == row.status">{{ item.name }}</div>
+                      </div>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column :label="t('operation')" fixed="right" min-width="120">
+                    <template #default="{ row }">
+                      <el-button type="primary" link @click="editSecurityTeachingLibrary(row)">{{ t('edit') }}</el-button>
+                      <el-button type="primary" link @click="deleteEvent(row.id, 7)">{{ t('delete') }}</el-button>
+                    </template>
+                  </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                  <el-pagination v-model:current-page="SecurityTeachingLibraryTable.page" v-model:page-size="SecurityTeachingLibraryTable.limit"
+                                 layout="total, sizes, prev, pager, next, jumper" :total="SecurityTeachingLibraryTable.total"
+                                 @size-change="loadSecurityTeachingLibraryList()" @current-change="loadSecurityTeachingLibraryList" />
+                </div>
+              </div>
+
+              <edit-security ref="editSecurityTeachingLibraryDialog" @complete="loadSecurityTeachingLibraryList" />
+            </el-tab-pane>
+            <el-tab-pane label="体能教案库" name="PhysicalTeachingLibrary">
+              <div class="flex justify-between items-center">
+                <el-button type="primary" @click="addPhysicalTeachingLibrary">
+                  {{ t('addPhysicalTeachingLibrary') }}
+                </el-button>
+              </div>
+              <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="PhysicalTeachingLibraryTable.searchParam" ref="searchFormRef">
+                  <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="PhysicalTeachingLibraryTable.searchParam.title" :placeholder="t('titlePlaceholder')" />
+                  </el-form-item>
+
+                  <el-form-item :label="t('status')" prop="status">
+                    <el-select class="w-[280px]" v-model="PhysicalTeachingLibraryTable.searchParam.status" clearable :placeholder="t('statusPlaceholder')">
+                      <el-option label="全部" value=""></el-option>
+                      <el-option
+                          v-for="(item, index) in statusList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.value"
+                      />
+                    </el-select>
+                  </el-form-item>
+
+                  <el-form-item :label="t('createTime')" prop="create_time">
+                    <el-date-picker v-model="PhysicalTeachingLibraryTable.searchParam.create_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                    :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+                  </el-form-item>
+
+                  <el-form-item :label="t('updateTime')" prop="update_time">
+                    <el-date-picker v-model="PhysicalTeachingLibraryTable.searchParam.update_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                    :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+                  </el-form-item>
+
+                  <el-form-item>
+                    <el-button type="primary" @click="loadPhysicalTeachingLibraryList()">{{ t('search') }}</el-button>
+                    <el-button @click="resetForm(searchFormRef, 8)">{{ t('reset') }}</el-button>
+                  </el-form-item>
+                </el-form>
+              </el-card>
+
+              <div class="mt-[10px]">
+                <el-table :data="PhysicalTeachingLibraryTable.data" size="large" v-loading="PhysicalTeachingLibraryTable.loading">
+                  <template #empty>
+                    <span>{{ !PhysicalTeachingLibraryTable.loading ? t('emptyData') : '' }}</span>
+                  </template>
+                  <el-table-column prop="title" :label="t('title')" min-width="120" :show-overflow-tooltip="true"/>
+
+                  <el-table-column :label="t('image')" width="100" align="left">
+                    <template #default="{ row }">
+                      <el-avatar v-if="row.image" :src="img(row.image)" />
+                      <el-avatar v-else icon="UserFilled" />
+                    </template>
+                  </el-table-column>
+                  <el-table-column :label="t('type')" min-width="180" align="center" :show-overflow-tooltip="true">
+                    <template #default="{ row }">
+                      <div v-for="(item, index) in typeList">
+                        <div v-if="item.value == row.type">{{ item.name }}</div>
+                      </div>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column :label="t('status')" min-width="180" align="center" :show-overflow-tooltip="true">
+                    <template #default="{ row }">
+                      <div v-for="(item, index) in statusList">
+                        <div v-if="item.value == row.status">{{ item.name }}</div>
+                      </div>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column :label="t('operation')" fixed="right" min-width="120">
+                    <template #default="{ row }">
+                      <el-button type="primary" link @click="editPhysicalTeachingLibrary(row)">{{ t('edit') }}</el-button>
+                      <el-button type="primary" link @click="deleteEvent(row.id, 8)">{{ t('delete') }}</el-button>
+                    </template>
+                  </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                  <el-pagination v-model:current-page="PhysicalTeachingLibraryTable.page" v-model:page-size="PhysicalTeachingLibraryTable.limit"
+                                 layout="total, sizes, prev, pager, next, jumper" :total="PhysicalTeachingLibraryTable.total"
+                                 @size-change="loadPhysicalTeachingLibraryList()" @current-change="loadPhysicalTeachingLibraryList" />
+                </div>
+              </div>
+
+              <edit-physical ref="editPhysicalTeachingLibraryDialog" @complete="loadPhysicalTeachingLibraryList" />
+            </el-tab-pane>
+          </el-tabs>
+        </el-card>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { reactive, ref, watch } from 'vue'
+import { t } from '@/lang'
+import { useDictionary } from '@/app/api/dict'
+import { getLessonCourseTeachingList, deleteLessonCourseTeaching, getWithPersonnelDataList, getJumpLessonLibraryList, getEnTeachingLibraryList, getBasketballTeachingLibraryList, getStrengTeachingLibraryList, getNinjaTeachingLibraryList, getSecurityTeachingLibraryList, getPhysicalTeachingLibraryList } from '@/app/api/lesson_course_teaching'
+import { img } from '@/utils/common'
+import { ElMessageBox,FormInstance } from 'element-plus'
+import Edit from '@/app/views/lesson_course_teaching/components/lesson-course-teaching-edit.vue'
+import EditJump from '@/app/views/lesson_course_teaching/components/Jump-lesson-library-edit.vue'
+import EditEn from '@/app/views/lesson_course_teaching/components/en-course-teaching-edit.vue'
+import EditBasketball from '@/app/views/lesson_course_teaching/components/basketball-course-teaching-edit.vue'
+import EditStrengthen from '@/app/views/lesson_course_teaching/components/strengthen-course-teaching-edit.vue'
+import EditNinja from '@/app/views/lesson_course_teaching/components/ninja-teaching-edit.vue'
+import EditSecurity from '@/app/views/lesson_course_teaching/components/security-teaching-edit.vue'
+import EditPhysical from '@/app/views/lesson_course_teaching/components/physical-teaching-edit.vue'
+import { useRoute } from 'vue-router'
+const route = useRoute()
+const pageName = route.meta.title;
+const active = 'CourseSyllabus'
+
+let lessonCourseTeachingTable = reactive({
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam:{
+      "title":"",
+      "status":"",
+      "create_time":[],
+      "update_time":[]
+    }
+})
+let JumpLessonLibraryTable = reactive({
+  page: 1,
+  limit: 10,
+  total: 0,
+  loading: true,
+  data: [],
+  searchParam:{
+    "title":"",
+    "status":"",
+    "create_time":[],
+    "update_time":[]
+  }
+})
+let EnTeachingLibraryTable = reactive({
+  page: 1,
+  limit: 10,
+  total: 0,
+  loading: true,
+  data: [],
+  searchParam:{
+    "title":"",
+    "status":"",
+    "create_time":[],
+    "update_time":[]
+  }
+})
+let BasketballTeachingLibraryTable = reactive({
+  page: 1,
+  limit: 10,
+  total: 0,
+  loading: true,
+  data: [],
+  searchParam:{
+    "title":"",
+    "status":"",
+    "create_time":[],
+    "update_time":[]
+  }
+})
+let StrengTeachingLibraryTable = reactive({
+  page: 1,
+  limit: 10,
+  total: 0,
+  loading: true,
+  data: [],
+  searchParam:{
+    "title":"",
+    "status":"",
+    "create_time":[],
+    "update_time":[]
+  }
+})
+let NinjaTeachingLibraryTable = reactive({
+  page: 1,
+  limit: 10,
+  total: 0,
+  loading: true,
+  data: [],
+  searchParam:{
+    "title":"",
+    "status":"",
+    "create_time":[],
+    "update_time":[]
+  }
+})
+let SecurityTeachingLibraryTable = reactive({
+  page: 1,
+  limit: 10,
+  total: 0,
+  loading: true,
+  data: [],
+  searchParam:{
+    "title":"",
+    "status":"",
+    "create_time":[],
+    "update_time":[]
+  }
+})
+let PhysicalTeachingLibraryTable = reactive({
+  page: 1,
+  limit: 10,
+  total: 0,
+  loading: true,
+  data: [],
+  searchParam:{
+    "title":"",
+    "status":"",
+    "create_time":[],
+    "update_time":[]
+  }
+})
+const searchFormRef = ref<FormInstance>()
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 字典数据
+const typeList = ref([] as any[])
+const typeDictList = async () => {
+typeList.value = await (await useDictionary('material_type')).data.dictionary
+}
+typeDictList();
+const statusList = ref([] as any[])
+const statusDictList = async () => {
+statusList.value = await (await useDictionary('course_status')).data.dictionary
+}
+statusDictList();
+
+const editLessonCourseTeachingDialog: Record<string, any> | null = ref(null)
+const editJumpLessonLibraryDialog: Record<string, any> | null = ref(null)
+const editEnTeachingLibraryDialog: Record<string, any> | null = ref(null)
+const editBasketballTeachingLibraryDialog: Record<string, any> | null = ref(null)
+const editStrengthenTeachingLibraryDialog: Record<string, any> | null = ref(null)
+const editNinjaTeachingLibraryDialog: Record<string, any> | null = ref(null)
+const editSecurityTeachingLibraryDialog: Record<string, any> | null = ref(null)
+const editPhysicalTeachingLibraryDialog: Record<string, any> | null = ref(null)
+
+/**
+ * 获取课程教学大纲列表
+ */
+const loadLessonCourseTeachingList = (page: number = 1) => {
+    lessonCourseTeachingTable.loading = true
+    lessonCourseTeachingTable.page = page
+
+    getLessonCourseTeachingList({
+        page: lessonCourseTeachingTable.page,
+        limit: lessonCourseTeachingTable.limit,
+         ...lessonCourseTeachingTable.searchParam
+    }).then(res => {
+        lessonCourseTeachingTable.loading = false
+        lessonCourseTeachingTable.data = res.data.data
+        lessonCourseTeachingTable.total = res.data.total
+    }).catch(() => {
+        lessonCourseTeachingTable.loading = false
+    })
+}
+loadLessonCourseTeachingList()
+
+/**
+ * 添加课程教学大纲
+ */
+const addEvent = () => {
+    editLessonCourseTeachingDialog.value.setFormData()
+    editLessonCourseTeachingDialog.value.showDialog = true
+}
+
+/**
+ * 编辑课程教学大纲
+ * @param data
+ */
+const editEvent = (data: any) => {
+    editLessonCourseTeachingDialog.value.setFormData(data)
+    editLessonCourseTeachingDialog.value.showDialog = true
+}
+
+
+/**
+ * 获取跳绳教案库列表
+ */
+const loadJumpLessonLibraryList = (page: number = 1) => {
+  JumpLessonLibraryTable.loading = true
+  JumpLessonLibraryTable.page = page
+
+  getJumpLessonLibraryList({
+    page: JumpLessonLibraryTable.page,
+    limit: JumpLessonLibraryTable.limit,
+    ...JumpLessonLibraryTable.searchParam
+  }).then(res => {
+    JumpLessonLibraryTable.loading = false
+    JumpLessonLibraryTable.data = res.data.data
+    JumpLessonLibraryTable.total = res.data.total
+  }).catch(() => {
+    JumpLessonLibraryTable.loading = false
+  })
+}
+loadJumpLessonLibraryList()
+
+/**
+ * 添加跳绳教案库
+ */
+const addJumpLessonLibrary = () => {
+  editJumpLessonLibraryDialog.value.setFormData()
+  editJumpLessonLibraryDialog.value.showDialog = true
+}
+
+/**
+ * 编辑跳绳教案库
+ * @param data
+ */
+const editJumpLessonLibrary = (data: any) => {
+  editJumpLessonLibraryDialog.value.setFormData(data)
+  editJumpLessonLibraryDialog.value.showDialog = true
+}
+
+
+/**
+ * 获取增高教案库列表
+ */
+const loadEnTeachingLibraryList = (page: number = 1) => {
+  EnTeachingLibraryTable.loading = true
+  EnTeachingLibraryTable.page = page
+
+  getEnTeachingLibraryList({
+    page: EnTeachingLibraryTable.page,
+    limit: EnTeachingLibraryTable.limit,
+    ...EnTeachingLibraryTable.searchParam
+  }).then(res => {
+    EnTeachingLibraryTable.loading = false
+    EnTeachingLibraryTable.data = res.data.data
+    EnTeachingLibraryTable.total = res.data.total
+  }).catch(() => {
+    EnTeachingLibraryTable.loading = false
+  })
+}
+loadEnTeachingLibraryList()
+
+/**
+ * 添加增高教案库
+ */
+const addEnTeachingLibrary = () => {
+  editEnTeachingLibraryDialog.value.setFormData()
+  editEnTeachingLibraryDialog.value.showDialog = true
+}
+
+/**
+ * 编辑增高教案库
+ * @param data
+ */
+const editEnTeachingLibrary = (data: any) => {
+  editEnTeachingLibraryDialog.value.setFormData(data)
+  editEnTeachingLibraryDialog.value.showDialog = true
+}
+
+/**
+ * 获取篮球教案库列表
+ */
+const loadBasketballTeachingLibraryList = (page: number = 1) => {
+  BasketballTeachingLibraryTable.loading = true
+  BasketballTeachingLibraryTable.page = page
+
+  getBasketballTeachingLibraryList({
+    page: BasketballTeachingLibraryTable.page,
+    limit: BasketballTeachingLibraryTable.limit,
+    ...BasketballTeachingLibraryTable.searchParam
+  }).then(res => {
+    BasketballTeachingLibraryTable.loading = false
+    BasketballTeachingLibraryTable.data = res.data.data
+    BasketballTeachingLibraryTable.total = res.data.total
+  }).catch(() => {
+    BasketballTeachingLibraryTable.loading = false
+  })
+}
+loadBasketballTeachingLibraryList()
+
+/**
+ * 添加篮球教案库
+ */
+const addBasketballTeachingLibrary = () => {
+  editBasketballTeachingLibraryDialog.value.setFormData()
+  editBasketballTeachingLibraryDialog.value.showDialog = true
+}
+
+/**
+ * 编辑篮球教案库
+ * @param data
+ */
+const editBasketballTeachingLibrary = (data: any) => {
+  editBasketballTeachingLibraryDialog.value.setFormData(data)
+  editBasketballTeachingLibraryDialog.value.showDialog = true
+}
+
+/**
+ * 获取强化教案库列表
+ */
+const loadStrengthenTeachingLibraryList = (page: number = 1) => {
+  StrengTeachingLibraryTable.loading = true
+  StrengTeachingLibraryTable.page = page
+
+  getStrengTeachingLibraryList({
+    page: StrengTeachingLibraryTable.page,
+    limit: StrengTeachingLibraryTable.limit,
+    ...StrengTeachingLibraryTable.searchParam
+  }).then(res => {
+    StrengTeachingLibraryTable.loading = false
+    StrengTeachingLibraryTable.data = res.data.data
+    StrengTeachingLibraryTable.total = res.data.total
+  }).catch(() => {
+    StrengTeachingLibraryTable.loading = false
+  })
+}
+loadStrengthenTeachingLibraryList()
+
+/**
+ * 添加强化教案库
+ */
+const addStrengthenTeachingLibrary = () => {
+  editStrengthenTeachingLibraryDialog.value.setFormData()
+  editStrengthenTeachingLibraryDialog.value.showDialog = true
+}
+
+/**
+ * 编辑强化教案库
+ * @param data
+ */
+const editStrengthenTeachingLibrary = (data: any) => {
+  editStrengthenTeachingLibraryDialog.value.setFormData(data)
+  editStrengthenTeachingLibraryDialog.value.showDialog = true
+}
+
+/**
+ * 获取空中忍者教案库列表
+ */
+const loadNinjaTeachingLibraryList = (page: number = 1) => {
+  NinjaTeachingLibraryTable.loading = true
+  NinjaTeachingLibraryTable.page = page
+
+  getNinjaTeachingLibraryList({
+    page: NinjaTeachingLibraryTable.page,
+    limit: NinjaTeachingLibraryTable.limit,
+    ...NinjaTeachingLibraryTable.searchParam
+  }).then(res => {
+    NinjaTeachingLibraryTable.loading = false
+    NinjaTeachingLibraryTable.data = res.data.data
+    NinjaTeachingLibraryTable.total = res.data.total
+  }).catch(() => {
+    NinjaTeachingLibraryTable.loading = false
+  })
+}
+loadNinjaTeachingLibraryList()
+
+/**
+ * 添加空中忍者教案库
+ */
+const addNinjaTeachingLibrary = () => {
+  editNinjaTeachingLibraryDialog.value.setFormData()
+  editNinjaTeachingLibraryDialog.value.showDialog = true
+}
+
+/**
+ * 编辑空中忍者教案库
+ * @param data
+ */
+const editNinjaTeachingLibrary = (data: any) => {
+  editNinjaTeachingLibraryDialog.value.setFormData(data)
+  editNinjaTeachingLibraryDialog.value.showDialog = true
+}
+
+/**
+ * 获取少儿安防教案库列表
+ */
+const loadSecurityTeachingLibraryList = (page: number = 1) => {
+  SecurityTeachingLibraryTable.loading = true
+  SecurityTeachingLibraryTable.page = page
+
+  getSecurityTeachingLibraryList({
+    page: SecurityTeachingLibraryTable.page,
+    limit: SecurityTeachingLibraryTable.limit,
+    ...SecurityTeachingLibraryTable.searchParam
+  }).then(res => {
+    SecurityTeachingLibraryTable.loading = false
+    SecurityTeachingLibraryTable.data = res.data.data
+    SecurityTeachingLibraryTable.total = res.data.total
+  }).catch(() => {
+    SecurityTeachingLibraryTable.loading = false
+  })
+}
+loadSecurityTeachingLibraryList()
+
+/**
+ * 添加少儿安防教案库
+ */
+const addSecurityTeachingLibrary = () => {
+  editSecurityTeachingLibraryDialog.value.setFormData()
+  editSecurityTeachingLibraryDialog.value.showDialog = true
+}
+
+/**
+ * 编辑少儿安防教案库
+ * @param data
+ */
+const editSecurityTeachingLibrary = (data: any) => {
+  editSecurityTeachingLibraryDialog.value.setFormData(data)
+  editSecurityTeachingLibraryDialog.value.showDialog = true
+}
+
+/**
+ * 获取体能教案库列表
+ */
+const loadPhysicalTeachingLibraryList = (page: number = 1) => {
+  PhysicalTeachingLibraryTable.loading = true
+  PhysicalTeachingLibraryTable.page = page
+
+  getPhysicalTeachingLibraryList({
+    page: PhysicalTeachingLibraryTable.page,
+    limit: PhysicalTeachingLibraryTable.limit,
+    ...PhysicalTeachingLibraryTable.searchParam
+  }).then(res => {
+    PhysicalTeachingLibraryTable.loading = false
+    PhysicalTeachingLibraryTable.data = res.data.data
+    PhysicalTeachingLibraryTable.total = res.data.total
+  }).catch(() => {
+    PhysicalTeachingLibraryTable.loading = false
+  })
+}
+loadPhysicalTeachingLibraryList()
+
+/**
+ * 添加体能教案库
+ */
+const addPhysicalTeachingLibrary = () => {
+  editPhysicalTeachingLibraryDialog.value.setFormData()
+  editPhysicalTeachingLibraryDialog.value.showDialog = true
+}
+
+/**
+ * 编辑体能教案库
+ * @param data
+ */
+const editPhysicalTeachingLibrary = (data: any) => {
+  editPhysicalTeachingLibraryDialog.value.setFormData(data)
+  editPhysicalTeachingLibraryDialog.value.showDialog = true
+}
+
+
+/**
+ * 删除教研管理
+ */
+const deleteEvent = (id: number, type: number) => {
+    ElMessageBox.confirm(t('lessonCourseTeachingDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning',
+        }
+    ).then(() => {
+        deleteLessonCourseTeaching(id).then(() => {
+          if (type === 1) {
+            loadLessonCourseTeachingList()
+          } else if (type === 2) {
+            loadJumpLessonLibraryList()
+          } else if (type === 3) {
+            loadEnTeachingLibraryList()
+          } else if (type === 4) {
+            loadBasketballTeachingLibraryList()
+          } else if (type === 5) {
+            loadStrengthenTeachingLibraryList()
+          } else if (type === 6) {
+            loadNinjaTeachingLibraryList()
+          } else if (type === 7) {
+            loadSecurityTeachingLibraryList()
+          } else if (type === 8) {
+            loadPhysicalTeachingLibraryList()
+          }
+        }).catch(() => {
+        })
+    })
+}
+
+
+    const userPermissionList = ref([])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+
+const resetForm = (formEl: FormInstance | undefined, type: number) => {
+    if (!formEl) return
+    formEl.resetFields()
+    if (type === 1) {
+      lessonCourseTeachingTable = reactive({
+        page: 1,
+        limit: 10,
+        total: 0,
+        loading: true,
+        data: [],
+        searchParam: {
+          "title": "",
+          "status": "",
+          "create_time": [],
+          "update_time": []
+        }
+      })
+      loadLessonCourseTeachingList()
+    } else if (type === 2) {
+      JumpLessonLibraryTable = reactive({
+        page: 1,
+        limit: 10,
+        total: 0,
+        loading: true,
+        data: [],
+        searchParam: {
+          "title": "",
+          "status": "",
+          "create_time": [],
+          "update_time": []
+        }
+      })
+      loadJumpLessonLibraryList()
+    } else if (type === 3) {
+      EnTeachingLibraryTable = reactive({
+        page: 1,
+        limit: 10,
+        total: 0,
+        loading: true,
+        data: [],
+        searchParam: {
+          "title": "",
+          "status": "",
+          "create_time": [],
+          "update_time": []
+        }
+      })
+      loadEnTeachingLibraryList()
+    } else if (type === 4) {
+      BasketballTeachingLibraryTable = reactive({
+        page: 1,
+        limit: 10,
+        total: 0,
+        loading: true,
+        data: [],
+        searchParam: {
+          "title": "",
+          "status": "",
+          "create_time": [],
+          "update_time": []
+        }
+      })
+      loadBasketballTeachingLibraryList()
+    } else if (type === 5) {
+      StrengTeachingLibraryTable = reactive({
+        page: 1,
+        limit: 10,
+        total: 0,
+        loading: true,
+        data: [],
+        searchParam: {
+          "title": "",
+          "status": "",
+          "create_time": [],
+          "update_time": []
+        }
+      })
+      loadStrengthenTeachingLibraryList()
+    } else if (type === 6) {
+      NinjaTeachingLibraryTable = reactive({
+        page: 1,
+        limit: 10,
+        total: 0,
+        loading: true,
+        data: [],
+        searchParam: {
+          "title": "",
+          "status": "",
+          "create_time": [],
+          "update_time": []
+        }
+      })
+      loadStrengthenTeachingLibraryList()
+    } else if (type === 7) {
+      SecurityTeachingLibraryTable = reactive({
+        page: 1,
+        limit: 10,
+        total: 0,
+        loading: true,
+        data: [],
+        searchParam: {
+          "title": "",
+          "status": "",
+          "create_time": [],
+          "update_time": []
+        }
+      })
+      loadStrengthenTeachingLibraryList()
+    } else if (type === 8) {
+      PhysicalTeachingLibraryTable = reactive({
+        page: 1,
+        limit: 10,
+        total: 0,
+        loading: true,
+        data: [],
+        searchParam: {
+          "title": "",
+          "status": "",
+          "create_time": [],
+          "update_time": []
+        }
+      })
+      loadStrengthenTeachingLibraryList()
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+/* 多行超出隐藏 */
+.multi-hidden {
+		word-break: break-all;
+		text-overflow: ellipsis;
+		overflow: hidden;
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		-webkit-box-orient: vertical;
+	}
+</style>
diff --git a/admin/src/app/views/login/index.vue b/admin/src/app/views/login/index.vue
index a1128c80..b6722b7c 100644
--- a/admin/src/app/views/login/index.vue
+++ b/admin/src/app/views/login/index.vue
@@ -1,110 +1,50 @@
 <template>
-  <el-container
-    :class="['w-full h-screen bg-page flex flex-col', 'login-wrap']"
-  >
+  <el-container :class="['w-full h-screen bg-page flex flex-col','login-wrap']">
     <template v-if="!imgLoading">
-      <!-- 平台端登录 -->
-      <el-main class="login-main items-center justify-center flex-1 h-0">
-        <div class="flex rounded-2xl shadow overflow-hidden">
-          <div class="login-main-left w-[450px] flex flex-wrap justify-center">
-            <el-image
-              v-if="loginConfig.bg"
-              class="w-[450px] h-[400px]"
-              :src="img(loginConfig.bg)"
-              fit="cover"
-            />
-            <img
-              v-else
-              src="@/app/assets/images/login/niushop_login_index_left.jpg"
-              alt=""
-            />
-          </div>
-          <div class="login flex flex-col w-[400px] h-[400px] p-[40px]">
-            <h3 class="text-center text-lg font-bold mb-[10px]">
-              {{ webSite.site_name || t('siteTitle') }}
-            </h3>
-            <h3 class="text-center text-2xl font-bold mb-[26px]">
-              {{ t('platform') }}
-            </h3>
-            <el-form
-              :model="form"
-              ref="formRef"
-              :rules="formRules"
-              class="mt-[30px]"
-            >
-              <el-form-item prop="username">
-                <el-input
-                  v-model.trim="form.username"
-                  :placeholder="t('userPlaceholder')"
-                  autocomplete="off"
-                  @keyup.enter="handleLogin(formRef)"
-                  class="h-[40px]"
-                ></el-input>
-              </el-form-item>
-
-              <el-form-item prop="password">
-                <el-input
-                  v-model.trim="form.password"
-                  :placeholder="t('passwordPlaceholder')"
-                  type="password"
-                  autocomplete="new-password"
-                  @keyup.enter="handleLogin(formRef)"
-                  :show-password="true"
-                  class="h-[40px]"
-                ></el-input>
-              </el-form-item>
-
-              <el-form-item>
-                <el-button
-                  type="primary"
-                  class="mt-[30px] !h-[40px] w-full"
-                  @click="handleLogin(formRef)"
-                  :loading="loading"
-                  >{{ loading ? t('logging') : t('login') }}</el-button
-                >
-              </el-form-item>
-            </el-form>
-          </div>
+        <!-- 平台端登录 -->
+        <el-main class="login-main items-center justify-center flex-1 h-0">
+            <div class="flex rounded-2xl shadow overflow-hidden">
+                <div class="login-main-left w-[450px] flex flex-wrap justify-center">
+                    <el-image v-if="loginConfig.bg" class="w-[450px] h-[400px]" :src="img(loginConfig.bg)" fit="cover" />
+                    <img v-else src="@/app/assets/images/login/niushop_login_index_left.jpg" alt="">
+                </div>
+                <div class="login flex flex-col w-[400px] h-[400px] p-[40px]">
+                    <h3 class="text-center text-lg font-bold mb-[10px]">{{ webSite.site_name || t('siteTitle') }}</h3>
+                    <h3 class="text-center text-2xl font-bold mb-[26px]">{{ t('platform') }}</h3>
+                    <el-form :model="form" ref="formRef" :rules="formRules" class="mt-[30px]">
+                        <el-form-item prop="username">
+                            <el-input v-model.trim="form.username" :placeholder="t('userPlaceholder')" autocomplete="off" @keyup.enter="handleLogin(formRef)" class="h-[40px]"></el-input>
+                        </el-form-item>
+
+                        <el-form-item prop="password">
+                            <el-input v-model.trim="form.password" :placeholder="t('passwordPlaceholder')" type="password" autocomplete="new-password" @keyup.enter="handleLogin(formRef)" :show-password="true" class="h-[40px]"></el-input>
+                        </el-form-item>
+
+                        <el-form-item>
+                            <el-button type="primary" class="mt-[30px] !h-[40px] w-full" @click="handleLogin(formRef)" :loading="loading">{{ loading ? t('logging') : t('login') }}</el-button>
+                        </el-form-item>
+
+                    </el-form>
+                </div>
+            </div>
+        </el-main>
+
+        <div class="flex items-center justify-center mt-[20px] pb-[20px] text-sm text-[#999]" v-if="copyright">
+            <a :href="copyright.copyright_link" target="_blank">
+                <span class="mr-3" v-if="copyright.copyright_desc">{{ copyright.copyright_desc }}</span>
+                <span class="mr-3" v-if="copyright.company_name">{{ copyright.company_name }}</span>
+            </a>
+            <a href="https://beian.miit.gov.cn/" v-if="copyright.icp" target="_blank">
+                <span class="mr-3">{{ copyright.icp }}</span>
+            </a>
+            <a :href="copyright.gov_url" v-if="copyright.gov_record" target="_blank">
+                <span class="mr-3">{{ copyright.gov_record }}</span>
+            </a>
         </div>
-      </el-main>
-
-      <div
-        class="flex items-center justify-center mt-[20px] pb-[20px] text-sm text-[#999]"
-        v-if="copyright"
-      >
-        <a :href="copyright.copyright_link" target="_blank">
-          <span class="mr-3" v-if="copyright.copyright_desc">{{
-            copyright.copyright_desc
-          }}</span>
-          <span class="mr-3" v-if="copyright.company_name">{{
-            copyright.company_name
-          }}</span>
-        </a>
-        <a
-          href="https://beian.miit.gov.cn/"
-          v-if="copyright.icp"
-          target="_blank"
-        >
-          <span class="mr-3">{{ copyright.icp }}</span>
-        </a>
-        <a
-          :href="copyright.gov_url"
-          v-if="copyright.gov_record"
-          target="_blank"
-        >
-          <span class="mr-3">{{ copyright.gov_record }}</span>
-        </a>
-      </div>
     </template>
 
     <!-- 验证组件 -->
-    <verify
-      @success="success"
-      :mode="pop"
-      captchaType="blockPuzzle"
-      :imgSize="{ width: '330px', height: '155px' }"
-      ref="verifyRef"
-    ></verify>
+    <verify @success="success" :mode="pop" captchaType="blockPuzzle" :imgSize="{ width: '330px', height: '155px' }" ref="verifyRef"></verify>
   </el-container>
 </template>
 
@@ -130,11 +70,11 @@ const copyright = ref(null)
 const webSite = ref([])
 
 getWebCopyright().then(({ data }) => {
-  copyright.value = data
+    copyright.value = data
 })
 
 getWebConfig().then(({ data }) => {
-  webSite.value = data
+    webSite.value = data
 })
 
 route.redirectedFrom && (route.query.redirect = route.redirectedFrom.path)
@@ -149,7 +89,7 @@ const success = (params) => {
 
 const form = reactive({
   username: '',
-  password: '',
+  password: ''
 })
 
 // 获取登录配置信息
@@ -166,11 +106,11 @@ const formRef = ref<FormInstance>()
 
 const formRules = reactive<FormRules>({
   username: [
-    { required: true, message: t('userPlaceholder'), trigger: 'blur' },
+    { required: true, message: t('userPlaceholder'), trigger: 'blur' }
   ],
   password: [
-    { required: true, message: t('passwordPlaceholder'), trigger: 'blur' },
-  ],
+    { required: true, message: t('passwordPlaceholder'), trigger: 'blur' }
+  ]
 })
 
 const handleLogin = async (formEl: FormInstance | undefined) => {
@@ -178,11 +118,7 @@ const handleLogin = async (formEl: FormInstance | undefined) => {
 
   await formEl.validate((valid, fields) => {
     if (valid) {
-      if (parseInt(loginConfig.value.is_captcha)) {
-        verifyRef.value.show()
-      } else {
-        loginFn()
-      }
+      if (parseInt(loginConfig.value.is_captcha)) { verifyRef.value.show() } else { loginFn() }
     }
   })
 }
@@ -190,25 +126,20 @@ const handleLogin = async (formEl: FormInstance | undefined) => {
 // data 验证码
 const loginFn = (data = {}) => {
   loading.value = true
-  userStore
-    .login({ username: form.username, password: form.password, ...data })
-    .then((res) => {
-      const {
-        query: { redirect },
-      } = route
-      const path = typeof redirect === 'string' ? redirect : '/'
-      const url = router.resolve(path)
-      location.href = url.href
-    })
-    .catch(() => {
-      loading.value = false
-    })
+  userStore.login({ username: form.username, password: form.password, ...data }).then(res => {
+    const { query: { redirect } } = route
+    const path = typeof redirect === 'string' ? redirect : '/'
+    const url = router.resolve(path)
+    location.href = url.href
+  }).catch(() => {
+    loading.value = false
+  })
 }
 </script>
 
 <style lang="scss">
 .login-wrap {
-  background-image: url('@/app/assets/images/login/login_index_bg.jpg');
+  background-image: url("@/app/assets/images/login/login_index_bg.jpg");
   background-repeat: no-repeat;
   background-size: cover;
 }
@@ -216,13 +147,13 @@ const loginFn = (data = {}) => {
 .login-main {
   display: flex !important;
 
-  .login {
-    background: var(--el-bg-color);
-  }
+    .login {
+        background: var(--el-bg-color);
+    }
 
-  .el-form-item__error {
-    top: 45px;
-  }
+    .el-form-item__error {
+        top : 45px;
+    }
 }
 
 @media only screen and (max-width: 750px) {
diff --git a/admin/src/app/views/marketing/components/sign-continue.vue b/admin/src/app/views/marketing/components/sign-continue.vue
index 6765c08c..6c5d3e28 100644
--- a/admin/src/app/views/marketing/components/sign-continue.vue
+++ b/admin/src/app/views/marketing/components/sign-continue.vue
@@ -1,54 +1,26 @@
 <template>
-  <el-form :model="formData" :rules="formRules" class="page-form" ref="formRef">
-    <el-form-item :label="t('continueSign')" prop="continue_sign">
-      <el-input
-        class="input-width"
-        v-model.trim="formData.continue_sign"
-        @keyup="filterNumber($event)"
-        :maxlength="3"
-        clearable
-      />
-      <span class="ml-[10px]">{{ t('day') }}</span>
-    </el-form-item>
-    <el-form-item :label="t('continueSign')">
-      <div class="flex-1">
-        <div v-for="(item, index) in gifts" :key="index" class="mb-[15px]">
-          <component
-            :is="item.component"
-            v-model="formData[item.key]"
-            ref="giftRefs"
-            v-if="item.component"
-          />
-        </div>
-      </div>
-    </el-form-item>
-    <el-form-item :label="t('receiveLimit')" prop="receive_num">
-      <div>
-        <el-radio
-          class="mb-[15px]"
-          v-model="formData.receive_limit"
-          :label="1"
-          @change="radioChange($event, 1)"
-          >{{ t('noLimit') }}</el-radio
-        >
-        <div class="flex">
-          <el-radio
-            class="!mr-[15px]"
-            v-model="formData.receive_limit"
-            :label="2"
-            @change="radioChange($event, 2)"
-            >{{ t('everyOneLimit') }}</el-radio
-          >
-          <el-input
-            class="input-width"
-            v-model.trim="formData.receive_num"
-            :maxlength="5"
-            clearable
-          /><span class="ml-[10px]">{{ t('time') }}</span>
-        </div>
-      </div>
-    </el-form-item>
-  </el-form>
+    <el-form :model="formData" :rules="formRules" class="page-form" ref="formRef">
+        <el-form-item :label="t('continueSign')" prop="continue_sign">
+            <el-input class="input-width" v-model.trim="formData.continue_sign" @keyup="filterNumber($event)" :maxlength="3" clearable />
+            <span class="ml-[10px]">{{ t('day') }}</span>
+        </el-form-item>
+        <el-form-item :label="t('continueSign')" >
+            <div class="flex-1">
+                <div v-for="(item,index) in gifts" :key="index" class="mb-[15px]">
+                    <component :is="item.component" v-model="formData[item.key]" ref="giftRefs" v-if="item.component" />
+                </div>
+            </div>
+        </el-form-item>
+        <el-form-item :label="t('receiveLimit')" prop="receive_num">
+            <div>
+                <el-radio class="mb-[15px]" v-model="formData.receive_limit" :label="1" @change="radioChange($event, 1)">{{ t('noLimit') }}</el-radio>
+                <div class="flex">
+                    <el-radio class="!mr-[15px]" v-model="formData.receive_limit" :label="2" @change="radioChange($event, 2)">{{ t('everyOneLimit') }}</el-radio>
+                    <el-input class="input-width" v-model.trim="formData.receive_num" :maxlength="5" clearable /><span class="ml-[10px]">{{ t('time') }}</span>
+                </div>
+            </div>
+        </el-form-item>
+    </el-form>
 </template>
 
 <script lang="ts" setup>
@@ -61,132 +33,120 @@ import Test from '@/utils/test'
 
 const gifts = ref({})
 const props = defineProps({
-  modelValue: {
-    type: Object,
-    default: () => {
-      return {}
-    },
-  },
+    modelValue: {
+        type: Object,
+        default: () => {
+            return {}
+        }
+    }
 })
 const emits = defineEmits(['update:modelValue'])
 const formData = ref({
-  continue_sign: 0,
-  continue_tag: guid(),
-  receive_limit: 1,
-  receive_num: 0,
+    continue_sign: 0,
+    continue_tag: guid(),
+    receive_limit: 1,
+    receive_num: 0,
 })
 
 const value = computed({
-  get() {
-    return props.modelValue
-  },
-  set(value) {
-    emits('update:modelValue', value)
-  },
+    get () {
+        return props.modelValue
+    },
+    set (value) {
+        emits('update:modelValue', value)
+    }
 })
 const giftRefs = ref([])
 
-watch(
-  () => value.value,
-  (nval, oval) => {
+watch(() => value.value, (nval, oval) => {
     if ((!oval || !Object.keys(oval).length) && Object.keys(nval).length) {
-      formData.value = value.value
+        formData.value = value.value
     }
-  },
-  { immediate: true }
-)
+}, { immediate: true })
 
-watch(
-  () => formData.value,
-  () => {
+watch(() => formData.value, () => {
     value.value = formData.value
-  },
-  { deep: true }
-)
+}, { deep: true })
 
 const modules: any = import.meta.glob('@/**/*.vue')
 getGiftDict().then(({ data }) => {
-  Object.keys(data).forEach((key: string) => {
-    data[key].component &&
-      (data[key].component = defineAsyncComponent(modules[data[key].component]))
-  })
-  gifts.value = data
+    Object.keys(data).forEach((key: string) => {
+        data[key].component && (data[key].component = defineAsyncComponent(modules[data[key].component]))
+    })
+    gifts.value = data
 })
 
 const formRef = ref(null)
 // 正则表达式
 const regExp = {
-  required: /[\S]+/,
-  number: /^\d{0,10}$/,
-  digit: /^\d{0,10}(.?\d{0,2})$/,
-  special: /^\d{0,10}(.?\d{0,3})$/,
+    required: /[\S]+/,
+    number: /^\d{0,10}$/,
+    digit: /^\d{0,10}(.?\d{0,2})$/,
+    special: /^\d{0,10}(.?\d{0,3})$/
 }
 // 表单验证规则
 const formRules = reactive<FormRules>({
-  continue_sign: [
-    { required: true, message: t('continueSignPlaceholder'), trigger: 'blur' },
-    {
-      validator: (rule: any, value: any, callback: any) => {
-        if (isNaN(value) || !regExp.number.test(value)) {
-          callback(t('continueSignFormatError'))
-        } else if (value < 2 || value > 365) {
-          callback(t('continueSignBerweenDays'))
-        } else {
-          callback()
+    continue_sign: [
+        { required: true, message: t('continueSignPlaceholder'), trigger: 'blur' },
+        {            
+            validator: (rule: any, value: any, callback: any) => {
+               if (isNaN(value) || !regExp.number.test(value)) {
+                    callback(t('continueSignFormatError'))
+                } else if (value < 2 || value > 365) {
+                    callback(t('continueSignBerweenDays'))
+                } else{
+                    callback();
+                }
+            },
+            trigger: 'blur'
         }
-      },
-      trigger: 'blur',
-    },
-  ],
-  receive_num: [
-    { required: true, message: t('receiveNumPlaceholder'), trigger: 'blur' },
-    {
-      validator: (rule: any, value: any, callback: Function) => {
-        if (formData.value.receive_limit == 2) {
-          if (Test.empty(formData.value.receive_num)) {
-            callback(t('receiveNumPlaceholder'))
-          }
-          if (
-            isNaN(formData.value.receive_num) ||
-            !regExp.number.test(formData.value.receive_num)
-          ) {
-            callback(t('receiveNumFormatError'))
-          }
-          if (formData.value.receive_num <= 0) {
-            callback(t('receiveNumMustGreaterThanZeroTip'))
-          }
-          callback()
-        } else {
-          callback()
+    ],
+    receive_num: [
+        { required: true, message: t('receiveNumPlaceholder'), trigger: 'blur' },
+        {
+            validator: (rule: any, value: any, callback: Function) => {
+                if (formData.value.receive_limit == 2) {
+                    if (Test.empty(formData.value.receive_num)) {
+                        callback(t('receiveNumPlaceholder'))
+                    }
+                    if (isNaN(formData.value.receive_num) || !regExp.number.test(formData.value.receive_num)) {
+                        callback(t('receiveNumFormatError'))
+                    }
+                    if (formData.value.receive_num <= 0) {
+                        callback(t('receiveNumMustGreaterThanZeroTip'))
+                    }
+                    callback()
+                } else {
+                    callback()
+                }
+            }
         }
-      },
-    },
-  ],
+    ]
 })
 
 const verify = async () => {
-  let verify = true
-  for (let i = 0; i < giftRefs.value.length; i++) {
-    const item = giftRefs.value[i]
-    !(await item.verify()) && (verify = false)
-  }
-  await formRef.value?.validate((valid) => {
-    verify = valid
-  })
-  return verify
+    let verify = true
+    for (let i = 0; i < giftRefs.value.length; i++) {
+        const item = giftRefs.value[i]
+        !await item.verify() && (verify = false)
+    }
+    await formRef.value?.validate((valid) => {
+        verify = valid
+    })
+    return verify
 }
 
 const radioChange = (val, key) => {
-  formData[key] = val
+    formData[key] = val
 }
 
 defineExpose({
-  verify,
+    verify
 })
 </script>
 
 <style lang="scss" scoped>
 .input-width {
-  width: 100px;
+    width: 100px;
 }
 </style>
diff --git a/admin/src/app/views/marketing/components/sign-day.vue b/admin/src/app/views/marketing/components/sign-day.vue
index 2565d758..578e7b5c 100644
--- a/admin/src/app/views/marketing/components/sign-day.vue
+++ b/admin/src/app/views/marketing/components/sign-day.vue
@@ -1,12 +1,7 @@
 <template>
-  <div v-for="(item, index) in gifts" :key="index" class="day-sign">
-    <component
-      :is="item.component"
-      v-model="formData[item.key]"
-      ref="giftRefs"
-      v-if="item.component"
-    />
-  </div>
+    <div v-for="(item,index) in gifts" :key="index"  class="day-sign">
+        <component :is="item.component" v-model="formData[item.key]" ref="giftRefs" v-if="item.component" />
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -15,71 +10,62 @@ import { getGiftDict } from '@/app/api/member'
 
 const gifts = ref({})
 const props = defineProps({
-  modelValue: {
-    type: Object,
-    default: () => {
-      return {}
-    },
-  },
+    modelValue: {
+        type: Object,
+        default: () => {
+            return {}
+        }
+    }
 })
 const emits = defineEmits(['update:modelValue'])
 const formData = ref({})
 const value = computed({
-  get() {
-    return props.modelValue
-  },
-  set(value) {
-    emits('update:modelValue', value)
-  },
+    get () {
+        return props.modelValue
+    },
+    set (value) {
+        emits('update:modelValue', value)
+    }
 })
 const giftRefs = ref([])
 
-watch(
-  () => value.value,
-  (nval, oval) => {
+watch(() => value.value, (nval, oval) => {
     if ((!oval || !Object.keys(oval).length) && Object.keys(nval).length) {
-      formData.value = value.value
+        formData.value = value.value
     }
-  },
-  { immediate: true }
-)
+}, { immediate: true })
 
-watch(
-  () => formData.value,
-  () => {
+watch(() => formData.value, () => {
     value.value = formData.value
-  },
-  { deep: true }
-)
+}, { deep: true })
 
 const modules: any = import.meta.glob('@/**/*.vue')
 getGiftDict().then(({ data }) => {
-  Object.keys(data).forEach((key: string) => {
-    data[key].component &&
-      (data[key].component = defineAsyncComponent(modules[data[key].component]))
-  })
-  gifts.value = data
+    Object.keys(data).forEach((key: string) => {
+        data[key].component && (data[key].component = defineAsyncComponent(modules[data[key].component]))
+    })
+    gifts.value = data
 })
 
 const verify = async () => {
-  let verify = true
-  for (let i = 0; i < giftRefs.value.length; i++) {
-    const item = giftRefs.value[i]
-    !(await item.verify()) && (verify = false)
-  }
-  return verify
+    let verify = true
+    for (let i = 0; i < giftRefs.value.length; i++) {
+        const item = giftRefs.value[i]
+        !await item.verify() && (verify = false)
+    }
+    return verify
 }
 
 defineExpose({
-  verify,
+    verify
 })
 </script>
 
 <style lang="scss" scoped>
 .day-sign:nth-child(1) :deep(.el-form-item__error) {
-  left: 48px;
+   left:48px;
 }
 .day-sign:nth-child(2) :deep(.el-form-item__error) {
-  left: 48px;
+   left:48px;
 }
 </style>
diff --git a/admin/src/app/views/marketing/components/verify-detail.vue b/admin/src/app/views/marketing/components/verify-detail.vue
index ab27ebd2..cbc847f0 100644
--- a/admin/src/app/views/marketing/components/verify-detail.vue
+++ b/admin/src/app/views/marketing/components/verify-detail.vue
@@ -1,138 +1,100 @@
 <template>
-  <el-drawer
-    v-model="showDialog"
-    title="核销记录详情"
-    direction="rtl"
-    :before-close="handleClose"
-    class="member-detail-drawer"
-  >
-    <div class="main-container" v-loading="loading">
-      <el-tabs v-model="activeName" class="pb-[10px]" @tab-change="handleClick">
-        <el-tab-pane label="核销信息" name="verifyInfo" />
-        <el-tab-pane label="商品信息" name="goodsInfo" />
-      </el-tabs>
-      <div v-if="activeName == 'verifyInfo'">
-        <div
-          class="text-[14px] min-w-[110px] border-solid border-l-[3px] border-[var(--el-color-primary)] pl-[5px]"
-        >
-          核销信息
-        </div>
-        <el-row>
-          <el-col :span="8">
-            <div class="flex items-center mt-[15px]">
-              <span class="text-[14px] w-[130px] text-right mr-[20px]">{{
-                t('核销类型')
-              }}</span>
-              <span class="text-[14px] text-[#666666]">
-                {{ verifyData.type_name }}
-              </span>
-            </div>
-          </el-col>
-          <el-col :span="8">
-            <div class="flex items-center mt-[15px]">
-              <span class="text-[14px] w-[130px] text-right mr-[20px]">{{
-                t('核销状态')
-              }}</span>
-              <span class="text-[14px] text-[#666666]"> 已核销 </span>
-            </div>
-          </el-col>
-          <el-col :span="8">
-            <div class="flex items-center mt-[15px]">
-              <span class="text-[14px] w-[130px] text-right mr-[20px]">{{
-                t('核销人员')
-              }}</span>
-              <span class="text-[14px] text-[#666666]">
-                {{ verifyData.member ? verifyData.member.nickname : '--' }}
-              </span>
+    <el-drawer v-model="showDialog" title="核销记录详情" direction="rtl" :before-close="handleClose" class="member-detail-drawer">
+        <div class="main-container" v-loading="loading">
+            <el-tabs v-model="activeName" class="pb-[10px]" @tab-change="handleClick">
+                <el-tab-pane label="核销信息" name="verifyInfo" />
+                <el-tab-pane label="商品信息" name="goodsInfo" />
+            </el-tabs>
+            <div v-if="activeName == 'verifyInfo'">
+                <div class="text-[14px] min-w-[110px] border-solid border-l-[3px] border-[var(--el-color-primary)] pl-[5px]">核销信息</div>
+                <el-row>
+                    <el-col :span="8">
+                        <div class="flex items-center mt-[15px]">
+                            <span class="text-[14px] w-[130px] text-right mr-[20px]">{{ t('核销类型') }}</span>
+                            <span class="text-[14px] text-[#666666]">
+                                {{ verifyData.type_name }}
+                            </span>
+                        </div>
+                    </el-col>
+                    <el-col :span="8">
+                        <div class="flex items-center mt-[15px]">
+                            <span class="text-[14px] w-[130px] text-right mr-[20px]">{{ t('核销状态') }}</span>
+                            <span class="text-[14px] text-[#666666]">
+                                已核销
+                            </span>
+                        </div>
+                    </el-col>
+                    <el-col :span="8">
+                        <div class="flex items-center mt-[15px]">
+                            <span class="text-[14px] w-[130px] text-right mr-[20px]">{{ t('核销人员') }}</span>
+                            <span class="text-[14px] text-[#666666]">
+                                {{ verifyData.member ? verifyData.member.nickname : '--' }}
+                            </span>
+                        </div>
+                    </el-col>
+                    <el-col :span="8">
+                        <div class="flex items-center mt-[15px]">
+                            <span class="text-[14px] w-[130px] text-right mr-[20px]">{{ t('核销时间') }}</span>
+                            <span class="text-[14px] text-[#666666]">
+                                {{verifyData.create_time}}
+                            </span>
+                        </div>
+                    </el-col>
+                     
+                    <template v-for="(item,index) in verifyContentData.fixed">
+                        <el-col :span="8">
+                            <div class="flex items-center mt-[15px]" v-if="item.title">
+                                <span class="text-[14px] w-[130px] text-right mr-[20px]">{{ item.title }}</span>
+                                <span class="text-[14px] text-[#666666]">
+                                    {{ item.value }}
+                                </span>
+                            </div>
+                        </el-col>
+                    </template>
+                    <template v-for="(item,index) in verifyData.verify_info">
+                        <el-col :span="8" v-for="(val,key) in item">
+                            <div class="flex items-center mt-[15px]" v-if="val.name">
+                                <span class="text-[14px] w-[130px] text-right mr-[20px]">{{ val.name }}</span>
+                                <span class="text-[14px] text-[#666666]">
+                                    {{ val.value }}
+                                </span>
+                            </div>
+                        </el-col>
+                    </template>
+                </el-row>
+                <template v-for="(item,index) in verifyContentData.diy">
+                    <div class="text-[14px] min-w-[110px] border-solid border-l-[3px] border-[var(--el-color-primary)] pl-[5px] mt-[20px]">{{item.title}}</div>
+                    <el-row>
+                        <el-col  :span="8" v-for="(subItem,subIndex) in item.list" :key="subIndex">
+                            <div class="flex items-center mt-[15px]">
+                                <span class="text-[14px] w-[130px] text-right mr-[20px]">{{ subItem.title }}</span>
+                                <span class="text-[14px] text-[#666666]">
+                                    {{ subItem.value }}
+                                </span>
+                            </div>
+                        </el-col>
+                    </el-row>
+                </template>
             </div>
-          </el-col>
-          <el-col :span="8">
-            <div class="flex items-center mt-[15px]">
-              <span class="text-[14px] w-[130px] text-right mr-[20px]">{{
-                t('核销时间')
-              }}</span>
-              <span class="text-[14px] text-[#666666]">
-                {{ verifyData.create_time }}
-              </span>
+            <div v-if="activeName == 'goodsInfo'">
+                <el-table :data="verifyGoodsList" size="large">
+                    <el-table-column :label="t('商品名称')" align="left" width="300">
+                        <template #default="{ row }">
+                            <div class="flex">
+                                <div class="flex items-center shrink-0">
+                                    <img class="w-[50px] h-[50px] mr-[10px]" :src="img(row.cover)" />
+                                </div>
+                                <div class="flex flex-col">
+                                    <p class="multi-hidden text-[14px]">{{ row.name }}</p>
+                                </div>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="num" :label="t('数量')" min-width="50" align="right" />
+                </el-table>
             </div>
-          </el-col>
-
-          <template v-for="(item, index) in verifyContentData.fixed">
-            <el-col :span="8">
-              <div class="flex items-center mt-[15px]" v-if="item.title">
-                <span class="text-[14px] w-[130px] text-right mr-[20px]">{{
-                  item.title
-                }}</span>
-                <span class="text-[14px] text-[#666666]">
-                  {{ item.value }}
-                </span>
-              </div>
-            </el-col>
-          </template>
-          <template v-for="(item, index) in verifyData.verify_info">
-            <el-col :span="8" v-for="(val, key) in item">
-              <div class="flex items-center mt-[15px]" v-if="val.name">
-                <span class="text-[14px] w-[130px] text-right mr-[20px]">{{
-                  val.name
-                }}</span>
-                <span class="text-[14px] text-[#666666]">
-                  {{ val.value }}
-                </span>
-              </div>
-            </el-col>
-          </template>
-        </el-row>
-        <template v-for="(item, index) in verifyContentData.diy">
-          <div
-            class="text-[14px] min-w-[110px] border-solid border-l-[3px] border-[var(--el-color-primary)] pl-[5px] mt-[20px]"
-          >
-            {{ item.title }}
-          </div>
-          <el-row>
-            <el-col
-              :span="8"
-              v-for="(subItem, subIndex) in item.list"
-              :key="subIndex"
-            >
-              <div class="flex items-center mt-[15px]">
-                <span class="text-[14px] w-[130px] text-right mr-[20px]">{{
-                  subItem.title
-                }}</span>
-                <span class="text-[14px] text-[#666666]">
-                  {{ subItem.value }}
-                </span>
-              </div>
-            </el-col>
-          </el-row>
-        </template>
-      </div>
-      <div v-if="activeName == 'goodsInfo'">
-        <el-table :data="verifyGoodsList" size="large">
-          <el-table-column :label="t('商品名称')" align="left" width="300">
-            <template #default="{ row }">
-              <div class="flex">
-                <div class="flex items-center shrink-0">
-                  <img
-                    class="w-[50px] h-[50px] mr-[10px]"
-                    :src="img(row.cover)"
-                  />
-                </div>
-                <div class="flex flex-col">
-                  <p class="multi-hidden text-[14px]">{{ row.name }}</p>
-                </div>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="num"
-            :label="t('数量')"
-            min-width="50"
-            align="right"
-          />
-        </el-table>
-      </div>
-    </div>
-  </el-drawer>
+        </div>
+    </el-drawer>
 </template>
 
 <script lang="ts" setup>
@@ -151,14 +113,14 @@ const router = useRouter()
 
 const appStore = useAppStore()
 const activeName = ref('verifyInfo')
-const formData: Record<string, any> = ref({})
+const formData:Record<string, any> = ref({})
 
-const handleClick = (data: string) => {
-  activeName.value = data
+const handleClick = (data:string) => {
+    activeName.value = data
 }
 
 const handleClose = (done: () => void) => {
-  showDialog.value = false
+    showDialog.value = false;
 }
 
 // 获取核销信息
@@ -168,39 +130,39 @@ const verifyContentData: any = ref({})
 const verifyGoodsList: any = ref([])
 
 const getVerifyDetailFn = async () => {
-  loading.value = true
-  if (code) {
-    const data = await (await getVerifyDetail(code)).data
-    if (!data || Object.keys(data).length == 0) {
-      ElMessage.error(t('memberNull'))
-      setTimeout(() => {
-        router.go(-1)
-      }, 2000)
-      return false
+    loading.value = true
+    if (code) {
+        const data = await (await getVerifyDetail(code)).data
+        if (!data || Object.keys(data).length == 0) {
+            ElMessage.error(t('memberNull'))
+            setTimeout(() => {
+                router.go(-1)
+            }, 2000)
+            return false
+        }
+        verifyData.value = data
+        verifyContentData.value = data.value.content || {}
+        verifyGoodsList.value = data.value.list || []
+        loading.value = false
+    } else {
+        loading.value = false
     }
-    verifyData.value = data
-    verifyContentData.value = data.value.content || {}
-    verifyGoodsList.value = data.value.list || []
-    loading.value = false
-  } else {
-    loading.value = false
-  }
 }
 
 const setFormData = async (row: any = null) => {
-  console.log('setFormData', row)
-  code = row.code
-  getVerifyDetailFn()
+    console.log("setFormData",row);
+    code = row.code;
+    getVerifyDetailFn();
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
 <style lang="scss">
-.member-detail-drawer {
-  width: 1300px !important;
+.member-detail-drawer{
+    width: 1300px !important;
 }
 </style>
diff --git a/admin/src/app/views/marketing/sign_config.vue b/admin/src/app/views/marketing/sign_config.vue
index 225ad034..f53002a5 100644
--- a/admin/src/app/views/marketing/sign_config.vue
+++ b/admin/src/app/views/marketing/sign_config.vue
@@ -1,240 +1,117 @@
 <template>
-  <!--签到设置-->
-  <div class="main-container">
-    <el-form
-      class="page-form"
-      :model="formData"
-      label-width="150px"
-      ref="ruleFormRef"
-      :rules="formRules"
-      v-loading="loading"
-    >
-      <el-card class="box-card !border-none" shadow="never">
-        <h3 class="text-page-title">{{ t('signRule') }}</h3>
-
-        <el-form-item :label="t('isUse')">
-          <el-switch v-model="formData.is_use" />
-        </el-form-item>
-
-        <el-form-item
-          :label="t('signPeriod')"
-          prop="sign_period"
-          v-if="formData.is_use"
-        >
-          <el-input
-            v-model.trim="formData.sign_period"
-            @keyup="filterNumber($event)"
-            maxlength="3"
-            clearable
-            class="input-width"
-          /><span class="ml-[10px]">天</span>
-        </el-form-item>
-
-        <el-form-item
-          :label="t('daySignAward')"
-          prop="day_award"
-          v-if="formData.is_use"
-        >
-          <div v-for="(item, index) in daySignAwardText" :key="index">
-            <span v-if="item.is_use == '1'"
-              >{{ item.content }}&nbsp;&nbsp;</span
-            >
-          </div>
-          <span
-            class="cursor-pointer tutorial-btn ml-[5px]"
-            @click="daySignAwardSet"
-            v-if="formData.day_award == ''"
-            >{{ t('set') }}</span
-          >
-          <div class="flex ml-[5px]" v-else>
-            <span
-              class="cursor-pointer tutorial-btn"
-              @click="daySignAwardSet"
-              >{{ t('modify') }}</span
-            >
-            <span class="ml-[5px] mr-[5px]">|</span>
-            <span
-              class="cursor-pointer tutorial-btn"
-              @click="daySignAwardDel"
-              >{{ t('delete') }}</span
-            >
-          </div>
-          <div class="form-tip">{{ t('daySignAwardTip') }}</div>
-        </el-form-item>
-
-        <el-form-item
-          :label="t('continueSignAward')"
-          prop="continue_award"
-          v-if="formData.is_use"
-        >
-          <div>
-            <div class="form-tip">{{ t('continueSignAwardTipTop') }}</div>
-            <div class="mt-[10px]">
-              <el-table
-                :data="continueSignAwardTableData.data"
-                size="large"
-                v-loading="continueSignAwardTableData.loading"
-              >
-                <template #empty>
-                  <span>{{
-                    !continueSignAwardTableData.loading ? t('emptyData') : ''
-                  }}</span>
-                </template>
-
-                <el-table-column
-                  prop="continue_sign"
-                  :label="t('continueSign')"
-                  min-width="120"
-                />
-
-                <el-table-column
-                  :label="t('continueSignAward')"
-                  min-width="300"
-                >
-                  <template #default="{ row }">
-                    <div
-                      v-for="(item, index) in row.continue_award"
-                      :key="index"
-                    >
-                      <span v-if="item.is_use == '1'">{{ item.content }}</span>
+    <!--签到设置-->
+    <div class="main-container">
+
+        <el-form class="page-form" :model="formData" label-width="150px" ref="ruleFormRef" :rules="formRules" v-loading="loading">
+            <el-card class="box-card !border-none" shadow="never">
+                <h3 class="text-page-title">{{ t('signRule') }}</h3>
+
+                <el-form-item :label="t('isUse')">
+                    <el-switch v-model="formData.is_use" />
+                </el-form-item>
+
+                <el-form-item :label="t('signPeriod')" prop="sign_period" v-if="formData.is_use">
+                    <el-input v-model.trim="formData.sign_period" @keyup="filterNumber($event)" maxlength="3" clearable class="input-width" /><span class="ml-[10px]">天</span>
+                </el-form-item>
+
+                <el-form-item :label="t('daySignAward')" prop="day_award" v-if="formData.is_use">
+                    <div v-for="(item, index) in daySignAwardText" :key="index">
+                        <span v-if="item.is_use == '1'">{{ item.content }}&nbsp;&nbsp;</span>
                     </div>
-                  </template>
-                </el-table-column>
-
-                <el-table-column :label="t('receiveLimit')" min-width="120">
-                  <template #default="{ row }">
-                    <span v-if="row.receive_limit == 1">{{
-                      t('noLimit')
-                    }}</span>
-                    <span v-else
-                      >{{ t('everyOneLimit') }}{{ row.receive_num
-                      }}{{ t('time') }}</span
-                    >
-                  </template>
-                </el-table-column>
-
-                <el-table-column
-                  :label="t('operation')"
-                  align="right"
-                  fixed="right"
-                  width="130"
-                >
-                  <template #default="scope">
-                    <el-button
-                      type="primary"
-                      link
-                      @click="continueSignAwardModify(true, scope.$index)"
-                      >{{ t('modify') }}</el-button
-                    >
-                    <el-button
-                      type="primary"
-                      link
-                      @click="deleteContinueSignAwardEvent(scope.$index)"
-                      >{{ t('delete') }}</el-button
-                    >
-                  </template>
-                </el-table-column>
-              </el-table>
-            </div>
-            <div class="flex mt-[10px]">
-              <span
-                class="cursor-pointer tutorial-btn"
-                @click="continueSignAwardSet"
-                >{{ t('add') }}</span
-              >
+                    <span class="cursor-pointer tutorial-btn ml-[5px]" @click="daySignAwardSet" v-if="formData.day_award == ''">{{ t('set') }}</span>
+                    <div class="flex ml-[5px]" v-else>
+                        <span class="cursor-pointer tutorial-btn" @click="daySignAwardSet">{{ t('modify') }}</span>
+                        <span class="ml-[5px] mr-[5px]">|</span>
+                        <span class="cursor-pointer tutorial-btn" @click="daySignAwardDel">{{ t('delete') }}</span>
+                    </div>
+                    <div class="form-tip">{{ t('daySignAwardTip') }}</div>
+                </el-form-item>
+
+                <el-form-item :label="t('continueSignAward')" prop="continue_award" v-if="formData.is_use">
+                    <div>
+                        <div class="form-tip">{{ t('continueSignAwardTipTop') }}</div>
+                        <div class="mt-[10px]">
+                            <el-table :data="continueSignAwardTableData.data" size="large" v-loading="continueSignAwardTableData.loading">
+                                <template #empty>
+                                    <span>{{ !continueSignAwardTableData.loading ? t('emptyData') : '' }}</span>
+                                </template>
+
+                                <el-table-column prop="continue_sign" :label="t('continueSign')" min-width="120" />
+
+                                <el-table-column :label="t('continueSignAward')" min-width="300">
+                                    <template #default="{ row }">
+                                        <div v-for="(item, index) in row.continue_award" :key="index">
+                                            <span v-if="item.is_use == '1'">{{ item.content }}</span>
+                                        </div>
+                                    </template>
+                                </el-table-column>
+
+                                <el-table-column :label="t('receiveLimit')" min-width="120">
+                                    <template #default="{ row }">
+                                        <span v-if="row.receive_limit == 1">{{ t('noLimit') }}</span>
+                                        <span v-else>{{ t('everyOneLimit') }}{{ row.receive_num }}{{ t('time') }}</span>
+                                    </template>
+                                </el-table-column>
+
+                                <el-table-column :label="t('operation')" align="right" fixed="right" width="130">
+                                    <template #default="scope">
+                                        <el-button type="primary" link @click="continueSignAwardModify(true, scope.$index)">{{ t('modify') }}</el-button>
+                                        <el-button type="primary" link @click="deleteContinueSignAwardEvent(scope.$index)">{{ t('delete') }}</el-button>
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                        </div>
+                        <div class="flex mt-[10px]">
+                            <span class="cursor-pointer tutorial-btn" @click="continueSignAwardSet">{{ t('add') }}</span>
+                        </div>
+                        <div class="form-tip">{{ t('continueSignAwardTipBottom') }}</div>
+                    </div>
+                </el-form-item>
+
+                <el-form-item :label="t('ruleExplain')" prop="rule_explain" v-if="formData.is_use">
+                    <div class="flex">
+                        <el-input v-model.trim="formData.rule_explain" :placeholder="t('ruleExplainTip')" type="textarea" maxlength="500" show-word-limit rows="5" class="textarea-width" clearable />
+                        <el-button class="ml-[20px]" type="primary" @click="defaultExplainEvent()" plain>{{ t('useDefaultExplain') }}</el-button>
+                    </div>
+                </el-form-item>
+            </el-card>
+        </el-form>
+
+        <!-- 日签奖励 -->
+        <el-dialog v-model="daySignDialog" :title="t('daySignTitle')" width="1000px" :destroy-on-close="true" v-if="formData.is_use">
+            <sign-day ref="benefitsRef" v-model="formData.day_award" />
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="daySignDialog = false">{{ t('cancel') }}</el-button>
+                    <el-button type="primary" @click="setDaySignAward()">{{ t('confirm') }}</el-button>
+                </span>
+            </template>
+        </el-dialog>
+
+        <!-- 连签奖励 -->
+        <el-dialog v-model="continueSignDialog" :title="t('continueSignTitle')" width="1200px" :destroy-on-close="true" v-if="formData.is_use">
+            <sign-continue ref="continueRef" v-model="continue_award" />
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="continueSignDialog = false">{{ t('cancel') }}</el-button>
+                    <el-button type="primary" @click="setContinueSignAward()">{{ t('confirm') }}</el-button>
+                </span>
+            </template>
+        </el-dialog>
+
+        <div class="fixed-footer-wrap">
+            <div class="fixed-footer">
+                <el-button type="primary" @click="onSave(ruleFormRef)">{{ t('save') }}</el-button>
             </div>
-            <div class="form-tip">{{ t('continueSignAwardTipBottom') }}</div>
-          </div>
-        </el-form-item>
-
-        <el-form-item
-          :label="t('ruleExplain')"
-          prop="rule_explain"
-          v-if="formData.is_use"
-        >
-          <div class="flex">
-            <el-input
-              v-model.trim="formData.rule_explain"
-              :placeholder="t('ruleExplainTip')"
-              type="textarea"
-              maxlength="500"
-              show-word-limit
-              rows="5"
-              class="textarea-width"
-              clearable
-            />
-            <el-button
-              class="ml-[20px]"
-              type="primary"
-              @click="defaultExplainEvent()"
-              plain
-              >{{ t('useDefaultExplain') }}</el-button
-            >
-          </div>
-        </el-form-item>
-      </el-card>
-    </el-form>
-
-    <!-- 日签奖励 -->
-    <el-dialog
-      v-model="daySignDialog"
-      :title="t('daySignTitle')"
-      width="1000px"
-      :destroy-on-close="true"
-      v-if="formData.is_use"
-    >
-      <sign-day ref="benefitsRef" v-model="formData.day_award" />
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="daySignDialog = false">{{
-            t('cancel')
-          }}</el-button>
-          <el-button type="primary" @click="setDaySignAward()">{{
-            t('confirm')
-          }}</el-button>
-        </span>
-      </template>
-    </el-dialog>
-
-    <!-- 连签奖励 -->
-    <el-dialog
-      v-model="continueSignDialog"
-      :title="t('continueSignTitle')"
-      width="1200px"
-      :destroy-on-close="true"
-      v-if="formData.is_use"
-    >
-      <sign-continue ref="continueRef" v-model="continue_award" />
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="continueSignDialog = false">{{
-            t('cancel')
-          }}</el-button>
-          <el-button type="primary" @click="setContinueSignAward()">{{
-            t('confirm')
-          }}</el-button>
-        </span>
-      </template>
-    </el-dialog>
-
-    <div class="fixed-footer-wrap">
-      <div class="fixed-footer">
-        <el-button type="primary" @click="onSave(ruleFormRef)">{{
-          t('save')
-        }}</el-button>
-      </div>
+        </div>
+
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
 import { t } from '@/lang'
-import {
-  getSignConfig,
-  setSignConfig,
-  getMemberGiftsContent,
-} from '@/app/api/member'
+import { getSignConfig, setSignConfig, getMemberGiftsContent } from '@/app/api/member'
 import signDay from '@/app/views/marketing/components/sign-day.vue'
 import signContinue from '@/app/views/marketing/components/sign-continue.vue'
 import { FormInstance, FormRules } from 'element-plus'
@@ -256,44 +133,38 @@ let editIndex = 0 // 连签奖励修改下标
 
 // 正则表达式
 const regExp: any = {
-  required: /[\S]+/,
-  number: /^\d{0,10}$/,
-  digit: /^\d{0,10}(.?\d{0,2})$/,
-  special: /^\d{0,10}(.?\d{0,3})$/,
+    required: /[\S]+/,
+    number: /^\d{0,10}$/,
+    digit: /^\d{0,10}(.?\d{0,2})$/,
+    special: /^\d{0,10}(.?\d{0,3})$/
 }
 // 表单验证规则
 const formRules = reactive<FormRules>({
-  day_award: [
-    {
-      required: true,
-      message: t('daySignAwardPlaceholder'),
-      trigger: 'change',
-    },
-  ],
-  sign_period: [
-    {
-      required: true,
-      trigger: 'blur',
-      validator: (rule: any, value: any, callback: any) => {
-        if (value === null || value === '') {
-          callback(t('signPeriodTip'))
-        } else if (isNaN(value) || !regExp.number.test(value)) {
-          callback(t('signPeriodLimitTips'))
-        } else if (value < 2 || value > 365) {
-          callback(t('signPeriodMustZeroTips'))
-        } else {
-          callback()
+    day_award: [
+        { required: true, message: t('daySignAwardPlaceholder'), trigger: 'change' }
+    ],
+    sign_period:[{
+            required: true,
+            trigger: 'blur',
+            validator: (rule: any, value: any, callback: any) => {
+                if (value === null || value === '') {
+                    callback(t('signPeriodTip'))
+                }else if (isNaN(value) || !regExp.number.test(value)) {
+                    callback(t('signPeriodLimitTips'))
+                }else if (value < 2 || value > 365) {
+                    callback(t('signPeriodMustZeroTips'))
+                } else {
+                    callback();
+                }
         }
-      },
-    },
-  ],
+    }],
 })
 
 /**
  * 签到奖励文本请求参数
  */
 const contentData = reactive<Record<string, any>>({
-  gifts: [],
+    gifts: [],
 })
 
 /**
@@ -302,62 +173,63 @@ const contentData = reactive<Record<string, any>>({
 const continueSignAwardText = ref([])
 
 const formData = reactive<Record<string, any>>({
-  is_use: 0,
-  sign_period: 30,
-  day_award: '',
-  continue_award: [],
-  rule_explain: '',
+    is_use: 0,
+    sign_period: 30,
+    day_award: '',
+    continue_award: [],
+    rule_explain: '',
 })
 
 const newArr = reactive<Record<string, any>>({
-  receive_num: '',
-  continue_sign: '',
-  receive_limit: '',
-  continue_award: [],
+    receive_num: '',
+    continue_sign: '',
+    receive_limit: '',
+    continue_award: []
 })
 
 /**
  * 连签奖励table数据
  */
 const continueSignAwardTableData = reactive<Record<string, any>>({
-  loading: false,
-  data: [],
+    loading: false,
+    data: []
 })
 
 /**
  * 获取显示签到设置
  */
 const setFormData = async () => {
-  const data = await (await getSignConfig()).data
-  Object.keys(formData).forEach((key: string) => {
-    if (data[key] != undefined) formData[key] = data[key]
-  })
+    const data = await (await getSignConfig()).data
+    Object.keys(formData).forEach((key: string) => {
+        if (data[key] != undefined) formData[key] = data[key]
+    })
 
-  if (formData.day_award) {
-    contentData.gifts = formData.day_award
-    setMemberBenefitsContent()
-  }
+    if (formData.day_award) {
+        contentData.gifts = formData.day_award
+        setMemberBenefitsContent()
+    }
 
-  if (formData.continue_award) {
-    formData.continue_award.forEach((item: any, index: number) => {
-      continueSignAwardTableData.data.push(cloneDeep(item))
+    if (formData.continue_award) {
+        formData.continue_award.forEach((item: any, index: number) => {
 
-      contentData.gifts = []
+            continueSignAwardTableData.data.push(cloneDeep(item))
 
-      const val = cloneDeep(item)
+            contentData.gifts = [];
 
-      delete val['continue_sign']
-      delete val['continue_tag']
-      delete val['receive_limit']
-      delete val['receive_num']
+            const val = cloneDeep(item)
 
-      contentData.gifts = val
+            delete val['continue_sign'];
+            delete val['continue_tag'];
+            delete val['receive_limit'];
+            delete val['receive_num'];
 
-      setMemberBenefitsContents(contentData, item, index)
-    })
-  }
+            contentData.gifts = val
 
-  loading.value = false
+            setMemberBenefitsContents(contentData, item, index)
+        })
+    }
+
+    loading.value = false
 }
 setFormData()
 
@@ -366,11 +238,11 @@ setFormData()
  */
 const daySignAwardText = ref([])
 const setMemberBenefitsContent = async () => {
-  const data = await (await getMemberGiftsContent(contentData)).data
-  daySignAwardText.value = []
-  Object.values(data).forEach((el: any) => {
-    daySignAwardText.value.push(el)
-  })
+    const data = await (await getMemberGiftsContent(contentData)).data
+    daySignAwardText.value = [];
+    Object.values(data).forEach((el: any) => {
+        daySignAwardText.value.push(el)
+    })
 }
 
 /**
@@ -380,61 +252,55 @@ const setMemberBenefitsContent = async () => {
  * @param index 数组索引
  * @param tag 0默认数据加载
  */
-const setMemberBenefitsContents = async (
-  content: any,
-  item: any,
-  index: number = 0,
-  tag = 0
-) => {
-  const data = await (await getMemberGiftsContent(content)).data
-  continueSignAwardText.value = []
-  Object.values(data).forEach((el: any) => {
-    continueSignAwardText.value.push(el)
-  })
-
-  newArr.receive_num = item.receive_num
-  newArr.continue_sign = item.continue_sign
-  newArr.receive_limit = item.receive_limit
-  newArr.continue_award = continueSignAwardText.value
-
-  if (!isEdit) {
-    if (tag == 0) {
-      continueSignAwardTableData.data.splice(index, 1, cloneDeep(newArr))
+const setMemberBenefitsContents = async (content: any, item: any, index: number = 0, tag = 0) => {
+    const data = await (await getMemberGiftsContent(content)).data
+    continueSignAwardText.value = [];
+    Object.values(data).forEach((el: any) => {
+        continueSignAwardText.value.push(el)
+    })
+
+    newArr.receive_num = item.receive_num
+    newArr.continue_sign = item.continue_sign
+    newArr.receive_limit = item.receive_limit
+    newArr.continue_award = continueSignAwardText.value
+
+    if (!isEdit) {
+        if (tag == 0) {
+            continueSignAwardTableData.data.splice(index, 1, cloneDeep(newArr))
+        } else {
+            continueSignAwardTableData.data.push(cloneDeep(newArr))
+        }
     } else {
-      continueSignAwardTableData.data.push(cloneDeep(newArr))
+        continueSignAwardTableData.data.splice(editIndex, 1, cloneDeep(newArr))
     }
-  } else {
-    continueSignAwardTableData.data.splice(editIndex, 1, cloneDeep(newArr))
-  }
 
-  isEdit = false
-  editIndex = 0
+    isEdit = false
+    editIndex = 0
+
 }
 
 /**
  * 设置签到设置
  */
 const onSave = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  await formEl.validate((valid) => {
-    if (valid) {
-      const save = cloneDeep(formData)
-      setSignConfig(save)
-        .then(() => {
-          loading.value = false
-        })
-        .catch(() => {
-          loading.value = false
-        })
-    }
-  })
+    if (loading.value || !formEl) return
+    await formEl.validate((valid) => {
+        if (valid) {
+            const save = cloneDeep(formData)
+            setSignConfig(save).then(() => {
+                loading.value = false
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
 }
 
 /**
  * 打开日签奖励设置页
  */
 const daySignAwardSet = () => {
-  daySignDialog.value = true
+    daySignDialog.value = true
 }
 
 /**
@@ -442,45 +308,41 @@ const daySignAwardSet = () => {
  */
 const benefitsRef = ref(null)
 const setDaySignAward = async () => {
-  if (!(await benefitsRef.value?.verify())) return
-  daySignDialog.value = false
-  if (
-    !formData.day_award.hasOwnProperty('balance') &&
-    !formData.day_award.hasOwnProperty('point') &&
-    formData.day_award.shop_coupon.is_use == 0
-  ) {
-    formData.day_award = ''
-  }
-  contentData.gifts = formData.day_award
+    if (!await benefitsRef.value?.verify()) return
+    daySignDialog.value = false
+    if (!formData.day_award.hasOwnProperty('balance') && !formData.day_award.hasOwnProperty('point') && formData.day_award.shop_coupon.is_use == 0) {
+        formData.day_award = ''
+    }
+    contentData.gifts = formData.day_award
 
-  setMemberBenefitsContent()
+    setMemberBenefitsContent()
 }
 
 /**
  * 日签奖励删除
  */
 const daySignAwardDel = () => {
-  formData.day_award = ''
-  daySignAwardText.value = []
+    formData.day_award = ''
+    daySignAwardText.value = []
 }
 
 /**
  * 打开连签奖励设置页
  */
 const continueSignAwardSet = () => {
-  continue_award.value = ''
-  continueSignDialog.value = true
+    continue_award.value = ''
+    continueSignDialog.value = true
 }
 
 /**
  * 修改连签奖励设置页
  */
 const continueSignAwardModify = (flag: boolean, index: any) => {
-  isEdit = flag
-  editIndex = index
+    isEdit = flag;
+    editIndex = index;
 
-  continue_award.value = formData.continue_award[index]
-  continueSignDialog.value = true
+    continue_award.value = formData.continue_award[index]
+    continueSignDialog.value = true
 }
 
 /**
@@ -488,77 +350,69 @@ const continueSignAwardModify = (flag: boolean, index: any) => {
  */
 const continueRef = ref(null)
 const setContinueSignAward = async () => {
-  if (!(await continueRef.value?.verify())) return
-  continueSignDialog.value = false
-
-  if (
-    !continue_award.value.hasOwnProperty('balance') &&
-    !continue_award.value.hasOwnProperty('point') &&
-    continue_award.value.shop_coupon.is_use == 0
-  ) {
-    continue_award.value = ''
-  }
+    if (!await continueRef.value?.verify()) return
+    continueSignDialog.value = false
 
-  if (Object.keys(continue_award.value).length > 0) {
-    const val = cloneDeep(continue_award.value)
+    if (!continue_award.value.hasOwnProperty('balance') && !continue_award.value.hasOwnProperty('point') && continue_award.value.shop_coupon.is_use == 0) {
+        continue_award.value = ''
+    }
 
-    delete val['continue_sign']
-    delete val['continue_tag']
-    delete val['receive_limit']
-    delete val['receive_num']
+    if (Object.keys(continue_award.value).length > 0) {
+        const val = cloneDeep(continue_award.value)
 
-    contentData.gifts = val
+        delete val['continue_sign'];
+        delete val['continue_tag'];
+        delete val['receive_limit'];
+        delete val['receive_num'];
 
-    let index = 0
-    if (formData.continue_award.length > 0) {
-      index = formData.continue_award.length - 1
-    }
+        contentData.gifts = val
 
-    setMemberBenefitsContents(contentData, continue_award.value, 0, 1)
+        let index = 0;
+        if (formData.continue_award.length > 0) {
+            index = formData.continue_award.length - 1
+        }
 
-    if (!isEdit) {
-      formData.continue_award.push(cloneDeep(continue_award.value))
-    } else {
-      formData.continue_award.splice(
-        editIndex,
-        1,
-        cloneDeep(continue_award.value)
-      )
+        setMemberBenefitsContents(contentData, continue_award.value, 0, 1)
+
+        if (!isEdit) {
+            formData.continue_award.push(cloneDeep(continue_award.value))
+        } else {
+            formData.continue_award.splice(editIndex, 1, cloneDeep(continue_award.value))
+        }
     }
-  }
 }
 
 /**
  * 连签奖励删除
  */
 const deleteContinueSignAwardEvent = (index: number) => {
-  continueSignAwardTableData.data.splice(index, 1)
-  formData.continue_award.splice(index, 1)
+    continueSignAwardTableData.data.splice(index, 1)
+    formData.continue_award.splice(index, 1)
 }
 
 /**
  * 使用默认说明
  */
 const defaultExplainEvent = () => {
-  formData.rule_explain = t('ruleExplainDefault')
+    formData.rule_explain = t('ruleExplainDefault');
 }
 </script>
 
 <style lang="scss" scoped>
-.input-width {
-  width: 100px;
-}
+    .input-width {
+        width: 100px;
+    }
 
-.textarea-width {
-  width: 400px;
-}
+    .textarea-width {
+        width: 400px;
+    }
 
-.el-form .form-tip {
-  line-height: 1.5;
-  margin-top: 5px;
-}
+    .el-form .form-tip {
+        line-height: 1.5;
+        margin-top: 5px;
+    }
 
-.tutorial-btn {
-  color: var(--el-color-primary);
-}
+    .tutorial-btn {
+        color: var(--el-color-primary);
+    }
 </style>
diff --git a/admin/src/app/views/marketing/sign_list.vue b/admin/src/app/views/marketing/sign_list.vue
index fff04516..eaf5fc80 100644
--- a/admin/src/app/views/marketing/sign_list.vue
+++ b/admin/src/app/views/marketing/sign_list.vue
@@ -1,146 +1,89 @@
 <template>
-  <!--签到记录-->
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
+    <!--签到记录-->
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
 
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="memberSignListTableData.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('memberInfo')" prop="keywords">
-            <el-input
-              v-model.trim="memberSignListTableData.searchParam.keywords"
-              class="w-[240px]"
-              :placeholder="t('memberInfoPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('createTime')" prop="create_time">
-            <el-date-picker
-              v-model="memberSignListTableData.searchParam.create_time"
-              type="datetimerange"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              :start-placeholder="t('startDate')"
-              :end-placeholder="t('endDate')"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="loadMemberSignList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+            </div>
 
-      <div class="mt-[10px]">
-        <el-table
-          :data="memberSignListTableData.data"
-          size="large"
-          v-loading="memberSignListTableData.loading"
-        >
-          <template #empty>
-            <span>{{
-              !memberSignListTableData.loading ? t('emptyData') : ''
-            }}</span>
-          </template>
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="memberSignListTableData.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('memberInfo')" prop="keywords">
+                        <el-input v-model.trim="memberSignListTableData.searchParam.keywords" class="w-[240px]" :placeholder="t('memberInfoPlaceholder')" />
+                    </el-form-item>
+                    <el-form-item :label="t('createTime')" prop="create_time">
+                        <el-date-picker v-model="memberSignListTableData.searchParam.create_time" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="loadMemberSignList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
 
-          <el-table-column
-            prop="member_id"
-            :label="t('memberId')"
-            min-width="100"
-            :show-overflow-tooltip="true"
-          >
-            <template #default="{ row }">
-              {{ row.member.member_no }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            :label="t('memberInfo')"
-            min-width="140"
-            :show-overflow-tooltip="true"
-          >
-            <template #default="{ row }">
-              <div
-                class="flex items-center cursor-pointer"
-                @click="toMember(row.member_id)"
-              >
-                <img
-                  class="w-[50px] h-[50px] mr-[10px]"
-                  v-if="row.member.headimg"
-                  :src="img(row.member.headimg)"
-                  alt=""
-                />
-                <img
-                  class="w-[50px] h-[50px] mr-[10px] rounded-full"
-                  v-else
-                  src="@/app/assets/images/member_head.png"
-                  alt=""
-                />
-                <div class="flex flex flex-col">
-                  <span>{{ row.member.nickname || '' }}</span>
-                </div>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="mobile" :label="t('mobile')" min-width="90">
-            <template #default="{ row }">
-              {{ row.member.mobile || '' }}
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('days')" min-width="110">
-            <template #default="{ row }">
-              {{ row.days }}{{ t('day') }}
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('dayAward')" min-width="100">
-            <template #default="{ row }">
-              <div v-if="row.day_award">
-                <template v-for="item in row.day_award">
-                  <div v-if="item.content">{{ item.content }}</div>
-                </template>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('continueAward')" min-width="150">
-            <template #default="{ row }">
-              <div v-if="row.continue_award">
-                <template v-for="item in row.continue_award">
-                  <div v-if="item.content">{{ item.content }}</div>
-                </template>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="create_time"
-            :show-overflow-tooltip="true"
-            :label="t('createTime')"
-            min-width="150"
-          />
-        </el-table>
+            <div class="mt-[10px]">
+                <el-table :data="memberSignListTableData.data" size="large" v-loading="memberSignListTableData.loading">
+                    <template #empty>
+                        <span>{{ !memberSignListTableData.loading ? t('emptyData') : '' }}</span>
+                    </template>
+
+                    <el-table-column prop="member_id" :label="t('memberId')" min-width="100" :show-overflow-tooltip="true">
+                        <template #default="{ row }">
+                            {{ row.member.member_no }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('memberInfo')" min-width="140" :show-overflow-tooltip="true">
+                        <template #default="{ row }">
+                            <div class="flex items-center cursor-pointer" @click="toMember(row.member_id)">
+                                <img class="w-[50px] h-[50px] mr-[10px]" v-if="row.member.headimg" :src="img(row.member.headimg)" alt="">
+                                <img class="w-[50px] h-[50px] mr-[10px] rounded-full" v-else src="@/app/assets/images/member_head.png" alt="">
+                                <div class="flex flex flex-col">
+                                    <span>{{ row.member.nickname || '' }}</span>
+                                </div>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="mobile" :label="t('mobile')" min-width="90">
+                        <template #default="{ row }">
+                            {{ row.member.mobile || '' }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('days')" min-width="110">
+                        <template #default="{ row }">
+                            {{ row.days }}{{ t('day') }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('dayAward')" min-width="100">
+                        <template #default="{ row }">
+                            <div v-if="row.day_award">
+                                <template v-for="item in row.day_award">
+                                    <div v-if="item.content">{{ item.content }}</div>
+                                </template>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('continueAward')" min-width="150">
+                        <template #default="{ row }">
+                            <div v-if="row.continue_award">
+                                <template v-for="item in row.continue_award">
+                                    <div v-if="item.content">{{ item.content }}</div>
+                                </template>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="create_time" :show-overflow-tooltip="true" :label="t('createTime')" min-width="150" />
+                </el-table>
 
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="memberSignListTableData.page"
-            v-model:page-size="memberSignListTableData.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="memberSignListTableData.total"
-            @size-change="loadMemberSignList()"
-            @current-change="loadMemberSignList"
-          />
-        </div>
-      </div>
-    </el-card>
-  </div>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="memberSignListTableData.page"
+                        v-model:page-size="memberSignListTableData.limit" layout="total, sizes, prev, pager, next, jumper"
+                        :total="memberSignListTableData.total" @size-change="loadMemberSignList()"
+                        @current-change="loadMemberSignList" />
+                </div>
+            </div>
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -156,45 +99,43 @@ const router = useRouter()
 const pageName = route.meta.title
 
 const memberSignListTableData = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    keywords: '',
-    create_time: '',
-    member_id: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        keywords: '',
+        create_time: '',
+        member_id: ''
+    }
 })
 
 const searchFormRef = ref<FormInstance>()
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadMemberSignList()
+    if (!formEl) return
+    formEl.resetFields()
+    loadMemberSignList()
 }
 
 /**
  * 获取会员账单表列表
  */
 const loadMemberSignList = (page: number = 1) => {
-  memberSignListTableData.loading = true
-  memberSignListTableData.page = page
+    memberSignListTableData.loading = true
+    memberSignListTableData.page = page
 
-  getMemberSignList({
-    page: memberSignListTableData.page,
-    limit: memberSignListTableData.limit,
-    ...memberSignListTableData.searchParam,
-  })
-    .then((res) => {
-      memberSignListTableData.loading = false
-      memberSignListTableData.data = res.data.data
-      memberSignListTableData.total = res.data.total
-    })
-    .catch(() => {
-      memberSignListTableData.loading = false
+    getMemberSignList({
+        page: memberSignListTableData.page,
+        limit: memberSignListTableData.limit,
+        ...memberSignListTableData.searchParam
+    }).then(res => {
+        memberSignListTableData.loading = false
+        memberSignListTableData.data = res.data.data
+        memberSignListTableData.total = res.data.total
+    }).catch(() => {
+        memberSignListTableData.loading = false
     })
 }
 loadMemberSignList()
@@ -203,7 +144,7 @@ loadMemberSignList()
  * 会员详情
  */
 const toMember = (member_id: number) => {
-  router.push(`/member/detail?id=${member_id}`)
+    router.push(`/member/detail?id=${member_id}`)
 }
 </script>
 
diff --git a/admin/src/app/views/marketing/verifier.vue b/admin/src/app/views/marketing/verifier.vue
index 40a7171c..59faf021 100644
--- a/admin/src/app/views/marketing/verifier.vue
+++ b/admin/src/app/views/marketing/verifier.vue
@@ -1,176 +1,88 @@
 <template>
-  <!--核销员-->
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-        <el-button type="primary" @click="addEvent">{{
-          t('addVerifier')
-        }}</el-button>
-      </div>
-
-      <div class="mt-[20px]">
-        <el-table
-          :data="verifierTable.data"
-          size="large"
-          v-loading="verifierTable.loading"
-        >
-          <template #empty>
-            <span>{{ !verifierTable.loading ? t('emptyData') : '' }}</span>
-          </template>
-
-          <el-table-column :label="t('memberInfo')" min-width="120">
-            <template #default="{ row }">
-              <div
-                class="flex items-center cursor-pointer"
-                @click="toMember(row.member.member_id)"
-                v-if="row.member"
-              >
-                <img
-                  class="w-[50px] h-[50px] mr-[10px]"
-                  v-if="row.member.headimg"
-                  :src="img(row.member.headimg)"
-                  alt=""
-                />
-                <img
-                  class="w-[50px] h-[50px] mr-[10px] rounded-full"
-                  v-else
-                  src="@/app/assets/images/member_head.png"
-                  alt=""
-                />
-                <div class="flex flex flex-col">
-                  <span>{{ row.member.nickname || '' }}</span>
-                  <span>{{ row.member.mobile || '' }}</span>
-                </div>
-              </div>
-            </template>
-          </el-table-column>
-
-          <el-table-column :label="t('verifyType')" min-width="120">
-            <template #default="{ row }">
-              <div class="flex flex-col">
-                <div
-                  v-for="(item, key) in row.verify_type_array"
-                  class="my-[3px]"
-                  :key="key"
-                >
-                  {{ item.verify_type_name }}
+    <!--核销员-->
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+                <el-button type="primary" @click="addEvent">{{ t('addVerifier') }}</el-button>
+            </div>
+
+            <div class="mt-[20px]">
+                <el-table :data="verifierTable.data" size="large" v-loading="verifierTable.loading">
+                    <template #empty>
+                        <span>{{ !verifierTable.loading ? t('emptyData') : '' }}</span>
+                    </template>
+
+                    <el-table-column :label="t('memberInfo')" min-width="120">
+                        <template #default="{ row }">
+                            <div class="flex items-center cursor-pointer " @click="toMember(row.member.member_id)" v-if="row.member">
+                                <img class="w-[50px] h-[50px] mr-[10px]" v-if="row.member.headimg" :src="img(row.member.headimg)" alt="">
+                                <img class="w-[50px] h-[50px] mr-[10px] rounded-full" v-else src="@/app/assets/images/member_head.png" alt="">
+                                <div class="flex flex flex-col">
+                                    <span>{{ row.member.nickname || '' }}</span>
+                                    <span>{{ row.member.mobile || '' }}</span>
+                                </div>
+                            </div>
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column :label="t('verifyType')" min-width="120">
+                        <template #default="{ row }">
+                            <div class="flex flex-col">
+                                <div v-for="(item, key) in row.verify_type_array" class="my-[3px]" :key="key">
+                                    {{ item.verify_type_name }}
+                                </div>
+                            </div>
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column :label="t('createTime')" prop="create_time" min-width="120" />
+
+                    <el-table-column :label="t('operation')" fixed="right" align="right" width="100">
+                        <template #default="{ row }">
+                            <el-button type="primary" link @click="deleteEvent(row.id)">{{ t('delete') }}</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="verifierTable.page" v-model:page-size="verifierTable.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="verifierTable.total"
+                        @size-change="loadVerifierList()" @current-change="loadVerifierList" />
                 </div>
-              </div>
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            :label="t('createTime')"
-            prop="create_time"
-            min-width="120"
-          />
-
-          <el-table-column
-            :label="t('operation')"
-            fixed="right"
-            align="right"
-            width="100"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="deleteEvent(row.id)">{{
-                t('delete')
-              }}</el-button>
+            </div>
+        </el-card>
+
+        <el-dialog v-model="showDialog" :title="t('addVerifier')" width="500px" :destroy-on-close="true">
+            <el-form :model="formData" label-width="90px" ref="formRef" :rules="formRules" class="page-form" v-loading="addLoading">
+                <el-form-item :label="t('member')" prop="member_id">
+                    <el-select v-model="formData.member_id" filterable remote reserve-keyword clearable :placeholder="t('searchPlaceholder')" :remote-method="searchMember" :loading="searchLoading" class="input-width">
+                        <el-option v-for="item in memberList" :key="item.member_id" :label="item.nickname" :value="item.member_id" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item :label="t('verifyType')" prop="verify_type">
+                    <el-select v-model="formData.verify_type" multiple collapse-tags clearable :placeholder="t('verifyTypePlaceholder')" class="input-width">
+                        <el-option v-for="(item, index) in verifyTypeList" :key="index" :label="item.name" :value="index" />
+                    </el-select>
+                </el-form-item>
+            </el-form>
+
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                    <el-button type="primary" :loading="addLoading" @click="addVerifiers(formRef)">{{ t('confirm') }}</el-button>
+                </span>
             </template>
-          </el-table-column>
-        </el-table>
-
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="verifierTable.page"
-            v-model:page-size="verifierTable.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="verifierTable.total"
-            @size-change="loadVerifierList()"
-            @current-change="loadVerifierList"
-          />
-        </div>
-      </div>
-    </el-card>
-
-    <el-dialog
-      v-model="showDialog"
-      :title="t('addVerifier')"
-      width="500px"
-      :destroy-on-close="true"
-    >
-      <el-form
-        :model="formData"
-        label-width="90px"
-        ref="formRef"
-        :rules="formRules"
-        class="page-form"
-        v-loading="addLoading"
-      >
-        <el-form-item :label="t('member')" prop="member_id">
-          <el-select
-            v-model="formData.member_id"
-            filterable
-            remote
-            reserve-keyword
-            clearable
-            :placeholder="t('searchPlaceholder')"
-            :remote-method="searchMember"
-            :loading="searchLoading"
-            class="input-width"
-          >
-            <el-option
-              v-for="item in memberList"
-              :key="item.member_id"
-              :label="item.nickname"
-              :value="item.member_id"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="t('verifyType')" prop="verify_type">
-          <el-select
-            v-model="formData.verify_type"
-            multiple
-            collapse-tags
-            clearable
-            :placeholder="t('verifyTypePlaceholder')"
-            class="input-width"
-          >
-            <el-option
-              v-for="(item, index) in verifyTypeList"
-              :key="index"
-              :label="item.name"
-              :value="index"
-            />
-          </el-select>
-        </el-form-item>
-      </el-form>
-
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-          <el-button
-            type="primary"
-            :loading="addLoading"
-            @click="addVerifiers(formRef)"
-            >{{ t('confirm') }}</el-button
-          >
-        </span>
-      </template>
-    </el-dialog>
-  </div>
+        </el-dialog>
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
 import { t } from '@/lang'
 import { useRouter, useRoute } from 'vue-router'
-import {
-  getVerifierList,
-  deleteVerifier,
-  addVerifier,
-  getVerifyTypeList,
-} from '@/app/api/verify'
+import { getVerifierList, deleteVerifier, addVerifier, getVerifyTypeList } from '@/app/api/verify'
 import { getMemberList } from '@/app/api/member'
 import { ElMessageBox, FormInstance } from 'element-plus'
 import { img } from '@/utils/common'
@@ -182,44 +94,42 @@ const pageName = route.meta.title
 const showDialog = ref(false)
 const addLoading = ref(false)
 const formData: Record<string, any> = reactive({
-  member_id: '',
-  verify_type: '',
+    member_id: '',
+    verify_type: '',
 })
 
 const formRules = reactive({
-  member_id: [
-    { required: true, message: t('memberIdPlaceholder'), trigger: 'blur' },
-  ],
+    member_id: [
+        { required: true, message: t('memberIdPlaceholder'), trigger: 'blur' }
+    ]
 })
 const formRef = ref<FormInstance>()
 
 const verifierTable = reactive<any>({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: []
 })
 
 /**
  * 获取核销员表列表
  */
 const loadVerifierList = (page: number = 1) => {
-  verifierTable.loading = true
-  verifierTable.page = page
-
-  getVerifierList({
-    page: verifierTable.page,
-    limit: verifierTable.limit,
-    ...verifierTable.searchParam,
-  })
-    .then((res) => {
-      verifierTable.loading = false
-      verifierTable.data = res.data.data
-      verifierTable.total = res.data.total
-    })
-    .catch(() => {
-      verifierTable.loading = false
+    verifierTable.loading = true
+    verifierTable.page = page
+
+    getVerifierList({
+        page: verifierTable.page,
+        limit: verifierTable.limit,
+        ...verifierTable.searchParam
+    }).then(res => {
+        verifierTable.loading = false
+        verifierTable.data = res.data.data
+        verifierTable.total = res.data.total
+    }).catch(() => {
+        verifierTable.loading = false
     })
 }
 loadVerifierList()
@@ -228,22 +138,24 @@ loadVerifierList()
  * 添加核销员表
  */
 const addEvent = () => {
-  showDialog.value = true
+    showDialog.value = true
 }
 
 /**
  * 删除核销员表
  */
 const deleteEvent = (id: number) => {
-  ElMessageBox.confirm(t('verifierDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    deleteVerifier(id).then(() => {
-      loadVerifierList()
+    ElMessageBox.confirm(t('verifierDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        deleteVerifier(id).then(() => {
+            loadVerifierList()
+        })
     })
-  })
 }
 
 /**
@@ -251,25 +163,23 @@ const deleteEvent = (id: number) => {
  * @param formEl
  */
 const addVerifiers = async (formEl: FormInstance | undefined) => {
-  if (addLoading.value || !formEl) return
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      addLoading.value = true
-
-      addVerifier(formData)
-        .then((res) => {
-          addLoading.value = false
-          showDialog.value = false
-          formData.member_id = ''
-          formData.verify_type = ''
-          loadVerifierList()
-        })
-        .catch(() => {
-          addLoading.value = false
-        })
-    }
-  })
+    if (addLoading.value || !formEl) return
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            addLoading.value = true
+
+            addVerifier(formData).then(res => {
+                addLoading.value = false
+                showDialog.value = false
+                formData.member_id = ''
+                formData.verify_type = ''
+                loadVerifierList()
+            }).catch(() => {
+                addLoading.value = false
+            })
+        }
+    })
 }
 
 /**
@@ -278,18 +188,16 @@ const addVerifiers = async (formEl: FormInstance | undefined) => {
 const memberList = ref<any>([])
 const searchLoading = ref(false)
 const searchMember = (query: string) => {
-  if (query) {
-    searchLoading.value = true
-    getMemberList({ keyword: query })
-      .then((res) => {
-        memberList.value = res.data.data
+    if (query) {
+        searchLoading.value = true
+        getMemberList({ keyword: query }).then(res => {
+            memberList.value = res.data.data
+            searchLoading.value = false
+        }).catch()
+    } else {
+        memberList.value = []
         searchLoading.value = false
-      })
-      .catch()
-  } else {
-    memberList.value = []
-    searchLoading.value = false
-  }
+    }
 }
 
 /**
@@ -297,20 +205,19 @@ const searchMember = (query: string) => {
  */
 const verifyTypeList = ref<any>([])
 const setVerifyTypeList = () => {
-  getVerifyTypeList()
-    .then((res) => {
-      verifyTypeList.value = res.data
-    })
-    .catch()
+    getVerifyTypeList().then(res => {
+        verifyTypeList.value = res.data
+    }).catch()
 }
-setVerifyTypeList()
+setVerifyTypeList();
 
 /**
  * 会员详情
  */
 const toMember = (member_id: number) => {
-  router.push(`/member/detail?id=${member_id}`)
+    router.push(`/member/detail?id=${member_id}`)
 }
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/marketing/verify.vue b/admin/src/app/views/marketing/verify.vue
index b5865147..b3886948 100644
--- a/admin/src/app/views/marketing/verify.vue
+++ b/admin/src/app/views/marketing/verify.vue
@@ -1,149 +1,73 @@
 <template>
-  <!--核销记录-->
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
-
-      <el-card
-        class="box-card mt-[10px] !border-none table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="recordTable.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('verifyCode')" prop="code">
-            <el-input
-              v-model.trim="recordTable.searchParam.code"
-              :placeholder="t('verifyCodePlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('verifyType')" prop="type">
-            <el-select
-              v-model="recordTable.searchParam.type"
-              clearable
-              :placeholder="t('verifyTypePlaceholder')"
-              class="input-width"
-            >
-              <el-option :label="t('selectPlaceholder')" value="" />
-              <el-option
-                :label="item.name"
-                :value="key"
-                v-for="(item, key) in verifyTypeList"
-                :key="key"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="t('verifyer')" prop="verifier_member_id">
-            <el-select
-              v-model="recordTable.searchParam.verifier_member_id"
-              clearable
-              :placeholder="t('verifierPlaceholder')"
-              class="input-width"
-            >
-              <el-option :label="t('selectPlaceholder')" value="" />
-              <el-option
-                :label="item.member.nickname"
-                :value="item.member_id"
-                v-for="(item, key) in verifierList"
-                :key="key"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="t('verifyTime')" prop="create_time">
-            <el-date-picker
-              v-model="recordTable.searchParam.create_time"
-              type="datetimerange"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              :start-placeholder="t('startDate')"
-              :end-placeholder="t('endDate')"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="loadRecordList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
-
-      <div class="mt-[10px]">
-        <el-table
-          :data="recordTable.data"
-          size="large"
-          v-loading="recordTable.loading"
-        >
-          <template #empty>
-            <span>{{ !recordTable.loading ? t('emptyData') : '' }}</span>
-          </template>
-
-          <el-table-column
-            prop="code"
-            :show-overflow-tooltip="true"
-            :label="t('verifyCode')"
-            align="left"
-            min-width="150"
-          />
-          <el-table-column
-            prop="type_name"
-            :label="t('verifyType')"
-            align="left"
-            min-width="150"
-          />
-          <el-table-column
-            :label="t('verifyTime')"
-            min-width="180"
-            align="center"
-            :show-overflow-tooltip="true"
-          >
-            <template #default="{ row }">
-              {{ row.create_time || '' }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="member.nickname"
-            :label="t('verifyer')"
-            min-width="180"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            :label="t('operation')"
-            align="right"
-            fixed="right"
-            width="100"
-          >
-            <template #default="{ row }">
-              <div class="flex justify-end">
-                <el-button type="primary" link @click="detailEvent(row)">{{
-                  t('详情')
-                }}</el-button>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="recordTable.page"
-            v-model:page-size="recordTable.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="recordTable.total"
-            @size-change="loadRecordList()"
-            @current-change="loadRecordList"
-          />
-        </div>
-      </div>
-
-      <verify-detail ref="verifyDetailDialog" />
-    </el-card>
-  </div>
+    <!--核销记录-->
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+            </div>
+
+            <el-card class="box-card mt-[10px] !border-none table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="recordTable.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('verifyCode')" prop="code">
+                        <el-input v-model.trim="recordTable.searchParam.code" :placeholder="t('verifyCodePlaceholder')" />
+                    </el-form-item>
+                    <el-form-item :label="t('verifyType')" prop="type">
+                        <el-select v-model="recordTable.searchParam.type" clearable :placeholder="t('verifyTypePlaceholder')" class="input-width">
+                            <el-option :label="t('selectPlaceholder')" value="" />
+                            <el-option :label="item.name" :value="key" v-for="(item, key) in verifyTypeList" :key="key" />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item :label="t('verifyer')" prop="verifier_member_id">
+                        <el-select v-model="recordTable.searchParam.verifier_member_id" clearable :placeholder="t('verifierPlaceholder')" class="input-width">
+                            <el-option :label="t('selectPlaceholder')" value="" />
+                            <el-option :label="item.member.nickname" :value="item.member_id" v-for="(item, key) in verifierList" :key="key" />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item :label="t('verifyTime')" prop="create_time">
+                        <el-date-picker v-model="recordTable.searchParam.create_time" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="loadRecordList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+
+            <div class="mt-[10px]">
+                <el-table :data="recordTable.data" size="large" v-loading="recordTable.loading">
+                    <template #empty>
+                        <span>{{ !recordTable.loading ? t('emptyData') : '' }}</span>
+                    </template>
+
+                    <el-table-column prop="code" :show-overflow-tooltip="true" :label="t('verifyCode')" align="left" min-width="150" />
+                    <el-table-column prop="type_name" :label="t('verifyType')" align="left" min-width="150" />
+                    <el-table-column :label="t('verifyTime')" min-width="180" align="center" :show-overflow-tooltip="true">
+                        <template #default="{ row }">
+                            {{ row.create_time || '' }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="member.nickname" :label="t('verifyer')" min-width="180" align="center">
+                    </el-table-column>
+                    <el-table-column :label="t('operation')" align="right" fixed="right" width="100">
+                        <template #default="{ row }">
+                            <div class="flex justify-end">
+                                <el-button type="primary" link @click="detailEvent(row)">{{ t('详情') }}</el-button>
+                            </div>
+                        </template>
+                    </el-table-column>
+                </el-table>
+
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="recordTable.page" v-model:page-size="recordTable.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="recordTable.total"
+                        @size-change="loadRecordList()" @current-change="loadRecordList" />
+                </div>
+            </div>
+            
+            <verify-detail ref="verifyDetailDialog" />
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -151,11 +75,7 @@ import { reactive, ref } from 'vue'
 import { t } from '@/lang'
 import { useRoute, useRouter } from 'vue-router'
 import { FormInstance } from 'element-plus'
-import {
-  getVerifyRecord,
-  getVerifyTypeList,
-  getVerifierSelect,
-} from '@/app/api/verify'
+import { getVerifyRecord, getVerifyTypeList, getVerifierSelect } from '@/app/api/verify'
 import verifyDetail from '@/app/views/marketing/components/verify-detail.vue'
 import { img } from '@/utils/common'
 
@@ -164,17 +84,17 @@ const router = useRouter()
 const pageName = route.meta.title
 
 const recordTable = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    code: '',
-    type: '',
-    verifier_member_id: '',
-    create_time: [],
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        code: '',
+        type: '',
+        verifier_member_id: '',
+        create_time: []
+    }
 })
 
 const searchFormRef = ref<FormInstance>()
@@ -183,21 +103,19 @@ const searchFormRef = ref<FormInstance>()
  * 获取核销记录列表
  */
 const loadRecordList = (page: number = 1) => {
-  recordTable.loading = true
-  recordTable.page = page
-
-  getVerifyRecord({
-    page: recordTable.page,
-    limit: recordTable.limit,
-    ...recordTable.searchParam,
-  })
-    .then((res) => {
-      recordTable.loading = false
-      recordTable.data = res.data.data
-      recordTable.total = res.data.total
-    })
-    .catch(() => {
-      recordTable.loading = false
+    recordTable.loading = true
+    recordTable.page = page
+
+    getVerifyRecord({
+        page: recordTable.page,
+        limit: recordTable.limit,
+        ...recordTable.searchParam
+    }).then(res => {
+        recordTable.loading = false
+        recordTable.data = res.data.data
+        recordTable.total = res.data.total
+    }).catch(() => {
+        recordTable.loading = false
     })
 }
 loadRecordList()
@@ -207,11 +125,9 @@ loadRecordList()
  */
 const verifyTypeList = ref<any>([])
 const setVerifyTypeList = () => {
-  getVerifyTypeList()
-    .then((res) => {
-      verifyTypeList.value = res.data
-    })
-    .catch()
+    getVerifyTypeList().then(res => {
+        verifyTypeList.value = res.data
+    }).catch()
 }
 setVerifyTypeList()
 
@@ -220,26 +136,24 @@ setVerifyTypeList()
  */
 const verifierList = ref<any>([])
 const setVerifyerList = () => {
-  getVerifierSelect()
-    .then((res) => {
-      verifierList.value = res.data
-    })
-    .catch()
+    getVerifierSelect().then(res => {
+        verifierList.value = res.data
+    }).catch()
 }
 setVerifyerList()
 
 // 重置
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadRecordList()
+    if (!formEl) return
+    formEl.resetFields()
+    loadRecordList()
 }
 
 // 详情
 let verifyDetailDialog: Record<string, any> | null = ref(null)
 const detailEvent = (data: any) => {
-  verifyDetailDialog.value.setFormData({ code: data.code })
-  verifyDetailDialog.value.showDialog = true
+    verifyDetailDialog.value.setFormData({code: data.code})
+    verifyDetailDialog.value.showDialog = true
 }
 </script>
 
diff --git a/admin/src/app/views/marketing/verify_detail.vue b/admin/src/app/views/marketing/verify_detail.vue
index 866372ef..d6cf981c 100644
--- a/admin/src/app/views/marketing/verify_detail.vue
+++ b/admin/src/app/views/marketing/verify_detail.vue
@@ -1,123 +1,88 @@
 <template>
-  <!--核销详情-->
-  <div class="main-container" v-loading="loading">
-    <el-card class="card !border-none" shadow="never">
-      <el-page-header :content="pageName" :icon="ArrowLeft" @back="back()" />
-    </el-card>
-
-    <el-card class="box-card mt-[15px] !border-none" shadow="never">
-      <h3 class="panel-title !text-sm">{{ t('核销信息') }}</h3>
-
-      <div class="flex items-center mt-[15px]">
-        <span class="text-[14px] w-[130px] text-right mr-[20px]">{{
-          t('核销类型')
-        }}</span>
-        <span class="text-[14px] text-[#666666]">
-          {{ verifyData.type_name }}
-        </span>
-      </div>
-      <div class="flex items-center mt-[15px]">
-        <span class="text-[14px] w-[130px] text-right mr-[20px]">{{
-          t('核销状态')
-        }}</span>
-        <span class="text-[14px] text-[#666666]"> 已核销 </span>
-      </div>
-
-      <div class="flex items-center mt-[15px]">
-        <span class="text-[14px] w-[130px] text-right mr-[20px]">{{
-          t('核销人员')
-        }}</span>
-        <span class="text-[14px] text-[#666666]">
-          {{ verifyData.member ? verifyData.member.nickname : '--' }}
-        </span>
-      </div>
-      <div class="flex items-center mt-[15px]">
-        <span class="text-[14px] w-[130px] text-right mr-[20px]">{{
-          t('核销时间')
-        }}</span>
-        <span class="text-[14px] text-[#666666]">
-          {{ verifyData.create_time }}
-        </span>
-      </div>
-      <div
-        class="flex items-center mt-[15px]"
-        v-for="(item, index) in verifyContentData.fixed"
-        :key="index"
-      >
-        <span class="text-[14px] w-[130px] text-right mr-[20px]">{{
-          item.title
-        }}</span>
-        <span class="text-[14px] text-[#666666]">
-          {{ item.value }}
-        </span>
-      </div>
-
-      <div v-for="(item, index) in verifyData.verify_info" :key="index">
-        <div
-          class="flex items-center mt-[15px]"
-          v-for="(val, key) in item"
-          :key="key"
-        >
-          <span class="text-[14px] w-[130px] text-right mr-[20px]">{{
-            val.name
-          }}</span>
-          <span class="text-[14px] text-[#666666]">
-            {{ val.value }}
-          </span>
-        </div>
-      </div>
-    </el-card>
-
-    <el-card
-      class="box-card mt-[15px] !border-none"
-      shadow="never"
-      v-for="(item, index) in verifyContentData.diy"
-      :key="index"
-    >
-      <h3 class="panel-title !text-sm">{{ item.title }}</h3>
-
-      <div
-        class="flex items-center mt-[15px]"
-        v-for="(subItem, subIndex) in item.list"
-        :key="subIndex"
-      >
-        <span class="text-[14px] w-[130px] text-right mr-[20px]">{{
-          subItem.title
-        }}</span>
-        <span class="text-[14px] text-[#666666]">
-          {{ subItem.value }}
-        </span>
-      </div>
-    </el-card>
-
-    <el-card class="box-card mt-[15px] !border-none" shadow="never">
-      <h3 class="panel-title !text-sm">{{ t('商品信息') }}</h3>
-
-      <el-table :data="verifyGoodsList" size="large">
-        <el-table-column :label="t('商品名称')" align="left" width="300">
-          <template #default="{ row }">
-            <div class="flex">
-              <div class="flex items-center shrink-0">
-                <img
-                  class="w-[50px] h-[50px] mr-[10px]"
-                  :src="img(row.cover)"
-                />
-              </div>
-              <div class="flex flex-col">
-                <p class="multi-hidden text-[14px]">{{ row.name }}</p>
-              </div>
+    <!--核销详情-->
+    <div class="main-container" v-loading="loading">
+
+        <el-card class="card !border-none" shadow="never">
+            <el-page-header :content="pageName" :icon="ArrowLeft" @back="back()" />
+        </el-card>
+
+        <el-card class="box-card mt-[15px] !border-none" shadow="never">
+            <h3 class="panel-title !text-sm">{{ t('核销信息') }}</h3>
+
+            <div class="flex items-center mt-[15px]">
+                <span class="text-[14px] w-[130px] text-right mr-[20px]">{{ t('核销类型') }}</span>
+                <span class="text-[14px] text-[#666666]">
+                    {{ verifyData.type_name }}
+                </span>
+            </div>
+            <div class="flex items-center mt-[15px]">
+                <span class="text-[14px] w-[130px] text-right mr-[20px]">{{ t('核销状态') }}</span>
+                <span class="text-[14px] text-[#666666]">
+                    已核销
+                </span>
+            </div>
+
+            <div class="flex items-center mt-[15px]">
+                <span class="text-[14px] w-[130px] text-right mr-[20px]">{{ t('核销人员') }}</span>
+                <span class="text-[14px] text-[#666666]">
+                    {{ verifyData.member ? verifyData.member.nickname : '--' }}
+                </span>
+            </div>
+            <div class="flex items-center mt-[15px]">
+                <span class="text-[14px] w-[130px] text-right mr-[20px]">{{ t('核销时间') }}</span>
+                <span class="text-[14px] text-[#666666]">
+                    {{verifyData.create_time}}
+                </span>
+            </div>
+            <div class="flex items-center mt-[15px]" v-for="(item,index) in verifyContentData.fixed" :key="index">
+                <span class="text-[14px] w-[130px] text-right mr-[20px]">{{ item.title }}</span>
+                <span class="text-[14px] text-[#666666]">
+                    {{ item.value }}
+                </span>
             </div>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="num"
-          :label="t('数量')"
-          min-width="50"
-          align="right"
-        />
-      </el-table>
-    </el-card>
-  </div>
+
+            <div v-for="(item,index) in verifyData.verify_info" :key="index">
+                <div class="flex items-center mt-[15px]" v-for="(val,key) in item" :key="key">
+                    <span class="text-[14px] w-[130px] text-right mr-[20px]">{{ val.name }}</span>
+                    <span class="text-[14px] text-[#666666]">
+                        {{ val.value }}
+                    </span>
+                </div>
+            </div>
+
+        </el-card>
+
+        <el-card class="box-card mt-[15px] !border-none" shadow="never" v-for="(item,index) in verifyContentData.diy" :key="index">
+            <h3 class="panel-title !text-sm">{{ item.title }}</h3>
+
+            <div class="flex items-center mt-[15px]" v-for="(subItem,subIndex) in item.list" :key="subIndex">
+                <span class="text-[14px] w-[130px] text-right mr-[20px]">{{ subItem.title }}</span>
+                <span class="text-[14px] text-[#666666]">
+                    {{ subItem.value }}
+                </span>
+            </div>
+        </el-card>
+
+        <el-card class="box-card mt-[15px] !border-none" shadow="never">
+            <h3 class="panel-title !text-sm">{{ t('商品信息') }}</h3>
+
+            <el-table :data="verifyGoodsList" size="large">
+                <el-table-column :label="t('商品名称')" align="left" width="300">
+                    <template #default="{ row }">
+                        <div class="flex">
+                            <div class="flex items-center shrink-0">
+                                <img class="w-[50px] h-[50px] mr-[10px]" :src="img(row.cover)" />
+                            </div>
+                            <div class="flex flex-col">
+                                <p class="multi-hidden text-[14px]">{{ row.name }}</p>
+                            </div>
+                        </div>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="num" :label="t('数量')" min-width="50" align="right" />
+            </el-table>
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -137,7 +102,7 @@ const route = useRoute()
 const router = useRouter()
 const pageName = route.meta.title
 const back = () => {
-  router.push('/marketing/verify')
+    router.push('/marketing/verify')
 }
 
 const appStore = useAppStore()
@@ -150,23 +115,23 @@ const verifyContentData: any = ref({})
 const verifyGoodsList: any = ref([])
 
 const getVerifyDetailFn = async () => {
-  loading.value = true
-  if (code) {
-    const data = await (await getVerifyDetail(code)).data
-    if (!data || Object.keys(data).length == 0) {
-      ElMessage.error(t('memberNull'))
-      setTimeout(() => {
-        router.go(-1)
-      }, 2000)
-      return false
+    loading.value = true
+    if (code) {
+        const data = await (await getVerifyDetail(code)).data
+        if (!data || Object.keys(data).length == 0) {
+            ElMessage.error(t('memberNull'))
+            setTimeout(() => {
+                router.go(-1)
+            }, 2000)
+            return false
+        }
+        verifyData.value = data
+        verifyContentData.value = data.value.content || {}
+        verifyGoodsList.value = data.value.list || []
+        loading.value = false
+    } else {
+        loading.value = false
     }
-    verifyData.value = data
-    verifyContentData.value = data.value.content || {}
-    verifyGoodsList.value = data.value.list || []
-    loading.value = false
-  } else {
-    loading.value = false
-  }
 }
 getVerifyDetailFn()
 </script>
diff --git a/admin/src/app/views/member/balance.vue b/admin/src/app/views/member/balance.vue
index 1e4447cf..e46dc045 100644
--- a/admin/src/app/views/member/balance.vue
+++ b/admin/src/app/views/member/balance.vue
@@ -1,259 +1,149 @@
 <template>
-  <!--会员余额-->
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
+    <!--会员余额-->
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
 
-      <el-card class="box-card !border-none !px-[35px]" shadow="never">
-        <el-row class="flex">
-          <el-col :span="8" class="min-w-[100px]">
-            <div class="statistic-card">
-              <el-statistic
-                :value="
-                  balanceStatistics.money && balanceStatistics.balance
-                    ? (
-                        Number.parseFloat(balanceStatistics.money) +
-                        Number.parseFloat(balanceStatistics.balance)
-                      ).toFixed(2)
-                    : '0.00'
-                "
-              ></el-statistic>
-              <div class="statistic-footer">
-                <div class="footer-item text-[14px] text-[#666]">
-                  <span>{{ t('totalAllBalance') }}</span>
-                </div>
-              </div>
-            </div>
-          </el-col>
-          <el-col :span="8" class="min-w-[100px]">
-            <div class="statistic-card">
-              <el-statistic :value="balanceStatistics.money"></el-statistic>
-              <div class="statistic-footer">
-                <div class="footer-item text-[14px] text-[#666]">
-                  <span>{{ t('totalMoney') }}</span>
-                </div>
-              </div>
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
             </div>
-          </el-col>
-          <el-col :span="8" class="min-w-[100px]">
-            <div class="statistic-card">
-              <el-statistic :value="balanceStatistics.balance"></el-statistic>
-              <div class="statistic-footer">
-                <div class="footer-item text-[14px] text-[#666]">
-                  <span>{{ t('totalBalance') }}</span>
-                </div>
-              </div>
-            </div>
-          </el-col>
-        </el-row>
-      </el-card>
 
-      <el-card
-        class="box-card !border-none mb-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="memberAccountLogTableData.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('memberInfo')" prop="keywords">
-            <el-input
-              v-model.trim="memberAccountLogTableData.searchParam.keywords"
-              class="w-[240px]"
-              :placeholder="t('memberInfoPlaceholder')"
-            />
-          </el-form-item>
+            <el-card class="box-card !border-none !px-[35px]" shadow="never">
+                <el-row class="flex">
+                    <el-col :span="8" class="min-w-[100px]">
+                        <div class="statistic-card">
+                            <el-statistic :value="balanceStatistics.money && balanceStatistics.balance ? (Number.parseFloat(balanceStatistics.money) + Number.parseFloat(balanceStatistics.balance)).toFixed(2) : '0.00'"></el-statistic>
+                            <div class="statistic-footer">
+                                <div class="footer-item text-[14px] text-[#666]">
+                                    <span>{{ t('totalAllBalance') }}</span>
+                                </div>
+                            </div>
+                        </div>
+                    </el-col>
+                    <el-col :span="8" class="min-w-[100px]">
+                        <div class="statistic-card">
+                            <el-statistic :value="balanceStatistics.money"></el-statistic>
+                            <div class="statistic-footer">
+                                <div class="footer-item text-[14px] text-[#666]">
+                                    <span>{{ t('totalMoney') }}</span>
+                                </div>
+                            </div>
+                        </div>
+                    </el-col>
+                    <el-col :span="8" class="min-w-[100px]">
+                        <div class="statistic-card">
+                            <el-statistic :value="balanceStatistics.balance"></el-statistic>
+                            <div class="statistic-footer">
+                                <div class="footer-item text-[14px] text-[#666]">
+                                    <span>{{ t('totalBalance') }}</span>
+                                </div>
+                            </div>
+                        </div>
+                    </el-col>
+                </el-row>
+            </el-card>
+
+            <el-card class="box-card !border-none mb-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="memberAccountLogTableData.searchParam" ref="searchFormRef">
 
-          <el-form-item :label="t('balanceType')" prop="balance_type">
-            <el-select
-              v-model="memberAccountLogTableData.searchParam.balance_type"
-              clearable
-              :placeholder="t('fromTypePlaceholder')"
-              class="input-width"
-              @change="checkAccountType"
-            >
-              <el-option :label="t('selectPlaceholder')" value="" />
-              <el-option
-                :label="item.name"
-                :value="item.type"
-                v-for="(item, key) in balanceStatus"
-                :key="key"
-              />
-            </el-select>
-          </el-form-item>
+                    <el-form-item :label="t('memberInfo')" prop="keywords">
+                        <el-input v-model.trim="memberAccountLogTableData.searchParam.keywords" class="w-[240px]" :placeholder="t('memberInfoPlaceholder')" />
+                    </el-form-item>
 
-          <el-form-item :label="t('fromType')" prop="from_type">
-            <el-select
-              v-model="memberAccountLogTableData.searchParam.from_type"
-              clearable
-              :placeholder="t('fromTypePlaceholder')"
-              class="input-width"
-            >
-              <el-option :label="t('selectPlaceholder')" value="" />
-              <el-option
-                :label="item.name"
-                :value="key"
-                v-for="(item, key) in fromTypeList"
-                :key="key"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="t('createTime')" prop="create_time">
-            <el-date-picker
-              v-model="memberAccountLogTableData.searchParam.create_time"
-              type="datetimerange"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              :start-placeholder="t('startDate')"
-              :end-placeholder="t('endDate')"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="loadMemberAccountLogList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
+                    <el-form-item :label="t('balanceType')" prop="balance_type">
+                        <el-select v-model="memberAccountLogTableData.searchParam.balance_type" clearable :placeholder="t('fromTypePlaceholder')" class="input-width" @change="checkAccountType">
+                            <el-option :label="t('selectPlaceholder')" value="" />
+                            <el-option :label="item.name" :value="item.type" v-for="(item, key) in balanceStatus" :key="key"/>
+                        </el-select>
+                    </el-form-item>
 
-      <div class="mt-[10px]">
-        <el-table
-          :data="memberAccountLogTableData.data"
-          size="large"
-          v-loading="memberAccountLogTableData.loading"
-        >
-          <template #empty>
-            <span>{{
-              !memberAccountLogTableData.loading ? t('emptyData') : ''
-            }}</span>
-          </template>
-          <el-table-column
-            prop="member_id"
-            :label="t('memberId')"
-            min-width="100"
-            :show-overflow-tooltip="true"
-          >
-            <template #default="{ row }">
-              {{ row.member.member_no }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            :label="t('memberInfo')"
-            min-width="140"
-            :show-overflow-tooltip="true"
-          >
-            <template #default="{ row }">
-              <div
-                class="flex items-center cursor-pointer"
-                @click="toMember(row.member_id)"
-              >
-                <img
-                  class="w-[50px] h-[50px] mr-[10px]"
-                  v-if="row.member.headimg"
-                  :src="img(row.member.headimg)"
-                  alt=""
-                />
-                <img
-                  class="w-[50px] h-[50px] mr-[10px] rounded-full"
-                  v-else
-                  src="@/app/assets/images/member_head.png"
-                  alt=""
-                />
-                <div class="flex flex flex-col">
-                  <span>{{ row.member.nickname || '' }}</span>
+                    <el-form-item :label="t('fromType')" prop="from_type">
+                        <el-select v-model="memberAccountLogTableData.searchParam.from_type" clearable :placeholder="t('fromTypePlaceholder')" class="input-width">
+                            <el-option :label="t('selectPlaceholder')" value="" />
+                            <el-option :label="item.name" :value="key" v-for="(item, key) in fromTypeList" :key="key"/>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item :label="t('createTime')" prop="create_time">
+                        <el-date-picker v-model="memberAccountLogTableData.searchParam.create_time" type="datetimerange"
+                            value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')"
+                            :end-placeholder="t('endDate')" />
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="loadMemberAccountLogList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+
+            <div class="mt-[10px]">
+                <el-table :data="memberAccountLogTableData.data" size="large" v-loading="memberAccountLogTableData.loading">
+
+                    <template #empty>
+                        <span>{{ !memberAccountLogTableData.loading ? t('emptyData') : '' }}</span>
+                    </template>
+                    <el-table-column prop="member_id" :label="t('memberId')" min-width="100" :show-overflow-tooltip="true">
+                        <template #default="{ row }">
+                            {{ row.member.member_no }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('memberInfo')" min-width="140" :show-overflow-tooltip="true">
+                        <template #default="{ row }">
+                            <div class="flex items-center cursor-pointer" @click="toMember(row.member_id)">
+                                <img class="w-[50px] h-[50px] mr-[10px]" v-if="row.member.headimg" :src="img(row.member.headimg)" alt="">
+                                <img class="w-[50px] h-[50px] mr-[10px] rounded-full" v-else src="@/app/assets/images/member_head.png" alt="">
+                                <div class="flex flex flex-col">
+                                    <span>{{ row.member.nickname || '' }}</span>
+                                </div>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="mobile" :label="t('mobile')" min-width="90">
+                        <template #default="{ row }">
+                            {{ row.member.mobile || '' }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="account_data" :label="t('accountData')" min-width="100" align="right">
+                        <template #default="{ row }">
+                            <div class="whitespace-nowrap">
+                                <span v-if="row.account_data >= 0">+{{ row.account_data }}</span>
+                                <span v-else>{{ row.account_data }}</span>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="account_sum" :label="t('accountSum')" min-width="110" align="right" />
+                    <el-table-column prop="account_type_name" :label="t('balanceType')" min-width="150" align="center" />
+                    <el-table-column prop="from_type_name" :label="t('fromType')" min-width="120" align="" />
+                    <el-table-column prop="create_time" :show-overflow-tooltip="true" :label="t('createTime')" min-width="150" />
+                    <el-table-column :label="t('operation')" align="right" fixed="right" width="100">
+                        <template #default="{ row }">
+                            <el-button type="primary" link @click="infoEvent(row)">{{ t('info') }}</el-button>
+                        </template>
+                    </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="memberAccountLogTableData.page"
+                        v-model:page-size="memberAccountLogTableData.limit" layout="total, sizes, prev, pager, next, jumper"
+                        :total="memberAccountLogTableData.total" @size-change="loadMemberAccountLogList()"
+                        @current-change="loadMemberAccountLogList" />
                 </div>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="mobile" :label="t('mobile')" min-width="90">
-            <template #default="{ row }">
-              {{ row.member.mobile || '' }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="account_data"
-            :label="t('accountData')"
-            min-width="100"
-            align="right"
-          >
-            <template #default="{ row }">
-              <div class="whitespace-nowrap">
-                <span v-if="row.account_data >= 0"
-                  >+{{ row.account_data }}</span
-                >
-                <span v-else>{{ row.account_data }}</span>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="account_sum"
-            :label="t('accountSum')"
-            min-width="110"
-            align="right"
-          />
-          <el-table-column
-            prop="account_type_name"
-            :label="t('balanceType')"
-            min-width="150"
-            align="center"
-          />
-          <el-table-column
-            prop="from_type_name"
-            :label="t('fromType')"
-            min-width="120"
-            align=""
-          />
-          <el-table-column
-            prop="create_time"
-            :show-overflow-tooltip="true"
-            :label="t('createTime')"
-            min-width="150"
-          />
-          <el-table-column
-            :label="t('operation')"
-            align="right"
-            fixed="right"
-            width="100"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="infoEvent(row)">{{
-                t('info')
-              }}</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="memberAccountLogTableData.page"
-            v-model:page-size="memberAccountLogTableData.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="memberAccountLogTableData.total"
-            @size-change="loadMemberAccountLogList()"
-            @current-change="loadMemberAccountLogList"
-          />
-        </div>
-      </div>
-    </el-card>
+            </div>
+        </el-card>
+
+        <balance-info ref="balanceDialog" @complete="loadMemberAccountLogList" />
 
-    <balance-info ref="balanceDialog" @complete="loadMemberAccountLogList" />
-  </div>
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
 import { t } from '@/lang'
 import {
-  getBalanceList,
-  getChangeTypeList,
-  getBalanceSum,
-  getBalanceStatus,
-  getMoneyList,
-  getAccountType,
+    getBalanceList,
+    getChangeTypeList,
+    getBalanceSum,
+    getBalanceStatus,
+    getMoneyList,
+    getAccountType
 } from '@/app/api/member'
 import { FormInstance } from 'element-plus'
 import { img } from '@/utils/common'
@@ -266,25 +156,25 @@ const pageName = route.meta.title
 const member_id: number = parseInt(route.query.id || 0)
 
 const memberAccountLogTableData = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    keywords: '',
-    from_type: '',
-    create_time: '',
-    mobile: '',
-    member_id: member_id,
-    balance_type: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        keywords: '',
+        from_type: '',
+        create_time: '',
+        mobile: '',
+        member_id: member_id,
+        balance_type: ''
+    }
 })
 
 const fromTypeList = ref([])
 
 const setFromTypeList = async () => {
-  fromTypeList.value = await (await getChangeTypeList('balance')).data
+    fromTypeList.value = await (await getChangeTypeList('balance')).data
 }
 
 setFromTypeList()
@@ -292,49 +182,42 @@ setFromTypeList()
 const searchFormRef = ref<FormInstance>()
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadMemberAccountLogList()
+    if (!formEl) return
+    formEl.resetFields()
+    loadMemberAccountLogList()
 }
 
 /**
  * 获取会员账单表列表
  */
 const loadMemberAccountLogList = (page: number = 1) => {
-  memberAccountLogTableData.loading = true
-  memberAccountLogTableData.page = page
-  if (
-    memberAccountLogTableData.searchParam.balance_type == '' ||
-    memberAccountLogTableData.searchParam.balance_type == 'balance'
-  ) {
-    getBalanceList({
-      page: memberAccountLogTableData.page,
-      limit: memberAccountLogTableData.limit,
-      ...memberAccountLogTableData.searchParam,
-    })
-      .then((res) => {
-        memberAccountLogTableData.loading = false
-        memberAccountLogTableData.data = res.data.data
-        memberAccountLogTableData.total = res.data.total
-      })
-      .catch(() => {
-        memberAccountLogTableData.loading = false
-      })
-  } else {
-    getMoneyList({
-      page: memberAccountLogTableData.page,
-      limit: memberAccountLogTableData.limit,
-      ...memberAccountLogTableData.searchParam,
-    })
-      .then((res) => {
-        memberAccountLogTableData.loading = false
-        memberAccountLogTableData.data = res.data.data
-        memberAccountLogTableData.total = res.data.total
-      })
-      .catch(() => {
-        memberAccountLogTableData.loading = false
-      })
-  }
+    memberAccountLogTableData.loading = true
+    memberAccountLogTableData.page = page
+    if (memberAccountLogTableData.searchParam.balance_type == '' || memberAccountLogTableData.searchParam.balance_type == 'balance') {
+        getBalanceList({
+            page: memberAccountLogTableData.page,
+            limit: memberAccountLogTableData.limit,
+            ...memberAccountLogTableData.searchParam
+        }).then(res => {
+            memberAccountLogTableData.loading = false
+            memberAccountLogTableData.data = res.data.data
+            memberAccountLogTableData.total = res.data.total
+        }).catch(() => {
+            memberAccountLogTableData.loading = false
+        })
+    } else {
+        getMoneyList({
+            page: memberAccountLogTableData.page,
+            limit: memberAccountLogTableData.limit,
+            ...memberAccountLogTableData.searchParam
+        }).then(res => {
+            memberAccountLogTableData.loading = false
+            memberAccountLogTableData.data = res.data.data
+            memberAccountLogTableData.total = res.data.total
+        }).catch(() => {
+            memberAccountLogTableData.loading = false
+        })
+    }
 }
 loadMemberAccountLogList()
 
@@ -344,8 +227,8 @@ const balanceDialog: Record<string, any> | null = ref(null)
  * @param data
  */
 const infoEvent = (data: any) => {
-  balanceDialog.value.setFormData(data)
-  balanceDialog.value.showDialog = true
+    balanceDialog.value.setFormData(data)
+    balanceDialog.value.showDialog = true
 }
 
 const router = useRouter()
@@ -354,7 +237,7 @@ const router = useRouter()
  * 会员详情
  */
 const toMember = (member_id: number) => {
-  router.push(`/member/detail?id=${member_id}`)
+    router.push(`/member/detail?id=${member_id}`)
 }
 
 /**
@@ -362,40 +245,41 @@ const toMember = (member_id: number) => {
  */
 const balanceStatistics = ref([])
 const checkBalanceInfo = () => {
-  getBalanceSum({
-    member_id,
-  }).then((res) => {
-    balanceStatistics.value = res.data
-  })
+    getBalanceSum({
+        member_id
+    }).then(res => {
+        balanceStatistics.value = res.data
+    })
 }
 checkBalanceInfo()
 
 // 获取余额类型
 const balanceStatus = ref([])
 const checkBalanceStatus = () => {
-  getBalanceStatus().then((res) => {
-    for (var i in res.data) {
-      if (i == 'balance' || i == 'money') {
-        balanceStatus.value.push({ name: res.data[i], type: i })
-      }
-    }
-  })
+    getBalanceStatus().then(res => {
+        for (var i in res.data) {
+            if (i == 'balance' || i == 'money') {
+                balanceStatus.value.push({ 'name': res.data[i], 'type': i })
+            }
+        }
+    })
 }
 checkBalanceStatus()
 
 const checkAccountType = () => {
-  let accountType = memberAccountLogTableData.searchParam.balance_type
+    let accountType = memberAccountLogTableData.searchParam.balance_type
 
-  if (accountType == '') {
-    accountType = 'balance'
-  }
-  getAccountType({
-    account_type: accountType,
-  }).then((res) => {
-    fromTypeList.value = res.data
-  })
+    if (accountType == '') {
+        accountType = 'balance'
+    }
+    getAccountType({
+        account_type: accountType
+    }).then(res => {
+        fromTypeList.value = res.data
+    })
 }
 checkAccountType()
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/member/commission.vue b/admin/src/app/views/member/commission.vue
index 23e6ad98..1bc5e78b 100644
--- a/admin/src/app/views/member/commission.vue
+++ b/admin/src/app/views/member/commission.vue
@@ -1,266 +1,147 @@
 <template>
-  <!--会员佣金-->
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
+    <!--会员佣金-->
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
 
-      <el-card class="box-card !border-none !px-[35px]" shadow="never">
-        <el-row class="flex">
-          <el-col :span="6" class="min-w-[100px]">
-            <div class="statistic-card">
-              <el-statistic
-                :value="
-                  commissionStatistics.total_commission
-                    ? Number.parseFloat(
-                        commissionStatistics.total_commission
-                      ).toFixed(2)
-                    : '0.00'
-                "
-              ></el-statistic>
-              <div class="statistic-footer">
-                <div class="footer-item text-[14px] text-[#666]">
-                  <span>{{ t('totalCommission') }}</span>
-                </div>
-              </div>
-            </div>
-          </el-col>
-          <el-col :span="6" class="min-w-[100px]">
-            <div class="statistic-card">
-              <el-statistic
-                :value="
-                  commissionStatistics.commission
-                    ? Number.parseFloat(
-                        commissionStatistics.commission
-                      ).toFixed(2)
-                    : '0.00'
-                "
-              ></el-statistic>
-              <div class="statistic-footer">
-                <div class="footer-item text-[14px] text-[#666]">
-                  <span>{{ t('commission') }}</span>
-                </div>
-              </div>
-            </div>
-          </el-col>
-          <el-col :span="6" class="min-w-[100px]">
-            <div class="statistic-card">
-              <el-statistic
-                :value="
-                  commissionStatistics.withdrawn_commission
-                    ? Number.parseFloat(
-                        commissionStatistics.withdrawn_commission
-                      ).toFixed(2)
-                    : '0.00'
-                "
-              ></el-statistic>
-              <div class="statistic-footer">
-                <div class="footer-item text-[14px] text-[#666]">
-                  <span>{{ t('withdrawnCommission') }}</span>
-                </div>
-              </div>
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
             </div>
-          </el-col>
-          <el-col :span="6" class="min-w-[100px]">
-            <div class="statistic-card">
-              <el-statistic
-                :value="
-                  commissionStatistics.commission_cash_outing
-                    ? Number.parseFloat(
-                        commissionStatistics.commission_cash_outing
-                      ).toFixed(2)
-                    : '0.00'
-                "
-              ></el-statistic>
-              <div class="statistic-footer">
-                <div class="footer-item text-[14px] text-[#666]">
-                  <span>{{ t('cashOutingCommission') }}</span>
-                </div>
-              </div>
-            </div>
-          </el-col>
-        </el-row>
-      </el-card>
-
-      <el-card
-        class="box-card !border-none mb-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="memberAccountLogTableData.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('memberInfo')" prop="keywords">
-            <el-input
-              v-model.trim="memberAccountLogTableData.searchParam.keywords"
-              class="w-[240px]"
-              :placeholder="t('memberInfoPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('fromType')" prop="from_type">
-            <el-select
-              v-model="memberAccountLogTableData.searchParam.from_type"
-              clearable
-              :placeholder="t('fromTypePlaceholder')"
-              class="input-width"
-            >
-              <el-option :label="t('selectPlaceholder')" value="" />
-              <el-option
-                :label="item.name"
-                :value="key"
-                v-for="(item, key) in fromTypeList"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="t('createTime')" prop="create_time">
-            <el-date-picker
-              v-model="memberAccountLogTableData.searchParam.create_time"
-              type="datetimerange"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              :start-placeholder="t('startDate')"
-              :end-placeholder="t('endDate')"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="loadMemberAccountLogList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
-
-      <div class="mt-[10px]">
-        <el-table
-          :data="memberAccountLogTableData.data"
-          size="large"
-          v-loading="memberAccountLogTableData.loading"
-        >
-          <template #empty>
-            <span>{{
-              !memberAccountLogTableData.loading ? t('emptyData') : ''
-            }}</span>
-          </template>
 
-          <el-table-column
-            prop="member_id"
-            :label="t('memberId')"
-            min-width="80"
-            :show-overflow-tooltip="true"
-          >
-            <template #default="{ row }">
-              {{ row.member.member_no }}
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            :label="t('memberInfo')"
-            min-width="150"
-            :show-overflow-tooltip="true"
-          >
-            <template #default="{ row }">
-              <div
-                class="flex items-center cursor-pointer"
-                @click="toMember(row.member_id)"
-              >
-                <img
-                  class="w-[50px] h-[50px] mr-[10px]"
-                  v-if="row.member.headimg"
-                  :src="img(row.member.headimg)"
-                  alt=""
-                />
-                <img
-                  class="w-[50px] h-[50px] mr-[10px] rounded-full"
-                  v-else
-                  src="@/app/assets/images/member_head.png"
-                  alt=""
-                />
-                <div class="flex flex flex-col">
-                  <span>{{ row.member.nickname || '' }}</span>
+            <el-card class="box-card !border-none !px-[35px]" shadow="never">
+                <el-row class="flex">
+                    <el-col :span="6" class="min-w-[100px]">
+                        <div class="statistic-card">
+                            <el-statistic :value="commissionStatistics.total_commission ? Number.parseFloat(commissionStatistics.total_commission).toFixed(2) : '0.00'"></el-statistic>
+                            <div class="statistic-footer">
+                                <div class="footer-item text-[14px] text-[#666]">
+                                    <span>{{ t('totalCommission') }}</span>
+                                </div>
+                            </div>
+                        </div>
+                    </el-col>
+                    <el-col :span="6" class="min-w-[100px]">
+                        <div class="statistic-card">
+                            <el-statistic :value="commissionStatistics.commission ? Number.parseFloat(commissionStatistics.commission).toFixed(2) : '0.00'"></el-statistic>
+                            <div class="statistic-footer">
+                                <div class="footer-item text-[14px] text-[#666]">
+                                    <span>{{ t('commission') }}</span>
+                                </div>
+                            </div>
+                        </div>
+                    </el-col>
+                    <el-col :span="6" class="min-w-[100px]">
+                        <div class="statistic-card">
+                            <el-statistic :value="commissionStatistics.withdrawn_commission ? Number.parseFloat(commissionStatistics.withdrawn_commission).toFixed(2) : '0.00'"></el-statistic>
+                            <div class="statistic-footer">
+                                <div class="footer-item text-[14px] text-[#666]">
+                                    <span>{{ t('withdrawnCommission') }}</span>
+                                </div>
+                            </div>
+                        </div>
+                    </el-col>
+                    <el-col :span="6" class="min-w-[100px]">
+                        <div class="statistic-card">
+                            <el-statistic :value="commissionStatistics.commission_cash_outing ? Number.parseFloat(commissionStatistics.commission_cash_outing).toFixed(2) : '0.00'"></el-statistic>
+                            <div class="statistic-footer">
+                                <div class="footer-item text-[14px] text-[#666]">
+                                    <span>{{ t('cashOutingCommission') }}</span>
+                                </div>
+                            </div>
+                        </div>
+                    </el-col>
+                </el-row>
+            </el-card>
+
+            <el-card class="box-card !border-none mb-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="memberAccountLogTableData.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('memberInfo')" prop="keywords">
+                        <el-input v-model.trim="memberAccountLogTableData.searchParam.keywords" class="w-[240px]" :placeholder="t('memberInfoPlaceholder')" />
+                    </el-form-item>
+                    <el-form-item :label="t('fromType')" prop="from_type">
+                        <el-select v-model="memberAccountLogTableData.searchParam.from_type" clearable :placeholder="t('fromTypePlaceholder')" class="input-width">
+                            <el-option :label="t('selectPlaceholder')" value="" />
+                            <el-option :label="item.name" :value="key" v-for="(item, key) in fromTypeList" />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item :label="t('createTime')" prop="create_time">
+                        <el-date-picker v-model="memberAccountLogTableData.searchParam.create_time" type="datetimerange"
+                            value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')"
+                            :end-placeholder="t('endDate')" />
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="loadMemberAccountLogList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+
+            <div class="mt-[10px]">
+                <el-table :data="memberAccountLogTableData.data" size="large" v-loading="memberAccountLogTableData.loading">
+
+                    <template #empty>
+                        <span>{{ !memberAccountLogTableData.loading ? t('emptyData') : '' }}</span>
+                    </template>
+
+                    <el-table-column prop="member_id" :label="t('memberId')" min-width="80" :show-overflow-tooltip="true">
+                        <template #default="{ row }">
+                            {{ row.member.member_no }}
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column :label="t('memberInfo')" min-width="150" :show-overflow-tooltip="true">
+                        <template #default="{ row }">
+                            <div class="flex items-center cursor-pointer" @click="toMember(row.member_id)">
+                                <img class="w-[50px] h-[50px] mr-[10px]" v-if="row.member.headimg" :src="img(row.member.headimg)" alt="">
+                                <img class="w-[50px] h-[50px] mr-[10px] rounded-full" v-else src="@/app/assets/images/member_head.png" alt="">
+                                <div class="flex flex flex-col">
+                                    <span>{{ row.member.nickname || '' }}</span>
+                                </div>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="mobile" :label="t('mobile')" min-width="100">
+                        <template #default="{ row }">
+                            {{ row.member.mobile || '' }}
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column prop="account_data" :label="t('accountData')" min-width="80" align="right">
+                        <template #default="{ row }">
+                            <span v-if="row.account_data >= 0">+{{ row.account_data }}</span>
+                            <span v-else>{{ row.account_data }}</span>
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column prop="account_sum" :label="t('accountSum')" min-width="120" align="right" />
+                    <el-table-column prop="from_type_name" :label="t('fromType')" min-width="180" align="center" />
+                    <el-table-column prop="create_time" :show-overflow-tooltip="true" :label="t('createTime')" min-width="150" />
+
+                    <el-table-column :label="t('operation')" align="right" fixed="right" width="100">
+                        <template #default="{ row }">
+                            <el-button type="primary" link @click="infoEvent(row)">{{ t('info') }}</el-button>
+                        </template>
+                    </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="memberAccountLogTableData.page"
+                        v-model:page-size="memberAccountLogTableData.limit" layout="total, sizes, prev, pager, next, jumper"
+                        :total="memberAccountLogTableData.total" @size-change="loadMemberAccountLogList()"
+                        @current-change="loadMemberAccountLogList" />
                 </div>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="mobile" :label="t('mobile')" min-width="100">
-            <template #default="{ row }">
-              {{ row.member.mobile || '' }}
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            prop="account_data"
-            :label="t('accountData')"
-            min-width="80"
-            align="right"
-          >
-            <template #default="{ row }">
-              <span v-if="row.account_data >= 0">+{{ row.account_data }}</span>
-              <span v-else>{{ row.account_data }}</span>
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            prop="account_sum"
-            :label="t('accountSum')"
-            min-width="120"
-            align="right"
-          />
-          <el-table-column
-            prop="from_type_name"
-            :label="t('fromType')"
-            min-width="180"
-            align="center"
-          />
-          <el-table-column
-            prop="create_time"
-            :show-overflow-tooltip="true"
-            :label="t('createTime')"
-            min-width="150"
-          />
+            </div>
+        </el-card>
 
-          <el-table-column
-            :label="t('operation')"
-            align="right"
-            fixed="right"
-            width="100"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="infoEvent(row)">{{
-                t('info')
-              }}</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="memberAccountLogTableData.page"
-            v-model:page-size="memberAccountLogTableData.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="memberAccountLogTableData.total"
-            @size-change="loadMemberAccountLogList()"
-            @current-change="loadMemberAccountLogList"
-          />
-        </div>
-      </div>
-    </el-card>
+        <money-info ref="moneyDialog" @complete="loadMemberAccountLogList" />
 
-    <money-info ref="moneyDialog" @complete="loadMemberAccountLogList" />
-  </div>
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
 import { t } from '@/lang'
 import { FormInstance } from 'element-plus'
-import {
-  getChangeTypeList,
-  getCommissionList,
-  getCommissionSum,
-} from '@/app/api/member'
+import { getChangeTypeList, getCommissionList, getCommissionSum } from '@/app/api/member'
 import { img } from '@/utils/common'
 import moneyInfo from '@/app/views/member/components/member-commission-info.vue'
 import { useRouter, useRoute } from 'vue-router'
@@ -271,24 +152,24 @@ const pageName = route.meta.title
 const member_id: number = parseInt(route.query.id || 0)
 
 const memberAccountLogTableData = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    keywords: '',
-    from_type: '',
-    create_time: '',
-    mobile: '',
-    member_id,
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        keywords: '',
+        from_type: '',
+        create_time: '',
+        mobile: '',
+        member_id
+    }
 })
 
 const fromTypeList = ref([])
 
 const setFromTypeList = async () => {
-  fromTypeList.value = await (await getChangeTypeList('commission')).data
+    fromTypeList.value = await (await getChangeTypeList('commission')).data
 }
 
 setFromTypeList()
@@ -298,20 +179,20 @@ setFromTypeList()
  */
 const commissionStatistics = ref([])
 const checkCommissionInfo = () => {
-  getCommissionSum({
-    member_id,
-  }).then((res) => {
-    commissionStatistics.value = res.data
-  })
+    getCommissionSum({
+        member_id
+    }).then(res => {
+        commissionStatistics.value = res.data
+    })
 }
 checkCommissionInfo()
 
 const searchFormRef = ref<FormInstance>()
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadMemberAccountLogList()
+    if (!formEl) return
+    formEl.resetFields()
+    loadMemberAccountLogList()
 }
 
 /**
@@ -319,21 +200,19 @@ const resetForm = (formEl: FormInstance | undefined) => {
  * 获取会员账单表列表
  */
 const loadMemberAccountLogList = (page: number = 1) => {
-  memberAccountLogTableData.loading = true
-  memberAccountLogTableData.page = page
-
-  getCommissionList({
-    page: memberAccountLogTableData.page,
-    limit: memberAccountLogTableData.limit,
-    ...memberAccountLogTableData.searchParam,
-  })
-    .then((res) => {
-      memberAccountLogTableData.loading = false
-      memberAccountLogTableData.data = res.data.data
-      memberAccountLogTableData.total = res.data.total
-    })
-    .catch(() => {
-      memberAccountLogTableData.loading = false
+    memberAccountLogTableData.loading = true
+    memberAccountLogTableData.page = page
+
+    getCommissionList({
+        page: memberAccountLogTableData.page,
+        limit: memberAccountLogTableData.limit,
+        ...memberAccountLogTableData.searchParam
+    }).then(res => {
+        memberAccountLogTableData.loading = false
+        memberAccountLogTableData.data = res.data.data
+        memberAccountLogTableData.total = res.data.total
+    }).catch(() => {
+        memberAccountLogTableData.loading = false
     })
 }
 loadMemberAccountLogList()
@@ -345,8 +224,8 @@ const moneyDialog: Record<string, any> | null = ref(null)
  * @param data
  */
 const infoEvent = (data: any) => {
-  moneyDialog.value.setFormData(data)
-  moneyDialog.value.showDialog = true
+    moneyDialog.value.setFormData(data)
+    moneyDialog.value.showDialog = true
 }
 
 const router = useRouter()
@@ -355,8 +234,9 @@ const router = useRouter()
  * 会员详情
  */
 const toMember = (member_id: number) => {
-  router.push(`/member/detail?id=${member_id}`)
+    router.push(`/member/detail?id=${member_id}`)
 }
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/member/components/add-member.vue b/admin/src/app/views/member/components/add-member.vue
index 06ede256..1380b001 100644
--- a/admin/src/app/views/member/components/add-member.vue
+++ b/admin/src/app/views/member/components/add-member.vue
@@ -1,92 +1,35 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="popTitle"
-    width="500px"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="90px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('memberNo')" prop="member_no">
-        <el-input
-          v-model.trim="formData.member_no"
-          clearable
-          maxlength="20"
-          :placeholder="t('memberNoPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('mobile')" prop="mobile">
-        <el-input
-          v-model.trim="formData.mobile"
-          clearable
-          :placeholder="t('mobilePlaceholder')"
-          @keyup="filterNumber($event)"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('nickname')">
-        <el-input
-          v-model.trim="formData.nickname"
-          clearable
-          :placeholder="t('nickNamePlaceholder')"
-          class="input-width"
-          maxlength="10"
-          show-word-limit
-          :readonly="nickname_name_input"
-          @click="nickname_name_input = false"
-          @blur="nickname_name_input = true"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('password')" prop="password">
-        <el-input
-          v-model.trim="formData.password"
-          type="password"
-          :placeholder="t('passwordPlaceholder')"
-          clearable
-          class="input-width"
-          :show-password="true"
-          :readonly="password_input"
-          @click="password_input = false"
-          @blur="password_input = true"
-        />
-      </el-form-item>
-      <el-form-item :label="t('passwordCopy')" prop="password_copy">
-        <el-input
-          v-model.trim="formData.password_copy"
-          type="password"
-          :placeholder="t('passwordPlaceholder')"
-          clearable
-          class="input-width"
-          :show-password="true"
-          :readonly="password_copy_input"
-          @click="password_copy_input = false"
-          @blur="password_copy_input = true"
-        />
-      </el-form-item>
-    </el-form>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+    <el-dialog v-model="showDialog" :title="popTitle" width="500px" :destroy-on-close="true">
+        <el-form :model="formData" label-width="90px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+
+            <el-form-item :label="t('memberNo')" prop="member_no">
+                <el-input v-model.trim="formData.member_no" clearable maxlength="20" :placeholder="t('memberNoPlaceholder')" class="input-width" />
+            </el-form-item>
+
+            <el-form-item :label="t('mobile')" prop="mobile">
+                <el-input v-model.trim="formData.mobile" clearable :placeholder="t('mobilePlaceholder')" @keyup="filterNumber($event)" class="input-width" />
+            </el-form-item>
+
+            <el-form-item :label="t('nickname')">
+                <el-input v-model.trim="formData.nickname" clearable :placeholder="t('nickNamePlaceholder')" class="input-width" maxlength="10" show-word-limit  :readonly="nickname_name_input" @click="nickname_name_input = false" @blur="nickname_name_input = true" />
+            </el-form-item>
+
+            <el-form-item :label="t('password')" prop="password">
+                <el-input v-model.trim="formData.password" type="password" :placeholder="t('passwordPlaceholder')" clearable class="input-width" :show-password="true"  :readonly="password_input" @click="password_input = false" @blur="password_input = true" />
+            </el-form-item>
+            <el-form-item :label="t('passwordCopy')" prop="password_copy">
+                <el-input v-model.trim="formData.password_copy" type="password" :placeholder="t('passwordPlaceholder')" clearable class="input-width" :show-password="true"  :readonly="password_copy_input" @click="password_copy_input = false" @blur="password_copy_input = true" />
+            </el-form-item>
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{t('confirm')}}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -110,13 +53,13 @@ const password_copy_input = ref(true)
  * 表单数据
  */
 const initialFormData = {
-  member_id: '',
-  nickname: '',
-  member_no: '',
-  init_member_no: '',
-  mobile: '',
-  password: '',
-  password_copy: '',
+    member_id: '',
+    nickname: '',
+    member_no: '',
+    init_member_no: '',
+    mobile: '',
+    password: '',
+    password_copy: ''
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -124,56 +67,56 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    member_no: [
-      { required: true, message: t('memberNoPlaceholder'), trigger: 'blur' },
-      { validator: memberNoVerify, trigger: 'blur' },
-    ],
-    mobile: [
-      { required: true, message: t('mobilePlaceholder'), trigger: 'blur' },
-      { validator: mobileVerify, trigger: 'blur' },
-    ],
-    password: [
-      { required: true, message: t('passwordPlaceholder'), trigger: 'blur' },
-    ],
-    password_copy: [
-      { required: true, message: t('passwordPlaceholder'), trigger: 'blur' },
-      { validator: doubleCipher, trigger: 'blur' },
-    ],
-  }
+    return {
+        member_no: [
+            { required: true, message: t('memberNoPlaceholder'), trigger: 'blur' },
+            { validator: memberNoVerify, trigger: 'blur' }
+        ],
+        mobile: [
+            { required: true, message: t('mobilePlaceholder'), trigger: 'blur' },
+            { validator: mobileVerify, trigger: 'blur' }
+        ],
+        password: [
+            { required: true, message: t('passwordPlaceholder'), trigger: 'blur' }
+        ],
+        password_copy: [
+            { required: true, message: t('passwordPlaceholder'), trigger: 'blur' },
+            { validator: doubleCipher, trigger: 'blur' }
+        ]
+    }
 })
 
 // 验证手机号格式
 const mobileVerify = (rule: any, value: any, callback: any) => {
-  if (value && !/^1[3-9]\d{9}$/.test(value)) {
-    callback(new Error(t('mobileHint')))
-  } else {
-    callback()
-  }
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('mobileHint')))
+    } else {
+        callback()
+    }
 }
 // 验证两次密码
 const doubleCipher = (rule: any, value: any, callback: any) => {
-  if (value != formData.password) {
-    callback(t('doubleCipherHint'))
-  } else {
-    callback()
-  }
+    if (value != formData.password) {
+        callback(t('doubleCipherHint'))
+    } else {
+        callback()
+    }
 }
 // 验证会员编号
 const memberNoVerify = (rule: any, value: any, callback: any) => {
-  if (value && !/^[0-9a-zA-Z]*$/g.test(value)) {
-    callback(new Error(t('memberNoHint')))
-  } else {
-    callback()
-  }
+    if (value && !/^[0-9a-zA-Z]*$/g.test(value)) {
+        callback(new Error(t('memberNoHint')))
+    } else {
+        callback()
+    }
 }
 
 const memberNoInit = async () => {
-  await getMemberNo()
-    .then((res) => {
-      memberNo = res.data
+    await getMemberNo().then(res => {
+        memberNo = res.data
+    }).catch(() => {
+
     })
-    .catch(() => {})
 }
 
 const emit = defineEmits(['complete'])
@@ -183,56 +126,54 @@ const emit = defineEmits(['complete'])
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  const save = addMember
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-
-      if (repeat.value) return
-      repeat.value = true
-
-      const data = formData
-
-      save(data)
-        .then((res) => {
-          loading.value = false
-          repeat.value = false
-          showDialog.value = false
-          emit('complete')
-        })
-        .catch(() => {
-          loading.value = false
-          repeat.value = false
-        })
-    }
-  })
+    if (loading.value || !formEl) return
+    const save = addMember
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            if (repeat.value) return
+            repeat.value = true
+
+            const data = formData
+
+            save(data).then(res => {
+                loading.value = false
+                repeat.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(() => {
+                loading.value = false
+                repeat.value = false
+            })
+        }
+    })
 }
 
 const setFormData = async (row: any = null) => {
-  loading.value = true
-  Object.assign(formData, initialFormData)
-  popTitle = t('addMember')
-  if (row) {
-    popTitle = t('updateMember')
-    const data = await (await getMemberList(row.member_id)).data
-    if (data) {
-      Object.keys(formData).forEach((key: string) => {
-        if (data[key] != undefined) formData[key] = data[key]
-      })
+    loading.value = true
+    Object.assign(formData, initialFormData)
+    popTitle = t('addMember')
+    if (row) {
+        popTitle = t('updateMember')
+        const data = await (await getMemberList(row.member_id)).data
+        if (data) {
+            Object.keys(formData).forEach((key: string) => {
+                if (data[key] != undefined) formData[key] = data[key]
+            })
+        }
+    } else {
+        await memberNoInit()
+        formData.member_no = memberNo
+        formData.init_member_no = memberNo
     }
-  } else {
-    await memberNoInit()
-    formData.member_no = memberNo
-    formData.init_member_no = memberNo
-  }
-  loading.value = false
+    loading.value = false
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
diff --git a/admin/src/app/views/member/components/benefits-discount.vue b/admin/src/app/views/member/components/benefits-discount.vue
index df4ae8d9..3cc6982d 100644
--- a/admin/src/app/views/member/components/benefits-discount.vue
+++ b/admin/src/app/views/member/components/benefits-discount.vue
@@ -1,28 +1,20 @@
 <template>
-  <el-form ref="formRef" :model="formData" :rules="formRules">
-    <el-form-item label="" prop="discount" class="!mb-[10px]">
-      <div>
-        <div class="flex items-center">
-          <el-checkbox
-            v-model="formData.is_use"
-            :true-label="1"
-            :false-label="0"
-            label=""
-            size="large"
-          />
-          <span class="ml-[10px] el-form-item__label">消费折扣</span>
-          <div class="w-[120px]" v-show="formData.is_use">
-            <el-input v-model.trim="formData.discount" clearable>
-              <template #append>折</template>
-            </el-input>
-          </div>
-        </div>
-        <div class="text-sm text-gray-400 mb-[5px]">
-          会员购买产品默认折扣，需要商品设置参与会员折扣有效
-        </div>
-      </div>
-    </el-form-item>
-  </el-form>
+    <el-form ref="formRef" :model="formData" :rules="formRules">
+        <el-form-item label="" prop="discount" class="!mb-[10px]">
+            <div>
+                <div class="flex items-center">
+                    <el-checkbox v-model="formData.is_use" :true-label="1" :false-label="0" label="" size="large" />
+                    <span class="ml-[10px] el-form-item__label">消费折扣</span>
+                    <div class="w-[120px]" v-show="formData.is_use">
+                        <el-input v-model.trim="formData.discount" clearable >
+                            <template #append>折</template>
+                        </el-input>
+                    </div>
+                </div>
+                <div class="text-sm text-gray-400 mb-[5px]">会员购买产品默认折扣，需要商品设置参与会员折扣有效</div>
+            </div>
+        </el-form-item>
+    </el-form>
 </template>
 
 <script lang="ts" setup>
@@ -31,88 +23,78 @@ import { FormRules } from 'element-plus'
 import Test from '@/utils/test'
 
 const props = defineProps({
-  modelValue: {
-    type: Object,
-    default: () => {
-      return {}
-    },
-  },
+    modelValue: {
+        type: Object,
+        default: () => {
+            return {}
+        }
+    }
 })
 const emits = defineEmits(['update:modelValue'])
 
 const formData = ref({
-  is_use: 0,
-  discount: '',
+    is_use: 0,
+    discount: ''
 })
 const formRef = ref(null)
 
 const formRules = reactive<FormRules>({
-  discount: [
-    {
-      validator: (rule: any, value: any, callback: any) => {
-        if (formData.value.is_use) {
-          if (Test.empty(formData.value.discount)) {
-            callback('请输入折扣')
-          }
-          if (!Test.decimal(formData.value.discount, 1)) {
-            callback('折扣格式错误')
-          }
-          if (
-            parseFloat(formData.value.discount) < 0.1 ||
-            parseFloat(formData.value.discount) > 9.9
-          ) {
-            callback('折扣只能输入0.1~9.9之间的值')
-          }
-          if (formData.value.discount <= 0) {
-            callback('折扣不能小于等于0')
-          }
-          callback()
-        } else {
-          callback()
+    discount: [
+        {
+            validator: (rule: any, value: any, callback: any) => {
+                if (formData.value.is_use) {
+                    if (Test.empty(formData.value.discount)) {
+                        callback('请输入折扣')
+                    }
+                    if (!Test.decimal(formData.value.discount, 1)) {
+                        callback('折扣格式错误')
+                    }
+                    if (parseFloat(formData.value.discount) < 0.1 || parseFloat(formData.value.discount) > 9.9) {
+                        callback('折扣只能输入0.1~9.9之间的值')
+                    }
+                    if (formData.value.discount <= 0) {
+                        callback('折扣不能小于等于0')
+                    }
+                    callback()
+                } else {
+                    callback()
+                }
+            }
         }
-      },
-    },
-  ],
+    ]
 })
 
 const value = computed({
-  get() {
-    return props.modelValue
-  },
-  set(value) {
-    emits('update:modelValue', value)
-  },
+    get () {
+        return props.modelValue
+    },
+    set (value) {
+        emits('update:modelValue', value)
+    }
 })
 
-watch(
-  () => value.value,
-  (nval, oval) => {
+watch(() => value.value, (nval, oval) => {
     if ((!oval || !Object.keys(oval).length) && Object.keys(nval).length) {
-      formData.value = value.value
+        formData.value = value.value
     }
-  },
-  { immediate: true }
-)
+}, { immediate: true })
 
-watch(
-  () => formData.value,
-  () => {
+watch(() => formData.value, () => {
     value.value = formData.value
-  },
-  { deep: true }
-)
+}, { deep: true })
 
 const verify = async () => {
-  let verify = true
-  await formRef.value?.validate((valid) => {
-    verify = valid
-  })
-  return verify
+    let verify = true
+    await formRef.value?.validate((valid) => {
+        verify = valid
+    })
+    return verify
 }
 
 defineExpose({
-  verify,
+    verify
 })
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
diff --git a/admin/src/app/views/member/components/detail-member.vue b/admin/src/app/views/member/components/detail-member.vue
index 0b31e360..35d210fc 100644
--- a/admin/src/app/views/member/components/detail-member.vue
+++ b/admin/src/app/views/member/components/detail-member.vue
@@ -1,406 +1,253 @@
 <template>
-  <el-drawer
-    v-model="showDialog"
-    :title="popTitle"
-    direction="rtl"
-    :before-close="handleClose"
-    class="member-detail-drawer"
-  >
-    <div class="main-container" v-loading="loading">
-      <div class="bg-page py-[20px] pr-[30px] relative flex">
-        <div class="member-info w-[250px]">
-          <div class="flex items-center">
-            <div class="text-[14px] min-w-[110px] text-right mr-[20px]">
-              {{ t('headimg') }}
-            </div>
-            <div class="flex items-end text-[14px]">
-              <div class="w-[50px] h-[50px] flex items-center justify-center">
-                <img
-                  class="max-w-[50px] max-h-[50px] inline-block"
-                  v-if="formData.headimg"
-                  :src="img(formData.headimg)"
-                  alt=""
-                />
-                <img
-                  class="max-w-[50px] max-h-[50px] inline-block rounded-full"
-                  v-else
-                  src="@/app/assets/images/member_head.png"
-                  alt=""
-                />
-              </div>
-              <el-icon
-                @click="editMemberInfo('headimg')"
-                class="-bottom-[2px] -right-[4px] cursor-pointer"
-              >
-                <EditPen color="#273CE2" />
-              </el-icon>
-            </div>
-          </div>
-          <div class="flex items-center mt-[20px]">
-            <span class="text-[14px] min-w-[110px] text-right mr-[20px]"
-              >UID</span
-            >
-            <span
-              class="member-info-item text-[14px] text-[#666666] font-bold w-[150px]"
-            >
-              {{ formData.member_no || t('notAvailable') }}
-            </span>
-          </div>
-        </div>
-        <div class="flex flex-1 justify-between">
-          <div class="statistic-card">
-            <el-statistic :value="formData.point">
-              <template #title>
-                <div style="display: inline-flex; align-items: center">
-                  <span class="text-[14px]">
-                    {{ t('point') }}
-                  </span>
-                  <el-tooltip
-                    effect="dark"
-                    :content="t('adjust')"
-                    placement="top"
-                  >
-                    <el-icon
-                      @click="adjustPoint(formData)"
-                      class="ml-2 cursor-pointer"
-                      :size="12"
-                    >
-                      <EditPen color="#273CE2" />
-                    </el-icon>
-                  </el-tooltip>
-                  <el-tooltip
-                    effect="dark"
-                    :content="t('detail')"
-                    placement="top"
-                  >
-                    <el-icon
-                      @click="infoPoint(formData)"
-                      class="ml-2 cursor-pointer"
-                      :size="12"
-                    >
-                      <View />
-                    </el-icon>
-                  </el-tooltip>
+    <el-drawer v-model="showDialog" :title="popTitle" direction="rtl" :before-close="handleClose" class="member-detail-drawer">
+        <div class="main-container" v-loading="loading">
+            <div class="bg-page py-[20px] pr-[30px] relative flex">
+                <div class="member-info w-[250px]">
+                    <div class="flex items-center">
+                        <div class="text-[14px] min-w-[110px] text-right mr-[20px]">{{ t('headimg') }}</div>
+                        <div class="flex items-end text-[14px]">
+                            <div class="w-[50px] h-[50px] flex items-center justify-center">
+                                <img class="max-w-[50px] max-h-[50px] inline-block" v-if="formData.headimg" :src="img(formData.headimg)" alt="">
+                                <img class="max-w-[50px] max-h-[50px] inline-block rounded-full" v-else src="@/app/assets/images/member_head.png" alt="">
+                            </div>
+                            <el-icon @click="editMemberInfo('headimg')" class="-bottom-[2px] -right-[4px] cursor-pointer">
+                                <EditPen color="#273CE2" />
+                            </el-icon>
+                        </div>
+                    </div>
+                    <div class="flex items-center mt-[20px]">
+                        <span class="text-[14px] min-w-[110px] text-right mr-[20px]">UID</span>
+                        <span class="member-info-item text-[14px] text-[#666666] font-bold w-[150px]">
+                            {{ formData.member_no || t('notAvailable') }}
+                        </span>
+                    </div>
                 </div>
-              </template>
-            </el-statistic>
-            <div class="statistic-footer">
-              <div class="footer-item text-[14px] text-secondary">
-                <span>{{ t('accumulative') }}</span>
-                <span class="green ml-1">
-                  {{ formData.point_get }}
-                </span>
-              </div>
-            </div>
-          </div>
-          <div class="statistic-card">
-            <el-statistic :value="formData.balance">
-              <template #title>
-                <div style="display: inline-flex; align-items: center">
-                  <span class="text-[14px]">
-                    {{ t('balance') }}
-                  </span>
-                  <el-tooltip
-                    effect="dark"
-                    :content="t('adjust')"
-                    placement="top"
-                  >
-                    <el-icon
-                      @click="adjustBalance(formData)"
-                      class="ml-2 cursor-pointer"
-                      :size="12"
-                    >
-                      <EditPen color="#273CE2" />
-                    </el-icon>
-                  </el-tooltip>
-                  <el-tooltip
-                    effect="dark"
-                    :content="t('detail')"
-                    placement="top"
-                  >
-                    <el-icon
-                      @click="infoBalance(formData)"
-                      class="ml-2 cursor-pointer"
-                      :size="12"
-                    >
-                      <View />
-                    </el-icon>
-                  </el-tooltip>
+                <div class="flex flex-1 justify-between">
+                    <div class="statistic-card">
+                        <el-statistic :value="formData.point">
+                            <template #title>
+                                <div style="display: inline-flex; align-items: center">
+                                    <span class="text-[14px]">
+                                        {{ t('point') }}
+                                    </span>
+                                    <el-tooltip effect="dark" :content="t('adjust')" placement="top">
+                                        <el-icon @click="adjustPoint(formData)" class="ml-2 cursor-pointer" :size="12">
+                                            <EditPen color="#273CE2" />
+                                        </el-icon>
+                                    </el-tooltip>
+                                    <el-tooltip effect="dark" :content="t('detail')" placement="top">
+                                        <el-icon @click="infoPoint(formData)" class="ml-2 cursor-pointer" :size="12">
+                                            <View />
+                                        </el-icon>
+                                    </el-tooltip>
+                                </div>
+                            </template>
+                        </el-statistic>
+                        <div class="statistic-footer">
+                            <div class="footer-item text-[14px] text-secondary">
+                                <span>{{ t('accumulative') }}</span>
+                                <span class="green ml-1">
+                                    {{ formData.point_get }}
+                                </span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="statistic-card">
+                        <el-statistic :value="formData.balance">
+                            <template #title>
+                                <div style="display: inline-flex; align-items: center">
+                                    <span class="text-[14px]">
+                                        {{ t('balance') }}
+                                    </span>
+                                    <el-tooltip effect="dark" :content="t('adjust')" placement="top">
+                                        <el-icon @click="adjustBalance(formData)" class="ml-2 cursor-pointer" :size="12">
+                                            <EditPen color="#273CE2" />
+                                        </el-icon>
+                                    </el-tooltip>
+                                    <el-tooltip effect="dark" :content="t('detail')" placement="top">
+                                        <el-icon @click="infoBalance(formData)" class="ml-2 cursor-pointer" :size="12">
+                                            <View />
+                                        </el-icon>
+                                    </el-tooltip>
+                                </div>
+                            </template>
+                        </el-statistic>
+                        <div class="statistic-footer">
+                            <div class="footer-item text-[14px] text-secondary">
+                                <span>{{ t('accumulative') }}</span>
+                                <span class="red ml-1">
+                                    {{ formData.balance_get }}
+                                </span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="statistic-card">
+                        <el-statistic :value="formData.growth">
+                            <template #title>
+                                <div style="display: inline-flex; align-items: center">
+                                    <span class="text-[14px]">
+                                        {{ t('growth') }}
+                                    </span>
+                                    <el-tooltip effect="dark" :content="t('detail')" placement="top">
+                                        <el-icon @click="infoGrowth(formData)" class="ml-2 cursor-pointer" :size="12">
+                                            <View />
+                                        </el-icon>
+                                    </el-tooltip>
+                                </div>
+                            </template>
+                        </el-statistic>
+                    </div>
+                    <div class="statistic-card">
+                        <el-statistic :value="formData.money" title="New transactions today">
+                            <template #title>
+                                <div style="display: inline-flex; align-items: center">
+                                    <span class="text-[14px]">
+                                        {{ t("money") }}
+                                    </span>
+                                    <el-tooltip effect="dark" :content="t('detail')" placement="top">
+                                        <el-icon @click="infoBalance(formData)" class="ml-2 cursor-pointer" :size="12">
+                                            <View />
+                                        </el-icon>
+                                    </el-tooltip>
+                                </div>
+                            </template>
+                        </el-statistic>
+                        <div class="statistic-footer">
+                            <div class="footer-item text-[14px] text-secondary">
+                                <span>{{ t('accumulative') }}</span>
+                                <span class="green ml-1">
+                                    {{ formData.money_get }}
+                                </span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="statistic-card">
+                        <el-statistic :value="formData.commission" title="New transactions today">
+                            <template #title>
+                                <div style="display: inline-flex; align-items: center ">
+                                    <span class="text-[14px]">
+                                        {{ t("commission") }}
+                                    </span>
+                                    <el-tooltip effect="dark" :content="t('detail')" placement="top">
+                                        <el-icon @click="infoCommission(formData)" class="ml-2 cursor-pointer" :size="12">
+                                            <View />
+                                        </el-icon>
+                                    </el-tooltip>
+                                </div>
+                            </template>
+                        </el-statistic>
+                        <div class="statistic-footer">
+                            <div class="footer-item text-[14px] text-secondary">
+                                <span>{{ t('accumulative') }}</span>
+                                <span class="green ml-1">
+                                    {{ formData.commission_get }}
+                                </span>
+                            </div>
+                        </div>
+                    </div>
                 </div>
-              </template>
-            </el-statistic>
-            <div class="statistic-footer">
-              <div class="footer-item text-[14px] text-secondary">
-                <span>{{ t('accumulative') }}</span>
-                <span class="red ml-1">
-                  {{ formData.balance_get }}
-                </span>
-              </div>
             </div>
-          </div>
-          <div class="statistic-card">
-            <el-statistic :value="formData.growth">
-              <template #title>
-                <div style="display: inline-flex; align-items: center">
-                  <span class="text-[14px]">
-                    {{ t('growth') }}
-                  </span>
-                  <el-tooltip
-                    effect="dark"
-                    :content="t('detail')"
-                    placement="top"
-                  >
-                    <el-icon
-                      @click="infoGrowth(formData)"
-                      class="ml-2 cursor-pointer"
-                      :size="12"
-                    >
-                      <View />
-                    </el-icon>
-                  </el-tooltip>
+            <div class="flex flex-wrap mt-[20px]">
+                <div class="flex items-center w-[33.3%] mt-[15px]">
+                    <span class="text-[14px] w-[130px] text-right flex-shrink-0 mr-[20px]">{{ t('urserName') }}</span>
+                    <span class="text-[14px] text-[#666666]">
+                        {{ formData.username || t('notAvailable') }}
+                    </span>
                 </div>
-              </template>
-            </el-statistic>
-          </div>
-          <div class="statistic-card">
-            <el-statistic
-              :value="formData.money"
-              title="New transactions today"
-            >
-              <template #title>
-                <div style="display: inline-flex; align-items: center">
-                  <span class="text-[14px]">
-                    {{ t('money') }}
-                  </span>
-                  <el-tooltip
-                    effect="dark"
-                    :content="t('detail')"
-                    placement="top"
-                  >
-                    <el-icon
-                      @click="infoBalance(formData)"
-                      class="ml-2 cursor-pointer"
-                      :size="12"
-                    >
-                      <View />
-                    </el-icon>
-                  </el-tooltip>
+                <div class="flex mt-[15px] w-[33.3%] break-all leading-[21px]">
+                    <span class="text-[14px] w-[130px] text-right flex-shrink-0 mr-[20px]">{{ t('nickname') }}</span>
+                    <span class="text-[14px] text-[#666666]">
+                        {{ formData.nickname || t('notAvailable') }}
+                    </span>
                 </div>
-              </template>
-            </el-statistic>
-            <div class="statistic-footer">
-              <div class="footer-item text-[14px] text-secondary">
-                <span>{{ t('accumulative') }}</span>
-                <span class="green ml-1">
-                  {{ formData.money_get }}
-                </span>
-              </div>
-            </div>
-          </div>
-          <div class="statistic-card">
-            <el-statistic
-              :value="formData.commission"
-              title="New transactions today"
-            >
-              <template #title>
-                <div style="display: inline-flex; align-items: center">
-                  <span class="text-[14px]">
-                    {{ t('commission') }}
-                  </span>
-                  <el-tooltip
-                    effect="dark"
-                    :content="t('detail')"
-                    placement="top"
-                  >
-                    <el-icon
-                      @click="infoCommission(formData)"
-                      class="ml-2 cursor-pointer"
-                      :size="12"
-                    >
-                      <View />
-                    </el-icon>
-                  </el-tooltip>
+
+                <div class="flex mt-[15px] w-[33.3%] break-all leading-[21px]">
+                    <span class="text-[14px] w-[130px] text-right flex-shrink-0 mr-[20px]">{{ t('mobile') }}</span>
+                    <span class="text-[14px] text-[#666666]">
+                        {{ formData.mobile || t('notAvailable') }}
+                    </span>
+                </div>
+                <div class="flex mt-[15px] w-[33.3%] break-all leading-[21px]">
+                    <span class="text-[14px] w-[130px] text-right flex-shrink-0 mr-[20px]">{{ t('memberLevel') }}</span>
+                    <span class="text-[14px] text-[#666666]">
+                        {{ formData.member_level_name || t('notAvailable') }}<el-icon @click="editMemberInfo('member_level')" class="-bottom-[2px] -right-[4px] cursor-pointer">
+                            <EditPen color="#273CE2" />
+                        </el-icon>
+                    </span>
+                </div>
+                <div class="flex mt-[15px] w-[33.3%] break-all leading-[21px]">
+                    <span class="text-[14px] w-[130px] text-right flex-shrink-0 mr-[20px]">{{ t('memberLabel') }}</span>
+                    <span class="text-[14px] text-[#666666]">
+                        {{ formData.member_label_name&&formData.member_label_name.toString() || t('notAvailable') }}<el-icon @click="editMemberInfo('member_label')" class="-bottom-[2px] -right-[4px] cursor-pointer">
+                            <EditPen color="#273CE2" />
+                        </el-icon>
+                    </span>
+                </div>
+                <div class="flex mt-[15px] w-[33.3%] break-all leading-[21px]">
+                    <span class="text-[14px] w-[130px] text-right flex-shrink-0 mr-[20px]">{{ t('birthday') }}</span>
+                    <span class="text-[14px] text-[#666666]">
+                        {{ formData.birthday || t('notAvailable') }}<el-icon @click="editMemberInfo('birthday')" class="-bottom-[2px] -right-[4px] cursor-pointer">
+                            <EditPen color="#273CE2" />
+                        </el-icon>
+                    </span>
+                </div>
+                <div class="flex mt-[15px] w-[33.3%] break-all leading-[21px]">
+                    <span class="text-[14px] w-[130px] text-right flex-shrink-0 mr-[20px]">{{ t('sex') }}</span>
+                    <span class="text-[14px] text-[#666666]">
+                        {{ formData.sex == 1 && t('manSex') || formData.sex == 2 && t('girlSex') || t('secrecySex') }}<el-icon @click="editMemberInfo('sex')" class="-bottom-[2px] -right-[4px] cursor-pointer">
+                            <EditPen color="#273CE2" />
+                        </el-icon>
+                    </span>
+                </div>
+                <div class="flex mt-[15px] w-[33.3%] break-all leading-[21px]">
+                    <span class="text-[14px] w-[130px] text-right flex-shrink-0 mr-[20px]">{{ t('wxUnionid') }}</span>
+                    <span class="text-[14px] text-[#666666]">
+                        {{ formData.wx_unionid || t('notAvailable') }}
+                    </span>
+                </div>
+                <div class="flex mt-[15px] w-[33.3%] break-all leading-[21px]">
+                    <span class="text-[14px] w-[130px] text-right flex-shrink-0 mr-[20px]">{{ t('weappOpenid') }}</span>
+                    <span class="text-[14px] text-[#666666]">
+                        {{ formData.weapp_openid || t('notAvailable') }}
+                    </span>
+                </div>
+                <div class="flex mt-[15px] w-[33.3%] break-all leading-[21px]">
+                    <span class="text-[14px] w-[130px] text-right flex-shrink-0 mr-[20px]">{{ t('wxOpenid') }}</span>
+                    <span class="text-[14px] text-[#666666]">
+                        {{ formData.wx_openid || t('notAvailable') }}
+                    </span>
+                </div>
+                <div class="flex mt-[15px] w-[33.3%] break-all leading-[21px]">
+                    <span class="text-[14px] w-[130px] text-right flex-shrink-0 mr-[20px]">{{ t('registeredSource') }}</span>
+                    <span class="text-[14px] text-[#666666]">
+                        {{ formData.register_channel_name || t('notAvailable') }}
+                    </span>
+                </div>
+                <div class="flex mt-[15px] w-[33.3%] break-all leading-[21px]">
+                    <span class="text-[14px] w-[130px] text-right flex-shrink-0 mr-[20px]">{{ t('createTime') }}</span>
+                    <span class="text-[14px] text-[#666666]">
+                        {{ formData.create_time || t('notAvailable') }}
+                    </span>
+                </div>
+                <div class="flex mt-[15px] w-[33.3%] break-all leading-[21px]">
+                    <span class="text-[14px] w-[130px] text-right flex-shrink-0 mr-[20px]">{{ t('lastVisitTime') }}</span>
+                    <span class="text-[14px] text-[#666666]">
+                        {{ formData.last_visit_time || t('notAvailable') }}
+                    </span>
                 </div>
-              </template>
-            </el-statistic>
-            <div class="statistic-footer">
-              <div class="footer-item text-[14px] text-secondary">
-                <span>{{ t('accumulative') }}</span>
-                <span class="green ml-1">
-                  {{ formData.commission_get }}
-                </span>
-              </div>
             </div>
-          </div>
-        </div>
-      </div>
-      <div class="flex flex-wrap mt-[20px]">
-        <div class="flex items-center w-[33.3%] mt-[15px]">
-          <span
-            class="text-[14px] w-[130px] text-right flex-shrink-0 mr-[20px]"
-            >{{ t('urserName') }}</span
-          >
-          <span class="text-[14px] text-[#666666]">
-            {{ formData.username || t('notAvailable') }}
-          </span>
-        </div>
-        <div class="flex mt-[15px] w-[33.3%] break-all leading-[21px]">
-          <span
-            class="text-[14px] w-[130px] text-right flex-shrink-0 mr-[20px]"
-            >{{ t('nickname') }}</span
-          >
-          <span class="text-[14px] text-[#666666]">
-            {{ formData.nickname || t('notAvailable') }}
-          </span>
-        </div>
-
-        <div class="flex mt-[15px] w-[33.3%] break-all leading-[21px]">
-          <span
-            class="text-[14px] w-[130px] text-right flex-shrink-0 mr-[20px]"
-            >{{ t('mobile') }}</span
-          >
-          <span class="text-[14px] text-[#666666]">
-            {{ formData.mobile || t('notAvailable') }}
-          </span>
-        </div>
-        <div class="flex mt-[15px] w-[33.3%] break-all leading-[21px]">
-          <span
-            class="text-[14px] w-[130px] text-right flex-shrink-0 mr-[20px]"
-            >{{ t('memberLevel') }}</span
-          >
-          <span class="text-[14px] text-[#666666]">
-            {{ formData.member_level_name || t('notAvailable')
-            }}<el-icon
-              @click="editMemberInfo('member_level')"
-              class="-bottom-[2px] -right-[4px] cursor-pointer"
-            >
-              <EditPen color="#273CE2" />
-            </el-icon>
-          </span>
-        </div>
-        <div class="flex mt-[15px] w-[33.3%] break-all leading-[21px]">
-          <span
-            class="text-[14px] w-[130px] text-right flex-shrink-0 mr-[20px]"
-            >{{ t('memberLabel') }}</span
-          >
-          <span class="text-[14px] text-[#666666]">
-            {{
-              (formData.member_label_name &&
-                formData.member_label_name.toString()) ||
-              t('notAvailable')
-            }}<el-icon
-              @click="editMemberInfo('member_label')"
-              class="-bottom-[2px] -right-[4px] cursor-pointer"
-            >
-              <EditPen color="#273CE2" />
-            </el-icon>
-          </span>
-        </div>
-        <div class="flex mt-[15px] w-[33.3%] break-all leading-[21px]">
-          <span
-            class="text-[14px] w-[130px] text-right flex-shrink-0 mr-[20px]"
-            >{{ t('birthday') }}</span
-          >
-          <span class="text-[14px] text-[#666666]">
-            {{ formData.birthday || t('notAvailable')
-            }}<el-icon
-              @click="editMemberInfo('birthday')"
-              class="-bottom-[2px] -right-[4px] cursor-pointer"
-            >
-              <EditPen color="#273CE2" />
-            </el-icon>
-          </span>
-        </div>
-        <div class="flex mt-[15px] w-[33.3%] break-all leading-[21px]">
-          <span
-            class="text-[14px] w-[130px] text-right flex-shrink-0 mr-[20px]"
-            >{{ t('sex') }}</span
-          >
-          <span class="text-[14px] text-[#666666]">
-            {{
-              (formData.sex == 1 && t('manSex')) ||
-              (formData.sex == 2 && t('girlSex')) ||
-              t('secrecySex')
-            }}<el-icon
-              @click="editMemberInfo('sex')"
-              class="-bottom-[2px] -right-[4px] cursor-pointer"
-            >
-              <EditPen color="#273CE2" />
-            </el-icon>
-          </span>
-        </div>
-        <div class="flex mt-[15px] w-[33.3%] break-all leading-[21px]">
-          <span
-            class="text-[14px] w-[130px] text-right flex-shrink-0 mr-[20px]"
-            >{{ t('wxUnionid') }}</span
-          >
-          <span class="text-[14px] text-[#666666]">
-            {{ formData.wx_unionid || t('notAvailable') }}
-          </span>
-        </div>
-        <div class="flex mt-[15px] w-[33.3%] break-all leading-[21px]">
-          <span
-            class="text-[14px] w-[130px] text-right flex-shrink-0 mr-[20px]"
-            >{{ t('weappOpenid') }}</span
-          >
-          <span class="text-[14px] text-[#666666]">
-            {{ formData.weapp_openid || t('notAvailable') }}
-          </span>
-        </div>
-        <div class="flex mt-[15px] w-[33.3%] break-all leading-[21px]">
-          <span
-            class="text-[14px] w-[130px] text-right flex-shrink-0 mr-[20px]"
-            >{{ t('wxOpenid') }}</span
-          >
-          <span class="text-[14px] text-[#666666]">
-            {{ formData.wx_openid || t('notAvailable') }}
-          </span>
-        </div>
-        <div class="flex mt-[15px] w-[33.3%] break-all leading-[21px]">
-          <span
-            class="text-[14px] w-[130px] text-right flex-shrink-0 mr-[20px]"
-            >{{ t('registeredSource') }}</span
-          >
-          <span class="text-[14px] text-[#666666]">
-            {{ formData.register_channel_name || t('notAvailable') }}
-          </span>
-        </div>
-        <div class="flex mt-[15px] w-[33.3%] break-all leading-[21px]">
-          <span
-            class="text-[14px] w-[130px] text-right flex-shrink-0 mr-[20px]"
-            >{{ t('createTime') }}</span
-          >
-          <span class="text-[14px] text-[#666666]">
-            {{ formData.create_time || t('notAvailable') }}
-          </span>
         </div>
-        <div class="flex mt-[15px] w-[33.3%] break-all leading-[21px]">
-          <span
-            class="text-[14px] w-[130px] text-right flex-shrink-0 mr-[20px]"
-            >{{ t('lastVisitTime') }}</span
-          >
-          <span class="text-[14px] text-[#666666]">
-            {{ formData.last_visit_time || t('notAvailable') }}
-          </span>
-        </div>
-      </div>
-    </div>
-
-    <point-edit ref="pointDialog" @complete="getMemberInfoFn" />
-    <balance-edit ref="balanceDialog" @complete="getMemberInfoFn" />
-    <edit-member ref="editMemberDialog" @complete="getMemberInfoFn()" />
-  </el-drawer>
+        
+        <point-edit ref="pointDialog" @complete="getMemberInfoFn" />
+        <balance-edit ref="balanceDialog" @complete="getMemberInfoFn" />
+        <edit-member ref="editMemberDialog" @complete="getMemberInfoFn()" />
+    </el-drawer>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref, computed } from 'vue'
 import { t } from '@/lang'
-import {
-  addMember,
-  getMemberList,
-  getMemberNo,
-  getMemberInfo,
-} from '@/app/api/member'
+import { addMember, getMemberList, getMemberNo, getMemberInfo } from '@/app/api/member'
 import { FormInstance, ElMessage } from 'element-plus'
 import { ArrowLeft } from '@element-plus/icons-vue'
 import { useRouter, useRoute } from 'vue-router'
@@ -415,7 +262,7 @@ const loading = ref(false)
 const repeat = ref(false)
 let popTitle: string = '会员详情'
 let memberNo: string = ''
-let id = ''
+let id = '';
 
 const route = useRoute()
 const router = useRouter()
@@ -426,20 +273,20 @@ const password_input = ref(true)
 const password_copy_input = ref(true)
 
 const handleClose = (done: () => void) => {
-  showDialog.value = false
+    showDialog.value = false;
 }
 
 /**
  * 表单数据
  */
 const initialFormData = {
-  member_id: '',
-  nickname: '',
-  member_no: '',
-  init_member_no: '',
-  mobile: '',
-  password: '',
-  password_copy: '',
+    member_id: '',
+    nickname: '',
+    member_no: '',
+    init_member_no: '',
+    mobile: '',
+    password: '',
+    password_copy: ''
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -453,114 +300,107 @@ const editMemberDialog: Record<string, any> | null = ref(null)
  *  修改会员信息
  */
 const editMemberInfo = (type: any) => {
-  const data = ref({
-    type,
-    id,
-    data: formData,
-  })
-  editMemberDialog.value.setDialogType(data.value)
-  editMemberDialog.value.showDialog = true
+    const data = ref({
+        type,
+        id,
+        data: formData
+    })
+    editMemberDialog.value.setDialogType(data.value)
+    editMemberDialog.value.showDialog = true
 }
 
 /**
  * 调整积分
  */
 const adjustPoint = (data: any) => {
-  pointDialog.value.setFormData(data)
-  pointDialog.value.showDialog = true
+    pointDialog.value.setFormData(data)
+    pointDialog.value.showDialog = true
 }
 
 /**
  * 调整余额
  */
 const adjustBalance = (data: any) => {
-  balanceDialog.value.setFormData(data)
-  balanceDialog.value.showDialog = true
+    balanceDialog.value.setFormData(data)
+    balanceDialog.value.showDialog = true
 }
 
 /**
  * 积分详情
  */
 const infoPoint = () => {
-  router.push(`/member/point?id=${id}`)
+    router.push(`/member/point?id=${id}`)
 }
 
 /**
  * 余额详情
  */
 const infoBalance = () => {
-  router.push(`/member/balance?id=${id}`)
+    router.push(`/member/balance?id=${id}`)
 }
 
 /**
  * 成长值明细
  */
 const infoGrowth = () => {
-  router.push(`/member/growth?id=${id}`)
+    router.push(`/member/growth?id=${id}`)
 }
 
 /**
  * 佣金详情
  */
 const infoCommission = () => {
-  router.push(`/member/commission?id=${id}`)
+    router.push(`/member/commission?id=${id}`)
 }
 
-const getMemberInfoFn = async (bool = false) => {
-  loading.value = true
-  if (id) {
-    const data = await (await getMemberInfo(id)).data
-    if (!data || Object.keys(data).length == 0) {
-      ElMessage.error(t('memberNull'))
-      setTimeout(() => {
-        router.go(-1)
-      }, 2000)
-      return false
-    }
+const getMemberInfoFn = async (bool=false) => {
+    loading.value = true
+    if (id) {
+        const data = await (await getMemberInfo(id)).data
+        if (!data || Object.keys(data).length == 0) {
+            ElMessage.error(t('memberNull'))
+            setTimeout(() => {
+                router.go(-1)
+            }, 2000)
+            return false
+        }
 
-    Object.keys(data).forEach((item) => {
-      formData[item] = data[item]
-    })
+        Object.keys(data).forEach((item) => {
+            formData[item] = data[item]
+        })
 
-    if (
-      formData?.member_label_array &&
-      Object.keys(formData.member_label_array)?.length
-    ) {
-      formData.member_label = Object.values(formData.member_label_array).map(
-        (item: any, index) => {
-          return item.label_id
-        }
-      )
+        if (formData?.member_label_array && Object.keys(formData.member_label_array)?.length) {
+            formData.member_label = Object.values(formData.member_label_array).map((item: any, index) => {
+                return item.label_id
+            })
 
-      formData.member_label_name = Object.values(
-        formData.member_label_array
-      ).map((item: any, index) => {
-        return item.label_name
-      })
+            formData.member_label_name = Object.values(formData.member_label_array).map((item: any, index) => {
+                return item.label_name
+            })
+        }
+        loading.value = false
+    } else {
+        loading.value = false
+    }
+    if(!bool){
+        emit('load');
     }
-    loading.value = false
-  } else {
-    loading.value = false
-  }
-  if (!bool) {
-    emit('load')
-  }
 }
 
 const setFormData = async (row: any = null) => {
-  id = row.id
-  Object.assign(formData, initialFormData)
-  getMemberInfoFn(true)
+    id = row.id;
+    Object.assign(formData, initialFormData)
+    getMemberInfoFn(true);
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
 <style lang="scss">
-.member-detail-drawer {
-  width: 1300px !important;
+.member-detail-drawer{
+    width: 1300px !important;
 }
 </style>
diff --git a/admin/src/app/views/member/components/edit-label.vue b/admin/src/app/views/member/components/edit-label.vue
index 9a8c9724..bd6b20e5 100644
--- a/admin/src/app/views/member/components/edit-label.vue
+++ b/admin/src/app/views/member/components/edit-label.vue
@@ -1,89 +1,47 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="popTitle"
-    width="500px"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="90px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('labelName')" prop="label_name">
-        <el-input
-          v-model.trim="formData.label_name"
-          clearable
-          :placeholder="t('labelNamePlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-      <el-form-item :label="t('memo')">
-        <el-input
-          v-model.trim="formData.memo"
-          type="textarea"
-          rows="4"
-          clearable
-          :placeholder="t('memoPlaceholder')"
-          class="input-width"
-          maxlength="200"
-          show-word-limit
-        />
-      </el-form-item>
-      <el-form-item :label="t('sort')" prop="sort">
-        <el-input
-          v-model.trim="formData.sort"
-          clearable
-          maxlength="8"
-          show-word-limit
-          :placeholder="t('sortPlaceholder')"
-          class="input-width"
-          @keyup="filterNumber($event)"
-        />
-      </el-form-item>
-    </el-form>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+    <el-dialog v-model="showDialog" :title="popTitle" width="500px" :destroy-on-close="true">
+        <el-form :model="formData" label-width="90px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+            <el-form-item :label="t('labelName')" prop="label_name">
+                <el-input v-model.trim="formData.label_name" clearable :placeholder="t('labelNamePlaceholder')" class="input-width" />
+            </el-form-item>
+            <el-form-item :label="t('memo')">
+                <el-input v-model.trim="formData.memo" type="textarea" rows="4" clearable :placeholder="t('memoPlaceholder')" class="input-width" maxlength="200" show-word-limit />
+            </el-form-item>
+            <el-form-item :label="t('sort')" prop="sort">
+                <el-input v-model.trim="formData.sort" clearable maxlength="8" show-word-limit :placeholder="t('sortPlaceholder')" class="input-width" @keyup="filterNumber($event)" />
+            </el-form-item>
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{t('confirm')}}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
 import { ref, reactive, computed } from 'vue'
 import { t } from '@/lang'
 import type { FormInstance } from 'element-plus'
-import {
-  addMemberLabel,
-  updateMemberLabel,
-  getMemberLabelInfo,
-} from '@/app/api/member'
+import { addMemberLabel, updateMemberLabel, getMemberLabelInfo } from '@/app/api/member'
 import { filterNumber } from '@/utils/common'
 
 const showDialog = ref(false)
 const loading = ref(false)
 const repeat = ref(false)
-let popTitle: string = ''
+let popTitle:string = ''
 
 /**
  * 表单数据
  */
 const initialFormData = {
-  label_id: '',
-  label_name: '',
-  memo: '',
-  sort: 0,
+    label_id: '',
+    label_name: '',
+    memo: '',
+    sort: 0
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -91,22 +49,24 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    label_name: [
-      { required: true, message: t('labelNamePlaceholder'), trigger: 'blur' },
-    ],
-    sort: [{ validator: sortVerify, trigger: 'blur' }],
-  }
+    return {
+        label_name: [
+            { required: true, message: t('labelNamePlaceholder'), trigger: 'blur' }
+        ],
+        sort: [
+            { validator: sortVerify, trigger: 'blur' }
+        ]
+    }
 })
 
 const sortVerify = (rule: any, value: any, callback: any) => {
-  if (value < 0) {
-    callback(new Error(t('sortVerifyOne')))
-  } else if (value.toString().indexOf('.') != -1) {
-    callback(new Error(t('sortVerifyTwo')))
-  } else {
-    callback()
-  }
+    if (value < 0) {
+        callback(new Error(t('sortVerifyOne')))
+    } else if (value.toString().indexOf('.') != -1) {
+        callback(new Error(t('sortVerifyTwo')))
+    } else {
+        callback()
+    }
 }
 
 const emit = defineEmits(['complete'])
@@ -116,53 +76,51 @@ const emit = defineEmits(['complete'])
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  const save = formData.label_id ? updateMemberLabel : addMemberLabel
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-
-      if (repeat.value) return
-      repeat.value = true
-
-      const data = formData
-
-      save(data)
-        .then((res) => {
-          loading.value = false
-          repeat.value = false
-          showDialog.value = false
-          emit('complete')
-        })
-        .catch(() => {
-          loading.value = false
-          repeat.value = false
-          // showDialog.value = false
-        })
-    }
-  })
+    if (loading.value || !formEl) return
+    const save = formData.label_id ? updateMemberLabel : addMemberLabel
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            if (repeat.value) return
+            repeat.value = true
+
+            const data = formData
+
+            save(data).then(res => {
+                loading.value = false
+                repeat.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(() => {
+                loading.value = false
+                repeat.value = false
+                // showDialog.value = false
+            })
+        }
+    })
 }
 
 const setFormData = async (row: any = null) => {
-  loading.value = true
-  Object.assign(formData, initialFormData)
-  popTitle = t('addMemberLabel')
-  if (row) {
-    popTitle = t('updateMemberLabel')
-    const data = await (await getMemberLabelInfo(row.label_id)).data
-    if (data) {
-      Object.keys(formData).forEach((key: string) => {
-        if (data[key] != undefined) formData[key] = data[key]
-      })
+    loading.value = true
+    Object.assign(formData, initialFormData)
+    popTitle = t('addMemberLabel')
+    if (row) {
+        popTitle = t('updateMemberLabel')
+        const data = await (await getMemberLabelInfo(row.label_id)).data
+        if (data) {
+            Object.keys(formData).forEach((key: string) => {
+                if (data[key] != undefined) formData[key] = data[key]
+            })
+        }
     }
-  }
-  loading.value = false
+    loading.value = false
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
diff --git a/admin/src/app/views/member/components/edit-member.vue b/admin/src/app/views/member/components/edit-member.vue
index de5606e1..b52fe268 100644
--- a/admin/src/app/views/member/components/edit-member.vue
+++ b/admin/src/app/views/member/components/edit-member.vue
@@ -1,102 +1,44 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="title || t('updateMember')"
-    width="500px"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="saveData"
-      label-width="90px"
-      :rules="formRules"
-      ref="formRef"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('headimg')" v-if="type == 'headimg'">
-        <upload-image v-model="saveData.headimg" />
-      </el-form-item>
-      <el-form-item :label="t('nickname')" v-if="type == 'nickname'">
-        <el-input
-          v-model.trim="saveData.nickname"
-          clearable
-          :placeholder="t('nickNamePlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-      <el-form-item :label="t('birthday')" v-if="type == 'birthday'">
-        <el-date-picker
-          v-model="saveData.birthday"
-          value-format="YYYY-MM-DD"
-          type="date"
-          :placeholder="t('birthdayTip')"
-        />
-      </el-form-item>
-      <el-form-item :label="t('sex')" v-if="type == 'sex'">
-        <el-select
-          v-model="saveData.sex"
-          clearable
-          :placeholder="t('sexPlaceholder')"
-          class="input-width"
-        >
-          <el-option
-            :label="item['name']"
-            :value="item['id']"
-            v-for="(item, index) in sexSelectData"
-            :key="index"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="t('memberLabel')" v-if="type == 'member_label'">
-        <el-select
-          v-model="saveData.member_label"
-          multiple
-          collapse-tags
-          :placeholder="t('memberLabelPlaceholder')"
-          class="input-width"
-        >
-          <el-option
-            :label="item['label_name']"
-            :value="item['label_id']"
-            v-for="(item, index) in labelSelectData"
-            :key="index"
-          />
-        </el-select>
-      </el-form-item>
-      <div v-if="type == 'member_level'">
-        <el-form-item :label="t('memberLevelUpdate')" prop="member_level">
-          <el-select
-            v-model="saveData.member_level"
-            :placeholder="t('memberLevelPlaceholder')"
-            class="input-width"
-          >
-            <el-option :label="t('memberLevelPlaceholder')" :value="0" />
-            <el-option
-              :label="item['level_name']"
-              :value="item['level_id']"
-              v-for="(item, index) in levelSelectData"
-              :key="index"
-            />
-          </el-select>
-          <div class="text-sm text-gray-400">
-            {{ t('memberLevelUpdateTips') }}
-          </div>
-        </el-form-item>
-      </div>
-    </el-form>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+    <el-dialog v-model="showDialog" :title="title || t('updateMember')" width="500px" :destroy-on-close="true">
+
+        <el-form :model="saveData" label-width="90px" :rules="formRules" ref="formRef" class="page-form" v-loading="loading">
+            <el-form-item :label="t('headimg')" v-if="type == 'headimg'">
+                <upload-image v-model="saveData.headimg" />
+            </el-form-item>
+            <el-form-item :label="t('nickname')" v-if="type == 'nickname'">
+                <el-input v-model.trim="saveData.nickname" clearable :placeholder="t('nickNamePlaceholder')" class="input-width" />
+            </el-form-item>
+            <el-form-item :label="t('birthday')" v-if="type == 'birthday'">
+                <el-date-picker v-model="saveData.birthday" value-format="YYYY-MM-DD" type="date" :placeholder="t('birthdayTip')" />
+            </el-form-item>
+            <el-form-item :label="t('sex')" v-if="type == 'sex'">
+                <el-select v-model="saveData.sex" clearable :placeholder="t('sexPlaceholder')" class="input-width">
+                    <el-option :label="item['name']" :value="item['id']" v-for="(item,index) in sexSelectData" :key="index" />
+                </el-select>
+            </el-form-item>
+            <el-form-item :label="t('memberLabel')" v-if="type == 'member_label'">
+                <el-select v-model="saveData.member_label" multiple collapse-tags :placeholder="t('memberLabelPlaceholder')" class="input-width">
+                    <el-option :label="item['label_name']" :value="item['label_id']" v-for="(item,index) in labelSelectData"  :key="index"/>
+                </el-select>
+            </el-form-item>
+            <div v-if="type == 'member_level'">
+                <el-form-item :label="t('memberLevelUpdate')" prop="member_level">
+                    <el-select v-model="saveData.member_level" :placeholder="t('memberLevelPlaceholder')" class="input-width">
+                        <el-option :label="t('memberLevelPlaceholder')" :value="0" />
+                        <el-option :label="item['level_name']" :value="item['level_id']" v-for="(item,index) in levelSelectData"  :key="index"/>
+                    </el-select>
+                    <div class="text-sm text-gray-400">{{ t('memberLevelUpdateTips') }}</div>
+                </el-form-item>
+            </div>
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{t('confirm')}}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -104,11 +46,7 @@ import { ref, reactive, computed } from 'vue'
 import { t } from '@/lang'
 import { deepClone } from '@/utils/common'
 import type { FormInstance } from 'element-plus'
-import {
-  editMemberDetail,
-  getMemberLabelAll,
-  getMemberLevelAll,
-} from '@/app/api/member'
+import { editMemberDetail, getMemberLabelAll, getMemberLevelAll } from '@/app/api/member'
 import Test from '@/utils/test'
 
 // 修改类型
@@ -122,56 +60,56 @@ const repeat = ref(false)
 const formRef = ref(null)
 
 const sexSelectData = ref([
-  {
-    id: 0,
-    name: t('secrecySex'),
-  },
-  {
-    id: 1,
-    name: t('manSex'),
-  },
-  {
-    id: 2,
-    name: t('girlSex'),
-  },
+    {
+        id: 0,
+        name: t('secrecySex')
+    },
+    {
+        id: 1,
+        name: t('manSex')
+    },
+    {
+        id: 2,
+        name: t('girlSex')
+    }
 ])
-const labelSelectData: any = ref(null)
+const labelSelectData:any = ref(null)
 // 获取全部标签
 const getMemberLabelAllFn = async () => {
-  labelSelectData.value = await (await getMemberLabelAll()).data
+    labelSelectData.value = await (await getMemberLabelAll()).data
 }
 getMemberLabelAllFn()
 
 const levelSelectData = ref([])
 getMemberLevelAll().then(({ data }) => {
-  levelSelectData.value = data
+    levelSelectData.value = data
 })
 
 const formRules = computed(() => {
-  return {
-    member_level: [
-      {
-        validator: (rule: any, value: any, callback: Function) => {
-          if (Test.empty(saveData.member_level)) {
-            callback(t('memberLevelPlaceholder'))
-          }
-          callback()
-        },
-      },
-    ],
-  }
+    return {
+        member_level: [
+            {
+                validator: (rule: any, value: any, callback: Function) => {
+                    if (Test.empty(saveData.member_level)) {
+                        callback(t('memberLevelPlaceholder'))
+                    }
+                    callback()
+                }
+            }
+        ]
+    }
 })
 
 /**
  * 表单数据
  */
 const initialFormData = {
-  headimg: '',
-  nickname: '',
-  member_label: '',
-  member_level: '',
-  sex: '',
-  birthday: '',
+    headimg: '',
+    nickname: '',
+    member_label: '',
+    member_level: '',
+    sex: '',
+    birthday: ''
 }
 const saveData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -182,71 +120,67 @@ const emit = defineEmits(['complete'])
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  await formRef.value?.validate((valid) => {
-    if (valid) {
-      loading.value = true
-
-      if (repeat.value) return
-      repeat.value = true
-
-      let val = saveData[type.value]
-      if (type.value == 'member_label') {
-        // 将saveData[type.value]中的值，转换为字符串
-        val =
-          saveData[type.value] && saveData[type.value].length
-            ? deepClone(saveData[type.value]).join(',').split(',')
-            : ''
-      }
-
-      const data = ref({
-        member_id: memberId.value,
-        field: type.value,
-        value: val,
-      })
-
-      editMemberDetail(data.value)
-        .then((res) => {
-          loading.value = false
-          repeat.value = false
-          showDialog.value = false
-          emit('complete')
-        })
-        .catch(() => {
-          loading.value = false
-          repeat.value = false
-        })
-    }
-  })
+    await formRef.value?.validate((valid) => {
+        if (valid) {
+            loading.value = true
+
+            if (repeat.value) return
+            repeat.value = true
+
+            let val = saveData[type.value];
+            if(type.value == 'member_label'){
+                // 将saveData[type.value]中的值，转换为字符串
+                val = saveData[type.value] && saveData[type.value].length  ? deepClone(saveData[type.value]).join(',').split(',') : '';
+            }
+
+            const data = ref({
+                member_id: memberId.value,
+                field: type.value,
+                value: val
+            })
+
+            editMemberDetail(data.value).then(res => {
+                loading.value = false
+                repeat.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(() => {
+                loading.value = false
+                repeat.value = false
+            })
+        }
+    })
 }
 
 const setDialogType = async (row: any = null) => {
-  loading.value = true
-  type.value = row.type
-  title.value = row.title
-  memberId.value = row.id
-  saveData[type.value] = row.data[type.value]
-  if (type.value == 'member_label' && saveData[type.value]) {
-    saveData[type.value].forEach((item: any, index: any) => {
-      let isExist = false
-      for (let i = 0; i < labelSelectData.value.length; i++) {
-        if (labelSelectData.value[i].label_id == item) {
-          isExist = true
-          break
-        }
-      }
-      if (isExist) {
-        saveData[type.value][index] = Number.parseFloat(item)
-      } else {
-        saveData[type.value].splice(index, 1) // 删除不存在的id
-      }
-    })
-  }
-  loading.value = false
+    loading.value = true
+    type.value = row.type
+    title.value = row.title
+    memberId.value = row.id
+    saveData[type.value] = row.data[type.value]
+    if (type.value == 'member_label' && saveData[type.value]) {
+        saveData[type.value].forEach((item: any, index: any) => {
+            let isExist = false;
+            for (let i = 0; i < labelSelectData.value.length; i++) {
+                if (labelSelectData.value[i].label_id == item) {
+                    isExist = true;
+                    break;
+                }
+            }
+            if (isExist) {
+                saveData[type.value][index] = Number.parseFloat(item)
+            } else {
+                saveData[type.value].splice(index, 1); // 删除不存在的id
+            }
+
+        })
+    }
+    loading.value = false
 }
 
 defineExpose({
-  showDialog,
-  setDialogType,
+    showDialog,
+    setDialogType
 })
 </script>
 
diff --git a/admin/src/app/views/member/components/gift-balance.vue b/admin/src/app/views/member/components/gift-balance.vue
index 375886e2..2a8d1e97 100644
--- a/admin/src/app/views/member/components/gift-balance.vue
+++ b/admin/src/app/views/member/components/gift-balance.vue
@@ -1,22 +1,16 @@
 <template>
-  <el-form ref="formRef" :model="formData" :rules="formRules">
-    <el-form-item label="" prop="money">
-      <div class="flex items-center">
-        <el-checkbox
-          v-model="formData.is_use"
-          :true-label="1"
-          :false-label="0"
-          label=""
-          size="large"
-        />
-        <span class="ml-[10px] el-form-item__label">送</span>
-        <div class="w-[70px]">
-          <el-input v-model.trim="formData.money" :maxlength="5" clearable />
-        </div>
-        <span class="ml-[15px] el-form-item__label">元红包</span>
-      </div>
-    </el-form-item>
-  </el-form>
+    <el-form ref="formRef" :model="formData" :rules="formRules">
+        <el-form-item label="" prop="money">
+            <div class="flex items-center">
+                <el-checkbox v-model="formData.is_use" :true-label="1" :false-label="0" label="" size="large" />
+                <span class="ml-[10px] el-form-item__label">送</span>
+                <div class="w-[70px]">
+                    <el-input v-model.trim="formData.money" :maxlength="5" clearable />
+                </div>
+                <span class="ml-[15px] el-form-item__label">元红包</span>
+            </div>
+        </el-form-item>
+    </el-form>
 </template>
 
 <script lang="ts" setup>
@@ -25,87 +19,80 @@ import { FormRules } from 'element-plus'
 import Test from '@/utils/test'
 
 const props = defineProps({
-  modelValue: {
-    type: Object,
-    default: () => {
-      return {}
-    },
-  },
+    modelValue: {
+        type: Object,
+        default: () => {
+            return {}
+        }
+    }
 })
 const emits = defineEmits(['update:modelValue'])
 
 const formData = ref({
-  is_use: 0,
-  money: '',
+    is_use: 0,
+    money: ''
 })
 const formRef = ref(null)
 // 正则表达式
 const regExp = {
-  required: /[\S]+/,
-  number: /^\d{0,10}$/,
-  digit: /^\d{0,10}(.?\d{0,2})$/,
-  special: /^\d{0,10}(.?\d{0,3})$/,
+    required: /[\S]+/,
+    number: /^\d{0,10}$/,
+    digit: /^\d{0,10}(.?\d{0,2})$/,
+    special: /^\d{0,10}(.?\d{0,3})$/
 }
 const formRules = reactive<FormRules>({
-  money: [
-    {
-      validator: (rule: any, value: any, callback: any) => {
-        if (formData.value.is_use) {
-          if (Test.empty(value)) {
-            callback('请输入红包金额')
-          } else if (isNaN(value) || !regExp.digit.test(value)) {
-            callback('红包金额格式错误')
-          } else if (value <= 0) {
-            callback('红包金额不能小于等于0')
-          }
-          callback()
-        } else {
-          callback()
+    money: [
+        {
+            validator: (rule: any, value: any, callback: any) => {
+                if (formData.value.is_use) {
+                    if (Test.empty(value)) {
+                        callback('请输入红包金额')
+                    }else if (isNaN(value) || !regExp.digit.test(value)) {
+                        callback('红包金额格式错误')
+                    }else if (value <= 0) {
+                        callback('红包金额不能小于等于0')
+                    }
+                    callback()
+                } else {
+                    callback()
+                }
+            },
+            trigger: 'blur'
         }
-      },
-      trigger: 'blur',
-    },
-  ],
+    ]
 })
 
 const value = computed({
-  get() {
-    return props.modelValue
-  },
-  set(value) {
-    emits('update:modelValue', value)
-  },
+    get () {
+        return props.modelValue
+    },
+    set (value) {
+        emits('update:modelValue', value)
+    }
 })
 
-watch(
-  () => value.value,
-  (nval, oval) => {
+watch(() => value.value, (nval, oval) => {
     if ((!oval || !Object.keys(oval).length) && Object.keys(nval).length) {
-      formData.value = value.value
+        formData.value = value.value
     }
-  },
-  { immediate: true }
-)
+}, { immediate: true })
 
-watch(
-  () => formData.value,
-  () => {
+watch(() => formData.value, () => {
     value.value = formData.value
-  },
-  { deep: true }
-)
+}, { deep: true })
 
 const verify = async () => {
-  let verify = true
-  await formRef.value?.validate((valid) => {
-    verify = valid
-  })
-  return verify
+    let verify = true
+    await formRef.value?.validate((valid) => {
+        verify = valid
+    })
+    return verify
 }
 
 defineExpose({
-  verify,
+    verify
 })
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
diff --git a/admin/src/app/views/member/components/gift-point.vue b/admin/src/app/views/member/components/gift-point.vue
index bfd901e2..b85ba16e 100644
--- a/admin/src/app/views/member/components/gift-point.vue
+++ b/admin/src/app/views/member/components/gift-point.vue
@@ -1,20 +1,14 @@
 <template>
-  <el-form ref="formRef" :model="formData" :rules="formRules">
-    <el-form-item label="" prop="num">
-      <el-checkbox
-        v-model="formData.is_use"
-        :true-label="1"
-        :false-label="0"
-        label=""
-        size="large"
-      />
-      <span class="ml-[10px] el-form-item__label">送</span>
-      <div class="w-[70px]">
-        <el-input v-model.trim="formData.num" clearable />
-      </div>
-      <span class="ml-[15px] el-form-item__label">积分</span>
-    </el-form-item>
-  </el-form>
+    <el-form ref="formRef" :model="formData" :rules="formRules">
+        <el-form-item label="" prop="num">
+            <el-checkbox v-model="formData.is_use" :true-label="1" :false-label="0" label="" size="large" />
+            <span class="ml-[10px] el-form-item__label">送</span>
+            <div class="w-[70px]">
+                <el-input v-model.trim="formData.num" clearable />
+            </div>
+            <span class="ml-[15px] el-form-item__label">积分</span>
+        </el-form-item>
+    </el-form>
 </template>
 
 <script lang="ts" setup>
@@ -23,89 +17,82 @@ import { FormRules } from 'element-plus'
 import Test from '@/utils/test'
 
 const props = defineProps({
-  modelValue: {
-    type: Object,
-    default: () => {
-      return {}
-    },
-  },
+    modelValue: {
+        type: Object,
+        default: () => {
+            return {}
+        }
+    }
 })
 const emits = defineEmits(['update:modelValue'])
 
 const formData = ref({
-  is_use: 0,
-  num: '',
+    is_use: 0,
+    num: ''
 })
 
 const formRef = ref(null)
 // 正则表达式
 const regExp = {
-  required: /[\S]+/,
-  number: /^\d{0,10}$/,
-  digit: /^\d{0,10}(.?\d{0,2})$/,
-  special: /^\d{0,10}(.?\d{0,3})$/,
+    required: /[\S]+/,
+    number: /^\d{0,10}$/,
+    digit: /^\d{0,10}(.?\d{0,2})$/,
+    special: /^\d{0,10}(.?\d{0,3})$/
 }
 const formRules = reactive<FormRules>({
-  num: [
-    {
-      validator: (rule: any, value: any, callback: any) => {
-        if (formData.value.is_use) {
-          if (value.length == 0) {
-            callback('请输入积分数量')
-          } else if (isNaN(value) || !regExp.number.test(value)) {
-            callback('积分数量格式错误')
-          } else if (value <= 0) {
-            callback('积分数量不能小于等于0')
-          } else {
-            callback()
-          }
-        } else {
-          callback()
+    num: [
+        {
+            validator: (rule: any, value: any, callback: any) => {
+                if (formData.value.is_use) {
+                    if (value.length == 0) {
+                        callback('请输入积分数量')
+                    } else if (isNaN(value) || !regExp.number.test(value)) {
+                        callback('积分数量格式错误')
+                    } else if (value <=0) {
+                        callback('积分数量不能小于等于0')
+                    } else{
+                        callback();
+                    }
+                } else {
+                    callback()
+                }
+            },
+            trigger: 'blur'
         }
-      },
-      trigger: 'blur',
-    },
-  ],
+    ]
 })
 
 const value = computed({
-  get() {
-    return props.modelValue
-  },
-  set(value) {
-    emits('update:modelValue', value)
-  },
+    get () {
+        return props.modelValue
+    },
+    set (value) {
+        emits('update:modelValue', value)
+    }
 })
 
-watch(
-  () => value.value,
-  (nval, oval) => {
+watch(() => value.value, (nval, oval) => {
     if ((!oval || !Object.keys(oval).length) && Object.keys(nval).length) {
-      formData.value = value.value
+        formData.value = value.value
     }
-  },
-  { immediate: true }
-)
+}, { immediate: true })
 
-watch(
-  () => formData.value,
-  () => {
+watch(() => formData.value, () => {
     value.value = formData.value
-  },
-  { deep: true }
-)
+}, { deep: true })
 
 const verify = async () => {
-  let verify = true
-  await formRef.value?.validate((valid) => {
-    verify = valid
-  })
-  return verify
+    let verify = true
+    await formRef.value?.validate((valid) => {
+        verify = valid
+    })
+    return verify
 }
 
 defineExpose({
-  verify,
+    verify
 })
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
diff --git a/admin/src/app/views/member/components/growth-rule-register.vue b/admin/src/app/views/member/components/growth-rule-register.vue
index 59c20476..84282104 100644
--- a/admin/src/app/views/member/components/growth-rule-register.vue
+++ b/admin/src/app/views/member/components/growth-rule-register.vue
@@ -1,25 +1,21 @@
 <template>
-  <el-form ref="formRef" :model="formData" :rules="formRules">
-    <el-form-item label="" prop="growth">
-      <div>
-        <div>
-          <span class="el-form-item__label">会员注册</span>
-          <el-switch
-            v-model="formData.is_use"
-            :active-value="1"
-            :inactive-value="0"
-          />
-        </div>
-        <div class="flex mt-[10px]" v-show="formData.is_use">
-          <span class="el-form-item__label">发放</span>
-          <div class="w-[70px]">
-            <el-input v-model.number.trim="formData.growth" clearable />
-          </div>
-          <span class="ml-[10px] el-form-item__label">成长值</span>
-        </div>
-      </div>
-    </el-form-item>
-  </el-form>
+    <el-form ref="formRef" :model="formData" :rules="formRules">
+        <el-form-item label="" prop="growth">
+            <div>
+                <div>
+                    <span class="el-form-item__label">会员注册</span>
+                    <el-switch v-model="formData.is_use" :active-value="1" :inactive-value="0"/>
+                </div>
+                <div class="flex mt-[10px]" v-show="formData.is_use">
+                    <span class="el-form-item__label">发放</span>
+                    <div class="w-[70px]">
+                        <el-input v-model.number.trim="formData.growth" clearable />
+                    </div>
+                    <span class="ml-[10px] el-form-item__label">成长值</span>
+                </div>
+            </div>
+        </el-form-item>
+    </el-form>
 </template>
 
 <script lang="ts" setup>
@@ -28,83 +24,76 @@ import { FormRules } from 'element-plus'
 import Test from '@/utils/test'
 
 const props = defineProps({
-  modelValue: {
-    type: Object,
-    default: () => {
-      return {}
-    },
-  },
+    modelValue: {
+        type: Object,
+        default: () => {
+            return {}
+        }
+    }
 })
 const emits = defineEmits(['update:modelValue'])
 
 const formData = ref({
-  is_use: 0,
-  growth: '',
+    is_use: 0,
+    growth: ''
 })
 
 const formRef = ref(null)
 
 const formRules = reactive<FormRules>({
-  growth: [
-    {
-      validator: (rule: any, value: any, callback: Function) => {
-        if (formData.value.is_use) {
-          if (Test.empty(formData.value.growth)) {
-            callback('请输入发放成长值数量')
-          }
-          if (!Test.digits(formData.value.growth)) {
-            callback('成长值数量格式错误')
-          }
-          if (formData.value.growth <= 0) {
-            callback('成长值数量不能小于等于0')
-          }
-          callback()
-        } else {
-          callback()
+    growth: [
+        {
+            validator: (rule: any, value: any, callback: Function) => {
+                if (formData.value.is_use) {
+                    if (Test.empty(formData.value.growth)) {
+                        callback('请输入发放成长值数量')
+                    }
+                    if (!Test.digits(formData.value.growth)) {
+                        callback('成长值数量格式错误')
+                    }
+                    if (formData.value.growth <= 0) {
+                        callback('成长值数量不能小于等于0')
+                    }
+                    callback()
+                } else {
+                    callback()
+                }
+            }
         }
-      },
-    },
-  ],
+    ]
 })
 
 const value = computed({
-  get() {
-    return props.modelValue
-  },
-  set(value) {
-    emits('update:modelValue', value)
-  },
+    get () {
+        return props.modelValue
+    },
+    set (value) {
+        emits('update:modelValue', value)
+    }
 })
 
-watch(
-  () => value.value,
-  (nval, oval) => {
+watch(() => value.value, (nval, oval) => {
     if ((!oval || !Object.keys(oval).length) && Object.keys(nval).length) {
-      formData.value = value.value
+        formData.value = value.value
     }
-  },
-  { immediate: true }
-)
+}, { immediate: true })
 
-watch(
-  () => formData.value,
-  () => {
+watch(() => formData.value, () => {
     value.value = formData.value
-  },
-  { deep: true }
-)
+}, { deep: true })
 
 const verify = async () => {
-  let verify = true
-  await formRef.value?.validate((valid) => {
-    verify = valid
-  })
-  return verify
+    let verify = true
+    await formRef.value?.validate((valid) => {
+        verify = valid
+    })
+    return verify
 }
 
 defineExpose({
-  verify,
+    verify
 })
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
diff --git a/admin/src/app/views/member/components/member-balance-edit.vue b/admin/src/app/views/member/components/member-balance-edit.vue
index 2e6a2213..d2aa04ba 100644
--- a/admin/src/app/views/member/components/member-balance-edit.vue
+++ b/admin/src/app/views/member/components/member-balance-edit.vue
@@ -1,64 +1,35 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="t('adjustBalance')"
-    width="550px"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="110px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-      @submit.enter.prevent
-    >
-      <el-form-item :label="t('currBalance')">
-        <div class="input-width">{{ formData.balance }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('adjustType')">
-        <el-radio-group v-model="formData.adjust_type">
-          <el-radio :label="1">{{ t('adjustAddBalance') }}</el-radio>
-          <el-radio :label="-1">{{ t('adjustReduceBalance') }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-
-      <el-form-item :label="t('adjustBalance')" prop="adjust">
-        <el-input-number
-          v-model="formData.adjust"
-          clearable
-          :min="0"
-          :max="999999"
-          :placeholder="t('adjustPlaceholder')"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('memo')" prop="memo">
-        <el-input
-          v-model.trim="formData.memo"
-          type="textarea"
-          rows="4"
-          clearable
-          :placeholder="t('memoPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-    </el-form>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+    <el-dialog v-model="showDialog" :title="t('adjustBalance')" width="550px" :destroy-on-close="true">
+        <el-form :model="formData" label-width="110px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading" @submit.enter.prevent>
+
+            <el-form-item :label="t('currBalance')" >
+                <div class="input-width"> {{ formData.balance }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('adjustType')">
+                <el-radio-group v-model="formData.adjust_type">
+                    <el-radio :label="1">{{ t('adjustAddBalance') }}</el-radio>
+                    <el-radio :label="-1">{{ t('adjustReduceBalance') }}</el-radio>
+                </el-radio-group>
+            </el-form-item>
+
+            <el-form-item :label="t('adjustBalance')" prop="adjust">
+                <el-input-number v-model="formData.adjust" clearable :min="0" :max="999999" :placeholder="t('adjustPlaceholder')"/>
+            </el-form-item>
+
+            <el-form-item :label="t('memo')" prop="memo">
+                <el-input v-model.trim="formData.memo" type="textarea" rows="4" clearable :placeholder="t('memoPlaceholder')" class="input-width"/>
+            </el-form-item>
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{t('confirm')}}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -75,12 +46,12 @@ const repeat = ref(false)
  * 表单数据
  */
 const initialFormData = {
-  member_id: 0,
-  balance: '',
-  memo: '',
-  adjust: '',
-  account_data: '',
-  adjust_type: 1,
+    member_id: 0,
+    balance: '',
+    memo: '',
+    adjust: '',
+    account_data: '',
+    adjust_type: 1
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -88,34 +59,27 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    adjust: [
-      {
-        required: true,
-        message: t('adjustBalancePlaceholder'),
-        trigger: 'blur',
-      },
-      {
-        validator: (rule: any, value: string, callback: any) => {
-          const adjust = Math.abs(parseFloat(formData.adjust))
-
-          if (!adjust) {
-            callback(new Error(t('adjustBalancePlaceholder')))
-          }
-
-          if (
-            formData.adjust_type == -1 &&
-            parseFloat(formData.balance) - adjust < 0
-          ) {
-            callback(new Error(t('adjustBalanceMaxAccountMessage')))
-          }
-
-          callback()
-        },
-        trigger: 'blur',
-      },
-    ],
-  }
+    return {
+        adjust: [
+            { required: true, message: t('adjustBalancePlaceholder'), trigger: 'blur' },
+            {
+                validator: (rule: any, value: string, callback: any) => {
+                    const adjust = Math.abs(parseFloat(formData.adjust))
+
+                    if (!adjust) {
+                        callback(new Error(t('adjustBalancePlaceholder')))
+                    }
+
+                    if (formData.adjust_type == -1 && (parseFloat(formData.balance) - adjust < 0)) {
+                        callback(new Error(t('adjustBalanceMaxAccountMessage')))
+                    }
+
+                    callback()
+                },
+                trigger: 'blur'
+            }
+        ]
+    }
 })
 
 /**
@@ -123,51 +87,48 @@ const formRules = computed(() => {
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-
-      if (repeat.value) return
-      repeat.value = true
-
-      formData.account_data =
-        Math.abs(parseFloat(formData.adjust)) * formData.adjust_type
-      const data = formData
-
-      adjustBalance(data)
-        .then((res) => {
-          loading.value = false
-          repeat.value = false
-          showDialog.value = false
-          emit('complete')
-        })
-        .catch(() => {
-          loading.value = false
-          repeat.value = false
-          // showDialog.value = false
-        })
-    }
-  })
+    if (loading.value || !formEl) return
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            if (repeat.value) return
+            repeat.value = true
+
+            formData.account_data = Math.abs(parseFloat(formData.adjust)) * formData.adjust_type
+            const data = formData
+
+            adjustBalance(data).then(res => {
+                loading.value = false
+                repeat.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(() => {
+                loading.value = false
+                repeat.value = false
+                // showDialog.value = false
+            })
+        }
+    })
 }
 
 const emit = defineEmits(['complete'])
 
 const setFormData = async (row: any = null) => {
-  loading.value = true
-  Object.assign(formData, initialFormData)
-  if (row) {
-    Object.keys(formData).forEach((key: string) => {
-      if (row[key] != undefined) formData[key] = row[key]
-    })
-  }
-  loading.value = false
+    loading.value = true
+    Object.assign(formData, initialFormData)
+    if (row) {
+        Object.keys(formData).forEach((key: string) => {
+            if (row[key] != undefined) formData[key] = row[key]
+        })
+    }
+    loading.value = false
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
diff --git a/admin/src/app/views/member/components/member-balance-info.vue b/admin/src/app/views/member/components/member-balance-info.vue
index e9ab54af..01ab8a2b 100644
--- a/admin/src/app/views/member/components/member-balance-info.vue
+++ b/admin/src/app/views/member/components/member-balance-info.vue
@@ -1,72 +1,50 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="t('balanceInfo')"
-    width="550px"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="110px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('headimg')">
-        <div class="flex items-center">
-          <img
-            class="w-[50px] h-[50px] mr-[10px]"
-            v-if="formData.member.headimg"
-            :src="img(formData.member.headimg)"
-            alt=""
-          />
-          <img
-            class="w-[50px] h-[50px] mr-[10px] rounded-full"
-            v-else
-            src="@/app/assets/images/member_head.png"
-            alt=""
-          />
-        </div>
-      </el-form-item>
-
-      <el-form-item :label="t('memberId')">
-        <div class="input-width">{{ formData.member.member_no }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('nickName')">
-        <div class="input-width">{{ formData.member.nickname }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('mobile')">
-        <div class="input-width">{{ formData.member.mobile }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('accountData')">
-        <div class="input-width">{{ formData.account_data }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('fromType')">
-        <div class="input-width">{{ formData.from_type_name }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('memo')">
-        <div class="input-width">{{ formData.memo }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('createTime')">
-        <div class="input-width">{{ formData.create_time }}</div>
-      </el-form-item>
-    </el-form>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="showDialog = false">{{
-          t('confirm')
-        }}</el-button>
-      </span>
-    </template>
-  </el-dialog>
+    <el-dialog v-model="showDialog" :title="t('balanceInfo')" width="550px" :destroy-on-close="true">
+        <el-form :model="formData" label-width="110px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+
+            <el-form-item :label="t('headimg')" >
+                <div class="flex items-center">
+                    <img class="w-[50px] h-[50px] mr-[10px]" v-if="formData.member.headimg" :src="img(formData.member.headimg)" alt="" >
+                    <img class="w-[50px] h-[50px] mr-[10px] rounded-full" v-else src="@/app/assets/images/member_head.png" alt="">
+                </div>
+            </el-form-item>
+
+			<el-form-item :label="t('memberId')" >
+                <div class="input-width"> {{ formData.member.member_no }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('nickName')" >
+                <div class="input-width"> {{ formData.member.nickname }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('mobile')" >
+                <div class="input-width"> {{ formData.member.mobile }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('accountData')" >
+                <div class="input-width"> {{ formData.account_data }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('fromType')" >
+                <div class="input-width"> {{ formData.from_type_name }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('memo')" >
+                <div class="input-width"> {{ formData.memo }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('createTime')" >
+                <div class="input-width"> {{ formData.create_time }} </div>
+            </el-form-item>
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button type="primary" @click="showDialog = false">{{ t('confirm') }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -82,21 +60,21 @@ const loading = ref(true)
  * 表单数据
  */
 const initialFormData = {
-  account_data: 0,
-  account_type: '',
-  create_time: '',
-  from_type: '',
-  from_type_name: '',
-  member_id: '',
-  memo: '',
-  related_id: '',
-  member: {
-    headimg: '',
-    mobile: '',
-    member_no: '',
-    username: '',
-    nickname: '',
-  },
+    account_data: 0,
+    account_type: '',
+    create_time: '',
+    from_type: '',
+    from_type_name: '',
+    member_id: '',
+    memo: '',
+    related_id: '',
+    member: {
+        headimg: '',
+        mobile: '',
+        member_no: '',
+        username: '',
+        nickname: ''
+    }
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -104,25 +82,27 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {}
+    return {
+
+    }
 })
 
 const setFormData = async (row: any = null) => {
-  loading.value = true
-  Object.assign(formData, initialFormData)
+    loading.value = true
+    Object.assign(formData, initialFormData)
 
-  if (row) {
-    Object.keys(formData).forEach((key: string) => {
-      if (row[key] != undefined) formData[key] = row[key]
-    })
-  }
+    if (row) {
+        Object.keys(formData).forEach((key: string) => {
+            if (row[key] != undefined) formData[key] = row[key]
+        })
+    }
 
-  loading.value = false
+    loading.value = false
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
diff --git a/admin/src/app/views/member/components/member-benefits.vue b/admin/src/app/views/member/components/member-benefits.vue
index e816d97f..c96d34dc 100644
--- a/admin/src/app/views/member/components/member-benefits.vue
+++ b/admin/src/app/views/member/components/member-benefits.vue
@@ -1,12 +1,7 @@
 <template>
-  <div v-for="item in benefits">
-    <component
-      :is="item.component"
-      v-model="formData[item.key]"
-      ref="benefitsRefs"
-      v-if="item.component"
-    />
-  </div>
+    <div v-for="item in benefits">
+        <component :is="item.component" v-model="formData[item.key]" ref="benefitsRefs" v-if="item.component"/>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -16,67 +11,59 @@ import { getBenefitsDict } from '@/app/api/member'
 
 const benefits = ref({})
 const props = defineProps({
-  modelValue: {
-    type: Object,
-    default: () => {
-      return {}
-    },
-  },
+    modelValue: {
+        type: Object,
+        default: () => {
+            return {}
+        }
+    }
 })
 const emits = defineEmits(['update:modelValue'])
 const formData = ref({})
 const value = computed({
-  get() {
-    return props.modelValue
-  },
-  set(value) {
-    emits('update:modelValue', value)
-  },
+    get () {
+        return props.modelValue
+    },
+    set (value) {
+        emits('update:modelValue', value)
+    }
 })
 const benefitsRefs = ref([])
 
-watch(
-  () => value.value,
-  (nval, oval) => {
+watch(() => value.value, (nval, oval) => {
     if ((!oval || !Object.keys(oval).length) && Object.keys(nval).length) {
-      formData.value = value.value
+        formData.value = value.value
     }
-  },
-  { immediate: true }
-)
+}, { immediate: true })
 
-watch(
-  () => formData.value,
-  () => {
+watch(() => formData.value, () => {
     value.value = formData.value
-  },
-  { deep: true }
-)
+}, { deep: true })
 
 const modules: any = import.meta.glob('@/**/*.vue')
 getBenefitsDict().then(({ data }) => {
-  Object.keys(data).forEach((key: string) => {
-    data[key].component &&
-      (data[key].component = defineAsyncComponent(modules[data[key].component]))
-  })
-  benefits.value = data
+    Object.keys(data).forEach((key: string) => {
+        data[key].component && (data[key].component = defineAsyncComponent(modules[data[key].component]))
+    })
+    benefits.value = data
 })
 
 /**
  * 验证
  */
 const verify = async () => {
-  let verify = true
-  for (let i = 0; i < benefitsRefs.value.length; i++) {
-    const item = benefitsRefs.value[i]
-    !(await item.verify()) && (verify = false)
-  }
-  return verify
+    let verify = true
+    for (let i = 0; i < benefitsRefs.value.length; i++) {
+        const item = benefitsRefs.value[i]
+        !await item.verify() && (verify = false)
+    }
+    return verify
 }
 
 defineExpose({
-  verify,
+    verify
 })
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
diff --git a/admin/src/app/views/member/components/member-commission-info.vue b/admin/src/app/views/member/components/member-commission-info.vue
index 8539c125..6b4c26ee 100644
--- a/admin/src/app/views/member/components/member-commission-info.vue
+++ b/admin/src/app/views/member/components/member-commission-info.vue
@@ -1,72 +1,50 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="t('moneyInfo')"
-    width="550px"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="110px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('headimg')">
-        <div class="flex items-center">
-          <img
-            class="w-[50px] h-[50px] mr-[10px]"
-            v-if="formData.member.headimg"
-            :src="img(formData.member.headimg)"
-            alt=""
-          />
-          <img
-            class="w-[50px] h-[50px] mr-[10px] rounded-full"
-            v-else
-            src="@/app/assets/images/member_head.png"
-            alt=""
-          />
-        </div>
-      </el-form-item>
-
-      <el-form-item :label="t('memberId')">
-        <div class="input-width">{{ formData.member.member_no }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('nickName')">
-        <div class="input-width">{{ formData.member.nickname }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('mobile')">
-        <div class="input-width">{{ formData.member.mobile }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('accountData')">
-        <div class="input-width">{{ formData.account_data }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('fromType')">
-        <div class="input-width">{{ formData.from_type_name }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('memo')">
-        <div class="input-width">{{ formData.memo }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('createTime')">
-        <div class="input-width">{{ formData.create_time }}</div>
-      </el-form-item>
-    </el-form>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="showDialog = false">{{
-          t('confirm')
-        }}</el-button>
-      </span>
-    </template>
-  </el-dialog>
+    <el-dialog v-model="showDialog" :title="t('moneyInfo')" width="550px" :destroy-on-close="true">
+        <el-form :model="formData" label-width="110px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+
+            <el-form-item :label="t('headimg')">
+                <div class="flex items-center">
+                    <img class="w-[50px] h-[50px] mr-[10px]" v-if="formData.member.headimg" :src="img(formData.member.headimg)" alt="">
+                    <img class="w-[50px] h-[50px] mr-[10px] rounded-full" v-else src="@/app/assets/images/member_head.png" alt="">
+                </div>
+            </el-form-item>
+
+            <el-form-item :label="t('memberId')">
+                <div class="input-width"> {{ formData.member.member_no }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('nickName')">
+                <div class="input-width"> {{ formData.member.nickname }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('mobile')">
+                <div class="input-width"> {{ formData.member.mobile }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('accountData')">
+                <div class="input-width"> {{ formData.account_data }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('fromType')">
+                <div class="input-width"> {{ formData.from_type_name }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('memo')">
+                <div class="input-width"> {{ formData.memo }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('createTime')">
+                <div class="input-width"> {{ formData.create_time }} </div>
+            </el-form-item>
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button type="primary" @click="showDialog = false">{{ t('confirm') }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -82,21 +60,21 @@ const loading = ref(true)
  * 表单数据
  */
 const initialFormData = {
-  account_data: 0,
-  account_type: '',
-  create_time: '',
-  from_type: '',
-  from_type_name: '',
-  member_id: '',
-  memo: '',
-  related_id: '',
-  member: {
-    headimg: '',
-    mobile: '',
-    member_no: '',
-    username: '',
-    nickname: '',
-  },
+    account_data: 0,
+    account_type: '',
+    create_time: '',
+    from_type: '',
+    from_type_name: '',
+    member_id: '',
+    memo: '',
+    related_id: '',
+    member: {
+        headimg: '',
+        mobile: '',
+        member_no: '',
+        username: '',
+        nickname: ''
+    }
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -104,25 +82,27 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {}
+    return {
+
+    }
 })
 
 const setFormData = async (row: any = null) => {
-  loading.value = true
-  Object.assign(formData, initialFormData)
+    loading.value = true
+    Object.assign(formData, initialFormData)
 
-  if (row) {
-    Object.keys(formData).forEach((key: string) => {
-      if (row[key] != undefined) formData[key] = row[key]
-    })
-  }
+    if (row) {
+        Object.keys(formData).forEach((key: string) => {
+            if (row[key] != undefined) formData[key] = row[key]
+        })
+    }
 
-  loading.value = false
+    loading.value = false
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
diff --git a/admin/src/app/views/member/components/member-gift.vue b/admin/src/app/views/member/components/member-gift.vue
index 18312280..7ed7fc1b 100644
--- a/admin/src/app/views/member/components/member-gift.vue
+++ b/admin/src/app/views/member/components/member-gift.vue
@@ -1,12 +1,7 @@
 <template>
-  <div v-for="item in gifts">
-    <component
-      :is="item.component"
-      v-model="formData[item.key]"
-      ref="giftRefs"
-      v-if="item.component"
-    />
-  </div>
+    <div v-for="item in gifts">
+        <component :is="item.component" v-model="formData[item.key]" ref="giftRefs" v-if="item.component"/>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -15,64 +10,56 @@ import { getGiftDict } from '@/app/api/member'
 
 const gifts = ref({})
 const props = defineProps({
-  modelValue: {
-    type: Object,
-    default: () => {
-      return {}
-    },
-  },
+    modelValue: {
+        type: Object,
+        default: () => {
+            return {}
+        }
+    }
 })
 const emits = defineEmits(['update:modelValue'])
 const formData = ref({})
 const value = computed({
-  get() {
-    return props.modelValue
-  },
-  set(value) {
-    emits('update:modelValue', value)
-  },
+    get () {
+        return props.modelValue
+    },
+    set (value) {
+        emits('update:modelValue', value)
+    }
 })
 const giftRefs = ref([])
 
-watch(
-  () => value.value,
-  (nval, oval) => {
+watch(() => value.value, (nval, oval) => {
     if ((!oval || !Object.keys(oval).length) && Object.keys(nval).length) {
-      formData.value = value.value
+        formData.value = value.value
     }
-  },
-  { immediate: true }
-)
+}, { immediate: true })
 
-watch(
-  () => formData.value,
-  () => {
+watch(() => formData.value, () => {
     value.value = formData.value
-  },
-  { deep: true }
-)
+}, { deep: true })
 
 const modules: any = import.meta.glob('@/**/*.vue')
 getGiftDict().then(({ data }) => {
-  Object.keys(data).forEach((key: string) => {
-    data[key].component &&
-      (data[key].component = defineAsyncComponent(modules[data[key].component]))
-  })
-  gifts.value = data
+    Object.keys(data).forEach((key: string) => {
+        data[key].component && (data[key].component = defineAsyncComponent(modules[data[key].component]))
+    })
+    gifts.value = data
 })
 
 const verify = async () => {
-  let verify = true
-  for (let i = 0; i < giftRefs.value.length; i++) {
-    const item = giftRefs.value[i]
-    !(await item.verify()) && (verify = false)
-  }
-  return verify
+    let verify = true
+    for (let i = 0; i < giftRefs.value.length; i++) {
+        const item = giftRefs.value[i]
+        !await item.verify() && (verify = false)
+    }
+    return verify
 }
 
 defineExpose({
-  verify,
+    verify
 })
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
diff --git a/admin/src/app/views/member/components/member-money-info.vue b/admin/src/app/views/member/components/member-money-info.vue
index 3891fe28..bc880588 100644
--- a/admin/src/app/views/member/components/member-money-info.vue
+++ b/admin/src/app/views/member/components/member-money-info.vue
@@ -1,68 +1,46 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="t('moneyInfo')"
-    width="550px"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="110px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('headimg')">
-        <div class="flex items-center">
-          <img
-            class="w-[50px] h-[50px] mr-[10px]"
-            v-if="formData.headimg"
-            :src="img(formData.headimg)"
-            alt=""
-          />
-          <img
-            class="w-[50px] h-[50px] mr-[10px] rounded-full"
-            v-else
-            src="@/app/assets/images/member_head.png"
-            alt=""
-          />
-        </div>
-      </el-form-item>
-
-      <el-form-item :label="t('nickName')">
-        <div class="input-width">{{ formData.nickname }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('mobile')">
-        <div class="input-width">{{ formData.mobile }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('accountData')">
-        <div class="input-width">{{ formData.account_data }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('fromType')">
-        <div class="input-width">{{ formData.from_type_name }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('memo')">
-        <div class="input-width">{{ formData.memo }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('createTime')">
-        <div class="input-width">{{ formData.create_time }}</div>
-      </el-form-item>
-    </el-form>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="showDialog = false">{{
-          t('confirm')
-        }}</el-button>
-      </span>
-    </template>
-  </el-dialog>
+    <el-dialog v-model="showDialog" :title="t('moneyInfo')" width="550px" :destroy-on-close="true">
+        <el-form :model="formData" label-width="110px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+
+            <el-form-item :label="t('headimg')" >
+                <div class="flex items-center">
+                    <img class="w-[50px] h-[50px] mr-[10px]" v-if="formData.headimg" :src="img(formData.headimg)" alt="" >
+                    <img class="w-[50px] h-[50px] mr-[10px] rounded-full" v-else src="@/app/assets/images/member_head.png" alt="">
+                </div>
+            </el-form-item>
+
+            <el-form-item :label="t('nickName')" >
+                <div class="input-width"> {{ formData.nickname }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('mobile')" >
+                <div class="input-width"> {{ formData.mobile }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('accountData')" >
+                <div class="input-width"> {{ formData.account_data }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('fromType')" >
+                <div class="input-width"> {{ formData.from_type_name }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('memo')" >
+                <div class="input-width"> {{ formData.memo }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('createTime')" >
+                <div class="input-width"> {{ formData.create_time }} </div>
+            </el-form-item>
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button type="primary" @click="showDialog = false">{{ t('confirm') }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -78,18 +56,18 @@ const loading = ref(true)
  * 表单数据
  */
 const initialFormData = {
-  account_data: 0,
-  account_type: '',
-  create_time: '',
-  from_type: '',
-  from_type_name: '',
-  headimg: '',
-  member_id: '',
-  memo: '',
-  mobile: '',
-  nickname: '',
-  related_id: '',
-  username: '',
+    account_data: 0,
+    account_type: '',
+    create_time: '',
+    from_type: '',
+    from_type_name: '',
+    headimg: '',
+    member_id: '',
+    memo: '',
+    mobile: '',
+    nickname: '',
+    related_id: '',
+    username: ''
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -97,25 +75,27 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {}
+    return {
+
+    }
 })
 
 const setFormData = async (row: any = null) => {
-  loading.value = true
-  Object.assign(formData, initialFormData)
+    loading.value = true
+    Object.assign(formData, initialFormData)
 
-  if (row) {
-    Object.keys(formData).forEach((key: string) => {
-      if (row[key] != undefined) formData[key] = row[key]
-    })
-  }
+    if (row) {
+        Object.keys(formData).forEach((key: string) => {
+            if (row[key] != undefined) formData[key] = row[key]
+        })
+    }
 
-  loading.value = false
+    loading.value = false
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
diff --git a/admin/src/app/views/member/components/member-point-edit.vue b/admin/src/app/views/member/components/member-point-edit.vue
index 15ca9531..84af30e8 100644
--- a/admin/src/app/views/member/components/member-point-edit.vue
+++ b/admin/src/app/views/member/components/member-point-edit.vue
@@ -1,64 +1,35 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="t('adjustPoint')"
-    width="550px"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="110px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-      @submit.enter.prevent
-    >
-      <el-form-item :label="t('currPoint')">
-        <div class="input-width">{{ formData.point }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('adjustType')">
-        <el-radio-group v-model="formData.adjust_type">
-          <el-radio :label="1">{{ t('adjustAddPoint') }}</el-radio>
-          <el-radio :label="-1">{{ t('adjustReducePoint') }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-
-      <el-form-item :label="t('adjustPoint')" prop="adjust">
-        <el-input-number
-          v-model="formData.adjust"
-          clearable
-          :min="0"
-          :max="999999"
-          :placeholder="t('adjustPlaceholder')"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('memo')" prop="memo">
-        <el-input
-          v-model.trim="formData.memo"
-          type="textarea"
-          rows="4"
-          clearable
-          :placeholder="t('memoPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-    </el-form>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+    <el-dialog v-model="showDialog" :title="t('adjustPoint')" width="550px" :destroy-on-close="true">
+        <el-form :model="formData" label-width="110px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading" @submit.enter.prevent>
+
+            <el-form-item :label="t('currPoint')" >
+                <div class="input-width"> {{ formData.point }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('adjustType')">
+                <el-radio-group v-model="formData.adjust_type">
+                    <el-radio :label="1">{{ t('adjustAddPoint') }}</el-radio>
+                    <el-radio :label="-1">{{ t('adjustReducePoint') }}</el-radio>
+                </el-radio-group>
+            </el-form-item>
+
+            <el-form-item :label="t('adjustPoint')" prop="adjust">
+                <el-input-number v-model="formData.adjust" clearable :min="0" :max="999999" :placeholder="t('adjustPlaceholder')"/>
+            </el-form-item>
+
+            <el-form-item :label="t('memo')" prop="memo">
+                <el-input v-model.trim="formData.memo" type="textarea" rows="4" clearable :placeholder="t('memoPlaceholder')" class="input-width"/>
+            </el-form-item>
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{t('confirm')}}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -75,12 +46,12 @@ const repeat = ref(false)
  * 表单数据
  */
 const initialFormData = {
-  member_id: 0,
-  point: '',
-  memo: '',
-  adjust: '',
-  account_data: '',
-  adjust_type: 1,
+    member_id: 0,
+    point: '',
+    memo: '',
+    adjust: '',
+    account_data: '',
+    adjust_type: 1
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -88,32 +59,29 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    adjust: [
-      { required: true, message: t('adjustPointPlaceholder'), trigger: 'blur' },
-      {
-        validator: (rule: any, value: string, callback: any) => {
-          formData.adjust = Math.floor(formData.adjust)
-
-          const adjust = Math.abs(parseFloat(formData.adjust))
-
-          if (!adjust) {
-            callback(new Error(t('adjustPointPlaceholder')))
-          }
-
-          if (
-            formData.adjust_type == -1 &&
-            parseFloat(formData.point) - adjust < 0
-          ) {
-            callback(new Error(t('adjustPointMaxAccountMessage')))
-          }
-
-          callback()
-        },
-        trigger: 'blur',
-      },
-    ],
-  }
+    return {
+        adjust: [
+            { required: true, message: t('adjustPointPlaceholder'), trigger: 'blur' },
+            {
+                validator: (rule: any, value: string, callback: any) => {
+                    formData.adjust = Math.floor(formData.adjust)
+
+                    const adjust = Math.abs(parseFloat(formData.adjust))
+
+                    if (!adjust) {
+                        callback(new Error(t('adjustPointPlaceholder')))
+                    }
+
+                    if (formData.adjust_type == -1 && (parseFloat(formData.point) - adjust < 0)) {
+                        callback(new Error(t('adjustPointMaxAccountMessage')))
+                    }
+
+                    callback()
+                },
+                trigger: 'blur'
+            }
+        ]
+    }
 })
 
 /**
@@ -121,51 +89,48 @@ const formRules = computed(() => {
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-
-      if (repeat.value) return
-      repeat.value = true
-
-      formData.account_data =
-        Math.abs(parseFloat(formData.adjust)) * formData.adjust_type
-      const data = formData
-
-      adjustPoint(data)
-        .then((res) => {
-          loading.value = false
-          repeat.value = false
-          showDialog.value = false
-          emit('complete')
-        })
-        .catch(() => {
-          loading.value = false
-          repeat.value = false
-          // showDialog.value = false
-        })
-    }
-  })
+    if (loading.value || !formEl) return
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+            
+            if (repeat.value) return
+            repeat.value = true
+
+            formData.account_data = Math.abs(parseFloat(formData.adjust)) * formData.adjust_type;
+            const data = formData
+
+            adjustPoint(data).then(res => {
+                loading.value = false
+                repeat.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(() => {
+                loading.value = false
+                repeat.value = false
+                // showDialog.value = false
+            })
+        }
+    })
 }
 
 const emit = defineEmits(['complete'])
 
 const setFormData = async (row: any = null) => {
-  loading.value = true
-  Object.assign(formData, initialFormData)
-  if (row) {
-    Object.keys(formData).forEach((key: string) => {
-      if (row[key] != undefined) formData[key] = row[key]
-    })
-  }
-  loading.value = false
+    loading.value = true
+    Object.assign(formData, initialFormData)
+    if (row) {
+        Object.keys(formData).forEach((key: string) => {
+            if (row[key] != undefined) formData[key] = row[key]
+        })
+    }
+    loading.value = false
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
diff --git a/admin/src/app/views/member/components/member-point-info.vue b/admin/src/app/views/member/components/member-point-info.vue
index caa0c6d8..1a8cbb84 100644
--- a/admin/src/app/views/member/components/member-point-info.vue
+++ b/admin/src/app/views/member/components/member-point-info.vue
@@ -1,72 +1,50 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="t('pointInfo')"
-    width="550px"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="110px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('headimg')">
-        <div class="flex items-center">
-          <img
-            class="w-[50px] h-[50px] mr-[10px]"
-            v-if="formData.member.headimg"
-            :src="img(formData.member.headimg)"
-            alt=""
-          />
-          <img
-            class="w-[50px] h-[50px] mr-[10px] rounded-full"
-            v-else
-            src="@/app/assets/images/member_head.png"
-            alt=""
-          />
-        </div>
-      </el-form-item>
-
-      <el-form-item :label="t('memberId')">
-        <div class="input-width">{{ formData.member.member_no }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('nickName')">
-        <div class="input-width">{{ formData.member.nickname }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('mobile')">
-        <div class="input-width">{{ formData.member.mobile }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('accountData')">
-        <div class="input-width">{{ formData.account_data }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('fromType')">
-        <div class="input-width">{{ formData.from_type_name }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('memo')">
-        <div class="input-width">{{ formData.memo }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('createTime')">
-        <div class="input-width">{{ formData.create_time }}</div>
-      </el-form-item>
-    </el-form>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="showDialog = false">{{
-          t('confirm')
-        }}</el-button>
-      </span>
-    </template>
-  </el-dialog>
+    <el-dialog v-model="showDialog" :title="t('pointInfo')" width="550px" :destroy-on-close="true">
+        <el-form :model="formData" label-width="110px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+
+            <el-form-item :label="t('headimg')" >
+                <div class="flex items-center">
+                    <img class="w-[50px] h-[50px] mr-[10px]" v-if="formData.member.headimg" :src="img(formData.member.headimg)" alt="" >
+                    <img class="w-[50px] h-[50px] mr-[10px] rounded-full" v-else src="@/app/assets/images/member_head.png" alt="">
+                </div>
+            </el-form-item>
+
+			<el-form-item :label="t('memberId')" >
+                <div class="input-width"> {{ formData.member.member_no }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('nickName')" >
+                <div class="input-width"> {{ formData.member.nickname }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('mobile')" >
+                <div class="input-width"> {{ formData.member.mobile }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('accountData')" >
+                <div class="input-width"> {{ formData.account_data }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('fromType')" >
+                <div class="input-width"> {{ formData.from_type_name }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('memo')" >
+                <div class="input-width"> {{ formData.memo }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('createTime')" >
+                <div class="input-width"> {{ formData.create_time }} </div>
+            </el-form-item>
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button type="primary" @click="showDialog = false">{{ t('confirm') }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -82,21 +60,21 @@ const loading = ref(true)
  * 表单数据
  */
 const initialFormData = {
-  account_data: 0,
-  account_type: '',
-  create_time: '',
-  from_type: '',
-  from_type_name: '',
-  member_id: '',
-  memo: '',
-  related_id: '',
-  member: {
-    headimg: '',
-    mobile: '',
-    member_no: '',
-    username: '',
-    nickname: '',
-  },
+    account_data: 0,
+    account_type: '',
+    create_time: '',
+    from_type: '',
+    from_type_name: '',
+    member_id: '',
+    memo: '',
+    related_id: '',
+    member: {
+        headimg: '',
+        mobile: '',
+        member_no: '',
+        username: '',
+        nickname: ''
+    }
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -104,24 +82,26 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {}
+    return {
+
+    }
 })
 
 const setFormData = async (row: any = null) => {
-  loading.value = true
-  Object.assign(formData, initialFormData)
-  if (row) {
-    Object.keys(formData).forEach((key: string) => {
-      if (row[key] != undefined) formData[key] = row[key]
-    })
-  }
-
-  loading.value = false
+    loading.value = true
+    Object.assign(formData, initialFormData)
+    if (row) {
+        Object.keys(formData).forEach((key: string) => {
+            if (row[key] != undefined) formData[key] = row[key]
+        })
+    }
+
+    loading.value = false
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
diff --git a/admin/src/app/views/member/components/point-rule-register.vue b/admin/src/app/views/member/components/point-rule-register.vue
index f7d35765..980ea285 100644
--- a/admin/src/app/views/member/components/point-rule-register.vue
+++ b/admin/src/app/views/member/components/point-rule-register.vue
@@ -1,25 +1,21 @@
 <template>
-  <el-form ref="formRef" :model="formData" :rules="formRules">
-    <el-form-item label="" prop="point">
-      <div>
-        <div>
-          <span class="el-form-item__label">会员注册</span>
-          <el-switch
-            v-model="formData.is_use"
-            :active-value="1"
-            :inactive-value="0"
-          />
-        </div>
-        <div class="flex mt-[10px]" v-show="formData.is_use">
-          <span class="el-form-item__label">发放</span>
-          <div class="w-[70px]">
-            <el-input v-model.number.trim="formData.point" clearable />
-          </div>
-          <span class="ml-[10px] el-form-item__label">积分</span>
-        </div>
-      </div>
-    </el-form-item>
-  </el-form>
+    <el-form ref="formRef" :model="formData" :rules="formRules">
+        <el-form-item label="" prop="point">
+            <div>
+                <div>
+                    <span class="el-form-item__label">会员注册</span>
+                    <el-switch v-model="formData.is_use" :active-value="1" :inactive-value="0"/>
+                </div>
+                <div class="flex mt-[10px]" v-show="formData.is_use">
+                    <span class="el-form-item__label">发放</span>
+                    <div class="w-[70px]">
+                        <el-input v-model.number.trim="formData.point" clearable />
+                    </div>
+                    <span class="ml-[10px] el-form-item__label">积分</span>
+                </div>
+            </div>
+        </el-form-item>
+    </el-form>
 </template>
 
 <script lang="ts" setup>
@@ -28,83 +24,76 @@ import { FormRules } from 'element-plus'
 import Test from '@/utils/test'
 
 const props = defineProps({
-  modelValue: {
-    type: Object,
-    default: () => {
-      return {}
-    },
-  },
+    modelValue: {
+        type: Object,
+        default: () => {
+            return {}
+        }
+    }
 })
 const emits = defineEmits(['update:modelValue'])
 
 const formData = ref({
-  is_use: 0,
-  point: '',
+    is_use: 0,
+    point: ''
 })
 
 const formRef = ref(null)
 
 const formRules = reactive<FormRules>({
-  point: [
-    {
-      validator: (rule: any, value: any, callback: Function) => {
-        if (formData.value.is_use) {
-          if (Test.empty(formData.value.point)) {
-            callback('请输入发放积分数量')
-          }
-          if (!Test.digits(formData.value.point)) {
-            callback('积分数量格式错误')
-          }
-          if (formData.value.point <= 0) {
-            callback('积分数量不能小于等于0')
-          }
-          callback()
-        } else {
-          callback()
+    point: [
+        {
+            validator: (rule: any, value: any, callback: Function) => {
+                if (formData.value.is_use) {
+                    if (Test.empty(formData.value.point)) {
+                        callback('请输入发放积分数量')
+                    }
+                    if (!Test.digits(formData.value.point)) {
+                        callback('积分数量格式错误')
+                    }
+                    if (formData.value.point <= 0) {
+                        callback('积分数量不能小于等于0')
+                    }
+                    callback()
+                } else {
+                    callback()
+                }
+            }
         }
-      },
-    },
-  ],
+    ]
 })
 
 const value = computed({
-  get() {
-    return props.modelValue
-  },
-  set(value) {
-    emits('update:modelValue', value)
-  },
+    get () {
+        return props.modelValue
+    },
+    set (value) {
+        emits('update:modelValue', value)
+    }
 })
 
-watch(
-  () => value.value,
-  (nval, oval) => {
+watch(() => value.value, (nval, oval) => {
     if ((!oval || !Object.keys(oval).length) && Object.keys(nval).length) {
-      formData.value = value.value
+        formData.value = value.value
     }
-  },
-  { immediate: true }
-)
+}, { immediate: true })
 
-watch(
-  () => formData.value,
-  () => {
+watch(() => formData.value, () => {
     value.value = formData.value
-  },
-  { deep: true }
-)
+}, { deep: true })
 
 const verify = async () => {
-  let verify = true
-  await formRef.value?.validate((valid) => {
-    verify = valid
-  })
-  return verify
+    let verify = true
+    await formRef.value?.validate((valid) => {
+        verify = valid
+    })
+    return verify
 }
 
 defineExpose({
-  verify,
+    verify
 })
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
diff --git a/admin/src/app/views/member/growth.vue b/admin/src/app/views/member/growth.vue
index fef39f3d..26712857 100644
--- a/admin/src/app/views/member/growth.vue
+++ b/admin/src/app/views/member/growth.vue
@@ -1,164 +1,84 @@
 <template>
-  <!--会员成长值-->
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
-
-      <el-card
-        class="box-card !border-none mb-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="memberAccountLogTableData.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('fromType')" prop="from_type">
-            <el-select
-              v-model="memberAccountLogTableData.searchParam.from_type"
-              clearable
-              :placeholder="t('fromTypePlaceholder')"
-              class="input-width"
-            >
-              <el-option :label="t('selectPlaceholder')" value="" />
-              <el-option
-                :label="item.name"
-                :value="key"
-                v-for="(item, key) in fromTypeList"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="t('createTime')" prop="create_time">
-            <el-date-picker
-              v-model="memberAccountLogTableData.searchParam.create_time"
-              type="datetimerange"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              :start-placeholder="t('startDate')"
-              :end-placeholder="t('endDate')"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="loadMemberAccountLogList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
-
-      <div class="mt-[16px]">
-        <el-table
-          :data="memberAccountLogTableData.data"
-          size="large"
-          v-loading="memberAccountLogTableData.loading"
-        >
-          <template #empty>
-            <span>{{
-              !memberAccountLogTableData.loading ? t('emptyData') : ''
-            }}</span>
-          </template>
-
-          <el-table-column
-            prop="member_id"
-            :label="t('memberId')"
-            min-width="110"
-            :show-overflow-tooltip="true"
-          >
-            <template #default="{ row }">
-              {{ row.member.member_no }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            :label="t('memberInfo')"
-            min-width="150"
-            :show-overflow-tooltip="true"
-          >
-            <template #default="{ row }">
-              <div
-                class="flex items-center cursor-pointer"
-                @click="toMember(row.member_id)"
-              >
-                <img
-                  class="w-[50px] h-[50px] mr-[10px]"
-                  v-if="row.member.headimg"
-                  :src="img(row.member.headimg)"
-                  alt=""
-                />
-                <img
-                  class="w-[50px] h-[50px] mr-[10px] rounded-full"
-                  v-else
-                  src="@/app/assets/images/member_head.png"
-                  alt=""
-                />
-                <div class="flex flex flex-col">
-                  <span>{{ row.member.nickname || '' }}</span>
+    <!--会员成长值-->
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+            </div>
+
+            <el-card class="box-card !border-none mb-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="memberAccountLogTableData.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('fromType')" prop="from_type">
+                        <el-select v-model="memberAccountLogTableData.searchParam.from_type" clearable :placeholder="t('fromTypePlaceholder')" class="input-width">
+                            <el-option :label="t('selectPlaceholder')" value="" />
+                            <el-option :label="item.name" :value="key" v-for="(item, key) in fromTypeList" />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item :label="t('createTime')" prop="create_time">
+                        <el-date-picker v-model="memberAccountLogTableData.searchParam.create_time" type="datetimerange"
+                            value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')"
+                            :end-placeholder="t('endDate')" />
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="loadMemberAccountLogList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+
+            <div class="mt-[16px]">
+                <el-table :data="memberAccountLogTableData.data" size="large" v-loading="memberAccountLogTableData.loading">
+
+                    <template #empty>
+                        <span>{{ !memberAccountLogTableData.loading ? t('emptyData') : '' }}</span>
+                    </template>
+
+                    <el-table-column prop="member_id" :label="t('memberId')" min-width="110" :show-overflow-tooltip="true">
+                        <template #default="{ row }">
+                            {{ row.member.member_no }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('memberInfo')" min-width="150" :show-overflow-tooltip="true">
+                        <template #default="{ row }">
+                            <div class="flex items-center cursor-pointer" @click="toMember(row.member_id)">
+                                <img class="w-[50px] h-[50px] mr-[10px]" v-if="row.member.headimg" :src="img(row.member.headimg)" alt="">
+                                <img class="w-[50px] h-[50px] mr-[10px] rounded-full" v-else src="@/app/assets/images/member_head.png" alt="">
+                                <div class="flex flex flex-col">
+                                    <span>{{ row.member.nickname || '' }}</span>
+                                </div>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="mobile" :label="t('mobile')" min-width="100">
+                        <template #default="{ row }">
+                            {{ row.member.mobile || '' }}
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column prop="account_data" :label="t('accountData')" min-width="110" align="right">
+                        <template #default="{ row }">
+                            <span v-if="row.account_data >= 0">+{{ row.account_data }}</span>
+                            <span v-else>{{ row.account_data }}</span>
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column prop="account_sum" :label="t('accountSum')" min-width="120" align="right" />
+
+                    <el-table-column prop="from_type_name" :label="t('fromType')" min-width="180" align="center" />
+                    <el-table-column prop="memo" :label="t('memo')" min-width="300" align="left" :show-overflow-tooltip="true"/>
+                    <el-table-column prop="create_time" :show-overflow-tooltip="true" :label="t('createTime')" min-width="150" />
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="memberAccountLogTableData.page"
+                        v-model:page-size="memberAccountLogTableData.limit" layout="total, sizes, prev, pager, next, jumper"
+                        :total="memberAccountLogTableData.total" @size-change="loadMemberAccountLogList()"
+                        @current-change="loadMemberAccountLogList" />
                 </div>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="mobile" :label="t('mobile')" min-width="100">
-            <template #default="{ row }">
-              {{ row.member.mobile || '' }}
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            prop="account_data"
-            :label="t('accountData')"
-            min-width="110"
-            align="right"
-          >
-            <template #default="{ row }">
-              <span v-if="row.account_data >= 0">+{{ row.account_data }}</span>
-              <span v-else>{{ row.account_data }}</span>
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            prop="account_sum"
-            :label="t('accountSum')"
-            min-width="120"
-            align="right"
-          />
-
-          <el-table-column
-            prop="from_type_name"
-            :label="t('fromType')"
-            min-width="180"
-            align="center"
-          />
-          <el-table-column
-            prop="memo"
-            :label="t('memo')"
-            min-width="300"
-            align="left"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            prop="create_time"
-            :show-overflow-tooltip="true"
-            :label="t('createTime')"
-            min-width="150"
-          />
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="memberAccountLogTableData.page"
-            v-model:page-size="memberAccountLogTableData.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="memberAccountLogTableData.total"
-            @size-change="loadMemberAccountLogList()"
-            @current-change="loadMemberAccountLogList"
-          />
-        </div>
-      </div>
-    </el-card>
-    <point-info ref="pointDialog" @complete="loadMemberAccountLogList" />
-  </div>
+            </div>
+        </el-card>
+        <point-info ref="pointDialog" @complete="loadMemberAccountLogList" />
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -176,24 +96,24 @@ const pageName = route.meta.title
 const member_id: number = parseInt(route.query.id || 0)
 
 const memberAccountLogTableData = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    keywords: '',
-    from_type: '',
-    create_time: '',
-    mobile: '',
-    member_id,
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        keywords: '',
+        from_type: '',
+        create_time: '',
+        mobile: '',
+        member_id
+    }
 })
 
 const fromTypeList = ref([])
 
 const setFromTypeList = async () => {
-  fromTypeList.value = await (await getChangeTypeList('growth')).data
+    fromTypeList.value = await (await getChangeTypeList('growth')).data
 }
 
 setFromTypeList()
@@ -201,9 +121,9 @@ setFromTypeList()
 const searchFormRef = ref<FormInstance>()
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadMemberAccountLogList()
+    if (!formEl) return
+    formEl.resetFields()
+    loadMemberAccountLogList()
 }
 
 /**
@@ -211,21 +131,19 @@ const resetForm = (formEl: FormInstance | undefined) => {
  * 获取会员账单表列表
  */
 const loadMemberAccountLogList = (page: number = 1) => {
-  memberAccountLogTableData.loading = true
-  memberAccountLogTableData.page = page
-
-  getGrowthList({
-    page: memberAccountLogTableData.page,
-    limit: memberAccountLogTableData.limit,
-    ...memberAccountLogTableData.searchParam,
-  })
-    .then((res) => {
-      memberAccountLogTableData.loading = false
-      memberAccountLogTableData.data = res.data.data
-      memberAccountLogTableData.total = res.data.total
-    })
-    .catch(() => {
-      memberAccountLogTableData.loading = false
+    memberAccountLogTableData.loading = true
+    memberAccountLogTableData.page = page
+
+    getGrowthList({
+        page: memberAccountLogTableData.page,
+        limit: memberAccountLogTableData.limit,
+        ...memberAccountLogTableData.searchParam
+    }).then(res => {
+        memberAccountLogTableData.loading = false
+        memberAccountLogTableData.data = res.data.data
+        memberAccountLogTableData.total = res.data.total
+    }).catch(() => {
+        memberAccountLogTableData.loading = false
     })
 }
 loadMemberAccountLogList()
@@ -237,8 +155,8 @@ const pointDialog: Record<string, any> | null = ref(null)
  * @param data
  */
 const infoEvent = (data: any) => {
-  pointDialog.value.setFormData(data)
-  pointDialog.value.showDialog = true
+    pointDialog.value.setFormData(data)
+    pointDialog.value.showDialog = true
 }
 
 const router = useRouter()
@@ -247,7 +165,7 @@ const router = useRouter()
  * 会员详情
  */
 const toMember = (memberId: number) => {
-  router.push(`/member/detail?id=${memberId}`)
+    router.push(`/member/detail?id=${memberId}`)
 }
 </script>
 
diff --git a/admin/src/app/views/member/label.vue b/admin/src/app/views/member/label.vue
index 428333bd..1dcd74a3 100644
--- a/admin/src/app/views/member/label.vue
+++ b/admin/src/app/views/member/label.vue
@@ -1,102 +1,55 @@
 <template>
-  <!--会员标签-->
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-        <el-button type="primary" @click="addEvent">{{
-          t('addMemberLabel')
-        }}</el-button>
-      </div>
-
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="memberLabelTableData.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('labelName')" prop="label_name">
-            <el-input
-              v-model.trim="memberLabelTableData.searchParam.label_name"
-              :placeholder="t('labelNamePlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="loadMemberLabelList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
-
-      <div class="mt-[10px]">
-        <el-table
-          :data="memberLabelTableData.data"
-          size="large"
-          v-loading="memberLabelTableData.loading"
-        >
-          <template #empty>
-            <span>{{
-              !memberLabelTableData.loading ? t('emptyData') : ''
-            }}</span>
-          </template>
-
-          <el-table-column
-            prop="label_name"
-            :label="t('labelName')"
-            min-width="120"
-          />
-          <el-table-column
-            prop="member_num"
-            :label="t('memberNumber')"
-            min-width="120"
-          />
-          <el-table-column prop="memo" :label="t('memo')" min-width="120" />
-          <el-table-column prop="sort" :label="t('sort')" min-width="120" />
-
-          <el-table-column
-            :label="t('operation')"
-            align="right"
-            fixed="right"
-            width="130"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="editEvent(row)">{{
-                t('edit')
-              }}</el-button>
-              <el-button
-                type="primary"
-                link
-                @click="deleteEvent(row.label_id)"
-                >{{ t('delete') }}</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="memberLabelTableData.page"
-            v-model:page-size="memberLabelTableData.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="memberLabelTableData.total"
-            @size-change="loadMemberLabelList()"
-            @current-change="loadMemberLabelList"
-          />
-        </div>
-      </div>
-
-      <edit-memberLabel
-        ref="editMemberLabelDialog"
-        @complete="loadMemberLabelList"
-      />
-    </el-card>
-  </div>
+    <!--会员标签-->
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{pageName}}</span>
+                <el-button type="primary" @click="addEvent">{{ t('addMemberLabel') }}</el-button>
+            </div>
+
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="memberLabelTableData.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('labelName')" prop="label_name">
+                        <el-input v-model.trim="memberLabelTableData.searchParam.label_name" :placeholder="t('labelNamePlaceholder')" />
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="loadMemberLabelList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+
+            <div class="mt-[10px]">
+                <el-table :data="memberLabelTableData.data" size="large" v-loading="memberLabelTableData.loading">
+
+                    <template #empty>
+                        <span>{{ !memberLabelTableData.loading ? t('emptyData') : '' }}</span>
+                    </template>
+
+                    <el-table-column prop="label_name" :label="t('labelName')" min-width="120" />
+                    <el-table-column prop="member_num" :label="t('memberNumber')" min-width="120" />
+                    <el-table-column prop="memo" :label="t('memo')" min-width="120" />
+                    <el-table-column prop="sort" :label="t('sort')" min-width="120" />
+
+                    <el-table-column :label="t('operation')" align="right" fixed="right" width="130">
+                       <template #default="{ row }">
+                           <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+                           <el-button type="primary" link @click="deleteEvent(row.label_id)">{{ t('delete') }}</el-button>
+                       </template>
+                    </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="memberLabelTableData.page" v-model:page-size="memberLabelTableData.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="memberLabelTableData.total"
+                        @size-change="loadMemberLabelList()" @current-change="loadMemberLabelList" />
+                </div>
+            </div>
+
+            <edit-memberLabel ref="editMemberLabelDialog" @complete="loadMemberLabelList" />
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -111,43 +64,41 @@ const route = useRoute()
 const pageName = route.meta.title
 
 const memberLabelTableData = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    label_name: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        label_name: ''
+    }
 })
 
 const searchFormRef = ref<FormInstance>()
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadMemberLabelList()
+    if (!formEl) return
+    formEl.resetFields()
+    loadMemberLabelList()
 }
 
 /**
  * 获取会员标签列表
  */
 const loadMemberLabelList = (page: number = 1) => {
-  memberLabelTableData.loading = true
-  memberLabelTableData.page = page
-
-  getMemberLabelList({
-    page: memberLabelTableData.page,
-    limit: memberLabelTableData.limit,
-    ...memberLabelTableData.searchParam,
-  })
-    .then((res) => {
-      memberLabelTableData.loading = false
-      memberLabelTableData.data = res.data.data
-      memberLabelTableData.total = res.data.total
-    })
-    .catch(() => {
-      memberLabelTableData.loading = false
+    memberLabelTableData.loading = true
+    memberLabelTableData.page = page
+
+    getMemberLabelList({
+        page: memberLabelTableData.page,
+        limit: memberLabelTableData.limit,
+        ...memberLabelTableData.searchParam
+    }).then(res => {
+        memberLabelTableData.loading = false
+        memberLabelTableData.data = res.data.data
+        memberLabelTableData.total = res.data.total
+    }).catch(() => {
+        memberLabelTableData.loading = false
     })
 }
 loadMemberLabelList()
@@ -158,8 +109,8 @@ const editMemberLabelDialog: Record<string, any> | null = ref(null)
  * 添加会员标签
  */
 const addEvent = () => {
-  editMemberLabelDialog.value.setFormData()
-  editMemberLabelDialog.value.showDialog = true
+    editMemberLabelDialog.value.setFormData()
+    editMemberLabelDialog.value.showDialog = true
 }
 
 /**
@@ -167,25 +118,26 @@ const addEvent = () => {
  * @param data
  */
 const editEvent = (data: any) => {
-  editMemberLabelDialog.value.setFormData(data)
-  editMemberLabelDialog.value.showDialog = true
+    editMemberLabelDialog.value.setFormData(data)
+    editMemberLabelDialog.value.showDialog = true
 }
 
 /**
  * 删除会员标签
  */
 const deleteEvent = (id: number) => {
-  ElMessageBox.confirm(t('memberLabelDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    deleteMemberLabel(id)
-      .then(() => {
-        loadMemberLabelList()
-      })
-      .catch(() => {})
-  })
+    ElMessageBox.confirm(t('memberLabelDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        deleteMemberLabel(id).then(() => {
+            loadMemberLabelList()
+        }).catch(() => {
+        })
+    })
 }
 </script>
 
diff --git a/admin/src/app/views/member/level.vue b/admin/src/app/views/member/level.vue
index a4168bde..aadee4ef 100644
--- a/admin/src/app/views/member/level.vue
+++ b/admin/src/app/views/member/level.vue
@@ -1,118 +1,70 @@
 <template>
-  <!--会员等级-->
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-        <el-button type="primary" @click="addEvent">{{
-          t('addMemberLevel')
-        }}</el-button>
-      </div>
-
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="memberLevelTableData.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('levelName')" prop="level_name">
-            <el-input
-              v-model.trim="memberLevelTableData.searchParam.level_name"
-              :placeholder="t('levelNamePlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="loadMemberLevelList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
-
-      <div class="mt-[10px]">
-        <el-table
-          :data="memberLevelTableData.data"
-          size="large"
-          v-loading="memberLevelTableData.loading"
-        >
-          <template #empty>
-            <span>{{
-              !memberLevelTableData.loading ? t('emptyData') : ''
-            }}</span>
-          </template>
-
-          <el-table-column
-            prop="level_name"
-            :label="t('levelName')"
-            min-width="120"
-          />
-          <el-table-column prop="growth" :label="t('growth')" min-width="120" />
-          <el-table-column
-            :label="t('levelBenefits')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          >
-            <template #default="{ row }">
-              <div>
-                <template v-for="item in row.level_benefits">
-                  <div v-if="item.content">{{ item.content }}</div>
-                </template>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('levelGifts')" min-width="120">
-            <template #default="{ row }">
-              <div>
-                <template v-for="item in row.level_gifts">
-                  <div v-if="item.content">{{ item.content }}</div>
-                </template>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="member_num"
-            :label="t('memberNumber')"
-            min-width="120"
-          />
-
-          <el-table-column
-            :label="t('operation')"
-            align="right"
-            fixed="right"
-            width="130"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="editEvent(row)">{{
-                t('edit')
-              }}</el-button>
-              <el-button
-                type="primary"
-                link
-                @click="deleteEvent(row.level_id)"
-                >{{ t('delete') }}</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="memberLevelTableData.page"
-            v-model:page-size="memberLevelTableData.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="memberLevelTableData.total"
-            @size-change="loadMemberLevelList()"
-            @current-change="loadMemberLevelList"
-          />
-        </div>
-      </div>
-    </el-card>
-  </div>
+    <!--会员等级-->
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+                <el-button type="primary" @click="addEvent">{{ t('addMemberLevel') }}</el-button>
+            </div>
+
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="memberLevelTableData.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('levelName')" prop="level_name">
+                        <el-input v-model.trim="memberLevelTableData.searchParam.level_name" :placeholder="t('levelNamePlaceholder')" />
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="loadMemberLevelList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+
+            <div class="mt-[10px]">
+                <el-table :data="memberLevelTableData.data" size="large" v-loading="memberLevelTableData.loading">
+
+                    <template #empty>
+                        <span>{{ !memberLevelTableData.loading ? t('emptyData') : '' }}</span>
+                    </template>
+
+                    <el-table-column prop="level_name" :label="t('levelName')" min-width="120" />
+                    <el-table-column prop="growth" :label="t('growth')" min-width="120" />
+                    <el-table-column :label="t('levelBenefits')" min-width="120" :show-overflow-tooltip="true">
+                        <template #default="{ row }">
+                            <div>
+                                <template v-for="item in row.level_benefits">
+                                    <div v-if="item.content">{{ item.content }}</div>
+                                </template>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('levelGifts')" min-width="120" >
+                        <template #default="{ row }">
+                            <div>
+                                <template v-for="item in row.level_gifts">
+                                    <div v-if="item.content">{{ item.content }}</div>
+                                </template>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="member_num" :label="t('memberNumber')" min-width="120" />
+
+                    <el-table-column :label="t('operation')" align="right" fixed="right" width="130">
+                       <template #default="{ row }">
+                           <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+                           <el-button type="primary" link @click="deleteEvent(row.level_id)">{{ t('delete') }}</el-button>
+                       </template>
+                    </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="memberLevelTableData.page" v-model:page-size="memberLevelTableData.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="memberLevelTableData.total"
+                        @size-change="loadMemberLevelList()" @current-change="loadMemberLevelList" />
+                </div>
+            </div>
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -121,64 +73,58 @@ import { t } from '@/lang'
 import { getMemberLevelPageList, deleteMemberLevel } from '@/app/api/member'
 import { ElMessageBox, FormInstance } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
-import { setTablePageStorage, getTablePageStorage } from '@/utils/common'
+import { setTablePageStorage,getTablePageStorage } from "@/utils/common";
 
 const route = useRoute()
 const router = useRouter()
 const pageName = route.meta.title
 
 const memberLevelTableData = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    level_name: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        level_name: ''
+    }
 })
 
 const searchFormRef = ref<FormInstance>()
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadMemberLevelList()
+    if (!formEl) return
+    formEl.resetFields()
+    loadMemberLevelList()
 }
 
 /**
  * 获取会员标签列表
  */
 const loadMemberLevelList = (page: number = 1) => {
-  memberLevelTableData.loading = true
-  memberLevelTableData.page = page
-
-  getMemberLevelPageList({
-    page: memberLevelTableData.page,
-    limit: memberLevelTableData.limit,
-    ...memberLevelTableData.searchParam,
-  })
-    .then((res) => {
-      memberLevelTableData.loading = false
-      memberLevelTableData.data = res.data.data
-      memberLevelTableData.total = res.data.total
-      setTablePageStorage(
-        memberLevelTableData.page,
-        memberLevelTableData.limit,
-        memberLevelTableData.searchParam
-      )
-    })
-    .catch(() => {
-      memberLevelTableData.loading = false
+    memberLevelTableData.loading = true
+    memberLevelTableData.page = page
+
+    getMemberLevelPageList({
+        page: memberLevelTableData.page,
+        limit: memberLevelTableData.limit,
+        ...memberLevelTableData.searchParam
+    }).then(res => {
+        memberLevelTableData.loading = false
+        memberLevelTableData.data = res.data.data
+        memberLevelTableData.total = res.data.total
+        setTablePageStorage(memberLevelTableData.page, memberLevelTableData.limit, memberLevelTableData.searchParam);
+    }).catch(() => {
+        memberLevelTableData.loading = false
     })
 }
-loadMemberLevelList(getTablePageStorage(memberLevelTableData.searchParam).page)
+loadMemberLevelList(getTablePageStorage(memberLevelTableData.searchParam).page);
 
 /**
  * 添加会员标签
  */
 const addEvent = () => {
-  router.push({ path: '/member/level_edit' })
+    router.push({ path: '/member/level_edit' })
 }
 
 /**
@@ -186,24 +132,25 @@ const addEvent = () => {
  * @param data
  */
 const editEvent = (data: any) => {
-  router.push({ path: '/member/level_edit', query: { id: data.level_id } })
+    router.push({ path: '/member/level_edit', query: { id: data.level_id } })
 }
 
 /**
  * 删除会员标签
  */
 const deleteEvent = (id: number) => {
-  ElMessageBox.confirm(t('memberLevelDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    deleteMemberLevel(id)
-      .then(() => {
-        loadMemberLevelList()
-      })
-      .catch(() => {})
-  })
+    ElMessageBox.confirm(t('memberLevelDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        deleteMemberLevel(id).then(() => {
+            loadMemberLevelList()
+        }).catch(() => {
+        })
+    })
 }
 </script>
 
diff --git a/admin/src/app/views/member/level_edit.vue b/admin/src/app/views/member/level_edit.vue
index 4ad3477e..7491f39b 100644
--- a/admin/src/app/views/member/level_edit.vue
+++ b/admin/src/app/views/member/level_edit.vue
@@ -1,92 +1,49 @@
 <template>
-  <!--编辑等级-->
-  <div class="main-container">
-    <el-card class="card !border-none" shadow="never">
-      <el-page-header :content="pageName" :icon="ArrowLeft" @back="back()" />
-    </el-card>
-
-    <el-card
-      class="box-card mt-[15px] !border-none"
-      shadow="never"
-      v-loading="loading"
-    >
-      <el-form
-        class="page-form"
-        :model="formData"
-        label-width="120px"
-        ref="formRef"
-        :rules="formRules"
-      >
-        <h3 class="panel-title !text-sm">{{ t('basicInfo') }}</h3>
-
-        <el-form-item :label="t('levelName')" prop="level_name">
-          <el-input
-            v-model.trim="formData.level_name"
-            :placeholder="t('levelNamePlaceholder')"
-            class="input-width"
-            maxlength="20"
-            show-word-limit
-            clearable
-          />
-        </el-form-item>
-        <el-form-item :label="t('remark')" prop="remark">
-          <el-input
-            v-model.trim="formData.remark"
-            type="textarea"
-            :placeholder="t('remarkPlaceholder')"
-            class="input-width"
-            clearable
-            rows="4"
-            maxlength="200"
-            show-word-limit
-          />
-        </el-form-item>
-        <el-form-item :label="t('growth')" prop="growth">
-          <div>
-            <div class="w-[150px]">
-              <el-input
-                v-model.number.trim="formData.growth"
-                :placeholder="t('growthPlaceholder')"
-                clearable
-              />
+    <!--编辑等级-->
+    <div class="main-container">
+
+        <el-card class="card !border-none" shadow="never">
+            <el-page-header :content="pageName" :icon="ArrowLeft" @back="back()" />
+        </el-card>
+
+        <el-card class="box-card mt-[15px] !border-none" shadow="never" v-loading="loading">
+            <el-form class="page-form" :model="formData" label-width="120px" ref="formRef" :rules="formRules">
+                <h3 class="panel-title !text-sm">{{ t('basicInfo') }}</h3>
+
+                <el-form-item :label="t('levelName')" prop="level_name">
+                    <el-input v-model.trim="formData.level_name" :placeholder="t('levelNamePlaceholder')" class="input-width" maxlength="20" show-word-limit clearable />
+                </el-form-item>
+                <el-form-item :label="t('remark')" prop="remark">
+                    <el-input v-model.trim="formData.remark" type="textarea" :placeholder="t('remarkPlaceholder')" class="input-width" clearable rows="4" maxlength="200" show-word-limit />
+                </el-form-item>
+                <el-form-item :label="t('growth')" prop="growth">
+                    <div>
+                        <div class="w-[150px]">
+                            <el-input v-model.number.trim="formData.growth" :placeholder="t('growthPlaceholder')" clearable />
+                        </div>
+                        <div class="text-sm text-gray-400 mb-[5px]">{{ t('growthTips') }}</div>
+                    </div>
+                </el-form-item>
+            </el-form>
+
+            <h3 class="panel-title !text-sm">{{ t('levelBenefits') }}</h3>
+            <div class="pl-[100px]">
+                <member-benefits v-if="!loading" ref="benefitsRef" v-model="formData.level_benefits"/>
             </div>
-            <div class="text-sm text-gray-400 mb-[5px]">
-              {{ t('growthTips') }}
+
+            <h3 class="panel-title !text-sm">{{ t('levelGift') }}</h3>
+            <div class="pl-[100px]">
+                <member-gift v-if="!loading" ref="giftRef" v-model="formData.level_gifts"/>
+            </div>
+
+        </el-card>
+
+        <div class="fixed-footer-wrap">
+            <div class="fixed-footer">
+                <el-button type="primary" :loading="saveLoading" @click="save(formRef)">{{ t('save') }}</el-button>
             </div>
-          </div>
-        </el-form-item>
-      </el-form>
-
-      <h3 class="panel-title !text-sm">{{ t('levelBenefits') }}</h3>
-      <div class="pl-[100px]">
-        <member-benefits
-          v-if="!loading"
-          ref="benefitsRef"
-          v-model="formData.level_benefits"
-        />
-      </div>
-
-      <h3 class="panel-title !text-sm">{{ t('levelGift') }}</h3>
-      <div class="pl-[100px]">
-        <member-gift
-          v-if="!loading"
-          ref="giftRef"
-          v-model="formData.level_gifts"
-        />
-      </div>
-    </el-card>
-
-    <div class="fixed-footer-wrap">
-      <div class="fixed-footer">
-        <el-button
-          type="primary"
-          :loading="saveLoading"
-          @click="save(formRef)"
-          >{{ t('save') }}</el-button
-        >
-      </div>
+        </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
@@ -97,12 +54,7 @@ import { ArrowLeft } from '@element-plus/icons-vue'
 import { useRoute, useRouter } from 'vue-router'
 import memberBenefits from '@/app/views/member/components/member-benefits.vue'
 import memberGift from '@/app/views/member/components/member-gift.vue'
-import {
-  getMemberLevelInfo,
-  addMemberLevel,
-  updateMemberLevel,
-  getMemberLevelAll,
-} from '@/app/api/member'
+import { getMemberLevelInfo, addMemberLevel, updateMemberLevel, getMemberLevelAll } from '@/app/api/member'
 import Test from '@/utils/test'
 
 const route = useRoute()
@@ -110,7 +62,7 @@ const router = useRouter()
 const pageName = route.meta.title
 
 const back = () => {
-  router.push('/member/level')
+    router.push('/member/level')
 }
 
 const benefitsRef = ref(null)
@@ -119,69 +71,62 @@ const loading = ref(true)
 const growthInterval = ref({ min: 0, max: 0 })
 
 const formData = reactive<Record<string, any>>({
-  level_id: 0,
-  level_name: '',
-  remark: '',
-  growth: '',
-  level_benefits: {},
-  level_gifts: {},
+    level_id: 0,
+    level_name: '',
+    remark: '',
+    growth: '',
+    level_benefits: {},
+    level_gifts: {}
 })
 
 const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = reactive<FormRules>({
-  level_name: [
-    { required: true, message: t('levelNamePlaceholder'), trigger: 'blur' },
-  ],
-  growth: [
-    { required: true, message: t('growthPlaceholder'), trigger: 'blur' },
-    {
-      validator: (rule: any, value: any, callback: any) => {
-        if (!Test.digits(formData.growth)) {
-          callback(t('growthFormatError'))
+    level_name: [
+        { required: true, message: t('levelNamePlaceholder'), trigger: 'blur' }
+    ],
+    growth: [
+        { required: true, message: t('growthPlaceholder'), trigger: 'blur' },
+        {
+            validator: (rule: any, value: any, callback: any) => {
+                if (!Test.digits(formData.growth)) {
+                    callback(t('growthFormatError'))
+                }
+                if (formData.growth <= 0) {
+                    callback(t('growthNeedGt') + 0)
+                }
+                if (growthInterval.value.min && formData.growth <= growthInterval.value.min) {
+                    callback(t('growthNeedGt') + growthInterval.value.min)
+                }
+                if (growthInterval.value.max && formData.growth >= growthInterval.value.max) {
+                    callback(t('growthNeedLt') + growthInterval.value.max)
+                }
+                callback()
+            }
         }
-        if (formData.growth <= 0) {
-          callback(t('growthNeedGt') + 0)
-        }
-        if (
-          growthInterval.value.min &&
-          formData.growth <= growthInterval.value.min
-        ) {
-          callback(t('growthNeedGt') + growthInterval.value.min)
-        }
-        if (
-          growthInterval.value.max &&
-          formData.growth >= growthInterval.value.max
-        ) {
-          callback(t('growthNeedLt') + growthInterval.value.max)
-        }
-        callback()
-      },
-    },
-  ],
+    ]
 })
 
 if (route.query.id) {
-  getMemberLevelInfo(route.query.id).then(({ data }) => {
-    Object.assign(formData, data)
-
+    getMemberLevelInfo(route.query.id).then(({ data }) => {
+        Object.assign(formData, data)
+
+        getMemberLevelAll().then(({ data }) => {
+            let index = 0
+            data.forEach((item, i) => {
+                item.level_id == formData.level_id && (index = i)
+            })
+            data[index - 1] && (growthInterval.value.min = data[index - 1].growth)
+            data[index + 1] && (growthInterval.value.max = data[index + 1].growth)
+        })
+        loading.value = false
+    })
+} else {
     getMemberLevelAll().then(({ data }) => {
-      let index = 0
-      data.forEach((item, i) => {
-        item.level_id == formData.level_id && (index = i)
-      })
-      data[index - 1] && (growthInterval.value.min = data[index - 1].growth)
-      data[index + 1] && (growthInterval.value.max = data[index + 1].growth)
+        data[data.length - 1] && (growthInterval.value.min = data[data.length - 1].growth)
     })
     loading.value = false
-  })
-} else {
-  getMemberLevelAll().then(({ data }) => {
-    data[data.length - 1] &&
-      (growthInterval.value.min = data[data.length - 1].growth)
-  })
-  loading.value = false
 }
 
 const saveLoading = ref(false)
@@ -189,24 +134,22 @@ const saveLoading = ref(false)
  * 保存
  */
 const save = async (formEl: FormInstance | undefined) => {
-  if (saveLoading.value || !formEl) return
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      if (!(await benefitsRef.value?.verify())) return
-      if (!(await giftRef.value?.verify())) return
-
-      saveLoading.value = true
-      const save = formData.level_id ? updateMemberLevel : addMemberLevel
-      save(formData)
-        .then(() => {
-          router.push({ path: '/member/level' })
-        })
-        .catch(() => {
-          saveLoading.value = false
-        })
-    }
-  })
+    if (saveLoading.value || !formEl) return
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            if (!await benefitsRef.value?.verify()) return
+            if (!await giftRef.value?.verify()) return
+
+            saveLoading.value = true
+            const save = formData.level_id ? updateMemberLevel : addMemberLevel
+            save(formData).then(() => {
+                router.push({ path: '/member/level' })
+            }).catch(() => {
+                saveLoading.value = false
+            })
+        }
+    })
 }
 </script>
 
diff --git a/admin/src/app/views/member/member.vue b/admin/src/app/views/member/member.vue
index eb9f988c..02418757 100644
--- a/admin/src/app/views/member/member.vue
+++ b/admin/src/app/views/member/member.vue
@@ -1,303 +1,139 @@
 <template>
-  <!--会员列表-->
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-        <el-button type="primary" @click="addEvent">{{
-          t('addMember')
-        }}</el-button>
-      </div>
+    <!--会员列表-->
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
 
-      <el-card
-        class="box-card !border-none my-[20px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="memberTableData.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('memberInfo')" prop="keyword">
-            <el-input
-              v-model.trim="memberTableData.searchParam.keyword"
-              class="w-[240px]"
-              :placeholder="t('memberInfoPlaceholder')"
-            />
-          </el-form-item>
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+                <el-button type="primary" @click="addEvent">{{ t('addMember') }}</el-button>
+            </div>
 
-          <el-form-item :label="t('registerChannel')" prop="register_channel">
-            <el-select
-              v-model="memberTableData.searchParam.register_channel"
-              clearable
-              :placeholder="t('channelPlaceholder')"
-              class="input-width"
-            >
-              <el-option :label="t('selectPlaceholder')" value="" />
-              <el-option
-                :label="item"
-                :value="key"
-                v-for="(item, key) in channelList"
-                :key="key"
-              />
-            </el-select>
-          </el-form-item>
+            <el-card class="box-card !border-none my-[20px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="memberTableData.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('memberInfo')" prop="keyword">
+                        <el-input v-model.trim="memberTableData.searchParam.keyword" class="w-[240px]" :placeholder="t('memberInfoPlaceholder')" />
+                    </el-form-item>
 
-          <el-form-item :label="t('memberLabel')" prop="member_label">
-            <el-select
-              v-model="memberTableData.searchParam.member_label"
-              collapse-tags
-              clearable
-              :placeholder="t('memberLabelPlaceholder')"
-              class="input-width"
-            >
-              <el-option :label="t('selectPlaceholder')" value="" />
-              <el-option
-                :label="item['label_name']"
-                :value="item['label_id']"
-                v-for="(item, index) in labelSelectData"
-                :key="index"
-              />
-            </el-select>
-          </el-form-item>
+                    <el-form-item :label="t('registerChannel')" prop="register_channel">
+                        <el-select v-model="memberTableData.searchParam.register_channel" clearable :placeholder="t('channelPlaceholder')" class="input-width">
+                            <el-option :label="t('selectPlaceholder')" value="" />
+                            <el-option :label="item" :value="key" v-for="(item, key) in channelList" :key="key" />
+                        </el-select>
+                    </el-form-item>
 
-          <el-form-item :label="t('memberLevel')" prop="member_level">
-            <el-select
-              v-model="memberTableData.searchParam.member_level"
-              collapse-tags
-              clearable
-              :placeholder="t('memberLevelPlaceholder')"
-              class="input-width"
-            >
-              <el-option :label="t('selectPlaceholder')" value="" />
-              <el-option
-                :label="item['level_name']"
-                :value="item['level_id']"
-                v-for="(item, index) in levelSelectData"
-                :key="index"
-              />
-            </el-select>
-          </el-form-item>
+                    <el-form-item :label="t('memberLabel')" prop="member_label">
+                        <el-select v-model="memberTableData.searchParam.member_label" collapse-tags clearable :placeholder="t('memberLabelPlaceholder')" class="input-width">
+                            <el-option :label="t('selectPlaceholder')" value="" />
+                            <el-option :label="item['label_name']" :value="item['label_id']" v-for="(item, index) in labelSelectData" :key="index" />
+                        </el-select>
+                    </el-form-item>
 
-          <el-form-item :label="t('createTime')" prop="create_time">
-            <el-date-picker
-              v-model="memberTableData.searchParam.create_time"
-              type="datetimerange"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              :start-placeholder="t('startDate')"
-              :end-placeholder="t('endDate')"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="loadMemberList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-            <el-button type="primary" @click="exportEvent">{{
-              t('export')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
+                    <el-form-item :label="t('memberLevel')" prop="member_level">
+                        <el-select v-model="memberTableData.searchParam.member_level" collapse-tags clearable :placeholder="t('memberLevelPlaceholder')" class="input-width">
+                            <el-option :label="t('selectPlaceholder')" value="" />
+                            <el-option :label="item['level_name']" :value="item['level_id']" v-for="(item, index) in levelSelectData" :key="index" />
+                        </el-select>
+                    </el-form-item>
 
-      <div class="mt-[10px]">
-        <el-table
-          :data="memberTableData.data"
-          size="large"
-          v-loading="memberTableData.loading"
-        >
-          <template #empty>
-            <span>{{ !memberTableData.loading ? t('emptyData') : '' }}</span>
-          </template>
+                    <el-form-item :label="t('createTime')" prop="create_time">
+                        <el-date-picker v-model="memberTableData.searchParam.create_time" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="loadMemberList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                        <el-button type="primary" @click="exportEvent">{{ t('export') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
 
-          <el-table-column
-            prop="member_no"
-            :label="t('memberNo')"
-            min-width="120"
-          />
-          <el-table-column
-            prop="nickname"
-            :show-overflow-tooltip="true"
-            :label="t('memberInfo')"
-            min-width="170"
-          >
-            <template #default="{ row }">
-              <div class="flex items-center">
-                <div
-                  class="mr-[10px] rounded-full w-[50px] h-[50px] flex items-center justify-center"
-                >
-                  <img
-                    class="max-w-[50px] max-h-[50px]"
-                    v-if="row.headimg"
-                    :src="img(row.headimg)"
-                    alt=""
-                  />
-                  <img
-                    class="max-w-[50px] max-h-[50px]"
-                    v-else
-                    src="@/app/assets/images/member_head.png"
-                    alt=""
-                  />
-                </div>
-                <div class="flex flex flex-col">
-                  <span>{{ row.nickname || '' }}</span>
-                </div>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="member_level_name"
-            :label="t('memberLevel')"
-            min-width="130"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column prop="mobile" :label="t('mobile')" min-width="120" />
-          <el-table-column
-            prop="point"
-            :label="t('point')"
-            min-width="80"
-            align="right"
-          >
-            <template #default="{ row }">
-              {{ Number.parseInt(row.point) }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="balance"
-            :label="t('balance')"
-            min-width="130"
-            align="right"
-          />
-          <el-table-column
-            prop="member_label"
-            :label="t('memberLabelTag')"
-            min-width="120"
-            align="center"
-          >
-            <template #default="{ row }">
-              <div class="flex flex-col items-center">
-                <div
-                  v-for="(item, key) in row.member_label_array"
-                  class="my-[3px]"
-                  :key="key"
-                >
-                  <el-tag type="info">{{ item.label_name }}</el-tag>
-                </div>
-              </div>
-            </template>
-          </el-table-column>
+            <div class="mt-[10px]">
+                <el-table :data="memberTableData.data" size="large" v-loading="memberTableData.loading">
+                    <template #empty>
+                        <span>{{ !memberTableData.loading ? t('emptyData') : '' }}</span>
+                    </template>
 
-          <el-table-column
-            prop="register_channel_name"
-            :label="t('registerChannel')"
-            min-width="110"
-            align="center"
-          />
+                    <el-table-column prop="member_no" :label="t('memberNo')" min-width="120" />
+                    <el-table-column prop="nickname" :show-overflow-tooltip="true" :label="t('memberInfo')" min-width="170">
+                        <template #default="{ row }">
+                            <div class="flex items-center">
+                                <div class="mr-[10px] rounded-full w-[50px] h-[50px] flex items-center justify-center">
+                                    <img class="max-w-[50px] max-h-[50px]" v-if="row.headimg" :src="img(row.headimg)" alt="">
+                                    <img class="max-w-[50px] max-h-[50px]" v-else src="@/app/assets/images/member_head.png" alt="">
+                                </div>
+                                <div class="flex flex flex-col">
+                                    <span>{{ row.nickname || '' }}</span>
+                                </div>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="member_level_name" :label="t('memberLevel')" min-width="130" :show-overflow-tooltip="true" />
+                    <el-table-column prop="mobile" :label="t('mobile')" min-width="120" />
+                    <el-table-column prop="point" :label="t('point')" min-width="80" align="right">
+                        <template #default="{ row }">
+                            {{ Number.parseInt(row.point) }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="balance" :label="t('balance')" min-width="130" align="right" />
+                    <el-table-column prop="member_label" :label="t('memberLabelTag')" min-width="120" align="center">
+                        <template #default="{ row }">
+                            <div class="flex flex-col items-center">
+                                <div v-for="(item, key) in row.member_label_array" class="my-[3px]" :key="key">
+                                    <el-tag type="info">{{ item.label_name }}</el-tag>
+                                </div>
+                            </div>
+                        </template>
+                    </el-table-column>
 
-          <el-table-column
-            prop="member_label"
-            :label="t('status')"
-            min-width="120"
-            align="center"
-          >
-            <template #default="{ row }">
-              <el-tag
-                type="success"
-                v-if="row.status == 1"
-                @click="lockMember(row, 0)"
-                class="cursor-pointer"
-                >{{ t('normal') }}</el-tag
-              >
-              <el-tag
-                type="error"
-                v-else
-                @click="lockMember(row, 1)"
-                class="cursor-pointer"
-                >{{ t('lock') }}</el-tag
-              >
-            </template>
-          </el-table-column>
-          <el-table-column
-            :label="t('createTime')"
-            min-width="150"
-            align="center"
-          >
-            <template #default="{ row }">
-              {{ row.create_time || '' }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            :label="t('lastVisitTime')"
-            min-width="150"
-            align="center"
-          >
-            <template #default="{ row }">
-              {{ row.last_visit_time || '' }}
-            </template>
-          </el-table-column>
+                    <el-table-column prop="register_channel_name" :label="t('registerChannel')" min-width="110" align="center" />
 
-          <el-table-column
-            :label="t('operation')"
-            align="right"
-            fixed="right"
-            width="100"
-          >
-            <template #default="{ row }">
-              <div class="flex items-center">
-                <el-button type="primary" link @click="detailEvent(row)">{{
-                  t('detail')
-                }}</el-button>
-                <el-button type="primary" link @click="setMemberLabel(row)">{{
-                  t('setLabel')
-                }}</el-button>
-                <!-- <el-button type="primary" link @click="deleteEvent(row)">{{ t('memberDelete') }}</el-button> -->
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="memberTableData.page"
-            v-model:page-size="memberTableData.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="memberTableData.total"
-            @size-change="loadMemberList()"
-            @current-change="loadMemberList"
-          />
-        </div>
-      </div>
+                    <el-table-column prop="member_label" :label="t('status')" min-width="120" align="center">
+                        <template #default="{ row }">
+                            <el-tag type="success" v-if="row.status == 1" @click="lockMember(row, 0)" class="cursor-pointer">{{ t('normal') }}</el-tag>
+                            <el-tag type="error" v-else @click="lockMember(row, 1)" class="cursor-pointer">{{ t('lock') }}</el-tag>
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('createTime')" min-width="150" align="center">
+                        <template #default="{ row }">
+                            {{ row.create_time || '' }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('lastVisitTime')" min-width="150" align="center">
+                        <template #default="{ row }">
+                            {{ row.last_visit_time || '' }}
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column :label="t('operation')" align="right" fixed="right" width="100">
+                        <template #default="{ row }">
+                            <div class="flex items-center">
+                                <el-button type="primary" link @click="detailEvent(row)">{{ t('detail') }}</el-button>
+                                <el-button type="primary" link @click="setMemberLabel(row)">{{ t('setLabel') }}</el-button>
+                                <!-- <el-button type="primary" link @click="deleteEvent(row)">{{ t('memberDelete') }}</el-button> -->
+                            </div>
+                        </template>
+                    </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="memberTableData.page" v-model:page-size="memberTableData.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="memberTableData.total"
+                        @size-change="loadMemberList()" @current-change="loadMemberList" />
+                </div>
+            </div>
 
-      <add-member ref="addMemberDialog" @complete="loadMemberList()" />
-      <edit-member ref="editMemberDialog" @complete="loadMemberList()" />
-      <export-sure
-        ref="exportSureDialog"
-        :show="flag"
-        type="member"
-        :searchParam="memberTableData.searchParam"
-        @close="handleClose"
-      />
-      <detail-member
-        ref="detailMemberDialog"
-        @load="loadMemberList()"
-      ></detail-member>
-    </el-card>
-  </div>
+            <add-member ref="addMemberDialog" @complete="loadMemberList()" />
+            <edit-member ref="editMemberDialog" @complete="loadMemberList()" />
+            <export-sure ref="exportSureDialog" :show="flag" type="member" :searchParam="memberTableData.searchParam" @close="handleClose" />
+            <detail-member ref="detailMemberDialog"  @load="loadMemberList()"></detail-member>
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
 import { t } from '@/lang'
 import { img } from '@/utils/common'
-import {
-  getRegisterChannelType,
-  getMemberList,
-  getMemberLabelAll,
-  editMemberStatus,
-  deleteMember,
-  getMemberLevelAll,
-} from '@/app/api/member'
+import { getRegisterChannelType, getMemberList, getMemberLabelAll, editMemberStatus, deleteMember, getMemberLevelAll } from '@/app/api/member'
 import { ElMessageBox, FormInstance } from 'element-plus'
 import { useRouter, useRoute } from 'vue-router'
 import AddMember from '@/app/views/member/components/add-member.vue'
@@ -308,19 +144,19 @@ const route = useRoute()
 const pageName = route.meta.title
 
 const memberTableData = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    keyword: '',
-    register_type: '',
-    member_label: '',
-    register_channel: '',
-    create_time: [],
-    member_level: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        keyword: '',
+        register_type: '',
+        member_label: '',
+        register_channel: '',
+        create_time: [],
+        member_level: ''
+    }
 })
 
 const searchFormRef = ref<FormInstance>()
@@ -328,45 +164,43 @@ const searchFormRef = ref<FormInstance>()
 // 获取注册方式
 const channelList = ref([])
 const setChannelList = async () => {
-  channelList.value = await (await getRegisterChannelType({})).data
+    channelList.value = await (await getRegisterChannelType({})).data
 }
 setChannelList()
 
 // 获取全部标签
 const labelSelectData = ref([])
 const getMemberLabelAllFn = async () => {
-  labelSelectData.value = await (await getMemberLabelAll()).data
+    labelSelectData.value = await (await getMemberLabelAll()).data
 }
 getMemberLabelAllFn()
 
 const levelSelectData = ref([])
 getMemberLevelAll().then(({ data }) => {
-  levelSelectData.value = data
+    levelSelectData.value = data
 })
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadMemberList()
+    if (!formEl) return
+    formEl.resetFields()
+    loadMemberList()
 }
 
 // 获取会员列表
 const loadMemberList = (page: number = 1) => {
-  memberTableData.loading = true
-  memberTableData.page = page
+    memberTableData.loading = true
+    memberTableData.page = page
 
-  getMemberList({
-    page: memberTableData.page,
-    limit: memberTableData.limit,
-    ...memberTableData.searchParam,
-  })
-    .then((res) => {
-      memberTableData.loading = false
-      memberTableData.data = res.data.data
-      memberTableData.total = res.data.total
-    })
-    .catch(() => {
-      memberTableData.loading = false
+    getMemberList({
+        page: memberTableData.page,
+        limit: memberTableData.limit,
+        ...memberTableData.searchParam
+    }).then(res => {
+        memberTableData.loading = false
+        memberTableData.data = res.data.data
+        memberTableData.total = res.data.total
+    }).catch(() => {
+        memberTableData.loading = false
     })
 }
 loadMemberList()
@@ -380,54 +214,55 @@ const detailMemberDialog: Record<string, any> | null = ref(null)
  * 设置标签
  */
 function setMemberLabel(res: any) {
-  const data = ref({
-    type: 'member_label',
-    id: res.member_id,
-    title: t('setLabel'),
-    data: res,
-  })
-  editMemberDialog.value.setDialogType(data.value)
-  editMemberDialog.value.showDialog = true
+    const data = ref({
+        type: 'member_label',
+        id: res.member_id,
+        title: t('setLabel'),
+        data: res
+    })
+    editMemberDialog.value.setDialogType(data.value)
+    editMemberDialog.value.showDialog = true
 }
 
 /**
  * 删除
  */
 function deleteEvent(res: any) {
-  ElMessageBox.confirm(t('memberDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    deleteMember(res.member_id)
-      .then(() => {
-        loadMemberList()
-      })
-      .catch(() => {})
-  })
+    ElMessageBox.confirm(t('memberDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        deleteMember(res.member_id).then(() => {
+            loadMemberList()
+        }).catch(() => {
+        })
+    })
 }
 
 /**
  * 添加会员
  */
 const addEvent = () => {
-  addMemberDialog.value.setFormData()
-  addMemberDialog.value.showDialog = true
+    addMemberDialog.value.setFormData()
+    addMemberDialog.value.showDialog = true
 }
 
 /**
  * 编辑会员
  * @param data
  */
-const editEvent = (data: any) => {}
+const editEvent = (data: any) => { }
 
 /**
  * 会员详情
  */
 const detailEvent = (res: any) => {
-  let data = { id: res.member_id }
-  detailMemberDialog.value.setFormData(data)
-  detailMemberDialog.value.showDialog = true
+    let data = {id: res.member_id};
+    detailMemberDialog.value.setFormData(data);
+    detailMemberDialog.value.showDialog = true;
 }
 
 /**
@@ -436,23 +271,23 @@ const detailEvent = (res: any) => {
 const exportSureDialog = ref(null)
 const flag = ref(false)
 const handleClose = (val) => {
-  flag.value = val
+    flag.value = val
 }
 const exportEvent = () => {
-  flag.value = true
+    flag.value = true
 }
 /**
  * 变更会员状态
  */
 const lockMember = (res: any, status: any) => {
-  editMemberStatus({
-    status: status,
-    member_ids: [res.member_id],
-  }).then((res) => {
-    if (res.code >= 0) {
-      loadMemberList()
-    }
-  })
+    editMemberStatus({
+        status: status,
+        member_ids: [res.member_id]
+    }).then(res => {
+        if (res.code >= 0) {
+            loadMemberList()
+        }
+    })
 }
 </script>
 
diff --git a/admin/src/app/views/member/member_detail.vue b/admin/src/app/views/member/member_detail.vue
index 01a2aa36..42f6081f 100644
--- a/admin/src/app/views/member/member_detail.vue
+++ b/admin/src/app/views/member/member_detail.vue
@@ -1,393 +1,268 @@
 <template>
-  <!--会员详情-->
-  <div class="main-container" v-loading="loading">
-    <el-card class="card !border-none" shadow="never">
-      <el-page-header :content="pageName" :icon="ArrowLeft" @back="back" />
-    </el-card>
+    <!--会员详情-->
+    <div class="main-container" v-loading="loading">
 
-    <el-card class="box-card mt-[15px] !border-none" shadow="never">
-      <div class="bg-page py-[20px] pr-[80px] pl-[280px] relative">
-        <div class="member-info absolute w-[250px]">
-          <div class="flex items-center">
-            <span class="text-[14px] min-w-[110px] text-right mr-[20px]">{{
-              t('headimg')
-            }}</span>
-            <span class="flex items-end text-[14px]">
-              <img
-                class="w-[50px] h-[50px] inline-block"
-                v-if="formData.headimg"
-                :src="img(formData.headimg)"
-                alt=""
-              />
-              <img
-                class="w-[50px] h-[50px] inline-block rounded-full"
-                v-else
-                src="@/app/assets/images/member_head.png"
-                alt=""
-              />
-              <el-icon
-                @click="editMemberInfo('headimg')"
-                class="-bottom-[2px] -right-[4px] cursor-pointer"
-              >
-                <EditPen color="#273CE2" />
-              </el-icon>
-            </span>
-          </div>
-          <div class="flex items-center mt-[20px]">
-            <span class="text-[14px] min-w-[110px] text-right mr-[20px]"
-              >UID</span
-            >
-            <span
-              class="member-info-item text-[14px] text-[#666666] font-bold w-[150px]"
-            >
-              {{ formData.member_no || t('notAvailable') }}
-            </span>
-          </div>
-        </div>
-        <div>
-          <el-row justify="space-evenly" class="flex">
-            <el-col :span="4">
-              <div class="statistic-card">
-                <el-statistic :value="formData.point">
-                  <template #title>
-                    <div style="display: inline-flex; align-items: center">
-                      <span class="text-[14px]">
-                        {{ t('point') }}
-                      </span>
-                      <el-tooltip
-                        effect="dark"
-                        :content="t('adjust')"
-                        placement="top"
-                      >
-                        <el-icon
-                          @click="adjustPoint(formData)"
-                          class="ml-2 cursor-pointer"
-                          :size="12"
-                        >
-                          <EditPen color="#273CE2" />
-                        </el-icon>
-                      </el-tooltip>
-                      <el-tooltip
-                        effect="dark"
-                        :content="t('detail')"
-                        placement="top"
-                      >
-                        <el-icon
-                          @click="infoPoint(formData)"
-                          class="ml-2 cursor-pointer"
-                          :size="12"
-                        >
-                          <View />
-                        </el-icon>
-                      </el-tooltip>
-                    </div>
-                  </template>
-                </el-statistic>
-                <div class="statistic-footer">
-                  <div class="footer-item text-[14px] text-secondary">
-                    <span>{{ t('accumulative') }}</span>
-                    <span class="green ml-1">
-                      {{ formData.point_get }}
-                    </span>
-                  </div>
-                </div>
-              </div>
-            </el-col>
-            <el-col :span="4">
-              <div class="statistic-card">
-                <el-statistic :value="formData.balance">
-                  <template #title>
-                    <div style="display: inline-flex; align-items: center">
-                      <span class="text-[14px]">
-                        {{ t('balance') }}
-                      </span>
-                      <el-tooltip
-                        effect="dark"
-                        :content="t('adjust')"
-                        placement="top"
-                      >
-                        <el-icon
-                          @click="adjustBalance(formData)"
-                          class="ml-2 cursor-pointer"
-                          :size="12"
-                        >
-                          <EditPen color="#273CE2" />
-                        </el-icon>
-                      </el-tooltip>
-                      <el-tooltip
-                        effect="dark"
-                        :content="t('detail')"
-                        placement="top"
-                      >
-                        <el-icon
-                          @click="infoBalance(formData)"
-                          class="ml-2 cursor-pointer"
-                          :size="12"
-                        >
-                          <View />
-                        </el-icon>
-                      </el-tooltip>
-                    </div>
-                  </template>
-                </el-statistic>
-                <div class="statistic-footer">
-                  <div class="footer-item text-[14px] text-secondary">
-                    <span>{{ t('accumulative') }}</span>
-                    <span class="red ml-1">
-                      {{ formData.balance_get }}
-                    </span>
-                  </div>
-                </div>
-              </div>
-            </el-col>
-            <el-col :span="4">
-              <div class="statistic-card">
-                <el-statistic :value="formData.growth">
-                  <template #title>
-                    <div style="display: inline-flex; align-items: center">
-                      <span class="text-[14px]">
-                        {{ t('growth') }}
-                      </span>
-                      <!--                                            <el-tooltip effect="dark" :content="t('adjust')" placement="top">-->
-                      <!--                                                <el-icon @click="adjustGrowth(formData)" class="ml-2 cursor-pointer" :size="12">-->
-                      <!--                                                    <EditPen color="#273CE2" />-->
-                      <!--                                                </el-icon>-->
-                      <!--                                            </el-tooltip>-->
-                      <el-tooltip
-                        effect="dark"
-                        :content="t('detail')"
-                        placement="top"
-                      >
-                        <el-icon
-                          @click="infoGrowth(formData)"
-                          class="ml-2 cursor-pointer"
-                          :size="12"
-                        >
-                          <View />
-                        </el-icon>
-                      </el-tooltip>
+        <el-card class="card !border-none" shadow="never">
+            <el-page-header :content="pageName" :icon="ArrowLeft" @back="back" />
+        </el-card>
+
+        <el-card class="box-card mt-[15px] !border-none" shadow="never">
+            <div class="bg-page py-[20px] pr-[80px] pl-[280px] relative">
+                <div class="member-info absolute w-[250px]">
+                    <div class="flex items-center">
+                        <span class="text-[14px] min-w-[110px] text-right mr-[20px]">{{ t('headimg') }}</span>
+                        <span class="flex items-end text-[14px]">
+                            <img class="w-[50px] h-[50px] inline-block" v-if="formData.headimg" :src="img(formData.headimg)" alt="">
+                            <img class="w-[50px] h-[50px] inline-block rounded-full" v-else src="@/app/assets/images/member_head.png" alt="">
+                            <el-icon @click="editMemberInfo('headimg')" class="-bottom-[2px] -right-[4px] cursor-pointer">
+                                <EditPen color="#273CE2" />
+                            </el-icon>
+                        </span>
                     </div>
-                  </template>
-                </el-statistic>
-              </div>
-            </el-col>
-            <el-col :span="4">
-              <div class="statistic-card">
-                <el-statistic
-                  :value="formData.money"
-                  title="New transactions today"
-                >
-                  <template #title>
-                    <div style="display: inline-flex; align-items: center">
-                      <span class="text-[14px]">
-                        {{ t('money') }}
-                      </span>
-                      <el-tooltip
-                        effect="dark"
-                        :content="t('detail')"
-                        placement="top"
-                      >
-                        <el-icon
-                          @click="infoBalance(formData)"
-                          class="ml-2 cursor-pointer"
-                          :size="12"
-                        >
-                          <View />
-                        </el-icon>
-                      </el-tooltip>
+                    <div class="flex items-center mt-[20px]">
+                        <span class="text-[14px] min-w-[110px] text-right mr-[20px]">UID</span>
+                        <span class="member-info-item text-[14px] text-[#666666] font-bold w-[150px]">
+                            {{ formData.member_no || t('notAvailable') }}
+                        </span>
                     </div>
-                  </template>
-                </el-statistic>
-                <div class="statistic-footer">
-                  <div class="footer-item text-[14px] text-secondary">
-                    <span>{{ t('accumulative') }}</span>
-                    <span class="green ml-1">
-                      {{ formData.money_get }}
-                    </span>
-                  </div>
                 </div>
-              </div>
-            </el-col>
-            <el-col :span="4">
-              <div class="statistic-card">
-                <el-statistic
-                  :value="formData.commission"
-                  title="New transactions today"
-                >
-                  <template #title>
-                    <div style="display: inline-flex; align-items: center">
-                      <span class="text-[14px]">
-                        {{ t('commission') }}
-                      </span>
-                      <el-tooltip
-                        effect="dark"
-                        :content="t('detail')"
-                        placement="top"
-                      >
-                        <el-icon
-                          @click="infoCommission(formData)"
-                          class="ml-2 cursor-pointer"
-                          :size="12"
-                        >
-                          <View />
-                        </el-icon>
-                      </el-tooltip>
-                    </div>
-                  </template>
-                </el-statistic>
-                <div class="statistic-footer">
-                  <div class="footer-item text-[14px] text-secondary">
-                    <span>{{ t('accumulative') }}</span>
-                    <span class="green ml-1">
-                      {{ formData.commission_get }}
-                    </span>
-                  </div>
+                <div>
+                    <el-row justify="space-evenly" class="flex">
+                        <el-col :span="4">
+                            <div class="statistic-card">
+                                <el-statistic :value="formData.point">
+                                    <template #title>
+                                        <div style="display: inline-flex; align-items: center">
+                                            <span class="text-[14px]">
+                                                {{ t('point') }}
+                                            </span>
+                                            <el-tooltip effect="dark" :content="t('adjust')" placement="top">
+                                                <el-icon @click="adjustPoint(formData)" class="ml-2 cursor-pointer" :size="12">
+                                                    <EditPen color="#273CE2" />
+                                                </el-icon>
+                                            </el-tooltip>
+                                            <el-tooltip effect="dark" :content="t('detail')" placement="top">
+                                                <el-icon @click="infoPoint(formData)" class="ml-2 cursor-pointer" :size="12">
+                                                    <View />
+                                                </el-icon>
+                                            </el-tooltip>
+                                        </div>
+                                    </template>
+                                </el-statistic>
+                                <div class="statistic-footer">
+                                    <div class="footer-item text-[14px] text-secondary">
+                                        <span>{{ t('accumulative') }}</span>
+                                        <span class="green ml-1">
+                                            {{ formData.point_get }}
+                                        </span>
+                                    </div>
+                                </div>
+                            </div>
+                        </el-col>
+                        <el-col :span="4">
+                            <div class="statistic-card">
+                                <el-statistic :value="formData.balance">
+                                    <template #title>
+                                        <div style="display: inline-flex; align-items: center">
+                                            <span class="text-[14px]">
+                                                {{ t('balance') }}
+                                            </span>
+                                            <el-tooltip effect="dark" :content="t('adjust')" placement="top">
+                                                <el-icon @click="adjustBalance(formData)" class="ml-2 cursor-pointer" :size="12">
+                                                    <EditPen color="#273CE2" />
+                                                </el-icon>
+                                            </el-tooltip>
+                                            <el-tooltip effect="dark" :content="t('detail')" placement="top">
+                                                <el-icon @click="infoBalance(formData)" class="ml-2 cursor-pointer" :size="12">
+                                                    <View />
+                                                </el-icon>
+                                            </el-tooltip>
+                                        </div>
+                                    </template>
+                                </el-statistic>
+                                <div class="statistic-footer">
+                                    <div class="footer-item text-[14px] text-secondary">
+                                        <span>{{ t('accumulative') }}</span>
+                                        <span class="red ml-1">
+                                            {{ formData.balance_get }}
+                                        </span>
+                                    </div>
+                                </div>
+                            </div>
+                        </el-col>
+                        <el-col :span="4">
+                            <div class="statistic-card">
+                                <el-statistic :value="formData.growth">
+                                    <template #title>
+                                        <div style="display: inline-flex; align-items: center">
+                                            <span class="text-[14px]">
+                                                {{ t('growth') }}
+                                            </span>
+<!--                                            <el-tooltip effect="dark" :content="t('adjust')" placement="top">-->
+<!--                                                <el-icon @click="adjustGrowth(formData)" class="ml-2 cursor-pointer" :size="12">-->
+<!--                                                    <EditPen color="#273CE2" />-->
+<!--                                                </el-icon>-->
+<!--                                            </el-tooltip>-->
+                                            <el-tooltip effect="dark" :content="t('detail')" placement="top">
+                                                <el-icon @click="infoGrowth(formData)" class="ml-2 cursor-pointer" :size="12">
+                                                    <View />
+                                                </el-icon>
+                                            </el-tooltip>
+                                        </div>
+                                    </template>
+                                </el-statistic>
+                            </div>
+                        </el-col>
+                        <el-col :span="4">
+                            <div class="statistic-card">
+                                <el-statistic :value="formData.money" title="New transactions today">
+                                    <template #title>
+                                        <div style="display: inline-flex; align-items: center">
+                                            <span class="text-[14px]">
+                                                {{ t("money") }}
+                                            </span>
+                                            <el-tooltip effect="dark" :content="t('detail')" placement="top">
+                                                <el-icon @click="infoBalance(formData)" class="ml-2 cursor-pointer" :size="12">
+                                                    <View />
+                                                </el-icon>
+                                            </el-tooltip>
+                                        </div>
+                                    </template>
+                                </el-statistic>
+                                <div class="statistic-footer">
+                                    <div class="footer-item text-[14px] text-secondary">
+                                        <span>{{ t('accumulative') }}</span>
+                                        <span class="green ml-1">
+                                            {{ formData.money_get }}
+                                        </span>
+                                    </div>
+                                </div>
+                            </div>
+                        </el-col>
+                        <el-col :span="4">
+                            <div class="statistic-card">
+                                <el-statistic :value="formData.commission" title="New transactions today">
+                                    <template #title>
+                                        <div style="display: inline-flex; align-items: center ">
+                                            <span class="text-[14px]">
+                                                {{ t("commission") }}
+                                            </span>
+                                            <el-tooltip effect="dark" :content="t('detail')" placement="top">
+                                                <el-icon @click="infoCommission(formData)" class="ml-2 cursor-pointer" :size="12">
+                                                    <View />
+                                                </el-icon>
+                                            </el-tooltip>
+                                        </div>
+                                    </template>
+                                </el-statistic>
+                                <div class="statistic-footer">
+                                    <div class="footer-item text-[14px] text-secondary">
+                                        <span>{{ t('accumulative') }}</span>
+                                        <span class="green ml-1">
+                                            {{ formData.commission_get }}
+                                        </span>
+                                    </div>
+                                </div>
+                            </div>
+                        </el-col>
+                    </el-row>
                 </div>
-              </div>
-            </el-col>
-          </el-row>
-        </div>
-      </div>
-    </el-card>
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex items-center mt-[15px]">
-        <span class="text-[14px] w-[130px] text-right mr-[20px]">{{
-          t('urserName')
-        }}</span>
-        <span class="text-[14px] text-[#666666]">
-          {{ formData.username || t('notAvailable') }}
-        </span>
-      </div>
-      <div class="flex items-center mt-[15px]">
-        <span class="text-[14px] w-[130px] text-right mr-[20px]">{{
-          t('nickname')
-        }}</span>
-        <span class="text-[14px] text-[#666666]">
-          {{ formData.nickname || t('notAvailable') }}
-        </span>
-      </div>
+            </div>
+        </el-card>
+        <el-card class="box-card !border-none" shadow="never">
+            <div class="flex items-center mt-[15px]">
+                <span class="text-[14px] w-[130px] text-right mr-[20px]">{{ t('urserName') }}</span>
+                <span class="text-[14px] text-[#666666]">
+                    {{ formData.username || t('notAvailable') }}
+                </span>
+            </div>
+            <div class="flex items-center mt-[15px]">
+                <span class="text-[14px] w-[130px] text-right mr-[20px]">{{ t('nickname') }}</span>
+                <span class="text-[14px] text-[#666666]">
+                    {{ formData.nickname || t('notAvailable') }}
+                </span>
+            </div>
 
-      <div class="flex items-center mt-[15px]">
-        <span class="text-[14px] w-[130px] text-right mr-[20px]">{{
-          t('mobile')
-        }}</span>
-        <span class="text-[14px] text-[#666666]">
-          {{ formData.mobile || t('notAvailable') }}
-        </span>
-      </div>
-      <div class="flex items-center mt-[15px]">
-        <span class="text-[14px] w-[130px] text-right mr-[20px]">{{
-          t('memberLevel')
-        }}</span>
-        <span class="text-[14px] text-[#666666]">
-          {{ formData.member_level_name || t('notAvailable')
-          }}<el-icon
-            @click="editMemberInfo('member_level')"
-            class="-bottom-[2px] -right-[4px] cursor-pointer"
-          >
-            <EditPen color="#273CE2" />
-          </el-icon>
-        </span>
-      </div>
-      <div class="flex items-center mt-[15px]">
-        <span class="text-[14px] w-[130px] text-right mr-[20px]">{{
-          t('memberLabel')
-        }}</span>
-        <span class="text-[14px] text-[#666666]">
-          {{ formData.member_label_name.toString() || t('notAvailable')
-          }}<el-icon
-            @click="editMemberInfo('member_label')"
-            class="-bottom-[2px] -right-[4px] cursor-pointer"
-          >
-            <EditPen color="#273CE2" />
-          </el-icon>
-        </span>
-      </div>
-      <div class="flex items-center mt-[15px]">
-        <span class="text-[14px] w-[130px] text-right mr-[20px]">{{
-          t('birthday')
-        }}</span>
-        <span class="text-[14px] text-[#666666]">
-          {{ formData.birthday || t('notAvailable')
-          }}<el-icon
-            @click="editMemberInfo('birthday')"
-            class="-bottom-[2px] -right-[4px] cursor-pointer"
-          >
-            <EditPen color="#273CE2" />
-          </el-icon>
-        </span>
-      </div>
-      <div class="flex items-center mt-[15px]">
-        <span class="text-[14px] w-[130px] text-right mr-[20px]">{{
-          t('sex')
-        }}</span>
-        <span class="text-[14px] text-[#666666]">
-          {{
-            (formData.sex == 1 && t('manSex')) ||
-            (formData.sex == 2 && t('girlSex')) ||
-            t('secrecySex')
-          }}<el-icon
-            @click="editMemberInfo('sex')"
-            class="-bottom-[2px] -right-[4px] cursor-pointer"
-          >
-            <EditPen color="#273CE2" />
-          </el-icon>
-        </span>
-      </div>
-      <div class="flex items-center mt-[15px]">
-        <span class="text-[14px] w-[130px] text-right mr-[20px]">{{
-          t('wxUnionid')
-        }}</span>
-        <span class="text-[14px] text-[#666666]">
-          {{ formData.wx_unionid || t('notAvailable') }}
-        </span>
-      </div>
-      <div class="flex items-center mt-[15px]">
-        <span class="text-[14px] w-[130px] text-right mr-[20px]">{{
-          t('weappOpenid')
-        }}</span>
-        <span class="text-[14px] text-[#666666]">
-          {{ formData.weapp_openid || t('notAvailable') }}
-        </span>
-      </div>
-      <div class="flex items-center mt-[15px]">
-        <span class="text-[14px] w-[130px] text-right mr-[20px]">{{
-          t('wxOpenid')
-        }}</span>
-        <span class="text-[14px] text-[#666666]">
-          {{ formData.wx_openid || t('notAvailable') }}
-        </span>
-      </div>
-      <div class="flex items-center mt-[15px]">
-        <span class="text-[14px] w-[130px] text-right mr-[20px]">{{
-          t('registeredSource')
-        }}</span>
-        <span class="text-[14px] text-[#666666]">
-          {{ formData.register_channel_name || t('notAvailable') }}
-        </span>
-      </div>
-      <div class="flex items-center mt-[15px]">
-        <span class="text-[14px] w-[130px] text-right mr-[20px]">{{
-          t('createTime')
-        }}</span>
-        <span class="text-[14px] text-[#666666]">
-          {{ formData.create_time || t('notAvailable') }}
-        </span>
-      </div>
-      <div class="flex items-center mt-[15px]">
-        <span class="text-[14px] w-[130px] text-right mr-[20px]">{{
-          t('lastVisitTime')
-        }}</span>
-        <span class="text-[14px] text-[#666666]">
-          {{ formData.last_visit_time || t('notAvailable') }}
-        </span>
-      </div>
-    </el-card>
+            <div class="flex items-center mt-[15px]">
+                <span class="text-[14px] w-[130px] text-right mr-[20px]">{{ t('mobile') }}</span>
+                <span class="text-[14px] text-[#666666]">
+                    {{ formData.mobile || t('notAvailable') }}
+                </span>
+            </div>
+            <div class="flex items-center mt-[15px]">
+                <span class="text-[14px] w-[130px] text-right mr-[20px]">{{ t('memberLevel') }}</span>
+                <span class="text-[14px] text-[#666666]">
+                    {{ formData.member_level_name || t('notAvailable') }}<el-icon @click="editMemberInfo('member_level')" class="-bottom-[2px] -right-[4px] cursor-pointer">
+                        <EditPen color="#273CE2" />
+                    </el-icon>
+                </span>
+            </div>
+            <div class="flex items-center mt-[15px]">
+                <span class="text-[14px] w-[130px] text-right mr-[20px]">{{ t('memberLabel') }}</span>
+                <span class="text-[14px] text-[#666666]">
+                    {{ formData.member_label_name.toString() || t('notAvailable') }}<el-icon @click="editMemberInfo('member_label')" class="-bottom-[2px] -right-[4px] cursor-pointer">
+                        <EditPen color="#273CE2" />
+                    </el-icon>
+                </span>
+            </div>
+            <div class="flex items-center mt-[15px]">
+                <span class="text-[14px] w-[130px] text-right mr-[20px]">{{ t('birthday') }}</span>
+                <span class="text-[14px] text-[#666666]">
+                    {{ formData.birthday || t('notAvailable') }}<el-icon @click="editMemberInfo('birthday')" class="-bottom-[2px] -right-[4px] cursor-pointer">
+                        <EditPen color="#273CE2" />
+                    </el-icon>
+                </span>
+            </div>
+            <div class="flex items-center mt-[15px]">
+                <span class="text-[14px] w-[130px] text-right mr-[20px]">{{ t('sex') }}</span>
+                <span class="text-[14px] text-[#666666]">
+                    {{ formData.sex == 1 && t('manSex') || formData.sex == 2 && t('girlSex') || t('secrecySex') }}<el-icon @click="editMemberInfo('sex')" class="-bottom-[2px] -right-[4px] cursor-pointer">
+                        <EditPen color="#273CE2" />
+                    </el-icon>
+                </span>
+            </div>
+            <div class="flex items-center mt-[15px]">
+                <span class="text-[14px] w-[130px] text-right mr-[20px]">{{ t('wxUnionid') }}</span>
+                <span class="text-[14px] text-[#666666]">
+                    {{ formData.wx_unionid || t('notAvailable') }}
+                </span>
+            </div>
+            <div class="flex items-center mt-[15px]">
+                <span class="text-[14px] w-[130px] text-right mr-[20px]">{{ t('weappOpenid') }}</span>
+                <span class="text-[14px] text-[#666666]">
+                    {{ formData.weapp_openid || t('notAvailable') }}
+                </span>
+            </div>
+            <div class="flex items-center mt-[15px]">
+                <span class="text-[14px] w-[130px] text-right mr-[20px]">{{ t('wxOpenid') }}</span>
+                <span class="text-[14px] text-[#666666]">
+                    {{ formData.wx_openid || t('notAvailable') }}
+                </span>
+            </div>
+            <div class="flex items-center mt-[15px]">
+                <span class="text-[14px] w-[130px] text-right mr-[20px]">{{ t('registeredSource') }}</span>
+                <span class="text-[14px] text-[#666666]">
+                    {{ formData.register_channel_name || t('notAvailable') }}
+                </span>
+            </div>
+            <div class="flex items-center mt-[15px]">
+                <span class="text-[14px] w-[130px] text-right mr-[20px]">{{ t('createTime') }}</span>
+                <span class="text-[14px] text-[#666666]">
+                    {{ formData.create_time || t('notAvailable') }}
+                </span>
+            </div>
+            <div class="flex items-center mt-[15px]">
+                <span class="text-[14px] w-[130px] text-right mr-[20px]">{{ t('lastVisitTime') }}</span>
+                <span class="text-[14px] text-[#666666]">
+                    {{ formData.last_visit_time || t('notAvailable') }}
+                </span>
+            </div>
+        </el-card>
 
-    <point-edit ref="pointDialog" @complete="getMemberInfoFn" />
-    <balance-edit ref="balanceDialog" @complete="getMemberInfoFn" />
-    <edit-member ref="editMemberDialog" @complete="getMemberInfoFn()" />
-  </div>
+        <point-edit ref="pointDialog" @complete="getMemberInfoFn" />
+        <balance-edit ref="balanceDialog" @complete="getMemberInfoFn" />
+        <edit-member ref="editMemberDialog" @complete="getMemberInfoFn()" />
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -414,41 +289,34 @@ const id: number = parseInt(route.query.id || 0)
 const formData: any = reactive({ member_label_name: '' })
 
 const getMemberInfoFn = async () => {
-  loading.value = true
-  if (id) {
-    const data = await (await getMemberInfo(id)).data
-    if (!data || Object.keys(data).length == 0) {
-      ElMessage.error(t('memberNull'))
-      setTimeout(() => {
-        router.go(-1)
-      }, 2000)
-      return false
-    }
+    loading.value = true
+    if (id) {
+        const data = await (await getMemberInfo(id)).data
+        if (!data || Object.keys(data).length == 0) {
+            ElMessage.error(t('memberNull'))
+            setTimeout(() => {
+                router.go(-1)
+            }, 2000)
+            return false
+        }
 
-    Object.keys(data).forEach((item) => {
-      formData[item] = data[item]
-    })
+        Object.keys(data).forEach((item) => {
+            formData[item] = data[item]
+        })
 
-    if (
-      formData?.member_label_array &&
-      Object.keys(formData.member_label_array)?.length
-    ) {
-      formData.member_label = Object.values(formData.member_label_array).map(
-        (item: any, index) => {
-          return item.label_id
-        }
-      )
+        if (formData?.member_label_array && Object.keys(formData.member_label_array)?.length) {
+            formData.member_label = Object.values(formData.member_label_array).map((item: any, index) => {
+                return item.label_id
+            })
 
-      formData.member_label_name = Object.values(
-        formData.member_label_array
-      ).map((item: any, index) => {
-        return item.label_name
-      })
+            formData.member_label_name = Object.values(formData.member_label_array).map((item: any, index) => {
+                return item.label_name
+            })
+        }
+        loading.value = false
+    } else {
+        loading.value = false
     }
-    loading.value = false
-  } else {
-    loading.value = false
-  }
 }
 getMemberInfoFn()
 
@@ -460,29 +328,29 @@ const editMemberDialog: Record<string, any> | null = ref(null)
  *  修改会员信息
  */
 const editMemberInfo = (type: any) => {
-  const data = ref({
-    type,
-    id,
-    data: formData,
-  })
-  editMemberDialog.value.setDialogType(data.value)
-  editMemberDialog.value.showDialog = true
+    const data = ref({
+        type,
+        id,
+        data: formData
+    })
+    editMemberDialog.value.setDialogType(data.value)
+    editMemberDialog.value.showDialog = true
 }
 
 /**
  * 调整积分
  */
 const adjustPoint = (data: any) => {
-  pointDialog.value.setFormData(data)
-  pointDialog.value.showDialog = true
+    pointDialog.value.setFormData(data)
+    pointDialog.value.showDialog = true
 }
 
 /**
  * 调整余额
  */
 const adjustBalance = (data: any) => {
-  balanceDialog.value.setFormData(data)
-  balanceDialog.value.showDialog = true
+    balanceDialog.value.setFormData(data)
+    balanceDialog.value.showDialog = true
 }
 
 const router = useRouter()
@@ -491,48 +359,48 @@ const router = useRouter()
  * 积分详情
  */
 const infoPoint = () => {
-  router.push(`/member/point?id=${id}`)
+    router.push(`/member/point?id=${id}`)
 }
 
 /**
  * 余额详情
  */
 const infoBalance = () => {
-  router.push(`/member/balance?id=${id}`)
+    router.push(`/member/balance?id=${id}`)
 }
 
 /**
  * 成长值明细
  */
 const infoGrowth = () => {
-  router.push(`/member/growth?id=${id}`)
+    router.push(`/member/growth?id=${id}`)
 }
 
 /**
  * 佣金详情
  */
 const infoCommission = () => {
-  router.push(`/member/commission?id=${id}`)
+    router.push(`/member/commission?id=${id}`)
 }
 
 const back = () => {
-  if (window.history.length > 1) {
-    router.go(-1)
-  } else {
-    router.push(`/member/member`)
-  }
-}
+    if (window.history.length > 1){
+        router.go(-1)
+    }else{
+        router.push(`/member/member`)
+    }
+        }
 </script>
 
 <style lang="scss" scoped>
-.member-info {
-  left: 0px;
-}
+    .member-info {
+        left: 0px
+    }
 
-.member-info-item {
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  -o-text-overflow: ellipsis;
-}
+    .member-info-item {
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        -o-text-overflow: ellipsis;
+    }
 </style>
diff --git a/admin/src/app/views/member/point.vue b/admin/src/app/views/member/point.vue
index 7c8b47ce..129feeb5 100644
--- a/admin/src/app/views/member/point.vue
+++ b/admin/src/app/views/member/point.vue
@@ -1,215 +1,120 @@
 <template>
-  <!--积分明细-->
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
+    <!--积分明细-->
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
 
-      <el-card class="box-card !border-none !px-[35px]" shadow="never">
-        <el-row class="flex">
-          <el-col :span="12" class="min-w-[100px]">
-            <div class="statistic-card">
-              <el-statistic
-                :value="
-                  pointStatistics.point_get
-                    ? Number.parseInt(pointStatistics.point_get)
-                    : '0'
-                "
-              ></el-statistic>
-              <div class="statistic-footer">
-                <div class="footer-item text-[14px] text-[#666]">
-                  <span>{{ t('pointGet') }}</span>
-                </div>
-              </div>
-            </div>
-          </el-col>
-          <el-col :span="12" class="min-w-[100px]">
-            <div class="statistic-card">
-              <el-statistic
-                :value="
-                  pointStatistics.point_use
-                    ? Number.parseInt(pointStatistics.point_use)
-                    : '0'
-                "
-              ></el-statistic>
-              <div class="statistic-footer">
-                <div class="footer-item text-[14px] text-[#666]">
-                  <span>{{ t('pointUse') }}</span>
-                </div>
-              </div>
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
             </div>
-          </el-col>
-        </el-row>
-      </el-card>
 
-      <el-card
-        class="box-card !border-none mb-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="memberAccountLogTableData.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('memberInfo')" prop="keywords">
-            <el-input
-              v-model.trim="memberAccountLogTableData.searchParam.keywords"
-              class="w-[240px]"
-              :placeholder="t('memberInfoPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('fromType')" prop="from_type">
-            <el-select
-              v-model="memberAccountLogTableData.searchParam.from_type"
-              clearable
-              :placeholder="t('fromTypePlaceholder')"
-              class="input-width"
-            >
-              <el-option :label="t('selectPlaceholder')" value="" />
-              <el-option
-                :label="item.name"
-                :value="key"
-                v-for="(item, key) in fromTypeList"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="t('createTime')" prop="create_time">
-            <el-date-picker
-              v-model="memberAccountLogTableData.searchParam.create_time"
-              type="datetimerange"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              :start-placeholder="t('startDate')"
-              :end-placeholder="t('endDate')"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="loadMemberAccountLogList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
-
-      <div class="mt-[16px]">
-        <el-table
-          :data="memberAccountLogTableData.data"
-          size="large"
-          v-loading="memberAccountLogTableData.loading"
-        >
-          <template #empty>
-            <span>{{
-              !memberAccountLogTableData.loading ? t('emptyData') : ''
-            }}</span>
-          </template>
-
-          <el-table-column
-            prop="member_id"
-            :label="t('memberId')"
-            min-width="80"
-            :show-overflow-tooltip="true"
-          >
-            <template #default="{ row }">
-              {{ row.member.member_no }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            :label="t('memberInfo')"
-            min-width="150"
-            :show-overflow-tooltip="true"
-          >
-            <template #default="{ row }">
-              <div
-                class="flex items-center cursor-pointer"
-                @click="toMember(row.member_id)"
-              >
-                <img
-                  class="w-[50px] h-[50px] mr-[10px]"
-                  v-if="row.member.headimg"
-                  :src="img(row.member.headimg)"
-                  alt=""
-                />
-                <img
-                  class="w-[50px] h-[50px] mr-[10px] rounded-full"
-                  v-else
-                  src="@/app/assets/images/member_head.png"
-                  alt=""
-                />
-                <div class="flex flex flex-col">
-                  <span>{{ row.member.nickname || '' }}</span>
+            <el-card class="box-card !border-none !px-[35px]" shadow="never">
+                <el-row class="flex">
+                    <el-col :span="12" class="min-w-[100px]">
+                        <div class="statistic-card">
+                            <el-statistic :value="pointStatistics.point_get ? Number.parseInt(pointStatistics.point_get) : '0'"></el-statistic>
+                            <div class="statistic-footer">
+                                <div class="footer-item text-[14px] text-[#666]">
+                                    <span>{{ t('pointGet') }}</span>
+                                </div>
+                            </div>
+                        </div>
+                    </el-col>
+                    <el-col :span="12" class="min-w-[100px]">
+                        <div class="statistic-card">
+                            <el-statistic :value="pointStatistics.point_use ? Number.parseInt(pointStatistics.point_use) : '0'"></el-statistic>
+                            <div class="statistic-footer">
+                                <div class="footer-item text-[14px] text-[#666]">
+                                    <span>{{ t('pointUse') }}</span>
+                                </div>
+                            </div>
+                        </div>
+                    </el-col>
+                </el-row>
+            </el-card>
+
+            <el-card class="box-card !border-none mb-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="memberAccountLogTableData.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('memberInfo')" prop="keywords">
+                        <el-input v-model.trim="memberAccountLogTableData.searchParam.keywords" class="w-[240px]" :placeholder="t('memberInfoPlaceholder')" />
+                    </el-form-item>
+                    <el-form-item :label="t('fromType')" prop="from_type">
+                        <el-select v-model="memberAccountLogTableData.searchParam.from_type" clearable :placeholder="t('fromTypePlaceholder')" class="input-width">
+                            <el-option :label="t('selectPlaceholder')" value="" />
+                            <el-option :label="item.name" :value="key" v-for="(item, key) in fromTypeList" />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item :label="t('createTime')" prop="create_time">
+                        <el-date-picker v-model="memberAccountLogTableData.searchParam.create_time" type="datetimerange"
+                            value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')"
+                            :end-placeholder="t('endDate')" />
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="loadMemberAccountLogList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+
+            <div class="mt-[16px]">
+                <el-table :data="memberAccountLogTableData.data" size="large" v-loading="memberAccountLogTableData.loading">
+
+                    <template #empty>
+                        <span>{{ !memberAccountLogTableData.loading ? t('emptyData') : '' }}</span>
+                    </template>
+
+                    <el-table-column prop="member_id" :label="t('memberId')" min-width="80" :show-overflow-tooltip="true">
+                        <template #default="{ row }">
+                            {{ row.member.member_no }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('memberInfo')" min-width="150" :show-overflow-tooltip="true">
+                        <template #default="{ row }">
+                            <div class="flex items-center cursor-pointer" @click="toMember(row.member_id)">
+                                <img class="w-[50px] h-[50px] mr-[10px]" v-if="row.member.headimg" :src="img(row.member.headimg)" alt="">
+                                <img class="w-[50px] h-[50px] mr-[10px] rounded-full" v-else src="@/app/assets/images/member_head.png" alt="">
+                                <div class="flex flex flex-col">
+                                    <span>{{ row.member.nickname || '' }}</span>
+                                </div>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="mobile" :label="t('mobile')" min-width="100">
+                        <template #default="{ row }">
+                            {{ row.member.mobile || '' }}
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column prop="account_data" :label="t('accountData')" min-width="80" align="right">
+                        <template #default="{ row }">
+                            <span v-if="row.account_data >= 0">+{{ row.account_data }}</span>
+                            <span v-else>{{ row.account_data }}</span>
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column prop="account_sum" :label="t('accountSum')" min-width="120" align="right" />
+
+                    <el-table-column prop="from_type_name" :label="t('fromType')" min-width="180" align="center" />
+                    <el-table-column prop="create_time" :show-overflow-tooltip="true" :label="t('createTime')" min-width="150" />
+
+                    <el-table-column :label="t('operation')" align="right" fixed="right" width="100">
+                        <template #default="{ row }">
+                            <el-button type="primary" link @click="infoEvent(row)">{{ t('info') }}</el-button>
+                        </template>
+                    </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="memberAccountLogTableData.page"
+                        v-model:page-size="memberAccountLogTableData.limit" layout="total, sizes, prev, pager, next, jumper"
+                        :total="memberAccountLogTableData.total" @size-change="loadMemberAccountLogList()"
+                        @current-change="loadMemberAccountLogList" />
                 </div>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="mobile" :label="t('mobile')" min-width="100">
-            <template #default="{ row }">
-              {{ row.member.mobile || '' }}
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            prop="account_data"
-            :label="t('accountData')"
-            min-width="80"
-            align="right"
-          >
-            <template #default="{ row }">
-              <span v-if="row.account_data >= 0">+{{ row.account_data }}</span>
-              <span v-else>{{ row.account_data }}</span>
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            prop="account_sum"
-            :label="t('accountSum')"
-            min-width="120"
-            align="right"
-          />
-
-          <el-table-column
-            prop="from_type_name"
-            :label="t('fromType')"
-            min-width="180"
-            align="center"
-          />
-          <el-table-column
-            prop="create_time"
-            :show-overflow-tooltip="true"
-            :label="t('createTime')"
-            min-width="150"
-          />
+            </div>
+        </el-card>
 
-          <el-table-column
-            :label="t('operation')"
-            align="right"
-            fixed="right"
-            width="100"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="infoEvent(row)">{{
-                t('info')
-              }}</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="memberAccountLogTableData.page"
-            v-model:page-size="memberAccountLogTableData.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="memberAccountLogTableData.total"
-            @size-change="loadMemberAccountLogList()"
-            @current-change="loadMemberAccountLogList"
-          />
-        </div>
-      </div>
-    </el-card>
+        <point-info ref="pointDialog" @complete="loadMemberAccountLogList" />
 
-    <point-info ref="pointDialog" @complete="loadMemberAccountLogList" />
-  </div>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -227,18 +132,18 @@ const pageName = route.meta.title
 const member_id: number = parseInt(route.query.id || 0)
 
 const memberAccountLogTableData = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    keywords: '',
-    from_type: '',
-    create_time: '',
-    mobile: '',
-    member_id: member_id,
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        keywords: '',
+        from_type: '',
+        create_time: '',
+        mobile: '',
+        member_id: member_id
+    }
 })
 
 /**
@@ -246,18 +151,18 @@ const memberAccountLogTableData = reactive({
  */
 const pointStatistics = ref([])
 const checkPointInfo = () => {
-  getPointSum({
-    member_id,
-  }).then((res) => {
-    pointStatistics.value = res.data
-  })
+    getPointSum({
+        member_id
+    }).then(res => {
+        pointStatistics.value = res.data
+    })
 }
 checkPointInfo()
 
 const fromTypeList = ref([])
 
 const setFromTypeList = async () => {
-  fromTypeList.value = await (await getChangeTypeList('point')).data
+    fromTypeList.value = await (await getChangeTypeList('point')).data
 }
 
 setFromTypeList()
@@ -265,9 +170,9 @@ setFromTypeList()
 const searchFormRef = ref<FormInstance>()
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadMemberAccountLogList()
+    if (!formEl) return
+    formEl.resetFields()
+    loadMemberAccountLogList()
 }
 
 /**
@@ -275,21 +180,19 @@ const resetForm = (formEl: FormInstance | undefined) => {
  * 获取会员账单表列表
  */
 const loadMemberAccountLogList = (page: number = 1) => {
-  memberAccountLogTableData.loading = true
-  memberAccountLogTableData.page = page
-
-  getPointList({
-    page: memberAccountLogTableData.page,
-    limit: memberAccountLogTableData.limit,
-    ...memberAccountLogTableData.searchParam,
-  })
-    .then((res) => {
-      memberAccountLogTableData.loading = false
-      memberAccountLogTableData.data = res.data.data
-      memberAccountLogTableData.total = res.data.total
-    })
-    .catch(() => {
-      memberAccountLogTableData.loading = false
+    memberAccountLogTableData.loading = true
+    memberAccountLogTableData.page = page
+
+    getPointList({
+        page: memberAccountLogTableData.page,
+        limit: memberAccountLogTableData.limit,
+        ...memberAccountLogTableData.searchParam
+    }).then(res => {
+        memberAccountLogTableData.loading = false
+        memberAccountLogTableData.data = res.data.data
+        memberAccountLogTableData.total = res.data.total
+    }).catch(() => {
+        memberAccountLogTableData.loading = false
     })
 }
 loadMemberAccountLogList()
@@ -301,8 +204,8 @@ const pointDialog: Record<string, any> | null = ref(null)
  * @param data
  */
 const infoEvent = (data: any) => {
-  pointDialog.value.setFormData(data)
-  pointDialog.value.showDialog = true
+    pointDialog.value.setFormData(data)
+    pointDialog.value.showDialog = true
 }
 
 const router = useRouter()
@@ -311,7 +214,7 @@ const router = useRouter()
  * 会员详情
  */
 const toMember = (member_id: number) => {
-  router.push(`/member/detail?id=${member_id}`)
+    router.push(`/member/detail?id=${member_id}`)
 }
 </script>
 
diff --git a/admin/src/app/views/physical_testing/components/Jump-lesson-library-edit.vue b/admin/src/app/views/physical_testing/components/Jump-lesson-library-edit.vue
new file mode 100644
index 00000000..7f390d43
--- /dev/null
+++ b/admin/src/app/views/physical_testing/components/Jump-lesson-library-edit.vue
@@ -0,0 +1,229 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('updateJumpLessonLibrary') : t('addJumpLessonLibrary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addJumpLessonLibrary, editJumpLessonLibrary, getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+import { addPublicLibraryList, editPublicLibraryList } from '@/app/api/future_ontent'
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: '',
+  table_type: 24
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+// ,
+//     user_permission: [
+//         { required: true, message: t('userPermissionPlaceholder'), trigger: 'blur' },
+//
+//     ]
+
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editPublicLibraryList : addPublicLibraryList
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+          data.table_type = 24
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/physical_testing/components/basketball-course-teaching-edit.vue b/admin/src/app/views/physical_testing/components/basketball-course-teaching-edit.vue
new file mode 100644
index 00000000..573cba88
--- /dev/null
+++ b/admin/src/app/views/physical_testing/components/basketball-course-teaching-edit.vue
@@ -0,0 +1,224 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('editBasketballTeachingLibrary') : t('addBasketballTeachingLibrary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addBasketballTeachingLibrary, editBasketballTeachingLibrary, getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+import { addPublicLibraryList, editPublicLibraryList } from '@/app/api/future_ontent'
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+  status: '',
+  table_type: 26
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editPublicLibraryList : addPublicLibraryList
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+            data.table_type = 26
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/physical_testing/components/en-course-teaching-edit.vue b/admin/src/app/views/physical_testing/components/en-course-teaching-edit.vue
new file mode 100644
index 00000000..351bfa40
--- /dev/null
+++ b/admin/src/app/views/physical_testing/components/en-course-teaching-edit.vue
@@ -0,0 +1,223 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('editEnTeachingLibrary') : t('addEnTeachingLibrary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addEnTeachingLibrary, editEnTeachingLibrary, getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+import { addPublicLibraryList, editPublicLibraryList } from '@/app/api/future_ontent'
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: '',
+  table_type: 25
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editPublicLibraryList : addPublicLibraryList
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+          data.table_type = 25
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/physical_testing/components/lesson-course-teaching-edit.vue b/admin/src/app/views/physical_testing/components/lesson-course-teaching-edit.vue
new file mode 100644
index 00000000..02fbe4d1
--- /dev/null
+++ b/admin/src/app/views/physical_testing/components/lesson-course-teaching-edit.vue
@@ -0,0 +1,224 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('updateLessonCourseTeaching') : t('addLessonCourseTeaching')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+
+import { addPublicLibraryList, editPublicLibraryList } from '@/app/api/future_ontent'
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: ''
+    // user_permission: [],
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editPublicLibraryList : addPublicLibraryList
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+            data.table_type = 23
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/physical_testing/components/ninja-teaching-edit.vue b/admin/src/app/views/physical_testing/components/ninja-teaching-edit.vue
new file mode 100644
index 00000000..7ac26150
--- /dev/null
+++ b/admin/src/app/views/physical_testing/components/ninja-teaching-edit.vue
@@ -0,0 +1,224 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('editNinjaTeachingLibrary') : t('addNinjaTeachingLibrary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addNinjaTeachingLibrary, editNinjaTeachingLibrary, getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+import { addPublicLibraryList, editPublicLibraryList } from '@/app/api/future_ontent'
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: '',
+  table_type: 21
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editPublicLibraryList : addPublicLibraryList
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+          data.table_type = 21
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/physical_testing/components/physical-teaching-edit.vue b/admin/src/app/views/physical_testing/components/physical-teaching-edit.vue
new file mode 100644
index 00000000..2c53ea49
--- /dev/null
+++ b/admin/src/app/views/physical_testing/components/physical-teaching-edit.vue
@@ -0,0 +1,223 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('editPhysicalTeachingLibrary') : t('addPhysicalTeachingLibrary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addPhysicalTeachingLibrary, editPhysicalTeachingLibrary, getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: ''
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editPhysicalTeachingLibrary : addPhysicalTeachingLibrary
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/physical_testing/components/security-teaching-edit.vue b/admin/src/app/views/physical_testing/components/security-teaching-edit.vue
new file mode 100644
index 00000000..5cda7ef5
--- /dev/null
+++ b/admin/src/app/views/physical_testing/components/security-teaching-edit.vue
@@ -0,0 +1,224 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('editSecurityTeachingLibrary') : t('addSecurityTeachingLibrary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addSecurityTeachingLibrary, editSecurityTeachingLibrary, getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+import { addPublicLibraryList, editPublicLibraryList } from '@/app/api/future_ontent'
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: '',
+  table_type: 22
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editPublicLibraryList : addPublicLibraryList
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+          data.table_type = 22
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/physical_testing/components/strengthen-course-teaching-edit.vue b/admin/src/app/views/physical_testing/components/strengthen-course-teaching-edit.vue
new file mode 100644
index 00000000..95b8d9f3
--- /dev/null
+++ b/admin/src/app/views/physical_testing/components/strengthen-course-teaching-edit.vue
@@ -0,0 +1,223 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('editStrengthenTeachingLibrary') : t('addStrengthenTeachingLibrary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addStrengTeachingLibrary, editStrengTeachingLibrary, getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+import { addPublicLibraryList, editPublicLibraryList } from '@/app/api/future_ontent'
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: '',
+  table_type: 20
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editPublicLibraryList : addPublicLibraryList
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+          data.table_type = 20
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/physical_testing/physical_testing.vue b/admin/src/app/views/physical_testing/physical_testing.vue
new file mode 100644
index 00000000..da1de592
--- /dev/null
+++ b/admin/src/app/views/physical_testing/physical_testing.vue
@@ -0,0 +1,724 @@
+<template>
+  <div class="main-container">
+    <el-card class="box-card !border-none" shadow="never">
+      <el-tabs v-model="active">
+        <el-tab-pane label="3-6岁体测" name="CourseSyllabus">
+          <div class="flex justify-between items-center">
+            <el-button type="primary" @click="addEvent">
+              {{ t('addLessonCourseTeaching') }}
+            </el-button>
+          </div>
+          <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+            <el-form :inline="true" :model="lessonCourseTeachingTable.searchParam" ref="searchFormRef">
+              <el-form-item :label="t('title')" prop="title">
+                <el-input v-model="lessonCourseTeachingTable.searchParam.title" :placeholder="t('titlePlaceholder')" />
+              </el-form-item>
+
+              <el-form-item :label="t('status')" prop="status">
+                <el-select class="w-[280px]" v-model="lessonCourseTeachingTable.searchParam.status" clearable :placeholder="t('statusPlaceholder')">
+                  <el-option label="全部" value=""></el-option>
+                  <el-option
+                      v-for="(item, index) in statusList"
+                      :key="index"
+                      :label="item.name"
+                      :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+
+              <el-form-item :label="t('createTime')" prop="create_time">
+                <el-date-picker v-model="lessonCourseTeachingTable.searchParam.create_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+              </el-form-item>
+
+              <el-form-item :label="t('updateTime')" prop="update_time">
+                <el-date-picker v-model="lessonCourseTeachingTable.searchParam.update_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+              </el-form-item>
+
+              <el-form-item>
+                <el-button type="primary" @click="loadLessonCourseTeachingList()">{{ t('search') }}</el-button>
+                <el-button @click="resetForm(searchFormRef, 23)">{{ t('reset') }}</el-button>
+              </el-form-item>
+            </el-form>
+          </el-card>
+
+          <div class="mt-[10px]">
+            <el-table :data="lessonCourseTeachingTable.data" size="large" v-loading="lessonCourseTeachingTable.loading">
+              <template #empty>
+                <span>{{ !lessonCourseTeachingTable.loading ? t('emptyData') : '' }}</span>
+              </template>
+              <el-table-column prop="title" :label="t('title')" min-width="120" :show-overflow-tooltip="true"/>
+
+              <el-table-column :label="t('image')" width="100" align="left">
+                <template #default="{ row }">
+                  <el-avatar v-if="row.image" :src="img(row.image)" />
+                  <el-avatar v-else icon="UserFilled" />
+                </template>
+              </el-table-column>
+              <el-table-column :label="t('type')" min-width="180" align="center" :show-overflow-tooltip="true">
+                <template #default="{ row }">
+                  <div v-for="(item, index) in typeList">
+                    <div v-if="item.value == row.type">{{ item.name }}</div>
+                  </div>
+                </template>
+              </el-table-column>
+
+              <el-table-column :label="t('status')" min-width="180" align="center" :show-overflow-tooltip="true">
+                <template #default="{ row }">
+                  <div v-for="(item, index) in statusList">
+                    <div v-if="item.value == row.status">{{ item.name }}</div>
+                  </div>
+                </template>
+              </el-table-column>
+
+              <el-table-column :label="t('operation')" fixed="right" min-width="120">
+                <template #default="{ row }">
+                  <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+                  <el-button type="primary" link @click="deleteEvent(row.id, 23)">{{ t('delete') }}</el-button>
+                </template>
+              </el-table-column>
+
+            </el-table>
+            <div class="mt-[16px] flex justify-end">
+              <el-pagination v-model:current-page="lessonCourseTeachingTable.page" v-model:page-size="lessonCourseTeachingTable.limit"
+                             layout="total, sizes, prev, pager, next, jumper" :total="lessonCourseTeachingTable.total"
+                             @size-change="loadLessonCourseTeachingList()" @current-change="loadLessonCourseTeachingList" />
+            </div>
+          </div>
+
+          <edit ref="editLessonCourseTeachingDialog" @complete="loadLessonCourseTeachingList" />
+        </el-tab-pane>
+        <el-tab-pane label="7+体测" name="JumpLessonLibrary">
+          <div class="flex justify-between items-center">
+            <el-button type="primary" @click="addJumpLessonLibrary">
+              {{ t('addJumpLessonLibrary') }}
+            </el-button>
+          </div>
+          <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+            <el-form :inline="true" :model="JumpLessonLibraryTable.searchParam" ref="searchFormRef">
+              <el-form-item :label="t('title')" prop="title">
+                <el-input v-model="JumpLessonLibraryTable.searchParam.title" :placeholder="t('titlePlaceholder')" />
+              </el-form-item>
+
+              <el-form-item :label="t('status')" prop="status">
+                <el-select class="w-[280px]" v-model="JumpLessonLibraryTable.searchParam.status" clearable :placeholder="t('statusPlaceholder')">
+                  <el-option label="全部" value=""></el-option>
+                  <el-option
+                      v-for="(item, index) in statusList"
+                      :key="index"
+                      :label="item.name"
+                      :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+
+              <el-form-item :label="t('createTime')" prop="create_time">
+                <el-date-picker v-model="JumpLessonLibraryTable.searchParam.create_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+              </el-form-item>
+
+              <el-form-item :label="t('updateTime')" prop="update_time">
+                <el-date-picker v-model="JumpLessonLibraryTable.searchParam.update_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+              </el-form-item>
+
+              <el-form-item>
+                <el-button type="primary" @click="loadJumpLessonLibraryList()">{{ t('search') }}</el-button>
+                <el-button @click="resetForm(searchFormRef, 24)">{{ t('reset') }}</el-button>
+              </el-form-item>
+            </el-form>
+          </el-card>
+
+          <div class="mt-[10px]">
+            <el-table :data="JumpLessonLibraryTable.data" size="large" v-loading="JumpLessonLibraryTable.loading">
+              <template #empty>
+                <span>{{ !JumpLessonLibraryTable.loading ? t('emptyData') : '' }}</span>
+              </template>
+              <el-table-column prop="title" :label="t('title')" min-width="120" :show-overflow-tooltip="true"/>
+
+              <el-table-column :label="t('image')" width="100" align="left">
+                <template #default="{ row }">
+                  <el-avatar v-if="row.image" :src="img(row.image)" />
+                  <el-avatar v-else icon="UserFilled" />
+                </template>
+              </el-table-column>
+              <el-table-column :label="t('type')" min-width="180" align="center" :show-overflow-tooltip="true">
+                <template #default="{ row }">
+                  <div v-for="(item, index) in typeList">
+                    <div v-if="item.value == row.type">{{ item.name }}</div>
+                  </div>
+                </template>
+              </el-table-column>
+
+              <el-table-column :label="t('status')" min-width="180" align="center" :show-overflow-tooltip="true">
+                <template #default="{ row }">
+                  <div v-for="(item, index) in statusList">
+                    <div v-if="item.value == row.status">{{ item.name }}</div>
+                  </div>
+                </template>
+              </el-table-column>
+
+              <el-table-column :label="t('operation')" fixed="right" min-width="120">
+                <template #default="{ row }">
+                  <el-button type="primary" link @click="editJumpLessonLibrary(row)">{{ t('edit') }}</el-button>
+                  <el-button type="primary" link @click="deleteEvent(row.id, 24)">{{ t('delete') }}</el-button>
+                </template>
+              </el-table-column>
+
+            </el-table>
+            <div class="mt-[16px] flex justify-end">
+              <el-pagination v-model:current-page="JumpLessonLibraryTable.page" v-model:page-size="JumpLessonLibraryTable.limit"
+                             layout="total, sizes, prev, pager, next, jumper" :total="JumpLessonLibraryTable.total"
+                             @size-change="loadJumpLessonLibraryList()" @current-change="loadJumpLessonLibraryList" />
+            </div>
+          </div>
+
+          <edit-jump ref="editJumpLessonLibraryDialog" @complete="loadJumpLessonLibraryList" />
+        </el-tab-pane>
+        <el-tab-pane label="3-6岁体测讲解—解读" name="EnTeachingLibrary">
+          <div class="flex justify-between items-center">
+            <el-button type="primary" @click="addEnTeachingLibrary">
+              {{ t('addEnTeachingLibrary') }}
+            </el-button>
+          </div>
+          <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+            <el-form :inline="true" :model="EnTeachingLibraryTable.searchParam" ref="searchFormRef">
+              <el-form-item :label="t('title')" prop="title">
+                <el-input v-model="EnTeachingLibraryTable.searchParam.title" :placeholder="t('titlePlaceholder')" />
+              </el-form-item>
+
+              <el-form-item :label="t('status')" prop="status">
+                <el-select class="w-[280px]" v-model="EnTeachingLibraryTable.searchParam.status" clearable :placeholder="t('statusPlaceholder')">
+                  <el-option label="全部" value=""></el-option>
+                  <el-option
+                      v-for="(item, index) in statusList"
+                      :key="index"
+                      :label="item.name"
+                      :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+
+              <el-form-item :label="t('createTime')" prop="create_time">
+                <el-date-picker v-model="EnTeachingLibraryTable.searchParam.create_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+              </el-form-item>
+
+              <el-form-item :label="t('updateTime')" prop="update_time">
+                <el-date-picker v-model="EnTeachingLibraryTable.searchParam.update_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+              </el-form-item>
+
+              <el-form-item>
+                <el-button type="primary" @click="loadEnTeachingLibraryList()">{{ t('search') }}</el-button>
+                <el-button @click="resetForm(searchFormRef, 25)">{{ t('reset') }}</el-button>
+              </el-form-item>
+            </el-form>
+          </el-card>
+
+          <div class="mt-[10px]">
+            <el-table :data="EnTeachingLibraryTable.data" size="large" v-loading="EnTeachingLibraryTable.loading">
+              <template #empty>
+                <span>{{ !EnTeachingLibraryTable.loading ? t('emptyData') : '' }}</span>
+              </template>
+              <el-table-column prop="title" :label="t('title')" min-width="120" :show-overflow-tooltip="true"/>
+
+              <el-table-column :label="t('image')" width="100" align="left">
+                <template #default="{ row }">
+                  <el-avatar v-if="row.image" :src="img(row.image)" />
+                  <el-avatar v-else icon="UserFilled" />
+                </template>
+              </el-table-column>
+              <el-table-column :label="t('type')" min-width="180" align="center" :show-overflow-tooltip="true">
+                <template #default="{ row }">
+                  <div v-for="(item, index) in typeList">
+                    <div v-if="item.value == row.type">{{ item.name }}</div>
+                  </div>
+                </template>
+              </el-table-column>
+
+              <el-table-column :label="t('status')" min-width="180" align="center" :show-overflow-tooltip="true">
+                <template #default="{ row }">
+                  <div v-for="(item, index) in statusList">
+                    <div v-if="item.value == row.status">{{ item.name }}</div>
+                  </div>
+                </template>
+              </el-table-column>
+
+              <el-table-column :label="t('operation')" fixed="right" min-width="120">
+                <template #default="{ row }">
+                  <el-button type="primary" link @click="editEnTeachingLibrary(row)">{{ t('edit') }}</el-button>
+                  <el-button type="primary" link @click="deleteEvent(row.id, 25)">{{ t('delete') }}</el-button>
+                </template>
+              </el-table-column>
+
+            </el-table>
+            <div class="mt-[16px] flex justify-end">
+              <el-pagination v-model:current-page="EnTeachingLibraryTable.page" v-model:page-size="EnTeachingLibraryTable.limit"
+                             layout="total, sizes, prev, pager, next, jumper" :total="EnTeachingLibraryTable.total"
+                             @size-change="loadEnTeachingLibraryList()" @current-change="loadEnTeachingLibraryList" />
+            </div>
+          </div>
+
+          <edit-en ref="editEnTeachingLibraryDialog" @complete="loadEnTeachingLibraryList" />
+        </el-tab-pane>
+        <el-tab-pane label="7+岁体测讲解—解读" name="BasketballTeachingLibrary">
+          <div class="flex justify-between items-center">
+            <el-button type="primary" @click="addBasketballTeachingLibrary">
+              {{ t('addBasketballTeachingLibrary') }}
+            </el-button>
+          </div>
+          <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+            <el-form :inline="true" :model="BasketballTeachingLibraryTable.searchParam" ref="searchFormRef">
+              <el-form-item :label="t('title')" prop="title">
+                <el-input v-model="BasketballTeachingLibraryTable.searchParam.title" :placeholder="t('titlePlaceholder')" />
+              </el-form-item>
+
+              <el-form-item :label="t('status')" prop="status">
+                <el-select class="w-[280px]" v-model="BasketballTeachingLibraryTable.searchParam.status" clearable :placeholder="t('statusPlaceholder')">
+                  <el-option label="全部" value=""></el-option>
+                  <el-option
+                      v-for="(item, index) in statusList"
+                      :key="index"
+                      :label="item.name"
+                      :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+
+              <el-form-item :label="t('createTime')" prop="create_time">
+                <el-date-picker v-model="BasketballTeachingLibraryTable.searchParam.create_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+              </el-form-item>
+
+              <el-form-item :label="t('updateTime')" prop="update_time">
+                <el-date-picker v-model="BasketballTeachingLibraryTable.searchParam.update_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+              </el-form-item>
+
+              <el-form-item>
+                <el-button type="primary" @click="loadBasketballTeachingLibraryList()">{{ t('search') }}</el-button>
+                <el-button @click="resetForm(searchFormRef, 26)">{{ t('reset') }}</el-button>
+              </el-form-item>
+            </el-form>
+          </el-card>
+
+          <div class="mt-[10px]">
+            <el-table :data="BasketballTeachingLibraryTable.data" size="large" v-loading="BasketballTeachingLibraryTable.loading">
+              <template #empty>
+                <span>{{ !BasketballTeachingLibraryTable.loading ? t('emptyData') : '' }}</span>
+              </template>
+              <el-table-column prop="title" :label="t('title')" min-width="120" :show-overflow-tooltip="true"/>
+
+              <el-table-column :label="t('image')" width="100" align="left">
+                <template #default="{ row }">
+                  <el-avatar v-if="row.image" :src="img(row.image)" />
+                  <el-avatar v-else icon="UserFilled" />
+                </template>
+              </el-table-column>
+              <el-table-column :label="t('type')" min-width="180" align="center" :show-overflow-tooltip="true">
+                <template #default="{ row }">
+                  <div v-for="(item, index) in typeList">
+                    <div v-if="item.value == row.type">{{ item.name }}</div>
+                  </div>
+                </template>
+              </el-table-column>
+
+              <el-table-column :label="t('status')" min-width="180" align="center" :show-overflow-tooltip="true">
+                <template #default="{ row }">
+                  <div v-for="(item, index) in statusList">
+                    <div v-if="item.value == row.status">{{ item.name }}</div>
+                  </div>
+                </template>
+              </el-table-column>
+
+              <el-table-column :label="t('operation')" fixed="right" min-width="120">
+                <template #default="{ row }">
+                  <el-button type="primary" link @click="editBasketballTeachingLibrary(row)">{{ t('edit') }}</el-button>
+                  <el-button type="primary" link @click="deleteEvent(row.id, 26)">{{ t('delete') }}</el-button>
+                </template>
+              </el-table-column>
+
+            </el-table>
+            <div class="mt-[16px] flex justify-end">
+              <el-pagination v-model:current-page="BasketballTeachingLibraryTable.page" v-model:page-size="BasketballTeachingLibraryTable.limit"
+                             layout="total, sizes, prev, pager, next, jumper" :total="BasketballTeachingLibraryTable.total"
+                             @size-change="loadBasketballTeachingLibraryList()" @current-change="loadBasketballTeachingLibraryList" />
+            </div>
+          </div>
+
+          <edit-basketball ref="editBasketballTeachingLibraryDialog" @complete="loadBasketballTeachingLibraryList" />
+        </el-tab-pane>
+      </el-tabs>
+    </el-card>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { reactive, ref, watch } from 'vue'
+import { t } from '@/lang'
+import { useDictionary } from '@/app/api/dict'
+import { getLessonCourseTeachingList, deleteLessonCourseTeaching, getWithPersonnelDataList, getJumpLessonLibraryList, getEnTeachingLibraryList, getBasketballTeachingLibraryList, getStrengTeachingLibraryList, getNinjaTeachingLibraryList, getSecurityTeachingLibraryList, getPhysicalTeachingLibraryList } from '@/app/api/lesson_course_teaching'
+import { img } from '@/utils/common'
+import { ElMessageBox,FormInstance } from 'element-plus'
+import Edit from '@/app/views/physical_testing/components/lesson-course-teaching-edit.vue'
+import EditJump from '@/app/views/physical_testing/components/Jump-lesson-library-edit.vue'
+import EditEn from '@/app/views/physical_testing/components/en-course-teaching-edit.vue'
+import EditBasketball from '@/app/views/physical_testing/components/basketball-course-teaching-edit.vue'
+import { useRoute } from 'vue-router'
+const route = useRoute()
+const pageName = route.meta.title;
+const active = 'CourseSyllabus'
+
+let lessonCourseTeachingTable = reactive({
+  page: 1,
+  limit: 10,
+  total: 0,
+  loading: true,
+  data: [],
+  searchParam:{
+    "title":"",
+    "status":"",
+    "create_time":[],
+    "update_time":[],
+    table_type: 23
+  }
+})
+let JumpLessonLibraryTable = reactive({
+  page: 1,
+  limit: 10,
+  total: 0,
+  loading: true,
+  data: [],
+  searchParam:{
+    "title":"",
+    "status":"",
+    "create_time":[],
+    "update_time":[],
+    table_type: 24
+  }
+})
+let EnTeachingLibraryTable = reactive({
+  page: 1,
+  limit: 10,
+  total: 0,
+  loading: true,
+  data: [],
+  searchParam:{
+    "title":"",
+    "status":"",
+    "create_time":[],
+    "update_time":[],
+    table_type: 25
+  }
+})
+let BasketballTeachingLibraryTable = reactive({
+  page: 1,
+  limit: 10,
+  total: 0,
+  loading: true,
+  data: [],
+  searchParam:{
+    "title":"",
+    "status":"",
+    "create_time":[],
+    "update_time":[],
+    table_type: 26
+  }
+})
+
+const searchFormRef = ref<FormInstance>()
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 字典数据
+const typeList = ref([] as any[])
+const typeDictList = async () => {
+  typeList.value = await (await useDictionary('material_type')).data.dictionary
+}
+typeDictList();
+const statusList = ref([] as any[])
+const statusDictList = async () => {
+  statusList.value = await (await useDictionary('course_status')).data.dictionary
+}
+statusDictList();
+
+const editLessonCourseTeachingDialog: Record<string, any> | null = ref(null)
+const editJumpLessonLibraryDialog: Record<string, any> | null = ref(null)
+const editEnTeachingLibraryDialog: Record<string, any> | null = ref(null)
+const editBasketballTeachingLibraryDialog: Record<string, any> | null = ref(null)
+
+/**
+ * 获取课程教学大纲列表
+ */
+const loadLessonCourseTeachingList = (page: number = 1) => {
+  lessonCourseTeachingTable.loading = true
+  lessonCourseTeachingTable.page = page
+
+  getLessonCourseTeachingList({
+    page: lessonCourseTeachingTable.page,
+    limit: lessonCourseTeachingTable.limit,
+    ...lessonCourseTeachingTable.searchParam
+  }).then(res => {
+    lessonCourseTeachingTable.loading = false
+    lessonCourseTeachingTable.data = res.data.data
+    lessonCourseTeachingTable.total = res.data.total
+  }).catch(() => {
+    lessonCourseTeachingTable.loading = false
+  })
+}
+loadLessonCourseTeachingList()
+
+/**
+ * 添加课程教学大纲
+ */
+const addEvent = () => {
+  editLessonCourseTeachingDialog.value.setFormData()
+  editLessonCourseTeachingDialog.value.showDialog = true
+}
+
+/**
+ * 编辑课程教学大纲
+ * @param data
+ */
+const editEvent = (data: any) => {
+  editLessonCourseTeachingDialog.value.setFormData(data)
+  editLessonCourseTeachingDialog.value.showDialog = true
+}
+
+
+/**
+ * 获取跳绳教案库列表
+ */
+const loadJumpLessonLibraryList = (page: number = 1) => {
+  JumpLessonLibraryTable.loading = true
+  JumpLessonLibraryTable.page = page
+
+  getJumpLessonLibraryList({
+    page: JumpLessonLibraryTable.page,
+    limit: JumpLessonLibraryTable.limit,
+    ...JumpLessonLibraryTable.searchParam
+  }).then(res => {
+    JumpLessonLibraryTable.loading = false
+    JumpLessonLibraryTable.data = res.data.data
+    JumpLessonLibraryTable.total = res.data.total
+  }).catch(() => {
+    JumpLessonLibraryTable.loading = false
+  })
+}
+loadJumpLessonLibraryList()
+
+/**
+ * 添加跳绳教案库
+ */
+const addJumpLessonLibrary = () => {
+  editJumpLessonLibraryDialog.value.setFormData()
+  editJumpLessonLibraryDialog.value.showDialog = true
+}
+
+/**
+ * 编辑跳绳教案库
+ * @param data
+ */
+const editJumpLessonLibrary = (data: any) => {
+  editJumpLessonLibraryDialog.value.setFormData(data)
+  editJumpLessonLibraryDialog.value.showDialog = true
+}
+
+
+/**
+ * 获取增高教案库列表
+ */
+const loadEnTeachingLibraryList = (page: number = 1) => {
+  EnTeachingLibraryTable.loading = true
+  EnTeachingLibraryTable.page = page
+
+  getEnTeachingLibraryList({
+    page: EnTeachingLibraryTable.page,
+    limit: EnTeachingLibraryTable.limit,
+    ...EnTeachingLibraryTable.searchParam
+  }).then(res => {
+    EnTeachingLibraryTable.loading = false
+    EnTeachingLibraryTable.data = res.data.data
+    EnTeachingLibraryTable.total = res.data.total
+  }).catch(() => {
+    EnTeachingLibraryTable.loading = false
+  })
+}
+loadEnTeachingLibraryList()
+
+/**
+ * 添加增高教案库
+ */
+const addEnTeachingLibrary = () => {
+  editEnTeachingLibraryDialog.value.setFormData()
+  editEnTeachingLibraryDialog.value.showDialog = true
+}
+
+/**
+ * 编辑增高教案库
+ * @param data
+ */
+const editEnTeachingLibrary = (data: any) => {
+  editEnTeachingLibraryDialog.value.setFormData(data)
+  editEnTeachingLibraryDialog.value.showDialog = true
+}
+
+/**
+ * 获取篮球教案库列表
+ */
+const loadBasketballTeachingLibraryList = (page: number = 1) => {
+  BasketballTeachingLibraryTable.loading = true
+  BasketballTeachingLibraryTable.page = page
+
+  getBasketballTeachingLibraryList({
+    page: BasketballTeachingLibraryTable.page,
+    limit: BasketballTeachingLibraryTable.limit,
+    ...BasketballTeachingLibraryTable.searchParam
+  }).then(res => {
+    BasketballTeachingLibraryTable.loading = false
+    BasketballTeachingLibraryTable.data = res.data.data
+    BasketballTeachingLibraryTable.total = res.data.total
+  }).catch(() => {
+    BasketballTeachingLibraryTable.loading = false
+  })
+}
+loadBasketballTeachingLibraryList()
+
+/**
+ * 添加篮球教案库
+ */
+const addBasketballTeachingLibrary = () => {
+  editBasketballTeachingLibraryDialog.value.setFormData()
+  editBasketballTeachingLibraryDialog.value.showDialog = true
+}
+
+/**
+ * 编辑篮球教案库
+ * @param data
+ */
+const editBasketballTeachingLibrary = (data: any) => {
+  editBasketballTeachingLibraryDialog.value.setFormData(data)
+  editBasketballTeachingLibraryDialog.value.showDialog = true
+}
+
+
+
+
+/**
+ * 删除教研管理
+ */
+const deleteEvent = (id: number, type: number) => {
+  ElMessageBox.confirm(t('lessonCourseTeachingDeleteTips'), t('warning'),
+      {
+        confirmButtonText: t('confirm'),
+        cancelButtonText: t('cancel'),
+        type: 'warning',
+      }
+  ).then(() => {
+    deleteLessonCourseTeaching(id).then(() => {
+      if (type === 23) {
+        loadLessonCourseTeachingList()
+      } else if (type === 24) {
+        loadJumpLessonLibraryList()
+      } else if (type === 25) {
+        loadEnTeachingLibraryList()
+      } else if (type === 26) {
+        loadBasketballTeachingLibraryList()
+      }
+    }).catch(() => {
+    })
+  })
+}
+
+
+const userPermissionList = ref([])
+const setUserPermissionList = async () => {
+  userPermissionList.value = await (await getWithPersonnelDataList({})).data
+}
+setUserPermissionList()
+
+const resetForm = (formEl: FormInstance | undefined, type: number) => {
+  if (!formEl) return
+  formEl.resetFields()
+  if (type === 23) {
+    lessonCourseTeachingTable = reactive({
+      page: 1,
+      limit: 10,
+      total: 0,
+      loading: true,
+      data: [],
+      searchParam: {
+        "title": "",
+        "status": "",
+        "create_time": [],
+        "update_time": [],
+        table_type: 23
+      }
+    })
+    loadLessonCourseTeachingList()
+  } else if (type === 24) {
+    JumpLessonLibraryTable = reactive({
+      page: 1,
+      limit: 10,
+      total: 0,
+      loading: true,
+      data: [],
+      searchParam: {
+        "title": "",
+        "status": "",
+        "create_time": [],
+        "update_time": [],
+        table_type: 24
+      }
+    })
+    loadJumpLessonLibraryList()
+  } else if (type === 25) {
+    EnTeachingLibraryTable = reactive({
+      page: 1,
+      limit: 10,
+      total: 0,
+      loading: true,
+      data: [],
+      searchParam: {
+        "title": "",
+        "status": "",
+        "create_time": [],
+        "update_time": [],
+        table_type: 25
+      }
+    })
+    loadEnTeachingLibraryList()
+  } else if (type === 26) {
+    BasketballTeachingLibraryTable = reactive({
+      page: 1,
+      limit: 10,
+      total: 0,
+      loading: true,
+      data: [],
+      searchParam: {
+        "title": "",
+        "status": "",
+        "create_time": [],
+        "update_time": [],
+        table_type: 26
+      }
+    })
+    loadBasketballTeachingLibraryList()
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+/* 多行超出隐藏 */
+.multi-hidden {
+  word-break: break-all;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+}
+</style>
diff --git a/admin/src/app/views/poster/components/edit-draw.vue b/admin/src/app/views/poster/components/edit-draw.vue
index bf936a62..7ccae935 100644
--- a/admin/src/app/views/poster/components/edit-draw.vue
+++ b/admin/src/app/views/poster/components/edit-draw.vue
@@ -1,9 +1,11 @@
 <template>
-  <!-- 属性内容 -->
-  <div class="content-wrap">
-    <!-- 组件公共属性 -->
-    <slot name="common"></slot>
-  </div>
+	<!-- 属性内容 -->
+	<div class="content-wrap">
+
+		<!-- 组件公共属性 -->
+		 <slot name="common"></slot>
+
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -14,6 +16,7 @@ import usePosterStore from '@/stores/modules/poster'
 const posterStore = usePosterStore()
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/poster/components/edit-friendspay-message.vue b/admin/src/app/views/poster/components/edit-friendspay-message.vue
index bf936a62..39ea162a 100644
--- a/admin/src/app/views/poster/components/edit-friendspay-message.vue
+++ b/admin/src/app/views/poster/components/edit-friendspay-message.vue
@@ -1,9 +1,11 @@
 <template>
-  <!-- 属性内容 -->
-  <div class="content-wrap">
-    <!-- 组件公共属性 -->
-    <slot name="common"></slot>
-  </div>
+	<!-- 属性内容 -->
+	<div class="content-wrap">
+
+		<!-- 组件公共属性 -->
+		<slot name="common"></slot>
+
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -14,6 +16,7 @@ import usePosterStore from '@/stores/modules/poster'
 const posterStore = usePosterStore()
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/poster/components/edit-friendspay-money.vue b/admin/src/app/views/poster/components/edit-friendspay-money.vue
index bf936a62..39ea162a 100644
--- a/admin/src/app/views/poster/components/edit-friendspay-money.vue
+++ b/admin/src/app/views/poster/components/edit-friendspay-money.vue
@@ -1,9 +1,11 @@
 <template>
-  <!-- 属性内容 -->
-  <div class="content-wrap">
-    <!-- 组件公共属性 -->
-    <slot name="common"></slot>
-  </div>
+	<!-- 属性内容 -->
+	<div class="content-wrap">
+
+		<!-- 组件公共属性 -->
+		<slot name="common"></slot>
+
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -14,6 +16,7 @@ import usePosterStore from '@/stores/modules/poster'
 const posterStore = usePosterStore()
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/poster/components/edit-headimg.vue b/admin/src/app/views/poster/components/edit-headimg.vue
index cc5775fe..b733dab3 100644
--- a/admin/src/app/views/poster/components/edit-headimg.vue
+++ b/admin/src/app/views/poster/components/edit-headimg.vue
@@ -1,35 +1,22 @@
 <template>
-  <!-- 属性内容 -->
-  <div class="content-wrap">
-    <div class="edit-attr-item-wrap">
-      <div class="mb-[10px] text-sm text-primary">{{ t('needLoginTips') }}</div>
-    </div>
-
-    <!-- 组件公共属性 -->
-    <slot name="common"></slot>
-    <el-form label-width="80px" class="px-[10px]">
-      <el-form-item :label="t('imgShape')">
-        <div class="flex items-center">
-          <div
-            class="bg-[#DFDFDF] cursor-pointer w-[50px] h-[50px] border-solid border-[1px] border-transparent rounded-[50%]"
-            :class="{
-              'border-[var(--el-color-primary)]':
-                posterStore.editComponent.shape == 'circle',
-            }"
-            @click="imgShapeChangeFn('circle')"
-          ></div>
-          <div
-            class="bg-[#DFDFDF] cursor-pointer w-[50px] h-[50px] ml-[25px] border-solid border-[1px] border-transparent"
-            :class="{
-              'border-[var(--el-color-primary)]':
-                posterStore.editComponent.shape == 'normal',
-            }"
-            @click="imgShapeChangeFn('normal')"
-          ></div>
-        </div>
-      </el-form-item>
-    </el-form>
-  </div>
+	<!-- 属性内容 -->
+	<div class="content-wrap">
+
+		<div class="edit-attr-item-wrap">
+			<div class="mb-[10px] text-sm text-primary">{{ t('needLoginTips') }}</div>
+		</div>
+
+		<!-- 组件公共属性 -->
+		<slot name="common"></slot>    
+        <el-form label-width="80px" class="px-[10px]">
+            <el-form-item :label="t('imgShape')">
+                <div class="flex items-center">
+                    <div class="bg-[#DFDFDF] cursor-pointer w-[50px] h-[50px] border-solid border-[1px] border-transparent rounded-[50%]" :class="{'border-[var(--el-color-primary)]': posterStore.editComponent.shape == 'circle'}" @click="imgShapeChangeFn('circle')"></div>
+                    <div class="bg-[#DFDFDF] cursor-pointer w-[50px] h-[50px] ml-[25px] border-solid border-[1px] border-transparent" :class="{'border-[var(--el-color-primary)]': posterStore.editComponent.shape == 'normal'}" @click="imgShapeChangeFn('normal')"></div>
+                </div>
+            </el-form-item>
+        </el-form>
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -40,11 +27,12 @@ import usePosterStore from '@/stores/modules/poster'
 const posterStore = usePosterStore()
 
 // 图片形状改变
-const imgShapeChangeFn = (data) => {
-  posterStore.editComponent.shape = data
+const imgShapeChangeFn = (data)=>{
+    posterStore.editComponent.shape = data;
 }
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/poster/components/edit-image.vue b/admin/src/app/views/poster/components/edit-image.vue
index 52583cd0..bf25c14d 100644
--- a/admin/src/app/views/poster/components/edit-image.vue
+++ b/admin/src/app/views/poster/components/edit-image.vue
@@ -1,21 +1,21 @@
 <template>
-  <!-- 属性内容 -->
-  <div class="content-wrap">
-    <div class="edit-attr-item-wrap">
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('image')">
-          <upload-image v-model="posterStore.editComponent.value" :limit="1" />
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <!-- 组件公共属性 -->
-    <slot name="common"></slot>
-  </div>
+	<!-- 属性内容 -->
+	<div class="content-wrap">
+		<div class="edit-attr-item-wrap">
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('image')">
+					<upload-image v-model="posterStore.editComponent.value" :limit="1"/>
+				</el-form-item>
+			</el-form>
+		</div>
+
+		<!-- 组件公共属性 -->
+		<slot name="common"></slot>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { ref, watch } from 'vue'
+import { ref,watch } from 'vue'
 import { t } from '@/lang'
 import { img } from '@/utils/common'
 import usePosterStore from '@/stores/modules/poster'
@@ -24,29 +24,30 @@ const posterStore = usePosterStore()
 
 // 组件验证
 posterStore.editComponent.verify = (index: number) => {
-  const res = { code: true, message: '' }
-  if (posterStore.value[index].value == '') {
-    res.code = false
-    res.message = t('imageUrlTip')
+    const res = { code: true, message: '' }
+    if (posterStore.value[index].value == '') {
+        res.code = false
+        res.message = t('imageUrlTip')
+        return res
+    }
     return res
-  }
-  return res
 }
 
 watch(
-  () => posterStore.editComponent.value,
-  (newValue, oldValue) => {
-    // 设置图片宽高
-    const image = new Image()
-    image.src = img(posterStore.editComponent.value)
-    image.onload = async () => {
-      posterStore.editComponent.imgWidth = image.width
-      posterStore.editComponent.imgHeight = image.height
+    () => posterStore.editComponent.value,
+    (newValue, oldValue) => {
+        // 设置图片宽高
+        const image = new Image()
+        image.src = img(posterStore.editComponent.value)
+        image.onload = async () => {
+            posterStore.editComponent.imgWidth = image.width
+            posterStore.editComponent.imgHeight = image.height
+        }
     }
-  }
 )
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/poster/components/edit-nickname.vue b/admin/src/app/views/poster/components/edit-nickname.vue
index 478267d9..34317f8b 100644
--- a/admin/src/app/views/poster/components/edit-nickname.vue
+++ b/admin/src/app/views/poster/components/edit-nickname.vue
@@ -1,13 +1,15 @@
 <template>
-  <!-- 属性内容 -->
-  <div class="content-wrap">
-    <div class="edit-attr-item-wrap">
-      <div class="mb-[10px] text-sm text-primary">{{ t('needLoginTips') }}</div>
-    </div>
-
-    <!-- 组件公共属性 -->
-    <slot name="common"></slot>
-  </div>
+	<!-- 属性内容 -->
+	<div class="content-wrap">
+
+		<div class="edit-attr-item-wrap">
+			<div class="mb-[10px] text-sm text-primary">{{ t('needLoginTips') }}</div>
+		</div>
+
+		<!-- 组件公共属性 -->
+		<slot name="common"></slot>
+
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -18,6 +20,7 @@ import usePosterStore from '@/stores/modules/poster'
 const posterStore = usePosterStore()
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/poster/components/edit-page.vue b/admin/src/app/views/poster/components/edit-page.vue
index 29df5bf7..c4be3eba 100644
--- a/admin/src/app/views/poster/components/edit-page.vue
+++ b/admin/src/app/views/poster/components/edit-page.vue
@@ -1,53 +1,34 @@
 <template>
-  <!-- 内容 -->
-  <div class="content-wrap">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('pageContent') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('posterName')">
-          <el-input
-            v-model.trim="posterStore.name"
-            :placeholder="t('posterNamePlaceholder')"
-            clearable
-            maxlength="12"
-            show-word-limit
-          />
-        </el-form-item>
-        <el-form-item :label="t('bgType')">
-          <el-radio-group v-model="posterStore.global.bgType">
-            <el-radio :label="'url'">{{ t('bgUrl') }}</el-radio>
-            <el-radio :label="'color'">{{ t('bgColor') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item
-          :label="t('bgUrl')"
-          v-show="posterStore.global.bgType == 'url'"
-        >
-          <upload-image v-model="posterStore.global.bgUrl" :limit="1" />
-          <div class="text-sm text-gray-400 mt-[10px]">
-            {{ t('bgUrlTips') }}
-          </div>
-        </el-form-item>
-        <el-form-item
-          :label="t('bgColor')"
-          v-show="posterStore.global.bgType == 'color'"
-        >
-          <el-color-picker
-            v-model="posterStore.editComponent.bgColor"
-            :predefine="posterStore.predefineColors"
-          />
-        </el-form-item>
-        <el-form-item :label="t('statusLabel')" class="display-block">
-          <el-switch
-            v-model="posterStore.status"
-            :active-value="1"
-            :inactive-value="0"
-          />
-          <div class="text-sm text-gray-400">{{ t('statusTips') }}</div>
-        </el-form-item>
-      </el-form>
-    </div>
-  </div>
+	<!-- 内容 -->
+	<div class="content-wrap">
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('pageContent') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('posterName')">
+					<el-input v-model.trim="posterStore.name" :placeholder="t('posterNamePlaceholder')" clearable maxlength="12" show-word-limit/>
+				</el-form-item>
+				<el-form-item :label="t('bgType')">
+					<el-radio-group v-model="posterStore.global.bgType">
+						<el-radio :label="'url'">{{ t('bgUrl') }}</el-radio>
+						<el-radio :label="'color'">{{ t('bgColor') }}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+				<el-form-item :label="t('bgUrl')" v-show="posterStore.global.bgType == 'url'">
+					<upload-image v-model="posterStore.global.bgUrl" :limit="1"/>
+					<div class="text-sm text-gray-400 mt-[10px]">{{ t('bgUrlTips') }}</div>
+				</el-form-item>
+				<el-form-item :label="t('bgColor')" v-show="posterStore.global.bgType == 'color'">
+					<el-color-picker v-model="posterStore.editComponent.bgColor" :predefine="posterStore.predefineColors" />
+				</el-form-item>
+				<el-form-item :label="t('statusLabel')" class="display-block">
+					<el-switch v-model="posterStore.status" :active-value="1" :inactive-value="0"/>
+					<div class="text-sm text-gray-400">{{ t('statusTips') }}</div>
+				</el-form-item>
+			</el-form>
+
+		</div>
+
+	</div>
 </template>
 
 <script lang="ts" setup>
diff --git a/admin/src/app/views/poster/components/edit-qrcode.vue b/admin/src/app/views/poster/components/edit-qrcode.vue
index bf936a62..39ea162a 100644
--- a/admin/src/app/views/poster/components/edit-qrcode.vue
+++ b/admin/src/app/views/poster/components/edit-qrcode.vue
@@ -1,9 +1,11 @@
 <template>
-  <!-- 属性内容 -->
-  <div class="content-wrap">
-    <!-- 组件公共属性 -->
-    <slot name="common"></slot>
-  </div>
+	<!-- 属性内容 -->
+	<div class="content-wrap">
+
+		<!-- 组件公共属性 -->
+		<slot name="common"></slot>
+
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -14,6 +16,7 @@ import usePosterStore from '@/stores/modules/poster'
 const posterStore = usePosterStore()
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/poster/components/edit-text.vue b/admin/src/app/views/poster/components/edit-text.vue
index fa6725b4..fde8aaf2 100644
--- a/admin/src/app/views/poster/components/edit-text.vue
+++ b/admin/src/app/views/poster/components/edit-text.vue
@@ -1,26 +1,19 @@
 <template>
-  <!-- 属性内容 -->
-  <div class="content-wrap">
-    <div class="edit-attr-item-wrap">
-      <h3 class="mb-[10px]">{{ t('textSet') }}</h3>
-      <el-form label-width="80px" class="px-[10px]">
-        <el-form-item :label="t('textLabel')">
-          <el-input
-            v-model.trim="posterStore.editComponent.value"
-            type="textarea"
-            rows="4"
-            :placeholder="t('textPlaceholder')"
-            clearable
-            maxlength="50"
-            show-word-limit
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <!-- 组件公共属性 -->
-    <slot name="common"></slot>
-  </div>
+	<!-- 属性内容 -->
+	<div class="content-wrap">
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('textSet') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('textLabel')">
+					<el-input v-model.trim="posterStore.editComponent.value" type="textarea" rows="4" :placeholder="t('textPlaceholder')" clearable maxlength="50" show-word-limit />
+				</el-form-item>
+			</el-form>
+		</div>
+
+		<!-- 组件公共属性 -->
+		 <slot name="common"></slot>
+
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -32,16 +25,17 @@ const posterStore = usePosterStore()
 
 // 组件验证
 posterStore.editComponent.verify = (index: number) => {
-  const res = { code: true, message: '' }
-  if (posterStore.value[index].value == '') {
-    res.code = false
-    res.message = t('textPlaceholder')
+    const res = { code: true, message: '' }
+    if (posterStore.value[index].value == '') {
+        res.code = false
+        res.message = t('textPlaceholder')
+        return res
+    }
     return res
-  }
-  return res
 }
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/poster/components/preview-draw.vue b/admin/src/app/views/poster/components/preview-draw.vue
index c0e51d91..ca12c305 100644
--- a/admin/src/app/views/poster/components/preview-draw.vue
+++ b/admin/src/app/views/poster/components/preview-draw.vue
@@ -1,33 +1,34 @@
 <template>
-  <div class="overflow-hidden" :style="componentStyle"></div>
+	<div class="overflow-hidden" :style="componentStyle"></div>
 </template>
 
 <script lang="ts" setup>
-import { ref, computed } from 'vue'
+import { ref,computed } from 'vue'
 
 const prop = defineProps({
-  value: {
-    type: Object,
-    default: {},
-  },
+    value: {
+        type: Object,
+        default: {}
+    }
 })
 
-const data = computed(() => {
-  return prop.value
+const data = computed(()=> {
+    return prop.value;
 })
 
-const componentStyle = computed(() => {
-  var style = ''
-  style += `background-color: ${prop.value.bgColor};`
-  style += `width: ${prop.value.width}px;height: ${prop.value.height}px;`
-  let box: any = document.getElementById(prop.value.id)
-  if (box) {
-    style += `width:${box.offsetWidth}px;height:${box.offsetHeight}px;`
-  }
-  return style
+const componentStyle = computed(()=> {
+    var style = '';
+    style += `background-color: ${prop.value.bgColor};`;
+    style += `width: ${prop.value.width}px;height: ${prop.value.height}px;`;
+    let box: any = document.getElementById(prop.value.id)
+    if (box) {
+        style += `width:${box.offsetWidth}px;height:${box.offsetHeight}px;`;
+    }
+    return style;
 })
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/poster/components/preview-friendspay-message.vue b/admin/src/app/views/poster/components/preview-friendspay-message.vue
index 52bafbe6..7de4d79b 100644
--- a/admin/src/app/views/poster/components/preview-friendspay-message.vue
+++ b/admin/src/app/views/poster/components/preview-friendspay-message.vue
@@ -1,53 +1,47 @@
 <template>
-  <div class="overflow-hidden" :style="componentStyle">{{ data.value }}</div>
+	<div class="overflow-hidden" :style="componentStyle">{{ data.value }}</div>
 </template>
 
 <script lang="ts" setup>
-import { ref, computed } from 'vue'
+import { ref,computed } from 'vue'
 import usePosterStore from '@/stores/modules/poster'
 
 const posterStore = usePosterStore()
 
 const prop = defineProps({
-  value: {
-    type: Object,
-    default: {},
-  },
+    value: {
+        type: Object,
+        default: {}
+    }
 })
 
-const data = computed(() => {
-  return prop.value
+const data = computed(()=> {
+    return prop.value;
 })
 
-const componentStyle = computed(() => {
-  var style = ''
-  style += `font-size: ${prop.value.fontSize}px;color: ${prop.value.fontColor};line-height: ${prop.value.lineHeight + prop.value.fontSize}px;`
-  if (
-    prop.value.x == 'left' ||
-    prop.value.x == 'center' ||
-    prop.value.x == 'right'
-  ) {
-    style += `text-align: ${prop.value.x};`
-  }
-  if (prop.value.weight) {
-    style += `font-weight: bold;`
-  }
-  if (
-    !prop.value.fontFamily ||
-    prop.value.fontFamily == 'static/font/SourceHanSansCN-Regular.ttf'
-  ) {
-    style += `font-family: poster_default_font;`
-  }
-  let box: any = document.getElementById(prop.value.id)
-  if (box) {
-    style += `width:${box.offsetWidth}px;height:${box.offsetHeight}px;`
-  } else {
-    style += `width:${prop.value.width}px;height:${prop.value.height}px;`
-  }
-  return style
+const componentStyle = computed(()=> {
+    var style = '';
+    style += `font-size: ${prop.value.fontSize}px;color: ${prop.value.fontColor};line-height: ${prop.value.lineHeight + prop.value.fontSize}px;`;
+    if(prop.value.x == 'left' || prop.value.x == 'center' || prop.value.x == 'right'){
+        style += `text-align: ${prop.value.x};`;
+    }
+    if(prop.value.weight){
+        style += `font-weight: bold;`;
+    }
+    if(!prop.value.fontFamily || prop.value.fontFamily == 'static/font/SourceHanSansCN-Regular.ttf'){
+        style += `font-family: poster_default_font;`;
+    }
+    let box: any = document.getElementById(prop.value.id)
+    if (box) {
+        style += `width:${box.offsetWidth}px;height:${box.offsetHeight}px;`;
+    }else{
+        style += `width:${prop.value.width}px;height:${prop.value.height}px;`;
+    }
+    return style;
 })
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/poster/components/preview-friendspay-money.vue b/admin/src/app/views/poster/components/preview-friendspay-money.vue
index 52bafbe6..7de4d79b 100644
--- a/admin/src/app/views/poster/components/preview-friendspay-money.vue
+++ b/admin/src/app/views/poster/components/preview-friendspay-money.vue
@@ -1,53 +1,47 @@
 <template>
-  <div class="overflow-hidden" :style="componentStyle">{{ data.value }}</div>
+	<div class="overflow-hidden" :style="componentStyle">{{ data.value }}</div>
 </template>
 
 <script lang="ts" setup>
-import { ref, computed } from 'vue'
+import { ref,computed } from 'vue'
 import usePosterStore from '@/stores/modules/poster'
 
 const posterStore = usePosterStore()
 
 const prop = defineProps({
-  value: {
-    type: Object,
-    default: {},
-  },
+    value: {
+        type: Object,
+        default: {}
+    }
 })
 
-const data = computed(() => {
-  return prop.value
+const data = computed(()=> {
+    return prop.value;
 })
 
-const componentStyle = computed(() => {
-  var style = ''
-  style += `font-size: ${prop.value.fontSize}px;color: ${prop.value.fontColor};line-height: ${prop.value.lineHeight + prop.value.fontSize}px;`
-  if (
-    prop.value.x == 'left' ||
-    prop.value.x == 'center' ||
-    prop.value.x == 'right'
-  ) {
-    style += `text-align: ${prop.value.x};`
-  }
-  if (prop.value.weight) {
-    style += `font-weight: bold;`
-  }
-  if (
-    !prop.value.fontFamily ||
-    prop.value.fontFamily == 'static/font/SourceHanSansCN-Regular.ttf'
-  ) {
-    style += `font-family: poster_default_font;`
-  }
-  let box: any = document.getElementById(prop.value.id)
-  if (box) {
-    style += `width:${box.offsetWidth}px;height:${box.offsetHeight}px;`
-  } else {
-    style += `width:${prop.value.width}px;height:${prop.value.height}px;`
-  }
-  return style
+const componentStyle = computed(()=> {
+    var style = '';
+    style += `font-size: ${prop.value.fontSize}px;color: ${prop.value.fontColor};line-height: ${prop.value.lineHeight + prop.value.fontSize}px;`;
+    if(prop.value.x == 'left' || prop.value.x == 'center' || prop.value.x == 'right'){
+        style += `text-align: ${prop.value.x};`;
+    }
+    if(prop.value.weight){
+        style += `font-weight: bold;`;
+    }
+    if(!prop.value.fontFamily || prop.value.fontFamily == 'static/font/SourceHanSansCN-Regular.ttf'){
+        style += `font-family: poster_default_font;`;
+    }
+    let box: any = document.getElementById(prop.value.id)
+    if (box) {
+        style += `width:${box.offsetWidth}px;height:${box.offsetHeight}px;`;
+    }else{
+        style += `width:${prop.value.width}px;height:${prop.value.height}px;`;
+    }
+    return style;
 })
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/poster/components/preview-headimg.vue b/admin/src/app/views/poster/components/preview-headimg.vue
index fd1a3f4f..fc9d3972 100644
--- a/admin/src/app/views/poster/components/preview-headimg.vue
+++ b/admin/src/app/views/poster/components/preview-headimg.vue
@@ -1,37 +1,35 @@
 <template>
-  <div class="pointer-events-none max-w-[720px]" :style="componentStyle">
-    <img
-      src="@/app/assets/images/default_headimg_square.jpg"
-      class="w-full h-full"
-    />
-  </div>
+	<div class="pointer-events-none max-w-[720px]" :style="componentStyle">
+		<img src="@/app/assets/images/default_headimg_square.jpg" class="w-full h-full" />
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { ref, computed } from 'vue'
+import { ref,computed } from 'vue'
 import { img } from '@/utils/common'
 
 const prop = defineProps({
-  value: {
-    type: Object,
-    default: {},
-  },
+    value: {
+        type: Object,
+        default: {}
+    }
 })
 
-const data = computed(() => {
-  return prop.value
+const data = computed(()=> {
+    return prop.value;
 })
 
-const componentStyle = computed(() => {
-  var style = ''
-  style += `width: ${prop.value.width}px;`
-  if (prop.value.shape == 'circle') {
-    style += `border-radius: 50%; overflow: hidden;`
-  }
-  return style
+const componentStyle = computed(()=> {
+    var style = '';
+    style += `width: ${prop.value.width}px;`;
+    if(prop.value.shape == 'circle'){
+        style += `border-radius: 50%; overflow: hidden;`;
+    }
+    return style;
 })
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/poster/components/preview-image.vue b/admin/src/app/views/poster/components/preview-image.vue
index 1f49f3b6..41ecf4f6 100644
--- a/admin/src/app/views/poster/components/preview-image.vue
+++ b/admin/src/app/views/poster/components/preview-image.vue
@@ -1,36 +1,33 @@
 <template>
-  <div class="pointer-events-none max-w-[720px]" :style="componentStyle">
-    <img v-if="data.value" :src="img(data.value)" class="w-full h-full" />
-    <img
-      v-else
-      :src="img('static/resource/images/diy/crack_figure.png')"
-      class="w-full h-full"
-    />
-  </div>
+	<div class="pointer-events-none max-w-[720px]" :style="componentStyle">
+		<img v-if="data.value" :src="img(data.value)" class="w-full h-full" />
+		<img v-else :src="img('static/resource/images/diy/crack_figure.png')" class="w-full h-full" />
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { ref, computed } from 'vue'
+import { ref,computed } from 'vue'
 import { img } from '@/utils/common'
 
 const prop = defineProps({
-  value: {
-    type: Object,
-    default: {},
-  },
+    value: {
+        type: Object,
+        default: {}
+    }
 })
 
-const data = computed(() => {
-  return prop.value
+const data = computed(()=> {
+    return prop.value;
 })
 
-const componentStyle = computed(() => {
-  var style = ''
-  style += `width: ${prop.value.width}px;`
-  return style
+const componentStyle = computed(()=> {
+    var style = '';
+    style += `width: ${prop.value.width}px;`;
+    return style;
 })
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/poster/components/preview-nickname.vue b/admin/src/app/views/poster/components/preview-nickname.vue
index 933fc648..1fa2dad8 100644
--- a/admin/src/app/views/poster/components/preview-nickname.vue
+++ b/admin/src/app/views/poster/components/preview-nickname.vue
@@ -1,53 +1,47 @@
 <template>
-  <div class="overflow-hidden" :style="componentStyle">会员昵称</div>
+	<div class="overflow-hidden" :style="componentStyle">会员昵称</div>
 </template>
 
 <script lang="ts" setup>
-import { ref, computed } from 'vue'
+import { ref,computed } from 'vue'
 import usePosterStore from '@/stores/modules/poster'
 
 const posterStore = usePosterStore()
 
 const prop = defineProps({
-  value: {
-    type: Object,
-    default: {},
-  },
+    value: {
+        type: Object,
+        default: {}
+    }
 })
 
-const data = computed(() => {
-  return prop.value
+const data = computed(()=> {
+    return prop.value;
 })
 
-const componentStyle = computed(() => {
-  var style = ''
-  style += `font-size: ${prop.value.fontSize}px;color: ${prop.value.fontColor};line-height: ${prop.value.lineHeight + prop.value.fontSize}px;`
-  if (
-    prop.value.x == 'left' ||
-    prop.value.x == 'center' ||
-    prop.value.x == 'right'
-  ) {
-    style += `text-align: ${prop.value.x};`
-  }
-  if (prop.value.weight) {
-    style += `font-weight: bold;`
-  }
-  if (
-    !prop.value.fontFamily ||
-    prop.value.fontFamily == 'static/font/SourceHanSansCN-Regular.ttf'
-  ) {
-    style += `font-family: poster_default_font;`
-  }
-  let box: any = document.getElementById(prop.value.id)
-  if (box) {
-    style += `width:${box.offsetWidth}px;height:${box.offsetHeight}px;`
-  } else {
-    style += `width:${prop.value.width}px;height:${prop.value.height}px;`
-  }
-  return style
+const componentStyle = computed(()=> {
+    var style = '';
+    style += `font-size: ${prop.value.fontSize}px;color: ${prop.value.fontColor};line-height: ${prop.value.lineHeight + prop.value.fontSize}px;`;
+    if(prop.value.x == 'left' || prop.value.x == 'center' || prop.value.x == 'right'){
+        style += `text-align: ${prop.value.x};`;
+    }
+    if(prop.value.weight){
+        style += `font-weight: bold;`;
+    }
+    if(!prop.value.fontFamily || prop.value.fontFamily == 'static/font/SourceHanSansCN-Regular.ttf'){
+        style += `font-family: poster_default_font;`;
+    }
+    let box: any = document.getElementById(prop.value.id)
+    if (box) {
+        style += `width:${box.offsetWidth}px;height:${box.offsetHeight}px;`;
+    }else{
+        style += `width:${prop.value.width}px;height:${prop.value.height}px;`;
+    }
+    return style;
 })
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/poster/components/preview-qrcode.vue b/admin/src/app/views/poster/components/preview-qrcode.vue
index 6483fa8b..b50fba8b 100644
--- a/admin/src/app/views/poster/components/preview-qrcode.vue
+++ b/admin/src/app/views/poster/components/preview-qrcode.vue
@@ -1,34 +1,32 @@
 <template>
-  <div class="pointer-events-none max-w-[720px]" :style="componentStyle">
-    <img
-      :src="img('static/resource/images/diy/qrcode.png')"
-      class="w-full h-full"
-    />
-  </div>
+	<div class="pointer-events-none max-w-[720px]" :style="componentStyle">
+		<img :src="img('static/resource/images/diy/qrcode.png')" class="w-full h-full" />
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { ref, computed } from 'vue'
+import { ref,computed } from 'vue'
 import { img } from '@/utils/common'
 
 const prop = defineProps({
-  value: {
-    type: Object,
-    default: {},
-  },
+    value: {
+        type: Object,
+        default: {}
+    }
 })
 
-const data = computed(() => {
-  return prop.value
+const data = computed(()=> {
+    return prop.value;
 })
 
-const componentStyle = computed(() => {
-  var style = ''
-  style += `width: ${prop.value.width}px;`
-  return style
+const componentStyle = computed(()=> {
+    var style = '';
+    style += `width: ${prop.value.width}px;`;
+    return style;
 })
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/poster/components/preview-text.vue b/admin/src/app/views/poster/components/preview-text.vue
index 52bafbe6..7de4d79b 100644
--- a/admin/src/app/views/poster/components/preview-text.vue
+++ b/admin/src/app/views/poster/components/preview-text.vue
@@ -1,53 +1,47 @@
 <template>
-  <div class="overflow-hidden" :style="componentStyle">{{ data.value }}</div>
+	<div class="overflow-hidden" :style="componentStyle">{{ data.value }}</div>
 </template>
 
 <script lang="ts" setup>
-import { ref, computed } from 'vue'
+import { ref,computed } from 'vue'
 import usePosterStore from '@/stores/modules/poster'
 
 const posterStore = usePosterStore()
 
 const prop = defineProps({
-  value: {
-    type: Object,
-    default: {},
-  },
+    value: {
+        type: Object,
+        default: {}
+    }
 })
 
-const data = computed(() => {
-  return prop.value
+const data = computed(()=> {
+    return prop.value;
 })
 
-const componentStyle = computed(() => {
-  var style = ''
-  style += `font-size: ${prop.value.fontSize}px;color: ${prop.value.fontColor};line-height: ${prop.value.lineHeight + prop.value.fontSize}px;`
-  if (
-    prop.value.x == 'left' ||
-    prop.value.x == 'center' ||
-    prop.value.x == 'right'
-  ) {
-    style += `text-align: ${prop.value.x};`
-  }
-  if (prop.value.weight) {
-    style += `font-weight: bold;`
-  }
-  if (
-    !prop.value.fontFamily ||
-    prop.value.fontFamily == 'static/font/SourceHanSansCN-Regular.ttf'
-  ) {
-    style += `font-family: poster_default_font;`
-  }
-  let box: any = document.getElementById(prop.value.id)
-  if (box) {
-    style += `width:${box.offsetWidth}px;height:${box.offsetHeight}px;`
-  } else {
-    style += `width:${prop.value.width}px;height:${prop.value.height}px;`
-  }
-  return style
+const componentStyle = computed(()=> {
+    var style = '';
+    style += `font-size: ${prop.value.fontSize}px;color: ${prop.value.fontColor};line-height: ${prop.value.lineHeight + prop.value.fontSize}px;`;
+    if(prop.value.x == 'left' || prop.value.x == 'center' || prop.value.x == 'right'){
+        style += `text-align: ${prop.value.x};`;
+    }
+    if(prop.value.weight){
+        style += `font-weight: bold;`;
+    }
+    if(!prop.value.fontFamily || prop.value.fontFamily == 'static/font/SourceHanSansCN-Regular.ttf'){
+        style += `font-family: poster_default_font;`;
+    }
+    let box: any = document.getElementById(prop.value.id)
+    if (box) {
+        style += `width:${box.offsetWidth}px;height:${box.offsetHeight}px;`;
+    }else{
+        style += `width:${prop.value.width}px;height:${prop.value.height}px;`;
+    }
+    return style;
 })
 
 defineExpose({})
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/poster/edit.vue b/admin/src/app/views/poster/edit.vue
index 70de1dbd..9bbf12fa 100644
--- a/admin/src/app/views/poster/edit.vue
+++ b/admin/src/app/views/poster/edit.vue
@@ -1,420 +1,226 @@
 <template>
-  <div class="main-container flex-1">
-    <el-header class="flex items-center h-[60px] bg-primary px-[20px]">
-      <div class="text-white cursor-pointer flex items-center" @click="goBack">
-        <el-icon size="14">
-          <ArrowLeft />
-        </el-icon>
-        <span class="pl-[5px] text-[14px]">{{ t('back') }}</span>
-      </div>
-      <div class="text-white ml-[10px] mr-[20px] flex items-center">
-        <span class="mr-[5px] text-[rgba(255,255,255,.5)]">｜</span>
-        <span class="mr-[5px] text-[14px]"
-          >{{ t('decorating') }}：{{ posterStore.typeName }}</span
-        >
-      </div>
-
-      <div class="flex items-center">
-        <span class="text-white mr-[10px] text-base">{{
-          t('templatePosterPlaceholder')
-        }}</span>
-        <div class="w-[180px]">
-          <el-select
-            size="small"
-            v-model="template"
-            :placeholder="t('templatePosterPlaceholder')"
-            @change="changeTemplatePoster"
-          >
-            <el-option :label="t('templatePosterEmpty')" value="" />
-            <el-option
-              v-for="(item, index) in templatePoster"
-              :label="item.name"
-              :value="index"
-              :key="index"
-            />
-          </el-select>
-        </div>
-      </div>
-      <div class="flex-1"></div>
-      <el-button @click="preview()" v-if="posterStore.id">{{
-        t('preview')
-      }}</el-button>
-      <el-button @click="save()">{{ t('save') }}</el-button>
-    </el-header>
-
-    <div class="full-container flex flex-row flex-1 bg-page">
-      <div class="component-list w-[290px]">
-        <!-- 组件列表区域 -->
-        <el-scrollbar class="px-[10px]">
-          <el-collapse v-model="activeNames" @change="handleChange">
-            <el-collapse-item
-              v-for="(item, key) in component"
-              :key="key"
-              :title="item.title"
-              :name="key"
-            >
-              <ul class="flex flex-row flex-wrap">
-                <li
-                  v-for="(compItem, compKey) in item.list"
-                  :key="compKey"
-                  class="w-2/6 text-center cursor-pointer h-[65px]"
-                  :title="compItem.title"
-                  @click="posterStore.addComponent(compKey, compItem)"
-                >
-                  <icon
-                    v-if="compItem.icon"
-                    :name="compItem.icon"
-                    size="20px"
-                    class="inline-block mt-[3px]"
-                  />
-                  <icon
-                    v-else
-                    name="iconfont iconkaifazujian"
-                    size="20px"
-                    class="inline-block mt-[3px]"
-                  />
-                  <span class="block text-[12px] truncate">{{
-                    compItem.title
-                  }}</span>
-                </li>
-              </ul>
-            </el-collapse-item>
-          </el-collapse>
-        </el-scrollbar>
-      </div>
-
-      <div class="preview-wrap flex-1 relative mt-[20px]">
-        <el-scrollbar>
-          <el-button
-            class="page-btn absolute right-[20px]"
-            @click="posterStore.changeCurrentIndex(-99)"
-            >{{ t('posterSet') }}</el-button
-          >
-          <div class="diy-view-wrap w-[360px] shadow-lg mx-auto">
-            <div
-              class="preview-head bg-no-repeat bg-center bg-cover cursor-pointer h-[64px]"
-              @click="posterStore.changeCurrentIndex(-99)"
-            >
-              <div class="content-wrap">
-                <div class="title-wrap text-center text-[14px]">
-                  {{ posterStore.name }}
-                </div>
-              </div>
+    <div class="main-container flex-1">
+        <el-header class="flex items-center h-[60px] bg-primary px-[20px]">
+            <div class="text-white cursor-pointer flex items-center" @click="goBack">
+                <el-icon size="14">
+                    <ArrowLeft />
+                </el-icon>
+                <span class="pl-[5px] text-[14px]">{{ t('back') }}</span>
+            </div>
+            <div class="text-white ml-[10px] mr-[20px] flex items-center">
+                <span class="mr-[5px] text-[rgba(255,255,255,.5)]">｜</span>
+                <span class="mr-[5px] text-[14px]">{{ t('decorating') }}：{{ posterStore.typeName }}</span>
             </div>
-            <div class="preview-block relative max-h-[640px]">
-              <ul
-                class="quick-action absolute text-center -right-[70px] top-[20px] w-[42px] rounded shadow-md"
-              >
-                <el-tooltip
-                  effect="light"
-                  :content="t('moveUpComponentZIndex')"
-                  placement="right"
-                >
-                  <icon
-                    name="iconfont iconjiantoushang"
-                    size="20px"
-                    class="block cursor-pointer leading-[40px]"
-                    @click="posterStore.moveUpComponent"
-                  />
-                </el-tooltip>
-                <el-tooltip
-                  effect="light"
-                  :content="t('moveDownComponentZIndex')"
-                  placement="right"
-                >
-                  <icon
-                    name="iconfont iconjiantouxia"
-                    size="20px"
-                    class="block cursor-pointer leading-[40px]"
-                    @click="posterStore.moveDownComponent"
-                  />
-                </el-tooltip>
-                <el-tooltip
-                  effect="light"
-                  :content="t('copyComponent')"
-                  placement="right"
-                >
-                  <icon
-                    name="iconfont iconcopy-line"
-                    size="20px"
-                    class="block cursor-pointer leading-[40px]"
-                    @click="posterStore.copyComponent"
-                  />
-                </el-tooltip>
-                <el-tooltip
-                  effect="light"
-                  :content="t('delComponent')"
-                  placement="right"
-                >
-                  <icon
-                    name="iconfont icondelete-line"
-                    size="20px"
-                    class="block cursor-pointer leading-[40px]"
-                    @click="posterStore.delComponent"
-                  />
-                </el-tooltip>
-                <el-tooltip
-                  effect="light"
-                  :content="t('resetComponent')"
-                  placement="right"
-                >
-                  <icon
-                    name="iconfont iconloader-line"
-                    size="20px"
-                    class="block cursor-pointer leading-[40px]"
-                    @click="posterStore.resetComponent"
-                  />
-                </el-tooltip>
-              </ul>
-
-              <!-- 组件预览渲染区域 -->
-              <div
-                class="preview-iframe"
-                :style="posterStore.getGlobalStyle()"
-                @click="posterStore.changeCurrentIndex(-99)"
-              >
-                <div
-                  class="item-wrap area-box select-none max-w-[720px] cursor-move"
-                  v-for="(item, index) in posterStore.value"
-                  :id="item.id"
-                  :key="item.id"
-                  :style="previewIframeStyle(item)"
-                  :class="{ selected: posterStore.currentIndex == index }"
-                  @mousedown="posterStore.mouseDown($event, item.id, index)"
-                  @click.stop="posterStore.changeCurrentIndex(index, item)"
-                >
-                  <component
-                    :is="modules['preview-' + item.path]"
-                    :value="item"
-                  />
-                  <span
-                    class="box1"
-                    @mousedown.stop="
-                      posterStore.resizeMouseDown($event, item, index)
-                    "
-                  ></span>
-                  <span
-                    class="box2"
-                    @mousedown.stop="
-                      posterStore.resizeMouseDown($event, item, index)
-                    "
-                  ></span>
-                  <span
-                    class="box3"
-                    @mousedown.stop="
-                      posterStore.resizeMouseDown($event, item, index)
-                    "
-                  ></span>
-                  <span
-                    class="box4"
-                    @mousedown.stop="
-                      posterStore.resizeMouseDown($event, item, index)
-                    "
-                  ></span>
+
+            <div class="flex items-center">
+                <span class="text-white mr-[10px] text-base">{{ t('templatePosterPlaceholder') }}</span>
+                <div class="w-[180px]">
+                    <el-select size="small" v-model="template" :placeholder="t('templatePosterPlaceholder')" @change="changeTemplatePoster">
+                        <el-option :label="t('templatePosterEmpty')" value="" />
+                        <el-option v-for="(item, index) in templatePoster" :label="item.name" :value="index" :key="index"/>
+                    </el-select>
                 </div>
-              </div>
             </div>
-          </div>
-        </el-scrollbar>
-      </div>
-
-      <div class="edit-attribute-wrap w-[400px]">
-        <!-- 编辑组件属性区域 -->
-        <el-scrollbar>
-          <el-card class="box-card" shadow="never">
-            <template #header>
-              <div class="card-header flex justify-between items-center">
-                <span class="title flex-1">{{
-                  posterStore.currentIndex == -99
-                    ? t('posterSet')
-                    : posterStore.editComponent?.componentTitle
-                }}</span>
-              </div>
-            </template>
-
-            <div class="edit-component-wrap">
-              <component
-                v-if="posterStore.currentComponent"
-                :is="modules[posterStore.currentComponent]"
-                :value="posterStore.value[posterStore.currentIndex]"
-              >
-                <template #common>
-                  <div class="edit-attr-item-wrap">
-                    <h3 class="mb-[10px]">{{ t('componentStyleTitle') }}</h3>
-                    <el-form label-width="100px" class="px-[10px]">
-                      <!-- 角度旋转、这里根据类型展示 文本、图片、绘画的编辑属性 -->
-
-                      <el-form-item :label="t('zIndex')">
-                        <span>{{ posterStore.editComponent.zIndex }}</span>
-                      </el-form-item>
-
-                      <!-- <el-form-item :label="t('coordinate')">
+            <div class="flex-1"></div>
+            <el-button @click="preview()" v-if="posterStore.id">{{ t('preview') }}</el-button>
+            <el-button @click="save()">{{ t('save') }}</el-button>
+        </el-header>
+
+        <div class="full-container flex flex-row flex-1 bg-page">
+
+            <div class="component-list w-[290px]">
+
+                <!-- 组件列表区域 -->
+                <el-scrollbar class="px-[10px]">
+                    <el-collapse v-model="activeNames" @change="handleChange">
+                        <el-collapse-item v-for="(item, key) in component" :key="key" :title="item.title" :name="key">
+                            <ul class="flex flex-row flex-wrap">
+                                <li v-for="(compItem, compKey) in item.list" :key="compKey" class="w-2/6 text-center cursor-pointer h-[65px]" :title="compItem.title" @click="posterStore.addComponent(compKey, compItem)">
+                                    <icon v-if="compItem.icon" :name="compItem.icon" size="20px" class="inline-block mt-[3px]" />
+                                    <icon v-else name="iconfont iconkaifazujian" size="20px" class="inline-block mt-[3px]" />
+                                    <span class="block text-[12px] truncate">{{ compItem.title }}</span>
+                                </li>
+                            </ul>
+                        </el-collapse-item>
+                    </el-collapse>
+                </el-scrollbar>
+
+            </div>
+
+            <div class="preview-wrap flex-1 relative mt-[20px]">
+
+                <el-scrollbar>
+                    <el-button class="page-btn absolute right-[20px]" @click="posterStore.changeCurrentIndex(-99)">{{ t('posterSet') }}</el-button>
+                    <div class="diy-view-wrap w-[360px] shadow-lg mx-auto">
+                        <div class="preview-head bg-no-repeat bg-center bg-cover cursor-pointer h-[64px]" @click="posterStore.changeCurrentIndex(-99)">
+                            <div class="content-wrap">
+                                <div class="title-wrap text-center text-[14px]">{{ posterStore.name }}</div>
+                            </div>
+                        </div>
+                        <div class="preview-block relative max-h-[640px]">
+                            <ul class="quick-action absolute text-center -right-[70px] top-[20px] w-[42px] rounded shadow-md">
+                                <el-tooltip effect="light" :content="t('moveUpComponentZIndex')" placement="right">
+                                    <icon name="iconfont iconjiantoushang" size="20px" class="block cursor-pointer leading-[40px]" @click="posterStore.moveUpComponent" />
+                                </el-tooltip>
+                                <el-tooltip effect="light" :content="t('moveDownComponentZIndex')" placement="right">
+                                    <icon name="iconfont iconjiantouxia" size="20px" class="block cursor-pointer leading-[40px]" @click="posterStore.moveDownComponent" />
+                                </el-tooltip>
+                                <el-tooltip effect="light" :content="t('copyComponent')" placement="right">
+                                    <icon name="iconfont iconcopy-line" size="20px" class="block cursor-pointer leading-[40px]" @click="posterStore.copyComponent" />
+                                </el-tooltip>
+                                <el-tooltip effect="light" :content="t('delComponent')" placement="right">
+                                    <icon name="iconfont icondelete-line" size="20px" class="block cursor-pointer leading-[40px]" @click="posterStore.delComponent" />
+                                </el-tooltip>
+                                <el-tooltip effect="light" :content="t('resetComponent')" placement="right">
+                                    <icon name="iconfont iconloader-line" size="20px" class="block cursor-pointer leading-[40px]" @click="posterStore.resetComponent" />
+                                </el-tooltip>
+                            </ul>
+
+                            <!-- 组件预览渲染区域 -->
+                            <div class="preview-iframe" :style="posterStore.getGlobalStyle()" @click="posterStore.changeCurrentIndex(-99)">
+                                <div class="item-wrap area-box select-none max-w-[720px] cursor-move" v-for="(item,index) in posterStore.value" :id="item.id" :key="item.id"
+                                     :style="previewIframeStyle(item)"
+                                     :class="{ 'selected' : posterStore.currentIndex == index }"
+                                     @mousedown="posterStore.mouseDown($event,item.id,index)"
+                                     @click.stop="posterStore.changeCurrentIndex(index,item)"
+                                >
+                                    <component :is="modules['preview-' + item.path]" :value="item"/>
+                                    <span class="box1" @mousedown.stop="posterStore.resizeMouseDown($event,item, index)"></span>
+                                    <span class="box2" @mousedown.stop="posterStore.resizeMouseDown($event,item, index)"></span>
+                                    <span class="box3" @mousedown.stop="posterStore.resizeMouseDown($event,item, index)"></span>
+                                    <span class="box4" @mousedown.stop="posterStore.resizeMouseDown($event,item, index)"></span>
+                                </div>
+
+                            </div>
+
+                        </div>
+                    </div>
+                </el-scrollbar>
+
+            </div>
+
+            <div class="edit-attribute-wrap w-[400px]">
+
+                <!-- 编辑组件属性区域 -->
+                <el-scrollbar>
+                    <el-card class="box-card" shadow="never">
+                        <template #header>
+                            <div class="card-header flex justify-between items-center">
+                                <span class="title flex-1">{{ posterStore.currentIndex == -99 ? t('posterSet') : posterStore.editComponent?.componentTitle }}</span>
+                            </div>
+                        </template>
+
+                        <div class="edit-component-wrap">
+
+                            <component v-if="posterStore.currentComponent" :is="modules[posterStore.currentComponent]" :value="posterStore.value[posterStore.currentIndex]">
+                                <template #common>
+                                    <div class="edit-attr-item-wrap">
+                                        <h3 class="mb-[10px]">{{ t('componentStyleTitle') }}</h3>
+                                        <el-form label-width="100px" class="px-[10px]">
+
+                                            <!-- 角度旋转、这里根据类型展示 文本、图片、绘画的编辑属性 -->
+
+                                            <el-form-item :label="t('zIndex')">
+                                                <span>{{ posterStore.editComponent.zIndex }}</span>
+                                            </el-form-item>
+
+                                            <!-- <el-form-item :label="t('coordinate')">
                                                 <el-slider v-model="posterStore.editComponent.x" show-input size="small" class="ml-[10px]" :min="0" :max="posterStore.getMaxX()" />
                                                 <div class="my-[10px]"></div>
                                                 <el-slider v-model="posterStore.editComponent.y" show-input size="small" class="ml-[10px]" :min="0" :max="posterStore.getMaxY()" />
                                             </el-form-item>
                                             <div class="ml-[92px] mb-[18px] text-sm text-gray-400">{{ t('coordinateTips') }}</div> -->
 
-                      <!-- 文本 -->
-                      <template v-if="posterStore.editComponent.type == 'text'">
-                        <el-form-item :label="t('textFontSize')">
-                          <el-slider
-                            v-model="posterStore.editComponent.fontSize"
-                            show-input
-                            size="small"
-                            class="ml-[10px]"
-                            :min="14"
-                            :max="100"
-                          />
-                        </el-form-item>
-                        <el-form-item :label="t('textColor')">
-                          <el-color-picker
-                            v-model="posterStore.editComponent.fontColor"
-                          />
-                        </el-form-item>
-                        <el-form-item :label="t('weight')">
-                          <el-switch
-                            v-model="posterStore.editComponent.weight"
-                          />
-                        </el-form-item>
-                        <!-- <el-form-item :label="t('space')">
+                                            <!-- 文本 -->
+                                            <template v-if="posterStore.editComponent.type == 'text'">
+                                                <el-form-item :label="t('textFontSize')">
+                                                    <el-slider v-model="posterStore.editComponent.fontSize" show-input size="small" class="ml-[10px]" :min="14" :max="100" />
+                                                </el-form-item>
+                                                <el-form-item :label="t('textColor')">
+                                                    <el-color-picker v-model="posterStore.editComponent.fontColor" />
+                                                </el-form-item>
+                                                <el-form-item :label="t('weight')">
+                                                    <el-switch v-model="posterStore.editComponent.weight" />
+                                                </el-form-item>
+                                                <!-- <el-form-item :label="t('space')">
                                                     <el-slider v-model="posterStore.editComponent.space" show-input size="small" class="ml-[10px]" :min="0" :max="20" />
                                                 </el-form-item> -->
-                        <el-form-item :label="t('lineHeight')">
-                          <el-slider
-                            v-model="posterStore.editComponent.lineHeight"
-                            show-input
-                            size="small"
-                            class="ml-[10px]"
-                            :min="0"
-                            :max="50"
-                          />
-                        </el-form-item>
-                      </template>
-
-                      <!-- 图片 -->
-                      <template
-                        v-if="posterStore.editComponent.type == 'image'"
-                      >
-                        <el-form-item :label="t('width')">
-                          <el-slider
-                            v-model="posterStore.editComponent.width"
-                            show-input
-                            size="small"
-                            class="ml-[10px]"
-                            :min="30"
-                            :max="posterStore.getMaxWidth()"
-                          />
-                        </el-form-item>
-                      </template>
-
-                      <!-- 绘画 -->
-                      <template v-if="posterStore.editComponent.type == 'draw'">
-                        <el-form-item :label="t('drawType')">
-                          <el-radio-group
-                            v-model="posterStore.editComponent.drawType"
-                          >
-                            <el-radio label="Polygon">{{
-                              t('polygon')
-                            }}</el-radio>
-                          </el-radio-group>
-                        </el-form-item>
-                        <el-form-item :label="t('bgColor')">
-                          <el-color-picker
-                            v-model="posterStore.editComponent.bgColor"
-                          />
-                        </el-form-item>
-                      </template>
-
-                      <!-- 对齐方式 -->
-                      <template
-                        v-if="
-                          posterStore.editComponent.type != 'draw' &&
-                          posterStore.editComponent.type != 'image' &&
-                          posterStore.editComponent.type != 'qrcode'
-                        "
-                      >
-                        <el-form-item :label="t('horizontalAlignment')">
-                          <ul class="flex items-center">
-                            <template v-for="(item, i) in xAlignList">
-                              <li
-                                :class="[
-                                  'w-[50px] h-[32px] flex items-center justify-center border-solid  border-[1px] border-[#eee] cursor-pointer',
-                                  {
-                                    'border-r-transparent':
-                                      xAlignList.length != i + 1,
-                                  },
-                                  item.className == posterStore.editComponent.x
-                                    ? '!border-[var(--el-color-primary)]'
-                                    : '',
-                                ]"
-                                @click="alignChangeFn('x', item)"
-                              >
-                                <span
-                                  :class="['iconfont !text-[20px]', item.src]"
-                                  :title="item.name"
-                                ></span>
-                              </li>
-                            </template>
-                          </ul>
-                          <div
-                            class="text-sm mt-[10px] leading-[1.4] text-gray-400"
-                          >
-                            {{ t('AlignTips') }}
-                          </div>
-                        </el-form-item>
-
-                        <el-form-item :label="t('verticalAlignment')">
-                          <ul class="flex items-center">
-                            <template v-for="(item, i) in yAlignList">
-                              <li
-                                :class="[
-                                  'w-[50px] h-[32px] flex items-center justify-center border-solid  border-[1px] border-[#eee] cursor-pointer',
-                                  {
-                                    'border-r-transparent':
-                                      yAlignList.length != i + 1,
-                                  },
-                                  item.className == posterStore.editComponent.y
-                                    ? '!border-[var(--el-color-primary)]'
-                                    : '',
-                                ]"
-                                @click="alignChangeFn('y', item)"
-                              >
-                                <span
-                                  :class="['iconfont !text-[20px]', item.src]"
-                                  :title="item.name"
-                                ></span>
-                              </li>
-                            </template>
-                          </ul>
-                        </el-form-item>
-                      </template>
-
-                      <!--                                            <el-form-item :label="t('旋转角度')">-->
-                      <!--                                                <el-slider v-model="posterStore.editComponent.angle" show-input size="small" class="ml-[10px]" :min="0" :max="360" />-->
-                      <!--                                            </el-form-item>-->
-                    </el-form>
-                  </div>
-                </template>
-              </component>
+                                                <el-form-item :label="t('lineHeight')">
+                                                    <el-slider v-model="posterStore.editComponent.lineHeight" show-input size="small" class="ml-[10px]" :min="0" :max="50" />
+                                                </el-form-item>
+                                            </template>
+
+                                            <!-- 图片 -->
+                                            <template v-if="posterStore.editComponent.type == 'image'">
+
+                                                <el-form-item :label="t('width')">
+                                                    <el-slider v-model="posterStore.editComponent.width" show-input size="small" class="ml-[10px]" :min="30" :max="posterStore.getMaxWidth()" />
+                                                </el-form-item>
+                                            </template>
+
+                                            <!-- 绘画 -->
+                                            <template v-if="posterStore.editComponent.type == 'draw'">
+                                                <el-form-item :label="t('drawType')">
+                                                    <el-radio-group v-model="posterStore.editComponent.drawType">
+                                                        <el-radio label="Polygon">{{ t('polygon') }}</el-radio>
+                                                    </el-radio-group>
+                                                </el-form-item>
+                                                <el-form-item :label="t('bgColor')">
+                                                    <el-color-picker v-model="posterStore.editComponent.bgColor" />
+                                                </el-form-item>
+                                            </template>
+
+                                            <!-- 对齐方式 -->
+                                            <template v-if="posterStore.editComponent.type != 'draw' && posterStore.editComponent.type != 'image' && posterStore.editComponent.type != 'qrcode'">
+                                                <el-form-item :label="t('horizontalAlignment')">
+                                                    <ul class="flex items-center">
+                                                        <template v-for="(item,i) in xAlignList">
+                                                            <li :class="['w-[50px] h-[32px] flex items-center justify-center border-solid  border-[1px] border-[#eee] cursor-pointer', {'border-r-transparent': xAlignList.length != (i+1)}, (item.className == posterStore.editComponent.x) ?  '!border-[var(--el-color-primary)]' : '' ]" @click="alignChangeFn('x',item)">
+                                                                <span :class="['iconfont !text-[20px]', item.src]" :title="item.name"></span>
+                                                            </li>
+                                                        </template>
+                                                    </ul>
+                                                    <div class="text-sm mt-[10px] leading-[1.4] text-gray-400">{{ t('AlignTips') }}</div>
+                                                </el-form-item>
+
+                                                <el-form-item :label="t('verticalAlignment')">
+                                                    <ul class="flex items-center">
+                                                        <template v-for="(item,i) in yAlignList">
+                                                            <li :class="['w-[50px] h-[32px] flex items-center justify-center border-solid  border-[1px] border-[#eee] cursor-pointer', {'border-r-transparent': yAlignList.length != (i+1)}, (item.className == posterStore.editComponent.y) ?  '!border-[var(--el-color-primary)]' : '' ]" @click="alignChangeFn('y',item)">
+                                                                <span :class="['iconfont !text-[20px]', item.src]" :title="item.name"></span>
+                                                            </li>
+                                                        </template>
+                                                    </ul>
+                                                </el-form-item>
+                                            </template>
+
+<!--                                            <el-form-item :label="t('旋转角度')">-->
+<!--                                                <el-slider v-model="posterStore.editComponent.angle" show-input size="small" class="ml-[10px]" :min="0" :max="360" />-->
+<!--                                            </el-form-item>-->
+
+                                        </el-form>
+                                    </div>
+                                </template>
+                            </component>
+
+                        </div>
+
+                    </el-card>
+                </el-scrollbar>
+
             </div>
-          </el-card>
-        </el-scrollbar>
-      </div>
-    </div>
 
-    <!--预览海报-->
-    <el-dialog
-      v-model="previewDialogVisible"
-      :title="t('previewDialogTitle')"
-      width="400px"
-      height="640px"
-    >
-      <div v-if="previewPosterUrl">
-        <img :src="img(previewPosterUrl)" class="w-[360px] h-[640px]" />
-      </div>
-    </el-dialog>
-  </div>
+        </div>
+
+        <!--预览海报-->
+        <el-dialog v-model="previewDialogVisible" :title="t('previewDialogTitle')" width="400px" height="640px">
+
+            <div v-if="previewPosterUrl">
+                <img :src="img(previewPosterUrl)" class="w-[360px] h-[640px]" />
+            </div>
+        </el-dialog>
+
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -425,13 +231,7 @@ import { useRoute, useRouter } from 'vue-router'
 import { cloneDeep } from 'lodash-es'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import usePosterStore from '@/stores/modules/poster'
-import {
-  initPoster,
-  addPoster,
-  editPoster,
-  getPosterTemplate,
-  getPreviewPoster,
-} from '@/app/api/poster'
+import { initPoster,addPoster,editPoster,getPosterTemplate,getPreviewPoster } from '@/app/api/poster'
 
 const setLayout = inject('setLayout')
 setLayout('decorate')
@@ -441,308 +241,303 @@ const posterStore = usePosterStore()
 const route = useRoute()
 const router = useRouter()
 
-if (route && route.query) {
-  route.query.id = route.query.id || 0
-  route.query.type = route.query.type || '' // 海报类型
-  route.query.name = route.query.name || ''
-  route.query.back = route.query.back || '/admin/poster/list'
+if(route && route.query){
+    route.query.id = route.query.id || 0
+    route.query.type = route.query.type || '' // 海报类型
+    route.query.name = route.query.name || ''
+    route.query.back = route.query.back || '/admin/poster/list'
 }
 
-const backPath: any = route.query.back
-const template = ref('')
-const oldTemplate = ref('')
+const backPath:any = route.query.back
+const template = ref('');
+const oldTemplate = ref('');
 
 const component = ref([])
 const componentType: string[] = reactive([])
 const page = ref('')
 
 const activeNames = ref(componentType)
-const handleChange = (val: string[]) => {}
-
-const previewIframeStyle = (data: any) => {
-  let style: any = {
-    transform: '',
-    zIndex: '',
-    top: '',
-    left: '',
-    right: '',
-    bottom: '',
-  }
-  style.transform = `rotate(${data.angle}deg)`
-  style.zIndex = `${data.zIndex}`
-  switch (data.y) {
-    case 'top':
-      style.top = 0
-      break
-    case 'center':
-      style.top = '50%'
-      style.transform = style.transform + ' translateY(-50%)'
-      break
-    case 'bottom':
-      style.bottom = 0
-      break
-    default:
-      style.top = data.y + 'px'
-  }
-  switch (data.x) {
-    case 'left':
-      style.left = 0
-      break
-    case 'center':
-      style.left = '50%'
-      style.transform = style.transform + ' translateX(-50%)'
-      break
-    case 'right':
-      style.right = 0
-      break
-    default:
-      style.left = data.x + 'px'
-  }
-  // console.log(data.x,data.y)
-  return style
+const handleChange = (val: string[]) => {
+}
+
+const previewIframeStyle = (data: any)=>{
+    let style: any = {
+        transform: '',
+        zIndex: '',
+        top: '',
+        left: '',
+        right: '',
+        bottom: ''
+    };
+    style.transform =  `rotate(${data.angle}deg)`;
+    style.zIndex =  `${data.zIndex}`;
+    switch(data.y) {
+        case 'top':
+            style.top = 0;
+            break;
+        case 'center':
+            style.top = '50%';
+            style.transform = style.transform + ' translateY(-50%)';
+            break;
+        case 'bottom':
+            style.bottom = 0;
+            break;
+        default:
+            style.top = data.y + 'px';
+    }
+    switch(data.x) {
+        case 'left':
+            style.left = 0;
+            break;
+        case 'center':
+            style.left = '50%';
+            style.transform = style.transform + ' translateX(-50%)';
+            break;
+        case 'right':
+            style.right = 0;
+            break;
+        default:
+            style.left = data.x + 'px';
+    }
+    // console.log(data.x,data.y)
+    return style;
 }
 
 // 水平方向对齐
 const xAlignList = ref([
-  {
-    name: '左',
-    src: 'iconzuoduiqi1',
-    className: 'left',
-  },
-  {
-    name: '中',
-    src: 'iconshuipingjuzhong1',
-    className: 'center',
-  },
-  {
-    name: '右',
-    src: 'iconyouduiqi1',
-    className: 'right',
-  },
+    {
+        name: '左',
+        src: 'iconzuoduiqi1',
+        className: 'left'
+    },
+    {
+        name: '中',
+        src: 'iconshuipingjuzhong1',
+        className: 'center'
+    },
+    {
+        name: '右',
+        src: 'iconyouduiqi1',
+        className: 'right'
+    }
 ])
 
 // 水平方向对齐
 const yAlignList = ref([
-  {
-    name: '上',
-    src: 'icondingduiqi1',
-    className: 'top',
-  },
-  {
-    name: '中',
-    src: 'iconchuizhijuzhong1',
-    className: 'center',
-  },
-  {
-    name: '下',
-    src: 'icondiduiqi1',
-    className: 'bottom',
-  },
+    {
+        name: '上',
+        src: 'icondingduiqi1',
+        className: 'top'
+    },
+    {
+        name: '中',
+        src: 'iconchuizhijuzhong1',
+        className: 'center'
+    },
+    {
+        name: '下',
+        src: 'icondiduiqi1',
+        className: 'bottom'
+    },
 ])
-const alignChangeFn = (type: any, data: any) => {
-  posterStore.editComponent[type] = data.className
+const alignChangeFn = (type: any,data: any)=>{
+    posterStore.editComponent[type] = data.className;
 }
 
 // 返回上一页
 const isChange = ref(true) // 数据是否发生变化，true：没变化，false：变化了
 const goBack = () => {
-  if (isChange.value) {
-    location.href = `${location.origin}${backPath}`
-    router.push(backPath)
-  } else {
-    // 数据发生变化，弹框提示：确定离开此页面
-    ElMessageBox.confirm(t('leavePageTitleTips'), t('leavePageContentTips'), {
-      confirmButtonText: t('confirm'),
-      cancelButtonText: t('cancel'),
-      type: 'warning',
-      autofocus: false,
-    })
-      .then(() => {
-        location.href = `${location.origin}${backPath}`
-      })
-      .catch(() => {})
-  }
+    if (isChange.value) {
+        location.href = `${location.origin}${backPath}`;
+        router.push(backPath)
+    } else {
+        // 数据发生变化，弹框提示：确定离开此页面
+        ElMessageBox.confirm(
+            t('leavePageTitleTips'),
+            t('leavePageContentTips'),
+            {
+                confirmButtonText: t('confirm'),
+                cancelButtonText: t('cancel'),
+                type: 'warning',
+                autofocus: false
+            }
+        ).then(() => {
+            location.href = `${location.origin}${backPath}`;
+        }).catch(() => {
+        })
+    }
 }
 
 // 动态加载后台自定义组件编辑
 const modulesFiles = import.meta.glob('./components/*.vue', { eager: true })
-const addonModulesFiles = import.meta.glob(
-  '@/addon/**/views/poster/components/*.vue',
-  { eager: true }
-)
+const addonModulesFiles = import.meta.glob('@/addon/**/views/poster/components/*.vue', { eager: true })
 addonModulesFiles && Object.assign(modulesFiles, addonModulesFiles)
 
-const modules: any = {}
+const modules:any = {}
 for (const [key, value] of Object.entries(modulesFiles)) {
-  const moduleName: any = key.split('/').pop()
-  const name = moduleName.split('.')[0]
-  modules[name] = value.default
+    const moduleName:any = key.split('/').pop()
+    const name = moduleName.split('.')[0]
+    modules[name] = value.default
 }
 
 // 获取模板页面列表
 const templatePoster: any = reactive([])
 
-const loadPosterTemplate = () => {
-  getPosterTemplate({
-    addon: posterStore.addon,
-    type: posterStore.type,
-  }).then((res) => {
-    if (res.data) {
-      templatePoster.splice(0, templatePoster.length, ...res.data)
-    }
-  })
+const loadPosterTemplate = ()=> {
+    getPosterTemplate({
+        addon: posterStore.addon,
+        type: posterStore.type,
+    }).then(res => {
+        if (res.data) {
+            templatePoster.splice(0, templatePoster.length, ...res.data)
+        }
+    })
 }
 
 // 全局监听自定义数据变化
 watch(
-  () => template.value,
-  (newValue, oldValue) => {
-    oldTemplate.value = oldValue
-  }
+    () => template.value,
+    (newValue, oldValue) => {
+        oldTemplate.value = oldValue;
+    }
 )
 
 // 切换模板页面
-const changeTemplatePoster = (index: any) => {
-  // 存在数据则弹框提示确认
-  if (posterStore.value.length) {
-    ElMessageBox.confirm(t('changeTemplatePosterTips'), t('warning'), {
-      confirmButtonText: t('confirm'),
-      cancelButtonText: t('cancel'),
-      type: 'warning',
-    })
-      .then(() => {
-        posterStore.changeCurrentIndex(-99)
+const changeTemplatePoster = (index:any)=> {
+    // 存在数据则弹框提示确认
+    if(posterStore.value.length) {
+        ElMessageBox.confirm(t('changeTemplatePosterTips'), t('warning'), {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }).then(() => {
+            posterStore.changeCurrentIndex(-99)
+            if (index !== '') {
+                let data = templatePoster[index].data;
+                posterStore.global = data.global;
+                if (data.value.length) {
+                    posterStore.value = data.value
+                }
+            } else {
+                // 清空
+                posterStore.init();
+            }
+        }).catch(() => {
+            // 还原
+            template.value = oldTemplate.value;
+        });
+    }else{
         if (index !== '') {
-          let data = templatePoster[index].data
-          posterStore.global = data.global
-          if (data.value.length) {
-            posterStore.value = data.value
-          }
+            let data = templatePoster[index].data;
+            posterStore.global = data.global;
+            if (data.value.length) {
+                posterStore.value = data.value
+            }
         } else {
-          // 清空
-          posterStore.init()
+            // 清空
+            posterStore.init();
         }
-      })
-      .catch(() => {
-        // 还原
-        template.value = oldTemplate.value
-      })
-  } else {
-    if (index !== '') {
-      let data = templatePoster[index].data
-      posterStore.global = data.global
-      if (data.value.length) {
-        posterStore.value = data.value
-      }
-    } else {
-      // 清空
-      posterStore.init()
     }
-  }
-}
+};
 
 // 根据当前页面路由查询页面初始化数据
 initPoster({
-  id: route.query.id,
-  type: route.query.type,
-  name: route.query.name,
-}).then(async (res: any) => {
-  const data = res.data
-
-  posterStore.init() // 初始化清空数据
-
-  posterStore.id = data.id
-  posterStore.name = data.name
-  posterStore.channel = data.channel
-  posterStore.status = data.status
-  posterStore.isDefault = data.is_default
-  posterStore.addon = data.addon
-  posterStore.type = data.type
-  posterStore.typeName = data.poster_type.name
-
-  if (data.value) {
-    const sources = data.value
-    posterStore.global = sources.global
-    if (sources.value.length) {
-      posterStore.value = sources.value
+    id: route.query.id,
+    type: route.query.type,
+    name: route.query.name
+}).then( async (res:any)=>{
+    const data = res.data
+
+    posterStore.init(); // 初始化清空数据
+
+    posterStore.id = data.id;
+    posterStore.name = data.name;
+    posterStore.channel = data.channel;
+    posterStore.status = data.status;
+    posterStore.isDefault = data.is_default;
+    posterStore.addon = data.addon;
+    posterStore.type = data.type;
+    posterStore.typeName = data.poster_type.name;
+
+    if (data.value) {
+        const sources = data.value
+        posterStore.global = sources.global
+        if (sources.value.length) {
+            posterStore.value = sources.value
+        }
     }
-  }
-
-  component.value = data.component
-  for (const type in component.value) {
-    componentType.push(type)
-    for (const key in component.value[type].list) {
-      const com = cloneDeep(component.value[type].list[key])
-      com.id = posterStore.generateRandom()
-      com.componentName = key
-      com.componentTitle = com.title
-      delete com.title
-      delete com.icon
-      posterStore.components.push(com)
+
+    component.value = data.component
+    for (const type in component.value) {
+        componentType.push(type)
+        for (const key in component.value[type].list) {
+            const com = cloneDeep(component.value[type].list[key])
+            com.id = posterStore.generateRandom()
+            com.componentName = key
+            com.componentTitle = com.title
+            delete com.title
+            delete com.icon
+            posterStore.components.push(com)
+        }
     }
-  }
 
-  loadPosterTemplate()
+    loadPosterTemplate()
+
 })
 
 const isRepeat = ref(false)
 const save = (callback: any) => {
-  if (!posterStore.verify()) {
-    return
-  }
-
-  if (isRepeat.value) return
-  isRepeat.value = true
-
-  posterStore.value.forEach((item: any, index: any, originalArr: any) => {
-    const box: any = document.getElementById(item.id)
-    if (box) {
-      item.width = box.offsetWidth
-      item.height = box.offsetHeight
-      if (item.type == 'draw') {
-        // [x,y]：左上，右上，右下，左下
-        let leftTop = [item.x * 1, item.y * 1] // 左上
-        let rightTop = [(item.x + item.width) * 1, item.y * 1] // 右上
-        let rightBottom = [
-          (item.x + item.width) * 1,
-          (item.y + item.height) * 1,
-        ] // 右下
-        let leftBottom = [item.x * 1, (item.y + item.height) * 1] // 左下
-        item.points = [leftTop, rightTop, rightBottom, leftBottom]
-      }
+    if (!posterStore.verify()) {
+        return
     }
-    delete item.verify
-  })
-
-  let data = {
-    id: posterStore.id,
-    name: posterStore.name,
-    type: posterStore.type,
-    status: posterStore.status,
-    is_default: posterStore.isDefault,
-    channel: posterStore.channel,
-    addon: posterStore.addon,
-    value: JSON.stringify({
-      global: toRaw(posterStore.global),
-      value: toRaw(posterStore.value),
-    }),
-  }
-
-  const api = posterStore.id ? editPoster : addPoster
-  api(data)
-    .then((res: any) => {
-      isRepeat.value = false
-      if (res.code == 1) {
-        if (posterStore.id) {
-          isRepeat.value = false // 不刷新
-        } else {
-          location.href = `${location.origin}${backPath}`
+
+    if (isRepeat.value) return
+    isRepeat.value = true
+
+    posterStore.value.forEach((item:any,index:any, originalArr:any)=> {
+        const box: any = document.getElementById(item.id)
+        if (box) {
+            item.width = box.offsetWidth;
+            item.height = box.offsetHeight;
+            if (item.type == 'draw') {
+                // [x,y]：左上，右上，右下，左下
+                let leftTop = [item.x * 1, item.y * 1]; // 左上
+                let rightTop = [(item.x + item.width) * 1, item.y * 1]; // 右上
+                let rightBottom = [(item.x + item.width) * 1, (item.y + item.height) * 1]; // 右下
+                let leftBottom = [item.x * 1, (item.y + item.height) * 1]; // 左下
+                item.points = [leftTop, rightTop, rightBottom, leftBottom];
+            }
         }
-        if (callback) callback(res.data.id)
-      }
+        delete item.verify;
     })
-    .catch(() => {
-      isRepeat.value = false
+
+    let data = {
+        id: posterStore.id,
+        name: posterStore.name,
+        type: posterStore.type,
+        status: posterStore.status,
+        is_default:posterStore.isDefault,
+        channel: posterStore.channel,
+        addon: posterStore.addon,
+        value: JSON.stringify({
+            global: toRaw(posterStore.global),
+            value: toRaw(posterStore.value)
+        })
+    }
+
+    const api = posterStore.id ? editPoster : addPoster
+    api(data).then((res: any) => {
+        isRepeat.value = false
+        if (res.code == 1) {
+            if (posterStore.id) {
+                isRepeat.value = false // 不刷新
+            } else {
+                location.href = `${location.origin}${backPath}`;
+            }
+            if (callback) callback(res.data.id)
+        }
+    }).catch(() => {
+        isRepeat.value = false
     })
 }
 
@@ -751,182 +546,185 @@ const previewPosterUrl = ref('')
 
 // 预览海报
 const preview = () => {
-  if (isRepeat.value) return
-  isRepeat.value = true
-
-  getPreviewPoster({
-    id: posterStore.id,
-    type: posterStore.type,
-  }).then((res: any) => {
-    if (res.data) {
-      previewPosterUrl.value = res.data
-      previewDialogVisible.value = true
-    }
-    isRepeat.value = false
-  })
+    if (isRepeat.value) return
+    isRepeat.value = true
+
+    getPreviewPoster({
+        id:posterStore.id,
+        type:posterStore.type
+    }).then(((res:any)=>{
+        if(res.data) {
+            previewPosterUrl.value = res.data;
+            previewDialogVisible.value = true;
+        }
+        isRepeat.value = false
+    }))
 }
 </script>
 
 <style lang="scss">
 .el-collapse-item__wrap {
-  border-bottom: none;
+    border-bottom: none;
 }
 
 .el-collapse-item__content {
-  padding-bottom: 0;
+    padding-bottom: 0;
 }
 
 .el-collapse-item__header {
-  font-size: var(--el-font-size-base);
+    font-size: var(--el-font-size-base);
 }
 
 .display-block {
-  .el-form-item__content {
-    display: block;
-  }
+    .el-form-item__content {
+        display: block;
+    }
 }
 
 .edit-component-wrap {
-  .edit-attr-item-wrap {
-    border-top: 2px solid var(--el-color-info-light-8);
-    padding-top: 20px;
+    .edit-attr-item-wrap {
+        border-top: 2px solid var(--el-color-info-light-8);
+        padding-top: 20px;
 
-    &:first-of-type {
-      border-top: none;
-      padding-top: 0;
+        &:first-of-type {
+            border-top: none;
+            padding-top: 0;
+        }
     }
-  }
 }
 </style>
 <style lang="scss" scoped>
 .full-container {
-  height: calc(100vh - 60px);
+    height: calc(100vh - 60px);
 }
 
 .preview-iframe {
-  transform: scale(0.5);
-  margin: 0 auto;
-  width: 720px;
-  height: 1280px;
-  background-size: 100% 1280px;
-  background-repeat: no-repeat;
-  position: relative;
-  transform-origin: left top;
-
-  .item-wrap {
-    position: absolute;
-
-    &.area-box {
-      background-color: rgba(255, 255, 255, 0.7);
-    }
-
-    &:hover {
-      &:after {
-        content: '';
-        position: absolute;
-        top: 0;
-        left: 0;
-        right: 0;
-        bottom: 0;
-        border: 2px dotted var(--el-color-primary);
-        z-index: 1;
-      }
-    }
-
-    &.selected {
-      &:after {
-        content: '';
-        position: absolute;
-        top: 0;
-        left: 0;
-        right: 0;
-        bottom: 0;
-        border: 2px solid var(--el-color-primary);
-        z-index: 1;
-      }
-
-      .box1,
-      .box2,
-      .box3,
-      .box4 {
-        width: 20px;
-        height: 20px;
-        background-color: #fff;
-        position: absolute;
-        border-radius: 50%;
-        border: 1px solid #666;
-        z-index: 10;
-      }
-
-      .box1 {
-        top: -8px;
-        left: -8px;
-        cursor: nw-resize;
-      }
-
-      .box2 {
-        top: -8px;
-        right: -8px;
-        cursor: ne-resize;
-      }
-
-      .box3 {
-        left: -8px;
-        bottom: -8px;
-        cursor: sw-resize;
-      }
-
-      .box4 {
-        bottom: -8px;
-        right: -8px;
-        cursor: se-resize;
-      }
-    }
-  }
+    transform: scale(0.5);
+	margin: 0 auto;
+	width: 720px;
+	height: 1280px;
+	background-size: 100% 1280px;
+	background-repeat: no-repeat;
+	position: relative;
+    transform-origin: left top;
+
+	.item-wrap {
+		position: absolute;
+
+		&.area-box {
+			background-color: rgba(255, 255, 255, 0.7);
+		}
+
+		&:hover {
+			&:after {
+				content: "";
+				position: absolute;
+				top: 0;
+				left: 0;
+				right: 0;
+				bottom: 0;
+				border: 2px dotted var(--el-color-primary);
+				z-index: 1;
+			}
+		}
+
+		&.selected {
+			&:after {
+				content: "";
+				position: absolute;
+				top: 0;
+				left: 0;
+				right: 0;
+				bottom: 0;
+				border: 2px solid var(--el-color-primary);
+				z-index: 1;
+			}
+
+			.box1,
+			.box2,
+			.box3,
+			.box4 {
+				width: 20px;
+				height: 20px;
+				background-color: #fff;
+				position: absolute;
+				border-radius: 50%;
+				border: 1px solid #666;
+				z-index: 10;
+			}
+
+			.box1 {
+				top: -8px;
+				left: -8px;
+				cursor: nw-resize;
+			}
+
+			.box2 {
+				top: -8px;
+				right: -8px;
+				cursor: ne-resize;
+			}
+
+			.box3 {
+				left: -8px;
+				bottom: -8px;
+				cursor: sw-resize;
+			}
+
+			.box4 {
+				bottom: -8px;
+				right: -8px;
+				cursor: se-resize;
+			}
+		}
+
+	}
 }
 
 .component-list {
-  background: var(--el-bg-color);
+    background: var(--el-bg-color);
 }
 
 .component-list ul li {
-  &:not(.disabled):hover {
-    color: var(--el-color-primary);
-    background: var(--el-color-primary-light-9);
-  }
+    &:not(.disabled):hover {
+        color: var(--el-color-primary);
+        background: var(--el-color-primary-light-9);
+    }
 }
 
 .diy-view-wrap {
-  background: var(--el-bg-color-page);
+    background: var(--el-bg-color-page);
 }
 
 .diy-view-wrap .preview-head {
-  background-image: url(@/app/assets/images/diy_preview_head.png);
-  background-color: var(--el-bg-color);
+    background-image: url(@/app/assets/images/diy_preview_head.png);
+    background-color: var(--el-bg-color);
 }
 
 .quick-action {
-  background: var(--el-bg-color);
+    background: var(--el-bg-color);
 }
 
 .edit-attribute-wrap {
-  background: var(--el-bg-color);
+    background: var(--el-bg-color);
 }
 
 .edit-attribute-wrap .box-card {
-  border: none;
+    border: none;
 }
 
-.diy-view-wrap .preview-head {
-  padding: 28px 15px 0;
-  .content-wrap {
-    height: 30px;
-  }
-  .content-wrap {
-    .title-wrap {
-      height: 30px;
-      line-height: 30px;
+.diy-view-wrap .preview-head{
+    padding: 28px 15px 0;
+    .content-wrap{
+        height: 30px;
     }
-  }
+    .content-wrap {
+        .title-wrap {
+            height: 30px;
+            line-height: 30px;
+        }
+    }
+
 }
+
 </style>
diff --git a/admin/src/app/views/poster/list.vue b/admin/src/app/views/poster/list.vue
index eb53d068..6c91c261 100644
--- a/admin/src/app/views/poster/list.vue
+++ b/admin/src/app/views/poster/list.vue
@@ -1,207 +1,101 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-        <el-button
-          type="primary"
-          class="w-[100px]"
-          @click="dialogVisible = true"
-          >{{ t('添加海报') }}</el-button
-        >
-      </div>
-
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="posterTableData.searchParam"
-          ref="searchFormDiyPosterRef"
-        >
-          <el-form-item :label="t('posterName')" prop="name">
-            <el-input
-              v-model.trim="posterTableData.searchParam.name"
-              :placeholder="t('posterNamePlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('posterType')" prop="type">
-            <el-select
-              v-model="posterTableData.searchParam.type"
-              :placeholder="t('posterTypePlaceholder')"
-            >
-              <el-option :label="t('all')" value="" />
-              <el-option
-                v-for="item in posterType"
-                :label="item.name"
-                :value="item.type"
-                :key="item.type"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="loadPosterPageList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormDiyPosterRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
-
-      <el-table
-        :data="posterTableData.data"
-        size="large"
-        v-loading="posterTableData.loading"
-      >
-        <template #empty>
-          <span>{{ !posterTableData.loading ? t('emptyData') : '' }}</span>
-        </template>
-
-        <el-table-column prop="name" :label="t('posterName')" min-width="120" />
-        <el-table-column
-          prop="type_name"
-          :label="t('posterType')"
-          min-width="80"
-        />
-        <el-table-column :label="t('status')" min-width="80">
-          <template #default="{ row }">
-            <el-tag
-              type="success"
-              v-if="row.status == 1"
-              @click="modifyPosterStatusFn(row.id, 0)"
-              class="cursor-pointer"
-              >{{ t('启用') }}</el-tag
-            >
-            <el-tag
-              type="info"
-              v-else
-              @click="modifyPosterStatusFn(row.id, 1)"
-              class="cursor-pointer"
-              >{{ t('未启用') }}</el-tag
-            >
-          </template>
-        </el-table-column>
-        <el-table-column :label="t('isDefault')" min-width="80">
-          <template #default="{ row }">
-            <span v-if="row.is_default == 1" class="text-primary">{{
-              t('defaultPoster')
-            }}</span>
-            <span v-else>{{ t('noDefault') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="update_time"
-          :label="t('updateTime')"
-          min-width="120"
-        />
-
-        <el-table-column
-          :label="t('operation')"
-          fixed="right"
-          align="right"
-          min-width="160"
-        >
-          <template #default="{ row }">
-            <el-button type="primary" link @click="previewPoster(row)">{{
-              t('preview')
-            }}</el-button>
-            <el-button
-              v-if="row.is_default == 0"
-              type="primary"
-              link
-              @click="modifyPosterDefaultFn(row.id)"
-              >{{ t('modifyDefault') }}</el-button
-            >
-            <el-button type="primary" link @click="editEvent(row)">{{
-              t('edit')
-            }}</el-button>
-            <el-button
-              v-if="row.is_default == 0"
-              type="primary"
-              link
-              @click="deleteEvent(row.id)"
-              >{{ t('delete') }}</el-button
-            >
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="mt-[16px] flex justify-end">
-        <el-pagination
-          v-model:current-page="posterTableData.page"
-          v-model:page-size="posterTableData.limit"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="posterTableData.total"
-          @size-change="loadPosterPageList()"
-          @current-change="loadPosterPageList"
-        />
-      </div>
-    </el-card>
-
-    <!--添加海报-->
-    <el-dialog
-      v-model="dialogVisible"
-      :title="t('addPosterTitle')"
-      width="350px"
-    >
-      <el-form
-        :model="formData"
-        label-width="90px"
-        ref="formRef"
-        :rules="formRules"
-      >
-        <el-form-item :label="t('posterName')" prop="name">
-          <el-input
-            v-model.trim="formData.name"
-            :placeholder="t('posterNamePlaceholder')"
-            clearable
-            maxlength="12"
-            show-word-limit
-            class="w-full"
-          />
-        </el-form-item>
-        <el-form-item :label="t('posterType')" prop="type">
-          <el-select
-            v-model="formData.type"
-            :placeholder="t('posterTypePlaceholder')"
-            class="!w-full"
-          >
-            <el-option
-              v-for="item in posterType"
-              :label="item.name"
-              :value="item.type"
-              :key="item.type"
-            />
-          </el-select>
-        </el-form-item>
-      </el-form>
-
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="dialogVisible = false">{{
-            t('cancel')
-          }}</el-button>
-          <el-button type="primary" @click="addEvent(formRef)">{{
-            t('confirm')
-          }}</el-button>
-        </span>
-      </template>
-    </el-dialog>
-
-    <!--预览海报-->
-    <el-dialog
-      v-model="previewDialogVisible"
-      :title="t('previewDialogTitle')"
-      width="400px"
-      height="640px"
-    >
-      <div v-if="previewPosterUrl">
-        <img :src="img(previewPosterUrl)" class="w-[360px] h-[640px]" />
-      </div>
-    </el-dialog>
-  </div>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+                <el-button type="primary" class="w-[100px]" @click="dialogVisible = true">{{ t('添加海报') }}</el-button>
+            </div>
+
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="posterTableData.searchParam" ref="searchFormDiyPosterRef">
+                    <el-form-item :label="t('posterName')" prop="name">
+                        <el-input v-model.trim="posterTableData.searchParam.name" :placeholder="t('posterNamePlaceholder')" />
+                    </el-form-item>
+                    <el-form-item :label="t('posterType')" prop="type">
+                        <el-select v-model="posterTableData.searchParam.type" :placeholder="t('posterTypePlaceholder')">
+                            <el-option :label="t('all')" value="" />
+                            <el-option v-for="item in posterType" :label="item.name" :value="item.type" :key="item.type"/>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="loadPosterPageList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormDiyPosterRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+
+            <el-table :data="posterTableData.data" size="large" v-loading="posterTableData.loading">
+
+                <template #empty>
+                    <span>{{ !posterTableData.loading ? t('emptyData') : '' }}</span>
+                </template>
+
+                <el-table-column prop="name" :label="t('posterName')" min-width="120" />
+                <el-table-column prop="type_name" :label="t('posterType')" min-width="80" />
+                <el-table-column :label="t('status')" min-width="80">
+                    <template #default="{ row }">
+                        <el-tag type="success" v-if="row.status == 1" @click="modifyPosterStatusFn(row.id, 0)" class="cursor-pointer">{{ t('启用') }}</el-tag>
+                        <el-tag type="info" v-else @click="modifyPosterStatusFn(row.id, 1)" class="cursor-pointer">{{ t('未启用') }}</el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column :label="t('isDefault')" min-width="80">
+                    <template #default="{ row }">
+                        <span v-if="row.is_default == 1" class="text-primary">{{ t('defaultPoster') }}</span>
+                        <span v-else>{{ t('noDefault') }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="update_time" :label="t('updateTime')" min-width="120" />
+
+                <el-table-column :label="t('operation')" fixed="right" align="right" min-width="160">
+                    <template #default="{ row }">
+                        <el-button type="primary" link @click="previewPoster(row)">{{ t('preview') }}</el-button>
+                        <el-button v-if="row.is_default == 0" type="primary" link @click="modifyPosterDefaultFn(row.id)">{{ t('modifyDefault') }}</el-button>
+                        <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+                        <el-button v-if="row.is_default == 0" type="primary" link @click="deleteEvent(row.id)">{{ t('delete') }}</el-button>
+                    </template>
+                </el-table-column>
+
+            </el-table>
+            <div class="mt-[16px] flex justify-end">
+                <el-pagination v-model:current-page="posterTableData.page" v-model:page-size="posterTableData.limit"
+                    layout="total, sizes, prev, pager, next, jumper" :total="posterTableData.total"
+                    @size-change="loadPosterPageList()" @current-change="loadPosterPageList" />
+            </div>
+
+        </el-card>
+
+        <!--添加海报-->
+        <el-dialog v-model="dialogVisible" :title="t('addPosterTitle')" width="350px">
+
+            <el-form :model="formData" label-width="90px" ref="formRef" :rules="formRules">
+                <el-form-item :label="t('posterName')" prop="name">
+                    <el-input v-model.trim="formData.name" :placeholder="t('posterNamePlaceholder')" clearable maxlength="12" show-word-limit class="w-full" />
+                </el-form-item>
+                <el-form-item :label="t('posterType')" prop="type">
+                    <el-select v-model="formData.type" :placeholder="t('posterTypePlaceholder')" class="!w-full">
+                        <el-option v-for="item in posterType" :label="item.name" :value="item.type" :key="item.type"/>
+                    </el-select>
+                </el-form-item>
+            </el-form>
+
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="dialogVisible = false">{{ t('cancel') }}</el-button>
+                    <el-button type="primary" @click="addEvent(formRef)">{{ t('confirm') }}</el-button>
+                </span>
+            </template>
+        </el-dialog>
+
+        <!--预览海报-->
+        <el-dialog v-model="previewDialogVisible" :title="t('previewDialogTitle')" width="400px" height="640px">
+
+            <div v-if="previewPosterUrl">
+                <img :src="img(previewPosterUrl)" class="w-[360px] h-[640px]" />
+            </div>
+        </el-dialog>
+
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -209,15 +103,8 @@ import { reactive, ref, computed } from 'vue'
 import { t } from '@/lang'
 import { ElMessageBox, FormInstance } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
-import {
-  getPosterPageList,
-  getPosterType,
-  modifyPosterStatus,
-  modifyPosterDefault,
-  deletePoster,
-  getPreviewPoster,
-} from '@/app/api/poster'
-import { img, setTablePageStorage, getTablePageStorage } from '@/utils/common'
+import { getPosterPageList,getPosterType,modifyPosterStatus,modifyPosterDefault,deletePoster,getPreviewPoster } from '@/app/api/poster'
+import { img,setTablePageStorage,getTablePageStorage } from '@/utils/common'
 
 const router = useRouter()
 const route = useRoute()
@@ -227,153 +114,146 @@ const posterType: any = reactive({}) // 自定义海报类型
 
 // 添加自定义海报
 const formData = reactive({
-  name: '',
-  type: '',
+    name: '',
+    type: ''
 })
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    name: [
-      { required: true, message: t('posterNamePlaceholder'), trigger: 'blur' },
-    ],
-    type: [
-      { required: true, message: t('posterTypePlaceholder'), trigger: 'blur' },
-    ],
-  }
+    return {
+        name: [
+            { required: true, message: t('posterNamePlaceholder'), trigger: 'blur' }
+        ],
+        type: [
+            { required: true, message: t('posterTypePlaceholder'), trigger: 'blur' }
+        ]
+    }
 })
 
 const formRef = ref<FormInstance>()
 const dialogVisible = ref(false)
 const addEvent = async (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      const query = { type: formData.type, name: formData.name }
-      const url = router.resolve({
-        path: '/poster/edit',
-        query,
-      })
-      window.open(url.href)
-      dialogVisible.value = false
-      formData.name = ''
-      formData.type = ''
-    }
-  })
+    if (!formEl) return
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            const query = { type: formData.type, name: formData.name }
+            const url = router.resolve({
+                path: '/poster/edit',
+                query
+            })
+            window.open(url.href)
+            dialogVisible.value = false
+            formData.name = ''
+            formData.type = ''
+        }
+    })
 }
 
 // 获取自定义海报类型
-const loadPosterType = () => {
-  getPosterType({}).then((res: any) => {
-    for (let key in posterType) {
-      delete posterType[key]
-    }
-
-    for (const key in res.data) {
-      posterType[key] = res.data[key]
-    }
-  })
+const loadPosterType = ()=> {
+    getPosterType({}).then((res:any)=>{
+        for (let key in posterType) {
+            delete posterType[key];
+        }
+
+        for (const key in res.data) {
+            posterType[key] = res.data[key]
+        }
+    })
 }
 
-loadPosterType()
+loadPosterType();
 
 const posterTableData: any = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    name: '',
-    type: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        name: '',
+        type: ''
+    }
 })
 
 const searchFormDiyPosterRef = ref<FormInstance>()
 
 // 获取自定义海报列表
 const loadPosterPageList = (page: number = 1) => {
-  posterTableData.loading = true
-  posterTableData.page = page
-
-  getPosterPageList({
-    page: posterTableData.page,
-    limit: posterTableData.limit,
-    ...posterTableData.searchParam,
-  })
-    .then((res) => {
-      posterTableData.loading = false
-      posterTableData.data = res.data.data
-      posterTableData.total = res.data.total
-      setTablePageStorage(
-        posterTableData.page,
-        posterTableData.limit,
-        posterTableData.searchParam
-      )
-    })
-    .catch(() => {
-      posterTableData.loading = false
+    posterTableData.loading = true
+    posterTableData.page = page
+
+    getPosterPageList({
+        page: posterTableData.page,
+        limit: posterTableData.limit,
+        ...posterTableData.searchParam
+    }).then(res => {
+        posterTableData.loading = false
+        posterTableData.data = res.data.data
+        posterTableData.total = res.data.total
+        setTablePageStorage(posterTableData.page, posterTableData.limit, posterTableData.searchParam);
+    }).catch(() => {
+        posterTableData.loading = false
     })
 }
 
-loadPosterPageList(getTablePageStorage(posterTableData.searchParam).page)
+loadPosterPageList(getTablePageStorage(posterTableData.searchParam).page);
 
 // 编辑自定义海报
 const editEvent = (data: any) => {
-  const url = router.resolve({
-    path: '/poster/edit',
-    query: { id: data.id },
-  })
-  window.open(url.href)
+    const url = router.resolve({
+        path: '/poster/edit',
+        query: { id: data.id }
+    })
+    window.open(url.href)
 }
 
 const isRepeat = ref(false)
 
 // 修改海报启用状态
-const modifyPosterStatusFn = (id: any, status: any) => {
-  if (isRepeat.value) return
-  isRepeat.value = true
-
-  modifyPosterStatus({
-    id,
-    status,
-  }).then((res) => {
-    loadPosterPageList()
-    isRepeat.value = false
-  })
-}
+const modifyPosterStatusFn = (id:any,status:any)=> {
+    if (isRepeat.value) return
+    isRepeat.value = true
 
-// 将自定义海报修改为默认海报
-const modifyPosterDefaultFn = (id: any) => {
-  if (isRepeat.value) return
-  isRepeat.value = true
-  modifyPosterDefault({
-    id,
-  }).then((res) => {
-    loadPosterPageList()
-    isRepeat.value = false
-  })
+    modifyPosterStatus({
+        id, status
+    }).then((res) => {
+        loadPosterPageList()
+        isRepeat.value = false
+    })
 }
 
-// 删除自定义海报
-const deleteEvent = (id: number) => {
-  ElMessageBox.confirm(t('diyPosterDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
+// 将自定义海报修改为默认海报
+const modifyPosterDefaultFn = (id:any)=> {
     if (isRepeat.value) return
     isRepeat.value = true
-    deletePoster(id)
-      .then(() => {
+    modifyPosterDefault({
+        id
+    }).then((res) => {
         loadPosterPageList()
         isRepeat.value = false
-      })
-      .catch(() => {
-        isRepeat.value = false
-      })
-  })
+    })
+}
+
+// 删除自定义海报
+const deleteEvent = (id: number) => {
+    ElMessageBox.confirm(t('diyPosterDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        if (isRepeat.value) return
+        isRepeat.value = true
+        deletePoster(id).then(() => {
+            loadPosterPageList()
+            isRepeat.value = false
+        }).catch(() => {
+            isRepeat.value = false
+        })
+    })
 }
 
 const previewDialogVisible = ref(false)
@@ -381,26 +261,28 @@ const previewPosterUrl = ref('')
 
 // 预览海报
 const previewPoster = (data: any) => {
-  if (isRepeat.value) return
-  isRepeat.value = true
-
-  getPreviewPoster({
-    id: data.id,
-    type: data.type,
-  }).then((res: any) => {
-    if (res.data) {
-      previewPosterUrl.value = res.data
-      previewDialogVisible.value = true
-    }
-    isRepeat.value = false
-  })
+    if (isRepeat.value) return
+    isRepeat.value = true
+
+    getPreviewPoster({
+        id:data.id,
+        type:data.type
+    }).then(((res:any)=>{
+        if(res.data) {
+            previewPosterUrl.value = res.data;
+            previewDialogVisible.value = true;
+        }
+        isRepeat.value = false
+    }))
+
 }
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadPosterPageList()
+    if (!formEl) return
+    formEl.resetFields()
+    loadPosterPageList()
 }
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/printer/edit.vue b/admin/src/app/views/printer/edit.vue
index 93f5a8a6..8b4c6e02 100644
--- a/admin/src/app/views/printer/edit.vue
+++ b/admin/src/app/views/printer/edit.vue
@@ -1,477 +1,363 @@
 <template>
-  <div class="main-container">
-    <el-card class="card !border-none mb-[15px]" shadow="never">
-      <el-page-header :content="pageName" :icon="ArrowLeft" @back="back" />
-    </el-card>
-
-    <el-form
-      class="page-form"
-      :model="formData"
-      :rules="formRules"
-      label-width="150px"
-      ref="formRef"
-      v-loading="loading"
-    >
-      <el-card class="box-card !border-none" shadow="never">
-        <h3 class="panel-title !text-sm">{{ t('printerSet') }}</h3>
-
-        <el-form-item :label="t('printerName')" prop="printer_name">
-          <el-input
-            v-model.trim="formData.printer_name"
-            clearable
-            :placeholder="t('printerNamePlaceholder')"
-            class="input-width"
-            maxlength="20"
-          />
-        </el-form-item>
-
-        <el-form-item :label="t('brand')" prop="brand">
-          <el-select
-            v-model="formData.brand"
-            :placeholder="t('brandPlaceholder')"
-            clearable
-          >
-            <el-option
-              v-for="(item, key) in brandList"
-              :key="key"
-              :label="item"
-              :value="key"
-            />
-          </el-select>
-        </el-form-item>
-
-        <el-form-item :label="t('printerCode')" prop="printer_code">
-          <div>
-            <el-input
-              v-model.trim="formData.printer_code"
-              clearable
-              :placeholder="t('printerCodePlaceholder')"
-              class="input-width"
-              maxlength="30"
-            />
-            <p class="text-[12px] text-[#b2b2b2]">{{ t('printerCodeTips') }}</p>
-          </div>
-        </el-form-item>
-
-        <el-form-item :label="t('printerKey')" prop="printer_key">
-          <div>
-            <el-input
-              v-model.trim="formData.printer_key"
-              clearable
-              :placeholder="t('printerKeyPlaceholder')"
-              class="input-width"
-              maxlength="30"
-            />
-            <p class="text-[12px] text-[#b2b2b2]">{{ t('printerKeyTips') }}</p>
-          </div>
-        </el-form-item>
-
-        <el-form-item :label="t('openId')" prop="open_id">
-          <div>
-            <el-input
-              v-model.trim="formData.open_id"
-              clearable
-              :placeholder="t('openIdPlaceholder')"
-              class="input-width"
-              maxlength="30"
-            />
-            <p class="text-[12px] text-[#b2b2b2]">{{ t('openIdTips') }}</p>
-          </div>
-        </el-form-item>
-
-        <el-form-item :label="t('apikey')" prop="apikey">
-          <div>
-            <el-input
-              v-model.trim="formData.apikey"
-              clearable
-              :placeholder="t('apikeyPlaceholder')"
-              class="input-width"
-              maxlength="60"
-            />
-            <p class="text-[12px] text-[#b2b2b2]">{{ t('apikeyTips') }}</p>
-          </div>
-        </el-form-item>
-
-        <el-form-item :label="t('printWidth')" prop="print_width">
-          <el-radio-group v-model="formData.print_width">
-            <el-radio label="58mm">58mm</el-radio>
-          </el-radio-group>
-        </el-form-item>
-
-        <el-form-item :label="t('status')">
-          <el-switch
-            v-model="formData.status"
-            :active-value="1"
-            :inactive-value="0"
-          />
-        </el-form-item>
-      </el-card>
-      <el-card
-        v-for="(item, index) in printerType"
-        :key="item.key"
-        class="box-card !border-none"
-        shadow="never"
-      >
-        <h3 class="panel-title !text-sm">{{ item.title }}</h3>
-
-        <div class="flex mb-[10px] py-[8px] bg-[#F5F7F9] text-[14px]">
-          <div class="px-[12px] w-[200px]">{{ t('printTrigger') }}</div>
-          <div class="px-[12px] w-[100px]">{{ t('status') }}</div>
-          <div class="px-[12px] w-[250px]">{{ t('usePrintTemplate') }}</div>
-          <div
-            class="px-[12px] w-[300px] flex-1"
-            v-for="childItem in item.condition"
-            :key="childItem.key"
-          >
-            {{ childItem.title }}
-          </div>
-          <div class="px-[12px] w-[200px]">{{ t('printNum') }}</div>
-        </div>
-
-        <template v-if="item.trigger">
-          <div
-            class="flex bg-[#f8f8f9] mb-[10px] py-[20px]"
-            v-for="(triggerItem, triggerKey) in item.trigger"
-            :key="triggerKey"
-          >
-            <template v-if="formData.value[item.key]['trigger_' + triggerKey]">
-              <div class="font-bold w-[200px] px-[12px]">{{ triggerItem }}</div>
-              <div class="w-[100px] px-[12px]">
-                <el-switch
-                  v-model="
-                    formData.value[item.key]['trigger_' + triggerKey].status
-                  "
-                  :active-value="1"
-                  :inactive-value="0"
-                />
-              </div>
-              <div class="w-[250px] px-[12px]">
-                <el-select
-                  v-model="
-                    formData.value[item.key]['trigger_' + triggerKey]
-                      .template_id
-                  "
-                  :placeholder="t('请选择小票打印模板')"
-                  clearable
-                >
-                  <el-option
-                    v-for="templateItem in templateList[item.key]"
-                    :key="templateItem.template_id"
-                    :label="templateItem.template_name"
-                    :value="templateItem.template_id"
-                  />
-                </el-select>
-              </div>
-              <template v-for="childItem in item.condition">
-                <div
-                  class="w-[300px] px-[12px] flex-1"
-                  v-if="childItem.type == 'checkbox'"
-                >
-                  <el-checkbox-group
-                    v-model="
-                      formData.value[item.key]['trigger_' + triggerKey][
-                        childItem.key
-                      ]
-                    "
-                  >
-                    <el-checkbox
-                      v-for="(checkboxItem, index) in childItem.list"
-                      :label="checkboxItem.value"
-                      :key="index"
-                      >{{ checkboxItem.name }}</el-checkbox
-                    >
-                  </el-checkbox-group>
-                </div>
-              </template>
-              <div class="w-[200px] px-[12px]">
-                <el-select
-                  v-model="
-                    formData.value[item.key]['trigger_' + triggerKey].print_num
-                  "
-                >
-                  <el-option label="1联" :value="1" />
-                  <el-option label="2联" :value="2" />
-                  <el-option label="3联" :value="3" />
-                  <el-option label="4联" :value="4" />
-                </el-select>
-              </div>
-            </template>
-          </div>
-        </template>
-      </el-card>
-    </el-form>
-
-    <div class="fixed-footer-wrap">
-      <div class="fixed-footer">
-        <el-button type="primary" :loading="repeat" @click="confirm(formRef)">{{
-          t('save')
-        }}</el-button>
-        <el-button @click="back()">{{ t('cancel') }}</el-button>
-      </div>
-    </div>
-  </div>
+	<div class="main-container">
+        <el-card class="card !border-none mb-[15px]" shadow="never">
+            <el-page-header :content="pageName" :icon="ArrowLeft" @back="back" />
+        </el-card>
+
+		<el-form class="page-form" :model="formData" :rules="formRules" label-width="150px" ref="formRef" v-loading="loading">
+			<el-card class="box-card !border-none" shadow="never">
+
+				<h3 class="panel-title !text-sm">{{ t('printerSet') }}</h3>
+
+				<el-form-item :label="t('printerName')" prop="printer_name">
+					<el-input v-model.trim="formData.printer_name" clearable :placeholder="t('printerNamePlaceholder')" class="input-width" maxlength="20" />
+				</el-form-item>
+
+				<el-form-item :label="t('brand')" prop="brand">
+					<el-select v-model="formData.brand" :placeholder="t('brandPlaceholder')" clearable>
+						<el-option v-for="(item,key) in brandList" :key="key" :label="item" :value="key" />
+					</el-select>
+				</el-form-item>
+
+				<el-form-item :label="t('printerCode')" prop="printer_code">
+					<div>
+						<el-input v-model.trim="formData.printer_code" clearable :placeholder="t('printerCodePlaceholder')" class="input-width" maxlength="30" />
+						<p class="text-[12px] text-[#b2b2b2]">{{ t('printerCodeTips') }}</p>
+					</div>
+				</el-form-item>
+
+				<el-form-item :label="t('printerKey')" prop="printer_key">
+					<div>
+						<el-input v-model.trim="formData.printer_key" clearable :placeholder="t('printerKeyPlaceholder')" class="input-width" maxlength="30" />
+						<p class="text-[12px] text-[#b2b2b2]">{{ t('printerKeyTips') }}</p>
+					</div>
+				</el-form-item>
+
+				<el-form-item :label="t('openId')" prop="open_id">
+					<div>
+						<el-input v-model.trim="formData.open_id" clearable :placeholder="t('openIdPlaceholder')" class="input-width" maxlength="30" />
+						<p class="text-[12px] text-[#b2b2b2]">{{ t('openIdTips') }}</p>
+					</div>
+				</el-form-item>
+
+				<el-form-item :label="t('apikey')" prop="apikey">
+					<div>
+						<el-input v-model.trim="formData.apikey" clearable :placeholder="t('apikeyPlaceholder')" class="input-width" maxlength="60" />
+						<p class="text-[12px] text-[#b2b2b2]">{{ t('apikeyTips') }}</p>
+					</div>
+				</el-form-item>
+
+				<el-form-item :label="t('printWidth')" prop="print_width">
+					<el-radio-group v-model="formData.print_width">
+						<el-radio label="58mm">58mm</el-radio>
+					</el-radio-group>
+				</el-form-item>
+
+				<el-form-item :label="t('status')">
+					<el-switch v-model="formData.status" :active-value="1" :inactive-value="0" />
+				</el-form-item>
+
+			</el-card>
+			<el-card v-for="(item,index) in printerType" :key="item.key" class="box-card !border-none" shadow="never">
+				<h3 class="panel-title !text-sm">{{ item.title }}</h3>
+
+				<div class="flex mb-[10px] py-[8px] bg-[#F5F7F9] text-[14px]">
+					<div class="px-[12px] w-[200px]">{{ t('printTrigger') }}</div>
+					<div class="px-[12px] w-[100px]">{{ t('status') }}</div>
+					<div class="px-[12px] w-[250px]">{{ t('usePrintTemplate') }}</div>
+					<div class="px-[12px] w-[300px] flex-1" v-for="childItem in item.condition" :key="childItem.key">{{ childItem.title }}</div>
+					<div class="px-[12px] w-[200px]">{{ t('printNum') }}</div>
+				</div>
+
+				<template v-if="item.trigger">
+					<div class="flex bg-[#f8f8f9] mb-[10px] py-[20px]" v-for="(triggerItem,triggerKey) in item.trigger" :key="triggerKey">
+						<template v-if="formData.value[item.key]['trigger_' + triggerKey]">
+							<div class="font-bold w-[200px] px-[12px]">{{ triggerItem }}</div>
+							<div class="w-[100px] px-[12px]">
+								<el-switch v-model="formData.value[item.key]['trigger_' + triggerKey].status" :active-value="1" :inactive-value="0" />
+							</div>
+							<div class="w-[250px] px-[12px]">
+								<el-select v-model="formData.value[item.key]['trigger_' + triggerKey].template_id" :placeholder="t('请选择小票打印模板')" clearable>
+									<el-option v-for="templateItem in templateList[item.key]" :key="templateItem.template_id" :label="templateItem.template_name" :value="templateItem.template_id" />
+								</el-select>
+							</div>
+							<template v-for="childItem in item.condition">
+								<div class="w-[300px] px-[12px] flex-1" v-if="childItem.type == 'checkbox'">
+									<el-checkbox-group v-model="formData.value[item.key]['trigger_' + triggerKey][childItem.key]">
+										<el-checkbox v-for="(checkboxItem, index) in childItem.list" :label="checkboxItem.value" :key="index">{{ checkboxItem.name }}</el-checkbox>
+									</el-checkbox-group>
+								</div>
+							</template>
+							<div class="w-[200px] px-[12px]">
+								<el-select v-model="formData.value[item.key]['trigger_' + triggerKey].print_num">
+									<el-option label="1联" :value="1" />
+									<el-option label="2联" :value="2" />
+									<el-option label="3联" :value="3" />
+									<el-option label="4联" :value="4" />
+								</el-select>
+							</div>
+						</template>
+					</div>
+				</template>
+
+			</el-card>
+		</el-form>
+
+		<div class="fixed-footer-wrap">
+			<div class="fixed-footer">
+				<el-button type="primary" :loading="repeat" @click="confirm(formRef)">{{ t('save') }}</el-button>
+				<el-button @click="back()">{{ t('cancel') }}</el-button>
+			</div>
+		</div>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { ref, reactive, computed } from 'vue'
-import { t } from '@/lang'
-import { FormInstance, ElMessage } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
-import { deepClone } from '@/utils/common'
-import {
-  addPrinter,
-  editPrinter,
-  getPrinterInfo,
-  getPrinterType,
-  getPrinterBrand,
-  getPrinterTemplateList,
-} from '@/app/api/printer'
-
-const route = useRoute()
-const router = useRouter()
-const repeat = ref(false)
-const loading = ref(true)
-
-const pageName = route.meta.title
-
-/**
- * 表单数据
- */
-const initialFormData: any = {
-  printer_id: route.query.printer_id || 0,
-  brand: '',
-  printer_name: '',
-  printer_code: '',
-  printer_key: '',
-  open_id: '',
-  apikey: '',
-  template_type: [],
-  trigger: [],
-  value: {},
-  print_width: '58mm',
-  status: 1,
-}
-
-const formData: Record<string, any> = reactive({ ...initialFormData })
-
-const formRef = ref<FormInstance>()
-
-// 表单验证规则
-const formRules = computed(() => {
-  return {
-    printer_name: [
-      { required: true, message: t('printerNamePlaceholder'), trigger: 'blur' },
-    ],
-    brand: [
-      { required: true, message: t('brandPlaceholder'), trigger: 'blur' },
-    ],
-    printer_code: [
-      { required: true, message: t('printerCodePlaceholder'), trigger: 'blur' },
-    ],
-    printer_key: [
-      { required: true, message: t('printerKeyPlaceholder'), trigger: 'blur' },
-    ],
-    open_id: [
-      { required: true, message: t('openIdPlaceholder'), trigger: 'blur' },
-    ],
-    apikey: [
-      { required: true, message: t('apikeyPlaceholder'), trigger: 'blur' },
-    ],
-  }
-})
-
-const printerType = ref([])
-
-const init = async () => {
-  await getPrinterType({}).then((res: any) => {
-    if (res.data) {
-      printerType.value = res.data
-
-      for (let i = 0; i < printerType.value.length; i++) {
-        let item: any = printerType.value[i]
-
-        formData.value[item.key] = {}
-
-        let extendData: any = {}
-        for (let ci = 0; ci < item.condition.length; ci++) {
-          let condition = item.condition[ci]
-          extendData[condition.key] = []
-          if (condition.type == 'checkbox') {
-            extendData[condition.key] = [] // 默认全选
-            for (let k = 0; k < condition.list.length; k++) {
-              extendData[condition.key].push(condition.list[k].value)
-            }
-          }
-        }
+    import { ref, reactive, computed } from 'vue'
+    import { t } from '@/lang'
+    import { FormInstance, ElMessage } from 'element-plus'
+    import { useRoute, useRouter } from 'vue-router'
+    import { deepClone } from '@/utils/common';
+    import { addPrinter, editPrinter,getPrinterInfo,getPrinterType,getPrinterBrand,getPrinterTemplateList } from '@/app/api/printer'
+
+    const route = useRoute()
+    const router = useRouter()
+    const repeat = ref(false)
+    const loading = ref(true)
+
+    const pageName = route.meta.title
+
+    /**
+     * 表单数据
+     */
+    const initialFormData:any = {
+        printer_id: route.query.printer_id || 0,
+        brand: '',
+        printer_name: '',
+        printer_code: '',
+        printer_key: '',
+        open_id: '',
+        apikey: '',
+        template_type: [],
+        trigger: [],
+        value: {},
+        print_width: '58mm',
+        status: 1,
+    }
 
-        for (let key in item.trigger) {
-          formData.value[item.key]['trigger_' + key] = {
-            status: 1,
-            template_id: '',
-            print_num: 1,
-          }
-          Object.assign(
-            formData.value[item.key]['trigger_' + key],
-            deepClone(extendData)
-          )
+    const formData: Record<string, any> = reactive({ ...initialFormData })
+
+    const formRef = ref<FormInstance>()
+
+    // 表单验证规则
+    const formRules = computed(() => {
+        return {
+            printer_name: [
+                { required: true, message: t('printerNamePlaceholder'), trigger: 'blur' },
+            ],
+            brand: [
+                { required: true, message: t('brandPlaceholder'), trigger: 'blur' },
+            ],
+            printer_code: [
+                { required: true, message: t('printerCodePlaceholder'), trigger: 'blur' },
+            ],
+            printer_key: [
+                { required: true, message: t('printerKeyPlaceholder'), trigger: 'blur' },
+            ],
+            open_id: [
+                { required: true, message: t('openIdPlaceholder'), trigger: 'blur' },
+            ],
+            apikey: [
+                { required: true, message: t('apikeyPlaceholder'), trigger: 'blur' },
+            ]
         }
-      }
-    }
-    if (!formData.printer_id) {
-      loading.value = false
-    }
-  })
-
-  if (formData.printer_id) {
-    getPrinterInfo(formData.printer_id).then((res: any) => {
-      let data = res.data
-      if (data)
-        Object.keys(formData).forEach((key: string) => {
-          if (data[key] != undefined) {
-            if (key == 'value') {
-              for (let ck in formData[key]) {
-                Object.assign(formData[key][ck], data[key][ck])
-              }
-            } else {
-              formData[key] = data[key]
-            }
-          }
-        })
-      loading.value = false
     })
-  }
-}
-
-init()
-
-const brandList = ref([])
-getPrinterBrand({}).then((res: any) => {
-  brandList.value = res.data
-})
-
-const templateList: any = ref({}) // 小票打印模板列表
-getPrinterTemplateList({}).then((res: any) => {
-  if (res.data) {
-    let data = res.data
-    for (let i = 0; i < data.length; i++) {
-      let item = data[i]
-      if (templateList.value[item.template_type] == undefined) {
-        templateList.value[item.template_type] = []
-      }
-      templateList.value[item.template_type].push({
-        template_id: item.template_id,
-        template_name: item.template_name,
-      })
-    }
-  }
-})
-
-/**
- * 确认
- * @param formEl
- */
-const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-
-  if (printerType.value.length == 0) {
-    ElMessage({
-      type: 'warning',
-      message: t('printTypeEmpty'),
-    })
-    return
-  }
-
-  let save = formData.printer_id ? editPrinter : addPrinter
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      let validateFlag = false
-      let validateMessage = ''
-
-      for (let i = 0; i < printerType.value.length; i++) {
-        let item: any = printerType.value[i]
-
-        for (let k = 0; k < Object.keys(item.trigger).length; k++) {
-          let triggerItem = Object.keys(item.trigger)[k]
-          if (formData.value[item.key]['trigger_' + triggerItem].status == 0) {
-            continue
-          }
-
-          if (!formData.value[item.key]['trigger_' + triggerItem].template_id) {
-            validateFlag = true
-            validateMessage = `请设置${item.title}[${item.trigger[triggerItem]}]的小票打印模板`
-            break
-          }
-
-          let isFail = false
-          for (let ck = 0; ck < item.condition.length; ck++) {
-            let condition = item.condition[ck]
-            if (condition.type == 'checkbox') {
-              if (
-                formData.value[item.key]['trigger_' + triggerItem][
-                  condition.key
-                ].length == 0
-              ) {
-                validateFlag = true
-                validateMessage = `请设置${item.title}[${item.trigger[triggerItem]}]的${condition.title}`
-                isFail = true
-                break
-              }
-            }
-          }
 
-          // 防止重复循环
-          if (isFail) {
-            break
-          }
-        }
+    const printerType = ref([])
+
+    const init = async ()=> {
+        await getPrinterType({}).then((res: any) => {
+            if (res.data) {
+                printerType.value = res.data;
+
+                for (let i = 0; i < printerType.value.length; i++) {
+                    let item: any = printerType.value[i];
+
+                    formData.value[item.key] = {};
+
+                    let extendData: any = {};
+                    for (let ci = 0; ci < item.condition.length; ci++) {
+                        let condition = item.condition[ci];
+                        extendData[condition.key] = [];
+                        if (condition.type == 'checkbox') {
+                            extendData[condition.key] = []; // 默认全选
+                            for (let k = 0; k < condition.list.length; k++) {
+                                extendData[condition.key].push(condition.list[k].value);
+                            }
+                        }
+                    }
+
+                    for (let key in item.trigger) {
+                        formData.value[item.key]['trigger_' + key] = {
+                            status: 1,
+                            template_id: '',
+                            print_num: 1,
+                        };
+                        Object.assign(formData.value[item.key]['trigger_' + key], deepClone(extendData));
+                    }
+                }
 
-        // 防止重复循环
-        if (validateFlag) {
-          break
+            }
+            if (!formData.printer_id) {
+                loading.value = false
+            }
+        })
+
+        if (formData.printer_id) {
+            getPrinterInfo(formData.printer_id).then((res: any) => {
+                let data = res.data;
+                if (data) Object.keys(formData).forEach((key: string) => {
+                    if (data[key] != undefined) {
+                        if (key == 'value') {
+                            for (let ck in formData[key]){
+                                Object.assign(formData[key][ck],data[key][ck])
+                            }
+                        } else {
+                            formData[key] = data[key]
+                        }
+                    }
+                })
+                loading.value = false
+            })
         }
-      }
+    }
 
-      if (validateFlag) {
-        ElMessage({
-          type: 'warning',
-          message: validateMessage,
-        })
-        return
-      }
+    init()
 
-      formData.template_type = []
-      formData.trigger = []
+    const brandList = ref([])
+    getPrinterBrand({}).then((res: any) => {
+        brandList.value = res.data;
+    })
 
-      for (let key in formData.value) {
-        for (let childKey in formData.value[key]) {
-          formData.trigger.push(key + '_' + childKey)
+    const templateList:any = ref({}) // 小票打印模板列表
+    getPrinterTemplateList({}).then((res:any)=> {
+        if (res.data) {
+            let data = res.data;
+            for (let i = 0; i < data.length; i++) {
+                let item = data[i];
+                if (templateList.value[item.template_type] == undefined) {
+                    templateList.value[item.template_type] = []
+                }
+                templateList.value[item.template_type].push({
+                    template_id: item.template_id,
+                    template_name: item.template_name,
+                })
+            }
         }
-        formData.template_type.push(key)
-      }
-
-      if (repeat.value) return
-      repeat.value = true
+    })
 
-      let data = formData
+    /**
+     * 确认
+     * @param formEl
+     */
+    const confirm = async(formEl: FormInstance | undefined) => {
+        if (loading.value || !formEl) return
+
+        if (printerType.value.length == 0) {
+            ElMessage({
+                type: 'warning',
+                message: t('printTypeEmpty')
+            })
+            return;
+        }
 
-      save(data)
-        .then((res) => {
-          repeat.value = false
-          if (!formData.printer_id) {
-            router.push('/printer/list')
-          }
-        })
-        .catch((err) => {
-          repeat.value = false
+        let save = formData.printer_id ? editPrinter : addPrinter
+
+        await formEl.validate(async(valid) => {
+            if (valid) {
+
+                let validateFlag = false;
+                let validateMessage = '';
+
+                for (let i = 0; i < printerType.value.length; i++) {
+                    let item: any = printerType.value[i];
+
+                    for (let k = 0; k < Object.keys(item.trigger).length; k++) {
+                        let triggerItem = Object.keys(item.trigger)[k];
+                        if (formData.value[item.key]['trigger_' + triggerItem].status == 0) {
+                            continue;
+                        }
+
+                        if (!formData.value[item.key]['trigger_' + triggerItem].template_id) {
+                            validateFlag = true;
+                            validateMessage = `请设置${ item.title }[${ item.trigger[triggerItem] }]的小票打印模板`
+                            break;
+                        }
+
+                        let isFail = false;
+                        for (let ck = 0; ck < item.condition.length; ck++) {
+                            let condition = item.condition[ck];
+                            if (condition.type == 'checkbox') {
+                                if (formData.value[item.key]['trigger_' + triggerItem][condition.key].length == 0) {
+                                    validateFlag = true;
+                                    validateMessage = `请设置${ item.title }[${ item.trigger[triggerItem] }]的${ condition.title }`
+                                    isFail = true;
+                                    break;
+                                }
+                            }
+                        }
+
+                        // 防止重复循环
+                        if (isFail) {
+                            break;
+                        }
+
+                    }
+
+                    // 防止重复循环
+                    if (validateFlag) {
+                        break;
+                    }
+                }
+
+                if (validateFlag) {
+                    ElMessage({
+                        type: 'warning',
+                        message: validateMessage
+                    })
+                    return;
+                }
+
+                formData.template_type = [];
+                formData.trigger = [];
+
+                for (let key in formData.value) {
+                    for (let childKey in formData.value[key]) {
+                        formData.trigger.push(key + '_' + childKey);
+                    }
+                    formData.template_type.push(key)
+                }
+
+                if (repeat.value) return
+                repeat.value = true
+
+                let data = formData
+
+                save(data).then(res => {
+                    repeat.value = false
+                    if (!formData.printer_id) {
+                        router.push('/printer/list')
+                    }
+                }).catch(err => {
+                    repeat.value = false
+                })
+            }
         })
     }
-  })
-}
 
-const back = () => {
-  router.push('/printer/list')
-}
+    const back = () => {
+        router.push('/printer/list')
+    }
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/printer/list.vue b/admin/src/app/views/printer/list.vue
index 7e06fe67..055e5d59 100644
--- a/admin/src/app/views/printer/list.vue
+++ b/admin/src/app/views/printer/list.vue
@@ -1,184 +1,97 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center mb-[5px]">
-        <span class="text-lg">{{ pageName }}</span>
-        <el-button type="primary" @click="addEvent">
-          {{ t('addPrinter') }}
-        </el-button>
-      </div>
-
-      <el-tabs
-        class="demo-tabs"
-        model-value="/printer/list"
-        @tab-change="handleClick"
-      >
-        <el-tab-pane :label="t('tabPrinterManager')" name="/printer/list" />
-        <el-tab-pane
-          :label="t('tabPrinterTemplate')"
-          name="/printer/template/list"
-        />
-      </el-tabs>
-
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="printerTable.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('printerName')" prop="printer_name">
-            <el-input
-              v-model.trim="printerTable.searchParam.printer_name"
-              :placeholder="t('printerNamePlaceholder')"
-              maxlength="20"
-            />
-          </el-form-item>
-
-          <el-form-item>
-            <el-button type="primary" @click="loadPrinterList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
-
-      <div class="mt-[10px]">
-        <el-table
-          :data="printerTable.data"
-          size="large"
-          v-loading="printerTable.loading"
-        >
-          <template #empty>
-            <span>{{ !printerTable.loading ? t('emptyData') : '' }}</span>
-          </template>
-
-          <el-table-column
-            prop="printer_name"
-            :label="t('printerName')"
-            min-width="220"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="brand_name"
-            :label="t('brand')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="print_width"
-            :label="t('printWidth')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="status"
-            :label="t('status')"
-            min-width="80"
-            :show-overflow-tooltip="true"
-          >
-            <template #default="{ row }">
-              <el-tag
-                type="success"
-                v-if="row.status == 1"
-                @click="modifyPrinterStatusEvent(row.printer_id, 0)"
-                class="cursor-pointer"
-                >{{ t('statusOn') }}</el-tag
-              >
-              <el-tag
-                type="info"
-                v-else
-                @click="modifyPrinterStatusEvent(row.printer_id, 1)"
-                class="cursor-pointer"
-                >{{ t('statusOff') }}</el-tag
-              >
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            :label="t('operation')"
-            fixed="right"
-            min-width="120"
-          >
-            <template #default="{ row }">
-              <el-button
-                type="primary"
-                link
-                @click="testPrintEvent(row.printer_id)"
-                >{{ t('testPrint') }}</el-button
-              >
-              <el-button
-                type="primary"
-                link
-                @click="refreshTokenEvent(row.printer_id)"
-                >{{ t('refreshToken') }}</el-button
-              >
-              <el-button type="primary" link @click="editEvent(row)">{{
-                t('edit')
-              }}</el-button>
-              <el-button
-                type="primary"
-                link
-                @click="deleteEvent(row.printer_id)"
-                >{{ t('delete') }}</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="printerTable.page"
-            v-model:page-size="printerTable.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="printerTable.total"
-            @size-change="loadPrinterList()"
-            @current-change="loadPrinterList"
-          />
-        </div>
-      </div>
-    </el-card>
-  </div>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+
+            <div class="flex justify-between items-center mb-[5px]">
+                <span class="text-lg">{{pageName}}</span>
+                <el-button type="primary" @click="addEvent">
+                    {{ t('addPrinter') }}
+                </el-button>
+            </div>
+
+            <el-tabs class="demo-tabs" model-value="/printer/list" @tab-change="handleClick">
+                <el-tab-pane :label="t('tabPrinterManager')" name="/printer/list" />
+                <el-tab-pane :label="t('tabPrinterTemplate')" name="/printer/template/list" />
+            </el-tabs>
+
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="printerTable.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('printerName')" prop="printer_name">
+                        <el-input v-model.trim="printerTable.searchParam.printer_name" :placeholder="t('printerNamePlaceholder')" maxlength="20" />
+                    </el-form-item>
+
+                    <el-form-item>
+                        <el-button type="primary" @click="loadPrinterList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+
+            <div class="mt-[10px]">
+                <el-table :data="printerTable.data" size="large" v-loading="printerTable.loading">
+                    <template #empty>
+                        <span>{{ !printerTable.loading ? t('emptyData') : '' }}</span>
+                    </template>
+
+                    <el-table-column prop="printer_name" :label="t('printerName')" min-width="220" :show-overflow-tooltip="true"/>
+
+                    <el-table-column prop="brand_name" :label="t('brand')" min-width="120" :show-overflow-tooltip="true"/>
+
+                    <el-table-column prop="print_width" :label="t('printWidth')" min-width="120" :show-overflow-tooltip="true"/>
+
+                    <el-table-column prop="status" :label="t('status')" min-width="80" :show-overflow-tooltip="true" >
+                        <template #default="{ row }">
+	                        <el-tag type="success" v-if="row.status == 1" @click="modifyPrinterStatusEvent(row.printer_id, 0)" class="cursor-pointer">{{ t('statusOn') }}</el-tag>
+	                        <el-tag type="info" v-else @click="modifyPrinterStatusEvent(row.printer_id, 1)" class="cursor-pointer">{{ t('statusOff') }}</el-tag>
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column :label="t('operation')" fixed="right" min-width="120">
+                       <template #default="{ row }">
+                           <el-button type="primary" link @click="testPrintEvent(row.printer_id)">{{ t('testPrint') }}</el-button>
+                           <el-button type="primary" link @click="refreshTokenEvent(row.printer_id)">{{ t('refreshToken') }}</el-button>
+                           <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+                           <el-button type="primary" link @click="deleteEvent(row.printer_id)">{{ t('delete') }}</el-button>
+                       </template>
+                    </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="printerTable.page" v-model:page-size="printerTable.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="printerTable.total"
+                        @size-change="loadPrinterList()" @current-change="loadPrinterList" />
+                </div>
+            </div>
+
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
 import { t } from '@/lang'
-import {
-  getPrinterPageList,
-  modifyPrinterStatus,
-  deletePrinter,
-  refreshPrinterToken,
-  testPrint,
-} from '@/app/api/printer'
-import { ElMessageBox, FormInstance } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { getPrinterPageList, modifyPrinterStatus, deletePrinter,refreshPrinterToken,testPrint } from '@/app/api/printer'
+import { ElMessageBox,FormInstance } from 'element-plus'
+import { useRoute,useRouter } from 'vue-router'
 
 const route = useRoute()
 const router = useRouter()
-const pageName = route.meta.title
+const pageName = route.meta.title;
 const repeat = ref(false)
 
 const handleClick = (path: string) => {
-  router.push({ path })
+    router.push({ path })
 }
 
 const printerTable = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    printer_name: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam:{
+      printer_name:''
+    }
 })
 
 const searchFormRef = ref<FormInstance>()
@@ -187,21 +100,19 @@ const searchFormRef = ref<FormInstance>()
  * 获取小票打印机列表
  */
 const loadPrinterList = (page: number = 1) => {
-  printerTable.loading = true
-  printerTable.page = page
-
-  getPrinterPageList({
-    page: printerTable.page,
-    limit: printerTable.limit,
-    ...printerTable.searchParam,
-  })
-    .then((res) => {
-      printerTable.loading = false
-      printerTable.data = res.data.data
-      printerTable.total = res.data.total
-    })
-    .catch(() => {
-      printerTable.loading = false
+    printerTable.loading = true
+    printerTable.page = page
+
+    getPrinterPageList({
+        page: printerTable.page,
+        limit: printerTable.limit,
+         ...printerTable.searchParam
+    }).then(res => {
+        printerTable.loading = false
+        printerTable.data = res.data.data
+        printerTable.total = res.data.total
+    }).catch(() => {
+        printerTable.loading = false
     })
 }
 
@@ -211,23 +122,23 @@ const isRepeat = ref(false)
 
 // 修改小票打印机状态
 const modifyPrinterStatusEvent = (printer_id: any, status: any) => {
-  if (isRepeat.value) return
-  isRepeat.value = true
+    if (isRepeat.value) return
+    isRepeat.value = true
 
-  modifyPrinterStatus({
-    printer_id,
-    status,
-  }).then((res) => {
-    loadPrinterList()
-    isRepeat.value = false
-  })
+    modifyPrinterStatus({
+        printer_id,
+        status
+    }).then((res) => {
+        loadPrinterList()
+        isRepeat.value = false
+    })
 }
 
 /**
  * 添加小票打印机
  */
 const addEvent = () => {
-  router.push('/printer/add')
+    router.push('/printer/add')
 }
 
 /**
@@ -235,35 +146,35 @@ const addEvent = () => {
  * @param data
  */
 const editEvent = (data: any) => {
-  router.push('/printer/edit?printer_id=' + data.printer_id)
+    router.push('/printer/edit?printer_id=' + data.printer_id)
 }
 
 /**
  * 删除小票打印机
  */
 const deleteEvent = (id: number) => {
-  ElMessageBox.confirm(t('printerDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    if (repeat.value) return
-    repeat.value = true
-    deletePrinter(id)
-      .then(() => {
-        loadPrinterList()
-        repeat.value = false
-      })
-      .catch(() => {
-        repeat.value = false
-      })
-  })
+    ElMessageBox.confirm(t('printerDeleteTips'), t('warning'),
+            {
+                confirmButtonText: t('confirm'),
+                cancelButtonText: t('cancel'),
+                type: 'warning',
+            }
+    ).then(() => {
+        if (repeat.value) return
+        repeat.value = true
+        deletePrinter(id).then(() => {
+            loadPrinterList()
+            repeat.value = false
+        }).catch(() => {
+            repeat.value = false
+        })
+    })
 }
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadPrinterList()
+    if (!formEl) return
+    formEl.resetFields()
+    loadPrinterList()
 }
 
 /**
@@ -271,21 +182,21 @@ const resetForm = (formEl: FormInstance | undefined) => {
  * @param printer_id
  */
 const testPrintEvent = (printer_id: any) => {
-  ElMessageBox.confirm(t('testPrintTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    if (repeat.value) return
-    repeat.value = true
-    testPrint(printer_id)
-      .then((res: any) => {
-        repeat.value = false
-      })
-      .catch(() => {
-        repeat.value = false
-      })
-  })
+    ElMessageBox.confirm(t('testPrintTips'), t('warning'),
+            {
+                confirmButtonText: t('confirm'),
+                cancelButtonText: t('cancel'),
+                type: 'warning',
+            }
+    ).then(() => {
+        if (repeat.value) return
+        repeat.value = true
+        testPrint(printer_id).then((res: any) => {
+            repeat.value = false
+        }).catch(() => {
+            repeat.value = false
+        })
+    })
 }
 
 /**
@@ -293,23 +204,24 @@ const testPrintEvent = (printer_id: any) => {
  * @param printer_id
  */
 const refreshTokenEvent = (printer_id: any) => {
-  ElMessageBox.confirm(t('refreshTokenTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    if (repeat.value) return
-    repeat.value = true
-    refreshPrinterToken(printer_id)
-      .then((res: any) => {
-        loadPrinterList()
-        repeat.value = false
-      })
-      .catch(() => {
-        repeat.value = false
-      })
-  })
+    ElMessageBox.confirm(t('refreshTokenTips'), t('warning'),
+            {
+                confirmButtonText: t('confirm'),
+                cancelButtonText: t('cancel'),
+                type: 'warning',
+            }
+    ).then(() => {
+        if (repeat.value) return
+        repeat.value = true
+        refreshPrinterToken(printer_id).then((res: any) => {
+            loadPrinterList()
+            repeat.value = false
+        }).catch(() => {
+            repeat.value = false
+        })
+    })
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
\ No newline at end of file
diff --git a/admin/src/app/views/printer/template_edit.vue b/admin/src/app/views/printer/template_edit.vue
index d1bcb539..f92ca203 100644
--- a/admin/src/app/views/printer/template_edit.vue
+++ b/admin/src/app/views/printer/template_edit.vue
@@ -1,455 +1,350 @@
 <template>
-  <div class="main-container">
-    <el-card class="card !border-none mb-[15px]" shadow="never">
-      <el-page-header :content="pageName" :icon="ArrowLeft" @back="back" />
-    </el-card>
-
-    <el-form
-      class="page-form"
-      :model="formData"
-      :rules="formRules"
-      label-width="150px"
-      ref="formRef"
-      v-loading="loading"
-    >
-      <div class="flex">
-        <div class="flex-1 mr-[20px] bg-[#fff]">
-          <el-card class="box-card !border-none" shadow="never">
-            <h3 class="panel-title !text-sm">{{ t('templateInfoLabel') }}</h3>
-
-            <el-form-item :label="t('templateName')" prop="template_name">
-              <el-input
-                v-model.trim="formData.template_name"
-                clearable
-                :placeholder="t('templateNamePlaceholder')"
-                class="input-width"
-                maxlength="20"
-              />
-            </el-form-item>
-
-            <el-form-item
-              :label="t('templateType')"
-              prop="template_type"
-              v-if="printerType.length"
-            >
-              <el-radio-group v-model="formData.template_type">
-                <el-radio
-                  v-for="item in printerType"
-                  :key="item.key"
-                  :label="item.key"
-                  @change="handlePrintType"
-                  >{{ item.title }}</el-radio
-                >
-              </el-radio-group>
-            </el-form-item>
-          </el-card>
-          <el-card
-            class="box-card !border-none"
-            shadow="never"
-            v-if="printerType.length"
-          >
-            <h3 class="panel-title !text-sm">{{ t('templateEditLabel') }}</h3>
-
-            <div
-              v-for="item in template"
-              :key="item.key"
-              class="bg-[#f8f8f9] mb-[20px] py-[20px] px-[40px] text-[14px]"
-            >
-              <h4 class="panel-title !text-sm">{{ item.title }}</h4>
-              <div
-                v-for="(childItem, index) in item.list"
-                :key="childItem.key"
-                class="ml-[30px]"
-                :style="{
-                  'margin-bottom': item.list.length == index + 1 ? '0' : '20px',
-                }"
-              >
-                <div class="flex">
-                  <el-checkbox
-                    v-model="formData.value[item.key][childItem.key].status"
-                    v-if="childItem.label"
-                    :label="childItem.label"
-                    :value="childItem.status"
-                    :true-value="1"
-                    :false-value="0"
-                    class="w-[180px] mr-[10px]"
-                    :disabled="childItem.disabled"
-                  />
-
-                  <template v-if="childItem.type == 'input'">
-                    <el-input
-                      v-model.trim="
-                        formData.value[item.key][childItem.key].value
-                      "
-                      clearable
-                      :placeholder="
-                        '请输入' +
-                        (childItem.placeholder
-                          ? childItem.placeholder
-                          : childItem.label)
-                      "
-                      class="input-width mr-[30px]"
-                      maxlength="32"
-                    />
-                  </template>
-
-                  <template v-if="childItem.type == 'checkbox'">
-                    <el-checkbox-group
-                      v-model="formData.value[item.key][childItem.key].value"
-                      class="mr-[30px]"
-                    >
-                      <el-checkbox
-                        v-for="(checkboxItem, key) in childItem.list"
-                        :label="key"
-                        :key="key"
-                        :disabled="childItem.disabled"
-                        >{{ checkboxItem }}</el-checkbox
-                      >
-                    </el-checkbox-group>
-                  </template>
-
-                  <template v-if="childItem.type == 'select'">
-                    <div
-                      class="leading-[30px] w-[50px] text-center text-[#707070] bg-[#d7d7d7] border-1 border-solid border-[#ededed]"
-                    >
-                      {{ childItem.text }}
-                    </div>
-                    <el-select
-                      v-model="formData.value[item.key][childItem.key].value"
-                      class="!w-[130px] mr-[30px]"
-                    >
-                      <el-option
-                        v-for="(item, key) in childItem.list"
-                        :key="key"
-                        :label="item"
-                        :value="key"
-                      />
-                    </el-select>
-                  </template>
-
-                  <template v-if="childItem.fontSize">
-                    <div class="flex mr-[30px]">
-                      <div
-                        class="leading-[30px] w-[50px] text-center text-[#707070] bg-[#d7d7d7] border-1 border-solid border-[#ededed]"
-                      >
-                        字号
-                      </div>
-                      <el-select
-                        v-model="
-                          formData.value[item.key][childItem.key].fontSize
-                        "
-                        class="!w-[130px]"
-                      >
-                        <el-option label="小" value="normal" />
-                        <!--												<el-option label="小" value="small" />-->
-                        <el-option label="大" value="big" />
-                      </el-select>
-                    </div>
-                  </template>
-
-                  <template v-if="childItem.fontWeight">
-                    <div class="flex mr-[30px]">
-                      <div
-                        class="leading-[30px] w-[50px] text-center text-[#707070] bg-[#d7d7d7] border-1 border-solid border-[#ededed]"
-                      >
-                        粗细
-                      </div>
-                      <el-select
-                        v-model="
-                          formData.value[item.key][childItem.key].fontWeight
-                        "
-                        class="!w-[130px]"
-                      >
-                        <el-option label="正常" value="normal" />
-                        <el-option label="加粗" value="bold" />
-                      </el-select>
-                    </div>
-                  </template>
-                </div>
-
-                <div
-                  v-if="childItem.remark"
-                  class="text-[12px] text-[#b2b2b2] mt-[10px]"
-                >
-                  {{ childItem.remark }}
-                </div>
-              </div>
-            </div>
-          </el-card>
-        </div>
-
-        <el-card class="box-card !border-none w-[450px]" shadow="never">
-          <h3 class="panel-title !text-sm">{{ t('preview') }}</h3>
-
-          <!-- 动态加载组件 -->
-          <component :is="modules[previewPath]" :value="formData.value" />
+	<div class="main-container">
+        <el-card class="card !border-none mb-[15px]" shadow="never">
+            <el-page-header :content="pageName" :icon="ArrowLeft" @back="back" />
         </el-card>
-      </div>
-    </el-form>
-
-    <div class="fixed-footer-wrap">
-      <div class="fixed-footer">
-        <el-button type="primary" :loading="repeat" @click="confirm(formRef)">{{
-          t('save')
-        }}</el-button>
-        <el-button @click="back()">{{ t('cancel') }}</el-button>
-      </div>
-    </div>
-  </div>
+
+		<el-form class="page-form" :model="formData" :rules="formRules" label-width="150px" ref="formRef" v-loading="loading">
+
+			<div class="flex">
+
+				<div class="flex-1 mr-[20px] bg-[#fff]">
+
+					<el-card class="box-card !border-none" shadow="never">
+
+						<h3 class="panel-title !text-sm">{{ t('templateInfoLabel') }}</h3>
+
+						<el-form-item :label="t('templateName')" prop="template_name">
+							<el-input v-model.trim="formData.template_name" clearable :placeholder="t('templateNamePlaceholder')" class="input-width" maxlength="20" />
+						</el-form-item>
+
+						<el-form-item :label="t('templateType')" prop="template_type" v-if="printerType.length">
+							<el-radio-group v-model="formData.template_type">
+								<el-radio v-for="item in printerType" :key="item.key" :label="item.key" @change="handlePrintType">{{ item.title }}</el-radio>
+							</el-radio-group>
+						</el-form-item>
+
+					</el-card>
+					<el-card class="box-card !border-none" shadow="never" v-if="printerType.length">
+
+						<h3 class="panel-title !text-sm">{{ t('templateEditLabel') }}</h3>
+
+						<div v-for="item in template" :key="item.key" class="bg-[#f8f8f9] mb-[20px] py-[20px] px-[40px] text-[14px]">
+							<h4 class="panel-title !text-sm">{{ item.title }}</h4>
+							<div v-for="(childItem,index) in item.list" :key="childItem.key" class="ml-[30px]" :style="{ 'margin-bottom' : item.list.length == (index + 1) ? '0' : '20px' }">
+								<div class="flex">
+									<el-checkbox v-model="formData.value[item.key][childItem.key].status" v-if="childItem.label" :label="childItem.label" :value="childItem.status" :true-value="1" :false-value="0" class="w-[180px] mr-[10px]" :disabled="childItem.disabled" />
+
+									<template v-if="childItem.type == 'input'">
+										<el-input v-model.trim="formData.value[item.key][childItem.key].value" clearable :placeholder="'请输入' + (childItem.placeholder ? childItem.placeholder : childItem.label)" class="input-width mr-[30px]" maxlength="32" />
+									</template>
+
+									<template v-if="childItem.type == 'checkbox'">
+										<el-checkbox-group v-model="formData.value[item.key][childItem.key].value" class="mr-[30px]">
+											<el-checkbox v-for="(checkboxItem, key) in childItem.list" :label="key" :key="key" :disabled="childItem.disabled">{{ checkboxItem }}</el-checkbox>
+										</el-checkbox-group>
+									</template>
+
+									<template v-if="childItem.type == 'select'">
+
+										<div class="leading-[30px] w-[50px] text-center text-[#707070] bg-[#d7d7d7] border-1 border-solid border-[#ededed]">{{ childItem.text }}</div>
+										<el-select v-model="formData.value[item.key][childItem.key].value" class="!w-[130px] mr-[30px]">
+											<el-option v-for="(item,key) in childItem.list" :key="key" :label="item" :value="key" />
+										</el-select>
+
+									</template>
+
+									<template v-if="childItem.fontSize">
+										<div class="flex mr-[30px]">
+											<div class="leading-[30px] w-[50px] text-center text-[#707070] bg-[#d7d7d7] border-1 border-solid border-[#ededed]">字号</div>
+											<el-select v-model="formData.value[item.key][childItem.key].fontSize" class="!w-[130px]">
+												<el-option label="小" value="normal" />
+<!--												<el-option label="小" value="small" />-->
+												<el-option label="大" value="big" />
+											</el-select>
+										</div>
+
+									</template>
+
+									<template v-if="childItem.fontWeight">
+
+										<div class="flex mr-[30px]">
+											<div class="leading-[30px] w-[50px] text-center text-[#707070] bg-[#d7d7d7] border-1 border-solid border-[#ededed]">粗细</div>
+											<el-select v-model="formData.value[item.key][childItem.key].fontWeight" class="!w-[130px]">
+												<el-option label="正常" value="normal" />
+												<el-option label="加粗" value="bold" />
+											</el-select>
+										</div>
+									</template>
+
+								</div>
+
+								<div v-if="childItem.remark" class="text-[12px] text-[#b2b2b2] mt-[10px]">{{ childItem.remark }}</div>
+
+							</div>
+
+						</div>
+
+					</el-card>
+				</div>
+
+				<el-card class="box-card !border-none w-[450px]" shadow="never">
+
+					<h3 class="panel-title !text-sm">{{ t('preview') }}</h3>
+
+					<!-- 动态加载组件 -->
+					<component :is="modules[previewPath]" :value="formData.value"/>
+
+				</el-card>
+
+			</div>
+
+		</el-form>
+
+		<div class="fixed-footer-wrap">
+			<div class="fixed-footer">
+				<el-button type="primary" :loading="repeat" @click="confirm(formRef)">{{ t('save') }}</el-button>
+				<el-button @click="back()">{{ t('cancel') }}</el-button>
+			</div>
+		</div>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { ref, reactive, computed } from 'vue'
-import { t } from '@/lang'
-import { FormInstance, ElMessage } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
-import {
-  getPrinterType,
-  addPrinterTemplate,
-  editPrinterTemplate,
-  getPrinterTemplateInfo,
-} from '@/app/api/printer'
-
-const route = useRoute()
-const router = useRouter()
-const pageName = route.meta.title
-const repeat = ref(false)
-const loading = ref(true)
-
-/**
- * 表单数据
- */
-const initialFormData: any = {
-  template_id: route.query.template_id || 0,
-  template_type: '',
-  template_name: '',
-  value: {},
-}
-
-const formData: Record<string, any> = reactive({ ...initialFormData })
-
-const formRef = ref<FormInstance>()
-
-// 表单验证规则
-const formRules = computed(() => {
-  return {
-    template_name: [
-      {
-        required: true,
-        message: t('templateNamePlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    template_type: [
-      {
-        required: true,
-        message: t('templateTypePlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-  }
-})
-
-// 动态加载组件
-const modulesFiles = import.meta.glob('./components/*.vue', { eager: true })
-const addonModulesFiles = import.meta.glob(
-  '@/addon/**/views/printer/components/*.vue',
-  { eager: true }
-)
-addonModulesFiles && Object.assign(modulesFiles, addonModulesFiles)
-
-const modules: any = {}
-for (const [key, value] of Object.entries(modulesFiles)) {
-  const moduleName: any = key.split('/').pop()
-  const name = moduleName.split('.')[0]
-  modules[name] = value.default
-}
-
-const previewPath = ref('')
-const printerType: any = ref([])
-const template: any = ref([])
-
-const init = async () => {
-  await getPrinterType({}).then((res: any) => {
-    if (res.data && res.data.length) {
-      printerType.value = res.data
-      handlePrintType(
-        printerType.value[0].key,
-        Boolean(parseInt(formData.template_id))
-      )
+    import { ref, reactive, computed } from 'vue'
+    import { t } from '@/lang'
+    import { FormInstance, ElMessage } from 'element-plus'
+    import { useRoute, useRouter } from 'vue-router'
+    import { getPrinterType, addPrinterTemplate, editPrinterTemplate, getPrinterTemplateInfo } from '@/app/api/printer'
+
+    const route = useRoute()
+    const router = useRouter()
+    const pageName = route.meta.title
+    const repeat = ref(false)
+    const loading = ref(true)
+
+    /**
+     * 表单数据
+     */
+    const initialFormData:any = {
+        template_id: route.query.template_id || 0,
+        template_type: '',
+        template_name: '',
+        value: {},
     }
-    if (!formData.template_id) {
-      loading.value = false
-    }
-  })
-
-  if (formData.template_id) {
-    getPrinterTemplateInfo(formData.template_id).then((res: any) => {
-      let data = res.data
-      if (data && Object.keys(data).length) {
-        Object.keys(formData).forEach((key: string) => {
-          if (key == 'value') {
-            for (let ck in formData[key]) {
-              Object.assign(formData[key][ck], data[key][ck])
-            }
-          } else {
-            formData[key] = data[key]
-          }
-        })
-        loading.value = false
-      } else {
-        ElMessage({
-          type: 'warning',
-          duration: 1500,
-          message: t('printTemplateEmpty'),
-        })
-        setTimeout(() => {
-          back()
-          loading.value = false
-        }, 2000)
-      }
+
+    const formData: Record<string, any> = reactive({ ...initialFormData })
+
+    const formRef = ref<FormInstance>()
+
+    // 表单验证规则
+    const formRules = computed(() => {
+        return {
+            template_name: [
+                { required: true, message: t('templateNamePlaceholder'), trigger: 'blur' },
+            ],
+            template_type: [
+                { required: true, message: t('templateTypePlaceholder'), trigger: 'blur' },
+            ]
+        }
     })
-  }
-}
-
-init()
-
-// 切换模板类型
-const handlePrintType = (value: any, load: boolean = false) => {
-  for (let i = 0; i < printerType.value.length; i++) {
-    if (printerType.value[i].key == value) {
-      formData.template_type = printerType.value[i].key
-      previewPath.value = printerType.value[i].path
-      template.value = printerType.value[i].template
-      break
-    }
-  }
-
-  // 清空模板内容数据
-  for (let key in formData.value) {
-    delete formData.value[key]
-  }
-
-  refreshTemplateData()
-}
-
-// 刷新模板内容数据
-const refreshTemplateData = () => {
-  for (let i = 0; i < template.value.length; i++) {
-    let item: any = template.value[i]
-    formData.value[item.key] = {}
-    for (let k = 0; k < item.list.length; k++) {
-      let childItem = item.list[k]
-      formData.value[item.key][childItem.key] = {
-        type: childItem.type,
-        value: childItem.value,
-        status: childItem.status,
-        fontSize: childItem.fontSize,
-        fontWeight: childItem.fontWeight,
-      }
+
+    // 动态加载组件
+    const modulesFiles = import.meta.glob('./components/*.vue', { eager: true })
+    const addonModulesFiles = import.meta.glob('@/addon/**/views/printer/components/*.vue', { eager: true })
+    addonModulesFiles && Object.assign(modulesFiles, addonModulesFiles)
+
+    const modules:any = {}
+    for (const [key, value] of Object.entries(modulesFiles)) {
+        const moduleName:any = key.split('/').pop()
+        const name = moduleName.split('.')[0]
+        modules[name] = value.default
     }
-  }
-}
-
-/**
- * 确认
- * @param formEl
- */
-const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-
-  if (printerType.value.length == 0) {
-    ElMessage({
-      type: 'warning',
-      message: t('printTypeEmpty'),
-    })
-    return
-  }
-
-  let save = formData.template_id ? editPrinterTemplate : addPrinterTemplate
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      let validateFlag = false
-      let validateMessage = ''
-
-      for (let i = 0; i < template.value.length; i++) {
-        let item: any = template.value[i]
-        let isFail = false
-
-        for (let k = 0; k < item.list.length; k++) {
-          let childItem = item.list[k]
-          if (formData.value[item.key][childItem.key].status == 0) {
-            continue
-          }
-          if (childItem.type == 'input') {
-            if (formData.value[item.key][childItem.key].value == '') {
-              validateFlag = true
-              validateMessage = `请输入${childItem.label}`
-              isFail = true
-              break
+
+    const previewPath = ref('')
+    const printerType:any = ref([])
+    const template:any = ref([])
+
+    const init = async ()=> {
+        await getPrinterType({}).then((res: any) => {
+            if (res.data && res.data.length) {
+                printerType.value = res.data;
+                handlePrintType(printerType.value[0].key, Boolean(parseInt(formData.template_id)));
             }
-          } else if (childItem.type == 'select') {
-            if (formData.value[item.key][childItem.key].value == '') {
-              validateFlag = true
-              validateMessage = `${childItem.label}未设置[${childItem.text}]`
-              isFail = true
-              break
+            if (!formData.template_id) {
+                loading.value = false
+            }
+        })
+
+        if(formData.template_id) {
+            getPrinterTemplateInfo(formData.template_id).then((res:any)=>{
+                let data = res.data;
+                if (data && Object.keys(data).length) {
+                    Object.keys(formData).forEach((key: string) => {
+                        if (key == 'value') {
+                            for (let ck in formData[key]){
+                                Object.assign(formData[key][ck],data[key][ck])
+                            }
+                        } else {
+                            formData[key] = data[key]
+                        }
+                    })
+                    loading.value = false
+                }else {
+                    ElMessage({
+                        type: 'warning',
+                        duration: 1500,
+                        message: t('printTemplateEmpty')
+                    })
+                    setTimeout(()=>{
+                        back();
+                        loading.value = false
+                    }, 2000);
+                }
+            })
+        }
+    };
+
+    init();
+
+    // 切换模板类型
+    const handlePrintType = (value: any, load: boolean = false) => {
+        for (let i = 0; i < printerType.value.length; i++) {
+            if (printerType.value[i].key == value) {
+                formData.template_type = printerType.value[i].key;
+                previewPath.value = printerType.value[i].path;
+                template.value = printerType.value[i].template;
+                break;
             }
-          }
         }
 
-        // 防止重复循环
-        if (isFail) {
-          break
+        // 清空模板内容数据
+        for (let key in formData.value) {
+            delete formData.value[key];
         }
-      }
 
-      if (validateFlag) {
-        ElMessage({
-          type: 'warning',
-          message: validateMessage,
-        })
-        return
-      }
-
-      for (let i = 0; i < template.value.length; i++) {
-        let item: any = template.value[i]
-
-        for (let k = 0; k < item.list.length; k++) {
-          let childItem = item.list[k]
-          if (childItem.type == 'checkbox') {
-            if (formData.value[item.key][childItem.key].value.length) {
-              formData.value[item.key][childItem.key].status = 1
-            } else {
-              formData.value[item.key][childItem.key].status = 0
+        refreshTemplateData();
+    }
+
+    // 刷新模板内容数据
+    const refreshTemplateData = ()=> {
+        for (let i = 0; i < template.value.length; i++) {
+            let item: any = template.value[i];
+            formData.value[item.key] = {};
+            for (let k = 0; k < item.list.length; k++) {
+                let childItem = item.list[k];
+                formData.value[item.key][childItem.key] = {
+                    type: childItem.type,
+                    value: childItem.value,
+                    status: childItem.status,
+                    fontSize: childItem.fontSize,
+                    fontWeight: childItem.fontWeight,
+                };
             }
-          }
         }
-      }
-
-      if (repeat.value) return
-      repeat.value = true
+    }
 
-      let data = formData
+    /**
+     * 确认
+     * @param formEl
+     */
+    const confirm = async(formEl: FormInstance | undefined) => {
+        if (loading.value || !formEl) return
+
+        if (printerType.value.length == 0) {
+            ElMessage({
+                type: 'warning',
+                message: t('printTypeEmpty')
+            })
+            return;
+        }
 
-      save(data)
-        .then((res) => {
-          repeat.value = false
-          if (!formData.template_id) {
-            back()
-          }
-        })
-        .catch((err) => {
-          repeat.value = false
+        let save = formData.template_id ? editPrinterTemplate : addPrinterTemplate
+
+        await formEl.validate(async(valid) => {
+            if (valid) {
+
+                let validateFlag = false;
+                let validateMessage = '';
+
+                for (let i = 0; i < template.value.length; i++) {
+
+                    let item: any = template.value[i];
+                    let isFail = false;
+
+                    for (let k = 0; k < item.list.length; k++) {
+                        let childItem = item.list[k];
+                        if (formData.value[item.key][childItem.key].status == 0) {
+                            continue;
+                        }
+                        if (childItem.type == 'input') {
+                            if (formData.value[item.key][childItem.key].value == '') {
+                                validateFlag = true;
+                                validateMessage = `请输入${ childItem.label }`;
+                                isFail = true;
+                                break;
+                            }
+                        } else if (childItem.type == 'select') {
+                            if (formData.value[item.key][childItem.key].value == '') {
+                                validateFlag = true;
+                                validateMessage = `${ childItem.label }未设置[${ childItem.text }]`;
+                                isFail = true;
+                                break;
+                            }
+                        }
+                    }
+
+                    // 防止重复循环
+                    if (isFail) {
+                        break;
+                    }
+                }
+
+                if (validateFlag) {
+                    ElMessage({
+                        type: 'warning',
+                        message: validateMessage
+                    })
+                    return;
+                }
+
+                for (let i = 0; i < template.value.length; i++) {
+
+                    let item: any = template.value[i];
+
+                    for (let k = 0; k < item.list.length; k++) {
+                        let childItem = item.list[k];
+                        if (childItem.type == 'checkbox') {
+                            if (formData.value[item.key][childItem.key].value.length) {
+                                formData.value[item.key][childItem.key].status = 1;
+                            } else {
+                                formData.value[item.key][childItem.key].status = 0;
+                            }
+                        }
+                    }
+                }
+
+                if (repeat.value) return
+                repeat.value = true
+
+                let data = formData
+
+                save(data).then(res => {
+                    repeat.value = false
+                    if (!formData.template_id) {
+                        back()
+                    }
+                }).catch(err => {
+                    repeat.value = false
+                })
+            }
         })
     }
-  })
-}
 
-const back = () => {
-  router.push('/printer/template/list')
-}
+    const back = () => {
+        router.push('/printer/template/list')
+    }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
diff --git a/admin/src/app/views/printer/template_list.vue b/admin/src/app/views/printer/template_list.vue
index 4bf40fc6..ab8c65aa 100644
--- a/admin/src/app/views/printer/template_list.vue
+++ b/admin/src/app/views/printer/template_list.vue
@@ -1,189 +1,120 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center mb-[5px]">
-        <span class="text-lg">{{ pageName }}</span>
-        <el-button type="primary" @click="addEvent">
-          {{ t('addPrinterTemplate') }}
-        </el-button>
-      </div>
-
-      <el-tabs
-        class="demo-tabs"
-        model-value="/printer/template/list"
-        @tab-change="handleClick"
-      >
-        <el-tab-pane :label="t('tabPrinterManager')" name="/printer/list" />
-        <el-tab-pane
-          :label="t('tabPrinterTemplate')"
-          name="/printer/template/list"
-        />
-      </el-tabs>
-
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="printerTemplateTable.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('templateName')" prop="template_name">
-            <el-input
-              v-model.trim="printerTemplateTable.searchParam.template_name"
-              :placeholder="t('templateNamePlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('templateType')" prop="template_type">
-            <el-select
-              v-model="printerTemplateTable.searchParam.template_type"
-              :placeholder="t('templateTypePlaceholder')"
-              clearable
-            >
-              <el-option
-                v-for="(item, key) in printerType"
-                :key="itemkey"
-                :label="item.title"
-                :value="item.key"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="loadPrinterTemplateList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
-
-      <div class="mt-[10px]">
-        <el-table
-          :data="printerTemplateTable.data"
-          size="large"
-          v-loading="printerTemplateTable.loading"
-        >
-          <template #empty>
-            <span>{{
-              !printerTemplateTable.loading ? t('emptyData') : ''
-            }}</span>
-          </template>
-
-          <el-table-column
-            prop="template_name"
-            :label="t('templateName')"
-            min-width="220"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="template_type_name"
-            :label="t('templateType')"
-            min-width="180"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="create_time"
-            :label="t('createTime')"
-            min-width="120"
-          />
-
-          <el-table-column
-            :label="t('operation')"
-            fixed="right"
-            min-width="120"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="editEvent(row)">{{
-                t('edit')
-              }}</el-button>
-              <el-button
-                type="primary"
-                link
-                @click="deleteEvent(row.template_id)"
-                >{{ t('delete') }}</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="printerTemplateTable.page"
-            v-model:page-size="printerTemplateTable.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="printerTemplateTable.total"
-            @size-change="loadPrinterTemplateList()"
-            @current-change="loadPrinterTemplateList"
-          />
-        </div>
-      </div>
-    </el-card>
-  </div>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+
+            <div class="flex justify-between items-center mb-[5px]">
+                <span class="text-lg">{{pageName}}</span>
+                <el-button type="primary" @click="addEvent">
+                    {{ t('addPrinterTemplate') }}
+                </el-button>
+            </div>
+
+            <el-tabs class="demo-tabs" model-value="/printer/template/list" @tab-change="handleClick">
+                <el-tab-pane :label="t('tabPrinterManager')" name="/printer/list" />
+                <el-tab-pane :label="t('tabPrinterTemplate')" name="/printer/template/list" />
+            </el-tabs>
+
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="printerTemplateTable.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('templateName')" prop="template_name">
+                        <el-input v-model.trim="printerTemplateTable.searchParam.template_name" :placeholder="t('templateNamePlaceholder')" />
+                    </el-form-item>
+                    <el-form-item :label="t('templateType')" prop="template_type">
+                        <el-select v-model="printerTemplateTable.searchParam.template_type" :placeholder="t('templateTypePlaceholder')" clearable>
+                            <el-option v-for="(item,key) in printerType" :key="itemkey" :label="item.title" :value="item.key" />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="loadPrinterTemplateList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+
+            <div class="mt-[10px]">
+                <el-table :data="printerTemplateTable.data" size="large" v-loading="printerTemplateTable.loading">
+                    <template #empty>
+                        <span>{{ !printerTemplateTable.loading ? t('emptyData') : '' }}</span>
+                    </template>
+
+                    <el-table-column prop="template_name" :label="t('templateName')" min-width="220" :show-overflow-tooltip="true"/>
+                    
+                    <el-table-column prop="template_type_name" :label="t('templateType')" min-width="180" :show-overflow-tooltip="true"/>
+                    
+                    <el-table-column prop="create_time" :label="t('createTime')" min-width="120" />
+
+                    <el-table-column :label="t('operation')" fixed="right" min-width="120">
+                       <template #default="{ row }">
+                           <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+                           <el-button type="primary" link @click="deleteEvent(row.template_id)">{{ t('delete') }}</el-button>
+                       </template>
+                    </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="printerTemplateTable.page" v-model:page-size="printerTemplateTable.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="printerTemplateTable.total"
+                        @size-change="loadPrinterTemplateList()" @current-change="loadPrinterTemplateList" />
+                </div>
+            </div>
+
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
 import { t } from '@/lang'
-import {
-  getPrinterTemplatePageList,
-  deletePrinterTemplate,
-  getPrinterType,
-} from '@/app/api/printer'
-import { ElMessageBox, FormInstance } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { getPrinterTemplatePageList, deletePrinterTemplate,getPrinterType } from '@/app/api/printer'
+import { ElMessageBox,FormInstance } from 'element-plus'
+import { useRoute,useRouter } from 'vue-router'
 
 const route = useRoute()
 const router = useRouter()
-const pageName = route.meta.title
+const pageName = route.meta.title;
 
 const handleClick = (path: string) => {
-  router.push({ path })
+    router.push({ path })
 }
 
 const printerTemplateTable = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    template_name: '',
-    template_type: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        template_name: '',
+        template_type: '',
+    }
 })
 
 const searchFormRef = ref<FormInstance>()
 
 const printerType = ref([])
 getPrinterType({}).then((res: any) => {
-  if (res.data) {
-    printerType.value = res.data
-  }
+    if (res.data) {
+        printerType.value = res.data;
+    }
 })
 
 /**
  * 获取小票打印模板列表
  */
 const loadPrinterTemplateList = (page: number = 1) => {
-  printerTemplateTable.loading = true
-  printerTemplateTable.page = page
-
-  getPrinterTemplatePageList({
-    page: printerTemplateTable.page,
-    limit: printerTemplateTable.limit,
-    ...printerTemplateTable.searchParam,
-  })
-    .then((res) => {
-      printerTemplateTable.loading = false
-      printerTemplateTable.data = res.data.data
-      printerTemplateTable.total = res.data.total
-    })
-    .catch(() => {
-      printerTemplateTable.loading = false
+    printerTemplateTable.loading = true
+    printerTemplateTable.page = page
+
+    getPrinterTemplatePageList({
+        page: printerTemplateTable.page,
+        limit: printerTemplateTable.limit,
+         ...printerTemplateTable.searchParam
+    }).then(res => {
+        printerTemplateTable.loading = false
+        printerTemplateTable.data = res.data.data
+        printerTemplateTable.total = res.data.total
+    }).catch(() => {
+        printerTemplateTable.loading = false
     })
 }
 loadPrinterTemplateList()
@@ -192,7 +123,7 @@ loadPrinterTemplateList()
  * 添加小票打印模板
  */
 const addEvent = () => {
-  router.push('/printer/template/add')
+    router.push('/printer/template/add')
 }
 
 /**
@@ -200,29 +131,32 @@ const addEvent = () => {
  * @param data
  */
 const editEvent = (data: any) => {
-  router.push('/printer/template/edit?template_id=' + data.template_id)
+    router.push('/printer/template/edit?template_id=' + data.template_id)
 }
 
 /**
  * 删除小票打印模板
  */
 const deleteEvent = (id: number) => {
-  ElMessageBox.confirm(t('printerTemplateDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    deletePrinterTemplate(id).then(() => {
-      loadPrinterTemplateList()
+    ElMessageBox.confirm(t('printerTemplateDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning',
+        }
+    ).then(() => {
+        deletePrinterTemplate(id).then(() => {
+            loadPrinterTemplateList()
+        })
     })
-  })
 }
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadPrinterTemplateList()
+    if (!formEl) return
+    formEl.resetFields()
+    loadPrinterTemplateList()
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
diff --git a/admin/src/app/views/professional_skills/components/Jump-lesson-library-edit.vue b/admin/src/app/views/professional_skills/components/Jump-lesson-library-edit.vue
new file mode 100644
index 00000000..3e6ce3a3
--- /dev/null
+++ b/admin/src/app/views/professional_skills/components/Jump-lesson-library-edit.vue
@@ -0,0 +1,229 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('updateJumpLessonLibrary') : t('addJumpLessonLibrary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addJumpLessonLibrary, editJumpLessonLibrary, getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+import { addPublicLibraryList, editPublicLibraryList } from '@/app/api/future_ontent'
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: '',
+  table_type: 17
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+// ,
+//     user_permission: [
+//         { required: true, message: t('userPermissionPlaceholder'), trigger: 'blur' },
+//
+//     ]
+
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editPublicLibraryList : addPublicLibraryList
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+          data.table_type = 17
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/professional_skills/components/basketball-course-teaching-edit.vue b/admin/src/app/views/professional_skills/components/basketball-course-teaching-edit.vue
new file mode 100644
index 00000000..21cdb6f2
--- /dev/null
+++ b/admin/src/app/views/professional_skills/components/basketball-course-teaching-edit.vue
@@ -0,0 +1,224 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('editBasketballTeachingLibrary') : t('addBasketballTeachingLibrary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addBasketballTeachingLibrary, editBasketballTeachingLibrary, getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+import { addPublicLibraryList, editPublicLibraryList } from '@/app/api/future_ontent'
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+  status: '',
+  table_type: 19
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editPublicLibraryList : addPublicLibraryList
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+            data.table_type = 19
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/professional_skills/components/en-course-teaching-edit.vue b/admin/src/app/views/professional_skills/components/en-course-teaching-edit.vue
new file mode 100644
index 00000000..7b9c7795
--- /dev/null
+++ b/admin/src/app/views/professional_skills/components/en-course-teaching-edit.vue
@@ -0,0 +1,223 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('editEnTeachingLibrary') : t('addEnTeachingLibrary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addEnTeachingLibrary, editEnTeachingLibrary, getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+import { addPublicLibraryList, editPublicLibraryList } from '@/app/api/future_ontent'
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: '',
+  table_type: 18
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editPublicLibraryList : addPublicLibraryList
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+          data.table_type = 18
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/professional_skills/components/lesson-course-teaching-edit.vue b/admin/src/app/views/professional_skills/components/lesson-course-teaching-edit.vue
new file mode 100644
index 00000000..a6a6c2c2
--- /dev/null
+++ b/admin/src/app/views/professional_skills/components/lesson-course-teaching-edit.vue
@@ -0,0 +1,224 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('updateLessonCourseTeaching') : t('addLessonCourseTeaching')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+
+import { addPublicLibraryList, editPublicLibraryList } from '@/app/api/future_ontent'
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: ''
+    // user_permission: [],
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editPublicLibraryList : addPublicLibraryList
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+            data.table_type = 16
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/professional_skills/components/ninja-teaching-edit.vue b/admin/src/app/views/professional_skills/components/ninja-teaching-edit.vue
new file mode 100644
index 00000000..7ac26150
--- /dev/null
+++ b/admin/src/app/views/professional_skills/components/ninja-teaching-edit.vue
@@ -0,0 +1,224 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('editNinjaTeachingLibrary') : t('addNinjaTeachingLibrary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addNinjaTeachingLibrary, editNinjaTeachingLibrary, getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+import { addPublicLibraryList, editPublicLibraryList } from '@/app/api/future_ontent'
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: '',
+  table_type: 21
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editPublicLibraryList : addPublicLibraryList
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+          data.table_type = 21
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/professional_skills/components/physical-teaching-edit.vue b/admin/src/app/views/professional_skills/components/physical-teaching-edit.vue
new file mode 100644
index 00000000..2c53ea49
--- /dev/null
+++ b/admin/src/app/views/professional_skills/components/physical-teaching-edit.vue
@@ -0,0 +1,223 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('editPhysicalTeachingLibrary') : t('addPhysicalTeachingLibrary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addPhysicalTeachingLibrary, editPhysicalTeachingLibrary, getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: ''
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editPhysicalTeachingLibrary : addPhysicalTeachingLibrary
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/professional_skills/components/security-teaching-edit.vue b/admin/src/app/views/professional_skills/components/security-teaching-edit.vue
new file mode 100644
index 00000000..5cda7ef5
--- /dev/null
+++ b/admin/src/app/views/professional_skills/components/security-teaching-edit.vue
@@ -0,0 +1,224 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('editSecurityTeachingLibrary') : t('addSecurityTeachingLibrary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addSecurityTeachingLibrary, editSecurityTeachingLibrary, getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+import { addPublicLibraryList, editPublicLibraryList } from '@/app/api/future_ontent'
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: '',
+  table_type: 22
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editPublicLibraryList : addPublicLibraryList
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+          data.table_type = 22
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/professional_skills/components/strengthen-course-teaching-edit.vue b/admin/src/app/views/professional_skills/components/strengthen-course-teaching-edit.vue
new file mode 100644
index 00000000..95b8d9f3
--- /dev/null
+++ b/admin/src/app/views/professional_skills/components/strengthen-course-teaching-edit.vue
@@ -0,0 +1,223 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('editStrengthenTeachingLibrary') : t('addStrengthenTeachingLibrary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+
+                <el-form-item :label="t('image')" prop="image">
+                    <upload-image v-model="formData.image" />
+                </el-form-item>
+
+                <el-form-item :label="t('type')" prop="type">
+                    <el-select class="input-width"  v-model="formData.type" clearable :placeholder="t('typePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+                <el-form-item :label="t('status')" prop="status">
+                    <el-radio-group  v-model="formData.status" :placeholder="t('statusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+<!--                <el-form-item :label="t('userPermission')" prop="user_permission">-->
+<!--                    <el-checkbox-group v-model="formData.user_permission" :placeholder="t('userPermissionPlaceholder')">-->
+<!--                        <el-checkbox-->
+<!--                            v-for="(item, index) in userPermissionList"-->
+<!--                                 :key="index"-->
+<!--                                :label="item['sys_user_id']">-->
+<!--                                {{ item['name'] }}-->
+<!--                        </el-checkbox>-->
+<!--                    </el-checkbox-group>-->
+<!--                </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addStrengTeachingLibrary, editStrengTeachingLibrary, getLessonCourseTeachingInfo, getWithPersonnelDataList } from '@/app/api/lesson_course_teaching'
+import { addPublicLibraryList, editPublicLibraryList } from '@/app/api/future_ontent'
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    title: '',
+    image: '',
+    type: '',
+    content: '',
+    status: '',
+  table_type: 20
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    image: [
+        { required: true, message: t('imagePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    content: [
+        { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
+
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+
+    ]
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editPublicLibraryList : addPublicLibraryList
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+          data.table_type = 20
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let typeList = ref([])
+    const typeDictList = async () => {
+    typeList.value = await (await useDictionary('material_type')).data.dictionary
+    }
+    typeDictList();
+    watch(() => typeList.value, () => { formData.type = typeList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('course_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+
+    const userPermissionList = ref([] as any[])
+    const setUserPermissionList = async () => {
+    userPermissionList.value = await (await getWithPersonnelDataList({})).data
+    }
+    setUserPermissionList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getLessonCourseTeachingInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/professional_skills/professional_skills.vue b/admin/src/app/views/professional_skills/professional_skills.vue
new file mode 100644
index 00000000..ef559353
--- /dev/null
+++ b/admin/src/app/views/professional_skills/professional_skills.vue
@@ -0,0 +1,1200 @@
+<template>
+  <div class="main-container">
+    <el-card class="box-card !border-none" shadow="never">
+      <el-tabs v-model="active">
+        <el-tab-pane label="优秀一堂课" name="CourseSyllabus">
+          <div class="flex justify-between items-center">
+            <el-button type="primary" @click="addEvent">
+              {{ t('addLessonCourseTeaching') }}
+            </el-button>
+          </div>
+          <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+            <el-form :inline="true" :model="lessonCourseTeachingTable.searchParam" ref="searchFormRef">
+              <el-form-item :label="t('title')" prop="title">
+                <el-input v-model="lessonCourseTeachingTable.searchParam.title" :placeholder="t('titlePlaceholder')" />
+              </el-form-item>
+
+              <el-form-item :label="t('status')" prop="status">
+                <el-select class="w-[280px]" v-model="lessonCourseTeachingTable.searchParam.status" clearable :placeholder="t('statusPlaceholder')">
+                  <el-option label="全部" value=""></el-option>
+                  <el-option
+                      v-for="(item, index) in statusList"
+                      :key="index"
+                      :label="item.name"
+                      :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+
+              <el-form-item :label="t('createTime')" prop="create_time">
+                <el-date-picker v-model="lessonCourseTeachingTable.searchParam.create_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+              </el-form-item>
+
+              <el-form-item :label="t('updateTime')" prop="update_time">
+                <el-date-picker v-model="lessonCourseTeachingTable.searchParam.update_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+              </el-form-item>
+
+              <el-form-item>
+                <el-button type="primary" @click="loadLessonCourseTeachingList()">{{ t('search') }}</el-button>
+                <el-button @click="resetForm(searchFormRef, 16)">{{ t('reset') }}</el-button>
+              </el-form-item>
+            </el-form>
+          </el-card>
+
+          <div class="mt-[10px]">
+            <el-table :data="lessonCourseTeachingTable.data" size="large" v-loading="lessonCourseTeachingTable.loading">
+              <template #empty>
+                <span>{{ !lessonCourseTeachingTable.loading ? t('emptyData') : '' }}</span>
+              </template>
+              <el-table-column prop="title" :label="t('title')" min-width="120" :show-overflow-tooltip="true"/>
+
+              <el-table-column :label="t('image')" width="100" align="left">
+                <template #default="{ row }">
+                  <el-avatar v-if="row.image" :src="img(row.image)" />
+                  <el-avatar v-else icon="UserFilled" />
+                </template>
+              </el-table-column>
+              <el-table-column :label="t('type')" min-width="180" align="center" :show-overflow-tooltip="true">
+                <template #default="{ row }">
+                  <div v-for="(item, index) in typeList">
+                    <div v-if="item.value == row.type">{{ item.name }}</div>
+                  </div>
+                </template>
+              </el-table-column>
+
+              <el-table-column :label="t('status')" min-width="180" align="center" :show-overflow-tooltip="true">
+                <template #default="{ row }">
+                  <div v-for="(item, index) in statusList">
+                    <div v-if="item.value == row.status">{{ item.name }}</div>
+                  </div>
+                </template>
+              </el-table-column>
+
+              <el-table-column :label="t('operation')" fixed="right" min-width="120">
+                <template #default="{ row }">
+                  <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+                  <el-button type="primary" link @click="deleteEvent(row.id, 16)">{{ t('delete') }}</el-button>
+                </template>
+              </el-table-column>
+
+            </el-table>
+            <div class="mt-[16px] flex justify-end">
+              <el-pagination v-model:current-page="lessonCourseTeachingTable.page" v-model:page-size="lessonCourseTeachingTable.limit"
+                             layout="total, sizes, prev, pager, next, jumper" :total="lessonCourseTeachingTable.total"
+                             @size-change="loadLessonCourseTeachingList()" @current-change="loadLessonCourseTeachingList" />
+            </div>
+          </div>
+
+          <edit ref="editLessonCourseTeachingDialog" @complete="loadLessonCourseTeachingList" />
+        </el-tab-pane>
+        <el-tab-pane label="空中忍者" name="JumpLessonLibrary">
+          <div class="flex justify-between items-center">
+            <el-button type="primary" @click="addJumpLessonLibrary">
+              {{ t('addJumpLessonLibrary') }}
+            </el-button>
+          </div>
+          <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+            <el-form :inline="true" :model="JumpLessonLibraryTable.searchParam" ref="searchFormRef">
+              <el-form-item :label="t('title')" prop="title">
+                <el-input v-model="JumpLessonLibraryTable.searchParam.title" :placeholder="t('titlePlaceholder')" />
+              </el-form-item>
+
+              <el-form-item :label="t('status')" prop="status">
+                <el-select class="w-[280px]" v-model="JumpLessonLibraryTable.searchParam.status" clearable :placeholder="t('statusPlaceholder')">
+                  <el-option label="全部" value=""></el-option>
+                  <el-option
+                      v-for="(item, index) in statusList"
+                      :key="index"
+                      :label="item.name"
+                      :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+
+              <el-form-item :label="t('createTime')" prop="create_time">
+                <el-date-picker v-model="JumpLessonLibraryTable.searchParam.create_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+              </el-form-item>
+
+              <el-form-item :label="t('updateTime')" prop="update_time">
+                <el-date-picker v-model="JumpLessonLibraryTable.searchParam.update_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+              </el-form-item>
+
+              <el-form-item>
+                <el-button type="primary" @click="loadJumpLessonLibraryList()">{{ t('search') }}</el-button>
+                <el-button @click="resetForm(searchFormRef, 17)">{{ t('reset') }}</el-button>
+              </el-form-item>
+            </el-form>
+          </el-card>
+
+          <div class="mt-[10px]">
+            <el-table :data="JumpLessonLibraryTable.data" size="large" v-loading="JumpLessonLibraryTable.loading">
+              <template #empty>
+                <span>{{ !JumpLessonLibraryTable.loading ? t('emptyData') : '' }}</span>
+              </template>
+              <el-table-column prop="title" :label="t('title')" min-width="120" :show-overflow-tooltip="true"/>
+
+              <el-table-column :label="t('image')" width="100" align="left">
+                <template #default="{ row }">
+                  <el-avatar v-if="row.image" :src="img(row.image)" />
+                  <el-avatar v-else icon="UserFilled" />
+                </template>
+              </el-table-column>
+              <el-table-column :label="t('type')" min-width="180" align="center" :show-overflow-tooltip="true">
+                <template #default="{ row }">
+                  <div v-for="(item, index) in typeList">
+                    <div v-if="item.value == row.type">{{ item.name }}</div>
+                  </div>
+                </template>
+              </el-table-column>
+
+              <el-table-column :label="t('status')" min-width="180" align="center" :show-overflow-tooltip="true">
+                <template #default="{ row }">
+                  <div v-for="(item, index) in statusList">
+                    <div v-if="item.value == row.status">{{ item.name }}</div>
+                  </div>
+                </template>
+              </el-table-column>
+
+              <el-table-column :label="t('operation')" fixed="right" min-width="120">
+                <template #default="{ row }">
+                  <el-button type="primary" link @click="editJumpLessonLibrary(row)">{{ t('edit') }}</el-button>
+                  <el-button type="primary" link @click="deleteEvent(row.id, 17)">{{ t('delete') }}</el-button>
+                </template>
+              </el-table-column>
+
+            </el-table>
+            <div class="mt-[16px] flex justify-end">
+              <el-pagination v-model:current-page="JumpLessonLibraryTable.page" v-model:page-size="JumpLessonLibraryTable.limit"
+                             layout="total, sizes, prev, pager, next, jumper" :total="JumpLessonLibraryTable.total"
+                             @size-change="loadJumpLessonLibraryList()" @current-change="loadJumpLessonLibraryList" />
+            </div>
+          </div>
+
+          <edit-jump ref="editJumpLessonLibraryDialog" @complete="loadJumpLessonLibraryList" />
+        </el-tab-pane>
+        <el-tab-pane label="篮球动作" name="EnTeachingLibrary">
+          <div class="flex justify-between items-center">
+            <el-button type="primary" @click="addEnTeachingLibrary">
+              {{ t('addEnTeachingLibrary') }}
+            </el-button>
+          </div>
+          <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+            <el-form :inline="true" :model="EnTeachingLibraryTable.searchParam" ref="searchFormRef">
+              <el-form-item :label="t('title')" prop="title">
+                <el-input v-model="EnTeachingLibraryTable.searchParam.title" :placeholder="t('titlePlaceholder')" />
+              </el-form-item>
+
+              <el-form-item :label="t('status')" prop="status">
+                <el-select class="w-[280px]" v-model="EnTeachingLibraryTable.searchParam.status" clearable :placeholder="t('statusPlaceholder')">
+                  <el-option label="全部" value=""></el-option>
+                  <el-option
+                      v-for="(item, index) in statusList"
+                      :key="index"
+                      :label="item.name"
+                      :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+
+              <el-form-item :label="t('createTime')" prop="create_time">
+                <el-date-picker v-model="EnTeachingLibraryTable.searchParam.create_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+              </el-form-item>
+
+              <el-form-item :label="t('updateTime')" prop="update_time">
+                <el-date-picker v-model="EnTeachingLibraryTable.searchParam.update_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+              </el-form-item>
+
+              <el-form-item>
+                <el-button type="primary" @click="loadEnTeachingLibraryList()">{{ t('search') }}</el-button>
+                <el-button @click="resetForm(searchFormRef, 18)">{{ t('reset') }}</el-button>
+              </el-form-item>
+            </el-form>
+          </el-card>
+
+          <div class="mt-[10px]">
+            <el-table :data="EnTeachingLibraryTable.data" size="large" v-loading="EnTeachingLibraryTable.loading">
+              <template #empty>
+                <span>{{ !EnTeachingLibraryTable.loading ? t('emptyData') : '' }}</span>
+              </template>
+              <el-table-column prop="title" :label="t('title')" min-width="120" :show-overflow-tooltip="true"/>
+
+              <el-table-column :label="t('image')" width="100" align="left">
+                <template #default="{ row }">
+                  <el-avatar v-if="row.image" :src="img(row.image)" />
+                  <el-avatar v-else icon="UserFilled" />
+                </template>
+              </el-table-column>
+              <el-table-column :label="t('type')" min-width="180" align="center" :show-overflow-tooltip="true">
+                <template #default="{ row }">
+                  <div v-for="(item, index) in typeList">
+                    <div v-if="item.value == row.type">{{ item.name }}</div>
+                  </div>
+                </template>
+              </el-table-column>
+
+              <el-table-column :label="t('status')" min-width="180" align="center" :show-overflow-tooltip="true">
+                <template #default="{ row }">
+                  <div v-for="(item, index) in statusList">
+                    <div v-if="item.value == row.status">{{ item.name }}</div>
+                  </div>
+                </template>
+              </el-table-column>
+
+              <el-table-column :label="t('operation')" fixed="right" min-width="120">
+                <template #default="{ row }">
+                  <el-button type="primary" link @click="editEnTeachingLibrary(row)">{{ t('edit') }}</el-button>
+                  <el-button type="primary" link @click="deleteEvent(row.id, 18)">{{ t('delete') }}</el-button>
+                </template>
+              </el-table-column>
+
+            </el-table>
+            <div class="mt-[16px] flex justify-end">
+              <el-pagination v-model:current-page="EnTeachingLibraryTable.page" v-model:page-size="EnTeachingLibraryTable.limit"
+                             layout="total, sizes, prev, pager, next, jumper" :total="EnTeachingLibraryTable.total"
+                             @size-change="loadEnTeachingLibraryList()" @current-change="loadEnTeachingLibraryList" />
+            </div>
+          </div>
+
+          <edit-en ref="editEnTeachingLibraryDialog" @complete="loadEnTeachingLibraryList" />
+        </el-tab-pane>
+        <el-tab-pane label="跳绳动作" name="BasketballTeachingLibrary">
+          <div class="flex justify-between items-center">
+            <el-button type="primary" @click="addBasketballTeachingLibrary">
+              {{ t('addBasketballTeachingLibrary') }}
+            </el-button>
+          </div>
+          <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+            <el-form :inline="true" :model="BasketballTeachingLibraryTable.searchParam" ref="searchFormRef">
+              <el-form-item :label="t('title')" prop="title">
+                <el-input v-model="BasketballTeachingLibraryTable.searchParam.title" :placeholder="t('titlePlaceholder')" />
+              </el-form-item>
+
+              <el-form-item :label="t('status')" prop="status">
+                <el-select class="w-[280px]" v-model="BasketballTeachingLibraryTable.searchParam.status" clearable :placeholder="t('statusPlaceholder')">
+                  <el-option label="全部" value=""></el-option>
+                  <el-option
+                      v-for="(item, index) in statusList"
+                      :key="index"
+                      :label="item.name"
+                      :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+
+              <el-form-item :label="t('createTime')" prop="create_time">
+                <el-date-picker v-model="BasketballTeachingLibraryTable.searchParam.create_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+              </el-form-item>
+
+              <el-form-item :label="t('updateTime')" prop="update_time">
+                <el-date-picker v-model="BasketballTeachingLibraryTable.searchParam.update_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+              </el-form-item>
+
+              <el-form-item>
+                <el-button type="primary" @click="loadBasketballTeachingLibraryList()">{{ t('search') }}</el-button>
+                <el-button @click="resetForm(searchFormRef, 19)">{{ t('reset') }}</el-button>
+              </el-form-item>
+            </el-form>
+          </el-card>
+
+          <div class="mt-[10px]">
+            <el-table :data="BasketballTeachingLibraryTable.data" size="large" v-loading="BasketballTeachingLibraryTable.loading">
+              <template #empty>
+                <span>{{ !BasketballTeachingLibraryTable.loading ? t('emptyData') : '' }}</span>
+              </template>
+              <el-table-column prop="title" :label="t('title')" min-width="120" :show-overflow-tooltip="true"/>
+
+              <el-table-column :label="t('image')" width="100" align="left">
+                <template #default="{ row }">
+                  <el-avatar v-if="row.image" :src="img(row.image)" />
+                  <el-avatar v-else icon="UserFilled" />
+                </template>
+              </el-table-column>
+              <el-table-column :label="t('type')" min-width="180" align="center" :show-overflow-tooltip="true">
+                <template #default="{ row }">
+                  <div v-for="(item, index) in typeList">
+                    <div v-if="item.value == row.type">{{ item.name }}</div>
+                  </div>
+                </template>
+              </el-table-column>
+
+              <el-table-column :label="t('status')" min-width="180" align="center" :show-overflow-tooltip="true">
+                <template #default="{ row }">
+                  <div v-for="(item, index) in statusList">
+                    <div v-if="item.value == row.status">{{ item.name }}</div>
+                  </div>
+                </template>
+              </el-table-column>
+
+              <el-table-column :label="t('operation')" fixed="right" min-width="120">
+                <template #default="{ row }">
+                  <el-button type="primary" link @click="editBasketballTeachingLibrary(row)">{{ t('edit') }}</el-button>
+                  <el-button type="primary" link @click="deleteEvent(row.id, 19)">{{ t('delete') }}</el-button>
+                </template>
+              </el-table-column>
+
+            </el-table>
+            <div class="mt-[16px] flex justify-end">
+              <el-pagination v-model:current-page="BasketballTeachingLibraryTable.page" v-model:page-size="BasketballTeachingLibraryTable.limit"
+                             layout="total, sizes, prev, pager, next, jumper" :total="BasketballTeachingLibraryTable.total"
+                             @size-change="loadBasketballTeachingLibraryList()" @current-change="loadBasketballTeachingLibraryList" />
+            </div>
+          </div>
+
+          <edit-basketball ref="editBasketballTeachingLibraryDialog" @complete="loadBasketballTeachingLibraryList" />
+        </el-tab-pane>
+        <el-tab-pane label="跑酷动作" name="StrengthenTeachingLibrary">
+          <div class="flex justify-between items-center">
+            <el-button type="primary" @click="addStrengthenTeachingLibrary">
+              {{ t('addStrengthenTeachingLibrary') }}
+            </el-button>
+          </div>
+          <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+            <el-form :inline="true" :model="StrengTeachingLibraryTable.searchParam" ref="searchFormRef">
+              <el-form-item :label="t('title')" prop="title">
+                <el-input v-model="StrengTeachingLibraryTable.searchParam.title" :placeholder="t('titlePlaceholder')" />
+              </el-form-item>
+
+              <el-form-item :label="t('status')" prop="status">
+                <el-select class="w-[280px]" v-model="StrengTeachingLibraryTable.searchParam.status" clearable :placeholder="t('statusPlaceholder')">
+                  <el-option label="全部" value=""></el-option>
+                  <el-option
+                      v-for="(item, index) in statusList"
+                      :key="index"
+                      :label="item.name"
+                      :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+
+              <el-form-item :label="t('createTime')" prop="create_time">
+                <el-date-picker v-model="StrengTeachingLibraryTable.searchParam.create_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+              </el-form-item>
+
+              <el-form-item :label="t('updateTime')" prop="update_time">
+                <el-date-picker v-model="StrengTeachingLibraryTable.searchParam.update_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+              </el-form-item>
+
+              <el-form-item>
+                <el-button type="primary" @click="loadStrengthenTeachingLibraryList()">{{ t('search') }}</el-button>
+                <el-button @click="resetForm(searchFormRef, 20)">{{ t('reset') }}</el-button>
+              </el-form-item>
+            </el-form>
+          </el-card>
+
+          <div class="mt-[10px]">
+            <el-table :data="StrengTeachingLibraryTable.data" size="large" v-loading="StrengTeachingLibraryTable.loading">
+              <template #empty>
+                <span>{{ !StrengTeachingLibraryTable.loading ? t('emptyData') : '' }}</span>
+              </template>
+              <el-table-column prop="title" :label="t('title')" min-width="120" :show-overflow-tooltip="true"/>
+
+              <el-table-column :label="t('image')" width="100" align="left">
+                <template #default="{ row }">
+                  <el-avatar v-if="row.image" :src="img(row.image)" />
+                  <el-avatar v-else icon="UserFilled" />
+                </template>
+              </el-table-column>
+              <el-table-column :label="t('type')" min-width="180" align="center" :show-overflow-tooltip="true">
+                <template #default="{ row }">
+                  <div v-for="(item, index) in typeList">
+                    <div v-if="item.value == row.type">{{ item.name }}</div>
+                  </div>
+                </template>
+              </el-table-column>
+
+              <el-table-column :label="t('status')" min-width="180" align="center" :show-overflow-tooltip="true">
+                <template #default="{ row }">
+                  <div v-for="(item, index) in statusList">
+                    <div v-if="item.value == row.status">{{ item.name }}</div>
+                  </div>
+                </template>
+              </el-table-column>
+
+              <el-table-column :label="t('operation')" fixed="right" min-width="120">
+                <template #default="{ row }">
+                  <el-button type="primary" link @click="editStrengthenTeachingLibrary(row)">{{ t('edit') }}</el-button>
+                  <el-button type="primary" link @click="deleteEvent(row.id, 20)">{{ t('delete') }}</el-button>
+                </template>
+              </el-table-column>
+
+            </el-table>
+            <div class="mt-[16px] flex justify-end">
+              <el-pagination v-model:current-page="StrengTeachingLibraryTable.page" v-model:page-size="StrengTeachingLibraryTable.limit"
+                             layout="total, sizes, prev, pager, next, jumper" :total="StrengTeachingLibraryTable.total"
+                             @size-change="loadStrengthenTeachingLibraryList()" @current-change="loadStrengthenTeachingLibraryList" />
+            </div>
+          </div>
+
+          <edit-strengthen ref="editStrengthenTeachingLibraryDialog" @complete="loadStrengthenTeachingLibraryList" />
+        </el-tab-pane>
+        <el-tab-pane label="安防动作" name="NinjaTeachingLibrary">
+          <div class="flex justify-between items-center">
+            <el-button type="primary" @click="addNinjaTeachingLibrary">
+              {{ t('addNinjaTeachingLibrary') }}
+            </el-button>
+          </div>
+          <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+            <el-form :inline="true" :model="NinjaTeachingLibraryTable.searchParam" ref="searchFormRef">
+              <el-form-item :label="t('title')" prop="title">
+                <el-input v-model="NinjaTeachingLibraryTable.searchParam.title" :placeholder="t('titlePlaceholder')" />
+              </el-form-item>
+
+              <el-form-item :label="t('status')" prop="status">
+                <el-select class="w-[280px]" v-model="NinjaTeachingLibraryTable.searchParam.status" clearable :placeholder="t('statusPlaceholder')">
+                  <el-option label="全部" value=""></el-option>
+                  <el-option
+                      v-for="(item, index) in statusList"
+                      :key="index"
+                      :label="item.name"
+                      :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+
+              <el-form-item :label="t('createTime')" prop="create_time">
+                <el-date-picker v-model="NinjaTeachingLibraryTable.searchParam.create_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+              </el-form-item>
+
+              <el-form-item :label="t('updateTime')" prop="update_time">
+                <el-date-picker v-model="NinjaTeachingLibraryTable.searchParam.update_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+              </el-form-item>
+
+              <el-form-item>
+                <el-button type="primary" @click="loadNinjaTeachingLibraryList()">{{ t('search') }}</el-button>
+                <el-button @click="resetForm(searchFormRef, 21)">{{ t('reset') }}</el-button>
+              </el-form-item>
+            </el-form>
+          </el-card>
+
+          <div class="mt-[10px]">
+            <el-table :data="NinjaTeachingLibraryTable.data" size="large" v-loading="NinjaTeachingLibraryTable.loading">
+              <template #empty>
+                <span>{{ !NinjaTeachingLibraryTable.loading ? t('emptyData') : '' }}</span>
+              </template>
+              <el-table-column prop="title" :label="t('title')" min-width="120" :show-overflow-tooltip="true"/>
+
+              <el-table-column :label="t('image')" width="100" align="left">
+                <template #default="{ row }">
+                  <el-avatar v-if="row.image" :src="img(row.image)" />
+                  <el-avatar v-else icon="UserFilled" />
+                </template>
+              </el-table-column>
+              <el-table-column :label="t('type')" min-width="180" align="center" :show-overflow-tooltip="true">
+                <template #default="{ row }">
+                  <div v-for="(item, index) in typeList">
+                    <div v-if="item.value == row.type">{{ item.name }}</div>
+                  </div>
+                </template>
+              </el-table-column>
+
+              <el-table-column :label="t('status')" min-width="180" align="center" :show-overflow-tooltip="true">
+                <template #default="{ row }">
+                  <div v-for="(item, index) in statusList">
+                    <div v-if="item.value == row.status">{{ item.name }}</div>
+                  </div>
+                </template>
+              </el-table-column>
+
+              <el-table-column :label="t('operation')" fixed="right" min-width="120">
+                <template #default="{ row }">
+                  <el-button type="primary" link @click="editNinjaTeachingLibrary(row)">{{ t('edit') }}</el-button>
+                  <el-button type="primary" link @click="deleteEvent(row.id, 21)">{{ t('delete') }}</el-button>
+                </template>
+              </el-table-column>
+
+            </el-table>
+            <div class="mt-[16px] flex justify-end">
+              <el-pagination v-model:current-page="NinjaTeachingLibraryTable.page" v-model:page-size="NinjaTeachingLibraryTable.limit"
+                             layout="total, sizes, prev, pager, next, jumper" :total="NinjaTeachingLibraryTable.total"
+                             @size-change="loadNinjaTeachingLibraryList()" @current-change="loadNinjaTeachingLibraryList" />
+            </div>
+          </div>
+
+          <edit-ninja ref="editNinjaTeachingLibraryDialog" @complete="loadNinjaTeachingLibraryList" />
+        </el-tab-pane>
+        <el-tab-pane label="标准化动作" name="SecurityTeachingLibrary">
+          <div class="flex justify-between items-center">
+            <el-button type="primary" @click="addSecurityTeachingLibrary">
+              {{ t('addSecurityTeachingLibrary') }}
+            </el-button>
+          </div>
+          <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+            <el-form :inline="true" :model="SecurityTeachingLibraryTable.searchParam" ref="searchFormRef">
+              <el-form-item :label="t('title')" prop="title">
+                <el-input v-model="SecurityTeachingLibraryTable.searchParam.title" :placeholder="t('titlePlaceholder')" />
+              </el-form-item>
+
+              <el-form-item :label="t('status')" prop="status">
+                <el-select class="w-[280px]" v-model="SecurityTeachingLibraryTable.searchParam.status" clearable :placeholder="t('statusPlaceholder')">
+                  <el-option label="全部" value=""></el-option>
+                  <el-option
+                      v-for="(item, index) in statusList"
+                      :key="index"
+                      :label="item.name"
+                      :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+
+              <el-form-item :label="t('createTime')" prop="create_time">
+                <el-date-picker v-model="SecurityTeachingLibraryTable.searchParam.create_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+              </el-form-item>
+
+              <el-form-item :label="t('updateTime')" prop="update_time">
+                <el-date-picker v-model="SecurityTeachingLibraryTable.searchParam.update_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                                :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+              </el-form-item>
+
+              <el-form-item>
+                <el-button type="primary" @click="loadSecurityTeachingLibraryList()">{{ t('search') }}</el-button>
+                <el-button @click="resetForm(searchFormRef, 22)">{{ t('reset') }}</el-button>
+              </el-form-item>
+            </el-form>
+          </el-card>
+
+          <div class="mt-[10px]">
+            <el-table :data="SecurityTeachingLibraryTable.data" size="large" v-loading="SecurityTeachingLibraryTable.loading">
+              <template #empty>
+                <span>{{ !SecurityTeachingLibraryTable.loading ? t('emptyData') : '' }}</span>
+              </template>
+              <el-table-column prop="title" :label="t('title')" min-width="120" :show-overflow-tooltip="true"/>
+
+              <el-table-column :label="t('image')" width="100" align="left">
+                <template #default="{ row }">
+                  <el-avatar v-if="row.image" :src="img(row.image)" />
+                  <el-avatar v-else icon="UserFilled" />
+                </template>
+              </el-table-column>
+              <el-table-column :label="t('type')" min-width="180" align="center" :show-overflow-tooltip="true">
+                <template #default="{ row }">
+                  <div v-for="(item, index) in typeList">
+                    <div v-if="item.value == row.type">{{ item.name }}</div>
+                  </div>
+                </template>
+              </el-table-column>
+
+              <el-table-column :label="t('status')" min-width="180" align="center" :show-overflow-tooltip="true">
+                <template #default="{ row }">
+                  <div v-for="(item, index) in statusList">
+                    <div v-if="item.value == row.status">{{ item.name }}</div>
+                  </div>
+                </template>
+              </el-table-column>
+
+              <el-table-column :label="t('operation')" fixed="right" min-width="120">
+                <template #default="{ row }">
+                  <el-button type="primary" link @click="editSecurityTeachingLibrary(row)">{{ t('edit') }}</el-button>
+                  <el-button type="primary" link @click="deleteEvent(row.id, 22)">{{ t('delete') }}</el-button>
+                </template>
+              </el-table-column>
+
+            </el-table>
+            <div class="mt-[16px] flex justify-end">
+              <el-pagination v-model:current-page="SecurityTeachingLibraryTable.page" v-model:page-size="SecurityTeachingLibraryTable.limit"
+                             layout="total, sizes, prev, pager, next, jumper" :total="SecurityTeachingLibraryTable.total"
+                             @size-change="loadSecurityTeachingLibraryList()" @current-change="loadSecurityTeachingLibraryList" />
+            </div>
+          </div>
+
+          <edit-security ref="editSecurityTeachingLibraryDialog" @complete="loadSecurityTeachingLibraryList" />
+        </el-tab-pane>
+      </el-tabs>
+    </el-card>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { reactive, ref, watch } from 'vue'
+import { t } from '@/lang'
+import { useDictionary } from '@/app/api/dict'
+import { getLessonCourseTeachingList, deleteLessonCourseTeaching, getWithPersonnelDataList, getJumpLessonLibraryList, getEnTeachingLibraryList, getBasketballTeachingLibraryList, getStrengTeachingLibraryList, getNinjaTeachingLibraryList, getSecurityTeachingLibraryList, getPhysicalTeachingLibraryList } from '@/app/api/lesson_course_teaching'
+import { img } from '@/utils/common'
+import { ElMessageBox,FormInstance } from 'element-plus'
+import Edit from '@/app/views/professional_skills/components/lesson-course-teaching-edit.vue'
+import EditJump from '@/app/views/professional_skills/components/Jump-lesson-library-edit.vue'
+import EditEn from '@/app/views/professional_skills/components/en-course-teaching-edit.vue'
+import EditBasketball from '@/app/views/professional_skills/components/basketball-course-teaching-edit.vue'
+import EditStrengthen from '@/app/views/professional_skills/components/strengthen-course-teaching-edit.vue'
+import EditNinja from '@/app/views/professional_skills/components/ninja-teaching-edit.vue'
+import EditSecurity from '@/app/views/professional_skills/components/security-teaching-edit.vue'
+import EditPhysical from '@/app/views/professional_skills/components/physical-teaching-edit.vue'
+import { useRoute } from 'vue-router'
+const route = useRoute()
+const pageName = route.meta.title;
+const active = 'CourseSyllabus'
+
+let lessonCourseTeachingTable = reactive({
+  page: 1,
+  limit: 10,
+  total: 0,
+  loading: true,
+  data: [],
+  searchParam:{
+    "title":"",
+    "status":"",
+    "create_time":[],
+    "update_time":[],
+    table_type: 16
+  }
+})
+let JumpLessonLibraryTable = reactive({
+  page: 1,
+  limit: 10,
+  total: 0,
+  loading: true,
+  data: [],
+  searchParam:{
+    "title":"",
+    "status":"",
+    "create_time":[],
+    "update_time":[],
+    table_type: 17
+  }
+})
+let EnTeachingLibraryTable = reactive({
+  page: 1,
+  limit: 10,
+  total: 0,
+  loading: true,
+  data: [],
+  searchParam:{
+    "title":"",
+    "status":"",
+    "create_time":[],
+    "update_time":[],
+    table_type: 18
+  }
+})
+let BasketballTeachingLibraryTable = reactive({
+  page: 1,
+  limit: 10,
+  total: 0,
+  loading: true,
+  data: [],
+  searchParam:{
+    "title":"",
+    "status":"",
+    "create_time":[],
+    "update_time":[],
+    table_type: 19
+  }
+})
+let StrengTeachingLibraryTable = reactive({
+  page: 1,
+  limit: 10,
+  total: 0,
+  loading: true,
+  data: [],
+  searchParam:{
+    "title":"",
+    "status":"",
+    "create_time":[],
+    "update_time":[],
+    table_type: 20
+  }
+})
+let NinjaTeachingLibraryTable = reactive({
+  page: 1,
+  limit: 10,
+  total: 0,
+  loading: true,
+  data: [],
+  searchParam:{
+    "title":"",
+    "status":"",
+    "create_time":[],
+    "update_time":[],
+    table_type: 21
+  }
+})
+let SecurityTeachingLibraryTable = reactive({
+  page: 1,
+  limit: 10,
+  total: 0,
+  loading: true,
+  data: [],
+  searchParam:{
+    "title":"",
+    "status":"",
+    "create_time":[],
+    "update_time":[],
+    table_type: 22
+  }
+})
+
+const searchFormRef = ref<FormInstance>()
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 字典数据
+const typeList = ref([] as any[])
+const typeDictList = async () => {
+  typeList.value = await (await useDictionary('material_type')).data.dictionary
+}
+typeDictList();
+const statusList = ref([] as any[])
+const statusDictList = async () => {
+  statusList.value = await (await useDictionary('course_status')).data.dictionary
+}
+statusDictList();
+
+const editLessonCourseTeachingDialog: Record<string, any> | null = ref(null)
+const editJumpLessonLibraryDialog: Record<string, any> | null = ref(null)
+const editEnTeachingLibraryDialog: Record<string, any> | null = ref(null)
+const editBasketballTeachingLibraryDialog: Record<string, any> | null = ref(null)
+const editStrengthenTeachingLibraryDialog: Record<string, any> | null = ref(null)
+const editNinjaTeachingLibraryDialog: Record<string, any> | null = ref(null)
+const editSecurityTeachingLibraryDialog: Record<string, any> | null = ref(null)
+
+/**
+ * 获取课程教学大纲列表
+ */
+const loadLessonCourseTeachingList = (page: number = 1) => {
+  lessonCourseTeachingTable.loading = true
+  lessonCourseTeachingTable.page = page
+
+  getLessonCourseTeachingList({
+    page: lessonCourseTeachingTable.page,
+    limit: lessonCourseTeachingTable.limit,
+    ...lessonCourseTeachingTable.searchParam
+  }).then(res => {
+    lessonCourseTeachingTable.loading = false
+    lessonCourseTeachingTable.data = res.data.data
+    lessonCourseTeachingTable.total = res.data.total
+  }).catch(() => {
+    lessonCourseTeachingTable.loading = false
+  })
+}
+loadLessonCourseTeachingList()
+
+/**
+ * 添加课程教学大纲
+ */
+const addEvent = () => {
+  editLessonCourseTeachingDialog.value.setFormData()
+  editLessonCourseTeachingDialog.value.showDialog = true
+}
+
+/**
+ * 编辑课程教学大纲
+ * @param data
+ */
+const editEvent = (data: any) => {
+  editLessonCourseTeachingDialog.value.setFormData(data)
+  editLessonCourseTeachingDialog.value.showDialog = true
+}
+
+
+/**
+ * 获取跳绳教案库列表
+ */
+const loadJumpLessonLibraryList = (page: number = 1) => {
+  JumpLessonLibraryTable.loading = true
+  JumpLessonLibraryTable.page = page
+
+  getJumpLessonLibraryList({
+    page: JumpLessonLibraryTable.page,
+    limit: JumpLessonLibraryTable.limit,
+    ...JumpLessonLibraryTable.searchParam
+  }).then(res => {
+    JumpLessonLibraryTable.loading = false
+    JumpLessonLibraryTable.data = res.data.data
+    JumpLessonLibraryTable.total = res.data.total
+  }).catch(() => {
+    JumpLessonLibraryTable.loading = false
+  })
+}
+loadJumpLessonLibraryList()
+
+/**
+ * 添加跳绳教案库
+ */
+const addJumpLessonLibrary = () => {
+  editJumpLessonLibraryDialog.value.setFormData()
+  editJumpLessonLibraryDialog.value.showDialog = true
+}
+
+/**
+ * 编辑跳绳教案库
+ * @param data
+ */
+const editJumpLessonLibrary = (data: any) => {
+  editJumpLessonLibraryDialog.value.setFormData(data)
+  editJumpLessonLibraryDialog.value.showDialog = true
+}
+
+
+/**
+ * 获取增高教案库列表
+ */
+const loadEnTeachingLibraryList = (page: number = 1) => {
+  EnTeachingLibraryTable.loading = true
+  EnTeachingLibraryTable.page = page
+
+  getEnTeachingLibraryList({
+    page: EnTeachingLibraryTable.page,
+    limit: EnTeachingLibraryTable.limit,
+    ...EnTeachingLibraryTable.searchParam
+  }).then(res => {
+    EnTeachingLibraryTable.loading = false
+    EnTeachingLibraryTable.data = res.data.data
+    EnTeachingLibraryTable.total = res.data.total
+  }).catch(() => {
+    EnTeachingLibraryTable.loading = false
+  })
+}
+loadEnTeachingLibraryList()
+
+/**
+ * 添加增高教案库
+ */
+const addEnTeachingLibrary = () => {
+  editEnTeachingLibraryDialog.value.setFormData()
+  editEnTeachingLibraryDialog.value.showDialog = true
+}
+
+/**
+ * 编辑增高教案库
+ * @param data
+ */
+const editEnTeachingLibrary = (data: any) => {
+  editEnTeachingLibraryDialog.value.setFormData(data)
+  editEnTeachingLibraryDialog.value.showDialog = true
+}
+
+/**
+ * 获取篮球教案库列表
+ */
+const loadBasketballTeachingLibraryList = (page: number = 1) => {
+  BasketballTeachingLibraryTable.loading = true
+  BasketballTeachingLibraryTable.page = page
+
+  getBasketballTeachingLibraryList({
+    page: BasketballTeachingLibraryTable.page,
+    limit: BasketballTeachingLibraryTable.limit,
+    ...BasketballTeachingLibraryTable.searchParam
+  }).then(res => {
+    BasketballTeachingLibraryTable.loading = false
+    BasketballTeachingLibraryTable.data = res.data.data
+    BasketballTeachingLibraryTable.total = res.data.total
+  }).catch(() => {
+    BasketballTeachingLibraryTable.loading = false
+  })
+}
+loadBasketballTeachingLibraryList()
+
+/**
+ * 添加篮球教案库
+ */
+const addBasketballTeachingLibrary = () => {
+  editBasketballTeachingLibraryDialog.value.setFormData()
+  editBasketballTeachingLibraryDialog.value.showDialog = true
+}
+
+/**
+ * 编辑篮球教案库
+ * @param data
+ */
+const editBasketballTeachingLibrary = (data: any) => {
+  editBasketballTeachingLibraryDialog.value.setFormData(data)
+  editBasketballTeachingLibraryDialog.value.showDialog = true
+}
+
+/**
+ * 获取强化教案库列表
+ */
+const loadStrengthenTeachingLibraryList = (page: number = 1) => {
+  StrengTeachingLibraryTable.loading = true
+  StrengTeachingLibraryTable.page = page
+
+  getStrengTeachingLibraryList({
+    page: StrengTeachingLibraryTable.page,
+    limit: StrengTeachingLibraryTable.limit,
+    ...StrengTeachingLibraryTable.searchParam
+  }).then(res => {
+    StrengTeachingLibraryTable.loading = false
+    StrengTeachingLibraryTable.data = res.data.data
+    StrengTeachingLibraryTable.total = res.data.total
+  }).catch(() => {
+    StrengTeachingLibraryTable.loading = false
+  })
+}
+loadStrengthenTeachingLibraryList()
+
+/**
+ * 添加强化教案库
+ */
+const addStrengthenTeachingLibrary = () => {
+  editStrengthenTeachingLibraryDialog.value.setFormData()
+  editStrengthenTeachingLibraryDialog.value.showDialog = true
+}
+
+/**
+ * 编辑强化教案库
+ * @param data
+ */
+const editStrengthenTeachingLibrary = (data: any) => {
+  editStrengthenTeachingLibraryDialog.value.setFormData(data)
+  editStrengthenTeachingLibraryDialog.value.showDialog = true
+}
+
+/**
+ * 获取空中忍者教案库列表
+ */
+const loadNinjaTeachingLibraryList = (page: number = 1) => {
+  NinjaTeachingLibraryTable.loading = true
+  NinjaTeachingLibraryTable.page = page
+
+  getNinjaTeachingLibraryList({
+    page: NinjaTeachingLibraryTable.page,
+    limit: NinjaTeachingLibraryTable.limit,
+    ...NinjaTeachingLibraryTable.searchParam
+  }).then(res => {
+    NinjaTeachingLibraryTable.loading = false
+    NinjaTeachingLibraryTable.data = res.data.data
+    NinjaTeachingLibraryTable.total = res.data.total
+  }).catch(() => {
+    NinjaTeachingLibraryTable.loading = false
+  })
+}
+loadNinjaTeachingLibraryList()
+
+/**
+ * 添加空中忍者教案库
+ */
+const addNinjaTeachingLibrary = () => {
+  editNinjaTeachingLibraryDialog.value.setFormData()
+  editNinjaTeachingLibraryDialog.value.showDialog = true
+}
+
+/**
+ * 编辑空中忍者教案库
+ * @param data
+ */
+const editNinjaTeachingLibrary = (data: any) => {
+  editNinjaTeachingLibraryDialog.value.setFormData(data)
+  editNinjaTeachingLibraryDialog.value.showDialog = true
+}
+
+/**
+ * 获取少儿安防教案库列表
+ */
+const loadSecurityTeachingLibraryList = (page: number = 1) => {
+  SecurityTeachingLibraryTable.loading = true
+  SecurityTeachingLibraryTable.page = page
+
+  getSecurityTeachingLibraryList({
+    page: SecurityTeachingLibraryTable.page,
+    limit: SecurityTeachingLibraryTable.limit,
+    ...SecurityTeachingLibraryTable.searchParam
+  }).then(res => {
+    SecurityTeachingLibraryTable.loading = false
+    SecurityTeachingLibraryTable.data = res.data.data
+    SecurityTeachingLibraryTable.total = res.data.total
+  }).catch(() => {
+    SecurityTeachingLibraryTable.loading = false
+  })
+}
+loadSecurityTeachingLibraryList()
+
+/**
+ * 添加少儿安防教案库
+ */
+const addSecurityTeachingLibrary = () => {
+  editSecurityTeachingLibraryDialog.value.setFormData()
+  editSecurityTeachingLibraryDialog.value.showDialog = true
+}
+
+/**
+ * 编辑少儿安防教案库
+ * @param data
+ */
+const editSecurityTeachingLibrary = (data: any) => {
+  editSecurityTeachingLibraryDialog.value.setFormData(data)
+  editSecurityTeachingLibraryDialog.value.showDialog = true
+}
+
+
+/**
+ * 删除教研管理
+ */
+const deleteEvent = (id: number, type: number) => {
+  ElMessageBox.confirm(t('lessonCourseTeachingDeleteTips'), t('warning'),
+      {
+        confirmButtonText: t('confirm'),
+        cancelButtonText: t('cancel'),
+        type: 'warning',
+      }
+  ).then(() => {
+    deleteLessonCourseTeaching(id).then(() => {
+      if (type === 16) {
+        loadLessonCourseTeachingList()
+      } else if (type === 17) {
+        loadJumpLessonLibraryList()
+      } else if (type === 18) {
+        loadEnTeachingLibraryList()
+      } else if (type === 19) {
+        loadBasketballTeachingLibraryList()
+      } else if (type === 20) {
+        loadStrengthenTeachingLibraryList()
+      } else if (type === 21) {
+        loadNinjaTeachingLibraryList()
+      } else if (type === 22) {
+        loadSecurityTeachingLibraryList()
+      }
+    }).catch(() => {
+    })
+  })
+}
+
+
+const userPermissionList = ref([])
+const setUserPermissionList = async () => {
+  userPermissionList.value = await (await getWithPersonnelDataList({})).data
+}
+setUserPermissionList()
+
+const resetForm = (formEl: FormInstance | undefined, type: number) => {
+  if (!formEl) return
+  formEl.resetFields()
+  if (type === 16) {
+    lessonCourseTeachingTable = reactive({
+      page: 1,
+      limit: 10,
+      total: 0,
+      loading: true,
+      data: [],
+      searchParam: {
+        "title": "",
+        "status": "",
+        "create_time": [],
+        "update_time": [],
+        table_type: 16
+      }
+    })
+    loadLessonCourseTeachingList()
+  } else if (type === 17) {
+    JumpLessonLibraryTable = reactive({
+      page: 1,
+      limit: 10,
+      total: 0,
+      loading: true,
+      data: [],
+      searchParam: {
+        "title": "",
+        "status": "",
+        "create_time": [],
+        "update_time": [],
+        table_type: 17
+      }
+    })
+    loadJumpLessonLibraryList()
+  } else if (type === 18) {
+    EnTeachingLibraryTable = reactive({
+      page: 1,
+      limit: 10,
+      total: 0,
+      loading: true,
+      data: [],
+      searchParam: {
+        "title": "",
+        "status": "",
+        "create_time": [],
+        "update_time": [],
+        table_type: 18
+      }
+    })
+    loadEnTeachingLibraryList()
+  } else if (type === 19) {
+    BasketballTeachingLibraryTable = reactive({
+      page: 1,
+      limit: 10,
+      total: 0,
+      loading: true,
+      data: [],
+      searchParam: {
+        "title": "",
+        "status": "",
+        "create_time": [],
+        "update_time": [],
+        table_type: 19
+      }
+    })
+    loadBasketballTeachingLibraryList()
+  } else if (type === 20) {
+    StrengTeachingLibraryTable = reactive({
+      page: 1,
+      limit: 10,
+      total: 0,
+      loading: true,
+      data: [],
+      searchParam: {
+        "title": "",
+        "status": "",
+        "create_time": [],
+        "update_time": [],
+        table_type: 20
+      }
+    })
+    loadStrengthenTeachingLibraryList()
+  } else if (type === 21) {
+    NinjaTeachingLibraryTable = reactive({
+      page: 1,
+      limit: 10,
+      total: 0,
+      loading: true,
+      data: [],
+      searchParam: {
+        "title": "",
+        "status": "",
+        "create_time": [],
+        "update_time": [],
+        table_type: 21
+      }
+    })
+    loadStrengthenTeachingLibraryList()
+  } else if (type === 22) {
+    SecurityTeachingLibraryTable = reactive({
+      page: 1,
+      limit: 10,
+      total: 0,
+      loading: true,
+      data: [],
+      searchParam: {
+        "title": "",
+        "status": "",
+        "create_time": [],
+        "update_time": [],
+        table_type: 22
+      }
+    })
+    loadStrengthenTeachingLibraryList()
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+/* 多行超出隐藏 */
+.multi-hidden {
+  word-break: break-all;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+}
+</style>
diff --git a/admin/src/app/views/setting/adminlogin.vue b/admin/src/app/views/setting/adminlogin.vue
index 58d49ab8..2da4e1d0 100644
--- a/admin/src/app/views/setting/adminlogin.vue
+++ b/admin/src/app/views/setting/adminlogin.vue
@@ -1,37 +1,27 @@
 <template>
-  <div class="main-container">
-    <el-form
-      class="page-form"
-      :model="formData"
-      label-width="150px"
-      ref="ruleFormRef"
-      v-loading="loading"
-    >
-      <el-card class="box-card !border-none" shadow="never">
-        <h3 class="panel-title !text-sm">{{ t('admin') }}</h3>
+    <div class="main-container">
 
-        <el-form-item :label="t('isCaptcha')">
-          <el-switch
-            v-model="formData.is_captcha"
-            :active-value="1"
-            :inactive-value="0"
-          />
-        </el-form-item>
-        <el-form-item :label="t('bgImg')">
-          <upload-image v-model="formData.bg" />
-          <div class="form-tip">{{ t('adminBgImgTip') }}</div>
-        </el-form-item>
-      </el-card>
-    </el-form>
+        <el-form class="page-form" :model="formData" label-width="150px" ref="ruleFormRef" v-loading="loading">
+            <el-card class="box-card !border-none" shadow="never">
+                <h3 class="panel-title !text-sm">{{ t('admin') }}</h3>
 
-    <div class="fixed-footer-wrap">
-      <div class="fixed-footer">
-        <el-button type="primary" @click="onSave(ruleFormRef)">{{
-          t('save')
-        }}</el-button>
-      </div>
+                <el-form-item :label="t('isCaptcha')">
+                    <el-switch v-model="formData.is_captcha" :active-value="1" :inactive-value="0" />
+                </el-form-item>
+                <el-form-item :label="t('bgImg')">
+                    <upload-image v-model="formData.bg" />
+                    <div class="form-tip">{{t('adminBgImgTip')}}</div>
+                </el-form-item>
+            </el-card>
+
+        </el-form>
+
+        <div class="fixed-footer-wrap">
+            <div class="fixed-footer">
+                <el-button type="primary" @click="onSave(ruleFormRef)">{{ t('save') }}</el-button>
+            </div>
+        </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
@@ -48,34 +38,32 @@ const pageName = route.meta.title
 const loading = ref(true)
 const ruleFormRef = ref<FormInstance>()
 const formData = reactive<Record<string, number | string>>({
-  is_captcha: 0,
-  bg: '',
+    is_captcha: 0,
+    bg: ''
 })
 
 const getFormData = async () => {
-  const data = await (await getConfigLogin()).data
-  Object.keys(formData).forEach((key: string) => {
-    formData[key] = data[key]
-  })
-  loading.value = false
+    const data = await (await getConfigLogin()).data
+    Object.keys(formData).forEach((key: string) => {
+        formData[key] = data[key]
+    })
+    loading.value = false
 }
 getFormData()
 
 const onSave = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  await formEl.validate((valid) => {
-    if (valid) {
-      const save = cloneDeep(formData)
+    if (loading.value || !formEl) return
+    await formEl.validate((valid) => {
+        if (valid) {
+            const save = cloneDeep(formData)
 
-      setConfigLogin(save)
-        .then(() => {
-          loading.value = false
-        })
-        .catch(() => {
-          loading.value = false
-        })
-    }
-  })
+            setConfigLogin(save).then(() => {
+                loading.value = false
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
 }
 </script>
 
diff --git a/admin/src/app/views/setting/agreement.vue b/admin/src/app/views/setting/agreement.vue
index fbd59783..e8ba09f4 100644
--- a/admin/src/app/views/setting/agreement.vue
+++ b/admin/src/app/views/setting/agreement.vue
@@ -1,60 +1,39 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
-
-      <div class="mt-[20px]">
-        <el-table
-          :data="agreementTableData.data"
-          size="large"
-          v-loading="agreementTableData.loading"
-        >
-          <template #empty>
-            <span>{{ !agreementTableData.loading ? t('emptyData') : '' }}</span>
-          </template>
-
-          <el-table-column
-            prop="type_name"
-            :label="t('typeName')"
-            min-width="100"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="title"
-            :label="t('title')"
-            min-width="100"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            :label="t('updateTime')"
-            min-width="180"
-            align="center"
-          >
-            <template #default="{ row }">
-              {{ row.update_time || '' }}
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            :label="t('operation')"
-            align="right"
-            fixed="right"
-            width="100"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="editEvent(row)">{{
-                t('config')
-              }}</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </el-card>
-  </div>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+
+           <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+            </div>
+
+            <div class="mt-[20px]">
+                <el-table :data="agreementTableData.data" size="large" v-loading="agreementTableData.loading">
+
+                    <template #empty>
+                        <span>{{ !agreementTableData.loading ? t('emptyData') : '' }}</span>
+                    </template>
+
+                    <el-table-column prop="type_name" :label="t('typeName')" min-width="100" :show-overflow-tooltip="true" />
+
+                    <el-table-column prop="title" :label="t('title')" min-width="100" :show-overflow-tooltip="true"/>
+
+                    <el-table-column :label="t('updateTime')" min-width="180" align="center">
+                        <template #default="{ row }">
+                            {{ row.update_time || '' }}
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column :label="t('operation')" align="right" fixed="right" width="100">
+                       <template #default="{ row }">
+                           <el-button type="primary" link @click="editEvent(row)">{{ t('config') }}</el-button>
+                       </template>
+                    </el-table-column>
+
+                </el-table>
+            </div>
+
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -67,25 +46,23 @@ const route = useRoute()
 const pageName = route.meta.title
 
 const agreementTableData = reactive({
-  loading: true,
-  data: [],
+    loading: true,
+    data: []
 })
 
 /**
  * 获取协议列表
  */
 const loadAgreementList = () => {
-  agreementTableData.loading = true
-  agreementTableData.data = []
-  getAgreementList()
-    .then((res) => {
-      Object.keys(res.data).forEach((key) => {
-        return agreementTableData.data.push(res.data[key])
-      })
-      agreementTableData.loading = false
-    })
-    .catch(() => {
-      agreementTableData.loading = false
+    agreementTableData.loading = true
+    agreementTableData.data = []
+    getAgreementList().then(res => {
+        Object.keys(res.data).forEach((key) => {
+            return agreementTableData.data.push(res.data[key])
+        })
+        agreementTableData.loading = false
+    }).catch(() => {
+        agreementTableData.loading = false
     })
 }
 
@@ -94,8 +71,9 @@ loadAgreementList()
 const router = useRouter()
 
 const editEvent = (data: any) => {
-  router.push(`/setting/agreement/edit?key=${data.agreement_key}`)
+    router.push(`/setting/agreement/edit?key=${data.agreement_key}`)
 }
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/setting/agreement_edit.vue b/admin/src/app/views/setting/agreement_edit.vue
index 8c9f19cb..6029ef1c 100644
--- a/admin/src/app/views/setting/agreement_edit.vue
+++ b/admin/src/app/views/setting/agreement_edit.vue
@@ -1,52 +1,31 @@
 <template>
-  <div class="main-container">
-    <el-card class="card !border-none" shadow="never">
-      <el-page-header :content="pageName" :icon="ArrowLeft" @back="back()" />
-    </el-card>
+    <div class="main-container">
 
-    <el-card
-      class="box-card mt-[15px] !border-none"
-      shadow="never"
-      v-loading="loading"
-    >
-      <el-form
-        :model="formData"
-        label-width="90px"
-        ref="formRef"
-        :rules="formRules"
-        class="page-form"
-      >
-        <el-form-item :label="t('type')">
-          <el-input
-            v-model.trim="formData.agreement_key_name"
-            readonly
-            class="input-width"
-          />
-        </el-form-item>
-        <el-form-item :label="t('title')" prop="title">
-          <el-input
-            v-model.trim="formData.title"
-            clearable
-            :placeholder="t('titlePlaceholder')"
-            class="input-width"
-            maxlength="20"
-          />
-        </el-form-item>
-        <el-form-item :label="t('content')" prop="content">
-          <editor v-model="formData.content" />
-        </el-form-item>
-      </el-form>
-    </el-card>
+        <el-card class="card !border-none" shadow="never">
+            <el-page-header :content="pageName" :icon="ArrowLeft" @back="back()" />
+        </el-card>
 
-    <div class="fixed-footer-wrap">
-      <div class="fixed-footer">
-        <el-button type="primary" @click="onSave(formRef)">{{
-          t('save')
-        }}</el-button>
-        <el-button @click="back()">{{ t('cancel') }}</el-button>
-      </div>
+        <el-card class="box-card mt-[15px] !border-none" shadow="never" v-loading="loading">
+            <el-form :model="formData" label-width="90px" ref="formRef" :rules="formRules" class="page-form">
+                <el-form-item :label="t('type')">
+                    <el-input v-model.trim="formData.agreement_key_name" readonly class="input-width" />
+                </el-form-item>
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model.trim="formData.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" maxlength="20" />
+                </el-form-item>
+                <el-form-item :label="t('content')" prop="content">
+                    <editor v-model="formData.content" />
+                </el-form-item>
+            </el-form>
+        </el-card>
+
+        <div class="fixed-footer-wrap">
+            <div class="fixed-footer">
+                <el-button type="primary" @click="onSave(formRef)">{{ t('save') }}</el-button>
+                <el-button @click="back()">{{ t('cancel') }}</el-button>
+            </div>
+        </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
@@ -69,21 +48,21 @@ const pageName = route.meta.title
  * 表单数据
  */
 const initialFormData = {
-  agreement_key: '',
-  content: '',
-  title: '',
-  agreement_key_name: '',
+    agreement_key: '',
+    content: '',
+    title: '',
+    agreement_key_name: ''
 }
 
 const formData: Record<string, any> = reactive({ ...initialFormData })
 loading.value = true
 const setFormData = async (agreement_key: string = '') => {
-  Object.assign(formData, initialFormData)
-  const data = await (await getAgreementInfo(agreement_key)).data
-  Object.keys(formData).forEach((key: string) => {
-    if (data[key] != undefined) formData[key] = data[key]
-  })
-  loading.value = false
+    Object.assign(formData, initialFormData)
+    const data = await (await getAgreementInfo(agreement_key)).data
+    Object.keys(formData).forEach((key: string) => {
+        if (data[key] != undefined) formData[key] = data[key]
+    })
+    loading.value = false
 }
 if (agreement_key) setFormData(agreement_key)
 
@@ -91,56 +70,54 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    title: [
-      { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
-    ],
-    content: [
-      {
-        required: true,
-        trigger: ['blur', 'change'],
-        validator: (rule: any, value: any, callback: any) => {
-          if (value === '') {
-            callback(new Error(t('contentPlaceholder')))
-          } else if (value.length < 5 || value.length > 100000) {
-            callback(new Error(t('contentMaxTips')))
-            return false
-          } else {
-            callback()
-          }
-        },
-      },
-    ],
-  }
+    return {
+        title: [
+            { required: true, message: t('titlePlaceholder'), trigger: 'blur' }
+        ],
+        content: [
+                {
+                    required: true,
+                    trigger: ['blur', 'change'],
+                    validator: (rule: any, value: any, callback: any) => {
+                        if (value === '') {
+                            callback(new Error(t('contentPlaceholder')))
+                        } else if (value.length < 5 || value.length > 100000) {
+                            callback(new Error(t('contentMaxTips')))
+                            return false
+                        } else {
+                            callback()
+                        }
+                    }
+                }
+            ]
+    }
 })
 
 const onSave = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      const data = formData
-      data.key = formData.agreement_key
-      editAgreement(data)
-        .then((res) => {
-          loading.value = false
-          back()
-        })
-        .catch(() => {
-          loading.value = false
-        })
-    }
-  })
+    if (loading.value || !formEl) return
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+            const data = formData
+            data.key = formData.agreement_key
+            editAgreement(data).then(res => {
+                loading.value = false
+                back()
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
 }
 
 const back = () => {
-  tabbarStore.removeTab(route.path)
-  router.push({ path: '/setting/agreement' })
+    tabbarStore.removeTab(route.path)
+    router.push({ path: '/setting/agreement' })
 }
 </script>
 
 <style lang="scss">
-.edui-default .edui-editor {
-  z-index: 1 !important;
-}
+    .edui-default .edui-editor{
+        z-index: 1 !important;
+    }
 </style>
diff --git a/admin/src/app/views/setting/cash_out.vue b/admin/src/app/views/setting/cash_out.vue
index a26aaaba..9b057973 100644
--- a/admin/src/app/views/setting/cash_out.vue
+++ b/admin/src/app/views/setting/cash_out.vue
@@ -1,133 +1,71 @@
 <template>
-  <!--提现设置-->
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
-
-      <el-form
-        class="page-form mt-[20px]"
-        :model="formData"
-        label-width="150px"
-        ref="ruleFormRef"
-        :rules="rules"
-        v-loading="loading"
-      >
+    <!--提现设置-->
+    <div class="main-container">
         <el-card class="box-card !border-none" shadow="never">
-          <el-form-item :label="t('isOpen')">
-            <el-switch
-              v-model="formData.is_open"
-              active-value="1"
-              inactive-value="0"
-            />
-          </el-form-item>
-
-          <el-form-item
-            :label="t('cashWithdrawalAmount')"
-            v-if="formData.is_open"
-            prop="min"
-          >
-            <div>
-              <el-input
-                v-model.trim="formData.min"
-                @keyup="filterDigit($event)"
-                class="input-width"
-                :placeholder="t('cashWithdrawalAmountPlaceholder')"
-              />
-              <div class="text-[12px] text-[#999] leading-[24px]">
-                {{ t('minTips') }}
-              </div>
-            </div>
-          </el-form-item>
-
-          <el-form-item
-            :label="t('commissionRatio')"
-            v-if="formData.is_open"
-            prop="rate"
-          >
-            <el-input
-              v-model.trim="formData.rate"
-              @keyup="filterDigit($event)"
-              class="input-width"
-              :placeholder="t('commissionRatioPlaceholder')"
-            />
-            <span class="ml-2">%</span>
-          </el-form-item>
-
-          <el-form-item
-            :label="t('audit')"
-            v-if="formData.is_open"
-            class="items-center"
-          >
-            <el-radio-group v-model="formData.is_auto_verify">
-              <el-radio label="0" size="large">{{ t('manualAudit') }}</el-radio>
-              <el-radio label="1" size="large">{{
-                t('automaticAudit')
-              }}</el-radio>
-            </el-radio-group>
-          </el-form-item>
-
-          <el-form-item
-            :label="t('transfer')"
-            v-if="formData.is_open"
-            class="items-baseline"
-          >
-            <div>
-              <el-radio-group v-model="formData.is_auto_transfer">
-                <el-radio label="0" size="large">{{
-                  t('manualTransfer')
-                }}</el-radio>
-                <el-radio label="1" size="large">{{
-                  t('automatedTransit')
-                }}</el-radio>
-              </el-radio-group>
-              <div class="text-[12px] text-[#999] leading-[24px]">
-                {{ t('transferTips') }}
-              </div>
-            </div>
-          </el-form-item>
-          <el-form-item
-            :label="t('transferMode')"
-            v-if="formData.is_open"
-            class="items-baseline"
-          >
-            <div>
-              <el-checkbox-group v-model="formData.transfer_type" size="large">
-                <el-checkbox
-                  :label="item.key"
-                  v-for="(item, index) in Transfertype"
-                  :key="'a' + index"
-                  >{{ item.name }}</el-checkbox
-                >
-              </el-checkbox-group>
-              <div class="text-[12px] text-[#999] leading-[24px]">
-                {{ t('transferModeTips') }}
-              </div>
+
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
             </div>
-          </el-form-item>
+
+            <el-form class="page-form mt-[20px]" :model="formData" label-width="150px" ref="ruleFormRef" :rules="rules" v-loading="loading">
+                <el-card class="box-card !border-none" shadow="never">
+
+                    <el-form-item :label="t('isOpen')">
+                        <el-switch v-model="formData.is_open" active-value="1" inactive-value="0" />
+                    </el-form-item>
+
+                    <el-form-item :label="t('cashWithdrawalAmount')" v-if="formData.is_open" prop="min">
+                        <div>
+                            <el-input v-model.trim="formData.min" @keyup="filterDigit($event)" class="input-width" :placeholder="t('cashWithdrawalAmountPlaceholder')" />
+                            <div class="text-[12px] text-[#999] leading-[24px]">{{  t('minTips') }}</div>
+                        </div>
+                    </el-form-item>
+
+                    <el-form-item :label="t('commissionRatio')" v-if="formData.is_open" prop="rate">
+                        <el-input v-model.trim="formData.rate" @keyup="filterDigit($event)" class="input-width" :placeholder="t('commissionRatioPlaceholder')" />
+                        <span class="ml-2">%</span>
+                    </el-form-item>
+
+                    <el-form-item :label="t('audit')" v-if="formData.is_open"  class="items-center">
+                        <el-radio-group v-model="formData.is_auto_verify">
+                            <el-radio label="0" size="large">{{t('manualAudit')}}</el-radio>
+                            <el-radio label="1" size="large">{{t('automaticAudit')}}</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+
+                    <el-form-item :label="t('transfer')" v-if="formData.is_open" class="items-baseline">
+                        <div>
+                            <el-radio-group v-model="formData.is_auto_transfer">
+                                <el-radio label="0" size="large">{{t('manualTransfer')}}</el-radio>
+                                <el-radio label="1" size="large">{{t('automatedTransit')}}</el-radio>
+                            </el-radio-group>
+                            <div class="text-[12px] text-[#999] leading-[24px]">{{ t('transferTips') }}</div>
+                        </div>
+                    </el-form-item>
+                    <el-form-item :label="t('transferMode')" v-if="formData.is_open" class="items-baseline">
+                        <div>
+                            <el-checkbox-group v-model="formData.transfer_type" size="large">
+                                <el-checkbox :label="item.key"  v-for="(item,index) in Transfertype" :key="'a'+index">{{item.name}}</el-checkbox>
+                            </el-checkbox-group>
+                            <div class="text-[12px] text-[#999] leading-[24px]">{{ t('transferModeTips') }}</div>
+                        </div>
+                    </el-form-item>
+                </el-card>
+            </el-form>
         </el-card>
-      </el-form>
-    </el-card>
-
-    <div class="fixed-footer-wrap">
-      <div class="fixed-footer">
-        <el-button type="primary" @click="onSave(ruleFormRef)">{{
-          t('save')
-        }}</el-button>
-      </div>
+
+        <div class="fixed-footer-wrap">
+            <div class="fixed-footer">
+                <el-button type="primary" @click="onSave(ruleFormRef)">{{ t('save') }}</el-button>
+            </div>
+        </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
 import { t } from '@/lang'
-import {
-  getCashOutConfig,
-  setCashOutConfig,
-  getTransfertype,
-} from '@/app/api/member'
+import { getCashOutConfig, setCashOutConfig, getTransfertype } from '@/app/api/member'
 import { FormRules, FormInstance } from 'element-plus'
 import { useRoute } from 'vue-router'
 import { filterDigit } from '@/utils/common'
@@ -138,67 +76,69 @@ const pageName = route.meta.title
 const loading = ref(true)
 const ruleFormRef = ref<FormInstance>()
 const formData = reactive({
-  is_auto_transfer: '0',
-  is_auto_verify: '0',
-  is_open: '0',
-  min: '0',
-  rate: '0',
-  transfer_type: [],
+    is_auto_transfer: '0',
+    is_auto_verify: '0',
+    is_open: '0',
+    min: '0',
+    rate: '0',
+    transfer_type: []
 })
 const Transfertype = ref<Array<Object>>([])
 
 // 获取会员转账方式
 const getTransfertypeFn = async () => {
-  Transfertype.value = await (await getTransfertype()).data
+    Transfertype.value = await (await getTransfertype()).data
 }
 getTransfertypeFn()
 
 // 获取会员的配置信息
 const setFormData = async () => {
-  const data = await (await getCashOutConfig()).data
-  Object.keys(formData).forEach((key: string) => {
-    if (data[key] != undefined) formData[key] = data[key]
-  })
-  loading.value = false
+    const data = await (await getCashOutConfig()).data
+    Object.keys(formData).forEach((key: string) => {
+        if (data[key] != undefined) formData[key] = data[key]
+    })
+    loading.value = false
 }
 setFormData()
 
 const minRules = (rule: any, value: any, callback: any) => {
-  if (Number(value) < 0.01) {
-    callback(new Error(t('cashWithdrawalAmountHint')))
-  } else {
-    callback()
-  }
+    if (Number(value) < 0.01) {
+        callback(new Error(t('cashWithdrawalAmountHint')))
+    } else {
+        callback()
+    }
 }
 
 const rateRules = (rule: any, value: any, callback: any) => {
-  if (Number(value) > 100 || Number(value) < 0) {
-    callback(new Error(t('commissionRatioHint')))
-  } else {
-    callback()
-  }
+    if (Number(value) > 100 || Number(value) < 0) {
+        callback(new Error(t('commissionRatioHint')))
+    } else {
+        callback()
+    }
 }
 
 const rules = reactive<FormRules>({
-  min: [{ validator: minRules, trigger: 'blur' }],
-  rate: [{ validator: rateRules, trigger: 'blur' }],
+    min: [
+        { validator: minRules, trigger: 'blur' }
+    ],
+    rate: [
+        { validator: rateRules, trigger: 'blur' }
+    ]
 })
 
 const onSave = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  await formEl.validate((valid) => {
-    if (valid) {
-      const save = { ...formData }
-
-      setCashOutConfig(save)
-        .then(() => {
-          loading.value = false
-        })
-        .catch(() => {
-          loading.value = false
-        })
-    }
-  })
+    if (loading.value || !formEl) return
+    await formEl.validate((valid) => {
+        if (valid) {
+            const save = { ...formData }
+
+            setCashOutConfig(save).then(() => {
+                loading.value = false
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
 }
 </script>
 
diff --git a/admin/src/app/views/setting/components/cron-info.vue b/admin/src/app/views/setting/components/cron-info.vue
index 19e79d58..e43eef95 100644
--- a/admin/src/app/views/setting/components/cron-info.vue
+++ b/admin/src/app/views/setting/components/cron-info.vue
@@ -1,70 +1,56 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="t('cronInfo')"
-    width="550px"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="110px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('title')">
-        <div class="input-width">{{ formData.title }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('typeName')">
-        <div class="input-width">{{ formData.type_name }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('crondType')">
-        <div class="input-width" v-if="formData.type == 'crond'">
-          {{ formData.crond_length }} {{ formData.crond_type_name }}
-        </div>
-        <div class="input-width" v-else>{{ t('cron') }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('count')">
-        <div class="input-width">{{ formData.count }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('task')">
-        <div class="input-width">{{ formData.task }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('data')">
-        <div class="input-width">{{ JSON.stringify(formData.data) }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('statusDesc')">
-        <div class="input-width">{{ formData.status_desc }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('lastTime')">
-        <div class="input-width">{{ formData.last_time }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('nextTime')">
-        <div class="input-width">{{ formData.next_time }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('createTime')">
-        <div class="input-width">{{ formData.create_time }}</div>
-      </el-form-item>
-    </el-form>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="showDialog = false">{{
-          t('confirm')
-        }}</el-button>
-      </span>
-    </template>
-  </el-dialog>
+    <el-dialog v-model="showDialog" :title="t('cronInfo')" width="550px" :destroy-on-close="true">
+        <el-form :model="formData" label-width="110px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+
+            <el-form-item :label="t('title')" >
+                <div class="input-width"> {{ formData.title }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('typeName')" >
+                <div class="input-width"> {{ formData.type_name }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('crondType')" >
+                <div class="input-width"  v-if="formData.type == 'crond'">{{ formData.crond_length }} {{ formData.crond_type_name }} </div>
+                <div  class="input-width" v-else>{{ t('cron') }}</div>
+            </el-form-item>
+
+            <el-form-item :label="t('count')" >
+                <div class="input-width"> {{ formData.count }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('task')" >
+                <div class="input-width"> {{ formData.task }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('data')" >
+                <div class="input-width"> {{ JSON.stringify(formData.data) }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('statusDesc')" >
+                <div class="input-width"> {{ formData.status_desc }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('lastTime')" >
+                <div class="input-width"> {{ formData.last_time }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('nextTime')" >
+                <div class="input-width"> {{ formData.next_time }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('createTime')" >
+                <div class="input-width"> {{ formData.create_time }} </div>
+            </el-form-item>
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button type="primary" @click="showDialog = false">{{ t('confirm') }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -79,20 +65,20 @@ const loading = ref(true)
  * 表单数据
  */
 const initialFormData = {
-  count: 0,
-  create_time: '',
-  crond_length: '',
-  crond_type: '',
-  crond_type_name: '',
-  data: '',
-  delete_time: '',
-  last_time: '',
-  next_time: '',
-  status_desc: '',
-  title: '',
-  type: '',
-  type_name: '',
-  update_time: '',
+    count: 0,
+    create_time: '',
+    crond_length: '',
+    crond_type: '',
+    crond_type_name: '',
+    data: '',
+    delete_time: '',
+    last_time: '',
+    next_time: '',
+    status_desc: '',
+    title: '',
+    type: '',
+    type_name: '',
+    update_time: ''
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -100,23 +86,25 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {}
+    return {
+
+    }
 })
 
 const setFormData = async (row: any = null) => {
-  loading.value = true
-  Object.assign(formData, initialFormData)
-  if (row) {
-    Object.keys(formData).forEach((key: string) => {
-      if (row[key] != undefined) formData[key] = row[key]
-    })
-  }
-  loading.value = false
+    loading.value = true
+    Object.assign(formData, initialFormData)
+    if (row) {
+        Object.keys(formData).forEach((key: string) => {
+            if (row[key] != undefined) formData[key] = row[key]
+        })
+    }
+    loading.value = false
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
diff --git a/admin/src/app/views/setting/components/notice-records-info.vue b/admin/src/app/views/setting/components/notice-records-info.vue
index 2e772d47..50b7c77e 100644
--- a/admin/src/app/views/setting/components/notice-records-info.vue
+++ b/admin/src/app/views/setting/components/notice-records-info.vue
@@ -1,55 +1,43 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="t('messageInfo')"
-    width="550px"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="110px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('messageKey')">
-        <div class="input-width">{{ formData.name }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('smsType')">
-        <div class="input-width">
-          <div v-if="formData.notice_type == 'sms'">{{ t('sms') }}</div>
-          <div v-if="formData.notice_type == 'wechat'">{{ t('wechat') }}</div>
-          <div v-if="formData.notice_type == 'weapp'">{{ t('weapp') }}</div>
-        </div>
-      </el-form-item>
-
-      <!-- <el-form-item :label="t('messageData')">
+    <el-dialog v-model="showDialog" :title="t('messageInfo')" width="550px" :destroy-on-close="true">
+        <el-form :model="formData" label-width="110px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+
+            <el-form-item :label="t('messageKey')">
+                <div class="input-width"> {{ formData.name }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('smsType')">
+                <div class="input-width"> 
+                    <div v-if="formData.notice_type == 'sms'">{{ t('sms') }}</div>
+                    <div v-if="formData.notice_type == 'wechat'">{{ t('wechat') }}</div>
+                    <div v-if="formData.notice_type == 'weapp'">{{ t('weapp') }}</div>    
+                </div>
+            </el-form-item>
+
+            <!-- <el-form-item :label="t('messageData')">
                 <div class="input-width"> {{ formData.message_data }} </div>
             </el-form-item> -->
 
-      <el-form-item :label="t('nickname')">
-        <div class="input-width">{{ formData.nickname }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('receiver')">
-        <div class="input-width">{{ formData.receiver }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('createTime')">
-        <div class="input-width">{{ formData.create_time }}</div>
-      </el-form-item>
-    </el-form>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="showDialog = false">{{
-          t('confirm')
-        }}</el-button>
-      </span>
-    </template>
-  </el-dialog>
+            <el-form-item :label="t('nickname')">
+                <div class="input-width"> {{ formData.nickname }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('receiver')">
+                <div class="input-width"> {{ formData.receiver }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('createTime')">
+                <div class="input-width"> {{ formData.create_time }} </div>
+            </el-form-item>
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button type="primary" @click="showDialog = false">{{ t('confirm') }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -64,14 +52,14 @@ const loading = ref(true)
  * 表单数据
  */
 const initialFormData = {
-  create_time: 0,
-  message_data: '',
-  message_key: '',
-  message_type: '',
-  name: '',
-  nickname: '',
-  receiver: '',
-  notice_type: '',
+    create_time: 0,
+    message_data: '',
+    message_key: '',
+    message_type: '',
+    name: '',
+    nickname: '',
+    receiver: '',
+    notice_type: ''
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -79,25 +67,27 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {}
+    return {
+
+    }
 })
 
 const setFormData = async (row: any = null) => {
-  loading.value = true
-  Object.assign(formData, initialFormData)
+    loading.value = true
+    Object.assign(formData, initialFormData)
 
-  if (row) {
-    Object.keys(formData).forEach((key: string) => {
-      if (row[key] != undefined) formData[key] = row[key]
-    })
-  }
+    if (row) {
+        Object.keys(formData).forEach((key: string) => {
+            if (row[key] != undefined) formData[key] = row[key]
+        })
+    }
 
-  loading.value = false
+    loading.value = false
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
diff --git a/admin/src/app/views/setting/components/notice-sms.vue b/admin/src/app/views/setting/components/notice-sms.vue
index 09c5e105..645da8a2 100644
--- a/admin/src/app/views/setting/components/notice-sms.vue
+++ b/admin/src/app/views/setting/components/notice-sms.vue
@@ -1,60 +1,38 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="t('noticeSetting')"
-    width="550px"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="110px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('status')">
-        <el-radio-group v-model="formData.is_sms">
-          <el-radio :label="1">{{ t('startUsing') }}</el-radio>
-          <el-radio :label="0">{{ t('statusDeactivate') }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-
-      <el-form-item :label="t('name')">
-        <div class="input-width">{{ formData.name }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('title')">
-        <div class="input-width">{{ formData.title }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('smsId')" prop="sms_id">
-        <el-input
-          v-model.trim="formData.sms_id"
-          :placeholder="t('smsIdPlaceholder')"
-          class="input-width"
-          show-word-limit
-          clearable
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('smsContent')">
-        <div class="input-width">{{ formData.content }}</div>
-      </el-form-item>
-    </el-form>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+    <el-dialog v-model="showDialog" :title="t('noticeSetting')" width="550px" :destroy-on-close="true">
+        <el-form :model="formData" label-width="110px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+            <el-form-item :label="t('status')">
+                <el-radio-group v-model="formData.is_sms">
+                    <el-radio :label="1">{{ t('startUsing') }}</el-radio>
+                    <el-radio :label="0">{{ t('statusDeactivate') }}</el-radio>
+                </el-radio-group>
+            </el-form-item>
+
+            <el-form-item :label="t('name')">
+                <div class="input-width"> {{ formData.name }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('title')">
+                <div class="input-width"> {{ formData.title }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('smsId')" prop="sms_id">
+                <el-input v-model.trim="formData.sms_id" :placeholder="t('smsIdPlaceholder')" class="input-width" show-word-limit clearable />
+            </el-form-item>
+
+            <el-form-item :label="t('smsContent')">
+                <div class="input-width"> {{ formData.content }} </div>
+            </el-form-item>
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{t('confirm')}}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -70,14 +48,14 @@ const loading = ref(true)
  * 表单数据
  */
 const initialFormData = {
-  is_sms: 0,
-  key: '',
-  name: '',
-  sms_default_content: '',
-  title: '',
-  type: '',
-  sms_id: '',
-  content: '',
+    is_sms: 0,
+    key: '',
+    name: '',
+    sms_default_content: '',
+    title: '',
+    type: '',
+    sms_id: '',
+    content: ''
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -85,11 +63,11 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    sms_id: [
-      { required: true, message: t('smsIdPlaceholder'), trigger: 'blur' },
-    ],
-  }
+    return {
+        sms_id: [
+            { required: true, message: t('smsIdPlaceholder'), trigger: 'blur' }
+        ]
+    }
 })
 
 const emit = defineEmits(['complete'])
@@ -99,46 +77,44 @@ const emit = defineEmits(['complete'])
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-
-      const data = formData
-      data.status = data.is_sms
-
-      editNotice(data)
-        .then((res) => {
-          loading.value = false
-          showDialog.value = false
-          emit('complete')
-        })
-        .catch(() => {
-          loading.value = false
-          // showDialog.value = false
-        })
-    }
-  })
+    if (loading.value || !formEl) return
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            const data = formData
+            data.status = data.is_sms
+
+            editNotice(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(() => {
+                loading.value = false
+                // showDialog.value = false
+            })
+        }
+    })
 }
 
 const setFormData = async (row: any = null) => {
-  loading.value = true
-  Object.assign(formData, initialFormData)
+    loading.value = true
+    Object.assign(formData, initialFormData)
 
-  if (row) {
-    Object.keys(formData).forEach((key: string) => {
-      if (row[key] != undefined) formData[key] = row[key]
-      if (row.sms && row.sms[key] != undefined) formData[key] = row.sms[key]
-    })
-  }
+    if (row) {
+        Object.keys(formData).forEach((key: string) => {
+            if (row[key] != undefined) formData[key] = row[key]
+            if (row.sms && row.sms[key] != undefined) formData[key] = row.sms[key]
+        })
+    }
 
-  loading.value = false
+    loading.value = false
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
diff --git a/admin/src/app/views/setting/components/notice-weapp.vue b/admin/src/app/views/setting/components/notice-weapp.vue
index 3ee1d45d..2d5ac6c9 100644
--- a/admin/src/app/views/setting/components/notice-weapp.vue
+++ b/admin/src/app/views/setting/components/notice-weapp.vue
@@ -1,54 +1,36 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="t('noticeSetting')"
-    width="550px"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="110px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('status')">
-        <el-radio-group v-model="formData.is_weapp">
-          <el-radio :label="1">{{ t('startUsing') }}</el-radio>
-          <el-radio :label="0">{{ t('statusDeactivate') }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-
-      <el-form-item :label="t('name')">
-        <div class="input-width">{{ formData.name }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('weappTempKey')">
-        <div class="input-width">{{ formData.tid }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('content')">
-        <div class="input-width">
-          <div v-for="(item, index) in formData.content" :key="index">
-            {{ item[0] }}：{{ item[1] }}
-          </div>
-        </div>
-      </el-form-item>
-    </el-form>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+    <el-dialog v-model="showDialog" :title="t('noticeSetting')" width="550px" :destroy-on-close="true">
+        <el-form :model="formData" label-width="110px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+            <el-form-item :label="t('status')">
+                <el-radio-group v-model="formData.is_weapp">
+                    <el-radio :label="1">{{ t('startUsing') }}</el-radio>
+                    <el-radio :label="0">{{ t('statusDeactivate') }}</el-radio>
+                </el-radio-group>
+            </el-form-item>
+
+            <el-form-item :label="t('name')">
+                <div class="input-width"> {{ formData.name }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('weappTempKey')">
+                <div class="input-width"> {{ formData.tid }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('content')">
+                <div class="input-width">
+                    <div v-for="(item, index) in formData.content" :key="index">{{ item[0] }}：{{ item[1] }} </div>
+                </div>
+            </el-form-item>
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{t('confirm')}}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -64,15 +46,15 @@ const loading = ref(true)
  * 表单数据
  */
 const initialFormData = {
-  is_weapp: 0,
-  key: '',
-  name: '',
-  title: '',
-  type: '',
-  content: [],
-  first: '',
-  remark: '',
-  tid: '',
+    is_weapp: 0,
+    key: '',
+    name: '',
+    title: '',
+    type: '',
+    content: [],
+    first: '',
+    remark: '',
+    tid: ''
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -80,7 +62,9 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {}
+    return {
+
+    }
 })
 
 const emit = defineEmits(['complete'])
@@ -90,47 +74,44 @@ const emit = defineEmits(['complete'])
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
+    if (loading.value || !formEl) return
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            const data = formData
+            data.status = data.is_weapp
+
+            editNoticeStatus(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(() => {
+                loading.value = false
+                // showDialog.value = false
+            })
+        }
+    })
+}
 
-      const data = formData
-      data.status = data.is_weapp
+const setFormData = async (row: any = null) => {
+    loading.value = true
+    Object.assign(formData, initialFormData)
 
-      editNoticeStatus(data)
-        .then((res) => {
-          loading.value = false
-          showDialog.value = false
-          emit('complete')
-        })
-        .catch(() => {
-          loading.value = false
-          // showDialog.value = false
+    if (row) {
+        Object.keys(formData).forEach((key: string) => {
+            if (row[key] != undefined) formData[key] = row[key]
+            if (row.weapp && row.weapp[key] != undefined) formData[key] = row.weapp[key]
         })
     }
-  })
-}
-
-const setFormData = async (row: any = null) => {
-  loading.value = true
-  Object.assign(formData, initialFormData)
-
-  if (row) {
-    Object.keys(formData).forEach((key: string) => {
-      if (row[key] != undefined) formData[key] = row[key]
-      if (row.weapp && row.weapp[key] != undefined)
-        formData[key] = row.weapp[key]
-    })
-  }
 
-  loading.value = false
+    loading.value = false
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
diff --git a/admin/src/app/views/setting/components/notice-wechat.vue b/admin/src/app/views/setting/components/notice-wechat.vue
index dba82745..bd1eb7af 100644
--- a/admin/src/app/views/setting/components/notice-wechat.vue
+++ b/admin/src/app/views/setting/components/notice-wechat.vue
@@ -1,72 +1,48 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="t('noticeSetting')"
-    width="550px"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="110px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('status')">
-        <el-radio-group v-model="formData.is_wechat">
-          <el-radio :label="1">{{ t('startUsing') }}</el-radio>
-          <el-radio :label="0">{{ t('statusDeactivate') }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-
-      <el-form-item :label="t('name')">
-        <div class="input-width">{{ formData.name }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('tempKey')">
-        <div class="input-width">{{ formData.temp_key }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('keywordNameList')">
-        <div class="input-width">
-          {{
-            formData.keyword_name_list
-              ? formData.keyword_name_list.join('，')
-              : ''
-          }}
-        </div>
-      </el-form-item>
-
-      <!--            <el-form-item :label="t('first')" prop="first">-->
-      <!--                <el-input v-model.trim="formData.wechat_first" :placeholder="t('firstPlaceholder')" class="input-width" show-word-limit clearable />-->
-      <!--            </el-form-item>-->
-
-      <el-form-item :label="t('content')">
-        <div class="input-width">
-          <div v-for="(item, index) in formData.content" :key="index">
-            {{ item[0] }}：{{ item[1] }}
-          </div>
-        </div>
-      </el-form-item>
-
-      <!--            <el-form-item :label="t('remark')" prop="remark">-->
-      <!--                <el-input v-model.trim="formData.wechat_remark" :placeholder="t('remarkPlaceholder')" class="input-width" show-word-limit clearable />-->
-      <!--            </el-form-item>-->
-    </el-form>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+    <el-dialog v-model="showDialog" :title="t('noticeSetting')" width="550px" :destroy-on-close="true">
+        <el-form :model="formData" label-width="110px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+            <el-form-item :label="t('status')">
+                <el-radio-group v-model="formData.is_wechat">
+                    <el-radio :label="1">{{ t('startUsing') }}</el-radio>
+                    <el-radio :label="0">{{ t('statusDeactivate') }}</el-radio>
+                </el-radio-group>
+            </el-form-item>
+
+            <el-form-item :label="t('name')">
+                <div class="input-width">{{ formData.name }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('tempKey')">
+                <div class="input-width">{{ formData.temp_key }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('keywordNameList')">
+                <div class="input-width">{{ formData.keyword_name_list ? formData.keyword_name_list.join('，') : '' }} </div>
+            </el-form-item>
+
+<!--            <el-form-item :label="t('first')" prop="first">-->
+<!--                <el-input v-model.trim="formData.wechat_first" :placeholder="t('firstPlaceholder')" class="input-width" show-word-limit clearable />-->
+<!--            </el-form-item>-->
+
+            <el-form-item :label="t('content')">
+                <div class="input-width">
+                    <div v-for="(item, index) in formData.content" :key="index">{{ item[0] }}：{{ item[1] }} </div>
+                </div>
+            </el-form-item>
+
+<!--            <el-form-item :label="t('remark')" prop="remark">-->
+<!--                <el-input v-model.trim="formData.wechat_remark" :placeholder="t('remarkPlaceholder')" class="input-width" show-word-limit clearable />-->
+<!--            </el-form-item>-->
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{t('confirm')}}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -82,18 +58,18 @@ const loading = ref(true)
  * 表单数据
  */
 const initialFormData = {
-  is_wechat: 0,
-  key: '',
-  name: '',
-  title: '',
-  type: '',
-  content: [],
-  // first: '',
-  // remark: '',
-  temp_key: '',
-  keyword_name_list: '',
-  // wechat_first: '',
-  // wechat_remark: ''
+    is_wechat: 0,
+    key: '',
+    name: '',
+    title: '',
+    type: '',
+    content: [],
+    // first: '',
+    // remark: '',
+    temp_key: '',
+    keyword_name_list: ''
+    // wechat_first: '',
+    // wechat_remark: ''
 }
 
 const formData: Record<string, any> = reactive({ ...initialFormData })
@@ -102,7 +78,9 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {}
+    return {
+
+    }
 })
 
 const emit = defineEmits(['complete'])
@@ -112,46 +90,43 @@ const emit = defineEmits(['complete'])
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-
-      const data = formData
-      data.status = data.is_wechat
-      editNotice(data)
-        .then((res) => {
-          loading.value = false
-          showDialog.value = false
-          emit('complete')
-        })
-        .catch(() => {
-          loading.value = false
-          // showDialog.value = false
-        })
-    }
-  })
+    if (loading.value || !formEl) return
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            const data = formData
+            data.status = data.is_wechat
+            editNotice(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(() => {
+                loading.value = false
+                // showDialog.value = false
+            })
+        }
+    })
 }
 
 const setFormData = async (row: any = null) => {
-  loading.value = true
-  Object.assign(formData, initialFormData)
-  if (row) {
-    Object.keys(formData).forEach((key: string) => {
-      if (row[key] != undefined) formData[key] = row[key]
-      if (row.wechat && row.wechat[key] != undefined)
-        formData[key] = row.wechat[key]
-    })
-    // if (!row.wechat_first) formData['wechat_first'] = row['first']
-    // if (!row.wechat_remark) formData['wechat_remark'] = row['remark']
-  }
-  loading.value = false
+    loading.value = true
+    Object.assign(formData, initialFormData)
+    if (row) {
+        Object.keys(formData).forEach((key: string) => {
+            if (row[key] != undefined) formData[key] = row[key]
+            if (row.wechat && row.wechat[key] != undefined) formData[key] = row.wechat[key]
+        })
+        // if (!row.wechat_first) formData['wechat_first'] = row['first']
+        // if (!row.wechat_remark) formData['wechat_remark'] = row['remark']
+    }
+    loading.value = false
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
diff --git a/admin/src/app/views/setting/components/pay-alipay.vue b/admin/src/app/views/setting/components/pay-alipay.vue
index 97db5ca2..5dd6a13a 100644
--- a/admin/src/app/views/setting/components/pay-alipay.vue
+++ b/admin/src/app/views/setting/components/pay-alipay.vue
@@ -1,89 +1,42 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="t('updateAlipay')"
-    width="550px"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="110px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('appId')" prop="config.app_id">
-        <el-input
-          v-model.trim="formData.config.app_id"
-          :placeholder="t('appIdPlaceholder')"
-          class="input-width"
-          maxlength="32"
-          show-word-limit
-          clearable
-        />
-        <div class="form-tip">{{ t('appIdTips') }}</div>
-      </el-form-item>
-      <el-form-item :label="t('appSecretCert')" prop="config.app_secret_cert">
-        <el-input
-          v-model.trim="formData.config.app_secret_cert"
-          :placeholder="t('appSecretCertPlaceholder')"
-          class="input-width"
-          type="textarea"
-          rows="4"
-          clearable
-        />
-      </el-form-item>
-
-      <el-form-item
-        :label="t('appPublicCertPath')"
-        prop="config.app_public_cert_path"
-      >
-        <div class="input-width">
-          <upload-file
-            v-model.trim="formData.config.app_public_cert_path"
-            api="sys/document/aliyun"
-          />
-        </div>
-      </el-form-item>
-
-      <el-form-item
-        :label="t('alipayPublicCertPath')"
-        prop="config.alipay_public_cert_path"
-      >
-        <div class="input-width">
-          <upload-file
-            v-model="formData.config.alipay_public_cert_path"
-            api="sys/document/aliyun"
-          />
-        </div>
-      </el-form-item>
-
-      <el-form-item
-        :label="t('alipayRootCertPath')"
-        prop="config.alipay_root_cert_path"
-      >
-        <div class="input-width">
-          <upload-file
-            v-model="formData.config.alipay_root_cert_path"
-            api="sys/document/aliyun"
-          />
-        </div>
-      </el-form-item>
-    </el-form>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="cancel">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+    <el-dialog v-model="showDialog" :title="t('updateAlipay')" width="550px" :destroy-on-close="true">
+        <el-form :model="formData" label-width="110px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+
+            <el-form-item :label="t('appId')" prop="config.app_id">
+                <el-input v-model.trim="formData.config.app_id" :placeholder="t('appIdPlaceholder')" class="input-width" maxlength="32" show-word-limit clearable />
+                <div class="form-tip">{{ t('appIdTips') }}</div>
+            </el-form-item>
+            <el-form-item :label="t('appSecretCert')" prop="config.app_secret_cert">
+                <el-input v-model.trim="formData.config.app_secret_cert" :placeholder="t('appSecretCertPlaceholder')" class="input-width" type="textarea" rows="4" clearable />
+            </el-form-item>
+
+            <el-form-item :label="t('appPublicCertPath')" prop="config.app_public_cert_path">
+                <div class="input-width">
+                    <upload-file v-model.trim="formData.config.app_public_cert_path" api="sys/document/aliyun" />
+                </div>
+            </el-form-item>
+
+            <el-form-item :label="t('alipayPublicCertPath')" prop="config.alipay_public_cert_path">
+                <div class="input-width">
+                    <upload-file v-model="formData.config.alipay_public_cert_path" api="sys/document/aliyun" />
+                </div>
+            </el-form-item>
+
+            <el-form-item :label="t('alipayRootCertPath')" prop="config.alipay_root_cert_path">
+                <div class="input-width">
+                    <upload-file v-model="formData.config.alipay_root_cert_path" api="sys/document/aliyun" />
+                </div>
+            </el-form-item>
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="cancel">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{t('confirm')}}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -100,17 +53,17 @@ const initData = ref<any>(null)
  * 表单数据
  */
 const initialFormData = {
-  type: 'alipay',
-  app_id: '',
-  config: {
-    app_secret_cert: '',
-    app_public_cert_path: '',
-    alipay_public_cert_path: '',
-    alipay_root_cert_path: '',
-  },
-  channel: '',
-  status: 0,
-  is_default: 0,
+    type: 'alipay',
+    app_id: '',
+    config: {
+        app_secret_cert: '',
+        app_public_cert_path: '',
+        alipay_public_cert_path: '',
+        alipay_root_cert_path: ''
+    },
+    channel: '',
+    status: 0,
+    is_default: 0
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -118,39 +71,23 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    'config.app_id': [
-      { required: true, message: t('appIdPlaceholder'), trigger: 'blur' },
-    ],
-    'config.app_secret_cert': [
-      {
-        required: true,
-        message: t('appSecretCertPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    'config.app_public_cert_path': [
-      {
-        required: true,
-        message: t('appPublicCertPathPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    'config.alipay_public_cert_path': [
-      {
-        required: true,
-        message: t('alipayPublicCertPathPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    'config.alipay_root_cert_path': [
-      {
-        required: true,
-        message: t('alipayRootCertPathPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-  }
+    return {
+        'config.app_id': [
+            { required: true, message: t('appIdPlaceholder'), trigger: 'blur' }
+        ],
+        'config.app_secret_cert': [
+            { required: true, message: t('appSecretCertPlaceholder'), trigger: 'blur' }
+        ],
+        'config.app_public_cert_path': [
+            { required: true, message: t('appPublicCertPathPlaceholder'), trigger: 'blur' }
+        ],
+        'config.alipay_public_cert_path': [
+            { required: true, message: t('alipayPublicCertPathPlaceholder'), trigger: 'blur' }
+        ],
+        'config.alipay_root_cert_path': [
+            { required: true, message: t('alipayRootCertPathPlaceholder'), trigger: 'blur' }
+        ]
+    }
 })
 
 const emit = defineEmits(['complete'])
@@ -160,58 +97,51 @@ const emit = defineEmits(['complete'])
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      emit('complete', formData)
-      showDialog.value = false
-    }
-  })
+    if (loading.value || !formEl) return
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            emit('complete', formData)
+            showDialog.value = false
+        }
+    })
 }
 
 const cancel = () => {
-  Object.assign(formData, initialFormData)
-  if (initData.value) {
-    Object.keys(formData).forEach((key: string) => {
-      if (initData.value[key] != undefined) formData[key] = initData.value[key]
-    })
-    formData.channel = initData.value.redio_key.split('_')[0]
-    formData.status = Number(formData.status)
-  }
-  emit('complete', formData)
-  showDialog.value = false
+    Object.assign(formData, initialFormData)
+    if (initData.value) {
+        Object.keys(formData).forEach((key: string) => {
+            if (initData.value[key] != undefined) formData[key] = initData.value[key]
+        })
+        formData.channel = initData.value.redio_key.split('_')[0]
+        formData.status = Number(formData.status)
+    }
+    emit('complete', formData)
+    showDialog.value = false
 }
 const setFormData = async (data: any = null) => {
-  initData.value = cloneDeep(data)
-  loading.value = true
-  Object.assign(formData, initialFormData)
-  if (data) {
-    Object.keys(formData).forEach((key: string) => {
-      if (data[key] != undefined) formData[key] = data[key]
-    })
-    formData.channel = data.redio_key.split('_')[0]
-    formData.status = Number(formData.status)
-  }
-  loading.value = false
+    initData.value = cloneDeep(data)
+    loading.value = true
+    Object.assign(formData, initialFormData)
+    if (data) {
+        Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+        formData.channel = data.redio_key.split('_')[0]
+        formData.status = Number(formData.status)
+    }
+    loading.value = false
 }
 
 const enableVerify = () => {
-  let verify = true
-  if (
-    Test.empty(formData.config.app_id) ||
-    Test.empty(formData.config.app_secret_cert) ||
-    Test.empty(formData.config.app_public_cert_path) ||
-    Test.empty(formData.config.alipay_public_cert_path) ||
-    Test.empty(formData.config.alipay_root_cert_path)
-  )
-    verify = false
-  return verify
+    let verify = true
+    if (Test.empty(formData.config.app_id) || Test.empty(formData.config.app_secret_cert) || Test.empty(formData.config.app_public_cert_path) || Test.empty(formData.config.alipay_public_cert_path) || Test.empty(formData.config.alipay_root_cert_path)) verify = false
+    return verify
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
-  enableVerify,
+    showDialog,
+    setFormData,
+    enableVerify
 })
 </script>
 
diff --git a/admin/src/app/views/setting/components/pay-friendspay.vue b/admin/src/app/views/setting/components/pay-friendspay.vue
index 82fc03fd..b31a29da 100644
--- a/admin/src/app/views/setting/components/pay-friendspay.vue
+++ b/admin/src/app/views/setting/components/pay-friendspay.vue
@@ -1,146 +1,49 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="
-      formData.config.pay_type_name
-        ? formData.config.pay_type_name
-        : t('updateFriendsPay')
-    "
-    width="550px"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="110px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('friendsPaySwitch')">
-        <el-switch
-          v-model="formData.config.pay_explain_switch"
-          :active-value="1"
-          :inactive-value="0"
-        />
-      </el-form-item>
-      <template v-if="formData.config.pay_explain_switch == 1">
-        <el-form-item
-          :label="t('friendsPayTitle')"
-          prop="config.pay_explain_title"
-        >
-          <el-input
-            v-model.trim="formData.config.pay_explain_title"
-            :placeholder="t('friendsPayTitlePlaceholder')"
-            class="input-width"
-            maxlength="10"
-            show-word-limit
-            clearable
-          />
-        </el-form-item>
-        <el-form-item
-          :label="t('desContent')"
-          prop="config.pay_explain_content"
-        >
-          <el-input
-            v-model.trim="formData.config.pay_explain_content"
-            :placeholder="t('desContentPlaceholder')"
-            class="input-width"
-            type="textarea"
-            rows="4"
-            maxlength="120"
-            show-word-limit
-            clearable
-          />
-        </el-form-item>
-      </template>
-      <el-form-item :label="t('friendsPayGoodsSwitch')">
-        <div>
-          <el-switch
-            v-model="formData.config.pay_info_switch"
-            :active-value="1"
-            :inactive-value="0"
-          />
-          <div class="text-[12px] text-[#999] leading-[20px]">
-            {{ t('friendsPayGoodsSwitchTips') }}
-          </div>
-        </div>
-      </el-form-item>
-      <el-form-item :label="t('friendsPayName')" prop="config.pay_type_name">
-        <el-input
-          v-model.trim="formData.config.pay_type_name"
-          :placeholder="t('friendsPayNamePlaceholder')"
-          class="input-width"
-          maxlength="10"
-          show-word-limit
-          clearable
-        />
-      </el-form-item>
-      <el-form-item :label="t('helpName')" prop="config.pay_page_name">
-        <el-input
-          v-model.trim="formData.config.pay_page_name"
-          :placeholder="t('helpNamePlaceholder')"
-          class="input-width"
-          maxlength="10"
-          show-word-limit
-          clearable
-        />
-      </el-form-item>
-      <el-form-item :label="t('helpBtn')" prop="config.pay_button_name">
-        <el-input
-          v-model.trim="formData.config.pay_button_name"
-          :placeholder="t('helpBtnPlaceholder')"
-          class="input-width"
-          maxlength="10"
-          show-word-limit
-          clearable
-        />
-      </el-form-item>
-      <el-form-item :label="t('remark')" prop="config.pay_leave_message">
-        <el-input
-          v-model.trim="formData.config.pay_leave_message"
-          :placeholder="t('remarkPlaceholder')"
-          class="input-width"
-          type="textarea"
-          rows="4"
-          maxlength="20"
-          show-word-limit
-          clearable
-        />
-      </el-form-item>
-      <el-form-item
-        :label="t('payWechatImage')"
-        prop="config.pay_wechat_share_image"
-        v-if="initData.redio_key == 'wechat_friendspay'"
-      >
-        <upload-image
-          v-model="formData.config.pay_wechat_share_image"
-          :limit="1"
-        />
-      </el-form-item>
-      <el-form-item
-        :label="t('payWeappImage')"
-        prop="config.pay_weapp_share_image"
-        v-if="initData.redio_key == 'weapp_friendspay'"
-      >
-        <upload-image
-          v-model="formData.config.pay_weapp_share_image"
-          :limit="1"
-        />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="cancel()">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+    <el-dialog v-model="showDialog" :title="formData.config.pay_type_name ? formData.config.pay_type_name : t('updateFriendsPay')" width="550px" :destroy-on-close="true">
+        <el-form :model="formData" label-width="110px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+            <el-form-item :label="t('friendsPaySwitch')">
+                <el-switch v-model="formData.config.pay_explain_switch" :active-value="1" :inactive-value="0"/>
+            </el-form-item>
+            <template v-if="formData.config.pay_explain_switch == 1">
+                <el-form-item :label="t('friendsPayTitle')" prop="config.pay_explain_title">
+                    <el-input v-model.trim="formData.config.pay_explain_title" :placeholder="t('friendsPayTitlePlaceholder')" class="input-width" maxlength="10" show-word-limit clearable />
+                </el-form-item>
+                <el-form-item :label="t('desContent')" prop="config.pay_explain_content">
+                    <el-input v-model.trim="formData.config.pay_explain_content" :placeholder="t('desContentPlaceholder')" class="input-width" type="textarea" rows="4" maxlength="120" show-word-limit  clearable />
+                </el-form-item>
+            </template>
+            <el-form-item :label="t('friendsPayGoodsSwitch')">
+                <div>
+                    <el-switch v-model="formData.config.pay_info_switch" :active-value="1" :inactive-value="0"/>
+                    <div class="text-[12px] text-[#999] leading-[20px]">{{ t('friendsPayGoodsSwitchTips') }}</div>
+                </div>
+            </el-form-item>
+            <el-form-item :label="t('friendsPayName')" prop="config.pay_type_name">
+                <el-input v-model.trim="formData.config.pay_type_name" :placeholder="t('friendsPayNamePlaceholder')" class="input-width" maxlength="10" show-word-limit clearable />
+            </el-form-item>
+            <el-form-item :label="t('helpName')" prop="config.pay_page_name">
+                <el-input v-model.trim="formData.config.pay_page_name" :placeholder="t('helpNamePlaceholder')" class="input-width" maxlength="10" show-word-limit clearable />
+            </el-form-item>
+            <el-form-item :label="t('helpBtn')" prop="config.pay_button_name">
+                <el-input v-model.trim="formData.config.pay_button_name" :placeholder="t('helpBtnPlaceholder')" class="input-width" maxlength="10" show-word-limit clearable />
+            </el-form-item>
+            <el-form-item :label="t('remark')" prop="config.pay_leave_message">
+                <el-input v-model.trim="formData.config.pay_leave_message" :placeholder="t('remarkPlaceholder')" class="input-width" type="textarea" rows="4" maxlength="20" show-word-limit clearable />
+            </el-form-item>
+            <el-form-item :label="t('payWechatImage')" prop="config.pay_wechat_share_image" v-if="initData.redio_key == 'wechat_friendspay'">
+                <upload-image v-model="formData.config.pay_wechat_share_image" :limit="1" />
+            </el-form-item>
+            <el-form-item :label="t('payWeappImage')" prop="config.pay_weapp_share_image" v-if="initData.redio_key == 'weapp_friendspay'">
+                <upload-image v-model="formData.config.pay_weapp_share_image" :limit="1" />
+            </el-form-item>
+        </el-form>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="cancel()">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{t('confirm')}}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 <script lang="ts" setup>
 import { ref, reactive, computed } from 'vue'
@@ -156,23 +59,23 @@ const initData = ref<any>(null)
  * 表单数据
  */
 const initialFormData = {
-  type: 'friendspay',
-  app_id: '',
-  config: {
-    pay_explain_switch: 0,
-    pay_info_switch: 1,
-    pay_explain_title: '',
-    pay_explain_content: '',
-    pay_type_name: '',
-    pay_page_name: '',
-    pay_button_name: '',
-    pay_leave_message: '',
-    pay_wechat_share_image: '',
-    pay_weapp_share_image: '',
-  },
-  channel: '',
-  status: 0,
-  is_default: 0,
+    type: 'friendspay',
+    app_id: '',
+    config: {
+        pay_explain_switch: 0,
+        pay_info_switch: 1,
+        pay_explain_title: '',
+        pay_explain_content: '',
+        pay_type_name: '',
+        pay_page_name: '',
+        pay_button_name: '',
+        pay_leave_message: '',
+        pay_wechat_share_image: '',
+        pay_weapp_share_image: ''
+    },
+    channel: '',
+    status: 0,
+    is_default: 0
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -180,54 +83,46 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    'config.pay_explain_title': [
-      {
-        required: true,
-        message: t('friendsPayTitlePlaceholder'),
-        trigger: 'blur',
-      },
-      {
-        validator: (rule: any, value: string, callback: any) => {
-          if (formData.config.pay_explain_switch == 1 && value === '') {
-            callback(new Error(t('friendsPayTitlePlaceholder')))
-          }
+    return {
+        'config.pay_explain_title': [
+            { required: true, message: t('friendsPayTitlePlaceholder'), trigger: 'blur' },
+            {
+                validator: (rule: any, value: string, callback: any) => {
+                    if (formData.config.pay_explain_switch == 1 && value === '') {
+                        callback(new Error(t('friendsPayTitlePlaceholder')))
+                    }
 
-          callback()
-        },
-        trigger: 'blur',
-      },
-    ],
-    'config.pay_explain_content': [
-      { required: true, message: t('desContentPlaceholder'), trigger: 'blur' },
-      {
-        validator: (rule: any, value: string, callback: any) => {
-          if (formData.config.pay_explain_switch == 1 && value === '') {
-            callback(new Error(t('desContentPlaceholder')))
-          }
+                    callback()
+                },
+                trigger: 'blur'
+            }
+        ],
+        'config.pay_explain_content': [
+            { required: true, message: t('desContentPlaceholder'), trigger: 'blur' },
+            {
+                validator: (rule: any, value: string, callback: any) => {
+                    if (formData.config.pay_explain_switch == 1 && value === '') {
+                        callback(new Error(t('desContentPlaceholder')))
+                    }
 
-          callback()
-        },
-        trigger: 'blur',
-      },
-    ],
-    'config.pay_type_name': [
-      {
-        required: true,
-        message: t('friendsPayNamePlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    'config.pay_page_name': [
-      { required: true, message: t('helpNamePlaceholder'), trigger: 'blur' },
-    ],
-    'config.pay_button_name': [
-      { required: true, message: t('helpBtnPlaceholder'), trigger: 'blur' },
-    ],
-    'config.pay_leave_message': [
-      { required: true, message: t('remarkPlaceholder'), trigger: 'blur' },
-    ],
-  }
+                    callback()
+                },
+                trigger: 'blur'
+            }
+        ],
+        'config.pay_type_name': [
+            { required: true, message: t('friendsPayNamePlaceholder'), trigger: 'blur' }
+        ],
+        'config.pay_page_name': [
+            { required: true, message: t('helpNamePlaceholder'), trigger: 'blur' }
+        ],
+        'config.pay_button_name': [
+            { required: true, message: t('helpBtnPlaceholder'), trigger: 'blur' }
+        ],
+        'config.pay_leave_message': [
+            { required: true, message: t('remarkPlaceholder'), trigger: 'blur' }
+        ]
+    }
 })
 
 const emit = defineEmits(['complete'])
@@ -236,63 +131,53 @@ const emit = defineEmits(['complete'])
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      emit('complete', formData)
-      showDialog.value = false
-    }
-  })
+    if (loading.value || !formEl) return
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            emit('complete', formData)
+            showDialog.value = false
+        }
+    })
 }
 
 const cancel = () => {
-  Object.assign(formData, initialFormData)
-  if (initData.value) {
-    Object.keys(formData).forEach((key: string) => {
-      if (initData.value[key] != undefined) formData[key] = initData.value[key]
-    })
-    formData.channel = initData.value.redio_key.split('_')[0]
-    formData.status = Number(formData.status)
-  }
-  emit('complete', formData)
-  showDialog.value = false
+    Object.assign(formData, initialFormData)
+    if (initData.value) {
+        Object.keys(formData).forEach((key: string) => {
+            if (initData.value[key] != undefined) formData[key] = initData.value[key]
+        })
+        formData.channel = initData.value.redio_key.split('_')[0]
+        formData.status = Number(formData.status)
+    }
+    emit('complete', formData)
+    showDialog.value = false
 }
 
 const setFormData = async (data: any = null) => {
-  console.log(data)
-  initData.value = cloneDeep(data)
-  loading.value = true
-  Object.assign(formData, initialFormData)
-  if (data) {
-    Object.keys(formData).forEach((key: string) => {
-      if (data[key] != undefined) formData[key] = data[key]
-    })
-    formData.channel = data.redio_key.split('_')[0]
-    formData.status = Number(formData.status)
-  }
-  loading.value = false
+    console.log(data)
+    initData.value = cloneDeep(data)
+    loading.value = true
+    Object.assign(formData, initialFormData)
+    if (data) {
+        Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+        formData.channel = data.redio_key.split('_')[0]
+        formData.status = Number(formData.status)
+    }
+    loading.value = false
 }
 
 const enableVerify = () => {
-  let verify = true
-  if (
-    (formData.config.pay_explain_switch == 1 &&
-      Test.empty(formData.config.pay_explain_title)) ||
-    (formData.config.pay_explain_switch == 1 &&
-      Test.empty(formData.config.pay_explain_content)) ||
-    Test.empty(formData.config.pay_type_name) ||
-    Test.empty(formData.config.pay_page_name) ||
-    Test.empty(formData.config.pay_button_name) ||
-    Test.empty(formData.config.pay_leave_message)
-  )
-    verify = false
-  return verify
+    let verify = true
+    if ((formData.config.pay_explain_switch == 1 && Test.empty(formData.config.pay_explain_title)) || (formData.config.pay_explain_switch == 1 && Test.empty(formData.config.pay_explain_content)) || Test.empty(formData.config.pay_type_name) || Test.empty(formData.config.pay_page_name) || Test.empty(formData.config.pay_button_name) || Test.empty(formData.config.pay_leave_message)) verify = false
+    return verify
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
-  enableVerify,
+    showDialog,
+    setFormData,
+    enableVerify
 })
 </script>
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/setting/components/pay-offlinepay.vue b/admin/src/app/views/setting/components/pay-offlinepay.vue
index 0adb9e7b..7a2a7de7 100644
--- a/admin/src/app/views/setting/components/pay-offlinepay.vue
+++ b/admin/src/app/views/setting/components/pay-offlinepay.vue
@@ -1,73 +1,31 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="t('updateOfflinepay')"
-    width="550px"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="110px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('collectionName')" prop="config.collection_name">
-        <el-input
-          v-model.trim="formData.config.collection_name"
-          :placeholder="t('collectionNamePlaceholder')"
-          class="input-width"
-          show-word-limit
-          clearable
-        />
-      </el-form-item>
+    <el-dialog v-model="showDialog" :title="t('updateOfflinepay')" width="550px" :destroy-on-close="true">
+        <el-form :model="formData" label-width="110px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
 
-      <el-form-item :label="t('collectionBank')" prop="config.collection_bank">
-        <el-input
-          v-model.trim="formData.config.collection_bank"
-          :placeholder="t('collectionBankPlaceholder')"
-          class="input-width"
-          clearable
-        />
-      </el-form-item>
+            <el-form-item :label="t('collectionName')" prop="config.collection_name">
+                <el-input v-model.trim="formData.config.collection_name" :placeholder="t('collectionNamePlaceholder')" class="input-width" show-word-limit clearable />
+            </el-form-item>
 
-      <el-form-item
-        :label="t('collectionAccount')"
-        prop="config.collection_account"
-      >
-        <el-input
-          v-model.trim="formData.config.collection_account"
-          :placeholder="t('collectionAccountPlaceholder')"
-          class="input-width"
-          clearable
-        />
-      </el-form-item>
+            <el-form-item :label="t('collectionBank')" prop="config.collection_bank">
+                <el-input v-model.trim="formData.config.collection_bank" :placeholder="t('collectionBankPlaceholder')" class="input-width" clearable />
+            </el-form-item>
 
-      <el-form-item :label="t('collectionDesc')" prop="config.collection_desc">
-        <el-input
-          v-model.trim="formData.config.collection_desc"
-          :placeholder="t('collectionDescPlaceholder')"
-          class="input-width"
-          type="textarea"
-          rows="4"
-          clearable
-        />
-      </el-form-item>
-    </el-form>
+            <el-form-item :label="t('collectionAccount')" prop="config.collection_account">
+                <el-input v-model.trim="formData.config.collection_account" :placeholder="t('collectionAccountPlaceholder')" class="input-width" clearable />
+            </el-form-item>
 
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+            <el-form-item :label="t('collectionDesc')" prop="config.collection_desc">
+                <el-input v-model.trim="formData.config.collection_desc" :placeholder="t('collectionDescPlaceholder')" class="input-width" type="textarea" rows="4" clearable />
+            </el-form-item>
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -82,16 +40,16 @@ const loading = ref(true)
  * 表单数据
  */
 const initialFormData = {
-  type: 'offlinepay',
-  config: {
-    collection_name: '',
-    collection_bank: '',
-    collection_account: '',
-    collection_desc: '',
-  },
-  channel: '',
-  status: 0,
-  is_default: 0,
+    type: 'offlinepay',
+    config: {
+        collection_name: '',
+        collection_bank: '',
+        collection_account: '',
+        collection_desc: ''
+    },
+    channel: '',
+    status: 0,
+    is_default: 0
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -99,36 +57,20 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    'config.collection_name': [
-      {
-        required: true,
-        message: t('collectionNamePlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    'config.collection_bank': [
-      {
-        required: true,
-        message: t('collectionBankPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    'config.collection_account': [
-      {
-        required: true,
-        message: t('collectionAccountPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    'config.collection_desc': [
-      {
-        required: true,
-        message: t('collectionDescPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-  }
+    return {
+        'config.collection_name': [
+            { required: true, message: t('collectionNamePlaceholder'), trigger: 'blur' }
+        ],
+        'config.collection_bank': [
+            { required: true, message: t('collectionBankPlaceholder'), trigger: 'blur' }
+        ],
+        'config.collection_account': [
+            { required: true, message: t('collectionAccountPlaceholder'), trigger: 'blur' }
+        ],
+        'config.collection_desc': [
+            { required: true, message: t('collectionDescPlaceholder'), trigger: 'blur' }
+        ]
+    }
 })
 
 const emit = defineEmits(['complete'])
@@ -138,31 +80,31 @@ const emit = defineEmits(['complete'])
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      emit('complete', formData)
-      showDialog.value = false
-    }
-  })
+    if (loading.value || !formEl) return
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            emit('complete', formData)
+            showDialog.value = false
+        }
+    })
 }
 
 const setFormData = async (data: any = null) => {
-  loading.value = true
-  Object.assign(formData, initialFormData)
-  if (data) {
-    Object.keys(formData).forEach((key: string) => {
-      if (data[key] != undefined) formData[key] = data[key]
-    })
-    formData.channel = data.redio_key.split('_')[0]
-    formData.status = Number(formData.status)
-  }
-  loading.value = false
+    loading.value = true
+    Object.assign(formData, initialFormData)
+    if (data) {
+        Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+        formData.channel = data.redio_key.split('_')[0]
+        formData.status = Number(formData.status)
+    }
+    loading.value = false
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
diff --git a/admin/src/app/views/setting/components/pay-wechatpay.vue b/admin/src/app/views/setting/components/pay-wechatpay.vue
index dab18f57..76ac8b9f 100644
--- a/admin/src/app/views/setting/components/pay-wechatpay.vue
+++ b/admin/src/app/views/setting/components/pay-wechatpay.vue
@@ -1,171 +1,81 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="t('updateWechat')"
-    width="500px"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="140px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('mchId')" prop="config.mch_id">
-        <el-input
-          v-model.trim="formData.config.mch_id"
-          :placeholder="t('mchIdPlaceholder')"
-          class="input-width"
-          maxlength="32"
-          show-word-limit
-          clearable
-        />
-        <div class="form-tip">{{ t('mchIdTips') }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('mchSecretKey')" prop="config.mch_secret_key">
-        <el-input
-          v-model.trim="formData.config.mch_secret_key"
-          :placeholder="t('mchSecretKeyPlaceholder')"
-          class="input-width"
-          maxlength="32"
-          show-word-limit
-          clearable
-        />
-        <div class="form-tip">{{ t('mchSecretKeyTips') }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('mchSecretCert')" prop="config.mch_secret_cert">
-        <div class="input-width">
-          <upload-file
-            v-model="formData.config.mch_secret_cert"
-            api="sys/document/wechat"
-          />
-        </div>
-        <div class="form-tip">{{ t('mchSecretCertTips') }}</div>
-      </el-form-item>
-
-      <el-form-item
-        :label="t('mchPublicCertPath')"
-        prop="config.mch_public_cert_path"
-      >
-        <div class="input-width">
-          <upload-file
-            v-model="formData.config.mch_public_cert_path"
-            api="sys/document/wechat"
-          />
-        </div>
-        <div class="form-tip">{{ t('mchPublicCertPathTips') }}</div>
-      </el-form-item>
-
-      <el-form-item
-        :label="t('wechatpayPublicCert')"
-        prop="config.wechat_public_cert_path"
-      >
-        <div class="input-width">
-          <upload-file
-            v-model="formData.config.wechat_public_cert_path"
-            api="sys/document/wechat"
-          />
-        </div>
-      </el-form-item>
-
-      <el-form-item
-        :label="t('wechatpayPublicCertId')"
-        prop="config.wechat_public_cert_id"
-      >
-        <div class="input-width">
-          <el-input
-            v-model.trim="formData.config.wechat_public_cert_id"
-            placeholder=""
-            class="input-width"
-            show-word-limit
-            clearable
-          />
-        </div>
-      </el-form-item>
-
-      <el-form-item
-        :label="t('jsapiDir')"
-        v-show="formData.channel == 'wechat' || formData.channel == 'weapp'"
-      >
-        <el-input
-          :model-value="wapDomain + '/'"
-          placeholder="Please input"
-          class="input-width"
-          :readonly="true"
-          :disabled="true"
-        >
-          <template #append>
-            <div class="cursor-pointer" @click="copyEvent(wapDomain + '/')">
-              {{ t('copy') }}
-            </div>
-          </template>
-        </el-input>
-        <div class="form-tip !leading-normal">{{ t('jsapiDirTips') }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('h5Domain')" v-show="formData.channel == 'h5'">
-        <el-input
-          :model-value="
-            wapDomain.replace('http://', '').replace('https://', '')
-          "
-          placeholder="Please input"
-          class="input-width"
-          :readonly="true"
-          :disabled="true"
-        >
-          <template #append>
-            <div
-              class="cursor-pointer"
-              @click="
-                copyEvent(
-                  wapDomain.replace('http://', '').replace('https://', '')
-                )
-              "
-            >
-              {{ t('copy') }}
-            </div>
-          </template>
-        </el-input>
-        <div class="form-tip !leading-normal">{{ t('h5DomainTips') }}</div>
-      </el-form-item>
-
-      <el-form-item
-        :label="t('nativeDomain')"
-        v-show="formData.channel == 'pc'"
-      >
-        <el-input
-          :model-value="serviceDomain"
-          placeholder="Please input"
-          class="input-width"
-          :readonly="true"
-          :disabled="true"
-        >
-          <template #append>
-            <div class="cursor-pointer" @click="copyEvent(serviceDomain)">
-              {{ t('copy') }}
-            </div>
-          </template>
-        </el-input>
-        <div class="form-tip !leading-normal">{{ t('nativeDomainTips') }}</div>
-      </el-form-item>
-    </el-form>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="cancel">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+    <el-dialog v-model="showDialog" :title="t('updateWechat')" width="500px" :destroy-on-close="true">
+        <el-form :model="formData" label-width="140px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+
+            <el-form-item :label="t('mchId')" prop="config.mch_id">
+                <el-input v-model.trim="formData.config.mch_id" :placeholder="t('mchIdPlaceholder')" class="input-width" maxlength="32" show-word-limit clearable />
+                <div class="form-tip">{{ t('mchIdTips') }}</div>
+            </el-form-item>
+
+            <el-form-item :label="t('mchSecretKey')" prop="config.mch_secret_key">
+                <el-input v-model.trim="formData.config.mch_secret_key" :placeholder="t('mchSecretKeyPlaceholder')" class="input-width" maxlength="32" show-word-limit clearable />
+                <div class="form-tip">{{ t('mchSecretKeyTips') }}</div>
+            </el-form-item>
+
+            <el-form-item :label="t('mchSecretCert')" prop="config.mch_secret_cert">
+                <div class="input-width">
+                    <upload-file v-model="formData.config.mch_secret_cert" api="sys/document/wechat" />
+                </div>
+                <div class="form-tip">{{ t('mchSecretCertTips') }}</div>
+            </el-form-item>
+
+            <el-form-item :label="t('mchPublicCertPath')" prop="config.mch_public_cert_path">
+                <div class="input-width">
+                    <upload-file v-model="formData.config.mch_public_cert_path" api="sys/document/wechat" />
+                </div>
+                <div class="form-tip">{{ t('mchPublicCertPathTips') }}</div>
+            </el-form-item>
+
+            <el-form-item :label="t('wechatpayPublicCert')" prop="config.wechat_public_cert_path">
+                <div class="input-width">
+                    <upload-file v-model="formData.config.wechat_public_cert_path" api="sys/document/wechat" />
+                </div>
+            </el-form-item>
+
+            <el-form-item :label="t('wechatpayPublicCertId')" prop="config.wechat_public_cert_id">
+                <div class="input-width">
+                    <el-input v-model.trim="formData.config.wechat_public_cert_id" placeholder="" class="input-width" show-word-limit clearable />
+                </div>
+            </el-form-item>
+
+            <el-form-item :label="t('jsapiDir')" v-show="formData.channel == 'wechat' || formData.channel == 'weapp'">
+                <el-input :model-value="wapDomain + '/'" placeholder="Please input" class="input-width" :readonly="true" :disabled="true">
+                    <template #append>
+                        <div class="cursor-pointer" @click="copyEvent(wapDomain + '/')">{{ t('copy') }}
+                        </div>
+                    </template>
+                </el-input>
+                <div class="form-tip !leading-normal">{{ t('jsapiDirTips') }}</div>
+            </el-form-item>
+
+            <el-form-item :label="t('h5Domain')" v-show="formData.channel == 'h5'">
+                <el-input :model-value="wapDomain.replace('http://', '').replace('https://', '')" placeholder="Please input" class="input-width" :readonly="true" :disabled="true">
+                    <template #append>
+                        <div class="cursor-pointer" @click="copyEvent(wapDomain.replace('http://', '').replace('https://', ''))">{{ t('copy') }}
+                        </div>
+                    </template>
+                </el-input>
+                <div class="form-tip !leading-normal">{{ t('h5DomainTips') }}</div>
+            </el-form-item>
+
+            <el-form-item :label="t('nativeDomain')" v-show="formData.channel == 'pc'">
+                <el-input :model-value="serviceDomain" placeholder="Please input" class="input-width" :readonly="true" :disabled="true">
+                    <template #append>
+                        <div class="cursor-pointer" @click="copyEvent(serviceDomain)">{{ t('copy') }}
+                        </div>
+                    </template>
+                </el-input>
+                <div class="form-tip !leading-normal">{{ t('nativeDomainTips') }}</div>
+            </el-form-item>
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="cancel">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -184,26 +94,26 @@ const serviceDomain = ref('')
 const initData = ref<any>(null)
 
 getUrl().then((res: any) => {
-  wapDomain.value = res.data.wap_domain
-  serviceDomain.value = res.data.service_domain
+    wapDomain.value = res.data.wap_domain
+    serviceDomain.value = res.data.service_domain
 })
 
 /**
  * 表单数据
  */
 const initialFormData = {
-  type: 'wechatpay',
-  config: {
-    mch_id: '',
-    mch_secret_key: '',
-    mch_secret_cert: '',
-    mch_public_cert_path: '',
-    wechat_public_cert_path: '',
-    wechat_public_cert_id: '',
-  },
-  channel: '',
-  status: 0,
-  is_default: 0,
+    type: 'wechatpay',
+    config: {
+        mch_id: '',
+        mch_secret_key: '',
+        mch_secret_cert: '',
+        mch_public_cert_path: '',
+        wechat_public_cert_path: '',
+        wechat_public_cert_id: ''
+    },
+    channel: '',
+    status: 0,
+    is_default: 0
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -211,32 +121,20 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    'config.mch_id': [
-      { required: true, message: t('mchIdPlaceholder'), trigger: 'blur' },
-    ],
-    'config.mch_secret_key': [
-      {
-        required: true,
-        message: t('mchSecretKeyPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    'config.mch_secret_cert': [
-      {
-        required: true,
-        message: t('mchSecretCertPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    'config.mch_public_cert_path': [
-      {
-        required: true,
-        message: t('mchPublicCertPathPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-  }
+    return {
+        'config.mch_id': [
+            { required: true, message: t('mchIdPlaceholder'), trigger: 'blur' }
+        ],
+        'config.mch_secret_key': [
+            { required: true, message: t('mchSecretKeyPlaceholder'), trigger: 'blur' }
+        ],
+        'config.mch_secret_cert': [
+            { required: true, message: t('mchSecretCertPlaceholder'), trigger: 'blur' }
+        ],
+        'config.mch_public_cert_path': [
+            { required: true, message: t('mchPublicCertPathPlaceholder'), trigger: 'blur' }
+        ]
+    }
 })
 
 const emit = defineEmits(['complete'])
@@ -246,51 +144,45 @@ const emit = defineEmits(['complete'])
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      emit('complete', formData)
-      showDialog.value = false
-    }
-  })
+    if (loading.value || !formEl) return
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            emit('complete', formData)
+            showDialog.value = false
+        }
+    })
 }
 
 const cancel = () => {
-  Object.assign(formData, initialFormData)
-  if (initData.value) {
-    Object.keys(formData).forEach((key: string) => {
-      if (initData.value[key] != undefined) formData[key] = initData.value[key]
-    })
-    formData.channel = initData.value.redio_key.split('_')[0]
-    formData.status = Number(formData.status)
-  }
-  emit('complete', formData)
-  showDialog.value = false
+    Object.assign(formData, initialFormData)
+    if (initData.value) {
+        Object.keys(formData).forEach((key: string) => {
+            if (initData.value[key] != undefined) formData[key] = initData.value[key]
+        })
+        formData.channel = initData.value.redio_key.split('_')[0]
+        formData.status = Number(formData.status)
+    }
+    emit('complete', formData)
+    showDialog.value = false
 }
 const setFormData = async (data: any = null) => {
-  initData.value = cloneDeep(data)
-  loading.value = true
-  Object.assign(formData, initialFormData)
-  if (data) {
-    Object.keys(formData).forEach((key: string) => {
-      if (data[key] != undefined) formData[key] = data[key]
-    })
-    formData.channel = data.redio_key.split('_')[0]
-    formData.status = Number(formData.status)
-  }
-  loading.value = false
+    initData.value = cloneDeep(data)
+    loading.value = true
+    Object.assign(formData, initialFormData)
+    if (data) {
+        Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+        formData.channel = data.redio_key.split('_')[0]
+        formData.status = Number(formData.status)
+    }
+    loading.value = false
 }
 
 const enableVerify = () => {
-  let verify = true
-  if (
-    Test.empty(formData.config.mch_id) ||
-    Test.empty(formData.config.mch_secret_key) ||
-    Test.empty(formData.config.mch_secret_cert) ||
-    Test.empty(formData.config.mch_public_cert_path)
-  )
-    verify = false
-  return verify
+    let verify = true
+    if (Test.empty(formData.config.mch_id) || Test.empty(formData.config.mch_secret_key) || Test.empty(formData.config.mch_secret_cert) || Test.empty(formData.config.mch_public_cert_path)) verify = false
+    return verify
 }
 
 /**
@@ -298,29 +190,29 @@ const enableVerify = () => {
  */
 const { copy, isSupported, copied } = useClipboard()
 const copyEvent = (text: string) => {
-  if (!isSupported.value) {
-    ElMessage({
-      message: t('notSupportCopy'),
-      type: 'warning',
-    })
-    return
-  }
-  copy(text)
+    if (!isSupported.value) {
+        ElMessage({
+            message: t('notSupportCopy'),
+            type: 'warning'
+        })
+        return
+    }
+    copy(text)
 }
 
 watch(copied, () => {
-  if (copied.value) {
-    ElMessage({
-      message: t('copySuccess'),
-      type: 'success',
-    })
-  }
+    if (copied.value) {
+        ElMessage({
+            message: t('copySuccess'),
+            type: 'success'
+        })
+    }
 })
 
 defineExpose({
-  showDialog,
-  setFormData,
-  enableVerify,
+    showDialog,
+    setFormData,
+    enableVerify
 })
 </script>
 
diff --git a/admin/src/app/views/setting/components/sms-ali.vue b/admin/src/app/views/setting/components/sms-ali.vue
index b8c1aa02..20749596 100644
--- a/admin/src/app/views/setting/components/sms-ali.vue
+++ b/admin/src/app/views/setting/components/sms-ali.vue
@@ -1,66 +1,34 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="t('aliSms')"
-    width="580px"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="140px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('isUse')">
-        <el-radio-group v-model="formData.is_use">
-          <el-radio :label="1">{{ t('startUsing') }}</el-radio>
-          <el-radio :label="0">{{ t('statusDeactivate') }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-
-      <el-form-item :label="t('aliSign')" prop="sign">
-        <el-input
-          v-model.trim="formData.sign"
-          :placeholder="t('aliSignPlaceholder')"
-          class="input-width"
-          show-word-limit
-          clearable
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('aliAppKey')" prop="app_key">
-        <el-input
-          v-model.trim="formData.app_key"
-          :placeholder="t('aliAppKeyPlaceholder')"
-          class="input-width"
-          clearable
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('aliSecretKey')" prop="secret_key">
-        <el-input
-          v-model.trim="formData.secret_key"
-          :placeholder="t('aliSecretKeyPlaceholder')"
-          class="input-width"
-          clearable
-        />
-      </el-form-item>
-    </el-form>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+    <el-dialog v-model="showDialog" :title="t('aliSms')" width="580px" :destroy-on-close="true">
+        <el-form :model="formData" label-width="140px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+            <el-form-item :label="t('isUse')">
+                <el-radio-group v-model="formData.is_use">
+                    <el-radio :label="1">{{ t('startUsing') }}</el-radio>
+                    <el-radio :label="0">{{ t('statusDeactivate') }}</el-radio>
+                </el-radio-group>
+            </el-form-item>
+
+            <el-form-item :label="t('aliSign')" prop="sign">
+                <el-input v-model.trim="formData.sign" :placeholder="t('aliSignPlaceholder')" class="input-width" show-word-limit clearable />
+            </el-form-item>
+
+            <el-form-item :label="t('aliAppKey')" prop="app_key">
+                <el-input v-model.trim="formData.app_key" :placeholder="t('aliAppKeyPlaceholder')" class="input-width" clearable />
+            </el-form-item>
+
+            <el-form-item :label="t('aliSecretKey')" prop="secret_key">
+                <el-input v-model.trim="formData.secret_key" :placeholder="t('aliSecretKeyPlaceholder')" class="input-width" clearable />
+            </el-form-item>
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{t('confirm')}}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -76,11 +44,11 @@ const loading = ref(true)
  * 表单数据
  */
 const initialFormData = {
-  sms_type: '',
-  sign: '',
-  app_key: '',
-  secret_key: '',
-  is_use: '',
+    sms_type: '',
+    sign: '',
+    app_key: '',
+    secret_key: '',
+    is_use: ''
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -88,21 +56,17 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    sign: [
-      { required: true, message: t('aliSignPlaceholder'), trigger: 'blur' },
-    ],
-    app_key: [
-      { required: true, message: t('aliAppKeyPlaceholder'), trigger: 'blur' },
-    ],
-    secret_key: [
-      {
-        required: true,
-        message: t('aliSecretKeyPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-  }
+    return {
+        sign: [
+            { required: true, message: t('aliSignPlaceholder'), trigger: 'blur' }
+        ],
+        app_key: [
+            { required: true, message: t('aliAppKeyPlaceholder'), trigger: 'blur' }
+        ],
+        secret_key: [
+            { required: true, message: t('aliSecretKeyPlaceholder'), trigger: 'blur' }
+        ]
+    }
 })
 
 const emit = defineEmits(['complete'])
@@ -112,44 +76,42 @@ const emit = defineEmits(['complete'])
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-
-      const data = formData
-
-      editSms(data)
-        .then((res) => {
-          loading.value = false
-          showDialog.value = false
-          emit('complete')
-        })
-        .catch(() => {
-          loading.value = false
-          // showDialog.value = false
-        })
-    }
-  })
+    if (loading.value || !formEl) return
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            const data = formData
+
+            editSms(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(() => {
+                loading.value = false
+                // showDialog.value = false
+            })
+        }
+    })
 }
 
 const setFormData = async (row: any = null) => {
-  loading.value = true
-  Object.assign(formData, initialFormData)
-  if (row) {
-    const data = await (await getSmsInfo(row.sms_type)).data
-    Object.keys(formData).forEach((key: string) => {
-      if (data[key] != undefined) formData[key] = data[key]
-      if (data.params[key] != undefined) formData[key] = data.params[key].value
-    })
-  }
-  loading.value = false
+    loading.value = true
+    Object.assign(formData, initialFormData)
+    if (row) {
+        const data = await (await getSmsInfo(row.sms_type)).data
+        Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+            if (data.params[key] != undefined) formData[key] = data.params[key].value
+        })
+    }
+    loading.value = false
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
diff --git a/admin/src/app/views/setting/components/sms-records-info.vue b/admin/src/app/views/setting/components/sms-records-info.vue
index baeb69de..a724e95d 100644
--- a/admin/src/app/views/setting/components/sms-records-info.vue
+++ b/admin/src/app/views/setting/components/sms-records-info.vue
@@ -1,51 +1,39 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="t('messageInfo')"
-    width="550px"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="110px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('messageKey')">
-        <div class="input-width">{{ formData.name }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('smsType')">
-        <div class="input-width">{{ formData.sms_type_name }}</div>
-      </el-form-item>
-
-      <!-- <el-form-item :label="t('messageData')">
+    <el-dialog v-model="showDialog" :title="t('messageInfo')" width="550px" :destroy-on-close="true">
+        <el-form :model="formData" label-width="110px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+
+            <el-form-item :label="t('messageKey')">
+                <div class="input-width"> {{ formData.name }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('smsType')">
+                <div class="input-width"> {{ formData.sms_type_name }} </div>
+            </el-form-item>
+
+            <!-- <el-form-item :label="t('messageData')">
                 <div class="input-width"> {{ formData.message_data }} </div>
             </el-form-item> -->
 
-      <!-- <el-form-item :label="t('nickname')">
+            <!-- <el-form-item :label="t('nickname')">
                 <div class="input-width"> {{ formData.nickname }} </div>
             </el-form-item> -->
 
-      <el-form-item :label="t('receiver')">
-        <div class="input-width">{{ formData.mobile }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('createTime')">
-        <div class="input-width">{{ formData.create_time }}</div>
-      </el-form-item>
-    </el-form>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="showDialog = false">{{
-          t('confirm')
-        }}</el-button>
-      </span>
-    </template>
-  </el-dialog>
+            <el-form-item :label="t('receiver')">
+                <div class="input-width"> {{ formData.mobile }} </div>
+            </el-form-item>
+
+            <el-form-item :label="t('createTime')">
+                <div class="input-width"> {{ formData.create_time }} </div>
+            </el-form-item>
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button type="primary" @click="showDialog = false">{{ t('confirm') }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -60,14 +48,14 @@ const loading = ref(true)
  * 表单数据
  */
 const initialFormData = {
-  create_time: 0,
-  message_data: '',
-  message_key: '',
-  message_type: '',
-  name: '',
-  nickname: '',
-  mobile: '',
-  sms_type_name: '',
+    create_time: 0,
+    message_data: '',
+    message_key: '',
+    message_type: '',
+    name: '',
+    nickname: '',
+    mobile: '',
+    sms_type_name: ''
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -75,25 +63,27 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {}
+    return {
+
+    }
 })
 
 const setFormData = async (row: any = null) => {
-  loading.value = true
-  Object.assign(formData, initialFormData)
+    loading.value = true
+    Object.assign(formData, initialFormData)
 
-  if (row) {
-    Object.keys(formData).forEach((key: string) => {
-      if (row[key] != undefined) formData[key] = row[key]
-    })
-  }
+    if (row) {
+        Object.keys(formData).forEach((key: string) => {
+            if (row[key] != undefined) formData[key] = row[key]
+        })
+    }
 
-  loading.value = false
+    loading.value = false
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
diff --git a/admin/src/app/views/setting/components/sms-tencent.vue b/admin/src/app/views/setting/components/sms-tencent.vue
index c5fe287c..5247a48b 100644
--- a/admin/src/app/views/setting/components/sms-tencent.vue
+++ b/admin/src/app/views/setting/components/sms-tencent.vue
@@ -1,76 +1,38 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="t('tencentSms')"
-    width="580px"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="140px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('isUse')">
-        <el-radio-group v-model="formData.is_use">
-          <el-radio :label="1">{{ t('startUsing') }}</el-radio>
-          <el-radio :label="0">{{ t('statusDeactivate') }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-
-      <el-form-item :label="t('tencentSign')" prop="sign">
-        <el-input
-          v-model.trim="formData.sign"
-          :placeholder="t('tencentSignPlaceholder')"
-          class="input-width"
-          show-word-limit
-          clearable
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('tencentAppId')" prop="app_id">
-        <el-input
-          v-model.trim="formData.app_id"
-          :placeholder="t('tencentAppIdPlaceholder')"
-          class="input-width"
-          show-word-limit
-          clearable
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('tencentSecretId')" prop="secret_id">
-        <el-input
-          v-model.trim="formData.secret_id"
-          :placeholder="t('tencentSecretIdPlaceholder')"
-          class="input-width"
-          clearable
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('tencentSecretKey')" prop="secret_key">
-        <el-input
-          v-model.trim="formData.secret_key"
-          :placeholder="t('tencentSecretKeyPlaceholder')"
-          class="input-width"
-          clearable
-        />
-      </el-form-item>
-    </el-form>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+    <el-dialog v-model="showDialog" :title="t('tencentSms')" width="580px" :destroy-on-close="true">
+        <el-form :model="formData" label-width="140px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+            <el-form-item :label="t('isUse')">
+                <el-radio-group v-model="formData.is_use">
+                    <el-radio :label="1">{{ t('startUsing') }}</el-radio>
+                    <el-radio :label="0">{{ t('statusDeactivate') }}</el-radio>
+                </el-radio-group>
+            </el-form-item>
+
+            <el-form-item :label="t('tencentSign')" prop="sign">
+                <el-input v-model.trim="formData.sign" :placeholder="t('tencentSignPlaceholder')" class="input-width" show-word-limit clearable />
+            </el-form-item>
+
+            <el-form-item :label="t('tencentAppId')" prop="app_id">
+                <el-input v-model.trim="formData.app_id" :placeholder="t('tencentAppIdPlaceholder')" class="input-width" show-word-limit clearable />
+            </el-form-item>
+
+            <el-form-item :label="t('tencentSecretId')" prop="secret_id">
+                <el-input v-model.trim="formData.secret_id" :placeholder="t('tencentSecretIdPlaceholder')" class="input-width" clearable />
+            </el-form-item>
+
+            <el-form-item :label="t('tencentSecretKey')" prop="secret_key">
+                <el-input v-model.trim="formData.secret_key" :placeholder="t('tencentSecretKeyPlaceholder')" class="input-width" clearable />
+            </el-form-item>
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{t('confirm')}}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -86,13 +48,13 @@ const loading = ref(true)
  * 表单数据
  */
 const initialFormData = {
-  sms_type: '',
-  sign: '',
-  access_key: '',
-  secret_key: '',
-  is_use: '',
-  app_id: '',
-  secret_id: '',
+    sms_type: '',
+    sign: '',
+    access_key: '',
+    secret_key: '',
+    is_use: '',
+    app_id:'',
+    secret_id:'',
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -100,32 +62,20 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    sign: [
-      { required: true, message: t('tencentSignPlaceholder'), trigger: 'blur' },
-    ],
-    app_id: [
-      {
-        required: true,
-        message: t('tencentAppIdPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    secret_id: [
-      {
-        required: true,
-        message: t('tencentSecretIdPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    secret_key: [
-      {
-        required: true,
-        message: t('tencentSecretKeyPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-  }
+    return {
+        sign: [
+            { required: true, message: t('tencentSignPlaceholder'), trigger: 'blur' }
+        ],
+        app_id: [
+            { required: true, message: t('tencentAppIdPlaceholder'), trigger: 'blur' }
+        ],
+        secret_id: [
+            { required: true, message: t('tencentSecretIdPlaceholder'), trigger: 'blur' }
+        ],
+        secret_key: [
+            { required: true, message: t('tencentSecretKeyPlaceholder'), trigger: 'blur' }
+        ]
+    }
 })
 
 const emit = defineEmits(['complete'])
@@ -135,44 +85,42 @@ const emit = defineEmits(['complete'])
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-
-      const data = formData
-
-      editSms(data)
-        .then((res) => {
-          loading.value = false
-          showDialog.value = false
-          emit('complete')
-        })
-        .catch(() => {
-          loading.value = false
-          // showDialog.value = false
-        })
-    }
-  })
+    if (loading.value || !formEl) return
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            const data = formData
+
+            editSms(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(() => {
+                loading.value = false
+                // showDialog.value = false
+            })
+        }
+    })
 }
 
 const setFormData = async (row: any = null) => {
-  loading.value = true
-  Object.assign(formData, initialFormData)
-  if (row) {
-    const data = await (await getSmsInfo(row.sms_type)).data
-    Object.keys(formData).forEach((key: string) => {
-      if (data[key] != undefined) formData[key] = data[key]
-      if (data.params[key] != undefined) formData[key] = data.params[key].value
-    })
-  }
-  loading.value = false
+    loading.value = true
+    Object.assign(formData, initialFormData)
+    if (row) {
+        const data = await (await getSmsInfo(row.sms_type)).data
+        Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+            if (data.params[key] != undefined) formData[key] = data.params[key].value
+        })
+    }
+    loading.value = false
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
diff --git a/admin/src/app/views/setting/components/storage-ali.vue b/admin/src/app/views/setting/components/storage-ali.vue
index 69936a3b..44d8f7f0 100644
--- a/admin/src/app/views/setting/components/storage-ali.vue
+++ b/admin/src/app/views/setting/components/storage-ali.vue
@@ -1,86 +1,44 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="t('aliStorage')"
-    width="580px"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="140px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('isUse')">
-        <el-radio-group v-model="formData.is_use">
-          <el-radio label="1">{{ t('startUsing') }}</el-radio>
-          <el-radio label="0">{{ t('statusDeactivate') }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-
-      <el-form-item :label="t('aliBucket')" prop="bucket">
-        <el-input
-          v-model.trim="formData.bucket"
-          :placeholder="t('aliBucketPlaceholder')"
-          class="input-width"
-          show-word-limit
-          clearable
-        />
-        <div class="form-tip">{{ t('aliBucketTips') }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('aliAccessKey')" prop="access_key">
-        <el-input
-          v-model.trim="formData.access_key"
-          :placeholder="t('aliAccessKeyPlaceholder')"
-          class="input-width"
-          clearable
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('aliSecretKey')" prop="secret_key">
-        <el-input
-          v-model.trim="formData.secret_key"
-          :placeholder="t('aliSecretKeyPlaceholder')"
-          class="input-width"
-          clearable
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('aliEndpoint')" prop="endpoint">
-        <el-input
-          v-model.trim="formData.endpoint"
-          :placeholder="t('aliEndpointPlaceholder')"
-          class="input-width"
-          clearable
-        />
-        <div class="form-tip">{{ t('aliEndpointTips') }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('domain')" prop="domain">
-        <el-input
-          v-model.trim="formData.domain"
-          :placeholder="t('domainPlaceholder')"
-          class="input-width"
-          clearable
-        />
-      </el-form-item>
-    </el-form>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+    <el-dialog v-model="showDialog" :title="t('aliStorage')" width="580px" :destroy-on-close="true">
+        <el-form :model="formData" label-width="140px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+            <el-form-item :label="t('isUse')">
+                <el-radio-group v-model="formData.is_use">
+                    <el-radio label="1">{{ t('startUsing') }}</el-radio>
+                    <el-radio label="0">{{ t('statusDeactivate') }}</el-radio>
+                </el-radio-group>
+            </el-form-item>
+
+            <el-form-item :label="t('aliBucket')" prop="bucket">
+                <el-input v-model.trim="formData.bucket" :placeholder="t('aliBucketPlaceholder')" class="input-width" show-word-limit clearable />
+                <div class="form-tip">{{ t('aliBucketTips') }}</div>
+            </el-form-item>
+
+            <el-form-item :label="t('aliAccessKey')" prop="access_key">
+                <el-input v-model.trim="formData.access_key" :placeholder="t('aliAccessKeyPlaceholder')" class="input-width" clearable />
+            </el-form-item>
+
+            <el-form-item :label="t('aliSecretKey')" prop="secret_key">
+                <el-input v-model.trim="formData.secret_key" :placeholder="t('aliSecretKeyPlaceholder')" class="input-width" clearable />
+            </el-form-item>
+
+            <el-form-item :label="t('aliEndpoint')" prop="endpoint">
+                <el-input v-model.trim="formData.endpoint" :placeholder="t('aliEndpointPlaceholder')" class="input-width" clearable />
+                <div class="form-tip">{{ t('aliEndpointTips') }}</div>
+            </el-form-item>
+
+            <el-form-item :label="t('domain')" prop="domain">
+                <el-input v-model.trim="formData.domain" :placeholder="t('domainPlaceholder')" class="input-width" clearable />
+            </el-form-item>
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{t('confirm')}}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -96,13 +54,13 @@ const loading = ref(true)
  * 表单数据
  */
 const initialFormData = {
-  storage_type: '',
-  bucket: '',
-  access_key: '',
-  secret_key: '',
-  endpoint: '',
-  domain: '',
-  is_use: '',
+    storage_type: '',
+    bucket: '',
+    access_key: '',
+    secret_key: '',
+    endpoint: '',
+    domain: '',
+    is_use: ''
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -110,31 +68,23 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    bucket: [
-      { required: true, message: t('aliBucketPlaceholder'), trigger: 'blur' },
-    ],
-    access_key: [
-      {
-        required: true,
-        message: t('aliAccessKeyPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    secret_key: [
-      {
-        required: true,
-        message: t('aliSecretKeyPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    endpoint: [
-      { required: true, message: t('aliEndpointPlaceholder'), trigger: 'blur' },
-    ],
-    domain: [
-      { required: true, message: t('domainPlaceholder'), trigger: 'blur' },
-    ],
-  }
+    return {
+        bucket: [
+            { required: true, message: t('aliBucketPlaceholder'), trigger: 'blur' }
+        ],
+        access_key: [
+            { required: true, message: t('aliAccessKeyPlaceholder'), trigger: 'blur' }
+        ],
+        secret_key: [
+            { required: true, message: t('aliSecretKeyPlaceholder'), trigger: 'blur' }
+        ],
+        endpoint: [
+            { required: true, message: t('aliEndpointPlaceholder'), trigger: 'blur' }
+        ],
+        domain: [
+            { required: true, message: t('domainPlaceholder'), trigger: 'blur' }
+        ]
+    }
 })
 
 const emit = defineEmits(['complete'])
@@ -144,44 +94,42 @@ const emit = defineEmits(['complete'])
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-
-      const data = formData
-
-      editStorage(data)
-        .then((res) => {
-          loading.value = false
-          showDialog.value = false
-          emit('complete')
-        })
-        .catch(() => {
-          loading.value = false
-          // showDialog.value = false
-        })
-    }
-  })
+    if (loading.value || !formEl) return
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            const data = formData
+
+            editStorage(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(() => {
+                loading.value = false
+                // showDialog.value = false
+            })
+        }
+    })
 }
 
 const setFormData = async (row: any = null) => {
-  loading.value = true
-  Object.assign(formData, initialFormData)
-  if (row) {
-    const data = await (await getStorageInfo(row.storage_type)).data
-    Object.keys(formData).forEach((key: string) => {
-      if (data[key] != undefined) formData[key] = data[key]
-      if (data.params[key] != undefined) formData[key] = data.params[key].value
-    })
-  }
-  loading.value = false
+    loading.value = true
+    Object.assign(formData, initialFormData)
+    if (row) {
+        const data = await (await getStorageInfo(row.storage_type)).data
+        Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+            if (data.params[key] != undefined) formData[key] = data.params[key].value
+        })
+    }
+    loading.value = false
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
diff --git a/admin/src/app/views/setting/components/storage-local.vue b/admin/src/app/views/setting/components/storage-local.vue
index 77ce77e1..92b88b20 100644
--- a/admin/src/app/views/setting/components/storage-local.vue
+++ b/admin/src/app/views/setting/components/storage-local.vue
@@ -1,38 +1,22 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="t('localStorage')"
-    width="580px"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="140px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('isUse')">
-        <el-radio-group v-model="formData.is_use">
-          <el-radio label="1">{{ t('startUsing') }}</el-radio>
-          <el-radio label="0">{{ t('statusDeactivate') }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-    </el-form>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+    <el-dialog v-model="showDialog" :title="t('localStorage')" width="580px" :destroy-on-close="true">
+        <el-form :model="formData" label-width="140px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+            <el-form-item :label="t('isUse')">
+                <el-radio-group v-model="formData.is_use">
+                    <el-radio label="1">{{ t('startUsing') }}</el-radio>
+                    <el-radio label="0">{{ t('statusDeactivate') }}</el-radio>
+                </el-radio-group>
+            </el-form-item>
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{t('confirm')}}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -48,8 +32,9 @@ const loading = ref(true)
  * 表单数据
  */
 const initialFormData = {
-  is_use: '',
-  storage_type: '',
+    is_use: '',
+    storage_type: ''
+
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -57,7 +42,9 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {}
+    return {
+
+    }
 })
 
 const emit = defineEmits(['complete'])
@@ -67,43 +54,41 @@ const emit = defineEmits(['complete'])
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
+    if (loading.value || !formEl) return
 
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
 
-      const data = formData
+            const data = formData
 
-      editStorage(data)
-        .then((res) => {
-          loading.value = false
-          showDialog.value = false
-          emit('complete')
-        })
-        .catch(() => {
-          loading.value = false
-          // showDialog.value = false
-        })
-    }
-  })
+            editStorage(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(() => {
+                loading.value = false
+                // showDialog.value = false
+            })
+        }
+    })
 }
 
 const setFormData = async (row: any = null) => {
-  loading.value = true
-  Object.assign(formData, initialFormData)
-  if (row) {
-    const data = await (await getStorageInfo(row.storage_type)).data
-    Object.keys(formData).forEach((key: string) => {
-      if (data[key] != undefined) formData[key] = data[key]
-    })
-  }
-  loading.value = false
+    loading.value = true
+    Object.assign(formData, initialFormData)
+    if (row) {
+        const data = await (await getStorageInfo(row.storage_type)).data
+        Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
diff --git a/admin/src/app/views/setting/components/storage-qiniu.vue b/admin/src/app/views/setting/components/storage-qiniu.vue
index 49b70099..885a4cd7 100644
--- a/admin/src/app/views/setting/components/storage-qiniu.vue
+++ b/admin/src/app/views/setting/components/storage-qiniu.vue
@@ -1,76 +1,39 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="t('qiniuStorage')"
-    width="580px"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="140px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('isUse')">
-        <el-radio-group v-model="formData.is_use">
-          <el-radio label="1">{{ t('startUsing') }}</el-radio>
-          <el-radio label="0">{{ t('statusDeactivate') }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-
-      <el-form-item :label="t('qiniuBucket')" prop="bucket">
-        <el-input
-          v-model.trim="formData.bucket"
-          :placeholder="t('qiniuBucketPlaceholder')"
-          class="input-width"
-          show-word-limit
-          clearable
-        />
-        <div class="form-tip">{{ t('qiniuBucketTips') }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('qiniuAccessKey')" prop="access_key">
-        <el-input
-          v-model.trim="formData.access_key"
-          :placeholder="t('qiniuAccessKeyPlaceholder')"
-          class="input-width"
-          clearable
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('qiniuSecretKey')" prop="secret_key">
-        <el-input
-          v-model.trim="formData.secret_key"
-          :placeholder="t('qiniuSecretKeyPlaceholder')"
-          class="input-width"
-          clearable
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('domain')" prop="domain">
-        <el-input
-          v-model.trim="formData.domain"
-          :placeholder="t('domainPlaceholder')"
-          class="input-width"
-          clearable
-        />
-      </el-form-item>
-    </el-form>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+    <el-dialog v-model="showDialog" :title="t('qiniuStorage')" width="580px" :destroy-on-close="true">
+        <el-form :model="formData" label-width="140px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+            <el-form-item :label="t('isUse')">
+                <el-radio-group v-model="formData.is_use">
+                    <el-radio label="1">{{ t('startUsing') }}</el-radio>
+                    <el-radio label="0">{{ t('statusDeactivate') }}</el-radio>
+                </el-radio-group>
+            </el-form-item>
+
+            <el-form-item :label="t('qiniuBucket')" prop="bucket">
+                <el-input v-model.trim="formData.bucket" :placeholder="t('qiniuBucketPlaceholder')" class="input-width" show-word-limit clearable />
+                <div class="form-tip">{{ t('qiniuBucketTips') }}</div>
+            </el-form-item>
+
+            <el-form-item :label="t('qiniuAccessKey')" prop="access_key">
+                <el-input v-model.trim="formData.access_key" :placeholder="t('qiniuAccessKeyPlaceholder')" class="input-width" clearable />
+            </el-form-item>
+
+            <el-form-item :label="t('qiniuSecretKey')" prop="secret_key">
+                <el-input v-model.trim="formData.secret_key" :placeholder="t('qiniuSecretKeyPlaceholder')" class="input-width" clearable />
+            </el-form-item>
+
+            <el-form-item :label="t('domain')" prop="domain">
+                <el-input v-model.trim="formData.domain" :placeholder="t('domainPlaceholder')" class="input-width" clearable />
+            </el-form-item>
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{t('confirm')}}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -86,12 +49,12 @@ const loading = ref(true)
  * 表单数据
  */
 const initialFormData = {
-  storage_type: '',
-  bucket: '',
-  access_key: '',
-  secret_key: '',
-  domain: '',
-  is_use: '',
+    storage_type: '',
+    bucket: '',
+    access_key: '',
+    secret_key: '',
+    domain: '',
+    is_use: ''
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -99,31 +62,23 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    bucket: [
-      { required: true, message: t('qiniuBucketPlaceholder'), trigger: 'blur' },
-    ],
-    access_key: [
-      {
-        required: true,
-        message: t('qiniuAccessKeyPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    secret_key: [
-      {
-        required: true,
-        message: t('qiniuSecretKeyPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    endpoint: [
-      { required: true, message: t('aliEndpointPlaceholder'), trigger: 'blur' },
-    ],
-    domain: [
-      { required: true, message: t('domainPlaceholder'), trigger: 'blur' },
-    ],
-  }
+    return {
+        bucket: [
+            { required: true, message: t('qiniuBucketPlaceholder'), trigger: 'blur' }
+        ],
+        access_key: [
+            { required: true, message: t('qiniuAccessKeyPlaceholder'), trigger: 'blur' }
+        ],
+        secret_key: [
+            { required: true, message: t('qiniuSecretKeyPlaceholder'), trigger: 'blur' }
+        ],
+        endpoint: [
+            { required: true, message: t('aliEndpointPlaceholder'), trigger: 'blur' }
+        ],
+        domain: [
+            { required: true, message: t('domainPlaceholder'), trigger: 'blur' }
+        ]
+    }
 })
 
 const emit = defineEmits(['complete'])
@@ -133,44 +88,42 @@ const emit = defineEmits(['complete'])
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-
-      const data = formData
-
-      editStorage(data)
-        .then((res) => {
-          loading.value = false
-          showDialog.value = false
-          emit('complete')
-        })
-        .catch(() => {
-          loading.value = false
-          // showDialog.value = false
-        })
-    }
-  })
+    if (loading.value || !formEl) return
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            const data = formData
+
+            editStorage(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(() => {
+                loading.value = false
+                // showDialog.value = false
+            })
+        }
+    })
 }
 
 const setFormData = async (row: any = null) => {
-  loading.value = true
-  Object.assign(formData, initialFormData)
-  if (row) {
-    const data = await (await getStorageInfo(row.storage_type)).data
-    Object.keys(formData).forEach((key: string) => {
-      if (data[key] != undefined) formData[key] = data[key]
-      if (data.params[key] != undefined) formData[key] = data.params[key].value
-    })
-  }
-  loading.value = false
+    loading.value = true
+    Object.assign(formData, initialFormData)
+    if (row) {
+        const data = await (await getStorageInfo(row.storage_type)).data
+        Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+            if (data.params[key] != undefined) formData[key] = data.params[key].value
+        })
+    }
+    loading.value = false
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
diff --git a/admin/src/app/views/setting/components/storage-tencent.vue b/admin/src/app/views/setting/components/storage-tencent.vue
index 911e0f49..a7e64d10 100644
--- a/admin/src/app/views/setting/components/storage-tencent.vue
+++ b/admin/src/app/views/setting/components/storage-tencent.vue
@@ -1,85 +1,43 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="t('tencentStorage')"
-    width="580px"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="140px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('isUse')">
-        <el-radio-group v-model="formData.is_use">
-          <el-radio label="1">{{ t('startUsing') }}</el-radio>
-          <el-radio label="0">{{ t('statusDeactivate') }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-
-      <el-form-item :label="t('tencentBucket')" prop="bucket">
-        <el-input
-          v-model.trim="formData.bucket"
-          :placeholder="t('tencentBucketPlaceholder')"
-          class="input-width"
-          show-word-limit
-          clearable
-        />
-        <div class="form-tip">{{ t('tencentBucketTips') }}</div>
-      </el-form-item>
-
-      <el-form-item :label="t('tencentAccessKey')" prop="access_key">
-        <el-input
-          v-model.trim="formData.access_key"
-          :placeholder="t('tencentAccessKeyPlaceholder')"
-          class="input-width"
-          clearable
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('tencentSecretKey')" prop="secret_key">
-        <el-input
-          v-model.trim="formData.secret_key"
-          :placeholder="t('tencentSecretKeyPlaceholder')"
-          class="input-width"
-          clearable
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('region')" prop="region">
-        <el-input
-          v-model.trim="formData.region"
-          :placeholder="t('regionPlaceholder')"
-          class="input-width"
-          clearable
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('domain')" prop="domain">
-        <el-input
-          v-model.trim="formData.domain"
-          :placeholder="t('domainPlaceholder')"
-          class="input-width"
-          clearable
-        />
-      </el-form-item>
-    </el-form>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+    <el-dialog v-model="showDialog" :title="t('tencentStorage')" width="580px" :destroy-on-close="true">
+        <el-form :model="formData" label-width="140px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+            <el-form-item :label="t('isUse')">
+                <el-radio-group v-model="formData.is_use">
+                    <el-radio label="1">{{ t('startUsing') }}</el-radio>
+                    <el-radio label="0">{{ t('statusDeactivate') }}</el-radio>
+                </el-radio-group>
+            </el-form-item>
+
+            <el-form-item :label="t('tencentBucket')" prop="bucket">
+                <el-input v-model.trim="formData.bucket" :placeholder="t('tencentBucketPlaceholder')" class="input-width" show-word-limit clearable />
+                <div class="form-tip">{{ t('tencentBucketTips') }}</div>
+            </el-form-item>
+
+            <el-form-item :label="t('tencentAccessKey')" prop="access_key">
+                <el-input v-model.trim="formData.access_key" :placeholder="t('tencentAccessKeyPlaceholder')" class="input-width" clearable />
+            </el-form-item>
+
+            <el-form-item :label="t('tencentSecretKey')" prop="secret_key">
+                <el-input v-model.trim="formData.secret_key" :placeholder="t('tencentSecretKeyPlaceholder')" class="input-width" clearable />
+            </el-form-item>
+
+            <el-form-item :label="t('region')" prop="region">
+                <el-input v-model.trim="formData.region" :placeholder="t('regionPlaceholder')" class="input-width" clearable />
+            </el-form-item>
+
+            <el-form-item :label="t('domain')" prop="domain">
+                <el-input v-model.trim="formData.domain" :placeholder="t('domainPlaceholder')" class="input-width" clearable />
+            </el-form-item>
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{t('confirm')}}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -95,13 +53,13 @@ const loading = ref(true)
  * 表单数据
  */
 const initialFormData = {
-  storage_type: '',
-  bucket: '',
-  access_key: '',
-  secret_key: '',
-  domain: '',
-  is_use: '',
-  region: '',
+    storage_type: '',
+    bucket: '',
+    access_key: '',
+    secret_key: '',
+    domain: '',
+    is_use: '',
+    region: ''
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -109,35 +67,23 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    bucket: [
-      {
-        required: true,
-        message: t('tencentBucketPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    access_key: [
-      {
-        required: true,
-        message: t('tencentAccessKeyPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    secret_key: [
-      {
-        required: true,
-        message: t('tencentSecretKeyPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    region: [
-      { required: true, message: t('regionPlaceholder'), trigger: 'blur' },
-    ],
-    domain: [
-      { required: true, message: t('domainPlaceholder'), trigger: 'blur' },
-    ],
-  }
+    return {
+        bucket: [
+            { required: true, message: t('tencentBucketPlaceholder'), trigger: 'blur' }
+        ],
+        access_key: [
+            { required: true, message: t('tencentAccessKeyPlaceholder'), trigger: 'blur' }
+        ],
+        secret_key: [
+            { required: true, message: t('tencentSecretKeyPlaceholder'), trigger: 'blur' }
+        ],
+        region: [
+            { required: true, message: t('regionPlaceholder'), trigger: 'blur' }
+        ],
+        domain: [
+            { required: true, message: t('domainPlaceholder'), trigger: 'blur' }
+        ]
+    }
 })
 
 const emit = defineEmits(['complete'])
@@ -147,44 +93,42 @@ const emit = defineEmits(['complete'])
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-
-      const data = formData
-
-      editStorage(data)
-        .then((res) => {
-          loading.value = false
-          showDialog.value = false
-          emit('complete')
-        })
-        .catch(() => {
-          loading.value = false
-          // showDialog.value = false
-        })
-    }
-  })
+    if (loading.value || !formEl) return
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            const data = formData
+
+            editStorage(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(() => {
+                loading.value = false
+                // showDialog.value = false
+            })
+        }
+    })
 }
 
 const setFormData = async (row: any = null) => {
-  loading.value = true
-  Object.assign(formData, initialFormData)
-  if (row) {
-    const data = await (await getStorageInfo(row.storage_type)).data
-    Object.keys(formData).forEach((key: string) => {
-      if (data[key] != undefined) formData[key] = data[key]
-      if (data.params[key] != undefined) formData[key] = data.params[key].value
-    })
-  }
-  loading.value = false
+    loading.value = true
+    Object.assign(formData, initialFormData)
+    if (row) {
+        const data = await (await getStorageInfo(row.storage_type)).data
+        Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+            if (data.params[key] != undefined) formData[key] = data.params[key].value
+        })
+    }
+    loading.value = false
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
diff --git a/admin/src/app/views/setting/copyright.vue b/admin/src/app/views/setting/copyright.vue
index b9f3db85..3dc71c71 100644
--- a/admin/src/app/views/setting/copyright.vue
+++ b/admin/src/app/views/setting/copyright.vue
@@ -1,98 +1,48 @@
 <template>
-  <div class="main-container">
-    <el-form
-      class="page-form"
-      :model="formData"
-      label-width="150px"
-      ref="formRef"
-      :rules="formRules"
-      v-loading="loading"
-    >
-      <el-card class="box-card !border-none" shadow="never">
-        <h3 class="panel-title !text-sm">{{ t('copyrightEdit') }}</h3>
-
-        <el-form-item :label="t('logo')">
-          <upload-image v-model="formData.logo" />
-        </el-form-item>
-        <el-form-item :label="t('companyName')" prop="company_name">
-          <el-input
-            v-model.trim="formData.company_name"
-            :placeholder="t('companyNamePlaceholder')"
-            class="input-width"
-            clearable
-            maxlength="30"
-          />
-        </el-form-item>
-        <el-form-item :label="t('copyrightLink')">
-          <el-input
-            v-model.trim="formData.copyright_link"
-            :placeholder="t('copyrightLinkPlaceholder')"
-            class="input-width"
-            clearable
-          />
-        </el-form-item>
-        <el-form-item :label="t('copyrightDesc')">
-          <el-input
-            v-model.trim="formData.copyright_desc"
-            type="textarea"
-            rows="4"
-            clearable
-            :placeholder="t('copyrightDescPlaceholder')"
-            class="input-width"
-            maxlength="150"
-          />
-        </el-form-item>
-      </el-card>
-
-      <el-card class="box-card mt-[15px] !border-none" shadow="never">
-        <h3 class="panel-title !text-sm">{{ t('putOnRecordEdit') }}</h3>
-
-        <el-form-item :label="t('icp')" prop="icp">
-          <el-input
-            v-model.trim="formData.icp"
-            :placeholder="t('icpPlaceholder')"
-            class="input-width"
-            clearable
-            maxlength="20"
-          />
-        </el-form-item>
-        <el-form-item :label="t('govRecord')">
-          <el-input
-            v-model.trim="formData.gov_record"
-            :placeholder="t('govRecordPlaceholder')"
-            class="input-width"
-            clearable
-            maxlength="50"
-          />
-        </el-form-item>
-        <el-form-item :label="t('govUrl')">
-          <el-input
-            v-model.trim="formData.gov_url"
-            :placeholder="t('govUrlPlaceholder')"
-            class="input-width"
-            clearable
-          />
-        </el-form-item>
-        <el-form-item :label="t('marketSupervisionUrl')">
-          <el-input
-            v-model.trim="formData.market_supervision_url"
-            rows="4"
-            clearable
-            :placeholder="t('marketSupervisionUrlPlaceholder')"
-            class="input-width"
-          />
-        </el-form-item>
-      </el-card>
-    </el-form>
-
-    <div class="fixed-footer-wrap">
-      <div class="fixed-footer">
-        <el-button type="primary" :loading="loading" @click="save(formRef)">{{
-          t('save')
-        }}</el-button>
-      </div>
+    <div class="main-container">
+
+        <el-form class="page-form" :model="formData" label-width="150px" ref="formRef" :rules="formRules" v-loading="loading">
+            <el-card class="box-card !border-none" shadow="never">
+                <h3 class="panel-title !text-sm">{{ t('copyrightEdit') }}</h3>
+
+                <el-form-item :label="t('logo')">
+                    <upload-image v-model="formData.logo" />
+                </el-form-item>
+                <el-form-item :label="t('companyName')" prop="company_name">
+                    <el-input v-model.trim="formData.company_name" :placeholder="t('companyNamePlaceholder')" class="input-width" clearable maxlength="30"/>
+                </el-form-item>
+                <el-form-item :label="t('copyrightLink')" >
+                    <el-input v-model.trim="formData.copyright_link" :placeholder="t('copyrightLinkPlaceholder')" class="input-width" clearable />
+                </el-form-item>
+                <el-form-item :label="t('copyrightDesc')" >
+                    <el-input v-model.trim="formData.copyright_desc" type="textarea" rows="4" clearable :placeholder="t('copyrightDescPlaceholder')" class="input-width" maxlength="150" />
+                </el-form-item>
+            </el-card>
+
+            <el-card class="box-card mt-[15px] !border-none" shadow="never">
+                <h3 class="panel-title !text-sm">{{ t('putOnRecordEdit') }}</h3>
+
+                <el-form-item :label="t('icp')" prop="icp">
+                    <el-input v-model.trim="formData.icp" :placeholder="t('icpPlaceholder')" class="input-width" clearable maxlength="20"/>
+                </el-form-item>
+                <el-form-item :label="t('govRecord')" >
+                    <el-input v-model.trim="formData.gov_record" :placeholder="t('govRecordPlaceholder')" class="input-width" clearable maxlength="50"/>
+                </el-form-item>
+                <el-form-item :label="t('govUrl')" >
+                    <el-input v-model.trim="formData.gov_url" :placeholder="t('govUrlPlaceholder')" class="input-width" clearable />
+                </el-form-item>
+                <el-form-item :label="t('marketSupervisionUrl')" >
+                    <el-input v-model.trim="formData.market_supervision_url" rows="4" clearable :placeholder="t('marketSupervisionUrlPlaceholder')" class="input-width" />
+                </el-form-item>
+            </el-card>
+        </el-form>
+
+        <div class="fixed-footer-wrap">
+            <div class="fixed-footer">
+                <el-button type="primary" :loading="loading" @click="save(formRef)">{{ t('save') }}</el-button>
+            </div>
+        </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
@@ -108,23 +58,23 @@ const pageName = route.meta.title
 const loading = ref(true)
 
 const formData = reactive<Record<string, string>>({
-  icp: '',
-  gov_record: '',
-  gov_url: '',
-  market_supervision_url: '',
-  logo: '',
-  company_name: '',
-  copyright_link: '',
-  copyright_desc: '',
+    icp: '',
+    gov_record: '',
+    gov_url: '',
+    market_supervision_url: '',
+    logo: '',
+    company_name: '',
+    copyright_link: '',
+    copyright_desc: ''
 })
 
 const setFormData = async () => {
-  const data = await (await getCopyright()).data
-  Object.keys(formData).forEach((key: string) => {
-    if (data[key] != undefined) formData[key] = data[key]
-  })
+    const data = await (await getCopyright()).data
+    Object.keys(formData).forEach((key: string) => {
+        if (data[key] != undefined) formData[key] = data[key]
+    })
 
-  loading.value = false
+    loading.value = false
 }
 setFormData()
 
@@ -132,30 +82,29 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = reactive<FormRules>({
-  site_name: [
-    { required: true, message: t('siteNamePlaceholder'), trigger: 'blur' },
-  ],
+    site_name: [
+        { required: true, message: t('siteNamePlaceholder'), trigger: 'blur' }
+    ]
 })
 
 /**
  * 保存
  */
 const save = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      setCopyright(formData)
-        .then(() => {
-          loading.value = false
-        })
-        .catch(() => {
-          loading.value = false
-        })
-    }
-  })
+    if (loading.value || !formEl) return
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+            setCopyright(formData).then(() => {
+                loading.value = false
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
 }
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/setting/cron.vue b/admin/src/app/views/setting/cron.vue
index 97e1af7c..380b3e29 100644
--- a/admin/src/app/views/setting/cron.vue
+++ b/admin/src/app/views/setting/cron.vue
@@ -1,125 +1,76 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <el-card
-        class="box-card !border-none my-[16px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="cronTableData.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('title')" prop="title">
-            <el-input
-              v-model="cronTableData.searchParam.title"
-              :placeholder="t('titlePlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('lastTime')" prop="last_time">
-            <el-date-picker
-              v-model="cronTableData.searchParam.last_time"
-              type="datetimerange"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              :start-placeholder="t('startDate')"
-              :end-placeholder="t('endDate')"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="loadCronList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="searchFormRef?.resetFields()">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
-
-      <div class="mt-[16px]">
-        <el-table
-          :data="cronTableData.data"
-          size="large"
-          v-loading="cronTableData.loading"
-        >
-          <template #empty>
-            <span>{{ !cronTableData.loading ? t('emptyData') : '' }}</span>
-          </template>
-
-          <el-table-column
-            prop="title"
-            :show-overflow-tooltip="true"
-            :label="t('title')"
-            min-width="150"
-          />
-          <el-table-column
-            prop="type_name"
-            :label="t('typeName')"
-            min-width="120"
-          />
-
-          <el-table-column
-            :label="t('crondType')"
-            min-width="180"
-            align="center"
-          >
-            <template #default="{ row }">
-              <span v-if="row.type == 'crond'"
-                >{{ row.crond_length }}{{ row.crond_type_name }}</span
-              >
-              <span v-else>{{ t('cron') }}</span>
-            </template>
-          </el-table-column>
-
-          <el-table-column prop="count" :label="t('count')" min-width="120" />
-
-          <el-table-column
-            :label="t('lastTime')"
-            min-width="180"
-            align="center"
-          >
-            <template #default="{ row }">
-              {{ row.last_time || '' }}
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            :label="t('nextTime')"
-            min-width="180"
-            align="center"
-          >
-            <template #default="{ row }">
-              {{ row.next_time || '' }}
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            :label="t('operation')"
-            align="right"
-            fixed="right"
-            width="100"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="infoEvent(row)">{{
-                t('info')
-              }}</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="cronTableData.page"
-            v-model:page-size="cronTableData.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="cronTableData.total"
-            @size-change="loadCronList()"
-            @current-change="loadCronList"
-          />
-        </div>
-      </div>
-    </el-card>
-    <cron-info ref="cronDialog" @complete="loadCronList" />
-  </div>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+
+            <el-card class="box-card !border-none my-[16px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="cronTableData.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('title')" prop="title">
+                        <el-input v-model="cronTableData.searchParam.title" :placeholder="t('titlePlaceholder')" />
+                    </el-form-item>
+                    <el-form-item :label="t('lastTime')" prop="last_time">
+                        <el-date-picker
+                            v-model="cronTableData.searchParam.last_time"
+                            type="datetimerange"
+                            value-format="YYYY-MM-DD HH:mm:ss"
+                            :start-placeholder="t('startDate')"
+                            :end-placeholder="t('endDate')"
+                        />
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="loadCronList()">{{ t('search') }}</el-button>
+                        <el-button @click="searchFormRef?.resetFields()">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+
+            <div class="mt-[16px]">
+                <el-table :data="cronTableData.data" size="large" v-loading="cronTableData.loading">
+
+                    <template #empty>
+                        <span>{{ !cronTableData.loading ? t('emptyData') : '' }}</span>
+                    </template>
+
+                    <el-table-column prop="title" :show-overflow-tooltip="true" :label="t('title')" min-width="150" />
+                    <el-table-column prop="type_name" :label="t('typeName')" min-width="120" />
+
+                    <el-table-column :label="t('crondType')" min-width="180" align="center">
+                        <template #default="{ row }">
+                            <span v-if="row.type == 'crond'">{{ row.crond_length }}{{ row.crond_type_name }}</span>
+                            <span v-else>{{ t('cron') }}</span>
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column prop="count" :label="t('count')" min-width="120" />
+
+                    <el-table-column :label="t('lastTime')" min-width="180" align="center">
+                        <template #default="{ row }">
+                            {{ row.last_time || '' }}
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column :label="t('nextTime')" min-width="180" align="center">
+                        <template #default="{ row }">
+                            {{ row.next_time || '' }}
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column :label="t('operation')" align="right" fixed="right" width="100">
+                        <template #default="{ row }">
+                            <el-button type="primary" link @click="infoEvent(row)">{{ t('info') }}</el-button>
+                        </template>
+                    </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="cronTableData.page" v-model:page-size="cronTableData.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="cronTableData.total"
+                        @size-change="loadCronList()" @current-change="loadCronList" />
+                </div>
+            </div>
+
+        </el-card>
+        <cron-info ref="cronDialog" @complete="loadCronList" />
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -132,16 +83,16 @@ import { FormInstance } from 'element-plus'
 import CronInfo from '@/app/views/setting/components/cron-info.vue'
 
 const cronTableData = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    title: '',
-    type: '',
-    last_time: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        title: '',
+        type: '',
+        last_time: ''
+    }
 })
 
 const searchFormRef = ref<FormInstance>()
@@ -150,21 +101,19 @@ const searchFormRef = ref<FormInstance>()
  * 获取任务列表
  */
 const loadCronList = (page: number = 1) => {
-  cronTableData.loading = true
-  cronTableData.page = page
-
-  getCronList({
-    page: cronTableData.page,
-    limit: cronTableData.limit,
-    ...cronTableData.searchParam,
-  })
-    .then((res) => {
-      cronTableData.loading = false
-      cronTableData.data = res.data.data
-      cronTableData.total = res.data.total
-    })
-    .catch(() => {
-      cronTableData.loading = false
+    cronTableData.loading = true
+    cronTableData.page = page
+
+    getCronList({
+        page: cronTableData.page,
+        limit: cronTableData.limit,
+        ...cronTableData.searchParam
+    }).then(res => {
+        cronTableData.loading = false
+        cronTableData.data = res.data.data
+        cronTableData.total = res.data.total
+    }).catch(() => {
+        cronTableData.loading = false
     })
 }
 loadCronList()
@@ -177,9 +126,10 @@ const cronDialog: Record<string, any> | null = ref(null)
  * @param data
  */
 const infoEvent = (data: any) => {
-  cronDialog.value.setFormData(data)
-  cronDialog.value.showDialog = true
+    cronDialog.value.setFormData(data)
+    cronDialog.value.showDialog = true
 }
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/setting/developer_token.vue b/admin/src/app/views/setting/developer_token.vue
index e776709f..c7e5dff1 100644
--- a/admin/src/app/views/setting/developer_token.vue
+++ b/admin/src/app/views/setting/developer_token.vue
@@ -1,38 +1,21 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <el-form
-        class="page-form"
-        :model="formData"
-        label-width="0"
-        ref="formRef"
-        :rules="formRules"
-        v-loading="loading"
-      >
-        <h3 class="panel-title !text-sm">{{ t('developerTokenEdit') }}</h3>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+            <el-form class="page-form" :model="formData" label-width="0" ref="formRef" :rules="formRules" v-loading="loading">
+                <h3 class="panel-title !text-sm">{{ t('developerTokenEdit') }}</h3>
 
-        <el-form-item label="" prop="token">
-          <div>
-            <el-input
-              v-model.trim="formData.token"
-              :placeholder="t('tokenPlaceholder')"
-              class="input-width"
-              clearable
-              maxlength="30"
-            />
-          </div>
-          <div class="text-[14px] text-[#a9a9a9] leading-tight mt-[10px]">
-            {{ t('tokenTips') }}
-          </div>
-        </el-form-item>
-        <el-form-item label="">
-          <el-button type="primary" :loading="loading" @click="save(formRef)">{{
-            t('save')
-          }}</el-button>
-        </el-form-item>
-      </el-form>
-    </el-card>
-  </div>
+                <el-form-item label="" prop="token">
+                    <div>
+                        <el-input v-model.trim="formData.token" :placeholder="t('tokenPlaceholder')" class="input-width" clearable maxlength="30"/>
+                    </div>
+                    <div class="text-[14px] text-[#a9a9a9] leading-tight mt-[10px]">{{ t('tokenTips') }}</div>
+                </el-form-item>
+                <el-form-item label="">
+                    <el-button type="primary" :loading="loading" @click="save(formRef)">{{ t('save') }}</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -43,39 +26,39 @@ import { FormInstance, FormRules } from 'element-plus'
 
 const loading = ref(true)
 const formData = ref({
-  token: '',
+    token: ''
 })
 
 getDeveloperToken().then(({ data }) => {
-  loading.value = false
-  data.token && (formData.value = data)
+    loading.value = false
+    data.token && (formData.value = data)
 })
 
 const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = reactive<FormRules>({
-  token: [{ required: true, message: t('tokenPlaceholder'), trigger: 'blur' }],
+    token: [
+        { required: true, message: t('tokenPlaceholder'), trigger: 'blur' }
+    ]
 })
 
 /**
  * 保存
  */
 const save = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
+    if (loading.value || !formEl) return
 
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      setDeveloperToken(formData.value)
-        .then(() => {
-          loading.value = false
-        })
-        .catch(() => {
-          loading.value = false
-        })
-    }
-  })
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+            setDeveloperToken(formData.value).then(() => {
+                loading.value = false
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
 }
 </script>
 
diff --git a/admin/src/app/views/setting/export.vue b/admin/src/app/views/setting/export.vue
index e36effb5..e28cbef1 100644
--- a/admin/src/app/views/setting/export.vue
+++ b/admin/src/app/views/setting/export.vue
@@ -1,202 +1,103 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
 
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="exportTableData.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('exportKey')" prop="export_key">
-            <el-select
-              v-model="exportTableData.searchParam.export_key"
-              clearable
-              :placeholder="t('exportKeyPlaceholder')"
-              class="input-width"
-            >
-              <el-option :label="t('selectPlaceholder')" value="" />
-              <el-option
-                :label="item"
-                :value="key"
-                v-for="(item, key) in exportKeyList"
-                :key="key"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="t('exportStatus')" prop="export_status">
-            <el-select
-              v-model="exportTableData.searchParam.export_status"
-              clearable
-              :placeholder="t('exportStatusPlaceholder')"
-              class="input-width"
-            >
-              <el-option :label="t('selectPlaceholder')" value="" />
-              <el-option
-                :label="item"
-                :value="key"
-                v-for="(item, key) in exportStatusList"
-                :key="key"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="t('createTime')" prop="create_time">
-            <el-date-picker
-              v-model="exportTableData.searchParam.create_time"
-              type="datetimerange"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              :start-placeholder="t('startDate')"
-              :end-placeholder="t('endDate')"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="loadExportList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+            </div>
 
-      <div class="mt-[10px]">
-        <el-table
-          :data="exportTableData.data"
-          size="large"
-          v-loading="exportTableData.loading"
-        >
-          <template #empty>
-            <span>{{ !exportTableData.loading ? t('emptyData') : '' }}</span>
-          </template>
-          <el-table-column prop="id" :label="t('id')" min-width="120" />
-          <el-table-column
-            prop="export_key_name"
-            :label="t('exportKey')"
-            min-width="120"
-          />
-          <el-table-column
-            prop="export_num"
-            :label="t('exportNum')"
-            min-width="120"
-          />
-          <el-table-column
-            prop="file_path"
-            :label="t('filePath')"
-            min-width="180"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            prop="file_size"
-            :label="t('fileSize')"
-            min-width="110"
-          >
-            <template #default="{ row }">
-              {{ row.file_size / 1000 }}k
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="export_status"
-            :label="t('exportStatus')"
-            min-width="120"
-            align="center"
-          >
-            <template #default="{ row }">
-              <el-tag
-                type="warning"
-                v-if="row.export_status == 1"
-                class="cursor-pointer"
-                >{{ row.export_status_name }}</el-tag
-              >
-              <el-tag
-                type="success"
-                v-else-if="row.export_status == 2"
-                class="cursor-pointer"
-                >{{ row.export_status_name }}</el-tag
-              >
-              <el-tag type="error" v-else class="cursor-pointer">{{
-                row.export_status_name
-              }}</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column
-            :label="t('createTime')"
-            min-width="150"
-            align="center"
-          >
-            <template #default="{ row }">
-              {{ row.create_time || '' }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            :label="t('operation')"
-            align="right"
-            fixed="right"
-            width="100"
-          >
-            <template #default="{ row }">
-              <div class="flex justify-end">
-                <el-button
-                  type="primary"
-                  link
-                  @click="downloadEvent(row)"
-                  v-if="row.export_status == 2"
-                  >{{ t('download') }}</el-button
-                >
-                <el-button type="primary" link @click="deleteEvent(row.id)">{{
-                  t('delete')
-                }}</el-button>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="exportTableData.page"
-            v-model:page-size="exportTableData.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="exportTableData.total"
-            @size-change="loadExportList()"
-            @current-change="loadExportList"
-          />
-        </div>
-      </div>
-    </el-card>
-  </div>
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="exportTableData.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('exportKey')" prop="export_key">
+                        <el-select v-model="exportTableData.searchParam.export_key" clearable :placeholder="t('exportKeyPlaceholder')" class="input-width">
+                            <el-option :label="t('selectPlaceholder')" value="" />
+                            <el-option :label="item" :value="key" v-for="(item, key) in exportKeyList" :key="key" />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item :label="t('exportStatus')" prop="export_status">
+                        <el-select v-model="exportTableData.searchParam.export_status" clearable :placeholder="t('exportStatusPlaceholder')" class="input-width">
+                            <el-option :label="t('selectPlaceholder')" value="" />
+                            <el-option :label="item" :value="key" v-for="(item, key) in exportStatusList" :key="key" />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item :label="t('createTime')" prop="create_time">
+                        <el-date-picker v-model="exportTableData.searchParam.create_time" type="datetimerange"
+                            value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')"
+                            :end-placeholder="t('endDate')" />
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="loadExportList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+
+            <div class="mt-[10px]">
+                <el-table :data="exportTableData.data" size="large" v-loading="exportTableData.loading">
+                    <template #empty>
+                        <span>{{ !exportTableData.loading ? t('emptyData') : '' }}</span>
+                    </template>
+                    <el-table-column prop="id" :label="t('id')" min-width="120" />
+                    <el-table-column prop="export_key_name" :label="t('exportKey')" min-width="120" />
+                    <el-table-column prop="export_num" :label="t('exportNum')" min-width="120" />
+                    <el-table-column prop="file_path" :label="t('filePath')" min-width="180" :show-overflow-tooltip="true" />
+                    <el-table-column prop="file_size" :label="t('fileSize')" min-width="110">
+                        <template #default="{ row }">
+                            {{ row.file_size / 1000 }}k
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="export_status" :label="t('exportStatus')" min-width="120" align="center">
+                        <template #default="{ row }">
+                            <el-tag type="warning" v-if="row.export_status == 1" class="cursor-pointer">{{ row.export_status_name }}</el-tag>
+                            <el-tag type="success" v-else-if="row.export_status == 2" class="cursor-pointer">{{ row.export_status_name }}</el-tag>
+                            <el-tag type="error" v-else class="cursor-pointer">{{ row.export_status_name }}</el-tag>
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('createTime')" min-width="150" align="center">
+                        <template #default="{ row }">
+                            {{ row.create_time || '' }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('operation')" align="right" fixed="right" width="100">
+                        <template #default="{ row }">
+                            <div class="flex justify-end">
+                                <el-button type="primary" link @click="downloadEvent(row)" v-if="row.export_status == 2">{{ t('download') }}</el-button>
+                                <el-button type="primary" link @click="deleteEvent(row.id)">{{ t('delete') }}</el-button>
+                            </div>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="exportTableData.page" v-model:page-size="exportTableData.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="exportTableData.total"
+                        @size-change="loadExportList()" @current-change="loadExportList" />
+                </div>
+            </div>
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
 import { t } from '@/lang'
 import { img } from '@/utils/common'
-import {
-  getExportStatusList,
-  getExportKeyList,
-  getExportList,
-  deleteExport,
-} from '@/app/api/sys'
+import { getExportStatusList, getExportKeyList, getExportList, deleteExport } from '@/app/api/sys'
 import { ElMessageBox, FormInstance } from 'element-plus'
 import { useRouter, useRoute } from 'vue-router'
 
 const route = useRoute()
 const pageName = route.meta.title
 const exportTableData = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    export_key: '',
-    export_status: '',
-    create_time: [],
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        export_key: '',
+        export_status: '',
+        create_time: []
+    }
 })
 
 const searchFormRef = ref<FormInstance>()
@@ -204,40 +105,38 @@ const searchFormRef = ref<FormInstance>()
 // 获取导出状态列表
 const exportStatusList = ref([])
 const setExportStatusList = async () => {
-  exportStatusList.value = await (await getExportStatusList({})).data
+    exportStatusList.value = await (await getExportStatusList({})).data
 }
 setExportStatusList()
 
 // 获取导出关键字列表
 const exportKeyList = ref([])
 const setExportKeyList = async () => {
-  exportKeyList.value = await (await getExportKeyList({})).data
+    exportKeyList.value = await (await getExportKeyList({})).data
 }
 setExportKeyList()
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadExportList()
+    if (!formEl) return
+    formEl.resetFields()
+    loadExportList()
 }
 
 // 获取导出列表
 const loadExportList = (page: number = 1) => {
-  exportTableData.loading = true
-  exportTableData.page = page
+    exportTableData.loading = true
+    exportTableData.page = page
 
-  getExportList({
-    page: exportTableData.page,
-    limit: exportTableData.limit,
-    ...exportTableData.searchParam,
-  })
-    .then((res) => {
-      exportTableData.loading = false
-      exportTableData.data = res.data.data
-      exportTableData.total = res.data.total
-    })
-    .catch(() => {
-      exportTableData.loading = false
+    getExportList({
+        page: exportTableData.page,
+        limit: exportTableData.limit,
+        ...exportTableData.searchParam
+    }).then(res => {
+        exportTableData.loading = false
+        exportTableData.data = res.data.data
+        exportTableData.total = res.data.total
+    }).catch(() => {
+        exportTableData.loading = false
     })
 }
 loadExportList()
@@ -248,29 +147,30 @@ const router = useRouter()
  * 下载导出报表
  */
 const downloadEvent = (data: any) => {
-  var url = img(data.file_path)
-  var suffix = url.substring(url.lastIndexOf('.'), url.length)
-  const a = document.createElement('a')
-  a.setAttribute('download', url)
-  a.setAttribute('target', '_blank')
-  a.setAttribute('href', url)
-  a.click()
+    var url = img(data.file_path);
+    var suffix = url.substring(url.lastIndexOf("."), url.length);
+    const a = document.createElement('a')
+    a.setAttribute('download', url)
+    a.setAttribute('target', '_blank')
+    a.setAttribute('href', url)
+    a.click()
 }
 /**
  * 删除导出报表
  */
 const deleteEvent = (id: number) => {
-  ElMessageBox.confirm(t('exportDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    deleteExport(id)
-      .then(() => {
-        loadExportList()
-      })
-      .catch(() => {})
-  })
+    ElMessageBox.confirm(t('exportDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        deleteExport(id).then(() => {
+            loadExportList()
+        }).catch(() => {
+        })
+    })
 }
 </script>
 
diff --git a/admin/src/app/views/setting/growth_rule.vue b/admin/src/app/views/setting/growth_rule.vue
index 8bab49b9..fa0b57a8 100644
--- a/admin/src/app/views/setting/growth_rule.vue
+++ b/admin/src/app/views/setting/growth_rule.vue
@@ -1,80 +1,52 @@
 <template>
-  <!--成长值规则-->
-  <div class="main-container" v-loading="loading">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
+    <!--成长值规则-->
+    <div class="main-container" v-loading="loading">
+        <el-card class="box-card !border-none" shadow="never">
 
-      <div class="mt-[20px]">
-        <div class="flex items-center bg">
-          <span class="p-[15px] w-[25%] text-[14px]">规则名称</span>
-          <span class="p-[15px] w-[50%] text-[14px]">规则详情</span>
-          <span class="p-[15px] w-[15%] text-[14px]">是否启用</span>
-          <span class="p-[15px] w-[10%] text-[14px]">操作</span>
-        </div>
-        <div v-for="(item, key) in rules" :key="key" class="flex items-center">
-          <span class="p-[15px] w-[25%] text-[14px]">{{ item.name }}</span>
-          <span class="p-[15px] w-[50%] text-[14px] text-[#666]">{{
-            formData[item.key] && formData[item.key].content
-              ? formData[item.key].content
-              : '--'
-          }}</span>
-          <span class="p-[15px] w-[15%] text-[14px] text-[#666]">
-            <el-tag
-              type="success"
-              v-if="formData[item.key] && formData[item.key].is_use"
-              >已启用</el-tag
-            >
-            <el-tag type="danger" v-else>未启用</el-tag>
-          </span>
-          <span
-            class="p-[15px] w-[10%] text-[14px] text-[#666] text-[var(--el-color-primary)] cursor-pointer"
-            @click="examineFn(key)"
-            >配置</span
-          >
-        </div>
-      </div>
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+            </div>
 
-      <el-dialog
-        v-model="ruleDialog"
-        :title="'规则配置'"
-        width="600px"
-        :close-on-press-escape="false"
-        :destroy-on-close="true"
-        :close-on-click-modal="false"
-      >
-        <div v-for="(item, key) in rules" :key="key" class="pl-[60px]">
-          <component
-            :is="item.component"
-            v-model="formData[item.key]"
-            ref="ruleRefs"
-            v-if="item.component && currRule == key"
-          />
-        </div>
+            <div class="mt-[20px]">
+                <div class="flex items-center bg">
+                    <span class="p-[15px] w-[25%] text-[14px]">规则名称</span>
+                    <span class="p-[15px] w-[50%] text-[14px]">规则详情</span>
+                    <span class="p-[15px] w-[15%] text-[14px]">是否启用</span>
+                    <span class="p-[15px] w-[10%] text-[14px]">操作</span>
+                </div>
+                <div v-for="(item, key) in rules" :key="key"  class="flex items-center">
+                    <span class="p-[15px] w-[25%] text-[14px]">{{ item.name }}</span>
+                    <span class="p-[15px] w-[50%] text-[14px] text-[#666]">{{ formData[item.key] && formData[item.key].content ? formData[item.key].content : '--' }}</span>
+                    <span class="p-[15px] w-[15%] text-[14px] text-[#666]">
+                        <el-tag type="success" v-if="formData[item.key] && formData[item.key].is_use">已启用</el-tag>
+                        <el-tag type="danger" v-else>未启用</el-tag>
+                    </span>
+                    <span class="p-[15px] w-[10%] text-[14px] text-[#666] text-[var(--el-color-primary)] cursor-pointer" @click="examineFn(key)">配置</span>
+                </div>
+            </div>
 
-        <template #footer>
-          <span class="dialog-footer">
-            <el-button @click="ruleDialog = false">{{ t('cancel') }}</el-button>
-            <el-button type="primary" @click="onSave()">{{
-              t('confirm')
-            }}</el-button>
-          </span>
-        </template>
-      </el-dialog>
-    </el-card>
-  </div>
+            <el-dialog v-model="ruleDialog" :title="'规则配置'" width="600px" :close-on-press-escape="false" :destroy-on-close="true" :close-on-click-modal="false">
+                <div v-for="(item, key) in rules" :key="key" class="pl-[60px]">
+                    <component :is="item.component" v-model="formData[item.key]" ref="ruleRefs" v-if="item.component && currRule == key"/>
+                </div>
+
+                <template #footer>
+                    <span class="dialog-footer">
+                        <el-button @click="ruleDialog = false">{{ t('cancel') }}</el-button>
+                        <el-button type="primary" @click="onSave()">{{ t('confirm') }}</el-button>
+                    </span>
+                </template>
+            </el-dialog>
+
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { ref, defineAsyncComponent } from 'vue'
 import { useRoute } from 'vue-router'
 import { t } from '@/lang'
-import {
-  getGrowthRuleConfig,
-  setGrowthRuleConfig,
-  getGrowthRuleDict,
-} from '@/app/api/member'
+import { getGrowthRuleConfig, setGrowthRuleConfig, getGrowthRuleDict } from '@/app/api/member'
 import Test from '@/utils/test'
 
 const route = useRoute()
@@ -86,49 +58,44 @@ const loading = ref(true)
 
 const modules: any = import.meta.glob('@/**/*.vue')
 getGrowthRuleDict().then(({ data }) => {
-  Object.keys(data).forEach((key: string) => {
-    data[key].component &&
-      (data[key].component = defineAsyncComponent(modules[data[key].component]))
-  })
-  rules.value = data
+    Object.keys(data).forEach((key: string) => {
+        data[key].component && (data[key].component = defineAsyncComponent(modules[data[key].component]))
+    })
+    rules.value = data
 })
 
 const ruleConfigFn = () => {
-  getGrowthRuleConfig()
-    .then(({ data }) => {
-      !Test.empty(data) && (formData.value = data)
-      loading.value = false
-    })
-    .catch(() => {
-      loading.value = false
+    getGrowthRuleConfig().then(({ data }) => {
+        !Test.empty(data) && (formData.value = data)
+        loading.value = false
+    }).catch(() => {
+        loading.value = false
     })
 }
 ruleConfigFn()
 
 const saveLoading = ref(false)
 const onSave = async () => {
-  if (await ruleRefs.value[0].verify()) {
-    if (saveLoading.value) return
-    saveLoading.value = true
+    if (await ruleRefs.value[0].verify()) {
+        if (saveLoading.value) return
+        saveLoading.value = true
 
-    setGrowthRuleConfig(formData.value)
-      .then(() => {
-        ruleDialog.value = false
-        saveLoading.value = false
-        ruleConfigFn()
-      })
-      .catch(() => {
-        saveLoading.value = false
-      })
-  }
+        setGrowthRuleConfig(formData.value).then(() => {
+            ruleDialog.value = false
+            saveLoading.value = false
+            ruleConfigFn()
+        }).catch(() => {
+            saveLoading.value = false
+        })
+    }
 }
 
 const ruleDialog = ref(false)
 // 查看操作
 const currRule = ref('')
-const examineFn = (key: string) => {
-  ruleDialog.value = true
-  currRule.value = key
+const examineFn = (key:string) => {
+    ruleDialog.value = true
+    currRule.value = key
 }
 </script>
 
diff --git a/admin/src/app/views/setting/login.vue b/admin/src/app/views/setting/login.vue
index be04db4a..9c8dc9c9 100644
--- a/admin/src/app/views/setting/login.vue
+++ b/admin/src/app/views/setting/login.vue
@@ -1,112 +1,63 @@
 <template>
-  <div class="main-container">
-    <el-form
-      class="page-form"
-      :model="formData"
-      :rules="formRules"
-      label-width="150px"
-      ref="ruleFormRef"
-      v-loading="loading"
-    >
-      <el-card class="box-card !border-none" shadow="never">
-        <h3 class="panel-title !text-sm">{{ t('commonSetting') }}</h3>
-
-        <el-form-item :label="t('logonMode')" prop="type">
-          <el-checkbox
-            v-model="formData.is_username"
-            :true-value="1"
-            :false-value="0"
-            :label="t('isUsername')"
-          />
-          <div class="form-tip mb-[10px]">{{ t('isUsernameTip') }}</div>
-          <el-checkbox
-            v-model="formData.is_mobile"
-            :true-value="1"
-            :false-value="0"
-            :label="t('isMobile')"
-          />
-          <div class="form-tip">{{ t('isMobileTip') }}</div>
-        </el-form-item>
-
-        <el-form-item :label="t('isBindMobile')" prop="formData.is_bind_mobile">
-          <el-switch
-            v-model="formData.is_bind_mobile"
-            :active-value="1"
-            :inactive-value="0"
-          />
-          <div class="form-tip">{{ t('isBindMobileTip') }}</div>
-        </el-form-item>
-
-        <el-form-item :label="t('agreement')" prop="formData.agreement_show">
-          <el-switch
-            v-model="formData.agreement_show"
-            :active-value="1"
-            :inactive-value="0"
-          />
-          <div class="form-tip">{{ t('agreementTips') }}</div>
-        </el-form-item>
-      </el-card>
-
-      <el-card class="box-card mt-[15px] !border-none" shadow="never">
-        <h3 class="panel-title !text-sm">{{ t('tripartiteSetting') }}</h3>
-
-        <el-form-item
-          :label="t('isAuthRegister')"
-          prop="formData.is_auth_register"
-        >
-          <el-switch
-            v-model="formData.is_auth_register"
-            :active-value="1"
-            :inactive-value="0"
-          />
-          <div class="form-tip">{{ t('isAuthRegisterTip') }}</div>
-        </el-form-item>
-
-        <el-form-item
-          :label="t('isForceAccessUserInfo')"
-          prop="formData.is_force_access_user_info"
-          v-show="formData.is_auth_register == 1"
-        >
-          <el-switch
-            v-model="formData.is_force_access_user_info"
-            :active-value="1"
-            :inactive-value="0"
-          />
-          <div class="form-tip">{{ t('isForceAccessUserInfoTip') }}</div>
-        </el-form-item>
-      </el-card>
-
-      <el-card class="box-card mt-[15px] !border-none" shadow="never">
-        <h3 class="panel-title !text-sm">{{ t('loginPageSet') }}</h3>
-        <el-form-item :label="t('bgUrl')">
-          <div>
-            <upload-image v-model="formData.bg_url" />
-            <p class="text-[12px] text-[#a9a9a9]">
-              {{ t('bgUrlPlaceholder') }}
-            </p>
-          </div>
-        </el-form-item>
-        <el-form-item :label="t('desc')">
-          <el-input
-            v-model.trim="formData.desc"
-            :placeholder="t('descPlaceholder')"
-            class="input-width"
-            clearable
-            maxlength="20"
-            show-word-limit
-          />
-        </el-form-item>
-      </el-card>
-    </el-form>
-
-    <div class="fixed-footer-wrap">
-      <div class="fixed-footer">
-        <el-button type="primary" @click="onSave(ruleFormRef)">{{
-          t('save')
-        }}</el-button>
-      </div>
+    <div class="main-container">
+
+        <el-form class="page-form" :model="formData" :rules="formRules"  label-width="150px" ref="ruleFormRef" v-loading="loading">
+            <el-card class="box-card !border-none" shadow="never">
+                <h3 class="panel-title !text-sm">{{ t('commonSetting') }}</h3>
+
+                <el-form-item :label="t('logonMode')" prop="type">
+                    <el-checkbox v-model="formData.is_username" :true-value="1" :false-value="0" :label="t('isUsername')" />
+                    <div class="form-tip mb-[10px]">{{ t('isUsernameTip') }}</div>
+                    <el-checkbox v-model="formData.is_mobile" :true-value="1" :false-value="0" :label="t('isMobile')" />
+                    <div class="form-tip">{{ t('isMobileTip') }}</div>
+                </el-form-item>
+
+                <el-form-item :label="t('isBindMobile')" prop="formData.is_bind_mobile">
+                    <el-switch v-model="formData.is_bind_mobile" :active-value="1" :inactive-value="0" />
+                    <div class="form-tip">{{ t('isBindMobileTip') }}</div>
+                </el-form-item>
+
+                <el-form-item :label="t('agreement')" prop="formData.agreement_show">
+                    <el-switch v-model="formData.agreement_show" :active-value="1" :inactive-value="0" />
+                    <div class="form-tip">{{ t('agreementTips') }}</div>
+                </el-form-item>
+            </el-card>
+
+            <el-card class="box-card mt-[15px] !border-none" shadow="never">
+                <h3 class="panel-title !text-sm">{{ t('tripartiteSetting') }}</h3>
+
+                <el-form-item :label="t('isAuthRegister')" prop="formData.is_auth_register">
+                    <el-switch v-model="formData.is_auth_register" :active-value="1" :inactive-value="0" />
+                    <div class="form-tip">{{ t('isAuthRegisterTip') }}</div>
+                </el-form-item>
+
+                <el-form-item :label="t('isForceAccessUserInfo')" prop="formData.is_force_access_user_info" v-show="formData.is_auth_register == 1">
+                    <el-switch v-model="formData.is_force_access_user_info" :active-value="1" :inactive-value="0" />
+                    <div class="form-tip">{{ t('isForceAccessUserInfoTip') }}</div>
+                </el-form-item>
+            </el-card>
+
+            <el-card class="box-card mt-[15px] !border-none" shadow="never">
+                <h3 class="panel-title !text-sm">{{ t('loginPageSet') }}</h3>
+                <el-form-item :label="t('bgUrl')">
+                    <div>
+                        <upload-image v-model="formData.bg_url" />
+                        <p class="text-[12px] text-[#a9a9a9]">{{ t('bgUrlPlaceholder') }}</p>
+                    </div>
+                </el-form-item>
+                <el-form-item :label="t('desc')">
+                    <el-input v-model.trim="formData.desc" :placeholder="t('descPlaceholder')" class="input-width" clearable maxlength="20" show-word-limit />
+                </el-form-item>
+
+            </el-card>
+        </el-form>
+
+        <div class="fixed-footer-wrap">
+            <div class="fixed-footer">
+                <el-button type="primary" @click="onSave(ruleFormRef)">{{ t('save') }}</el-button>
+            </div>
+        </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
@@ -122,60 +73,58 @@ const pageName = route.meta.title
 
 const loading = ref(true)
 const ruleFormRef = ref<FormInstance>()
-const formData: any = reactive({
-  is_username: 0,
-  is_mobile: 0,
-  is_auth_register: 0,
-  is_force_access_user_info: 0,
-  is_bind_mobile: 0,
-  agreement_show: 0,
-  bg_url: '',
-  logo: '',
-  desc: '',
+const formData:any = reactive({
+    is_username: 0,
+    is_mobile: 0,
+    is_auth_register: 0,
+    is_force_access_user_info: 0,
+    is_bind_mobile: 0,
+    agreement_show: 0,
+    bg_url: '',
+    logo: '',
+    desc: ''
 })
 
 const formRules = computed(() => {
-  return {
-    // type: [
-    //     {
-    //         required: true,
-    //         trigger: 'change',
-    //         validator: (rule: any, value: any, callback: any) => {
-    //             if (!formData.is_mobile && !formData.is_username) {
-    //                 callback(new Error(t('mobileOrUsernameNoEmpty')))
-    //             } else {
-    //                 callback()
-    //             }
-    //         }
-    //     }
-    // ]
-  }
+    return {
+        // type: [
+        //     {
+        //         required: true,
+        //         trigger: 'change',
+        //         validator: (rule: any, value: any, callback: any) => {
+        //             if (!formData.is_mobile && !formData.is_username) {
+        //                 callback(new Error(t('mobileOrUsernameNoEmpty')))
+        //             } else {
+        //                 callback()
+        //             }
+        //         }
+        //     }
+        // ]
+    }
 })
 
 const setFormData = async () => {
-  const data = await (await getLoginConfig()).data
-  Object.keys(formData).forEach((key: string) => {
-    if (data[key] != undefined) formData[key] = data[key]
-  })
-  loading.value = false
+    const data = await (await getLoginConfig()).data
+    Object.keys(formData).forEach((key: string) => {
+        if (data[key] != undefined) formData[key] = data[key]
+    })
+    loading.value = false
 }
 setFormData()
 
 const onSave = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  await formEl.validate((valid) => {
-    if (valid) {
-      const save = cloneDeep(formData)
-
-      setLoginConfig(save)
-        .then(() => {
-          loading.value = false
-        })
-        .catch(() => {
-          loading.value = false
-        })
-    }
-  })
+    if (loading.value || !formEl) return
+    await formEl.validate((valid) => {
+        if (valid) {
+            const save = cloneDeep(formData)
+
+            setLoginConfig(save).then(() => {
+                loading.value = false
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
 }
 </script>
 
diff --git a/admin/src/app/views/setting/map.vue b/admin/src/app/views/setting/map.vue
index ceaf6ef2..69bc6cfa 100644
--- a/admin/src/app/views/setting/map.vue
+++ b/admin/src/app/views/setting/map.vue
@@ -1,56 +1,39 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ t('mapSetting') }}</span>
-      </div>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
 
-      <el-form
-        class="page-form mt-[20px]"
-        :model="formData"
-        :rules="formRules"
-        label-width="150px"
-        ref="formRef"
-        v-loading="loading"
-      >
-        <el-form-item :label="t('mapKey')" prop="key">
-          <el-input v-model.trim="formData.key" class="input-width" clearable />
-          <span class="ml-2 cursor-pointer tutorial-btn" @click="tutorialFn">{{
-            t('clickTutorial')
-          }}</span>
-          <span class="ml-2 cursor-pointer secret-btn" @click="secretFn">{{
-            t('clickSecretKey')
-          }}</span>
-        </el-form-item>
-        <el-form-item :label="t('isOpen')" prop="is_open">
-          <el-switch
-            v-model="formData.is_open"
-            :active-value="1"
-            :inactive-value="0"
-          />
-        </el-form-item>
-        <el-form-item :label="t('validTime')" prop="valid_time">
-          <el-input v-model.trim="formData.valid_time" class="!w-[120px]" />
-          <span class="ml-[10px]">{{ t('minutes') }}</span>
-        </el-form-item>
-        <div class="ml-[150px] text-sm text-gray-400">
-          {{ t('validTimeTips') }}
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ t('mapSetting') }}</span>
+            </div>
+
+            <el-form class="page-form mt-[20px]" :model="formData" :rules="formRules" label-width="150px" ref="formRef" v-loading="loading">
+                <el-form-item :label="t('mapKey')" prop="key">
+                    <el-input v-model.trim="formData.key" class="input-width" clearable />
+                    <span class="ml-2 cursor-pointer tutorial-btn" @click="tutorialFn">{{ t('clickTutorial') }}</span>
+                    <span class="ml-2 cursor-pointer secret-btn" @click="secretFn">{{ t('clickSecretKey') }}</span>
+                </el-form-item>
+                <el-form-item :label="t('isOpen')" prop="is_open">
+                    <el-switch v-model="formData.is_open" :active-value="1" :inactive-value="0" />
+                </el-form-item>
+                <el-form-item :label="t('validTime')" prop="valid_time">
+                    <el-input v-model.trim="formData.valid_time" class="!w-[120px]" />
+                    <span class="ml-[10px]">{{ t('minutes') }}</span>
+                </el-form-item>
+                <div class="ml-[150px] text-sm text-gray-400">{{ t('validTimeTips') }}</div>
+            </el-form>
+        </el-card>
+
+        <div class="fixed-footer-wrap">
+            <div class="fixed-footer">
+                <el-button type="primary" :loading="loading" @click="save(formRef)">{{ t('save') }}</el-button>
+            </div>
         </div>
-      </el-form>
-    </el-card>
 
-    <div class="fixed-footer-wrap">
-      <div class="fixed-footer">
-        <el-button type="primary" :loading="loading" @click="save(formRef)">{{
-          t('save')
-        }}</el-button>
-      </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
-import { reactive, ref, computed } from 'vue'
+import { reactive, ref,computed } from 'vue'
 import { t } from '@/lang'
 import { setMap, getMap } from '@/app/api/sys'
 import { FormInstance } from 'element-plus'
@@ -58,40 +41,40 @@ import { FormInstance } from 'element-plus'
 const loading = ref(true)
 const formRef = ref<FormInstance>()
 const formData = reactive({
-  key: '',
-  is_open: 0,
-  valid_time: 0,
+    key: '',
+    is_open: 0,
+    valid_time: 0
 })
 
 const formRules = computed(() => {
-  return {
-    valid_time: [
-      {
-        required: true,
-        trigger: 'blur',
-        validator: (rule: any, value: any, callback: any) => {
-          if (value === '') {
-            callback(new Error(t('validTimePlaceholder')))
-          } else if (isNaN(value) || !/^\d{0,10}$/.test(value)) {
-            callback(new Error(t('validTimeFormatTips')))
-          } else if (value < 5) {
-            callback(new Error(t('validTimeNotZeroTips')))
-          } else {
-            callback()
-          }
-        },
-      },
-    ],
-  }
-})
+    return {
+        valid_time: [
+            {
+                required: true,
+                trigger: 'blur',
+                validator: (rule: any, value: any, callback: any) => {
+                    if (value === '') {
+                        callback(new Error(t('validTimePlaceholder')))
+                    } else if (isNaN(value) || !/^\d{0,10}$/.test(value)) {
+                        callback(new Error(t('validTimeFormatTips')))
+                    } else if (value < 5) {
+                        callback(new Error(t('validTimeNotZeroTips')))
+                    } else {
+                        callback()
+                    }
+                }
+            }
+        ],
+    }
+});
 
 const setFormData = async () => {
-  loading.value = true
-  const service_data = await (await getMap()).data
-  formData.key = service_data.key
-  formData.is_open = service_data.is_open
-  formData.valid_time = service_data.valid_time
-  loading.value = false
+    loading.value = true
+    const service_data = await (await getMap()).data
+    formData.key = service_data.key
+    formData.is_open = service_data.is_open
+    formData.valid_time = service_data.valid_time
+    loading.value = false
 }
 setFormData()
 
@@ -99,44 +82,42 @@ setFormData()
  * 保存
  */
 const save = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
+    if (loading.value || !formEl) return
 
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
 
-      setMap(formData)
-        .then(() => {
-          loading.value = false
-        })
-        .catch(() => {
-          loading.value = false
-        })
-    }
-  })
+            setMap(formData).then(() => {
+                loading.value = false
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
 }
 
 /**
  * 点击访问教程
  */
 const tutorialFn = () => {
-  window.open('https://www.kancloud.cn/niucloud/niucloud-admin-develop/3214217')
+    window.open('https://www.kancloud.cn/niucloud/niucloud-admin-develop/3214217')
 }
 
 /**
  * 点击访问腾讯地图
  */
 const secretFn = () => {
-  window.open('https://lbs.qq.com/dev/console/key/manage')
+    window.open('https://lbs.qq.com/dev/console/key/manage')
 }
 </script>
 
 <style lang="scss" scoped>
-.tutorial-btn {
-  color: var(--el-color-primary);
-}
+    .tutorial-btn {
+        color:var(--el-color-primary);
+    }
 
-.secret-btn {
-  color: var(--el-color-primary);
-}
+    .secret-btn {
+        color:var(--el-color-primary);
+    }
 </style>
diff --git a/admin/src/app/views/setting/member.vue b/admin/src/app/views/setting/member.vue
index f42cf053..d94534bc 100644
--- a/admin/src/app/views/setting/member.vue
+++ b/admin/src/app/views/setting/member.vue
@@ -1,55 +1,29 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <el-form
-        class="page-form"
-        :model="formData"
-        label-width="150px"
-        ref="ruleFormRef"
-        :rules="formRules"
-        v-loading="loading"
-      >
-        <h3 class="panel-title !text-sm">{{ t('memberNoRule') }}</h3>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
 
-        <el-form-item :label="t('prefix')" prop="prefix">
-          <el-input
-            v-model.trim="formData.prefix"
-            :placeholder="t('prefixPlaceholder')"
-            class="input-width"
-            clearable
-            maxlength="20"
-            @change="getMemberNo(ruleFormRef)"
-          />
-        </el-form-item>
-        <el-form-item :label="t('length')" prop="length">
-          <el-input
-            v-model.trim="formData.length"
-            :placeholder="t('lengthPlaceholder')"
-            class="input-width"
-            clearable
-            @keyup="filterNumber($event)"
-            @change="getMemberNo(ruleFormRef)"
-            @blur="formData.length = $event.target.value"
-          />
-          <div class="form-tip">{{ t('lengthTips') }}</div>
-        </el-form-item>
-        <el-form-item label="默认头像">
-          <upload-image v-model="formData.member_headimg" />
-        </el-form-item>
-        <el-form-item>
-          <div class="text-lg">编号预览：{{ memberNo }}</div>
-        </el-form-item>
-      </el-form>
-    </el-card>
+            <el-form class="page-form" :model="formData" label-width="150px" ref="ruleFormRef" :rules="formRules" v-loading="loading">
+                <h3 class="panel-title !text-sm">{{ t('memberNoRule') }}</h3>
 
-    <div class="fixed-footer-wrap">
-      <div class="fixed-footer">
-        <el-button type="primary" @click="onSave(ruleFormRef)">{{
-          t('save')
-        }}</el-button>
-      </div>
+                <el-form-item :label="t('prefix')" prop="prefix">
+                    <el-input v-model.trim="formData.prefix" :placeholder="t('prefixPlaceholder')" class="input-width" clearable maxlength="20" @change="getMemberNo(ruleFormRef)"/>
+                </el-form-item>
+                <el-form-item :label="t('length')" prop="length">
+                    <el-input v-model.trim="formData.length" :placeholder="t('lengthPlaceholder')" class="input-width" clearable @keyup="filterNumber($event)" @change="getMemberNo(ruleFormRef)" @blur="formData.length = $event.target.value"/>
+                    <div class="form-tip">{{ t('lengthTips') }}</div>
+                </el-form-item>
+                <el-form-item >
+                    <div class="text-lg">{{ memberNo }}</div>
+                </el-form-item>
+            </el-form>
+        </el-card>
+
+        <div class="fixed-footer-wrap">
+            <div class="fixed-footer">
+                <el-button type="primary" @click="onSave(ruleFormRef)">{{ t('save') }}</el-button>
+            </div>
+        </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
@@ -65,78 +39,71 @@ const memberNo = ref('')
 
 // 验证会员编号
 const prefixVerify = (rule: any, value: any, callback: any) => {
-  if (value && !/^[a-zA-Z]*$/g.test(value)) {
-    callback(new Error(t('prefixHint')))
-  } else {
-    callback()
-  }
+    if (value && !/^[a-zA-Z]*$/g.test(value)) {
+        callback(new Error(t('prefixHint')))
+    } else {
+        callback()
+    }
 }
 
 // 表单验证规则
 const formRules = reactive<FormRules>({
-  prefix: [{ validator: prefixVerify, trigger: 'blur' }],
-  length: [
-    {
-      required: true,
-      message: t('lengthPlaceholder'),
-      trigger: ['blur', 'change'],
-    },
-    {
-      validator: (rule: any, value: any, callback: any) => {
-        if (
-          parseInt(value) > 30 ||
-          parseInt(value) - formData.prefix.length < 4
-        ) {
-          callback(new Error(t('lengthHint')))
-        } else {
-          callback()
+    prefix: [
+        { validator: prefixVerify, trigger: 'blur' }
+    ],
+    length: [
+        { required: true, message: t('lengthPlaceholder'), trigger: ['blur', 'change'] },
+        {
+            validator: (rule: any, value: any, callback: any) => {
+                if (parseInt(value) > 30 || parseInt(value) - formData.prefix.length < 4) {
+                    callback(new Error(t('lengthHint')))
+                } else {
+                    callback()
+                }
+            },
+            trigger: 'blur'
         }
-      },
-      trigger: 'blur',
-    },
-  ],
+    ]
 })
 
 const formData = reactive<Record<string, number | string>>({
-  prefix: '',
-  length: 10,
+    prefix: '',
+    length: 10
 })
 
 const setFormData = async () => {
-  const data = await (await getMemberConfig()).data
-  Object.keys(formData).forEach((key: string) => {
-    if (data[key] != undefined) formData[key] = data[key]
-  })
-  getMemberNo(ruleFormRef.value)
-  loading.value = false
+    const data = await (await getMemberConfig()).data
+    Object.keys(formData).forEach((key: string) => {
+        if (data[key] != undefined) formData[key] = data[key]
+    })
+    getMemberNo(ruleFormRef.value)
+    loading.value = false
 }
 setFormData()
 
 const getMemberNo = async (formEl: FormInstance | undefined) => {
-  await formEl.validate((valid) => {
-    if (valid) {
-      let no = ''
-      const length = formData.length - formData.prefix.length - 1
-      for (let i = 1; i <= length; i++) no += '0'
-      memberNo.value = formData.prefix + no + '1'
-    }
-  })
+    await formEl.validate((valid) => {
+        if (valid) {
+            let no = ''
+            const length = formData.length - formData.prefix.length - 1
+            for (let i = 1; i <= length; i++) no += '0'
+            memberNo.value = formData.prefix + no + '1'
+        }
+    })
 }
 
 const onSave = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  await formEl.validate((valid) => {
-    if (valid) {
-      setMemberConfig(formData)
-        .then(() => {
-          loading.value = false
-          getMemberNo(ruleFormRef.value)
-        })
-        .catch(() => {
-          loading.value = false
-        })
-    }
-  })
+    if (loading.value || !formEl) return
+    await formEl.validate((valid) => {
+        if (valid) {
+            setMemberConfig(formData).then(() => {
+                loading.value = false
+                getMemberNo(ruleFormRef.value)
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
 }
 </script>
 
diff --git a/admin/src/app/views/setting/notice.vue b/admin/src/app/views/setting/notice.vue
index d114c56f..30df41d1 100644
--- a/admin/src/app/views/setting/notice.vue
+++ b/admin/src/app/views/setting/notice.vue
@@ -1,156 +1,81 @@
 <template>
-  <!--消息模板-->
-  <div class="main-container" v-loading="noticeTableData.loading">
-    <el-card class="box-card !border-none" shadow="never">
-      <h3 class="panel-title !text-sm">{{ t('buyerNotice') }}</h3>
-
-      <div class="flex flex-row flex-wrap">
-        <el-table
-          :data="noticeTableData.buyer"
-          size="large"
-          :span-method="buyerSpan"
-        >
-          <el-table-column
-            prop="addon_name"
-            :label="t('addon')"
-            min-width="120"
-          />
-          <el-table-column
-            prop="name"
-            :label="t('noticeType')"
-            min-width="120"
-          />
-          <el-table-column
-            :label="t('operation')"
-            align="right"
-            fixed="right"
-            min-width="300"
-          >
-            <template #default="{ row }">
-              <div class="flex">
-                <div
-                  class="text-sm mr-1 flex items-center cursor-pointer"
-                  v-if="row.support_type.indexOf('sms') != -1"
-                  @click="setNotice(row, 'sms')"
-                >
-                  <el-icon
-                    class="text-[15px] mr-[3px]"
-                    :class="row.is_sms ? 'open' : ''"
-                  >
-                    <SuccessFilled />
-                  </el-icon>
-                  <span class="ml-0.5">{{ t('sms') }}</span>
-                </div>
-                <div
-                  class="text-sm flex items-center cursor-pointer ml-[20px]"
-                  v-if="row.support_type.indexOf('wechat') != -1"
-                  @click="setNotice(row, 'wechat')"
-                >
-                  <el-icon
-                    class="text-[15px] mr-[3px]"
-                    :class="row.is_wechat ? 'open' : ''"
-                  >
-                    <SuccessFilled />
-                  </el-icon>
-                  <span class="ml-0.5">{{ t('wechat') }}</span>
-                </div>
-                <div
-                  class="text-sm flex items-center cursor-pointer ml-[20px]"
-                  v-if="row.support_type.indexOf('weapp') != -1"
-                  @click="setNotice(row, 'weapp')"
-                >
-                  <el-icon
-                    class="text-[15px] mr-[3px]"
-                    :class="row.is_weapp ? 'open' : ''"
-                  >
-                    <SuccessFilled />
-                  </el-icon>
-                  <span class="ml-0.5">{{ t('weapp') }}</span>
-                </div>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </el-card>
-
-    <el-card class="box-card mt-[15px] !border-none" shadow="never">
-      <h3 class="panel-title !text-sm">{{ t('sellerNotice') }}</h3>
-
-      <div class="flex flex-row flex-wrap">
-        <el-table
-          :data="noticeTableData.seller"
-          size="large"
-          :span-method="buyerSpan"
-        >
-          <el-table-column
-            prop="addon_name"
-            :label="t('addon')"
-            min-width="120"
-          />
-          <el-table-column
-            prop="name"
-            :label="t('noticeType')"
-            min-width="120"
-          />
-          <el-table-column
-            :label="t('operation')"
-            align="right"
-            fixed="right"
-            min-width="300"
-          >
-            <template #default="{ row }">
-              <div class="flex">
-                <div
-                  class="text-sm mr-1 flex items-center cursor-pointer"
-                  v-if="row.support_type.indexOf('sms') != -1"
-                  @click="setNotice(row, 'sms')"
-                >
-                  <el-icon
-                    class="text-[15px] mr-[3px]"
-                    :class="row.is_sms ? 'open' : ''"
-                  >
-                    <SuccessFilled />
-                  </el-icon>
-                  <span class="ml-0.5">{{ t('sms') }}</span>
-                </div>
-                <div
-                  class="text-sm flex items-center cursor-pointer ml-[20px]"
-                  v-if="row.support_type.indexOf('wechat') != -1"
-                  @click="setNotice(row, 'wechat')"
-                >
-                  <el-icon
-                    class="text-[15px] mr-[3px]"
-                    :class="row.is_wechat ? 'open' : ''"
-                  >
-                    <SuccessFilled />
-                  </el-icon>
-                  <span class="ml-0.5">{{ t('wechat') }}</span>
-                </div>
-                <div
-                  class="text-sm flex items-center cursor-pointer ml-[20px]"
-                  v-if="row.support_type.indexOf('weapp') != -1"
-                  @click="setNotice(row, 'weapp')"
-                >
-                  <el-icon
-                    class="text-[15px] mr-[3px]"
-                    :class="row.is_weapp ? 'open' : ''"
-                  >
-                    <SuccessFilled />
-                  </el-icon>
-                  <span class="ml-0.5">{{ t('weapp') }}</span>
-                </div>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </el-card>
-
-    <sms ref="smsDialog" @complete="loadNoticeList()" />
-    <wechat ref="wechatDialog" @complete="loadNoticeList()" />
-    <weapp ref="weappDialog" @complete="loadNoticeList()" />
-  </div>
+    <!--消息模板-->
+    <div class="main-container" v-loading="noticeTableData.loading">
+        <el-card class="box-card !border-none" shadow="never">
+            <h3 class="panel-title !text-sm">{{ t('buyerNotice') }}</h3>
+
+            <div class="flex flex-row flex-wrap">
+                <el-table :data="noticeTableData.buyer" size="large" :span-method="buyerSpan">
+                    <el-table-column prop="addon_name" :label="t('addon')" min-width="120" />
+                    <el-table-column prop="name" :label="t('noticeType')" min-width="120" />
+                    <el-table-column :label="t('operation')" align="right" fixed="right" min-width="300">
+                        <template #default="{ row }">
+                            <div class="flex">
+                                <div class="text-sm mr-1 flex items-center cursor-pointer" v-if="row.support_type.indexOf('sms') != -1" @click="setNotice(row, 'sms')">
+                                    <el-icon class="text-[15px] mr-[3px]" :class="row.is_sms ? 'open' : ''">
+                                        <SuccessFilled />
+                                    </el-icon>
+                                    <span class="ml-0.5">{{ t('sms') }}</span>
+                                </div>
+                                <div class="text-sm  flex items-center cursor-pointer ml-[20px]" v-if="row.support_type.indexOf('wechat') != -1" @click="setNotice(row, 'wechat')">
+                                    <el-icon class="text-[15px] mr-[3px]" :class="row.is_wechat ? 'open' : ''">
+                                        <SuccessFilled />
+                                    </el-icon>
+                                    <span class="ml-0.5">{{ t('wechat') }}</span>
+                                </div>
+                                <div class="text-sm  flex items-center cursor-pointer ml-[20px]" v-if="row.support_type.indexOf('weapp') != -1" @click="setNotice(row, 'weapp')">
+                                    <el-icon class="text-[15px] mr-[3px]" :class="row.is_weapp ? 'open' : ''">
+                                        <SuccessFilled />
+                                    </el-icon>
+                                    <span class="ml-0.5">{{ t('weapp') }}</span>
+                                </div>
+                            </div>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+        </el-card>
+
+        <el-card class="box-card mt-[15px] !border-none" shadow="never">
+            <h3 class="panel-title !text-sm">{{ t('sellerNotice') }}</h3>
+
+            <div class="flex flex-row flex-wrap">
+                <el-table :data="noticeTableData.seller" size="large" :span-method="buyerSpan">
+                    <el-table-column prop="addon_name" :label="t('addon')" min-width="120" />
+                    <el-table-column prop="name" :label="t('noticeType')" min-width="120" />
+                    <el-table-column :label="t('operation')" align="right" fixed="right" min-width="300">
+                        <template #default="{ row }">
+                            <div class="flex">
+                                <div class="text-sm mr-1 flex items-center cursor-pointer" v-if="row.support_type.indexOf('sms') != -1" @click="setNotice(row, 'sms')">
+                                    <el-icon class="text-[15px] mr-[3px]" :class="row.is_sms ? 'open' : ''">
+                                        <SuccessFilled />
+                                    </el-icon>
+                                    <span class="ml-0.5">{{ t('sms') }}</span>
+                                </div>
+                                <div class="text-sm  flex items-center cursor-pointer ml-[20px]" v-if="row.support_type.indexOf('wechat') != -1" @click="setNotice(row, 'wechat')">
+                                    <el-icon class="text-[15px] mr-[3px]" :class="row.is_wechat ? 'open' : ''">
+                                        <SuccessFilled />
+                                    </el-icon>
+                                    <span class="ml-0.5">{{ t('wechat') }}</span>
+                                </div>
+                                <div class="text-sm  flex items-center cursor-pointer ml-[20px]" v-if="row.support_type.indexOf('weapp') != -1" @click="setNotice(row, 'weapp')">
+                                    <el-icon class="text-[15px] mr-[3px]" :class="row.is_weapp ? 'open' : ''">
+                                        <SuccessFilled />
+                                    </el-icon>
+                                    <span class="ml-0.5">{{ t('weapp') }}</span>
+                                </div>
+                            </div>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+        </el-card>
+
+        <sms ref="smsDialog" @complete="loadNoticeList()" />
+        <wechat ref="wechatDialog" @complete="loadNoticeList()" />
+        <weapp ref="weappDialog" @complete="loadNoticeList()" />
+
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -165,86 +90,83 @@ import { useRoute } from 'vue-router'
 const route = useRoute()
 const pageName = route.meta.title
 
-const smsDialog: Record<string, any> | null = ref(null)
-const wechatDialog: Record<string, any> | null = ref(null)
-const weappDialog: Record<string, any> | null = ref(null)
+const smsDialog : Record<string, any> | null = ref(null)
+const wechatDialog : Record<string, any> | null = ref(null)
+const weappDialog : Record<string, any> | null = ref(null)
 
 const noticeTableData = reactive({
-  loading: true,
-  buyer: [],
-  seller: [],
+    loading: true,
+    buyer: [],
+    seller: []
 })
 
 /**
  * 获取配置信息
  */
 const loadNoticeList = () => {
-  noticeTableData.loading = true
-
-  getNoticeList({})
-    .then((res) => {
-      noticeTableData.buyer = []
-      noticeTableData.seller = []
-      res.data.forEach((item) => {
-        if (item.notice.length) {
-          const buyer = [],
-            seller = []
-          Object.keys(item.notice).forEach((key, index) => {
-            const notice = item.notice[key]
-            notice.addon_name = item.title
-            notice.receiver_type == 1 ? buyer.push(notice) : seller.push(notice)
-          })
-          if (buyer.length) {
-            buyer[0].rowspan = buyer.length
-            noticeTableData.buyer = noticeTableData.buyer.concat(buyer)
-          }
-          if (seller.length) {
-            seller[0].rowspan = seller.length
-            noticeTableData.seller = noticeTableData.seller.concat(seller)
-          }
-        }
-      })
-      noticeTableData.loading = false
-    })
-    .catch((e) => {
-      noticeTableData.loading = false
+    noticeTableData.loading = true
+
+    getNoticeList({}).then(res => {
+        noticeTableData.buyer = []
+        noticeTableData.seller = []
+        res.data.forEach(item => {
+            if (item.notice.length) {
+                const buyer = [], seller = []
+                Object.keys(item.notice).forEach((key, index) => {
+                    const notice = item.notice[key]
+                    notice.addon_name = item.title
+                    notice.receiver_type == 1 ? buyer.push(notice) : seller.push(notice)
+                })
+                if (buyer.length) {
+                    buyer[0].rowspan = buyer.length
+                    noticeTableData.buyer = noticeTableData.buyer.concat(buyer)
+                }
+                if (seller.length) {
+                    seller[0].rowspan = seller.length
+                    noticeTableData.seller = noticeTableData.seller.concat(seller)
+                }
+            }
+        })
+        noticeTableData.loading = false
+    }).catch((e) => {
+        noticeTableData.loading = false
     })
 }
 
-const buyerSpan = (row: any) => {
-  if (row.columnIndex === 0) {
-    if (row.row.rowspan) {
-      return {
-        rowspan: row.row.rowspan,
-        colspan: 1,
-      }
-    } else {
-      return {
-        rowspan: 0,
-        colspan: 0,
-      }
+const buyerSpan = (row : any) => {
+    if (row.columnIndex === 0) {
+        if (row.row.rowspan) {
+            return {
+                rowspan: row.row.rowspan,
+                colspan: 1
+            }
+        } else {
+            return {
+                rowspan: 0,
+                colspan: 0
+            }
+        }
     }
-  }
 }
 
 loadNoticeList()
 
-const setNotice = (data: any, type: string) => {
-  data.type = type
-  eval('data.status=data.is_' + type)
-  eval(type + 'Dialog.value.setFormData(data)')
-  eval(type + 'Dialog.value.showDialog = true;')
+const setNotice = (data : any, type : string) => {
+    data.type = type
+    eval('data.status=data.is_' + type)
+    eval(type + 'Dialog.value.setFormData(data)')
+    eval(type + 'Dialog.value.showDialog = true;')
 }
 </script>
 
 <style lang="scss" scoped>
-.open {
-  color: var(--el-color-primary);
-}
+    .open {
+        color: var(--el-color-primary);
+    }
 
-.notice-type {
-  > div:nth-last-child(1):first-child {
-    width: 100%;
-  }
-}
+    .notice-type {
+        >div:nth-last-child(1):first-child {
+            width: 100%;
+        }
+    }
 </style>
diff --git a/admin/src/app/views/setting/notice_records.vue b/admin/src/app/views/setting/notice_records.vue
index 10df338b..55abc865 100644
--- a/admin/src/app/views/setting/notice_records.vue
+++ b/admin/src/app/views/setting/notice_records.vue
@@ -1,144 +1,75 @@
 <template>
-  <!--发送记录-->
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
-
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="recordsTableData.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('searchReceiver')" prop="receiver">
-            <el-input
-              v-model.trim="recordsTableData.searchParam.receiver"
-              :placeholder="t('receiverPlaceholder')"
-            />
-          </el-form-item>
-
-          <el-form-item :label="t('noticeKey')" prop="key">
-            <el-select
-              v-model="recordsTableData.searchParam.key"
-              clearable
-              :placeholder="t('noticeKeyPlaceholder')"
-              class="input-width"
-              popper-class="notice"
-            >
-              <el-option-group
-                v-for="(group, gindex) in templateList"
-                :key="gindex"
-                :label="group.label"
-              >
-                <el-option
-                  :label="item.name"
-                  :value="item.value"
-                  :disabled="item.disabled ?? false"
-                  v-for="(item, index) in group.list"
-                  :key="index"
-                />
-              </el-option-group>
-            </el-select>
-          </el-form-item>
-
-          <el-form-item :label="t('createTime')" prop="create_time">
-            <el-date-picker
-              v-model="recordsTableData.searchParam.create_time"
-              type="datetimerange"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              :start-placeholder="t('startDate')"
-              :end-placeholder="t('endDate')"
-            />
-          </el-form-item>
-
-          <el-form-item>
-            <el-button type="primary" @click="loadNoticeLogList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
-
-      <div class="mt-[10px]">
-        <el-table
-          :data="recordsTableData.data"
-          size="large"
-          v-loading="recordsTableData.loading"
-        >
-          <template #empty>
-            <span>{{ !recordsTableData.loading ? t('emptyData') : '' }}</span>
-          </template>
-
-          <el-table-column
-            prop="name"
-            :label="t('noticeKey')"
-            min-width="120"
-          />
-          <el-table-column
-            prop="notice_type"
-            :label="t('noticeType')"
-            min-width="120"
-          >
-            <template #default="{ row }">
-              <div v-if="row.notice_type == 'sms'">{{ t('sms') }}</div>
-              <div v-if="row.notice_type == 'wechat'">{{ t('wechat') }}</div>
-              <div v-if="row.notice_type == 'weapp'">{{ t('weapp') }}</div>
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            prop="nickname"
-            :label="t('nickname')"
-            min-width="120"
-          />
-          <el-table-column
-            prop="receiver"
-            :label="t('receiver')"
-            min-width="120"
-          />
-          <el-table-column
-            prop="create_time"
-            :label="t('createTime')"
-            min-width="140"
-          />
-
-          <el-table-column
-            :label="t('operation')"
-            align="right"
-            fixed="right"
-            width="100"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="infoEvent(row)">{{
-                t('info')
-              }}</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="recordsTableData.page"
-            v-model:page-size="recordsTableData.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="recordsTableData.total"
-            @size-change="loadNoticeLogList()"
-            @current-change="loadNoticeLogList"
-          />
-        </div>
-      </div>
-
-      <records-info ref="recordsDialog" @complete="loadNoticeLogList" />
-    </el-card>
-  </div>
+    <!--发送记录-->
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+            </div>
+
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="recordsTableData.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('searchReceiver')" prop="receiver">
+                        <el-input v-model.trim="recordsTableData.searchParam.receiver" :placeholder="t('receiverPlaceholder')" />
+                    </el-form-item>
+
+                    <el-form-item :label="t('noticeKey')" prop="key">
+                        <el-select v-model="recordsTableData.searchParam.key" clearable :placeholder="t('noticeKeyPlaceholder')" class="input-width" popper-class="notice">
+                            <el-option-group v-for="(group, gindex) in templateList" :key="gindex" :label="group.label">
+                                <el-option :label="item.name" :value="item.value" :disabled="item.disabled ?? false" v-for="(item, index) in group.list" :key="index" />
+                            </el-option-group>
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item :label="t('createTime')" prop="create_time">
+                        <el-date-picker v-model="recordsTableData.searchParam.create_time" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+                    </el-form-item>
+
+                    <el-form-item>
+                        <el-button type="primary" @click="loadNoticeLogList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+
+            <div class="mt-[10px]">
+                <el-table :data="recordsTableData.data" size="large" v-loading="recordsTableData.loading">
+
+                    <template #empty>
+                        <span>{{ !recordsTableData.loading ? t('emptyData') : '' }}</span>
+                    </template>
+
+                    <el-table-column prop="name" :label="t('noticeKey')" min-width="120" />
+                    <el-table-column prop="notice_type" :label="t('noticeType')" min-width="120">
+                        <template #default="{ row }">
+                            <div v-if="row.notice_type == 'sms'">{{ t('sms') }}</div>
+                            <div v-if="row.notice_type == 'wechat'">{{ t('wechat') }}</div>
+                            <div v-if="row.notice_type == 'weapp'">{{ t('weapp') }}</div>
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column prop="nickname" :label="t('nickname')" min-width="120" />
+                    <el-table-column prop="receiver" :label="t('receiver')" min-width="120" />
+                    <el-table-column prop="create_time" :label="t('createTime')" min-width="140" />
+
+                    <el-table-column :label="t('operation')" align="right" fixed="right" width="100">
+                        <template #default="{ row }">
+                            <el-button type="primary" link @click="infoEvent(row)">{{ t('info') }}</el-button>
+                        </template>
+                    </el-table-column>
+
+                </el-table>
+
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="recordsTableData.page" v-model:page-size="recordsTableData.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="recordsTableData.total"
+                        @size-change="loadNoticeLogList()" @current-change="loadNoticeLogList" />
+                </div>
+            </div>
+
+            <records-info ref="recordsDialog" @complete="loadNoticeLogList" />
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -153,61 +84,53 @@ const route = useRoute()
 const pageName = route.meta.title
 
 const recordsTableData = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    key: '',
-    receiver: '',
-    create_time: [],
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        key: '',
+        receiver: '',
+        create_time: []
+    }
 })
 
 const templateList = reactive<Record<string, any>>({
-  buyer: {
-    label: t('buyerNotice'),
-    list: [],
-  },
-  seller: {
-    label: t('sellerNotice'),
-    list: [],
-  },
+    buyer: {
+        label: t('buyerNotice'),
+        list: []
+    },
+    seller: {
+        label: t('sellerNotice'),
+        list: []
+    }
 })
 
 const setTemplateList = async () => {
-  getNoticeList({})
-    .then((res) => {
-      templateList.buyer.list = []
-      templateList.seller.list = []
-      res.data.forEach((item) => {
-        if (item.notice.length) {
-          const buyer = [],
-            seller = []
-          Object.keys(item.notice).forEach((key, index) => {
-            const notice = item.notice[key]
-            notice.addon_name = item.title
-            notice.receiver_type == 1
-              ? buyer.push({ name: notice.name, value: notice.key })
-              : seller.push({ name: notice.name, value: notice.key })
-          })
-          if (buyer.length) {
-            buyer.unshift({ name: item.title, value: item.key, disabled: true })
-            templateList.buyer.list = templateList.buyer.list.concat(buyer)
-          }
-          if (seller.length) {
-            seller.unshift({
-              name: item.title,
-              value: item.key,
-              disabled: true,
-            })
-            templateList.seller.list = templateList.seller.list.concat(seller)
-          }
-        }
-      })
+    getNoticeList({}).then(res => {
+        templateList.buyer.list = []
+        templateList.seller.list = []
+        res.data.forEach(item => {
+            if (item.notice.length) {
+                const buyer = [], seller = []
+                Object.keys(item.notice).forEach((key, index) => {
+                    const notice = item.notice[key]
+                    notice.addon_name = item.title
+                    notice.receiver_type == 1 ? buyer.push({ name: notice.name, value: notice.key }) : seller.push({ name: notice.name, value: notice.key })
+                })
+                if (buyer.length) {
+                    buyer.unshift({ name: item.title, value: item.key, disabled: true })
+                    templateList.buyer.list = templateList.buyer.list.concat(buyer)
+                }
+                if (seller.length) {
+                    seller.unshift({ name: item.title, value: item.key, disabled: true })
+                    templateList.seller.list = templateList.seller.list.concat(seller)
+                }
+            }
+        })
+    }).catch((e) => {
     })
-    .catch((e) => {})
 }
 
 setTemplateList()
@@ -218,29 +141,27 @@ const searchFormRef = ref<FormInstance>()
  * 获取通知记录列表
  */
 const loadNoticeLogList = (page: number = 1) => {
-  recordsTableData.loading = true
-  recordsTableData.page = page
-
-  getNoticeList({
-    page: recordsTableData.page,
-    limit: recordsTableData.limit,
-    ...recordsTableData.searchParam,
-  })
-    .then((res) => {
-      recordsTableData.loading = false
-      recordsTableData.data = res.data.data
-      recordsTableData.total = res.data.total
-    })
-    .catch(() => {
-      recordsTableData.loading = false
+    recordsTableData.loading = true
+    recordsTableData.page = page
+
+    getNoticeList({
+        page: recordsTableData.page,
+        limit: recordsTableData.limit,
+        ...recordsTableData.searchParam
+    }).then(res => {
+        recordsTableData.loading = false
+        recordsTableData.data = res.data.data
+        recordsTableData.total = res.data.total
+    }).catch(() => {
+        recordsTableData.loading = false
     })
 }
 loadNoticeLogList()
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadNoticeLogList()
+    if (!formEl) return
+    formEl.resetFields()
+    loadNoticeLogList()
 }
 
 const recordsDialog: Record<string, any> | null = ref(null)
@@ -250,13 +171,15 @@ const recordsDialog: Record<string, any> | null = ref(null)
  * @param data
  */
 const infoEvent = (data: any) => {
-  recordsDialog.value.setFormData(data)
-  recordsDialog.value.showDialog = true
+    recordsDialog.value.setFormData(data)
+    recordsDialog.value.showDialog = true
 }
+
 </script>
 
 <style lang="scss">
-.notice .el-select-group__title {
-  font-size: 14px;
+.notice .el-select-group__title{
+    font-size: 14px;;
 }
+
 </style>
diff --git a/admin/src/app/views/setting/pay.vue b/admin/src/app/views/setting/pay.vue
index d237d0e8..711ceec0 100644
--- a/admin/src/app/views/setting/pay.vue
+++ b/admin/src/app/views/setting/pay.vue
@@ -1,116 +1,63 @@
 <template>
-  <!--支付设置-->
-  <div class="main-container" v-loading="payLoading">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center" v-if="!payLoading">
-        <span class="text-page-title">{{ pageName }}</span>
-        <el-button type="primary" @click="isEdit = true" ref="setConfigBtn">{{
-          t('setConfig')
-        }}</el-button>
-      </div>
-    </el-card>
+    <!--支付设置-->
+    <div class="main-container" v-loading="payLoading">
 
-    <el-card
-      class="box-card mt-[15px] !border-none"
-      shadow="never"
-      v-for="(payItems, payKey) in payConfigData"
-      :key="payKey"
-    >
-      <h3 class="panel-title !text-sm">{{ payItems.name }}</h3>
+        <el-card class="box-card !border-none" shadow="never">
+            <div class="flex justify-between items-center" v-if="!payLoading">
+                <span class="text-page-title">{{ pageName }}</span>
+                <el-button type="primary" @click="isEdit = true" ref="setConfigBtn">{{ t('setConfig') }}</el-button>
+            </div>
+        </el-card>
 
-      <div>
-        <div
-          class="flex items-center justify-between p-[10px] table-item-border bg"
-        >
-          <span class="text-base w-[230px]">{{ t('payType') }}</span>
-          <span class="text-base w-[110px] text-center">{{
-            t('onState')
-          }}</span>
-          <span class="text-base w-[80px] text-center" v-if="isEdit">{{
-            t('templateName')
-          }}</span>
-        </div>
+        <el-card class="box-card mt-[15px] !border-none" shadow="never" v-for="(payItems, payKey) in payConfigData" :key="payKey">
+            <h3 class="panel-title !text-sm">{{ payItems.name }}</h3>
 
-        <div ref="fieldBoxRefs" :data-key="payKey">
-          <div
-            class="flex items-center justify-between p-[10px] table-item-border"
-            v-for="(childrenItem, childrenIndex) in payItems.pay_type"
-            :key="childrenItem.redio_key"
-            :id="payKey + '_' + childrenIndex"
-          >
-            <div class="flex w-[230px] flex-shrink-0">
-              <span
-                v-if="isEdit"
-                class="iconfont icontuodong mr-2 handle cursor-pointer"
-              ></span>
-              <div class="flex items-center select-none">
-                <div class="mr-[15px] w-[30px] h-[30px] flex-shrink-0">
-                  <img class="w-[30px]" :src="img(childrenItem.icon)" />
+            <div>
+                <div class="flex items-center justify-between p-[10px] table-item-border bg">
+                    <span class="text-base w-[230px]">{{ t('payType') }}</span>
+                    <span class="text-base w-[110px] text-center">{{ t('onState') }}</span>
+                    <span class="text-base w-[80px] text-center" v-if="isEdit">{{ t('templateName') }}</span>
+                </div>
+
+                <div ref="fieldBoxRefs" :data-key="payKey">
+                    <div class="flex items-center justify-between p-[10px] table-item-border" v-for="(childrenItem, childrenIndex) in payItems.pay_type" :key="childrenItem.redio_key" :id="payKey + '_' + childrenIndex">
+                        <div class="flex w-[230px] flex-shrink-0">
+                            <span v-if="isEdit" class="iconfont icontuodong mr-2 handle cursor-pointer"></span>
+                            <div class="flex items-center select-none">
+                                <div class="mr-[15px] w-[30px] h-[30px] flex-shrink-0">
+                                    <img class="w-[30px]" :src="img(childrenItem.icon)" />
+                                </div>
+                                <span class="text-base text-[#666]">{{ childrenItem.name }}</span>
+                            </div>
+                        </div>
+                        <div class="flex items-center justify-center w-[110px] select-none">
+                            <el-switch v-if="isEdit" v-model="childrenItem.status" :active-value="1" :inactive-value="0" :active-text="t('isEnable')" @change="enablePaymentMode(childrenItem)" />
+                            <div v-else>
+                                <el-tag v-if="childrenItem.status" class="ml-2" type="success">{{ t('open') }}</el-tag>
+                                <el-tag v-else class="ml-2" type="info">{{ t('notOpen') }}</el-tag>
+                            </div>
+                        </div>
+                        <div class="flex items-center justify-center w-[80px] select-none" v-if="isEdit">
+                            <button class="text-base" @click="configPayFn(childrenItem)" v-if="childrenItem.setting_component">{{ t('clickConfigure') }}</button>
+                            <button v-else>--</button>
+                        </div>
+                    </div>
                 </div>
-                <span class="text-base text-[#666]">{{
-                  childrenItem.name
-                }}</span>
-              </div>
-            </div>
-            <div class="flex items-center justify-center w-[110px] select-none">
-              <el-switch
-                v-if="isEdit"
-                v-model="childrenItem.status"
-                :active-value="1"
-                :inactive-value="0"
-                :active-text="t('isEnable')"
-                @change="enablePaymentMode(childrenItem)"
-              />
-              <div v-else>
-                <el-tag
-                  v-if="childrenItem.status"
-                  class="ml-2"
-                  type="success"
-                  >{{ t('open') }}</el-tag
-                >
-                <el-tag v-else class="ml-2" type="info">{{
-                  t('notOpen')
-                }}</el-tag>
-              </div>
             </div>
-            <div
-              class="flex items-center justify-center w-[80px] select-none"
-              v-if="isEdit"
-            >
-              <button
-                class="text-base"
-                @click="configPayFn(childrenItem)"
-                v-if="childrenItem.setting_component"
-              >
-                {{ t('clickConfigure') }}
-              </button>
-              <button v-else>--</button>
+        </el-card>
+
+        <div class="fixed-footer-wrap" v-if="isEdit">
+            <div class="fixed-footer">
+                <el-button type="primary" :loading="loading" @click="cancelFn">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="saveFn(formRef)">{{ t('save') }}</el-button>
             </div>
-          </div>
         </div>
-      </div>
-    </el-card>
 
-    <div class="fixed-footer-wrap" v-if="isEdit">
-      <div class="fixed-footer">
-        <el-button type="primary" :loading="loading" @click="cancelFn">{{
-          t('cancel')
-        }}</el-button>
-        <el-button type="primary" :loading="loading" @click="saveFn(formRef)">{{
-          t('save')
-        }}</el-button>
-      </div>
-    </div>
+        <template v-for="(item, index) in payTypeList">
+            <component :is="item.setting_component" :ref="(el) => setPayTypeRefs(el, item.key)" v-if="item.setting_component" @complete="setConfigInfo"/>
+        </template>
 
-    <template v-for="(item, index) in payTypeList">
-      <component
-        :is="item.setting_component"
-        :ref="(el) => setPayTypeRefs(el, item.key)"
-        v-if="item.setting_component"
-        @complete="setConfigInfo"
-      />
-    </template>
-  </div>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -132,17 +79,14 @@ const payTypeRefs = ref({})
 const modules: any = import.meta.glob('@/**/*.vue')
 
 getAllPayType().then(({ data }) => {
-  Object.keys(data).forEach((key: string) => {
-    data[key].setting_component &&
-      (data[key].setting_component = defineAsyncComponent(
-        modules[data[key].setting_component]
-      ))
-  })
-  payTypeList.value = data
+    Object.keys(data).forEach((key: string) => {
+        data[key].setting_component && (data[key].setting_component = defineAsyncComponent(modules[data[key].setting_component]))
+    })
+    payTypeList.value = data
 })
 
 const setPayTypeRefs = (el: any, index: string) => {
-  payTypeRefs.value[index] = el
+    payTypeRefs.value[index] = (el)
 }
 
 const payLoading = ref(true)
@@ -153,127 +97,124 @@ const setConfigBtn = ref()
 // 获取原始数据
 const payConfigData = ref([])
 const checkPayConfigList = () => {
-  getPayConfigList().then((res) => {
-    const payData = res.data
-    for (const i in payData) {
-      const payType = payData[i].pay_type
-      const pay_type = []
-      let default_key = ''
-
-      payType.forEach((item, index) => {
-        item.redio_key = payData[i].key + '_' + item.key
-        item.defauit_key = ''
-        if (item.is_default == 1) {
-          default_key = item.redio_key
+    getPayConfigList().then(res => {
+        const payData = res.data
+        for (const i in payData) {
+            const payType = payData[i].pay_type
+            const pay_type = []
+            let default_key = ''
+
+            payType.forEach((item, index) => {
+                item.redio_key = payData[i].key + '_' + item.key
+                item.defauit_key = ''
+                if (item.is_default == 1) {
+                    default_key = item.redio_key
+                }
+                pay_type.push(item)
+            })
+
+            payData[payData[i].key].default_pay_type = default_key
+            payData[payData[i].key].pay_type = pay_type
         }
-        pay_type.push(item)
-      })
-
-      payData[payData[i].key].default_pay_type = default_key
-      payData[payData[i].key].pay_type = pay_type
-    }
-    payConfigData.value = payData
-    payLoading.value = false
-    nextTick(() => {
-      fieldBoxRefs.value.forEach((item, index) => {
-        sortableFn(item, index)
-      })
+        payConfigData.value = payData
+        payLoading.value = false
+        nextTick(() => {
+            fieldBoxRefs.value.forEach((item, index) => {
+                sortableFn(item, index)
+            })
+        })
     })
-  })
 }
 checkPayConfigList()
 
 // 配置支付宝、微信信息
-const setConfigInfo = (data: any) => {
-  payConfigData.value[data.channel].pay_type.forEach((element) => {
-    if (element.key == data.type) {
-      element.config = data.config
-    }
-  })
-  console.log(payConfigData.value)
+const setConfigInfo = (data:any) => {
+    payConfigData.value[data.channel].pay_type.forEach(element => {
+        if (element.key == data.type) {
+            element.config = data.config
+        }
+    })
+    console.log(payConfigData.value)
 }
 
 // 初始化配置信息
-const configPayFn = (data: any) => {
-  payTypeRefs.value[data.key].setFormData(data)
-  payTypeRefs.value[data.key].showDialog = true
+const configPayFn = (data:any) => {
+    payTypeRefs.value[data.key].setFormData(data)
+    payTypeRefs.value[data.key].showDialog = true
 }
 
 // 开启支付方式
 const enablePaymentMode = async (data: any) => {
-  if (
-    payTypeRefs.value[data.key] &&
-    typeof payTypeRefs.value[data.key].enableVerify == 'function'
-  ) {
-    payTypeRefs.value[data.key].setFormData(data)
-
-    const verify = payTypeRefs.value[data.key].enableVerify()
-    if (!verify) {
-      data.status = 0
-      ElMessage(t('configurePaymentMethod'))
-      return false
+    if (payTypeRefs.value[data.key] && typeof payTypeRefs.value[data.key].enableVerify == 'function') {
+        payTypeRefs.value[data.key].setFormData(data)
+
+        const verify = payTypeRefs.value[data.key].enableVerify()
+        if (!verify) {
+            data.status = 0
+            ElMessage(t('configurePaymentMethod'))
+            return false
+        }
     }
-  }
 }
 
 interface SortableEvt extends SortableEvent {
-  originalEvent?: DragEvent
+    originalEvent?: DragEvent
 }
 
 // 拖动
 const fieldBoxRefs = ref<any>([])
 watch(isEdit, (newValue, oldValue) => {
-  if (newValue) {
-    nextTick(() => {
-      fieldBoxRefs.value.forEach((item: any, index: any) => {
-        sortableFn(item, index)
-      })
-    })
-  }
+    if (newValue) {
+        nextTick(() => {
+            fieldBoxRefs.value.forEach((item:any, index:any) => {
+                sortableFn(item, index)
+            })
+        })
+    }
 })
 
 // item=>拖动的每项，index 索引
 const sortableFn = (item, index) => {
-  const sortable = Sortable.create(item, {
-    group: {
-      put: false, // 不允许拖拽进这个列表
-    },
-    handle: '.handle',
-    animation: 200,
-    disabled: false,
-    onEnd: (evt) => {
-      const key = evt.target.getAttribute('data-key')
-      const data = payConfigData.value[key].pay_type
-      data.splice(evt.newIndex, 0, ...data.splice(evt.oldIndex, 1))
-    },
-  })
+    const sortable = Sortable.create(item, {
+        group: {
+            put: false // 不允许拖拽进这个列表
+        },
+        handle: '.handle',
+        animation: 200,
+        disabled: false,
+        onEnd: (evt) => {
+            const key = evt.target.getAttribute('data-key')
+            const data = payConfigData.value[key].pay_type
+            data.splice(evt.newIndex, 0, ...data.splice(evt.oldIndex, 1))
+        }
+    })
 }
 
 // 保存
 const saveFn = () => {
-  payLoading.value = true
-  const data = cloneDeep(payConfigData.value)
-  Object.values(data).forEach((item, index) => {
-    item.pay_type.forEach((subItem: any, subIndex: any) => {
-      subItem.sort = subIndex
+    payLoading.value = true
+    const data = cloneDeep(payConfigData.value)
+    Object.values(data).forEach((item, index) => {
+        item.pay_type.forEach((subItem:any, subIndex:any) => {
+            subItem.sort = subIndex
+        })
     })
-  })
 
-  setPatConfig({ config: data }).then((res) => {
-    checkPayConfigList()
-    isEdit.value = false
-    payLoading.value = false
-  })
+    setPatConfig({ config: data }).then(res => {
+        checkPayConfigList()
+        isEdit.value = false
+        payLoading.value = false
+    })
 }
 
 // 取消按钮
 const cancelFn = () => {
-  location.reload()
+    location.reload()
 }
 </script>
 
 <style lang="scss" scoped>
-.table-item-border {
-  @apply border-b border-[var(--el-border-color)];
-}
+    .table-item-border {
+        @apply border-b border-[var(--el-border-color)];
+    }
 </style>
diff --git a/admin/src/app/views/setting/point_rule.vue b/admin/src/app/views/setting/point_rule.vue
index 7e26ae62..f6f6dcd7 100644
--- a/admin/src/app/views/setting/point_rule.vue
+++ b/admin/src/app/views/setting/point_rule.vue
@@ -1,118 +1,63 @@
 <template>
-  <div class="main-container" v-loading="loading">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
+    <div class="main-container" v-loading="loading">
+        <el-card class="box-card !border-none" shadow="never">
 
-      <div class="mt-[20px]">
-        <div class="flex items-center bg">
-          <span class="p-[15px] w-[25%] text-[14px]">规则名称</span>
-          <span class="p-[15px] w-[50%] text-[14px]">规则详情</span>
-          <span class="p-[15px] w-[15%] text-[14px]">是否启用</span>
-          <span class="p-[15px] w-[10%] text-[14px]">操作</span>
-        </div>
-        <div
-          v-for="(item, key) in rules.grant"
-          :key="key"
-          class="flex items-center"
-        >
-          <span class="p-[15px] w-[25%] text-[14px]">{{ item.name }}</span>
-          <span class="p-[15px] w-[50%] text-[14px] text-[#666]">{{
-            formData.grant[item.key] && formData.grant[item.key].content
-              ? formData.grant[item.key].content
-              : '--'
-          }}</span>
-          <span class="p-[15px] w-[15%] text-[14px] text-[#666]">
-            <el-tag
-              type="success"
-              v-if="formData.grant[item.key] && formData.grant[item.key].is_use"
-              >已启用</el-tag
-            >
-            <el-tag type="danger" v-else>未启用</el-tag>
-          </span>
-          <span
-            class="p-[15px] w-[10%] text-[14px] text-[#666] text-[var(--el-color-primary)] cursor-pointer"
-            @click="examineFn(key)"
-            >配置</span
-          >
-        </div>
-        <div
-          v-for="(item, key) in rules.consume"
-          :key="key"
-          class="flex items-center"
-        >
-          <span class="p-[15px] w-[25%] text-[14px]">{{ item.name }}</span>
-          <span class="p-[15px] w-[50%] text-[14px] text-[#666]">{{
-            formData.consume[item.key] && formData.consume[item.key].content
-              ? formData.consume[item.key].content
-              : '--'
-          }}</span>
-          <span class="p-[15px] w-[15%] text-[14px] text-[#666]">
-            <el-tag
-              type="success"
-              v-if="
-                formData.consume[item.key] && formData.consume[item.key].is_use
-              "
-              >已启用</el-tag
-            >
-            <el-tag type="danger" v-else>未启用</el-tag>
-          </span>
-          <span
-            class="p-[15px] w-[10%] text-[14px] text-[#666] text-[var(--el-color-primary)] cursor-pointer"
-            @click="examineFn(key)"
-            >配置</span
-          >
-        </div>
-      </div>
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+            </div>
 
-      <el-dialog
-        v-model="ruleDialog"
-        :title="'规则配置'"
-        width="600px"
-        :close-on-press-escape="false"
-        :destroy-on-close="true"
-        :close-on-click-modal="false"
-      >
-        <div v-for="(item, key) in rules.grant" :key="key" class="pl-[60px]">
-          <component
-            :is="item.component"
-            v-model="formData.grant[item.key]"
-            ref="ruleRefs"
-            v-if="item.component && currRule == key"
-          />
-        </div>
-        <div v-for="(item, key) in rules.consume" :key="key" class="pl-[60px]">
-          <component
-            :is="item.component"
-            v-model="formData.consume[item.key]"
-            ref="ruleRefs"
-            v-if="item.component && currRule == key"
-          />
-        </div>
+            <div class="mt-[20px]">
+                <div class="flex items-center bg">
+                    <span class="p-[15px] w-[25%] text-[14px]">规则名称</span>
+                    <span class="p-[15px] w-[50%] text-[14px]">规则详情</span>
+                    <span class="p-[15px] w-[15%] text-[14px]">是否启用</span>
+                    <span class="p-[15px] w-[10%] text-[14px]">操作</span>
+                </div>
+                <div v-for="(item, key) in rules.grant" :key="key" class="flex items-center">
+                    <span class="p-[15px] w-[25%] text-[14px]">{{ item.name }}</span>
+                    <span class="p-[15px] w-[50%] text-[14px] text-[#666]">{{ formData.grant[item.key] && formData.grant[item.key].content ? formData.grant[item.key].content : '--' }}</span>
+                    <span class="p-[15px] w-[15%] text-[14px] text-[#666]">
+                        <el-tag type="success" v-if="formData.grant[item.key] && formData.grant[item.key].is_use">已启用</el-tag>
+                        <el-tag type="danger" v-else>未启用</el-tag>
+                    </span>
+                    <span class="p-[15px] w-[10%] text-[14px] text-[#666] text-[var(--el-color-primary)] cursor-pointer" @click="examineFn(key)">配置</span>
+                </div>
+                <div v-for="(item, key) in rules.consume" :key="key"  class="flex items-center">
+                    <span class="p-[15px] w-[25%] text-[14px]">{{ item.name }}</span>
+                    <span class="p-[15px] w-[50%] text-[14px] text-[#666]">{{ formData.consume[item.key] && formData.consume[item.key].content ? formData.consume[item.key].content : '--' }}</span>
+                    <span class="p-[15px] w-[15%] text-[14px] text-[#666]">
+                        <el-tag type="success" v-if="formData.consume[item.key] && formData.consume[item.key].is_use">已启用</el-tag>
+                        <el-tag type="danger" v-else>未启用</el-tag>
+                    </span>
+                    <span class="p-[15px] w-[10%] text-[14px] text-[#666] text-[var(--el-color-primary)] cursor-pointer" @click="examineFn(key)">配置</span>
+                </div>
+            </div>
 
-        <template #footer>
-          <span class="dialog-footer">
-            <el-button @click="ruleDialog = false">{{ t('cancel') }}</el-button>
-            <el-button type="primary" @click="onSave()">{{
-              t('confirm')
-            }}</el-button>
-          </span>
-        </template>
-      </el-dialog>
-    </el-card>
-  </div>
+            <el-dialog v-model="ruleDialog" :title="'规则配置'" width="600px" :close-on-press-escape="false" :destroy-on-close="true" :close-on-click-modal="false">
+                <div v-for="(item, key) in rules.grant" :key="key" class="pl-[60px]">
+                    <component :is="item.component" v-model="formData.grant[item.key]" ref="ruleRefs" v-if="item.component && currRule == key"/>
+                </div>
+                <div v-for="(item, key) in rules.consume" :key="key" class="pl-[60px]">
+                    <component :is="item.component" v-model="formData.consume[item.key]" ref="ruleRefs" v-if="item.component && currRule == key"/>
+                </div>
+
+                <template #footer>
+                    <span class="dialog-footer">
+                        <el-button @click="ruleDialog = false">{{ t('cancel') }}</el-button>
+                        <el-button type="primary" @click="onSave()">{{ t('confirm') }}</el-button>
+                    </span>
+                </template>
+            </el-dialog>
+
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { ref, defineAsyncComponent } from 'vue'
 import { useRoute } from 'vue-router'
 import { t } from '@/lang'
-import {
-  getPointRuleConfig,
-  setPointRuleConfig,
-  getPointRuleDict,
-} from '@/app/api/member'
+import { getPointRuleConfig, setPointRuleConfig, getPointRuleDict } from '@/app/api/member'
 import Test from '@/utils/test'
 
 const route = useRoute()
@@ -120,65 +65,55 @@ const pageName = route.meta.title
 
 const rules = ref({})
 const formData = ref({
-  grant: {},
-  consume: {},
+    grant: {},
+    consume: {}
 })
 const ruleRefs = ref(null)
 const loading = ref(true)
 
 const modules: any = import.meta.glob('@/**/*.vue')
 getPointRuleDict().then(({ data }) => {
-  Object.keys(data.grant).forEach((key: string) => {
-    data.grant[key].component &&
-      (data.grant[key].component = defineAsyncComponent(
-        modules[data.grant[key].component]
-      ))
-  })
-  Object.keys(data.consume).forEach((key: string) => {
-    data.consume[key].component &&
-      (data.consume[key].component = defineAsyncComponent(
-        modules[data.consume[key].component]
-      ))
-  })
-  rules.value = data
+    Object.keys(data.grant).forEach((key : string) => {
+        data.grant[key].component && (data.grant[key].component = defineAsyncComponent(modules[data.grant[key].component]))
+    })
+    Object.keys(data.consume).forEach((key : string) => {
+        data.consume[key].component && (data.consume[key].component = defineAsyncComponent(modules[data.consume[key].component]))
+    })
+    rules.value = data
 })
 
 const ruleConfigFn = () => {
-  getPointRuleConfig()
-    .then(({ data }) => {
-      !Test.empty(data) && (formData.value = data)
-      loading.value = false
-    })
-    .catch(() => {
-      loading.value = false
+    getPointRuleConfig().then(({ data }) => {
+        !Test.empty(data) && (formData.value = data)
+        loading.value = false
+    }).catch(() => {
+        loading.value = false
     })
 }
 ruleConfigFn()
 
 const saveLoading = ref(false)
 const onSave = async () => {
-  if (await ruleRefs.value[0].verify()) {
-    if (saveLoading.value) return
-    saveLoading.value = true
+    if (await ruleRefs.value[0].verify()) {
+        if (saveLoading.value) return
+        saveLoading.value = true
 
-    setPointRuleConfig(formData.value)
-      .then(() => {
-        ruleDialog.value = false
-        saveLoading.value = false
-        ruleConfigFn()
-      })
-      .catch(() => {
-        saveLoading.value = false
-      })
-  }
+        setPointRuleConfig(formData.value).then(() => {
+            ruleDialog.value = false
+            saveLoading.value = false
+            ruleConfigFn()
+        }).catch(() => {
+            saveLoading.value = false
+        })
+    }
 }
 
 const ruleDialog = ref(false)
 // 查看操作
 const currRule = ref('')
-const examineFn = (key: string) => {
-  ruleDialog.value = true
-  currRule.value = key
+const examineFn = (key:string) => {
+    ruleDialog.value = true
+    currRule.value = key
 }
 </script>
 
diff --git a/admin/src/app/views/setting/sms.vue b/admin/src/app/views/setting/sms.vue
index 93211a2b..8544a33f 100644
--- a/admin/src/app/views/setting/sms.vue
+++ b/admin/src/app/views/setting/sms.vue
@@ -1,62 +1,39 @@
 <template>
-  <!--短信设置-->
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
+    <!--短信设置-->
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
 
-      <div class="mt-[20px]">
-        <el-table
-          :data="smsTableData.data"
-          size="large"
-          v-loading="smsTableData.loading"
-        >
-          <template #empty>
-            <span>{{ !smsTableData.loading ? t('emptyData') : '' }}</span>
-          </template>
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+            </div>
 
-          <el-table-column
-            prop="name"
-            :label="t('name')"
-            min-width="100"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column :label="t('isUse')" min-width="180" align="center">
-            <template #default="{ row }">
-              <el-tag class="ml-2" type="success" v-if="row.is_use == 1">{{
-                t('statusNormal')
-              }}</el-tag>
-              <el-tag class="ml-2" type="error" v-if="row.is_use == 0">{{
-                t('statusDeactivate')
-              }}</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column
-            :label="t('operation')"
-            align="right"
-            fixed="right"
-            width="100"
-          >
-            <template #default="{ row, $index }">
-              <el-button type="primary" link @click="editEvent(row, $index)">{{
-                t('config')
-              }}</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
+            <div class="mt-[20px]">
+                <el-table :data="smsTableData.data" size="large" v-loading="smsTableData.loading">
+                    <template #empty>
+                        <span>{{ !smsTableData.loading ? t('emptyData') : '' }}</span>
+                    </template>
+
+                    <el-table-column prop="name" :label="t('name')" min-width="100" :show-overflow-tooltip="true"/>
+                    <el-table-column :label="t('isUse')" min-width="180" align="center">
+                        <template #default="{ row }">
+                            <el-tag class="ml-2" type="success" v-if="row.is_use == 1">{{ t('statusNormal') }}</el-tag>
+                            <el-tag class="ml-2" type="error" v-if="row.is_use == 0">{{t('statusDeactivate') }}</el-tag>
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('operation')" align="right" fixed="right" width="100">
+                       <template #default="{ row, $index }">
+                           <el-button type="primary" link @click="editEvent(row, $index)">{{ t('config') }}</el-button>
+                       </template>
+                    </el-table-column>
 
-      <template v-for="(item, index) in smsTableData.data">
-        <component
-          :is="item.component"
-          :ref="(el) => setSmsTypeRefs(el, index)"
-          v-if="item.component"
-          @complete="loadSmsList()"
-        />
-      </template>
-    </el-card>
-  </div>
+                </el-table>
+            </div>
+
+            <template v-for="(item, index) in smsTableData.data">
+                <component :is="item.component" :ref="(el) => setSmsTypeRefs(el, index)" v-if="item.component" @complete="loadSmsList()"/>
+            </template>
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -70,8 +47,8 @@ const pageName = route.meta.title
 const smsTypeRefs = ref([])
 
 const smsTableData = reactive({
-  loading: true,
-  data: [],
+    loading: true,
+    data: []
 })
 
 const modules: any = import.meta.glob('@/**/*.vue')
@@ -79,31 +56,26 @@ const modules: any = import.meta.glob('@/**/*.vue')
  * 获取配置信息
  */
 const loadSmsList = () => {
-  smsTableData.loading = true
-  getSmsList()
-    .then(({ data }) => {
-      Object.keys(data).forEach((key: string) => {
-        data[key].component &&
-          (data[key].component = defineAsyncComponent(
-            modules[data[key].component]
-          ))
-      })
-      smsTableData.data = data
-      smsTableData.loading = false
-    })
-    .catch(() => {
-      smsTableData.loading = false
+    smsTableData.loading = true
+    getSmsList().then(({ data }) => {
+        Object.keys(data).forEach((key: string) => {
+            data[key].component && (data[key].component = defineAsyncComponent(modules[data[key].component]))
+        })
+        smsTableData.data = data
+        smsTableData.loading = false
+    }).catch(() => {
+        smsTableData.loading = false
     })
 }
 
 const setSmsTypeRefs = (el, index) => {
-  smsTypeRefs.value[index] = el
+    smsTypeRefs.value[index] = (el)
 }
 
 loadSmsList()
 const editEvent = (data: any, index: number) => {
-  smsTypeRefs.value[index].setFormData(data)
-  smsTypeRefs.value[index].showDialog = true
+    smsTypeRefs.value[index].setFormData(data)
+    smsTypeRefs.value[index].showDialog = true
 }
 </script>
 
diff --git a/admin/src/app/views/setting/sms_records.vue b/admin/src/app/views/setting/sms_records.vue
index 049ced06..cb2b2d98 100644
--- a/admin/src/app/views/setting/sms_records.vue
+++ b/admin/src/app/views/setting/sms_records.vue
@@ -1,132 +1,68 @@
 <template>
-  <!--发送记录-->
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
-
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="recordsTableData.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('searchReceiver')" prop="mobile">
-            <el-input
-              v-model.trim="recordsTableData.searchParam.mobile"
-              :placeholder="t('receiverPlaceholder')"
-            />
-          </el-form-item>
-
-          <el-form-item :label="t('noticeKey')" prop="key">
-            <el-select
-              v-model="recordsTableData.searchParam.key"
-              clearable
-              :placeholder="t('noticeKeyPlaceholder')"
-              class="input-width"
-            >
-              <el-option-group
-                v-for="(group, gindex) in templateList"
-                :key="gindex"
-                :label="group.label"
-              >
-                <el-option
-                  :label="item.name"
-                  :value="item.value"
-                  :disabled="item.disabled ?? false"
-                  v-for="(item, index) in group.list"
-                  :key="index"
-                />
-              </el-option-group>
-            </el-select>
-          </el-form-item>
-
-          <el-form-item :label="t('createTime')" prop="create_time">
-            <el-date-picker
-              v-model="recordsTableData.searchParam.create_time"
-              type="datetimerange"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              :start-placeholder="t('startDate')"
-              :end-placeholder="t('endDate')"
-            />
-          </el-form-item>
-
-          <el-form-item>
-            <el-button type="primary" @click="loadNoticeLogList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
-
-      <div class="mt-[10px]">
-        <el-table
-          :data="recordsTableData.data"
-          size="large"
-          v-loading="recordsTableData.loading"
-        >
-          <template #empty>
-            <span>{{ !recordsTableData.loading ? t('emptyData') : '' }}</span>
-          </template>
-
-          <el-table-column
-            prop="name"
-            :label="t('noticeKey')"
-            min-width="120"
-          />
-          <el-table-column
-            prop="sms_type_name"
-            :label="t('smsType')"
-            min-width="120"
-          />
-
-          <el-table-column
-            prop="mobile"
-            :label="t('receiver')"
-            min-width="120"
-          />
-          <el-table-column
-            prop="create_time"
-            :label="t('createTime')"
-            min-width="140"
-          />
-
-          <el-table-column
-            :label="t('operation')"
-            align="right"
-            fixed="right"
-            width="100"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="infoEvent(row)">{{
-                t('info')
-              }}</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="recordsTableData.page"
-            v-model:page-size="recordsTableData.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="recordsTableData.total"
-            @size-change="loadNoticeLogList()"
-            @current-change="loadNoticeLogList"
-          />
-        </div>
-      </div>
-
-      <records-info ref="recordsDialog" @complete="loadNoticeLogList" />
-    </el-card>
-  </div>
+    <!--发送记录-->
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+            </div>
+
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="recordsTableData.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('searchReceiver')" prop="mobile">
+                        <el-input v-model.trim="recordsTableData.searchParam.mobile" :placeholder="t('receiverPlaceholder')" />
+                    </el-form-item>
+
+                    <el-form-item :label="t('noticeKey')" prop="key">
+                        <el-select v-model="recordsTableData.searchParam.key" clearable :placeholder="t('noticeKeyPlaceholder')" class="input-width">
+                            <el-option-group v-for="(group, gindex) in templateList" :key="gindex" :label="group.label">
+                                <el-option :label="item.name" :value="item.value" :disabled="item.disabled ?? false" v-for="(item, index) in group.list" :key="index" />
+                            </el-option-group>
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item :label="t('createTime')" prop="create_time">
+                        <el-date-picker v-model="recordsTableData.searchParam.create_time" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+                    </el-form-item>
+
+                    <el-form-item>
+                        <el-button type="primary" @click="loadNoticeLogList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+
+            <div class="mt-[10px]">
+                <el-table :data="recordsTableData.data" size="large" v-loading="recordsTableData.loading">
+
+                    <template #empty>
+                        <span>{{ !recordsTableData.loading ? t('emptyData') : '' }}</span>
+                    </template>
+
+                    <el-table-column prop="name" :label="t('noticeKey')" min-width="120" />
+                    <el-table-column prop="sms_type_name" :label="t('smsType')" min-width="120"/>
+
+                    <el-table-column prop="mobile" :label="t('receiver')" min-width="120" />
+                    <el-table-column prop="create_time" :label="t('createTime')" min-width="140" />
+
+                    <el-table-column :label="t('operation')" align="right" fixed="right" width="100">
+                        <template #default="{ row }">
+                            <el-button type="primary" link @click="infoEvent(row)">{{ t('info') }}</el-button>
+                        </template>
+                    </el-table-column>
+
+                </el-table>
+
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="recordsTableData.page" v-model:page-size="recordsTableData.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="recordsTableData.total"
+                        @size-change="loadNoticeLogList()" @current-change="loadNoticeLogList" />
+                </div>
+            </div>
+
+            <records-info ref="recordsDialog" @complete="loadNoticeLogList" />
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -141,61 +77,53 @@ const route = useRoute()
 const pageName = route.meta.title
 
 const recordsTableData = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    key: '',
-    mobile: '',
-    create_time: [],
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        key: '',
+        mobile: '',
+        create_time: []
+    }
 })
 
 const templateList = reactive<Record<string, any>>({
-  buyer: {
-    label: t('buyerNotice'),
-    list: [],
-  },
-  seller: {
-    label: t('sellerNotice'),
-    list: [],
-  },
+    buyer: {
+        label: t('buyerNotice'),
+        list: []
+    },
+    seller: {
+        label: t('sellerNotice'),
+        list: []
+    }
 })
 
 const setTemplateList = async () => {
-  getNoticeList({})
-    .then((res) => {
-      templateList.buyer.list = []
-      templateList.seller.list = []
-      res.data.forEach((item) => {
-        if (item.notice.length) {
-          const buyer = [],
-            seller = []
-          Object.keys(item.notice).forEach((key, index) => {
-            const notice = item.notice[key]
-            notice.addon_name = item.title
-            notice.receiver_type == 1
-              ? buyer.push({ name: notice.name, value: notice.key })
-              : seller.push({ name: notice.name, value: notice.key })
-          })
-          if (buyer.length) {
-            buyer.unshift({ name: item.title, value: item.key, disabled: true })
-            templateList.buyer.list = templateList.buyer.list.concat(buyer)
-          }
-          if (seller.length) {
-            seller.unshift({
-              name: item.title,
-              value: item.key,
-              disabled: true,
-            })
-            templateList.seller.list = templateList.seller.list.concat(seller)
-          }
-        }
-      })
+    getNoticeList({}).then(res => {
+        templateList.buyer.list = []
+        templateList.seller.list = []
+        res.data.forEach(item => {
+            if (item.notice.length) {
+                const buyer = [], seller = []
+                Object.keys(item.notice).forEach((key, index) => {
+                    const notice = item.notice[key]
+                    notice.addon_name = item.title
+                    notice.receiver_type == 1 ? buyer.push({ name: notice.name, value: notice.key }) : seller.push({ name: notice.name, value: notice.key })
+                })
+                if (buyer.length) {
+                    buyer.unshift({ name: item.title, value: item.key, disabled: true })
+                    templateList.buyer.list = templateList.buyer.list.concat(buyer)
+                }
+                if (seller.length) {
+                    seller.unshift({ name: item.title, value: item.key, disabled: true })
+                    templateList.seller.list = templateList.seller.list.concat(seller)
+                }
+            }
+        })
+    }).catch((e) => {
     })
-    .catch((e) => {})
 }
 
 setTemplateList()
@@ -206,29 +134,27 @@ const searchFormRef = ref<FormInstance>()
  * 获取通知记录列表
  */
 const loadNoticeLogList = (page: number = 1) => {
-  recordsTableData.loading = true
-  recordsTableData.page = page
-
-  getSmsLog({
-    page: recordsTableData.page,
-    limit: recordsTableData.limit,
-    ...recordsTableData.searchParam,
-  })
-    .then((res) => {
-      recordsTableData.loading = false
-      recordsTableData.data = res.data.data
-      recordsTableData.total = res.data.total
-    })
-    .catch(() => {
-      recordsTableData.loading = false
+    recordsTableData.loading = true
+    recordsTableData.page = page
+
+    getSmsLog({
+        page: recordsTableData.page,
+        limit: recordsTableData.limit,
+        ...recordsTableData.searchParam
+    }).then(res => {
+        recordsTableData.loading = false
+        recordsTableData.data = res.data.data
+        recordsTableData.total = res.data.total
+    }).catch(() => {
+        recordsTableData.loading = false
     })
 }
 loadNoticeLogList()
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadNoticeLogList()
+    if (!formEl) return
+    formEl.resetFields()
+    loadNoticeLogList()
 }
 
 const recordsDialog: Record<string, any> | null = ref(null)
@@ -238,9 +164,10 @@ const recordsDialog: Record<string, any> | null = ref(null)
  * @param data
  */
 const infoEvent = (data: any) => {
-  recordsDialog.value.setFormData(data)
-  recordsDialog.value.showDialog = true
+    recordsDialog.value.setFormData(data)
+    recordsDialog.value.showDialog = true
 }
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/setting/storage.vue b/admin/src/app/views/setting/storage.vue
index 439ec817..2067f88d 100644
--- a/admin/src/app/views/setting/storage.vue
+++ b/admin/src/app/views/setting/storage.vue
@@ -1,62 +1,40 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
-
-      <div class="mt-[20px]">
-        <el-table
-          :data="storageTableData.data"
-          size="large"
-          v-loading="loading"
-        >
-          <template #empty>
-            <span>{{ !loading ? t('emptyData') : '' }}</span>
-          </template>
-
-          <el-table-column
-            prop="name"
-            :label="t('name')"
-            min-width="100"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column :label="t('isUse')" min-width="180" align="center">
-            <template #default="{ row }">
-              <el-tag class="ml-2" type="success" v-if="row.is_use == 1">{{
-                t('statusNormal')
-              }}</el-tag>
-              <el-tag class="ml-2" type="error" v-if="row.is_use == 0">{{
-                t('statusDeactivate')
-              }}</el-tag>
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            :label="t('operation')"
-            align="right"
-            fixed="right"
-            width="100"
-          >
-            <template #default="{ row, $index }">
-              <el-button type="primary" link @click="editEvent(row, $index)">{{
-                t('config')
-              }}</el-button>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+
+           <div class="flex justify-between items-center">
+                <span class="text-page-title">{{pageName}}</span>
+            </div>
+
+            <div class="mt-[20px]">
+                <el-table :data="storageTableData.data" size="large" v-loading="loading">
+
+                    <template #empty>
+                        <span>{{ !loading ? t('emptyData') : '' }}</span>
+                    </template>
+
+                    <el-table-column prop="name" :label="t('name')" min-width="100" :show-overflow-tooltip="true"/>
+                    <el-table-column :label="t('isUse')" min-width="180" align="center">
+                        <template #default="{ row }">
+                            <el-tag class="ml-2" type="success" v-if="row.is_use == 1">{{ t('statusNormal') }}</el-tag>
+                            <el-tag class="ml-2" type="error" v-if="row.is_use == 0">{{t('statusDeactivate') }}</el-tag>
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column :label="t('operation')" align="right" fixed="right" width="100">
+                       <template #default="{ row, $index }">
+                           <el-button type="primary" link @click="editEvent(row, $index)">{{ t('config') }}</el-button>
+                       </template>
+                    </el-table-column>
+
+                </el-table>
+            </div>
+
+            <template v-for="(item, index) in storageTableData.data">
+                <component :is="item.component" :ref="(el) => setStorageTypeRefs(el, index)" v-if="item.component" @complete="loadStorageList()"/>
             </template>
-          </el-table-column>
-        </el-table>
-      </div>
-
-      <template v-for="(item, index) in storageTableData.data">
-        <component
-          :is="item.component"
-          :ref="(el) => setStorageTypeRefs(el, index)"
-          v-if="item.component"
-          @complete="loadStorageList()"
-        />
-      </template>
-    </el-card>
-  </div>
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -70,7 +48,7 @@ const pageName = route.meta.title
 const storageTypeRefs = ref([])
 
 const storageTableData = reactive({
-  data: [],
+    data: []
 })
 const loading = ref(true)
 
@@ -79,33 +57,29 @@ const modules: any = import.meta.glob('@/**/*.vue')
  * 获取配置信息
  */
 const loadStorageList = () => {
-  loading.value = true
-  getStorageList()
-    .then(({ data }) => {
-      Object.keys(data).forEach((key: string) => {
-        data[key].component &&
-          (data[key].component = defineAsyncComponent(
-            modules[data[key].component]
-          ))
-      })
-      storageTableData.data = data
-      loading.value = false
-    })
-    .catch(() => {
-      loading.value = false
+    loading.value = true
+    getStorageList().then(({ data }) => {
+        Object.keys(data).forEach((key: string) => {
+            data[key].component && (data[key].component = defineAsyncComponent(modules[data[key].component]))
+        })
+        storageTableData.data = data
+        loading.value = false
+    }).catch(() => {
+        loading.value = false
     })
 }
 
 loadStorageList()
 
 const setStorageTypeRefs = (el, index) => {
-  storageTypeRefs.value[index] = el
+    storageTypeRefs.value[index] = (el)
 }
 
 const editEvent = (data: any, index: number) => {
-  storageTypeRefs.value[index].setFormData(data)
-  storageTypeRefs.value[index].showDialog = true
+    storageTypeRefs.value[index].setFormData(data)
+    storageTypeRefs.value[index].showDialog = true
 }
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/setting/system.vue b/admin/src/app/views/setting/system.vue
index be1bcacb..26ae0492 100644
--- a/admin/src/app/views/setting/system.vue
+++ b/admin/src/app/views/setting/system.vue
@@ -1,122 +1,70 @@
 <template>
-  <div class="main-container">
-    <el-form
-      class="page-form"
-      :model="formData"
-      label-width="150px"
-      ref="formRef"
-      :rules="formRules"
-      v-loading="loading"
-    >
-      <el-card class="box-card !border-none" shadow="never">
-        <h3 class="panel-title !text-sm">{{ t('websiteInfo') }}</h3>
-
-        <el-form-item :label="t('siteName')" prop="site_name">
-          <el-input
-            v-model.trim="formData.site_name"
-            :placeholder="t('siteNamePlaceholder')"
-            class="input-width"
-            clearable
-            maxlength="20"
-            show-word-limit
-          />
-        </el-form-item>
-        <el-form-item :label="t('logo')">
-          <div>
-            <upload-image v-model="formData.logo" />
-            <p class="text-[12px] text-[#a9a9a9]">{{ t('logoPlaceholder') }}</p>
-          </div>
-        </el-form-item>
-        <el-form-item :label="t('icon')">
-          <div>
-            <upload-image v-model="formData.icon" />
-            <p class="text-[12px] text-[#a9a9a9]">{{ t('iconPlaceholder') }}</p>
-          </div>
-        </el-form-item>
-        <el-form-item :label="t('keywords')">
-          <el-input
-            v-model.trim="formData.keywords"
-            :placeholder="t('keywordsPlaceholder')"
-            class="input-width"
-            clearable
-            maxlength="20"
-            show-word-limit
-          />
-        </el-form-item>
-        <el-form-item :label="t('desc')">
-          <el-input
-            v-model.trim="formData.desc"
-            type="textarea"
-            :rows="4"
-            clearable
-            :placeholder="t('descPlaceholder')"
-            class="input-width"
-            maxlength="100"
-            show-word-limit
-          />
-        </el-form-item>
-      </el-card>
-
-      <el-card class="box-card mt-[15px] !border-none" shadow="never">
-        <h3 class="panel-title !text-sm">{{ t('frontEndInfo') }}</h3>
-        <el-form-item :label="t('frontEndName')">
-          <el-input
-            v-model.trim="formData.front_end_name"
-            :placeholder="t('frontEndNamePlaceholder')"
-            class="input-width"
-            clearable
-            maxlength="20"
-            show-word-limit
-          />
-        </el-form-item>
-        <el-form-item :label="t('phone')">
-          <el-input
-            v-model.trim="formData.phone"
-            :placeholder="t('phonePlaceholder')"
-            class="input-width"
-            clearable
-            maxlength="20"
-            show-word-limit
-          />
-        </el-form-item>
-        <el-form-item :label="t('logo')">
-          <upload-image v-model="formData.front_end_logo" />
-        </el-form-item>
-        <el-form-item :label="t('icon')">
-          <upload-image v-model="formData.front_end_icon" />
-        </el-form-item>
-      </el-card>
-
-      <el-card class="box-card mt-[15px] !border-none" shadow="never">
-        <h3 class="panel-title !text-sm">{{ t('serviceInformation') }}</h3>
-
-        <el-form-item :label="t('contactsTel')">
-          <el-input
-            v-model.trim="formData.tel"
-            :placeholder="t('contactsTelPlaceholder')"
-            class="input-width"
-            clearable
-            maxlength="20"
-            show-word-limit
-          />
-        </el-form-item>
-        <el-form-item :label="t('wechatCode')">
-          <upload-image v-model="formData.wechat_code" />
-        </el-form-item>
-        <el-form-item :label="t('customerServiceCode')">
-          <upload-image v-model="formData.enterprise_wechat" />
-        </el-form-item>
-      </el-card>
-    </el-form>
-
-    <div class="fixed-footer-wrap">
-      <div class="fixed-footer">
-        <el-button type="primary" :loading="loading" @click="save(formRef)">{{
-          t('save')
-        }}</el-button>
-      </div>
+    <div class="main-container">
+
+        <el-form class="page-form" :model="formData" label-width="150px" ref="formRef" :rules="formRules" v-loading="loading">
+            <el-card class="box-card !border-none" shadow="never">
+                <h3 class="panel-title !text-sm">{{ t('websiteInfo') }}</h3>
+
+                <el-form-item :label="t('siteName')" prop="site_name">
+                    <el-input v-model.trim="formData.site_name" :placeholder="t('siteNamePlaceholder')" class="input-width" clearable maxlength="20" show-word-limit />
+                </el-form-item>
+                <el-form-item :label="t('logo')">
+                    <div>
+                        <upload-image v-model="formData.logo" />
+                        <p class="text-[12px] text-[#a9a9a9]">{{ t('logoPlaceholder') }}</p>
+                    </div>
+                </el-form-item>
+                <el-form-item :label="t('icon')">
+                    <div>
+                        <upload-image v-model="formData.icon" />
+                        <p class="text-[12px] text-[#a9a9a9]">{{ t('iconPlaceholder') }}</p>
+                    </div>
+                </el-form-item>
+                <el-form-item :label="t('keywords')">
+                    <el-input v-model.trim="formData.keywords" :placeholder="t('keywordsPlaceholder')" class="input-width" clearable maxlength="20" show-word-limit />
+                </el-form-item>
+                <el-form-item :label="t('desc')">
+                    <el-input v-model.trim="formData.desc" type="textarea" :rows="4" clearable :placeholder="t('descPlaceholder')" class="input-width" maxlength="100" show-word-limit />
+                </el-form-item>
+            </el-card>
+
+            <el-card class="box-card mt-[15px] !border-none" shadow="never">
+                <h3 class="panel-title !text-sm">{{ t('frontEndInfo') }}</h3>
+                <el-form-item :label="t('frontEndName')">
+                    <el-input v-model.trim="formData.front_end_name" :placeholder="t('frontEndNamePlaceholder')" class="input-width" clearable maxlength="20" show-word-limit />
+                </el-form-item>
+                <el-form-item :label="t('phone')">
+                    <el-input v-model.trim="formData.phone" :placeholder="t('phonePlaceholder')" class="input-width" clearable maxlength="20" show-word-limit />
+                </el-form-item>
+                <el-form-item :label="t('logo')">
+                    <upload-image v-model="formData.front_end_logo" />
+                </el-form-item>
+                <el-form-item :label="t('icon')">
+                    <upload-image v-model="formData.front_end_icon" />
+                </el-form-item>
+            </el-card>
+
+            <el-card class="box-card mt-[15px] !border-none" shadow="never">
+                <h3 class="panel-title !text-sm">{{ t('serviceInformation') }}</h3>
+
+                <el-form-item :label="t('contactsTel')">
+                    <el-input v-model.trim="formData.tel" :placeholder="t('contactsTelPlaceholder')" class="input-width" clearable maxlength="20" show-word-limit />
+                </el-form-item>
+                <el-form-item :label="t('wechatCode')">
+                    <upload-image v-model="formData.wechat_code" />
+                </el-form-item>
+                <el-form-item :label="t('customerServiceCode')">
+                    <upload-image v-model="formData.enterprise_wechat" />
+                </el-form-item>
+            </el-card>
+        </el-form>
+
+        <div class="fixed-footer-wrap">
+            <div class="fixed-footer">
+                <el-button type="primary" :loading="loading" @click="save(formRef)">{{ t('save') }}</el-button>
+            </div>
+        </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
@@ -127,46 +75,46 @@ import { FormInstance, FormRules } from 'element-plus'
 import { getAppType } from '@/utils/common'
 import { useRoute } from 'vue-router'
 import useUserStore from '@/stores/modules/user'
-import useSystemStore from '@/stores/modules/system'
+import useSystemStore from '@/stores/modules/system';
 
 const route = useRoute()
 const pageName = route.meta.title
 const loading = ref(true)
 const appType = ref(getAppType())
 const formData = reactive<Record<string, string>>({
-  site_name: '',
-  logo: '',
-  desc: '',
-  latitude: '',
-  keywords: '',
-  longitude: '',
-  province_id: '',
-  city_id: '',
-  district_id: '',
-  address: '',
-  full_address: '',
-  business_hours: '',
-  phone: '',
-  front_end_name: '',
-  front_end_logo: '',
-  front_end_icon: '',
-  icon: '',
-  wechat_code: '',
-  enterprise_wechat: '',
-  tel: '',
+    site_name: '',
+    logo: '',
+    desc: '',
+    latitude: '',
+    keywords: '',
+    longitude: '',
+    province_id: '',
+    city_id: '',
+    district_id: '',
+    address: '',
+    full_address: '',
+    business_hours: '',
+    phone: '',
+    front_end_name: '',
+    front_end_logo: '',
+    front_end_icon: '',
+    icon: '',
+    wechat_code: '',
+    enterprise_wechat: '',
+    tel: ''
 })
 
 const setFormData = async () => {
-  const data = await (await getWebsite()).data
-  Object.keys(formData).forEach((key: string) => {
-    if (data[key] != undefined) formData[key] = data[key]
-  })
-
-  const service_data = await (await getService()).data
-  formData['wechat_code'] = service_data.wechat_code
-  formData['enterprise_wechat'] = service_data.enterprise_wechat
-  formData['tel'] = service_data.tel
-  loading.value = false
+    const data = await (await getWebsite()).data
+    Object.keys(formData).forEach((key: string) => {
+        if (data[key] != undefined) formData[key] = data[key]
+    })
+
+    const service_data = await (await getService()).data
+    formData['wechat_code'] = service_data.wechat_code
+    formData['enterprise_wechat'] = service_data.enterprise_wechat
+    formData['tel'] = service_data.tel
+    loading.value = false
 }
 setFormData()
 
@@ -174,36 +122,32 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = reactive<FormRules>({
-  site_name: [
-    { required: true, message: t('siteNamePlaceholder'), trigger: 'blur' },
-  ],
-  front_end_name: [
-    { required: true, message: t('frontEndNamePlaceholder'), trigger: 'blur' },
-  ],
+    site_name: [
+        { required: true, message: t('siteNamePlaceholder'), trigger: 'blur' }
+    ],
+    front_end_name: [
+        { required: true, message: t('frontEndNamePlaceholder'), trigger: 'blur' }
+    ]
 })
 
 /**
  * 保存
  */
 const save = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-
-      setWebsite(formData)
-        .then(() => {
-          loading.value = false
-          appType.value == 'admin'
-            ? useSystemStore().getWebsiteInfo()
-            : useUserStore().getSiteInfo()
-        })
-        .catch(() => {
-          loading.value = false
-        })
-    }
-  })
+    if (loading.value || !formEl) return
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            setWebsite(formData).then(() => {
+                loading.value = false
+                appType.value == 'admin' ? useSystemStore().getWebsiteInfo() : useUserStore().getSiteInfo()
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
 }
 </script>
 
diff --git a/admin/src/app/views/setting/transfer.vue b/admin/src/app/views/setting/transfer.vue
index 52c6d280..a596852d 100644
--- a/admin/src/app/views/setting/transfer.vue
+++ b/admin/src/app/views/setting/transfer.vue
@@ -1,83 +1,48 @@
 <template>
-  <!--打款设置-->
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
-
-      <div class="mt-[20px]">
-        <el-alert :description="t('transferTips')" type="warning" show-icon>
-          <template #title>
-            <span class="!text-[14px]">{{ t('operationTip') }}</span>
-          </template>
-        </el-alert>
-      </div>
-    </el-card>
-
-    <el-form
-      class="page-form"
-      :model="formData"
-      label-width="200px"
-      ref="formRef"
-      :rules="formRules"
-      v-loading="loading"
-    >
-      <el-card class="box-card mt-[15px] !border-none" shadow="never">
-        <h3 class="panel-title !text-sm">{{ t('wechatpay') }}</h3>
-
-        <el-form-item :label="t('mchId')" prop="wechatpay_config.mch_id">
-          <el-input
-            v-model.trim="formData.wechatpay_config.mch_id"
-            :placeholder="t('mchIdPlaceholder')"
-            class="input-width"
-            maxlength="32"
-            show-word-limit
-            clearable
-          />
-          <div class="form-tip">{{ t('mchIdTips') }}</div>
-        </el-form-item>
-        <el-form-item
-          :label="t('mchSecretKey')"
-          prop="wechatpay_config.mch_secret_key"
-        >
-          <el-input
-            v-model.trim="formData.wechatpay_config.mch_secret_key"
-            :placeholder="t('mchSecretKeyPlaceholder')"
-            class="input-width"
-            maxlength="32"
-            show-word-limit
-            clearable
-          />
-          <div class="form-tip">{{ t('mchSecretKeyTips') }}</div>
-        </el-form-item>
-        <el-form-item
-          :label="t('mchSecretCert')"
-          prop="wechatpay_config.mch_secret_cert"
-        >
-          <div class="input-width">
-            <upload-file
-              v-model="formData.wechatpay_config.mch_secret_cert"
-              api="sys/document/wechat"
-            />
-          </div>
-          <div class="form-tip">{{ t('mchSecretCertTips') }}</div>
-        </el-form-item>
-        <el-form-item
-          :label="t('mchPublicCertPath')"
-          prop="wechatpay_config.mch_public_cert_path"
-        >
-          <div class="input-width">
-            <upload-file
-              v-model="formData.wechatpay_config.mch_public_cert_path"
-              api="sys/document/wechat"
-            />
-          </div>
-          <div class="form-tip">{{ t('mchPublicCertPathTips') }}</div>
-        </el-form-item>
-      </el-card>
-
-      <!-- <el-card class="box-card mt-[15px] !border-none" shadow="never">
+    <!--打款设置-->
+    <div class="main-container">
+
+        <el-card class="box-card !border-none" shadow="never">
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+            </div>
+
+            <div class="mt-[20px]">
+                <el-alert :description="t('transferTips')" type="warning" show-icon>
+                    <template #title>
+                        <span class="!text-[14px]">{{ t('operationTip') }}</span>
+                    </template>
+                </el-alert>
+            </div>
+        </el-card>
+
+        <el-form class="page-form" :model="formData" label-width="200px" ref="formRef" :rules="formRules" v-loading="loading">
+            <el-card class="box-card mt-[15px] !border-none" shadow="never">
+                <h3 class="panel-title !text-sm">{{t('wechatpay')}}</h3>
+
+                <el-form-item :label="t('mchId')" prop="wechatpay_config.mch_id">
+                    <el-input v-model.trim="formData.wechatpay_config.mch_id" :placeholder="t('mchIdPlaceholder')" class="input-width" maxlength="32" show-word-limit clearable />
+                    <div class="form-tip">{{ t('mchIdTips') }}</div>
+                </el-form-item>
+                <el-form-item :label="t('mchSecretKey')" prop="wechatpay_config.mch_secret_key">
+                    <el-input v-model.trim="formData.wechatpay_config.mch_secret_key" :placeholder="t('mchSecretKeyPlaceholder')" class="input-width" maxlength="32" show-word-limit clearable />
+                    <div class="form-tip">{{ t('mchSecretKeyTips') }}</div>
+                </el-form-item>
+                <el-form-item :label="t('mchSecretCert')" prop="wechatpay_config.mch_secret_cert">
+                    <div class="input-width">
+                        <upload-file v-model="formData.wechatpay_config.mch_secret_cert" api="sys/document/wechat" />
+                    </div>
+                    <div class="form-tip">{{ t('mchSecretCertTips') }}</div>
+                </el-form-item>
+                <el-form-item :label="t('mchPublicCertPath')" prop="wechatpay_config.mch_public_cert_path">
+                    <div class="input-width">
+                        <upload-file v-model="formData.wechatpay_config.mch_public_cert_path" api="sys/document/wechat" />
+                    </div>
+                    <div class="form-tip">{{ t('mchPublicCertPathTips') }}</div>
+                </el-form-item>
+            </el-card>
+
+            <!-- <el-card class="box-card mt-[15px] !border-none" shadow="never">
                 <h3 class="panel-title !text-sm">{{t('alipay')}}</h3>
 
                 <el-form-item :label="t('appId')" prop="alipay_config.app_id">
@@ -103,16 +68,14 @@
                     </div>
                 </el-form-item>
             </el-card> -->
-    </el-form>
-
-    <div class="fixed-footer-wrap">
-      <div class="fixed-footer">
-        <el-button type="primary" :loading="loading" @click="save(formRef)">{{
-          t('save')
-        }}</el-button>
-      </div>
+        </el-form>
+
+        <div class="fixed-footer-wrap">
+            <div class="fixed-footer">
+                <el-button type="primary" :loading="loading" @click="save(formRef)">{{ t('save') }}</el-button>
+            </div>
+        </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
@@ -131,66 +94,66 @@ const loading = ref(false)
  * 表单数据
  */
 const initialFormData = {
-  wechatpay_config: {
-    mch_id: '',
-    mch_secret_key: '',
-    mch_secret_cert: '',
-    mch_public_cert_path: '',
-  },
-  alipay_config: {
-    app_secret_cert: '',
-    app_public_cert_path: '',
-    alipay_public_cert_path: '',
-    alipay_root_cert_path: '',
-    app_id: '',
-  },
+    wechatpay_config: {
+        mch_id: '',
+        mch_secret_key: '',
+        mch_secret_cert: '',
+        mch_public_cert_path: ''
+    },
+    alipay_config: {
+        app_secret_cert: '',
+        app_public_cert_path: '',
+        alipay_public_cert_path: '',
+        alipay_root_cert_path: '',
+        app_id: ''
+    }
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
 // 获取提款信息
 const transferInfoF = async () => {
-  loading.value = true
-  const val = await (await getTransferInfo('transfer')).data
-  if (val && val.length) {
-    formData.wechatpay_config = val[0].config
-    formData.alipay_config = val[1].config
-  }
-  loading.value = false
+    loading.value = true
+    const val = await (await getTransferInfo('transfer')).data
+    if (val && val.length) {
+        formData.wechatpay_config = val[0].config
+        formData.alipay_config = val[1].config
+    }
+    loading.value = false
 }
 transferInfoF()
 
 const formRef = ref<FormInstance>()
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    // 'wechatpay_config.mch_id': [
-    //     { required: true, message: t('mchIdPlaceholder'), trigger: 'blur' }
-    // ],
-    // 'wechatpay_config.mch_secret_key': [
-    //     { required: true, message: t('mchSecretKeyPlaceholder'), trigger: 'blur' }
-    // ],
-    // 'wechatpay_config.mch_secret_cert': [
-    //     { required: true, message: t('mchSecretCertPlaceholder'), trigger: 'blur' }
-    // ],
-    // 'wechatpay_config.mch_public_cert_path': [
-    //     { required: true, message: t('mchPublicCertPathPlaceholder'), trigger: 'blur' }
-    // ],
-    // 'alipay_config.app_id': [
-    //     { required: true, message: t('appIdPlaceholder'), trigger: 'blur' }
-    // ],
-    // 'alipay_config.app_secret_cert': [
-    //     { required: true, message: t('appSecretCertPlaceholder'), trigger: 'blur' }
-    // ],
-    // 'alipay_config.app_public_cert_path': [
-    //     { required: true, message: t('appPublicCertPathPlaceholder'), trigger: 'blur' }
-    // ],
-    // 'alipay_config.alipay_public_cert_path': [
-    //     { required: true, message: t('alipayPublicCertPathPlaceholder'), trigger: 'blur' }
-    // ],
-    // 'alipay_config.alipay_root_cert_path': [
-    //     { required: true, message: t('alipayRootCertPathPlaceholder'), trigger: 'blur' }
-    // ]
-  }
+    return {
+        // 'wechatpay_config.mch_id': [
+        //     { required: true, message: t('mchIdPlaceholder'), trigger: 'blur' }
+        // ],
+        // 'wechatpay_config.mch_secret_key': [
+        //     { required: true, message: t('mchSecretKeyPlaceholder'), trigger: 'blur' }
+        // ],
+        // 'wechatpay_config.mch_secret_cert': [
+        //     { required: true, message: t('mchSecretCertPlaceholder'), trigger: 'blur' }
+        // ],
+        // 'wechatpay_config.mch_public_cert_path': [
+        //     { required: true, message: t('mchPublicCertPathPlaceholder'), trigger: 'blur' }
+        // ],
+        // 'alipay_config.app_id': [
+        //     { required: true, message: t('appIdPlaceholder'), trigger: 'blur' }
+        // ],
+        // 'alipay_config.app_secret_cert': [
+        //     { required: true, message: t('appSecretCertPlaceholder'), trigger: 'blur' }
+        // ],
+        // 'alipay_config.app_public_cert_path': [
+        //     { required: true, message: t('appPublicCertPathPlaceholder'), trigger: 'blur' }
+        // ],
+        // 'alipay_config.alipay_public_cert_path': [
+        //     { required: true, message: t('alipayPublicCertPathPlaceholder'), trigger: 'blur' }
+        // ],
+        // 'alipay_config.alipay_root_cert_path': [
+        //     { required: true, message: t('alipayRootCertPathPlaceholder'), trigger: 'blur' }
+        // ]
+    }
 })
 
 /**
@@ -198,22 +161,20 @@ const formRules = computed(() => {
  * @param formEl
  */
 const save = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-
-      const data = formData
-      setTransferInfo(data)
-        .then((res) => {
-          loading.value = false
-        })
-        .catch(() => {
-          loading.value = false
-        })
-    }
-  })
+    if (loading.value || !formEl) return
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            const data = formData
+            setTransferInfo(data).then(res => {
+                loading.value = false
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
 }
 </script>
 
diff --git a/admin/src/app/views/setting/weapp.vue b/admin/src/app/views/setting/weapp.vue
index b779d5d2..e944373a 100644
--- a/admin/src/app/views/setting/weapp.vue
+++ b/admin/src/app/views/setting/weapp.vue
@@ -1,123 +1,64 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-        <el-button type="primary" @click="showEvent">{{
-          t('addVersion')
-        }}</el-button>
-      </div>
-
-      <div class="mt-[20px]">
-        <el-table
-          :data="weappTableData.data"
-          size="large"
-          v-loading="weappTableData.loading"
-        >
-          <template #empty>
-            <span>{{ !weappTableData.loading ? t('emptyData') : '' }}</span>
-          </template>
-
-          <el-table-column
-            prop="version"
-            :label="t('version')"
-            min-width="150"
-          />
-          <el-table-column
-            prop="create_time"
-            :label="t('createTime')"
-            min-width="150"
-          />
-          <!-- <el-table-column prop="status_name" :label="t('status')" min-width="100" /> -->
-          <el-table-column
-            :label="t('operation')"
-            align="right"
-            fixed="right"
-            width="130"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="editEvent(row)">{{
-                t('edit')
-              }}</el-button>
-              <el-button type="primary" link @click="deleteEvent(row.id)">{{
-                t('delete')
-              }}</el-button>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+                <el-button type="primary" @click="showEvent">{{ t('addVersion') }}</el-button>
+            </div>
+
+            <div class="mt-[20px]">
+                <el-table :data="weappTableData.data" size="large" v-loading="weappTableData.loading">
+                    <template #empty>
+                        <span>{{ !weappTableData.loading ? t('emptyData') : '' }}</span>
+                    </template>
+
+                    <el-table-column prop="version" :label="t('version')" min-width="150" />
+                    <el-table-column prop="create_time" :label="t('createTime')" min-width="150" />
+                    <!-- <el-table-column prop="status_name" :label="t('status')" min-width="100" /> -->
+                    <el-table-column :label="t('operation')" align="right" fixed="right" width="130">
+                        <template #default="{ row }">
+                            <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+                            <el-button type="primary" link @click="deleteEvent(row.id)">{{ t('delete') }}</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="weappTableData.page" v-model:page-size="weappTableData.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="weappTableData.total"
+                        @size-change="loadWeappTemplateList()" @current-change="loadWeappTemplateList" />
+                </div>
+            </div>
+        </el-card>
+
+        <cron-info ref="cronDialog" @complete="weappTableData" />
+
+        <el-dialog v-model="showDialog" :title="t('editVersion')" width="550px" :destroy-on-close="true">
+            <el-form :model="formData" label-width="110px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('version')" prop="version">
+                    <el-input v-model.trim="formData.version" :placeholder="t('versionPlaceholder')" class="input-width" />
+                </el-form-item>
+                <el-form-item :label="t('file')" prop="path">
+                    <upload-file v-model="formData.path" class="input-width" api="applet/upload" />
+                </el-form-item>
+                <el-form-item :label="t('desc')">
+                    <el-input type="textarea" v-model.trim="formData.desc" class="input-width" clearable></el-input>
+                </el-form-item>
+            </el-form>
+
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button type="primary" @click="addEvent(formRef)">{{ t('confirm') }}</el-button>
+                </span>
             </template>
-          </el-table-column>
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="weappTableData.page"
-            v-model:page-size="weappTableData.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="weappTableData.total"
-            @size-change="loadWeappTemplateList()"
-            @current-change="loadWeappTemplateList"
-          />
-        </div>
-      </div>
-    </el-card>
-
-    <cron-info ref="cronDialog" @complete="weappTableData" />
-
-    <el-dialog
-      v-model="showDialog"
-      :title="t('editVersion')"
-      width="550px"
-      :destroy-on-close="true"
-    >
-      <el-form
-        :model="formData"
-        label-width="110px"
-        ref="formRef"
-        :rules="formRules"
-        class="page-form"
-        v-loading="loading"
-      >
-        <el-form-item :label="t('version')" prop="version">
-          <el-input
-            v-model.trim="formData.version"
-            :placeholder="t('versionPlaceholder')"
-            class="input-width"
-          />
-        </el-form-item>
-        <el-form-item :label="t('file')" prop="path">
-          <upload-file
-            v-model="formData.path"
-            class="input-width"
-            api="applet/upload"
-          />
-        </el-form-item>
-        <el-form-item :label="t('desc')">
-          <el-input
-            type="textarea"
-            v-model.trim="formData.desc"
-            class="input-width"
-            clearable
-          ></el-input>
-        </el-form-item>
-      </el-form>
-
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button type="primary" @click="addEvent(formRef)">{{
-            t('confirm')
-          }}</el-button>
-        </span>
-      </template>
-    </el-dialog>
-  </div>
+        </el-dialog>
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref, computed } from 'vue'
 import { t } from '@/lang'
-import {
-  getVersionList,
-  addVersion,
-  editVersion,
-  deleteVersion,
-} from '@/app/api/weapp'
+import { getVersionList, addVersion, editVersion, deleteVersion } from '@/app/api/weapp'
 import { ElMessageBox, FormInstance } from 'element-plus'
 import { useRoute } from 'vue-router'
 import CronInfo from '@/app/views/setting/components/cron-info.vue'
@@ -126,117 +67,116 @@ const route = useRoute()
 const pageName = route.meta.title
 
 const weappTableData = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    title: '',
-    type: '',
-    last_time: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        title: '',
+        type: '',
+        last_time: ''
+    }
 })
 
 /**
  * 获取版本列表
  */
 const loadWeappTemplateList = (page: number = 1) => {
-  weappTableData.loading = true
-  weappTableData.page = page
-
-  getVersionList({
-    page: weappTableData.page,
-    limit: weappTableData.limit,
-    ...weappTableData.searchParam,
-  })
-    .then((res) => {
-      weappTableData.loading = false
-      weappTableData.data = res.data.data
-      weappTableData.total = res.data.total
-    })
-    .catch(() => {
-      weappTableData.loading = false
+    weappTableData.loading = true
+    weappTableData.page = page
+
+    getVersionList({
+        page: weappTableData.page,
+        limit: weappTableData.limit,
+        ...weappTableData.searchParam
+    }).then(res => {
+        weappTableData.loading = false
+        weappTableData.data = res.data.data
+        weappTableData.total = res.data.total
+    }).catch(() => {
+        weappTableData.loading = false
     })
 }
 loadWeappTemplateList()
 
 const showDialog = ref(false)
 const initialFormData = {
-  id: 0,
-  desc: '',
-  path: '',
-  version: '',
-  type: 'weapp',
+    id: 0,
+    desc: '',
+    path: '',
+    version: '',
+    type: 'weapp'
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 const formRef = ref<FormInstance>()
 
 const showEvent = () => {
-  formData.id = 0
-  formData.desc = ''
-  formData.path = ''
-  formData.version = ''
-  showDialog.value = true
+    formData.id = 0
+    formData.desc = ''
+    formData.path = ''
+    formData.version = ''
+    showDialog.value = true
 }
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    version: [
-      { required: true, message: t('versionPlaceholder'), trigger: 'blur' },
-    ],
-    path: [{ required: true, validator: validatePass, trigger: 'blur' }],
-  }
+    return {
+        version: [
+            { required: true, message: t('versionPlaceholder'), trigger: 'blur' }
+        ],
+        path: [
+            { required: true, validator: validatePass, trigger: 'blur' }
+        ]
+    }
 })
 
 const validatePass = (rule: any, value: any, callback: any) => {
-  if (formData.path == '') {
-    return callback(new Error(t('filePlaceholder')))
-  }
-  return callback()
+    if (formData.path == '') {
+        return callback(new Error(t('filePlaceholder')))
+    }
+    return callback()
 }
 const saveType = ref(false)
 const addEvent = async (formEl: FormInstance | undefined) => {
-  if (saveType.value || !formEl) return
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      saveType.value = true
-      const data = formData
-      const save = formData.id > 0 ? editVersion : addVersion
-      save(data)
-        .then((res) => {
-          saveType.value = false
-          showDialog.value = false
-          loadWeappTemplateList()
-        })
-        .catch(() => {
-          saveType.value = false
-        })
-    }
-  })
+    if (saveType.value || !formEl) return
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            saveType.value = true
+            const data = formData
+            const save = formData.id > 0 ? editVersion : addVersion
+            save(data).then(res => {
+                saveType.value = false
+                showDialog.value = false
+                loadWeappTemplateList()
+            }).catch(() => {
+                saveType.value = false
+            })
+        }
+    })
 }
 
-const editEvent = (item: any) => {
-  formData.id = item.id
-  formData.desc = item.desc
-  formData.path = item.path
-  formData.version = item.version
-  showDialog.value = true
+const editEvent = (item:any) => {
+    formData.id = item.id
+    formData.desc = item.desc
+    formData.path = item.path
+    formData.version = item.version
+    showDialog.value = true
 }
 
 const deleteEvent = (id: string) => {
-  ElMessageBox.confirm(t('weappVersionDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    deleteVersion(id)
-      .then(() => {
-        loadWeappTemplateList()
-      })
-      .catch(() => {})
-  })
+    ElMessageBox.confirm(t('weappVersionDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        deleteVersion(id).then(() => {
+            loadWeappTemplateList()
+        }).catch(() => {
+        })
+    })
 }
 
 const cronDialog: Record<string, any> | null = ref(null)
@@ -245,9 +185,10 @@ const cronDialog: Record<string, any> | null = ref(null)
  * @param data
  */
 const infoEvent = (data: any) => {
-  cronDialog.value.setFormData(data)
-  cronDialog.value.showDialog = true
+    cronDialog.value.setFormData(data)
+    cronDialog.value.showDialog = true
 }
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/tools/addon/edit.vue b/admin/src/app/views/tools/addon/edit.vue
index 4d210880..65c558dc 100644
--- a/admin/src/app/views/tools/addon/edit.vue
+++ b/admin/src/app/views/tools/addon/edit.vue
@@ -1,191 +1,94 @@
 <template>
-  <div class="main-container" v-loading="loading">
-    <el-card class="card !border-none" shadow="never">
-      <el-page-header :content="pageName" :icon="ArrowLeft" @back="back()" />
-    </el-card>
+    <div class="main-container" v-loading="loading">
 
-    <el-card class="box-card mt-[15px] !border-none" shadow="never">
-      <el-form
-        :model="form"
-        label-width="90px"
-        ref="formRef"
-        :rules="rules"
-        class="page-form"
-      >
-        <el-form-item :label="t('title')" prop="title">
-          <el-input
-            v-model.trim="form.title"
-            clearable
-            :placeholder="t('titlePlaceholder')"
-            class="input-width"
-          />
-        </el-form-item>
-        <el-form-item :label="t('icon')" prop="icon">
-          <div>
-            <upload-image v-model="form.icon" />
-            <p class="text-[12px] text-[#a9a9a9] leading-normal mt-[5px]">
-              {{ t('iconPlaceholder1') }}
-            </p>
-          </div>
-        </el-form-item>
-        <el-form-item :label="t('key')" prop="key">
-          <div>
-            <el-input
-              v-model.trim="form.key"
-              clearable
-              :disabled="route.query.key"
-              :placeholder="t('keyPlaceholder')"
-              class="input-width mr-[15px]"
-            />
-            <el-button
-              v-if="!route.query.key"
-              type="primary"
-              :disabled="form.key == ''"
-              @click="getAddonDevelopCheckFn(form.key)"
-              >官方市场标识检测</el-button
-            >
-            <p class="text-[12px] text-[#a9a9a9] leading-normal mt-[5px]">
-              {{ t('keyPlaceholder1') }}
-            </p>
-            <p class="text-[12px] text-[#a9a9a9] leading-normal">
-              {{ t('keyPlaceholder2') }}
-            </p>
-            <p
-              v-if="keyBlackList.length"
-              class="text-[12px] text-[#a9a9a9] leading-normal"
-            >
-              插件标识不能定义成黑名单中的值，插件标识黑名单：{{
-                keyBlackList.join('，')
-              }}
-            </p>
-          </div>
-        </el-form-item>
-        <el-form-item :label="t('desc')" prop="desc">
-          <el-input
-            type="textarea"
-            v-model.trim="form.desc"
-            clearable
-            :placeholder="t('descPlaceholder')"
-            class="input-width"
-          />
-        </el-form-item>
-        <el-form-item :label="t('author')" prop="author">
-          <el-input
-            v-model.trim="form.author"
-            clearable
-            :placeholder="t('authorPlaceholder')"
-            class="input-width"
-          />
-        </el-form-item>
-        <el-form-item :label="t('version')" prop="version">
-          <div>
-            <el-input
-              v-model.trim="form.version"
-              clearable
-              :placeholder="t('versionPlaceholder')"
-              class="input-width"
-              onkeyup="this.value = this.value.replace(/[^\d\.]/g,'');"
-            />
-            <p class="text-[12px] text-[#a9a9a9] leading-normal mt-[5px]">
-              {{ t('versionPlaceholder1') }}
-            </p>
-          </div>
-        </el-form-item>
-        <el-form-item :label="t('cover')" prop="cover">
-          <div>
-            <upload-image v-model="form.cover" />
-            <p class="text-[12px] text-[#a9a9a9] leading-normal mt-[5px]">
-              {{ t('coverPlaceholder1') }}
-            </p>
-          </div>
-        </el-form-item>
-        <el-form-item :label="t('type')" prop="type">
-          <div>
-            <el-select
-              v-model="form.type"
-              :placeholder="t('typePlaceholder')"
-              class="input-width"
-              clearable
-              @change="typeChange"
-            >
-              <el-option
-                v-for="(item, key) in options"
-                :key="key"
-                :label="item"
-                :value="key"
-              />
-            </el-select>
-            <p class="text-[12px] text-[#a9a9a9] leading-normal mt-[5px]">
-              {{ t('typePlaceholder1') }}
-            </p>
-            <p class="text-[12px] text-[#a9a9a9] leading-normal">
-              {{ t('typePlaceholder2') }}
-            </p>
-          </div>
-        </el-form-item>
-        <template v-if="form.type === 'addon'">
-          <el-form-item :label="t('supportType')">
-            <div>
-              <el-select
-                v-model="form.support_type"
-                class="input-width"
-                @change="typeChange"
-              >
-                <el-option label="通用插件" :value="1" />
-                <el-option label="支持应用" :value="2" />
-              </el-select>
-            </div>
-          </el-form-item>
-          <el-form-item
-            :label="t('supportApp')"
-            prop="support_app"
-            v-if="form.support_type != 1"
-          >
-            <el-select
-              v-model="form.support_app"
-              :placeholder="t('supportAppPlaceholder')"
-              class="input-width"
-            >
-              <el-option
-                v-for="(item, index) in AppLst"
-                :label="item.title"
-                :value="item.key"
-                :key="index"
-              />
-            </el-select>
-          </el-form-item>
-        </template>
-        <!-- <el-form-item v-if="form.type != 'app'" :label="t('supportApp')" prop="support_app">
+        <el-card class="card !border-none" shadow="never">
+            <el-page-header :content="pageName" :icon="ArrowLeft" @back="back()" />
+        </el-card>
+
+        <el-card class="box-card mt-[15px] !border-none" shadow="never">
+            <el-form :model="form" label-width="90px" ref="formRef" :rules="rules" class="page-form">
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model.trim="form.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                </el-form-item>
+                <el-form-item :label="t('icon')" prop="icon">
+                    <div>
+                        <upload-image v-model="form.icon" />
+                        <p class="text-[12px] text-[#a9a9a9] leading-normal mt-[5px]">{{ t('iconPlaceholder1') }}</p>
+                    </div>
+                </el-form-item>
+                <el-form-item :label="t('key')" prop="key">
+                    <div>
+                        <el-input v-model.trim="form.key" clearable :disabled="route.query.key" :placeholder="t('keyPlaceholder')" class="input-width mr-[15px]" />
+                        <el-button v-if="!route.query.key" type="primary" :disabled="form.key == ''" @click="getAddonDevelopCheckFn(form.key)">官方市场标识检测</el-button>
+                        <p class="text-[12px] text-[#a9a9a9] leading-normal mt-[5px]">{{ t('keyPlaceholder1') }}</p>
+                        <p class="text-[12px] text-[#a9a9a9] leading-normal">{{ t('keyPlaceholder2') }}</p>
+                        <p v-if="keyBlackList.length" class="text-[12px] text-[#a9a9a9] leading-normal">
+                            插件标识不能定义成黑名单中的值，插件标识黑名单：{{ keyBlackList.join('，') }}
+                        </p>
+                    </div>
+                </el-form-item>
+                <el-form-item :label="t('desc')" prop="desc">
+                    <el-input type="textarea" v-model.trim="form.desc" clearable :placeholder="t('descPlaceholder')" class="input-width" />
+                </el-form-item>
+                <el-form-item :label="t('author')" prop="author">
+                    <el-input v-model.trim="form.author" clearable :placeholder="t('authorPlaceholder')" class="input-width" />
+                </el-form-item>
+                <el-form-item :label="t('version')" prop="version">
+                    <div>
+                        <el-input v-model.trim="form.version" clearable :placeholder="t('versionPlaceholder')" class="input-width" onkeyup="this.value = this.value.replace(/[^\d\.]/g,'');" />
+                        <p class="text-[12px] text-[#a9a9a9] leading-normal mt-[5px]">{{ t('versionPlaceholder1') }}</p>
+                    </div>
+                </el-form-item>
+                <el-form-item :label="t('cover')" prop="cover">
+                    <div>
+                        <upload-image v-model="form.cover" />
+                        <p class="text-[12px] text-[#a9a9a9] leading-normal mt-[5px]">{{ t('coverPlaceholder1') }}</p>
+                    </div>
+                </el-form-item>
+                <el-form-item :label="t('type')" prop="type">
+                    <div>
+                        <el-select v-model="form.type" :placeholder="t('typePlaceholder')" class="input-width" clearable @change="typeChange">
+                            <el-option v-for="(item, key) in options" :key="key" :label="item" :value="key" />
+                        </el-select>
+                        <p class="text-[12px] text-[#a9a9a9] leading-normal mt-[5px]">{{ t('typePlaceholder1') }}</p>
+                        <p class="text-[12px] text-[#a9a9a9] leading-normal">{{ t('typePlaceholder2') }}</p>
+                    </div>
+                </el-form-item>
+                <template v-if="form.type === 'addon'">
+                    <el-form-item :label="t('supportType')">
+                        <div>
+                            <el-select v-model="form.support_type" class="input-width" @change="typeChange">
+                                <el-option label="通用插件" :value="1" />
+                                <el-option label="支持应用" :value="2" />
+                            </el-select>
+                        </div>
+                    </el-form-item>
+                    <el-form-item :label="t('supportApp')" prop="support_app" v-if="form.support_type!=1">
+                        <el-select v-model="form.support_app" :placeholder="t('supportAppPlaceholder')" class="input-width">
+                            <el-option v-for="(item, index) in AppLst" :label="item.title" :value="item.key" :key="index" />
+                        </el-select>
+                    </el-form-item>
+                </template>
+                <!-- <el-form-item v-if="form.type != 'app'" :label="t('supportApp')" prop="support_app">
                     <el-input v-model.trim="form.support_app" clearable :placeholder="t('supportAppPlaceholder')"
                         class="input-width" />
                 </el-form-item> -->
-      </el-form>
-    </el-card>
+            </el-form>
+        </el-card>
 
-    <div class="fixed-footer-wrap" v-if="!loading">
-      <div class="fixed-footer">
-        <el-button type="primary" @click="onSave(formRef)">{{
-          t('GeneratePlugins')
-        }}</el-button>
-        <el-button @click="router.push({ path: '/tools/addon' })">{{
-          t('cancel')
-        }}</el-button>
-      </div>
+        <div class="fixed-footer-wrap" v-if="!loading">
+            <div class="fixed-footer">
+                <el-button type="primary" @click="onSave(formRef)">{{ t('GeneratePlugins') }}</el-button>
+                <el-button @click="router.push({ path: '/tools/addon' })">{{ t('cancel') }}</el-button>
+            </div>
+        </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
 import { onMounted, ref } from 'vue'
 import { t } from '@/lang'
-import {
-  getAddontype,
-  addAddonDevelop,
-  editAddonDevelop,
-  getAddonDevelopInfo,
-  getAddonDevelopCheck,
-  getAddonKeyBlackList,
-} from '@/app/api/tools'
+import { getAddontype, addAddonDevelop, editAddonDevelop, getAddonDevelopInfo, getAddonDevelopCheck, getAddonKeyBlackList } from '@/app/api/tools'
 import { getAddonList } from '@/app/api/sys'
 import { ElMessageBox, ElMessage, FormInstance } from 'element-plus'
 import { ArrowLeft } from '@element-plus/icons-vue'
@@ -196,143 +99,145 @@ const router = useRouter()
 const pageName = route.meta.title
 
 const back = () => {
-  router.push('/tools/addon')
+    router.push('/tools/addon')
 }
 const form = ref({
-  title: '',
-  icon: '',
-  key: '',
-  desc: '',
-  author: '',
-  version: '',
-  cover: '',
-  type: '',
-  support_app: '',
-  support_type: 1,
+    title: '',
+    icon: '',
+    key: '',
+    desc: '',
+    author: '',
+    version: '',
+    cover: '',
+    type: '',
+    support_app: '',
+    support_type: 1
 })
 const options = ref([])
 const loading = ref(false)
 const formRef = ref()
 const keyBlackList = ref([])
-const validKey = (rule: any, value: any, callback: any) => {
-  if (value !== '') {
-    const reg = /^[a-zA-Z][a-zA-Z0-9_]*$/
-    if (!reg.test(value)) {
-      return callback(new Error(t('keyPlaceholderErr')))
+const validKey = (rule:any, value:any, callback:any) => {
+    if (value !== '') {
+        const reg = /^[a-zA-Z][a-zA-Z0-9_]*$/
+        if (!reg.test(value)) {
+            return callback(new Error(t('keyPlaceholderErr')))
+        } else {
+            return callback() // *验证成功的地方必须callback()
+        }
     } else {
-      return callback() // *验证成功的地方必须callback()
+        return callback(new Error(t('keyPlaceholder')))
     }
-  } else {
-    return callback(new Error(t('keyPlaceholder')))
-  }
 }
 
-const validVersion = (rule: any, value: any, callback: any) => {
-  if (value !== '') {
-    const reg = /^([0-9]\d|[0-9])(\.([0-9]){1}){2}$/
-    if (!reg.test(value)) {
-      return callback(new Error(t('versionPlaceholderErr')))
+const validVersion = (rule:any, value:any, callback:any) => {
+    if (value !== '') {
+        const reg = /^([0-9]\d|[0-9])(\.([0-9]){1}){2}$/
+        if (!reg.test(value)) {
+            return callback(new Error(t('versionPlaceholderErr')))
+        } else {
+            return callback() // 验证成功的地方必须callback()
+        }
     } else {
-      return callback() // 验证成功的地方必须callback()
+        return callback(new Error(t('versionPlaceholder')))
     }
-  } else {
-    return callback(new Error(t('versionPlaceholder')))
-  }
 }
 
 const rules = ref({
-  title: [{ required: true, message: t('titlePlaceholder'), trigger: 'blur' }],
-  icon: [{ required: true, message: t('iconPlaceholder'), trigger: 'change' }],
-  key: [{ required: true, validator: validKey, trigger: 'blur' }],
-  author: [
-    { required: true, message: t('authorPlaceholder'), trigger: 'blur' },
-  ],
-  version: [{ required: true, validator: validVersion, trigger: 'blur' }],
-  cover: [
-    { required: true, message: t('coverPlaceholder'), trigger: 'change' },
-  ],
-  type: [{ required: true, message: t('typePlaceholder'), trigger: 'change' }],
-  support_app: [
-    { required: true, message: t('typePlaceholder'), trigger: 'change' },
-  ],
+    title: [
+        { required: true, message: t('titlePlaceholder'), trigger: 'blur' }
+    ],
+    icon: [
+        { required: true, message: t('iconPlaceholder'), trigger: 'change' }
+    ],
+    key: [
+        { required: true, validator: validKey, trigger: 'blur' }
+    ],
+    author: [
+        { required: true, message: t('authorPlaceholder'), trigger: 'blur' }
+    ],
+    version: [
+        { required: true, validator: validVersion, trigger: 'blur' }
+    ],
+    cover: [
+        { required: true, message: t('coverPlaceholder'), trigger: 'change' }
+    ],
+    type: [
+        { required: true, message: t('typePlaceholder'), trigger: 'change' }
+    ],
+    support_app: [
+        { required: true, message: t('typePlaceholder'), trigger: 'change' }
+    ]
 })
 
 onMounted(async () => {
-  const res = await getAddontype()
-  options.value = res.data
-  if (route.query.key) getAddonDevelopInfoFn(route.query.key)
+    const res = await getAddontype()
+    options.value = res.data
+    if (route.query.key) getAddonDevelopInfoFn(route.query.key)
 })
 
 const typeChange = () => {
-  form.value.support_app = ''
+    form.value.support_app = ''
 }
 
 // 详情查询
 const getAddonDevelopInfoFn = (key: any) => {
-  loading.value = true
-  getAddonDevelopInfo(key)
-    .then((res) => {
-      form.value = Object.assign(form.value, res.data)
-      loading.value = false
-    })
-    .catch(() => {
-      loading.value = false
+    loading.value = true
+    getAddonDevelopInfo(key).then(res => {
+        form.value = Object.assign(form.value, res.data)
+        loading.value = false
+    }).catch(() => {
+        loading.value = false
     })
 }
 
 // 获取app列表
 const AppLst = ref<Array<any>>([])
 const getAddonListFn = async () => {
-  const { data } = await getAddonList()
-  AppLst.value = data
+    const { data } = await getAddonList()
+    AppLst.value = data
 }
 getAddonListFn()
 const getAddonDevelopCheckFn = (key: any) => {
-  getAddonDevelopCheck(key).then((res) => {
-    ElMessageBox.alert(
-      res.data ? t('warningText') : t('successText'),
-      t('warning'),
-      {
-        // if you want to disable its autofocus
-        // autofocus: false,
-        confirmButtonText: t('confirm'),
-        callback: (action: any) => {
-          console.log(action)
-        },
-      }
-    )
-  })
+    getAddonDevelopCheck(key).then(res => {
+        ElMessageBox.alert(res.data ? t('warningText') : t('successText'), t('warning'), {
+            // if you want to disable its autofocus
+            // autofocus: false,
+            confirmButtonText: t('confirm'),
+            callback: (action: any) => {
+                console.log(action)
+            }
+        })
+    })
 }
 /**
  * 确认
  * @param formEl
  */
 const onSave = async (formEl: FormInstance | undefined) => {
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      const save = route.query.key ? editAddonDevelop : addAddonDevelop
-      loading.value = true
-      save(form.value.key, form.value)
-        .then((res) => {
-          loading.value = false
-          ElMessage({
-            message: t('onSaveSuccessText'),
-            type: 'success',
-          })
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            const save = route.query.key ? editAddonDevelop : addAddonDevelop
+            loading.value = true
+            save(form.value.key, form.value).then(res => {
+                loading.value = false
+                ElMessage({
+                    message: t('onSaveSuccessText'),
+                    type: 'success'
+                })
 
-          setTimeout(() => {
-            window.addonActiveName = 'pluginList'
-            router.push({ path: '/tools/addon' })
-          }, 650)
-        })
-        .catch(() => {
-          loading.value = false
-        })
-    }
-  })
+                setTimeout(() => {
+                    window.addonActiveName = 'pluginList'
+                    router.push({ path: '/tools/addon' })
+                }, 650)
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
 }
 
 getAddonKeyBlackList().then(({ data }) => {
-  keyBlackList.value = data
+    keyBlackList.value = data
 })
 </script>
diff --git a/admin/src/app/views/tools/addon/index.vue b/admin/src/app/views/tools/addon/index.vue
index dac2db55..9724688c 100644
--- a/admin/src/app/views/tools/addon/index.vue
+++ b/admin/src/app/views/tools/addon/index.vue
@@ -1,258 +1,151 @@
 <template>
-  <!--插件开发-->
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
+    <!--插件开发-->
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
 
-      <el-tabs v-model="activeName" class="mt-[20px]">
-        <el-tab-pane :label="t('developmentProcess')" name="developmentProcess">
-          <el-steps :active="5" direction="vertical">
-            <el-step>
-              <template #title>
-                <p class="text-[14px] font-[700]">
-                  {{ t('step1') }}
-                </p>
-              </template>
-              <template #description>
-                <span class="text-[#999]">{{ t('describe1') }}</span>
-                <div class="mt-[20px] mb-[40px] h-[32px]">
-                  <el-button
-                    type="primary"
-                    @click="router.push({ path: '/tools/addon_edit' })"
-                    >{{ t('btn1') }}</el-button
-                  >
-                </div>
-              </template>
-            </el-step>
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+            </div>
 
-            <el-step>
-              <template #title>
-                <p class="text-[14px] font-[700]">
-                  {{ t('step2') }}
-                </p>
-              </template>
-              <template #description>
-                <span class="text-[#999]">{{ t('describe2') }}</span>
-                <div class="mt-[20px] mb-[40px] h-[32px]">
-                  <el-button
-                    type="primary"
-                    plain
-                    @click="activeName = 'pluginList'"
-                    >{{ t('btn2') }}</el-button
-                  >
-                </div>
-              </template>
-            </el-step>
+            <el-tabs v-model="activeName" class="mt-[20px]">
+                <el-tab-pane :label="t('developmentProcess')" name="developmentProcess">
+                    <el-steps :active="5" direction="vertical">
+                        <el-step>
+                            <template #title>
+                                <p class="text-[14px] font-[700]">
+                                    {{ t("step1") }}
+                                </p>
+                            </template>
+                            <template #description>
+                                <span class="text-[#999]">{{ t("describe1") }}</span>
+                                <div class="mt-[20px] mb-[40px] h-[32px]">
+                                    <el-button type="primary" @click="router.push({ path: '/tools/addon_edit' })">{{t("btn1") }}</el-button>
+                                </div>
+                            </template>
+                        </el-step>
 
-            <el-step>
-              <template #title>
-                <p class="text-[14px] font-[700]">
-                  {{ t('step3') }}
-                </p>
-              </template>
-              <template #description>
-                <span class="text-[#999]">{{ t('describe3') }}</span>
-                <div class="mt-[20px] mb-[40px] h-[32px]">
-                  <el-button
-                    type="primary"
-                    plain
-                    @click="
-                      linkEvent(
-                        'https://www.kancloud.cn/niucloud/niucloud-admin-develop/3225439'
-                      )
-                    "
-                    >{{ t('btn3') }}</el-button
-                  >
-                </div>
-              </template>
-            </el-step>
+                        <el-step>
+                            <template #title>
+                                <p class="text-[14px] font-[700]">
+                                    {{ t("step2") }}
+                                </p>
+                            </template>
+                            <template #description>
+                                <span class="text-[#999]">{{ t("describe2") }}</span>
+                                <div class="mt-[20px] mb-[40px] h-[32px]">
+                                    <el-button type="primary" plain @click="activeName = 'pluginList'">{{t("btn2") }}</el-button>
+                                </div>
+                            </template>
+                        </el-step>
 
-            <el-step>
-              <template #title>
-                <p class="text-[14px] font-[700]">
-                  {{ t('step4') }}
-                </p>
-              </template>
-              <template #description>
-                <span class="text-[#999]">{{ t('describe4') }}</span>
-                <div class="mt-[20px] mb-[40px] h-[32px]">
-                  <el-button
-                    type="primary"
-                    plain
-                    @click="activeName = 'pluginList'"
-                    >{{ t('btn4') }}</el-button
-                  >
-                </div>
-              </template>
-            </el-step>
+                        <el-step>
+                            <template #title>
+                                <p class="text-[14px] font-[700]">
+                                    {{ t("step3") }}
+                                </p>
+                            </template>
+                            <template #description>
+                                <span class="text-[#999]">{{ t("describe3") }}</span>
+                                <div class="mt-[20px] mb-[40px] h-[32px]">
+                                    <el-button type="primary" plain @click="linkEvent('https://www.kancloud.cn/niucloud/niucloud-admin-develop/3225439')">{{t("btn3") }}</el-button>
+                                </div>
+                            </template>
+                        </el-step>
 
-            <el-step>
-              <template #title>
-                <p class="text-[14px] font-[700]">
-                  {{ t('step5') }}
-                </p>
-              </template>
-              <template #description>
-                <span class="text-[#999]">{{ t('describe5') }}</span>
-                <div class="mt-[20px] mb-[40px] h-[32px]">
-                  <el-button
-                    type="primary"
-                    plain
-                    @click="linkEvent('https://www.niucloud.com/app')"
-                    >{{ t('btn5') }}</el-button
-                  >
-                </div>
-              </template>
-            </el-step>
-          </el-steps>
-        </el-tab-pane>
+                        <el-step>
+                            <template #title>
+                                <p class="text-[14px] font-[700]">
+                                    {{ t("step4") }}
+                                </p>
+                            </template>
+                            <template #description>
+                                <span class="text-[#999]">{{ t("describe4") }}</span>
+                                <div class="mt-[20px] mb-[40px] h-[32px]">
+                                    <el-button type="primary" plain @click="activeName = 'pluginList'">{{t("btn4") }}</el-button>
+                                </div>
+                            </template>
+                        </el-step>
 
-        <el-tab-pane :label="t('pluginList')" name="pluginList">
-          <el-card
-            class="box-card !border-none mb-[10px] table-search-wrap"
-            shadow="never"
-          >
-            <div class="flex justify-between">
-              <el-form :inline="true" :model="params" ref="searchFormRef">
-                <el-form-item :label="t('title')" prop="search">
-                  <el-input
-                    v-model.trim="params.search"
-                    :placeholder="t('titlePlaceholder')"
-                  />
-                </el-form-item>
-                <el-form-item>
-                  <el-button type="primary" @click="getAddonDevelopFn">{{
-                    t('search')
-                  }}</el-button>
-                  <el-button @click="resetForm(searchFormRef)">{{
-                    t('reset')
-                  }}</el-button>
-                </el-form-item>
-              </el-form>
-            </div>
-          </el-card>
+                        <el-step>
+                            <template #title>
+                                <p class="text-[14px] font-[700]">
+                                    {{ t("step5") }}
+                                </p>
+                            </template>
+                            <template #description>
+                                <span class="text-[#999]">{{ t("describe5") }}</span>
+                                <div class="mt-[20px] mb-[40px] h-[32px]">
+                                    <el-button type="primary" plain @click="linkEvent('https://www.niucloud.com/app')">{{t("btn5") }}</el-button>
+                                </div>
+                            </template>
+                        </el-step>
+                    </el-steps>
+                </el-tab-pane>
+
+                <el-tab-pane :label="t('pluginList')" name="pluginList">
+
+                    <el-card class="box-card !border-none mb-[10px] table-search-wrap" shadow="never">
+                        <div class="flex justify-between">
+                            <el-form :inline="true" :model="params" ref="searchFormRef">
+                                <el-form-item :label="t('title')" prop="search">
+                                    <el-input v-model.trim="params.search" :placeholder="t('titlePlaceholder')" />
+                                </el-form-item>
+                                <el-form-item>
+                                    <el-button type="primary" @click="getAddonDevelopFn">{{ t('search') }}</el-button>
+                                    <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                                </el-form-item>
+                            </el-form>
+                        </div>
+                    </el-card>
+
+                    <el-table :data="data" size="large" v-loading="loading" class="pt-[5px]">
+                        <template #empty>
+                            <span>{{ t('emptyData') }}</span>
+                        </template>
 
-          <el-table
-            :data="data"
-            size="large"
-            v-loading="loading"
-            class="pt-[5px]"
-          >
-            <template #empty>
-              <span>{{ t('emptyData') }}</span>
-            </template>
+                        <el-table-column :label="t('title')" align="left" min-width="320">
+                            <template #default="{ row }">
+                                <div class="flex items-center justify-between">
+                                    <el-image v-if="row.icon" class="w-[45px] h-[45px]" :src="row.icon.indexOf('data:image') != -1 ? row.icon : img(row.icon)" fit="contain">
+                                        <template #error>
+                                            <img class="w-[45px] h-[45px]" src="@/app/assets/images/category_default.png" alt="">
+                                        </template>
+                                    </el-image>
+                                    <img v-else class="w-[45px] h-[45px]" src="@/app/assets/images/category_default.png" alt="">
+                                    <div class="flex-1 w-[236px] pl-[15px] truncate">
+                                        {{ row.title }}
+                                    </div>
+                                </div>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="key" :label="t('key')" align="center" min-width="200" />
+                        <el-table-column prop="type_name" :label="t('type')" align="center" min-width="200" />
+                        <el-table-column prop="author" :label="t('author')" align="center" min-width="200" />
+                        <el-table-column prop="version" :label="t('version')" align="center" min-width="200" />
+                        <el-table-column :label="t('status')" align="center" min-width="200">
+                            <template #default="{ row }">
+                                {{ Object.keys(row.install_info).length ? '已安装' : '未安装' }}
+                            </template>
+                        </el-table-column>
+                        <el-table-column :label="t('operation')" fixed="right" align="right" width="180" :show-overflow-tooltip="true">
+                            <template #default="{ row }">
+                                <el-button type="primary" link @click="editEvent(row.key)">{{ t('edit') }}</el-button>
+                                <el-button v-if="Object.keys(row.install_info).length" type="primary" link @click="addonDevelopBuildFn(row)">{{ t('step4') }}</el-button>
+                                <el-button v-if="!Object.keys(row.install_info).length" type="primary" link @click="deleteEvent(row.key)">{{ t('delete') }}</el-button>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </el-tab-pane>
+            </el-tabs>
 
-            <el-table-column :label="t('title')" align="left" min-width="320">
-              <template #default="{ row }">
-                <div class="flex items-center justify-between">
-                  <el-image
-                    v-if="row.icon"
-                    class="w-[45px] h-[45px]"
-                    :src="
-                      row.icon.indexOf('data:image') != -1
-                        ? row.icon
-                        : img(row.icon)
-                    "
-                    fit="contain"
-                  >
-                    <template #error>
-                      <img
-                        class="w-[45px] h-[45px]"
-                        src="@/app/assets/images/category_default.png"
-                        alt=""
-                      />
-                    </template>
-                  </el-image>
-                  <img
-                    v-else
-                    class="w-[45px] h-[45px]"
-                    src="@/app/assets/images/category_default.png"
-                    alt=""
-                  />
-                  <div class="flex-1 w-[236px] pl-[15px] truncate">
-                    {{ row.title }}
-                  </div>
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="key"
-              :label="t('key')"
-              align="center"
-              min-width="200"
-            />
-            <el-table-column
-              prop="type_name"
-              :label="t('type')"
-              align="center"
-              min-width="200"
-            />
-            <el-table-column
-              prop="author"
-              :label="t('author')"
-              align="center"
-              min-width="200"
-            />
-            <el-table-column
-              prop="version"
-              :label="t('version')"
-              align="center"
-              min-width="200"
-            />
-            <el-table-column
-              :label="t('status')"
-              align="center"
-              min-width="200"
-            >
-              <template #default="{ row }">
-                {{ Object.keys(row.install_info).length ? '已安装' : '未安装' }}
-              </template>
-            </el-table-column>
-            <el-table-column
-              :label="t('operation')"
-              fixed="right"
-              align="right"
-              width="180"
-              :show-overflow-tooltip="true"
-            >
-              <template #default="{ row }">
-                <el-button type="primary" link @click="editEvent(row.key)">{{
-                  t('edit')
-                }}</el-button>
-                <el-button
-                  v-if="Object.keys(row.install_info).length"
-                  type="primary"
-                  link
-                  @click="addonDevelopBuildFn(row)"
-                  >{{ t('step4') }}</el-button
-                >
-                <el-button
-                  v-if="!Object.keys(row.install_info).length"
-                  type="primary"
-                  link
-                  @click="deleteEvent(row.key)"
-                  >{{ t('delete') }}</el-button
-                >
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-tab-pane>
-      </el-tabs>
-    </el-card>
-  </div>
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, toRefs, ref, onMounted } from 'vue'
 import { t } from '@/lang'
-import {
-  getAddonDevelop,
-  deleteAddonDevelop,
-  addonDevelopBuild,
-  addonDevelopDownload,
-} from '@/app/api/tools'
+import { getAddonDevelop, deleteAddonDevelop, addonDevelopBuild, addonDevelopDownload } from '@/app/api/tools'
 import { img } from '@/utils/common'
 import { ElMessageBox } from 'element-plus'
 import { useRouter, useRoute } from 'vue-router'
@@ -263,66 +156,57 @@ const router = useRouter()
 const pageName = route.meta.title
 const searchFormRef = ref(null)
 const state = reactive({
-  params: {
-    // page: 1,
-    // limit: 10,
-    // total: 0,
-    // title: '',
-    search: '',
-  },
-  loading: false,
-  data: [],
-  activeName: 'developmentProcess',
-  active: 0,
+    params: {
+        // page: 1,
+        // limit: 10,
+        // total: 0,
+        // title: '',
+        search: ''
+    },
+    loading: false,
+    data: [],
+    activeName: 'developmentProcess',
+    active: 0
 })
 const { params, loading, data, activeName, active } = toRefs(state)
 onMounted(() => {
-  if (window.addonActiveName) {
-    state.activeName = window.addonActiveName + ''
-    window.addonActiveName = null
-  }
-  getAddonDevelopFn()
+    if (window.addonActiveName) {
+        state.activeName = window.addonActiveName + ''
+        window.addonActiveName = null
+    }
+    getAddonDevelopFn()
 })
 const getAddonDevelopFn = () => {
-  loading.value = true
-  getAddonDevelop(state.params)
-    .then((res) => {
-      state.data = res.data
-      loading.value = false
-    })
-    .catch(() => {
-      loading.value = false
+    loading.value = true
+    getAddonDevelop(state.params).then(res => {
+        state.data = res.data
+        loading.value = false
+    }).catch(() => {
+        loading.value = false
     })
 }
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  getAddonDevelopFn()
+    if (!formEl) return
+    formEl.resetFields()
+    getAddonDevelopFn()
 }
 const editEvent = (key: any) => {
-  router.push({ path: '/tools/addon_edit', query: { key } })
+    router.push({ path: '/tools/addon_edit', query: { key } })
 }
 const linkEvent = (url: string) => {
-  window.open(url, '_blank')
+    window.open(url, '_blank')
 }
 // 打包插件
 const addonDevelopBuildFn = (data: any) => {
-  loading.value = true
-  addonDevelopBuild(data.key)
-    .then((res) => {
-      loading.value = false
-      addonDevelopDownload(data.key)
-        .then((res) => {
-          ElMessageBox.alert(
-            `插件打包成功，插件包所在位置：网站根目录${res.data}下请手动进行下载`,
-            t('warning')
-          )
-        })
-        .catch()
-    })
-    .catch(() => {
-      loading.value = false
+    loading.value = true
+    addonDevelopBuild(data.key).then(res => {
+        loading.value = false
+        addonDevelopDownload(data.key).then(res => {
+            ElMessageBox.alert(`插件打包成功，插件包所在位置：网站根目录${res.data}下请手动进行下载`, t('warning'))
+        }).catch()
+    }).catch(() => {
+        loading.value = false
     })
 }
 
@@ -330,20 +214,20 @@ const addonDevelopBuildFn = (data: any) => {
  * 删除
  */
 const deleteEvent = (key: any) => {
-  ElMessageBox.confirm(t('codeDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    loading.value = true
-    deleteAddonDevelop(key)
-      .then(() => {
-        getAddonDevelopFn()
-      })
-      .catch(() => {
-        loading.value = false
-      })
-  })
+    ElMessageBox.confirm(t('codeDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        loading.value = true
+        deleteAddonDevelop(key).then(() => {
+            getAddonDevelopFn()
+        }).catch(() => {
+            loading.value = false
+        })
+    })
 }
 </script>
 
diff --git a/admin/src/app/views/tools/attachment.vue b/admin/src/app/views/tools/attachment.vue
index 39e5a85c..518af118 100644
--- a/admin/src/app/views/tools/attachment.vue
+++ b/admin/src/app/views/tools/attachment.vue
@@ -1,22 +1,18 @@
 <template>
-  <div class="main-container attachment-container">
-    <el-card class="box-card !border-none full-container" shadow="never">
-      <div class="flex justify-between items-center mb-[20px]">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
+	<div class="main-container attachment-container">
+		<el-card class="box-card !border-none full-container" shadow="never">
 
-      <el-tabs v-model="type">
-        <el-tab-pane
-          :label="t(tab)"
-          v-for="(tab, index) in attachmentType"
-          :name="tab"
-          :key="index"
-        >
-          <attachment scene="attachment" :type="tab" />
-        </el-tab-pane>
-      </el-tabs>
-    </el-card>
-  </div>
+			<div class="flex justify-between items-center mb-[20px]">
+                <span class="text-page-title">{{ pageName }}</span>
+            </div>
+
+			<el-tabs v-model="type">
+				<el-tab-pane :label="t(tab)" v-for="(tab, index) in attachmentType" :name="tab" :key="index">
+					<attachment scene="attachment" :type="tab" />
+				</el-tab-pane>
+			</el-tabs>
+		</el-card>
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -29,50 +25,51 @@ const route = useRoute()
 const pageName = route.meta.title
 const attachmentType: string[] = ['image', 'video', 'icon']
 const type = ref(attachmentType[0])
+
 </script>
 
 <style lang="scss">
-.attachment-container {
-  overflow: hidden;
-  min-height: calc(100vh - 94px);
-  background-color: var(--el-bg-color-overlay);
+	.attachment-container {
+        overflow: hidden;
+        min-height: calc(100vh - 94px);
+        background-color: var(--el-bg-color-overlay);
 
-  .full-container {
-    height: calc(100vh - 100px);
-  }
+        .full-container {
+            height: calc(100vh - 100px);
+        }
 
-  .el-card__body {
-    height: 100%;
-  }
+		.el-card__body {
+			height: 100%;
+		}
 
-  .el-tabs {
-    display: flex;
-    flex-direction: column;
-    height: calc(100% - 40px);
-  }
+		.el-tabs {
+			display: flex;
+            flex-direction: column;
+            height: calc(100% - 40px);
+		}
 
-  .el-tabs__content {
-    flex: 1;
+		.el-tabs__content {
+			flex: 1;
 
-    .el-tab-pane {
-      height: 100%;
-    }
-  }
+			.el-tab-pane {
+				height: 100%;
+			}
+		}
 
-  .el-tabs__nav-wrap::after {
-    height: 1px;
-  }
+		.el-tabs__nav-wrap::after {
+			height: 1px;
+		}
 
-  .main-wrap {
-    border: none;
+		.main-wrap {
+			border: none;
 
-    .group-wrap {
-      padding: 0 15px 0 0;
-    }
+			.group-wrap {
+				padding: 0 15px 0 0;
+			}
 
-    .attachment-list-wrap {
-      padding: 0 0 0 15px;
-    }
-  }
-}
+			.attachment-list-wrap {
+				padding: 0 0 0 15px;
+			}
+		}
+	}
 </style>
diff --git a/admin/src/app/views/tools/code/components/add-table.vue b/admin/src/app/views/tools/code/components/add-table.vue
index d478d2c6..d15fe02c 100644
--- a/admin/src/app/views/tools/code/components/add-table.vue
+++ b/admin/src/app/views/tools/code/components/add-table.vue
@@ -1,48 +1,28 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="t('addCode')"
-    width="800px"
-    :destroy-on-close="true"
-  >
-    <div>
-      <el-table
-        :data="filterTableData"
-        size="large"
-        v-loading="tableTableData.loading"
-        height="400"
-      >
-        <template #empty>
-          <span>{{ !tableTableData.loading ? t('emptyData') : '' }}</span>
-        </template>
+    <el-dialog v-model="showDialog" :title="t('addCode')" width="800px" :destroy-on-close="true">
+        <div>
+            <el-table :data="filterTableData" size="large" v-loading="tableTableData.loading" height="400">
 
-        <el-table-column prop="Name" :label="t('tableName')" min-width="150" />
-        <el-table-column
-          prop="Comment"
-          :label="t('tableComment')"
-          min-width="120"
-        />
+                <template #empty>
+                    <span>{{ !tableTableData.loading ? t('emptyData') : '' }}</span>
+                </template>
 
-        <el-table-column align="right" min-width="150">
-          <template #header>
-            <el-input
-              v-model.trim="search"
-              size="small"
-              :placeholder="t('searchPlaceholder')"
-            />
-          </template>
-          <template #default="scope">
-            <el-button
-              size="small"
-              type="primary"
-              @click="confirm(scope.row)"
-              >{{ t('addBtn') }}</el-button
-            >
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-  </el-dialog>
+                <el-table-column prop="Name" :label="t('tableName')" min-width="150" />
+                <el-table-column prop="Comment" :label="t('tableComment')" min-width="120" />
+
+                <el-table-column align="right" min-width="150">
+                    <template #header>
+                        <el-input v-model.trim="search" size="small" :placeholder="t('searchPlaceholder')" />
+                    </template>
+                    <template #default="scope">
+                        <el-button size="small" type="primary" @click="confirm(scope.row)">{{ t('addBtn') }}</el-button>
+                    </template>
+                </el-table-column>
+
+            </el-table>
+        </div>
+
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -55,36 +35,33 @@ const router = useRouter()
 const showDialog = ref(false)
 const search = ref('')
 const tableTableData = reactive({
-  loading: true,
-  data: [],
-  searchParam: {
-    table_name: '',
-    table_content: '',
-  },
+    loading: true,
+    data: [],
+    searchParam: {
+        table_name: '',
+        table_content: ''
+    }
 })
 
 const filterTableData = computed(() =>
-  tableTableData.data.filter(
-    (data: any) =>
-      !search.value ||
-      data.Name.toLowerCase().includes(search.value.toLowerCase()) ||
-      data.Comment.toLowerCase().includes(search.value.toLowerCase())
-  )
+    tableTableData.data.filter(
+        (data:any) =>
+            !search.value ||
+            data.Name.toLowerCase().includes(search.value.toLowerCase()) || data.Comment.toLowerCase().includes(search.value.toLowerCase())
+    )
 )
 
 /**
  * 获取代码生成列表
  */
 const loadTableList = () => {
-  tableTableData.loading = true
+    tableTableData.loading = true
 
-  generateTable()
-    .then((res) => {
-      tableTableData.loading = false
-      tableTableData.data = res.data
-    })
-    .catch(() => {
-      tableTableData.loading = false
+    generateTable().then(res => {
+        tableTableData.loading = false
+        tableTableData.data = res.data
+    }).catch(() => {
+        tableTableData.loading = false
     })
 }
 loadTableList()
@@ -94,27 +71,26 @@ loadTableList()
  * @param row
  */
 const confirm = (row: any) => {
-  const name: string = row.Name
-  tableTableData.loading = true
-  addGenerateTable({ table_name: name })
-    .then((res) => {
-      tableTableData.loading = false
-      showDialog.value = false
-      router.push({ path: '/tools/code/edit', query: { id: res.data.id } })
-    })
-    .catch(() => {
-      tableTableData.loading = false
+    const name: string = row.Name
+    tableTableData.loading = true
+    addGenerateTable({ 'table_name': name }).then(res => {
+        tableTableData.loading = false
+        showDialog.value = false
+        router.push({ path: '/tools/code/edit', query: { id: res.data.id } })
+    }).catch(() => {
+        tableTableData.loading = false
     })
 }
 
 const setFormData = async (row: any = null) => {
-  loadTableList()
+    loadTableList()
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/tools/code/components/edit-associated.vue b/admin/src/app/views/tools/code/components/edit-associated.vue
index 39472f2c..9810506f 100644
--- a/admin/src/app/views/tools/code/components/edit-associated.vue
+++ b/admin/src/app/views/tools/code/components/edit-associated.vue
@@ -1,127 +1,68 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="title"
-    width="500px"
-    :before-close="beforeClose"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="120px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-    >
-      <el-form-item :label="t('associatedType')" prop="type">
-        <el-select
-          :placeholder="t('associatedTypePlaceholder')"
-          v-model="formData.type"
-          class="input-width"
-        >
-          <el-option :label="t('hasOne')" value="has_one" />
-          <el-option :label="t('hasMany')" value="has_many" />
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="t('associatedName')" prop="name">
-        <el-input
-          v-model.trim="formData.name"
-          :placeholder="t('associatedNamePlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-      <el-form-item :label="t('addons')" prop="addon">
-        <el-select
-          v-model="formData.addon"
-          :placeholder="t('addonsPlaceholder')"
-          class="input-width"
-          @change="addonChange"
-        >
-          <el-option
-            v-for="(item, index) in addonList"
-            :label="item.title"
-            :value="item.key"
-            :key="index"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="t('associatedModel')" prop="model">
-        <el-select
-          :placeholder="t('associatedModelPlaceholder')"
-          v-model="formData.model"
-          class="input-width"
-          filterable
-        >
-          <el-option
-            v-for="item in modelList"
-            :label="item"
-            :value="item"
-            :key="item"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item prop="local_key" :label="t('localKey')">
-        <el-select
-          class="input-width"
-          :placeholder="t('localKeyPlaceholder')"
-          v-model="formData.local_key"
-        >
-          <el-option
-            :label="`${item.name}:${item.comment}`"
-            :value="item.name"
-            v-for="(item, index) in localKeyList"
-            :key="index"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="t('foreignKey')" prop="foreign_key">
-        <el-input
-          v-model.trim="formData.foreign_key"
-          :placeholder="t('foreignKeyPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button type="primary" @click="confirm(formRef)">{{
-          t('confirm')
-        }}</el-button>
-      </span>
-    </template>
-  </el-dialog>
+    <el-dialog v-model="showDialog" :title="title" width="500px" :before-close="beforeClose"  :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form">
+            <el-form-item :label="t('associatedType')" prop="type">
+                <el-select :placeholder="t('associatedTypePlaceholder')" v-model="formData.type" class="input-width">
+                    <el-option :label="t('hasOne')" value="has_one" />
+                    <el-option :label="t('hasMany')" value="has_many" />
+                </el-select>
+            </el-form-item>
+            <el-form-item :label="t('associatedName')" prop="name">
+                <el-input v-model.trim="formData.name" :placeholder="t('associatedNamePlaceholder')" class="input-width" />
+            </el-form-item>
+            <el-form-item :label="t('addons')" prop="addon">
+                <el-select v-model="formData.addon" :placeholder="t('addonsPlaceholder')" class="input-width" @change="addonChange">
+                    <el-option v-for="(item, index) in addonList" :label="item.title" :value="item.key" :key="index" />
+                </el-select>
+            </el-form-item>
+            <el-form-item :label="t('associatedModel')" prop="model">
+                <el-select :placeholder="t('associatedModelPlaceholder')" v-model="formData.model" class="input-width" filterable>
+                    <el-option v-for="item in modelList" :label="item" :value="item" :key="item" />
+                </el-select>
+            </el-form-item>
+            <el-form-item prop="local_key" :label="t('localKey')">
+                <el-select class="input-width" :placeholder="t('localKeyPlaceholder')" v-model="formData.local_key">
+                    <el-option :label="`${item.name}:${item.comment}`" :value="item.name" v-for="(item, index) in localKeyList" :key="index" />
+                </el-select>
+            </el-form-item>
+            <el-form-item :label="t('foreignKey')" prop="foreign_key">
+                <el-input v-model.trim="formData.foreign_key" :placeholder="t('foreignKeyPlaceholder')" class="input-width" />
+            </el-form-item>
+        </el-form>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup async>
 import { ref, computed, toRaw } from 'vue'
 import { t } from '@/lang'
 import type { FormInstance } from 'element-plus'
-import {
-  getGeneratorAllModel,
-  getGeneratorTableColumn,
-  getAddonDevelop,
-} from '@/app/api/tools'
+import { getGeneratorAllModel, getGeneratorTableColumn, getAddonDevelop } from '@/app/api/tools'
 import { cloneDeep } from 'lodash-es'
 
 const showDialog = ref(false)
 const title = ref('')
 const prop = defineProps({
-  table_name: {
-    type: String,
-    required: true,
-  },
+    table_name: {
+        type: String,
+        required: true
+    }
 })
 /**
  * 表单数据
  */
 const initialFormData = {
-  type: 'has_one',
-  name: '',
-  addon: 'system',
-  model: '',
-  local_key: '',
-  foreign_key: '',
+    type: 'has_one',
+    name: '',
+    addon: 'system',
+    model: '',
+    local_key: '',
+    foreign_key: ''
 }
 const formData: Record<string, any> = ref({ ...initialFormData })
 
@@ -129,48 +70,36 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    type: [
-      {
-        required: true,
-        message: t('associatedTypePlaceholder'),
-        trigger: 'change',
-      },
-    ],
-    name: [
-      {
-        required: true,
-        message: t('associatedNamePlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    addon: [
-      { required: true, message: t('addonsPlaceholder'), trigger: 'change' },
-    ],
-    model: [
-      {
-        required: true,
-        message: t('associatedModelPlaceholder'),
-        trigger: 'change',
-      },
-    ],
-    local_key: [
-      { required: true, message: t('localKeyPlaceholder'), trigger: 'change' },
-    ],
-    foreign_key: [
-      { required: true, message: t('foreignKeyPlaceholder'), trigger: 'blur' },
-    ],
-  }
+    return {
+        type: [
+            { required: true, message: t('associatedTypePlaceholder'), trigger: 'change' }
+        ],
+        name: [
+            { required: true, message: t('associatedNamePlaceholder'), trigger: 'blur' }
+        ],
+        addon: [
+            { required: true, message: t('addonsPlaceholder'), trigger: 'change' }
+        ],
+        model: [
+            { required: true, message: t('associatedModelPlaceholder'), trigger: 'change' }
+        ],
+        local_key: [
+            { required: true, message: t('localKeyPlaceholder'), trigger: 'change' }
+        ],
+        foreign_key: [
+            { required: true, message: t('foreignKeyPlaceholder'), trigger: 'blur' }
+        ]
+    }
 })
 
 /**
  * 获取关联模型
  */
 const modelList = ref([])
-const getGeneratorAllModelFn = (params: any) => {
-  getGeneratorAllModel(params).then((res) => {
-    modelList.value = res.data
-  })
+const getGeneratorAllModelFn = (params:any) => {
+    getGeneratorAllModel(params).then(res => {
+        modelList.value = res.data
+    })
 }
 
 /**
@@ -178,27 +107,27 @@ const getGeneratorAllModelFn = (params: any) => {
  */
 const localKeyList = ref([])
 const getGeneratorTableColumnFn = (key: any) => {
-  getGeneratorTableColumn({ table_name: key }).then((res) => {
-    localKeyList.value = res.data
-  })
+    getGeneratorTableColumn({ table_name: key }).then(res => {
+        localKeyList.value = res.data
+    })
 }
 // 获取插件列表
 const addonList = ref<Array<any>>([])
 const getAddonDevelopFn = async () => {
-  const { data } = await getAddonDevelop({})
-  addonList.value = [{ title: '系统', key: 'system' }]
-  addonList.value.push(...data)
-  getGeneratorAllModelFn({ addon: 'system' })
+    const { data } = await getAddonDevelop({})
+    addonList.value = [{ title: '系统', key: 'system' }]
+    addonList.value.push(...data)
+    getGeneratorAllModelFn({ addon: 'system' })
 }
 getAddonDevelopFn()
 // 选择应用
-const addonChange = (val: any) => {
-  formData.value.model = ''
-  getGeneratorAllModelFn({ addon: val })
+const addonChange = (val:any) => {
+    formData.value.model = ''
+    getGeneratorAllModelFn({ addon: val })
 }
-const beforeClose = (next: any) => {
-  formRef.value?.clearValidate()
-  next()
+const beforeClose = (next:any) => {
+    formRef.value?.clearValidate()
+    next()
 }
 const emit = defineEmits(['complete'])
 /**
@@ -206,29 +135,29 @@ const emit = defineEmits(['complete'])
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) return
+    if (!formEl) return
 
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      emit('complete', toRaw(formData.value))
-      showDialog.value = false
-    }
-  })
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            emit('complete', toRaw(formData.value))
+            showDialog.value = false
+        }
+    })
 }
 
 const setFormData = async (row: any = null) => {
-  getGeneratorTableColumnFn(prop.table_name)
-  if (row) {
-    formData.value = cloneDeep(row)
-  } else {
-    formData.value = cloneDeep(initialFormData)
-  }
-  showDialog.value = true
+    getGeneratorTableColumnFn(prop.table_name)
+    if (row) {
+        formData.value = cloneDeep(row)
+    } else {
+        formData.value = cloneDeep(initialFormData)
+    }
+    showDialog.value = true
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
diff --git a/admin/src/app/views/tools/code/components/edit-verify.vue b/admin/src/app/views/tools/code/components/edit-verify.vue
index db8e2f79..d2d07eae 100644
--- a/admin/src/app/views/tools/code/components/edit-verify.vue
+++ b/admin/src/app/views/tools/code/components/edit-verify.vue
@@ -1,82 +1,30 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="title"
-    width="480px"
-    :before-close="beforeClose"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="130px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-    >
-      <el-form-item
-        v-if="formData.validate_type == 'min'"
-        :label="t('minLabel')"
-        prop="min_number"
-      >
-        <el-input-number
-          v-model="formData.min_number"
-          :step="1"
-          step-strictly
-          :min="1"
-          class="input-width"
-        />
-      </el-form-item>
-      <el-form-item
-        v-else-if="formData.validate_type == 'max'"
-        :label="t('maxLabel')"
-        prop="max_number"
-      >
-        <el-input-number
-          v-model="formData.max_number"
-          :step="1"
-          step-strictly
-          :min="1"
-          class="input-width"
-        />
-      </el-form-item>
-      <template v-else-if="formData.view_type === 'number'">
-        <el-form-item :label="t('minLabel1')" prop="view_min">
-          <el-input-number
-            v-model="formData.view_min"
-            :min="0"
-            :value-on-clear="0"
-            class="input-width"
-          />
-        </el-form-item>
-        <el-form-item :label="t('maxLabel1')" prop="view_max">
-          <el-input-number
-            v-model="formData.view_max"
-            :min="1"
-            class="input-width"
-          />
-        </el-form-item>
-      </template>
-      <template v-else>
-        <el-form-item :label="t('minLabel')" prop="betweenMin">
-          <el-input-number
-            v-model="formData.betweenMin"
-            :step="1"
-            step-strictly
-            :min="1"
-            class="input-width"
-          />
-        </el-form-item>
-        <el-form-item :label="t('maxLabel')" prop="betweenMax">
-          <el-input-number
-            v-model="formData.betweenMax"
-            :step="1"
-            step-strictly
-            :min="1"
-            class="input-width"
-          />
-        </el-form-item>
-      </template>
-      <!-- <el-form-item v-else :label="t('between')" required>
+    <el-dialog v-model="showDialog" :title="title" width="480px" :before-close="beforeClose" :destroy-on-close="true">
+        <el-form :model="formData" label-width="130px" ref="formRef" :rules="formRules" class="page-form">
+
+            <el-form-item v-if="formData.validate_type == 'min'" :label="t('minLabel')" prop="min_number">
+                <el-input-number v-model="formData.min_number" :step="1" step-strictly :min="1" class="input-width" />
+            </el-form-item>
+            <el-form-item v-else-if="formData.validate_type == 'max'" :label="t('maxLabel')" prop="max_number">
+                <el-input-number v-model="formData.max_number" :step="1" step-strictly :min="1" class="input-width" />
+            </el-form-item>
+            <template v-else-if="formData.view_type === 'number'">
+                <el-form-item :label="t('minLabel1')" prop="view_min">
+                    <el-input-number v-model="formData.view_min" :min="0" :value-on-clear="0" class="input-width" />
+                </el-form-item>
+                <el-form-item :label="t('maxLabel1')"  prop="view_max">
+                    <el-input-number v-model="formData.view_max" :min="1" class="input-width" />
+                </el-form-item>
+            </template>
+            <template v-else>
+                <el-form-item :label="t('minLabel')" prop="betweenMin">
+                    <el-input-number v-model="formData.betweenMin" :step="1" step-strictly :min="1" class="input-width" />
+                </el-form-item>
+                <el-form-item :label="t('maxLabel')" prop="betweenMax">
+                    <el-input-number v-model="formData.betweenMax" :step="1" step-strictly :min="1" class="input-width" />
+                </el-form-item>
+            </template>
+            <!-- <el-form-item v-else :label="t('between')" required>
                 <el-col :span="11">
                     <el-form-item prop="betweenMin">
                         <el-input-number v-model="formData.betweenMin" :step="1" step-strictly :min="1" class="input-width" />
@@ -91,16 +39,14 @@
                     </el-form-item>
                 </el-col>
             </el-form-item> -->
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button type="primary" @click="confirm(formRef)">{{
-          t('confirm')
-        }}</el-button>
-      </span>
-    </template>
-  </el-dialog>
+        </el-form>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup async>
@@ -115,63 +61,71 @@ const title = ref('')
  * 表单数据
  */
 const initialFormData = {
-  validate_type: '',
-  min_number: 1,
-  max_number: 120,
-  betweenMin: 1,
-  betweenMax: 120,
+    validate_type: '',
+    min_number: 1,
+    max_number: 120,
+    betweenMin: 1,
+    betweenMax: 120
 }
 const formData: Record<string, any> = ref({ ...initialFormData })
 
 const formRef = ref<FormInstance>()
 const validateMin = (rule: any, value: any, callback: any) => {
-  if (!value) {
-    callback(new Error(t('minPlaceholder')))
-  } else if (value > formData.value.betweenMax) {
-    callback(new Error(t('minPlaceholder1')))
-  } else {
-    callback()
-  }
+    if (!value) {
+        callback(new Error(t('minPlaceholder')))
+    } else if (value > formData.value.betweenMax) {
+        callback(new Error(t('minPlaceholder1')))
+    } else {
+        callback()
+    }
 }
 const validateMax = (rule: any, value: any, callback: any) => {
-  if (!value) {
-    callback(new Error(t('maxPlaceholder')))
-  } else if (value < formData.value.betweenMin) {
-    callback(new Error(t('maxPlaceholder1')))
-  } else {
-    callback()
-  }
+    if (!value) {
+        callback(new Error(t('maxPlaceholder')))
+    } else if (value < formData.value.betweenMin) {
+        callback(new Error(t('maxPlaceholder1')))
+    } else {
+        callback()
+    }
 }
 const validateMin1 = (rule: any, value: any, callback: any) => {
-  if (value > formData.value.view_max) {
-    callback(new Error(t('min1Placeholder1')))
-  } else {
-    callback()
-  }
+    if (value > formData.value.view_max) {
+        callback(new Error(t('min1Placeholder1')))
+    } else {
+        callback()
+    }
 }
 const validateMax1 = (rule: any, value: any, callback: any) => {
-  if (!value) {
-    callback(new Error(t('max1Placeholder')))
-  } else if (value < formData.value.view_min) {
-    callback(new Error(t('max1Placeholder1')))
-  } else {
-    callback()
-  }
+    if (!value) {
+        callback(new Error(t('max1Placeholder')))
+    } else if (value < formData.value.view_min) {
+        callback(new Error(t('max1Placeholder1')))
+    } else {
+        callback()
+    }
 }
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    min_number: [
-      { required: true, message: t('minPlaceholder'), trigger: 'change' },
-    ],
-    max_number: [
-      { required: true, message: t('maxPlaceholder'), trigger: 'change' },
-    ],
-    betweenMin: [{ required: true, validator: validateMin, trigger: 'change' }],
-    betweenMax: [{ required: true, validator: validateMax, trigger: 'change' }],
-    view_min: [{ required: true, validator: validateMin1, trigger: 'change' }],
-    view_max: [{ required: true, validator: validateMax1, trigger: 'change' }],
-  }
+    return {
+        min_number: [
+            { required: true, message: t('minPlaceholder'), trigger: 'change' }
+        ],
+        max_number: [
+            { required: true, message: t('maxPlaceholder'), trigger: 'change' }
+        ],
+        betweenMin: [
+            { required: true, validator: validateMin, trigger: 'change' }
+        ],
+        betweenMax: [
+            { required: true, validator: validateMax, trigger: 'change' }
+        ],
+        view_min: [
+            { required: true, validator: validateMin1, trigger: 'change' }
+        ],
+        view_max: [
+            { required: true, validator: validateMax1, trigger: 'change' }
+        ]
+    }
 })
 
 const emit = defineEmits(['complete'])
@@ -180,27 +134,27 @@ const emit = defineEmits(['complete'])
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) return
+    if (!formEl) return
 
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      emit('complete', toRaw(formData.value))
-      showDialog.value = false
-    }
-  })
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            emit('complete', toRaw(formData.value))
+            showDialog.value = false
+        }
+    })
 }
 
 const setFormData = async (row: any = null) => {
-  formData.value = cloneDeep(Object.assign(initialFormData, row))
-  showDialog.value = true
+    formData.value = cloneDeep(Object.assign(initialFormData, row))
+    showDialog.value = true
 }
 const beforeClose = (next: any) => {
-  formRef.value?.clearValidate()
-  next()
+    formRef.value?.clearValidate()
+    next()
 }
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
diff --git a/admin/src/app/views/tools/code/components/edit-view-type.vue b/admin/src/app/views/tools/code/components/edit-view-type.vue
index 42cb6b7c..730117de 100644
--- a/admin/src/app/views/tools/code/components/edit-view-type.vue
+++ b/admin/src/app/views/tools/code/components/edit-view-type.vue
@@ -1,135 +1,50 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="title"
-    width="480px"
-    :before-close="beforeClose"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="130px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-    >
-      <el-form-item :label="t('selectType')" prop="type">
-        <el-radio-group v-model="formData.select_type">
-          <el-radio :label="1">{{ t('dictType') }}</el-radio>
-          <el-radio :label="2">{{ t('remotePullDown') }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-
-      <el-form-item
-        :label="t('dictType')"
-        v-if="formData.select_type == 1"
-        prop="dict_type"
-      >
-        <el-select
-          class="input-width"
-          :placeholder="t('dictTypePlaceholder')"
-          v-model="formData.dict_type"
-          filterable
-          remote
-          clearable
-        >
-          <el-option
-            :label="item.name"
-            :value="item.key"
-            v-for="item in dicList"
-            :key="item.key"
-          />
-        </el-select>
-      </el-form-item>
-
-      <el-form-item
-        :label="t('addons')"
-        prop="addon"
-        v-if="formData.select_type == 2"
-      >
-        <el-select
-          v-model="formData.addon"
-          :placeholder="t('addonsPlaceholder')"
-          class="input-width"
-          @change="addonChange"
-        >
-          <el-option
-            v-for="(item, index) in addonList"
-            :label="item.title"
-            :value="item.key"
-            :key="index"
-          />
-        </el-select>
-      </el-form-item>
-
-      <el-form-item
-        :label="t('associatedModel')"
-        prop="model"
-        v-if="formData.select_type == 2"
-      >
-        <el-select
-          :placeholder="t('associatedModelPlaceholder')"
-          v-model="formData.model"
-          class="input-width"
-          filterable
-          @change="modelChange"
-        >
-          <el-option
-            v-for="item in modelList"
-            :label="item"
-            :value="item"
-            :key="item"
-          />
-        </el-select>
-      </el-form-item>
-
-      <el-form-item
-        prop="value_key"
-        :label="t('remotePullDownValue')"
-        v-if="formData.select_type == 2"
-      >
-        <el-select
-          class="input-width"
-          :placeholder="t('remotePullDownValuePlaceholder')"
-          v-model="formData.value_key"
-        >
-          <el-option
-            :label="`${item.name}:${item.comment}`"
-            :value="item.name"
-            v-for="(item, index) in keyList"
-            :key="index"
-          />
-        </el-select>
-      </el-form-item>
-
-      <el-form-item
-        prop="label_key"
-        :label="t('remotePullDownLabel')"
-        v-if="formData.select_type == 2"
-      >
-        <el-select
-          class="input-width"
-          :placeholder="t('remotePullDownLabelPlaceholder')"
-          v-model="formData.label_key"
-        >
-          <el-option
-            :label="`${item.name}:${item.comment}`"
-            :value="item.name"
-            v-for="(item, index) in keyList"
-            :key="index"
-          />
-        </el-select>
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button type="primary" @click="confirm(formRef)">{{
-          t('confirm')
-        }}</el-button>
-      </span>
-    </template>
-  </el-dialog>
+    <el-dialog v-model="showDialog" :title="title" width="480px" :before-close="beforeClose" :destroy-on-close="true">
+        <el-form :model="formData" label-width="130px" ref="formRef" :rules="formRules" class="page-form">
+            <el-form-item :label="t('selectType')" prop="type">
+					<el-radio-group v-model="formData.select_type">
+						<el-radio :label="1">{{ t('dictType' )}}</el-radio>
+						<el-radio :label="2">{{ t('remotePullDown') }}</el-radio>
+					</el-radio-group>
+			</el-form-item>
+
+            <el-form-item :label="t('dictType')"  v-if="formData.select_type == 1" prop="dict_type">
+                <el-select class="input-width" :placeholder="t('dictTypePlaceholder')" v-model="formData.dict_type" filterable remote clearable>
+                    <el-option :label="item.name" :value="item.key" v-for="item in dicList" :key="item.key" />
+                </el-select>
+            </el-form-item>
+               
+            <el-form-item :label="t('addons')" prop="addon" v-if="formData.select_type == 2">
+                <el-select v-model="formData.addon" :placeholder="t('addonsPlaceholder')" class="input-width" @change="addonChange">
+                    <el-option v-for="(item, index) in addonList" :label="item.title" :value="item.key" :key="index" />
+                </el-select>
+            </el-form-item>
+
+            <el-form-item :label="t('associatedModel')" prop="model" v-if="formData.select_type == 2">
+                <el-select :placeholder="t('associatedModelPlaceholder')" v-model="formData.model" class="input-width" filterable  @change="modelChange"> 
+                    <el-option v-for="item in modelList" :label="item" :value="item" :key="item" />
+                </el-select>
+            </el-form-item>
+
+             <el-form-item prop="value_key" :label="t('remotePullDownValue')" v-if="formData.select_type == 2">
+                <el-select class="input-width" :placeholder="t('remotePullDownValuePlaceholder')" v-model="formData.value_key">
+                    <el-option :label="`${item.name}:${item.comment}`" :value="item.name" v-for="(item, index) in keyList" :key="index" />
+                </el-select>
+            </el-form-item>
+
+            <el-form-item prop="label_key" :label="t('remotePullDownLabel')" v-if="formData.select_type == 2">
+                <el-select class="input-width" :placeholder="t('remotePullDownLabelPlaceholder')" v-model="formData.label_key">
+                    <el-option :label="`${item.name}:${item.comment}`" :value="item.name" v-for="(item, index) in keyList" :key="index" />
+                </el-select>
+            </el-form-item>
+        </el-form>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup async>
@@ -138,11 +53,7 @@ import { t } from '@/lang'
 import { getDictAll } from '@/app/api/dict'
 import type { FormInstance } from 'element-plus'
 import { cloneDeep } from 'lodash-es'
-import {
-  getGeneratorAllModel,
-  getAddonDevelop,
-  getGeneratorModelTableColumn,
-} from '@/app/api/tools'
+import { getGeneratorAllModel, getAddonDevelop,getGeneratorModelTableColumn } from '@/app/api/tools'
 
 const showDialog = ref(false)
 const title = ref('')
@@ -150,12 +61,12 @@ const title = ref('')
  * 表单数据
  */
 const initialFormData = {
-  select_type: 1,
-  dict_type: '',
-  addon: '',
-  model: '',
-  value_key: '',
-  label_key: '',
+    select_type : 1,
+    dict_type: "",
+    addon: "",
+    model: "",
+    value_key: "",
+    label_key: ""
 }
 const formData: Record<string, any> = ref({ ...initialFormData })
 
@@ -166,120 +77,112 @@ const dicList = ref<Array<any>>([])
  * 获取关联模型
  */
 const modelList = ref([])
-const getGeneratorAllModelFn = (params: any) => {
-  getGeneratorAllModel(params).then((res) => {
-    modelList.value = res.data
-  })
+const getGeneratorAllModelFn = (params:any) => {
+    getGeneratorAllModel(params).then(res => {
+        modelList.value = res.data
+    })
 }
 
 //获取插件列表
 const addonList = ref<Array<any>>([])
 const getAddonDevelopFn = async () => {
-  let { data } = await getAddonDevelop({})
-  addonList.value = [{ title: '系统', key: 'system' }]
-  addonList.value.push(...data)
-  getGeneratorAllModelFn({ addon: 'system' })
+    let { data } = await getAddonDevelop({})
+    addonList.value = [{ title: "系统", key: "system" }]
+    addonList.value.push(...data)
+    getGeneratorAllModelFn({addon:'system'})
 }
 getAddonDevelopFn()
 
 //选择应用
-const addonChange = (val: any) => {
-  formData.value.model = ''
-  getGeneratorAllModelFn({ addon: val })
+const addonChange =(val:any)=>{
+    formData.value.model = ''
+   getGeneratorAllModelFn({addon:val})
 }
 
 const keyList = ref([])
-const getGeneratorModelTableColumnFn = (params: any) => {
-  getGeneratorModelTableColumn(params).then((res) => {
-    keyList.value = res.data
-  })
+const getGeneratorModelTableColumnFn = (params:any) => {
+    getGeneratorModelTableColumn(params).then(res => {
+        keyList.value = res.data
+    })
 }
 
 //根据模型获取字段
-const modelChange = (val: any) => {
-  // formData.value.model = ''
-  getGeneratorModelTableColumnFn({ model: val })
+const modelChange = (val:any) => {
+    // formData.value.model = ''
+    getGeneratorModelTableColumnFn({model:val})
 }
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    dict_type: [
-      {
-        validator: (rule: any, value: any, callback: any) => {
-          if (
-            formData.value.select_type == 1 &&
-            formData.value.dict_type == ''
-          ) {
-            callback(new Error(t('dictTypePlaceholder')))
-          } else {
-            callback()
-          }
-        },
-        trigger: 'blur',
-      },
-    ],
-    addon: [
-      {
-        validator: (rule: any, value: any, callback: any) => {
-          if (formData.value.select_type == 2 && formData.value.addon == '') {
-            callback(new Error(t('addonsPlaceholder')))
-          } else {
-            callback()
-          }
-        },
-        trigger: 'blur',
-      },
-    ],
-    model: [
-      {
-        validator: (rule: any, value: any, callback: any) => {
-          if (formData.value.select_type == 2 && formData.value.model == '') {
-            callback(new Error(t('associatedModelPlaceholder')))
-          } else {
-            callback()
-          }
-        },
-        trigger: 'blur',
-      },
-    ],
-    value_key: [
-      {
-        validator: (rule: any, value: any, callback: any) => {
-          if (
-            formData.value.select_type == 2 &&
-            formData.value.value_key == ''
-          ) {
-            callback(new Error(t('remotePullDownValuePlaceholder')))
-          } else {
-            callback()
-          }
-        },
-        trigger: 'blur',
-      },
-    ],
-    label_key: [
-      {
-        validator: (rule: any, value: any, callback: any) => {
-          if (
-            formData.value.select_type == 2 &&
-            formData.value.label_key == ''
-          ) {
-            callback(new Error(t('remotePullDownLabelPlaceholder')))
-          } else {
-            callback()
-          }
-        },
-        trigger: 'blur',
-      },
-    ],
-  }
+    return {
+        dict_type: [
+            {
+            validator: (rule: any, value: any, callback: any) => {
+                if (formData.value.select_type == 1 && formData.value.dict_type == '') {
+                    callback(new Error(t('dictTypePlaceholder')))
+                }else{
+                        callback()
+                    } 
+            },
+            trigger: 'blur'
+        }
+        ],
+        addon: [
+            {
+                validator: (rule: any, value: any, callback: any) => {
+                    if (formData.value.select_type == 2 && formData.value.addon == '') {
+                        callback(new Error(t('addonsPlaceholder')))
+                    }else{
+                        callback()
+                    } 
+                },
+                trigger: 'blur'
+            }
+        ],
+        model: [
+            {
+                validator: (rule: any, value: any, callback: any) => {
+                    if (formData.value.select_type == 2 && formData.value.model == '') {
+                        callback(new Error(t('associatedModelPlaceholder')))
+                    }else{
+                        callback()
+                    }
+                },
+                trigger: 'blur'
+            }
+        ],
+        value_key: [
+            {
+                validator: (rule: any, value: any, callback: any) => {
+                    if (formData.value.select_type == 2 && formData.value.value_key == '') {
+                        callback(new Error(t('remotePullDownValuePlaceholder')))
+                    }else{
+                        callback()
+                    } 
+                },
+                trigger: 'blur'
+            }
+        ],
+        label_key: [
+            {
+                validator: (rule: any, value: any, callback: any) => {
+                    if (formData.value.select_type == 2 && formData.value.label_key == '') {
+                        callback(new Error(t('remotePullDownLabelPlaceholder')))
+                    }else{
+                        callback()
+                    } 
+                },
+                trigger: 'blur'
+            }
+        ]
+
+    }
 })
 
 const getDictAllFn = () => {
-  getDictAll().then((res) => {
-    dicList.value = res.data
-  })
+    getDictAll().then((res) => {
+        dicList.value = res.data
+    })
 }
 const emit = defineEmits(['complete'])
 /**
@@ -287,32 +190,33 @@ const emit = defineEmits(['complete'])
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      emit('complete', toRaw(formData.value))
-      showDialog.value = false
-    }
-  })
+    if (!formEl) return
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            emit('complete', toRaw(formData.value))
+            showDialog.value = false
+        }
+    })
 }
 
 const setFormData = async (row: any = null) => {
-  formData.value = cloneDeep(Object.assign(initialFormData, row))
-  getDictAllFn()
-  if (formData.value.model != '') {
-    getGeneratorAllModelFn({ addon: formData.value.addon })
-    getGeneratorModelTableColumnFn({ model: formData.value.model })
-  }
-  showDialog.value = true
+    formData.value = cloneDeep(Object.assign(initialFormData, row))
+    getDictAllFn()
+    if(formData.value.model != '')
+    {
+        getGeneratorAllModelFn({addon:formData.value.addon})
+        getGeneratorModelTableColumnFn({model:formData.value.model})
+    }
+    showDialog.value = true
 }
 const beforeClose = (next: any) => {
-  formRef.value?.clearValidate()
-  next()
+    formRef.value?.clearValidate()
+    next()
 }
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
diff --git a/admin/src/app/views/tools/code/edit.vue b/admin/src/app/views/tools/code/edit.vue
index c315efc8..c3502ea1 100644
--- a/admin/src/app/views/tools/code/edit.vue
+++ b/admin/src/app/views/tools/code/edit.vue
@@ -1,305 +1,130 @@
 <template>
-  <div class="main-container" v-loading="loading">
-    <el-card class="card !border-none" shadow="never">
-      <el-page-header :content="pageName" :icon="ArrowLeft" @back="back()" />
-    </el-card>
+    <div class="main-container" v-loading="loading">
 
-    <el-card class="box-card mt-[15px] !border-none" shadow="never">
-      <el-tabs v-model="activeName" class="demo-tabs">
-        <el-tab-pane :label="t('basicSettings')" name="basicSettings">
-          <el-form :model="formData" label-width="70px" class="page-form">
-            <el-form-item :label="t('tableName')">
-              <el-input
-                v-model.trim="formData.table_name"
-                disabled
-                :placeholder="t('tableNamePlaceholder')"
-                class="input-width"
-                maxlength="64"
-              />
-            </el-form-item>
-            <el-form-item :label="t('tableContent')">
-              <el-input
-                v-model.trim="formData.table_content"
-                clearable
-                :placeholder="t('tableContentPlaceholder')"
-                class="input-width"
-                maxlength="64"
-              />
-            </el-form-item>
-            <el-form-item :label="t('addon')">
-              <el-select
-                class="input-width"
-                :placeholder="t('addonPlaceholder1')"
-                v-model="formData.addon_name"
-                filterable
-                remote
-                clearable
-                :remote-method="getAddonDevelopFn"
-                @change="addonChange"
-              >
-                <el-option
-                  :label="item.title"
-                  :value="item.key"
-                  v-for="item in addonList"
-                  :key="item.key"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item :label="t('moduleName')">
-              <div>
-                <el-input
-                  v-model.trim="formData.module_name"
-                  clearable
-                  :placeholder="t('moduleNamePlaceholder')"
-                  class="input-width"
-                />
-                <p class="text-[12px] text-[#a9a9a9] leading-normal mt-[5px]">
-                  生成代码所属功能模块，对应路由名称，例如会员模块，充值模块，订单模块等
-                </p>
-                <p class="text-[12px] text-[#a9a9a9] leading-normal mt-[5px]">
-                  命名规范，小写，多个单词使用下划线连接,例如:
-                  member，article_category
-                </p>
-              </div>
-            </el-form-item>
-            <el-form-item :label="t('className')">
-              <div>
-                <el-input
-                  v-model.trim="formData.class_name"
-                  clearable
-                  :placeholder="t('classNamePlaceholder')"
-                  class="input-width"
-                />
-                <p class="text-[12px] text-[#a9a9a9] leading-normal mt-[5px]">
-                  生成代码所属文件名称，controller，model，service，等类型文件名
-                </p>
-                <p class="text-[12px] text-[#a9a9a9] leading-normal mt-[5px]">
-                  命名规范，小写，多个单词使用下划线连接,例如: article_category
-                </p>
-              </div>
-            </el-form-item>
-          </el-form>
-        </el-tab-pane>
-        <el-tab-pane :label="t('fieldSettings')" name="fieldSettings">
-          <el-table
-            :data="formData.table_column"
-            size="large"
-            ref="tableRef"
-            :key="toggleIndex"
-          >
-            <el-table-column align="center" label="操作" width="80">
-              <template #default>
-                <i class="iconfont icontuodong vues-rank"></i>
-              </template>
-            </el-table-column>
-            <el-table-column
-              :label="t('columnName')"
-              prop="column_name"
-              min-width="130px"
-            />
-            <el-table-column
-              :label="t('columnComment')"
-              prop=""
-              min-width="220px"
-            >
-              <template #default="{ row }">
-                <el-input
-                  v-model.trim="row.column_comment"
-                  :placeholder="t('columnCommentPlaceholder')"
-                />
-              </template>
-            </el-table-column>
-            <el-table-column
-              :label="t('columnType')"
-              prop="column_type"
-              width="100px"
-            />
-            <el-table-column
-              :label="t('isPk')"
-              prop=""
-              align="center"
-              width="65px"
-            >
-              <template #default="{ row }">
-                <el-checkbox
-                  v-model="row.is_pk"
-                  disabled
-                  :true-label="1"
-                  :false-label="0"
-                />
-              </template>
-            </el-table-column>
-            <el-table-column
-              :label="t('isRequired')"
-              prop=""
-              align="center"
-              width="65px"
-            >
-              <template #default="{ row }">
-                <el-checkbox
-                  v-model="row.is_required"
-                  :true-label="1"
-                  :false-label="0"
-                />
-              </template>
-            </el-table-column>
-            <el-table-column
-              :label="t('isInsert')"
-              prop=""
-              align="center"
-              width="65px"
-            >
-              <template #default="{ row }">
-                <el-checkbox
-                  v-model="row.is_insert"
-                  :true-label="1"
-                  :false-label="0"
-                />
-              </template>
-            </el-table-column>
-            <el-table-column
-              :label="t('isUpdate')"
-              prop=""
-              align="center"
-              width="65px"
-            >
-              <template #default="{ row }">
-                <el-checkbox
-                  v-model="row.is_update"
-                  :true-label="1"
-                  :false-label="0"
-                />
-              </template>
-            </el-table-column>
-            <el-table-column
-              :label="t('isLists')"
-              prop=""
-              align="center"
-              width="65px"
-            >
-              <template #default="{ row }">
-                <el-checkbox
-                  v-model="row.is_lists"
-                  :true-label="1"
-                  :false-label="0"
-                />
-              </template>
-            </el-table-column>
-            <el-table-column
-              :label="t('isSearch')"
-              prop=""
-              align="center"
-              width="65px"
-            >
-              <template #default="{ row }">
-                <el-checkbox
-                  v-model="row.is_search"
-                  :true-label="1"
-                  :false-label="0"
-                />
-              </template>
-            </el-table-column>
-            <!-- <el-table-column :label="t('isQuery')" prop="" width="80px">
+        <el-card class="card !border-none" shadow="never">
+            <el-page-header :content="pageName" :icon="ArrowLeft" @back="back()" />
+        </el-card>
+
+        <el-card class="box-card mt-[15px] !border-none" shadow="never">
+            <el-tabs v-model="activeName" class="demo-tabs">
+                <el-tab-pane :label="t('basicSettings')" name="basicSettings">
+                    <el-form :model="formData" label-width="70px" class="page-form">
+                        <el-form-item :label="t('tableName')">
+                            <el-input v-model.trim="formData.table_name" disabled :placeholder="t('tableNamePlaceholder')" class="input-width" maxlength="64" />
+                        </el-form-item>
+                        <el-form-item :label="t('tableContent')">
+                            <el-input v-model.trim="formData.table_content" clearable :placeholder="t('tableContentPlaceholder')" class="input-width" maxlength="64" />
+                        </el-form-item>
+                        <el-form-item :label="t('addon')">
+                            <el-select class="input-width" :placeholder="t('addonPlaceholder1')" v-model="formData.addon_name" filterable remote clearable :remote-method="getAddonDevelopFn" @change="addonChange">
+                                <el-option :label="item.title" :value="item.key" v-for="item in addonList" :key="item.key" />
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item :label="t('moduleName')">
+                            <div>
+                                <el-input v-model.trim="formData.module_name" clearable :placeholder="t('moduleNamePlaceholder')" class="input-width" />
+                                <p class="text-[12px] text-[#a9a9a9] leading-normal mt-[5px]">生成代码所属功能模块，对应路由名称，例如会员模块，充值模块，订单模块等</p>
+                                <p class="text-[12px] text-[#a9a9a9] leading-normal mt-[5px]">命名规范，小写，多个单词使用下划线连接,例如: member，article_category</p>
+                            </div>
+
+                        </el-form-item>
+                        <el-form-item :label="t('className')">
+                            <div>
+                                <el-input v-model.trim="formData.class_name" clearable :placeholder="t('classNamePlaceholder')" class="input-width" />
+                                <p class="text-[12px] text-[#a9a9a9] leading-normal mt-[5px]">生成代码所属文件名称，controller，model，service，等类型文件名</p>
+                                <p class="text-[12px] text-[#a9a9a9] leading-normal mt-[5px]">命名规范，小写，多个单词使用下划线连接,例如: article_category</p>
+                            </div>
+                        </el-form-item>
+                    </el-form>
+                </el-tab-pane>
+                <el-tab-pane :label="t('fieldSettings')" name="fieldSettings">
+                    <el-table :data="formData.table_column" size="large" ref="tableRef" :key="toggleIndex">
+                        <el-table-column align="center" label="操作" width="80">
+                            <template #default>
+                                <i class="iconfont icontuodong vues-rank"></i>
+                            </template>
+                        </el-table-column>
+                        <el-table-column :label="t('columnName')" prop="column_name" min-width="130px" />
+                        <el-table-column :label="t('columnComment')" prop="" min-width="220px">
+                            <template #default="{ row }">
+                                <el-input v-model.trim="row.column_comment" :placeholder="t('columnCommentPlaceholder')" />
+                            </template>
+                        </el-table-column>
+                        <el-table-column :label="t('columnType')" prop="column_type" width="100px" />
+                        <el-table-column :label="t('isPk')" prop="" align="center" width="65px">
+                            <template #default="{ row }">
+                                <el-checkbox v-model="row.is_pk" disabled :true-label="1" :false-label="0" />
+                            </template>
+                        </el-table-column>
+                        <el-table-column :label="t('isRequired')" prop="" align="center" width="65px">
+                            <template #default="{ row }">
+                                <el-checkbox v-model="row.is_required" :true-label="1" :false-label="0" />
+                            </template>
+                        </el-table-column>
+                        <el-table-column :label="t('isInsert')" prop="" align="center" width="65px">
+                            <template #default="{ row }">
+                                <el-checkbox v-model="row.is_insert" :true-label="1" :false-label="0" />
+                            </template>
+                        </el-table-column>
+                        <el-table-column :label="t('isUpdate')" prop="" align="center" width="65px">
+                            <template #default="{ row }">
+                                <el-checkbox v-model="row.is_update" :true-label="1" :false-label="0" />
+                            </template>
+                        </el-table-column>
+                        <el-table-column :label="t('isLists')" prop="" align="center" width="65px">
+                            <template #default="{ row }">
+                                <el-checkbox v-model="row.is_lists" :true-label="1" :false-label="0" />
+                            </template>
+                        </el-table-column>
+                        <el-table-column :label="t('isSearch')" prop="" align="center" width="65px">
+                            <template #default="{ row }">
+                                <el-checkbox v-model="row.is_search" :true-label="1" :false-label="0" />
+                            </template>
+                        </el-table-column>
+                        <!-- <el-table-column :label="t('isQuery')" prop="" width="80px">
                         <template #default="{ row }">
                             <el-checkbox v-model="row.is_query" :true-label="1" :false-label="0" size="large" />
                         </template>
                     </el-table-column> -->
-            <el-table-column :label="t('queryType')" prop="" min-width="170px">
-              <template #default="{ row }">
-                <div class="flex items-center">
-                  <el-select
-                    v-if="row.is_search"
-                    :placeholder="t('selectPlaceholder')"
-                    v-model="row.query_type"
-                  >
-                    <el-option
-                      :label="item"
-                      :value="item"
-                      v-for="(item, index) in queryType"
-                      :key="index"
-                    />
-                  </el-select>
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column :label="t('formType')" prop="" min-width="225px">
-              <template #default="{ row, $index }">
-                <el-select
-                  class="w-[146px]"
-                  :placeholder="t('selectPlaceholder')"
-                  v-model="row.view_type"
-                  @change="viewTypeBtn(row, $index)"
-                >
-                  <el-option
-                    :label="item.label"
-                    :value="item.value"
-                    v-for="(item, index) in viewType"
-                    :key="index"
-                  />
-                </el-select>
-                <el-button
-                  class="ml-[10px]"
-                  v-if="['select', 'radio', 'checkbox'].includes(row.view_type)"
-                  type="primary"
-                  link
-                  @click="viewTypeBtn(row, $index)"
-                  >{{ t('setUp') }}</el-button
-                >
-                <el-button
-                  class="ml-[10px]"
-                  v-if="row.view_type === 'number'"
-                  type="primary"
-                  link
-                  @click="validatorBtn(row, $index)"
-                  >{{ t('setUp') }}</el-button
-                >
-              </template>
-            </el-table-column>
-            <el-table-column :label="t('verifyType')" prop="" min-width="260px">
-              <template #default="{ row, $index }">
-                <div class="flex items-center">
-                  <el-select
-                    class="w-[196px]"
-                    :placeholder="t('selectPlaceholder')"
-                    v-model="row.validate_type"
-                    @change="validatorBtn(row, $index)"
-                    :disabled="!['input', 'textarea'].includes(row.view_type)"
-                  >
-                    <template v-for="(item, index) in verifyType" :key="index">
-                      <el-option
-                        v-if="item.value === 'max'"
-                        :value="item.value"
-                        :label="`最大输入字符`"
-                      />
-                      <el-option
-                        v-else-if="item.value === 'min'"
-                        :value="item.value"
-                        :label="`最小输入字符`"
-                      />
-                      <el-option
-                        v-else-if="item.value === 'between'"
-                        :value="item.value"
-                        :label="`输入字符区间`"
-                      />
-                      <el-option
-                        v-else
-                        :label="item.label"
-                        :value="item.value"
-                      />
-                    </template>
-                  </el-select>
-                  <el-button
-                    class="ml-[10px]"
-                    v-if="['max', 'min', 'between'].includes(row.validate_type)"
-                    type="primary"
-                    link
-                    @click="validatorBtn(row, $index)"
-                    >{{ t('setUp') }}</el-button
-                  >
-                </div>
-              </template>
-            </el-table-column>
-            <!-- <el-table-column :label="t('formValidation')" prop="" min-width="170px">
+                        <el-table-column :label="t('queryType')" prop="" min-width="170px">
+                            <template #default="{ row }">
+                                <div class="flex items-center">
+                                    <el-select v-if="row.is_search" :placeholder="t('selectPlaceholder')" v-model="row.query_type">
+                                        <el-option :label="item" :value="item" v-for="(item, index) in queryType" :key="index" />
+                                    </el-select>
+                                </div>
+                            </template>
+                        </el-table-column>
+                        <el-table-column :label="t('formType')" prop="" min-width="225px">
+                            <template #default="{ row, $index }">
+                                <el-select class="w-[146px]" :placeholder="t('selectPlaceholder')" v-model="row.view_type" @change="viewTypeBtn(row, $index)">
+                                    <el-option :label="item.label" :value="item.value" v-for="(item, index) in viewType" :key="index" />
+                                </el-select>
+                                <el-button class="ml-[10px]" v-if="['select', 'radio', 'checkbox'].includes(row.view_type)" type="primary" link @click="viewTypeBtn(row, $index)">{{ t('setUp') }}</el-button>
+                                <el-button class="ml-[10px]" v-if="row.view_type === 'number'" type="primary" link @click="validatorBtn(row, $index)">{{ t('setUp') }}</el-button>
+                            </template>
+                        </el-table-column>
+                        <el-table-column :label="t('verifyType')" prop="" min-width="260px">
+                            <template #default="{ row, $index }">
+                                <div class="flex items-center">
+                                    <el-select class="w-[196px]" :placeholder="t('selectPlaceholder')"
+                                        v-model="row.validate_type" @change="validatorBtn(row, $index)"
+                                        :disabled="!['input', 'textarea'].includes(row.view_type)">
+                                        <template v-for="(item, index) in verifyType" :key="index">
+                                            <el-option v-if="item.value === 'max'" :value="item.value" :label="`最大输入字符`" />
+                                            <el-option v-else-if="item.value === 'min'" :value="item.value" :label="`最小输入字符`" />
+                                            <el-option v-else-if="item.value === 'between'" :value="item.value" :label="`输入字符区间`" />
+                                            <el-option v-else :label="item.label" :value="item.value" />
+                                        </template>
+                                    </el-select>
+                                    <el-button class="ml-[10px]"
+                                        v-if="['max', 'min', 'between'].includes(row.validate_type)" type="primary" link
+                                        @click="validatorBtn(row, $index)">{{ t('setUp') }}</el-button>
+                                </div>
+
+                            </template>
+                        </el-table-column>
+                        <!-- <el-table-column :label="t('formValidation')" prop="" min-width="170px">
                             <template #default="{ row }">
                                 <el-select :placeholder="t('selectPlaceholder')" v-model="row.view_type">
                                     <el-option :label="item.label" :value="item.value" v-for="(item, index) in viewType"
@@ -307,137 +132,79 @@
                                 </el-select>
                             </template>
                         </el-table-column> -->
-          </el-table>
-        </el-tab-pane>
-        <el-tab-pane :label="t('generationSettings')" name="generationSettings">
-          <el-form
-            :model="formData"
-            class="page-form"
-            label-width="140px"
-            ref="formRef"
-            :rules="rules"
-          >
-            <el-form-item :label="t('deleteType')">
-              <div>
-                <el-radio-group
-                  v-model="formData.is_delete"
-                  @change="deleteTypeChange"
-                >
-                  <el-radio :label="0">{{ t('physicalDeletion') }}</el-radio>
-                  <el-radio :label="1">{{ t('softDeletion') }}</el-radio>
-                </el-radio-group>
-                <p class="text-[12px] text-[#a9a9a9] leading-normal mt-[5px]">
-                  物理删除：从表中把记录移除。软删除：通过标识使得这条记录在系统逻辑层面上不可见
-                </p>
-              </div>
-            </el-form-item>
-            <el-form-item
-              prop="delete_column_name"
-              :label="t('deleteField')"
-              v-if="formData.is_delete"
-            >
-              <div>
-                <el-select
-                  class="input-width"
-                  :placeholder="t('deleteFieldPlaceholder')"
-                  v-model="formData.delete_column_name"
-                >
-                  <el-option
-                    :label="`${item.column_name}:${item.column_comment}`"
-                    :value="item.column_name"
-                    v-for="(item, index) in formData.table_column"
-                    :key="index"
-                  />
-                </el-select>
-                <p class="text-[12px] text-[#a9a9a9] leading-normal mt-[5px]">
-                  软删除字段需为int类型，并且默认值为0
-                </p>
-              </div>
-            </el-form-item>
+                    </el-table>
+                </el-tab-pane>
+                <el-tab-pane :label="t('generationSettings')" name="generationSettings">
+                    <el-form :model="formData" class="page-form" label-width="140px" ref="formRef" :rules="rules">
+                        <el-form-item :label="t('deleteType')">
+                            <div>
+                                <el-radio-group v-model="formData.is_delete" @change="deleteTypeChange">
+                                    <el-radio :label="0">{{ t('physicalDeletion') }}</el-radio>
+                                    <el-radio :label="1">{{ t('softDeletion') }}</el-radio>
+                                </el-radio-group>
+                                <p class="text-[12px] text-[#a9a9a9] leading-normal mt-[5px]">物理删除：从表中把记录移除。软删除：通过标识使得这条记录在系统逻辑层面上不可见</p>
+                            </div>
+
+                        </el-form-item>
+                        <el-form-item prop="delete_column_name" :label="t('deleteField')" v-if="formData.is_delete">
+                            <div>
+                                <el-select class="input-width" :placeholder="t('deleteFieldPlaceholder')" v-model="formData.delete_column_name">
+                                    <el-option :label="`${item.column_name}:${item.column_comment}`"
+                                        :value="item.column_name" v-for="(item, index) in formData.table_column "
+                                        :key="index" />
+                                </el-select>
+                                <p class="text-[12px] text-[#a9a9a9] leading-normal mt-[5px]">软删除字段需为int类型，并且默认值为0</p>
+                            </div>
+
+                        </el-form-item>
+
+                        <el-form-item :label="t('editType')">
+                            <div>
+                                <el-radio-group v-model="formData.edit_type" :placeholder="t('editTypePlaceholder')">
+                                    <el-radio :label="1">{{ t('popup') }}</el-radio>
+                                    <el-radio :label="2">{{ t('page') }}</el-radio>
+                                </el-radio-group>
+                                <p class="text-[12px] text-[#a9a9a9] leading-normal mt-[5px]">弹出：弹出框编辑。新页面：跳转页面编辑。</p>
+                            </div>
+                        </el-form-item>
+                        <el-form-item :label="t('orderColumnName')">
+                            <div>
+                                <el-select class="input-width" :placeholder="t('orderColumnNamePlaceholder')"
+                                    v-model="formData.order_column_name" clearable @change="orderColumnNameChange">
+                                    <el-option :label="`${item.column_name}:${item.column_comment}`"
+                                        :value="item.column_name" v-for="(item, index) in formData.table_column "
+                                        :key="index" />
+                                </el-select>
+                                <p class="text-[12px] text-[#a9a9a9] leading-normal mt-[5px]">列表排序规则字段。</p>
+                            </div>
 
-            <el-form-item :label="t('editType')">
-              <div>
-                <el-radio-group
-                  v-model="formData.edit_type"
-                  :placeholder="t('editTypePlaceholder')"
-                >
-                  <el-radio :label="1">{{ t('popup') }}</el-radio>
-                  <el-radio :label="2">{{ t('page') }}</el-radio>
-                </el-radio-group>
-                <p class="text-[12px] text-[#a9a9a9] leading-normal mt-[5px]">
-                  弹出：弹出框编辑。新页面：跳转页面编辑。
-                </p>
-              </div>
-            </el-form-item>
-            <el-form-item :label="t('orderColumnName')">
-              <div>
-                <el-select
-                  class="input-width"
-                  :placeholder="t('orderColumnNamePlaceholder')"
-                  v-model="formData.order_column_name"
-                  clearable
-                  @change="orderColumnNameChange"
-                >
-                  <el-option
-                    :label="`${item.column_name}:${item.column_comment}`"
-                    :value="item.column_name"
-                    v-for="(item, index) in formData.table_column"
-                    :key="index"
-                  />
-                </el-select>
-                <p class="text-[12px] text-[#a9a9a9] leading-normal mt-[5px]">
-                  列表排序规则字段。
-                </p>
-              </div>
-            </el-form-item>
-            <el-form-item
-              :label="t('orderType')"
-              v-if="formData.order_column_name"
-            >
-              <div>
-                <el-select
-                  class="input-width"
-                  :placeholder="t('orderTypePlaceholder')"
-                  v-model="formData.order_type"
-                >
-                  <el-option label="正序 asc" :value="1" />
-                  <el-option label="倒序 desc" :value="2" />
-                </el-select>
-                <p class="text-[12px] text-[#a9a9a9] leading-normal mt-[5px]">
-                  列表排序规则。
-                </p>
-              </div>
-            </el-form-item>
-            <el-form-item :label="t('menuType')">
-              <!-- <div>
+                        </el-form-item>
+                        <el-form-item :label="t('orderType')" v-if="formData.order_column_name">
+                            <div>
+                                <el-select class="input-width" :placeholder="t('orderTypePlaceholder')" v-model="formData.order_type" >
+                                    <el-option label="正序 asc" :value="1" />
+                                    <el-option label="倒序 desc" :value="2" />
+                                </el-select>
+                                <p class="text-[12px] text-[#a9a9a9] leading-normal mt-[5px]">列表排序规则。</p>
+                            </div>
+
+                        </el-form-item>
+                        <el-form-item :label="t('menuType')">
+                            <!-- <div>
                                 <el-radio-group v-model="formData.parent_menu">
                                     <el-radio :label="0">{{ t('manualAddition') }}</el-radio>
                                     <el-radio :label="1">{{ t('autoBuild') }}</el-radio>
                                 </el-radio-group>
                             <p class="text-[12px] text-[#a9a9a9] leading-normal mt-[5px]">自动构建：自动执行生成菜单sql。手动添加：自行添加菜单。</p>
                             </div> -->
-              <el-tree-select
-                class="input-width"
-                v-if="formData.addon_name != ''"
-                clearable
-                v-model="formData.parent_menu"
-                :props="{ label: 'menu_name', value: 'menu_key' }"
-                :data="addonMenuList"
-                check-strictly
-                :render-after-expand="false"
-              />
-              <el-tree-select
-                class="input-width"
-                v-else
-                v-model="formData.parent_menu"
-                clearable
-                :props="{ label: 'menu_name', value: 'menu_key' }"
-                :data="sysMenuList"
-                check-strictly
-                :render-after-expand="false"
-              />
-            </el-form-item>
-            <!-- <el-form-item :label="t('controller')">
+                            <el-tree-select class="input-width" v-if="formData.addon_name != ''" clearable
+                                            v-model="formData.parent_menu" :props="{ label: 'menu_name', value: 'menu_key' }"
+                                :data="addonMenuList" check-strictly :render-after-expand="false" />
+                            <el-tree-select class="input-width" v-else v-model="formData.parent_menu" clearable
+                                            :props="{ label: 'menu_name', value: 'menu_key' }" :data="sysMenuList" check-strictly
+                                :render-after-expand="false" />
+                        </el-form-item>
+                        <!-- <el-form-item :label="t('controller')">
                             <el-input v-model.trim="controller" disabled class="input-width" />
                         </el-form-item>
                         <el-form-item :label="t('dataModel')">
@@ -452,91 +219,43 @@
                         <el-form-item :label="t('routerView')">
                             <el-input v-model.trim="routerView" disabled class="input-width" />
                         </el-form-item> -->
-          </el-form>
-        </el-tab-pane>
-        <el-tab-pane
-          :label="t('associatedConfiguration')"
-          name="associatedConfiguration"
-        >
-          <div class="mb-[20px]">
-            <el-button
-              type="primary"
-              class="w-[100px]"
-              @click="addEvent(null, -1)"
-              >{{ t('insertAssociated') }}</el-button
-            >
-          </div>
-          <el-table :data="formData.relations" size="large">
-            <el-table-column
-              :label="t('associatedType')"
-              prop="type"
-              min-width="130px"
-            />
-            <el-table-column
-              :label="t('associatedName')"
-              prop="name"
-              min-width="130px"
-            />
-            <el-table-column
-              :label="t('addons')"
-              prop="addon"
-              min-width="130px"
-            />
-            <el-table-column
-              :label="t('associatedModel')"
-              prop="model"
-              min-width="130px"
-            />
-            <el-table-column
-              :label="t('localKey')"
-              prop="local_key"
-              min-width="130px"
-            />
-            <el-table-column
-              :label="t('foreignKey')"
-              prop="foreign_key"
-              min-width="130px"
-            />
-            <el-table-column
-              :label="t('operation')"
-              align="right"
-              min-width="130px"
-            >
-              <template #default="{ row, $index }">
-                <el-button type="primary" link @click="addEvent(row, $index)">{{
-                  t('edit')
-                }}</el-button>
-                <el-button type="primary" link @click="deleteEvent($index)">{{
-                  t('delete')
-                }}</el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-tab-pane>
-      </el-tabs>
-    </el-card>
-  </div>
+                    </el-form>
+                </el-tab-pane>
+                <el-tab-pane :label="t('associatedConfiguration')" name="associatedConfiguration">
+                    <div class="mb-[20px]">
+                        <el-button type="primary" class="w-[100px]" @click="addEvent(null, -1)">{{ t('insertAssociated') }}</el-button>
+                    </div>
+                    <el-table :data="formData.relations" size="large">
+                        <el-table-column :label="t('associatedType')" prop="type" min-width="130px" />
+                        <el-table-column :label="t('associatedName')" prop="name" min-width="130px" />
+                        <el-table-column :label="t('addons')" prop="addon" min-width="130px" />
+                        <el-table-column :label="t('associatedModel')" prop="model" min-width="130px" />
+                        <el-table-column :label="t('localKey')" prop="local_key" min-width="130px" />
+                        <el-table-column :label="t('foreignKey')" prop="foreign_key" min-width="130px" />
+                        <el-table-column :label="t('operation')" align="right" min-width="130px">
+                            <template #default="{ row, $index }">
+                                <el-button type="primary" link @click="addEvent(row, $index)">{{ t('edit') }}</el-button>
+                                <el-button type="primary" link @click="deleteEvent($index)">{{ t('delete') }}</el-button>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </el-tab-pane>
+            </el-tabs>
+        </el-card>
+    </div>
 
-  <edit-associated
-    ref="editDialog"
-    :table_name="formData.table_name"
-    @complete="complete"
-  />
-  <edit-view-type ref="editViewTypeRef" @complete="completeViewType" />
-  <edit-verify ref="editVerifyRef" @complete="completeVerify" />
+    <edit-associated ref="editDialog" :table_name="formData.table_name" @complete="complete" />
+    <edit-view-type ref="editViewTypeRef" @complete="completeViewType" />
+    <edit-verify ref="editVerifyRef" @complete="completeVerify" />
 
-  <div class="fixed-footer-wrap">
-    <div class="fixed-footer">
-      <el-button type="primary" @click="onSave(1)">{{ t('save') }}</el-button>
-      <el-button type="primary" @click="onSave(3)">{{
-        t('saveAndSync')
-      }}</el-button>
-      <el-button type="primary" @click="onSave(2)">{{
-        t('saveAndDownload')
-      }}</el-button>
-      <el-button @click="back()">{{ t('cancel') }}</el-button>
+    <div class="fixed-footer-wrap">
+        <div class="fixed-footer">
+            <el-button type="primary" @click="onSave(1)">{{ t('save') }}</el-button>
+            <el-button type="primary" @click="onSave(3)">{{ t('saveAndSync') }}</el-button>
+            <el-button type="primary" @click="onSave(2)">{{ t('saveAndDownload') }}</el-button>
+            <el-button @click="back()">{{ t('cancel') }}</el-button>
+        </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
@@ -548,13 +267,7 @@ import { ArrowLeft } from '@element-plus/icons-vue'
 import editAssociated from '@/app/views/tools/code/components/edit-associated.vue'
 import editViewType from '@/app/views/tools/code/components/edit-view-type.vue'
 import editVerify from '@/app/views/tools/code/components/edit-verify.vue'
-import {
-  getGenerateTableInfo,
-  editGenerateTable,
-  getAddonDevelop,
-  generatorCheckFile,
-  generateCreate,
-} from '@/app/api/tools'
+import { getGenerateTableInfo, editGenerateTable, getAddonDevelop, generatorCheckFile, generateCreate } from '@/app/api/tools'
 import { getMenuByTypeDir } from '@/app/api/sys'
 import { useRoute, useRouter } from 'vue-router'
 import Sortable from 'sortablejs'
@@ -575,177 +288,165 @@ const activeName = ref('basicSettings')
  * 表单数据
  */
 const initialFormData = {
-  id: '',
-  table_name: '',
-  table_content: '',
-  module_name: '',
-  class_name: '',
-  edit_type: 1,
-  table_column: [],
-  editFiledIndex: 0,
+    id: '',
+    table_name: '',
+    table_content: '',
+    module_name: '',
+    class_name: '',
+    edit_type: 1,
+    table_column: [],
+    editFiledIndex: 0
 }
 const queryType = ['=', '!=', '>', '>=', '<', '<=', 'LIKE', 'BETWEEN']
 const viewType = [
-  {
-    label: t('formInput'),
-    value: 'input',
-  },
-  {
-    label: t('formTextarea'),
-    value: 'textarea',
-  },
-  {
-    label: t('formSelect'),
-    value: 'select',
-  },
-  {
-    label: t('formRadio'),
-    value: 'radio',
-  },
-  {
-    label: t('formCheckbox'),
-    value: 'checkbox',
-  },
-  {
-    label: t('formDateTime'),
-    value: 'datetime',
-  },
-  {
-    label: t('formImageSelect'),
-    value: 'imageSelect',
-  },
-  {
-    label: t('formFileSelect'),
-    value: 'fileSelect',
-  },
-  {
-    label: t('formVideoSelect'),
-    value: 'videoSelect',
-  },
-  {
-    label: t('formEditor'),
-    value: 'editor',
-  },
-  {
-    label: t('formNumber'),
-    value: 'number',
-  },
+    {
+        label: t('formInput'),
+        value: 'input'
+    },
+    {
+        label: t('formTextarea'),
+        value: 'textarea'
+    },
+    {
+        label: t('formSelect'),
+        value: 'select'
+    },
+    {
+        label: t('formRadio'),
+        value: 'radio'
+    },
+    {
+        label: t('formCheckbox'),
+        value: 'checkbox'
+    },
+    {
+        label: t('formDateTime'),
+        value: 'datetime'
+    },
+    {
+        label: t('formImageSelect'),
+        value: 'imageSelect'
+    },
+    {
+        label: t('formFileSelect'),
+        value: 'fileSelect'
+    },
+    {
+        label: t('formVideoSelect'),
+        value: 'videoSelect'
+    },
+    {
+        label: t('formEditor'),
+        value: 'editor'
+    },
+    {
+        label: t('formNumber'),
+        value: 'number'
+    }
 ]
 const verifyType = [
-  {
-    label: '无需验证',
-    value: '',
-  },
-  {
-    label: t('mobileVerify'),
-    value: 'mobile',
-  },
-  {
-    label: t('numberVerify'),
-    value: 'number',
-  },
-  {
-    label: t('idCardVerify'),
-    value: 'idCard',
-  },
-  {
-    label: t('emailVerify'),
-    value: 'email',
-  },
-  {
-    label: '',
-    value: 'max',
-  },
-  {
-    label: '',
-    value: 'min',
-  },
-  {
-    label: '',
-    value: 'between',
-  },
+    {
+        label: '无需验证',
+        value: ''
+    },
+    {
+        label: t('mobileVerify'),
+        value: 'mobile'
+    },
+    {
+        label: t('numberVerify'),
+        value: 'number'
+    },
+    {
+        label: t('idCardVerify'),
+        value: 'idCard'
+    },
+    {
+        label: t('emailVerify'),
+        value: 'email'
+    },
+    {
+        label: '',
+        value: 'max'
+    },
+    {
+        label: '',
+        value: 'min'
+    },
+    {
+        label: '',
+        value: 'between'
+    }
 ]
 
 const addonList = ref<Array<any>>([])
 // 获取插件远程搜索
 const getAddonDevelopFn = (search: string) => {
-  getAddonDevelop({ search }).then((res) => {
-    addonList.value = res.data
-    nextTick(() => {
-      rowDrop()
+    getAddonDevelop({ search }).then(res => {
+        addonList.value = res.data
+        nextTick(() => {
+            rowDrop()
+        })
     })
-  })
 }
 // 拖拽排序
 const rowDrop = () => {
-  const tbody = tableRef.value.$el.querySelector(
-    '.el-table__body-wrapper tbody'
-  )
-  Sortable.create(tbody, {
-    handle: '.vues-rank',
-    animation: 300,
-    onEnd({ newIndex, oldIndex }) {
-      const tableData = formData.table_column
-      const currRow = tableData.splice(oldIndex, 1)[0]
-      tableData.splice(newIndex, 0, currRow)
-      toggleIndex.value += 1
-      nextTick(() => {
-        rowDrop()
-      })
-    },
-  })
+    const tbody = tableRef.value.$el.querySelector(
+        '.el-table__body-wrapper tbody'
+    )
+    Sortable.create(tbody, {
+        handle: '.vues-rank',
+        animation: 300,
+        onEnd ({ newIndex, oldIndex }) {
+            const tableData = formData.table_column
+            const currRow = tableData.splice(oldIndex, 1)[0]
+            tableData.splice(newIndex, 0, currRow)
+            toggleIndex.value += 1
+            nextTick(() => {
+                rowDrop()
+            })
+        }
+    })
 }
 onMounted(() => {
-  getAddonDevelopFn('')
+    getAddonDevelopFn('')
 })
 // 删除类型change
 const deleteTypeChange = (val: any) => {
-  formData.delete_column_name = val
-    ? formData.table_column[formData.table_column.length - 1].column_name
-    : ''
+    formData.delete_column_name = val ? formData.table_column[formData.table_column.length - 1].column_name : ''
 }
 // 排序字段change
 const orderColumnNameChange = (val: any) => {
-  formData.order_type = val ? 1 : 0
+    formData.order_type = val ? 1 : 0
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 const controller = computed(() => {
-  return formData.addon_name
-    ? `addon${formData.addon_name ? '\\' + formData.addon_name : ''}\\app\\adminapi\\controller${formData.module_name ? '\\' + formData.module_name : ''}${formData.class_name ? '\\' + formData.class_name : ''}`
-    : `app\\adminapi\\controller${formData.module_name ? '\\' + formData.module_name : ''}${formData.class_name ? '\\' + formData.class_name : ''}`
+    return formData.addon_name ? `addon${formData.addon_name ? '\\' + formData.addon_name : ''}\\app\\adminapi\\controller${formData.module_name ? '\\' + formData.module_name : ''}${formData.class_name ? '\\' + formData.class_name : ''}` : `app\\adminapi\\controller${formData.module_name ? '\\' + formData.module_name : ''}${formData.class_name ? '\\' + formData.class_name : ''}`
 })
 const dataModel = computed(() => {
-  return formData.addon_name
-    ? `addon${formData.addon_name ? '\\' + formData.addon_name : ''}\\app\\model${formData.module_name ? '\\' + formData.module_name : ''}${formData.class_name ? '\\' + formData.class_name : ''}`
-    : `app\\model${formData.module_name ? '\\' + formData.module_name : ''}${formData.class_name ? '\\' + formData.class_name : ''}`
+    return formData.addon_name ? `addon${formData.addon_name ? '\\' + formData.addon_name : ''}\\app\\model${formData.module_name ? '\\' + formData.module_name : ''}${formData.class_name ? '\\' + formData.class_name : ''}` : `app\\model${formData.module_name ? '\\' + formData.module_name : ''}${formData.class_name ? '\\' + formData.class_name : ''}`
 })
 const validator = computed(() => {
-  return formData.addon_name
-    ? `addon${formData.addon_name ? '\\' + formData.addon_name : ''}\\app\\validate${formData.module_name ? '\\' + formData.module_name : ''}${formData.class_name ? '\\' + formData.class_name : ''}`
-    : `app\\validate${formData.module_name ? '\\' + formData.module_name : ''}${formData.class_name ? '\\' + formData.class_name : ''}`
+    return formData.addon_name ? `addon${formData.addon_name ? '\\' + formData.addon_name : ''}\\app\\validate${formData.module_name ? '\\' + formData.module_name : ''}${formData.class_name ? '\\' + formData.class_name : ''}` : `app\\validate${formData.module_name ? '\\' + formData.module_name : ''}${formData.class_name ? '\\' + formData.class_name : ''}`
 })
 const webView = computed(() => {
-  return formData.addon_name
-    ? `addon${formData.addon_name ? '\\' + formData.addon_name : ''}\\admin\\src`
-    : 'admin\\src'
+    return formData.addon_name ? `addon${formData.addon_name ? '\\' + formData.addon_name : ''}\\admin\\src` : 'admin\\src'
 })
 const routerView = computed(() => {
-  return formData.addon_name
-    ? `addon${formData.addon_name ? '\\' + formData.addon_name : ''}\\app\\adminapi\\route${formData.module_name ? '\\' + formData.module_name : ''}`
-    : `app\\adminapi\\route${formData.module_name ? '\\' + formData.module_name : ''}`
+    return formData.addon_name ? `addon${formData.addon_name ? '\\' + formData.addon_name : ''}\\app\\adminapi\\route${formData.module_name ? '\\' + formData.module_name : ''}` : `app\\adminapi\\route${formData.module_name ? '\\' + formData.module_name : ''}`
 })
 const setFormData = async (id: number = 0) => {
-  Object.assign(formData, initialFormData)
-  const data = await (await getGenerateTableInfo(id)).data
-  Object.keys(data).forEach((key: string) => {
-    if (data[key] != undefined) formData[key] = data[key]
-  })
-  formData.table_column.forEach((el: any) => {
-    el.betweenMin = cloneDeep(el.min_number)
-    el.betweenMax = cloneDeep(el.max_number)
-  })
-  if (formData.addon_name != '') getAddonMenuFn(formData.addon_name)
-  loading.value = false
+    Object.assign(formData, initialFormData)
+    const data = await (await getGenerateTableInfo(id)).data
+    Object.keys(data).forEach((key: string) => {
+        if (data[key] != undefined) formData[key] = data[key]
+    })
+    formData.table_column.forEach((el:any) => {
+        el.betweenMin = cloneDeep(el.min_number)
+        el.betweenMax = cloneDeep(el.max_number)
+    })
+    if (formData.addon_name != '') getAddonMenuFn(formData.addon_name)
+    loading.value = false
 }
 if (id) setFormData(id)
 
@@ -755,131 +456,120 @@ const sysMenuList = ref<Array<any>>([])
 const addonMenuList = ref<Array<any>>([])
 // 获取系统菜单列表
 const getSystemMenuFn = async () => {
-  const { data } = await getMenuByTypeDir()
-  sysMenuList.value = [{ menu_name: '顶级', menu_key: '' }]
-  sysMenuList.value.push(...data)
+    const { data } = await getMenuByTypeDir()
+    sysMenuList.value = [{ menu_name: '顶级', menu_key: '' }]
+    sysMenuList.value.push(...data)
 }
 getSystemMenuFn()
 // 获取系统应用菜单列表
 const getAddonMenuFn = async (key: any) => {
-  const { data } = await getMenuByTypeDir(key)
-  addonMenuList.value = data
+    const { data } = await getMenuByTypeDir(key)
+    addonMenuList.value = data
 }
 // 选择插件
 const addonChange = async (val: any) => {
-  formData.parent_menu = ''
-  if (val != '') {
-    await getAddonMenuFn(val)
-    if (addonMenuList.value[0])
-      formData.parent_menu = addonMenuList.value[0].menu_key
-  }
+    formData.parent_menu = ''
+    if (val != '') {
+        await getAddonMenuFn(val)
+        if (addonMenuList.value[0]) formData.parent_menu = addonMenuList.value[0].menu_key
+    }
 }
 const associatedIndex = ref(0)
 const editDialog = ref()
 // 添加编辑关联设置
 
 const addEvent = (val: any, index: number) => {
-  associatedIndex.value = index
-  editDialog.value.setFormData(val)
+    associatedIndex.value = index
+    editDialog.value.setFormData(val)
 }
 const complete = (row: any) => {
-  if (associatedIndex.value != -1) {
-    formData.relations.splice(associatedIndex.value, 1, row)
-  } else {
-    formData.relations.unshift(row)
-  }
+    if (associatedIndex.value != -1) {
+        formData.relations.splice(associatedIndex.value, 1, row)
+    } else {
+        formData.relations.unshift(row)
+    }
 }
 // 删除关联配置
 const deleteEvent = (index: number) => {
-  formData.relations.splice(index, 1)
+    formData.relations.splice(index, 1)
 }
 const onSave = async (code: number) => {
-  const data = cloneDeep(formData)
-  // if (data.table_column.some(el => { return ['select', 'radio', 'checkbox'].includes(el.view_type) && el.dict_type == '' })) {
-  //     // ElMessage({
-  //     //     type: 'error',
-  //     //     message: t('dictTypePlaceholder'),
-  //     // })
-  //     // return false
-  // }
+    const data = cloneDeep(formData)
+    // if (data.table_column.some(el => { return ['select', 'radio', 'checkbox'].includes(el.view_type) && el.dict_type == '' })) {
+    //     // ElMessage({
+    //     //     type: 'error',
+    //     //     message: t('dictTypePlaceholder'),
+    //     // })
+    //     // return false
+    // }
 
-  data.table_column = JSON.stringify(
-    data.table_column.map((el: any) => {
-      if (!el.is_search) el.query_type = ''
-      if (el.validate_type === 'between' || el.view_type === 'number') {
-        el.max_number = el.betweenMax
-        el.min_number = el.betweenMin
-      }
-      if (!['select', 'radio', 'checkbox'].includes(el.view_type))
-        el.dict_type = ''
-      return el
-    })
-  )
+    data.table_column = JSON.stringify(data.table_column.map((el:any) => {
+        if (!el.is_search) el.query_type = ''
+        if (el.validate_type === 'between' || el.view_type === 'number') {
+            el.max_number = el.betweenMax
+            el.min_number = el.betweenMin
+        }
+        if (!['select', 'radio', 'checkbox'].includes(el.view_type)) el.dict_type = ''
+        return el
+    }))
 
-  data.relations = JSON.stringify(data.relations)
-  loading.value = true
-  editGenerateTable(data)
-    .then((res: any) => {
-      if (code === 3) {
-        generatorCheckFileFn()
-      } else if (code === 2) {
-        generateCreateFn(code)
-      } else {
+    data.relations = JSON.stringify(data.relations)
+    loading.value = true
+    editGenerateTable(data).then((res: any) => {
+        if (code === 3) {
+            generatorCheckFileFn()
+        } else if (code === 2) {
+            generateCreateFn(code)
+        } else {
+            loading.value = false
+            setTimeout(() => {
+                window.codeActiveName = 'codeList'
+                back()
+            }, 650)
+        }
+    }).catch(() => {
         loading.value = false
-        setTimeout(() => {
-          window.codeActiveName = 'codeList'
-          back()
-        }, 650)
-      }
-    })
-    .catch(() => {
-      loading.value = false
     })
 }
 /**
  * 同步校验
  */
-const generatorCheckFileFn = () => {
-  generatorCheckFile({ id: formData.id })
-    .then((res) => {
-      loading.value = false
-      ElMessageBox.confirm(
-        res.msg != '2' ? t('saveAndSyncText') : t('saveAndSyncText1'),
-        t('warning'),
-        {
-          confirmButtonText: t('confirm'),
-          cancelButtonText: t('cancel'),
-        }
-      )
-        .then(() => {
-          loading.value = true
-          generateCreateFn(3)
+const generatorCheckFileFn = (() => {
+    generatorCheckFile({ id: formData.id }).then(res => {
+        loading.value = false
+        ElMessageBox.confirm(
+                res.msg != '2' ? t('saveAndSyncText') : t('saveAndSyncText1'),
+                t('warning'),
+                {
+                    confirmButtonText: t('confirm'),
+                    cancelButtonText: t('cancel')
+                }
+        ).then(() => {
+            loading.value = true
+            generateCreateFn(3)
+        }).catch(() => {
         })
-        .catch(() => {})
-    })
-    .catch(() => {
-      loading.value = false
+    }).catch(() => {
+        loading.value = false
     })
-}
+})
 /**
  * 同步or下载
  */
 const generateCreateFn = (generate_type: any) => {
-  generateCreate({ id: formData.id, generate_type })
-    .then((res) => {
-      loading.value = false
-      ElMessage({
-        type: 'success',
-        message: '操作成功',
-      })
-      window.open(img(res.data.file), '_blank')
-      setTimeout(() => {
-        window.codeActiveName = 'codeList'
-        back()
-      }, 650)
-    })
-    .catch(() => {
-      loading.value = false
+    generateCreate({ id: formData.id, generate_type }).then(res => {
+        loading.value = false
+        ElMessage({
+            type: 'success',
+            message: '操作成功'
+        })
+        window.open(img(res.data.file), '_blank')
+        setTimeout(() => {
+            window.codeActiveName = 'codeList'
+            back()
+        }, 650)
+    }).catch(() => {
+        loading.value = false
     })
 }
 const rowIndex = ref(0)
@@ -890,62 +580,59 @@ const editViewTypeRef = ref(null)
  * 打开最大最小值设置
  */
 const validatorBtn = (row: any, index: number) => {
-  if (
-    ['max', 'min', 'between'].includes(row.validate_type) ||
-    row.view_type === 'number'
-  ) {
-    rowIndex.value = index
-    editVerifyRef.value?.setFormData(row)
-  }
+    if (['max', 'min', 'between'].includes(row.validate_type) || row.view_type === 'number') {
+        rowIndex.value = index
+        editVerifyRef.value?.setFormData(row)
+    }
 }
 const completeVerify = (row: any) => {
-  formData.table_column.splice(rowIndex.value, 1, row)
+    formData.table_column.splice(rowIndex.value, 1, row)
 }
 const viewTypeBtn = (row: any, index: number) => {
-  if (!['input', 'textarea'].includes(row.view_type)) row.validate_type = ''
-  if (['select', 'radio', 'checkbox'].includes(row.view_type)) {
-    rowIndex.value = index
-    editViewTypeRef.value?.setFormData(row)
-  } else if (row.view_type === 'number') {
-    validatorBtn(row, index)
-  }
+    if (!['input', 'textarea'].includes(row.view_type)) row.validate_type = ''
+    if (['select', 'radio', 'checkbox'].includes(row.view_type)) {
+        rowIndex.value = index
+        editViewTypeRef.value?.setFormData(row)
+    } else if (row.view_type === 'number') {
+        validatorBtn(row, index)
+    }
 }
 const completeViewType = (row: object) => {
-  if (row.select_type == 1) {
-    Object.assign(row, {
-      addon: '',
-      model: '',
-      value_key: '',
-      label_key: '',
-    })
-  } else {
-    row.dict_type = ''
-  }
-  formData.table_column.splice(rowIndex.value, 1, row)
+    if (row.select_type == 1) {
+        Object.assign(row, {
+            addon: "",
+            model: "",
+            value_key: "",
+            label_key: ""
+        })
+    } else {
+        row.dict_type = ''
+    }
+    formData.table_column.splice(rowIndex.value, 1, row)
 }
 const back = () => {
-  router.push({ path: '/tools/code' })
+    router.push({ path: '/tools/code' })
 }
 </script>
 
 <style lang="scss" scoped>
 .dashed-border {
-  border-color: var(--el-border-color-light);
+    border-color: var(--el-border-color-light);
 
-  &:hover {
-    border-color: var(--el-color-primary);
-  }
+    &:hover {
+        border-color: var(--el-color-primary);
+    }
 
-  &.activate {
-    border-color: var(--el-color-primary);
-  }
+    &.activate {
+        border-color: var(--el-color-primary);
+    }
 }
 
 .icon-btn {
-  background-color: var(--el-color-primary);
+    background-color: var(--el-color-primary);
 }
 
 :deep(.el-card__body) {
-  padding-left: 30px;
+    padding-left: 30px;
 }
 </style>
diff --git a/admin/src/app/views/tools/code/index.vue b/admin/src/app/views/tools/code/index.vue
index fc142c8d..978e7f90 100644
--- a/admin/src/app/views/tools/code/index.vue
+++ b/admin/src/app/views/tools/code/index.vue
@@ -1,284 +1,179 @@
 <template>
-  <!--代码生成-->
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
-
-      <el-tabs v-model="activeName" class="mt-[20px]">
-        <el-tab-pane :label="t('codeGeneration')" name="codeGeneration">
-          <el-steps :active="5" direction="vertical">
-            <el-step>
-              <template #title>
-                <p class="text-[14px] font-[700]">
-                  {{ t('step1') }}
-                </p>
-              </template>
-              <template #description>
-                <span class="text-[#999]">{{ t('describe1') }}</span>
-                <div class="mt-[20px] mb-[40px] h-[32px]">
-                  <el-button
-                    type="primary"
-                    class="w-[100px]"
-                    @click="addEvent"
-                    >{{ t('btn1') }}</el-button
-                  >
-                </div>
-              </template>
-            </el-step>
-
-            <el-step>
-              <template #title>
-                <p class="text-[14px] font-[700]">
-                  {{ t('step2') }}
-                </p>
-              </template>
-              <template #description>
-                <span class="text-[#999]">{{ t('describe2') }}</span>
-                <div class="mt-[20px] mb-[40px] h-[32px]"></div>
-              </template>
-            </el-step>
-
-            <el-step>
-              <template #title>
-                <p class="text-[14px] font-[700]">
-                  {{ t('step3') }}
-                </p>
-              </template>
-              <template #description>
-                <span class="text-[#999]">{{ t('describe3') }}</span>
-                <div class="mt-[20px] mb-[40px] h-[32px]"></div>
-              </template>
-            </el-step>
-
-            <el-step>
-              <template #title>
-                <p class="text-[14px] font-[700]">
-                  {{ t('step4') }}
-                </p>
-              </template>
-              <template #description>
-                <span class="text-[#999]">{{ t('describe4') }}</span>
-                <div class="mt-[20px] mb-[40px] h-[32px]"></div>
-              </template>
-            </el-step>
-
-            <el-step>
-              <template #title>
-                <p class="text-[14px] font-[700]">
-                  {{ t('step5') }}
-                </p>
-              </template>
-              <template #description>
-                <span class="text-[#999]">{{ t('describe5') }}</span>
-                <div class="mt-[20px] mb-[40px] h-[32px]"></div>
-              </template>
-            </el-step>
-          </el-steps>
-        </el-tab-pane>
-        <el-tab-pane :label="t('codeList')" name="codeList">
-          <el-card
-            class="box-card !border-none my-[10px] table-search-wrap"
-            shadow="never"
-          >
-            <el-form
-              :inline="true"
-              :model="codeTableData.searchParam"
-              ref="searchFormRef"
-            >
-              <el-form-item :label="t('addonName')" prop="addon_name">
-                <el-select
-                  v-model="codeTableData.searchParam.addon_name"
-                  placeholder="全部"
-                  filterable
-                  remote
-                  clearable
-                  :remote-method="getAddonDevelopFn"
-                >
-                  <el-option label="全部" value="" />
-                  <el-option label="系统" value="2" />
-                  <el-option
-                    :label="item.title"
-                    :value="item.key"
-                    v-for="item in addonList"
-                    :key="item.key"
-                  />
-                </el-select>
-              </el-form-item>
-
-              <el-form-item :label="t('tableName')" prop="table_name">
-                <el-input
-                  v-model.trim="codeTableData.searchParam.table_name"
-                  :placeholder="t('tableNamePlaceholder')"
-                />
-              </el-form-item>
-              <el-form-item>
-                <el-button type="primary" @click="loadGenerateTableList()">{{
-                  t('search')
-                }}</el-button>
-                <el-button @click="resetForm(searchFormRef)">{{
-                  t('reset')
-                }}</el-button>
-              </el-form-item>
-            </el-form>
-          </el-card>
-          <div>
-            <el-table
-              :data="codeTableData.data"
-              size="large"
-              v-loading="codeTableData.loading"
-            >
-              <template #empty>
-                <span>{{ !codeTableData.loading ? t('emptyData') : '' }}</span>
-              </template>
-
-              <el-table-column
-                prop="table_name"
-                :show-overflow-tooltip="true"
-                :label="t('tableName')"
-                min-width="120"
-              />
-              <el-table-column
-                prop="title"
-                :show-overflow-tooltip="true"
-                :label="t('addonName')"
-                min-width="120"
-              />
-              <el-table-column
-                prop="table_content"
-                :show-overflow-tooltip="true"
-                :label="t('tableContent')"
-                min-width="120"
-              />
-
-              <el-table-column
-                prop="edit_type"
-                :label="t('editType')"
-                min-width="150"
-                align="center"
-              >
-                <template #default="{ row }">
-                  {{ row.edit_type == 1 ? t('popup') : t('page') }}
-                </template>
-              </el-table-column>
-
-              <el-table-column
-                :label="t('createTime')"
-                min-width="180"
-                align="center"
-              >
-                <template #default="{ row }">
-                  {{ row.create_time || '' }}
-                </template>
-              </el-table-column>
-
-              <el-table-column
-                :label="t('operation')"
-                fixed="right"
-                align="right"
-                width="330"
-              >
-                <template #default="{ row }">
-                  <el-button type="primary" link @click="editEvent(row)">{{
-                    t('edit')
-                  }}</el-button>
-                  <el-button
-                    type="primary"
-                    link
-                    @click="generatePreviewFn(row.id)"
-                    >{{ t('preview') }}</el-button
-                  >
-                  <el-button
-                    type="primary"
-                    link
-                    @click="generatorCheckFileFn(row.id)"
-                    >{{ t('saveAndSync') }}</el-button
-                  >
-                  <el-button
-                    type="primary"
-                    link
-                    @click="generateCreateFn(row.id, 2)"
-                    >{{ t('download') }}</el-button
-                  >
-                  <el-button type="primary" link @click="deleteEvent(row.id)">{{
-                    t('delete')
-                  }}</el-button>
-                </template>
-              </el-table-column>
-            </el-table>
-            <div class="mt-[16px] flex justify-end">
-              <el-pagination
-                v-model:current-page="codeTableData.page"
-                v-model:page-size="codeTableData.limit"
-                layout="total, sizes, prev, pager, next, jumper"
-                :total="codeTableData.total"
-                @size-change="loadGenerateTableList()"
-                @current-change="loadGenerateTableList"
-              />
+    <!--代码生成-->
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
             </div>
-          </div>
-        </el-tab-pane>
-      </el-tabs>
-
-      <add-table ref="addCodeDialog" />
-
-      <el-dialog
-        v-model="dialogVisible"
-        class="dialog-visible"
-        width="70%"
-        title="代码预览"
-      >
-        <div class="flex h-[50vh]" v-loading="codeLoading">
-          <el-scrollbar class="h-[100%] w-[270px]">
-            <el-tree
-              v-if="treeData.length && treeKey != ''"
-              :data="treeData"
-              :props="{ label: 'name', value: 'key' }"
-              node-key="key"
-              :current-node-key="treeKey"
-              :expand-on-click-node="false"
-              highlight-current
-              default-expand-all
-              ref="treeRef"
-              @node-click="nodeClick"
-            >
-              <template #default="{ node, data }">
-                <div class="flex items-center">
-                  <el-icon v-if="data.children">
-                    <Folder v-if="!node.expanded" />
-                    <FolderOpened v-else />
-                  </el-icon>
-                  <el-icon v-else>
-                    <Document />
-                  </el-icon>
-                  <span class="pl-[5px]">{{ data.name }}</span>
+
+            <el-tabs v-model="activeName" class="mt-[20px]">
+                <el-tab-pane :label="t('codeGeneration')" name="codeGeneration">
+                    <el-steps :active="5" direction="vertical">
+                        <el-step>
+                            <template #title>
+                                <p class="text-[14px] font-[700]">
+                                    {{ t("step1") }}
+                                </p>
+                            </template>
+                            <template #description>
+                                <span class="text-[#999]">{{ t("describe1") }}</span>
+                                <div class="mt-[20px] mb-[40px] h-[32px]">
+                                    <el-button type="primary" class="w-[100px]" @click="addEvent">{{ t('btn1') }}</el-button>
+                                </div>
+                            </template>
+                        </el-step>
+
+                        <el-step>
+                            <template #title>
+                                <p class="text-[14px] font-[700]">
+                                    {{ t("step2") }}
+                                </p>
+                            </template>
+                            <template #description>
+                                <span class="text-[#999]">{{ t("describe2") }}</span>
+                                <div class="mt-[20px] mb-[40px] h-[32px]"></div>
+                            </template>
+                        </el-step>
+
+                        <el-step>
+                            <template #title>
+                                <p class="text-[14px] font-[700]">
+                                    {{ t("step3") }}
+                                </p>
+                            </template>
+                            <template #description>
+                                <span class="text-[#999]">{{ t("describe3") }}</span>
+                                <div class="mt-[20px] mb-[40px] h-[32px]"></div>
+                            </template>
+                        </el-step>
+
+                        <el-step>
+                            <template #title>
+                                <p class="text-[14px] font-[700]">
+                                    {{ t("step4") }}
+                                </p>
+                            </template>
+                            <template #description>
+                                <span class="text-[#999]">{{ t("describe4") }}</span>
+                                <div class="mt-[20px] mb-[40px] h-[32px]"></div>
+                            </template>
+                        </el-step>
+
+                        <el-step>
+                            <template #title>
+                                <p class="text-[14px] font-[700]">
+                                    {{ t("step5") }}
+                                </p>
+                            </template>
+                            <template #description>
+                                <span class="text-[#999]">{{ t("describe5") }}</span>
+                                <div class="mt-[20px] mb-[40px] h-[32px]"></div>
+                            </template>
+                        </el-step>
+                    </el-steps>
+                </el-tab-pane>
+                <el-tab-pane :label="t('codeList')" name="codeList">
+                    <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                        <el-form :inline="true" :model="codeTableData.searchParam" ref="searchFormRef">
+                             <el-form-item :label="t('addonName')" prop="addon_name">
+                                <el-select v-model="codeTableData.searchParam.addon_name" placeholder="全部" filterable remote clearable :remote-method="getAddonDevelopFn">
+                                    <el-option label="全部" value="" />
+                                    <el-option label="系统" value="2" />
+                                    <el-option :label="item.title" :value="item.key" v-for="item in addonList" :key="item.key" />
+                                </el-select>
+                            </el-form-item>
+
+                            <el-form-item :label="t('tableName')" prop="table_name">
+                                <el-input v-model.trim="codeTableData.searchParam.table_name" :placeholder="t('tableNamePlaceholder')" />
+                            </el-form-item>
+                            <el-form-item>
+                                <el-button type="primary" @click="loadGenerateTableList()">{{ t('search') }}</el-button>
+                                <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                            </el-form-item>
+                        </el-form>
+                    </el-card>
+                    <div>
+                        <el-table :data="codeTableData.data" size="large" v-loading="codeTableData.loading">
+
+                            <template #empty>
+                                <span>{{ !codeTableData.loading ? t('emptyData') : '' }}</span>
+                            </template>
+
+                            <el-table-column prop="table_name" :show-overflow-tooltip="true" :label="t('tableName')" min-width="120" />
+                            <el-table-column prop="title" :show-overflow-tooltip="true" :label="t('addonName')" min-width="120" />
+                            <el-table-column prop="table_content" :show-overflow-tooltip="true" :label="t('tableContent')" min-width="120" />
+
+                            <el-table-column prop="edit_type" :label="t('editType')" min-width="150" align="center">
+                                <template #default="{ row }">
+                                    {{ row.edit_type == 1 ? t('popup') : t('page') }}
+                                </template>
+                            </el-table-column>
+
+                            <el-table-column :label="t('createTime')" min-width="180" align="center">
+                                <template #default="{ row }">
+                                    {{ row.create_time || '' }}
+                                </template>
+                            </el-table-column>
+
+                            <el-table-column :label="t('operation')" fixed="right" align="right" width="330">
+                                <template #default="{ row }">
+                                    <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+                                    <el-button type="primary" link @click="generatePreviewFn(row.id)">{{ t('preview') }}</el-button>
+                                    <el-button type="primary" link @click="generatorCheckFileFn(row.id)">{{ t('saveAndSync') }}</el-button>
+                                    <el-button type="primary" link @click="generateCreateFn(row.id, 2)">{{ t('download') }}</el-button>
+                                    <el-button type="primary" link @click="deleteEvent(row.id)">{{ t('delete') }}</el-button>
+                                </template>
+                            </el-table-column>
+
+                        </el-table>
+                        <div class="mt-[16px] flex justify-end">
+                            <el-pagination v-model:current-page="codeTableData.page" v-model:page-size="codeTableData.limit"
+                                layout="total, sizes, prev, pager, next, jumper" :total="codeTableData.total"
+                                @size-change="loadGenerateTableList()" @current-change="loadGenerateTableList" />
+                        </div>
+                    </div>
+                </el-tab-pane>
+            </el-tabs>
+
+            <add-table ref="addCodeDialog" />
+
+            <el-dialog v-model="dialogVisible" class="dialog-visible" width="70%" title="代码预览">
+                <div class="flex h-[50vh]" v-loading="codeLoading">
+                    <el-scrollbar class="h-[100%] w-[270px]">
+                        <el-tree v-if="treeData.length && treeKey != ''" :data="treeData" :props="{ label: 'name', value: 'key' }"
+                            node-key="key" :current-node-key="treeKey" :expand-on-click-node="false" highlight-current
+                            default-expand-all ref="treeRef" @node-click="nodeClick">
+                            <template #default="{ node, data }">
+                                <div class="flex items-center">
+                                    <el-icon v-if="data.children">
+                                        <Folder v-if="!node.expanded" />
+                                        <FolderOpened v-else />
+                                    </el-icon>
+                                    <el-icon v-else>
+                                        <Document />
+                                    </el-icon>
+                                    <span class="pl-[5px]">{{ data.name }}</span>
+                                </div>
+
+                            </template>
+                        </el-tree>
+                    </el-scrollbar>
+                    <div class="ml-[20px]" style="width: calc(100% - 285px);">
+                        <el-scrollbar class="h-[100%] w-[100%]">
+                            <highlightjs autodetect class="h-[100%]" :code="code" />
+                        </el-scrollbar>
+                    </div>
                 </div>
-              </template>
-            </el-tree>
-          </el-scrollbar>
-          <div class="ml-[20px]" style="width: calc(100% - 285px)">
-            <el-scrollbar class="h-[100%] w-[100%]">
-              <highlightjs autodetect class="h-[100%]" :code="code" />
-            </el-scrollbar>
-          </div>
-        </div>
-      </el-dialog>
-    </el-card>
-  </div>
+            </el-dialog>
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref, onMounted } from 'vue'
 import { t } from '@/lang'
-import {
-  getGenerateTableList,
-  deleteGenerateTable,
-  generateCreate,
-  generatePreview,
-  generatorCheckFile,
-  getAddonDevelop,
-} from '@/app/api/tools'
+import { getGenerateTableList, deleteGenerateTable, generateCreate, generatePreview, generatorCheckFile, getAddonDevelop } from '@/app/api/tools'
 import { img } from '@/utils/common'
 import { ElMessageBox, ElMessage } from 'element-plus'
 import AddTable from '@/app/views/tools/code/components/add-table.vue'
@@ -291,61 +186,59 @@ const pageName = route.meta.title
 const router = useRouter()
 const activeName = ref('codeGeneration')
 const codeTableData = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    table_name: '',
-    table_content: '',
-    addon_name: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        table_name: '',
+        table_content: '',
+        addon_name: ''
+    }
 })
 
 const searchFormRef = ref<FormInstance>()
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
+    if (!formEl) return
 
-  formEl.resetFields()
-  loadGenerateTableList()
+    formEl.resetFields()
+    loadGenerateTableList()
 }
 onMounted(() => {
-  if (window.codeActiveName) {
-    activeName.value = window.codeActiveName + ''
-    window.codeActiveName = null
-  }
-  loadGenerateTableList()
+    if (window.codeActiveName) {
+        activeName.value = window.codeActiveName + ''
+        window.codeActiveName = null
+    }
+    loadGenerateTableList()
 })
 /**
  * 获取代码生成列表
  */
 const loadGenerateTableList = (page: number = 1) => {
-  codeTableData.loading = true
-  codeTableData.page = page
-
-  getGenerateTableList({
-    page: codeTableData.page,
-    limit: codeTableData.limit,
-    ...codeTableData.searchParam,
-  })
-    .then((res) => {
-      codeTableData.loading = false
-      codeTableData.data = res.data.data
-      codeTableData.total = res.data.total
-    })
-    .catch(() => {
-      codeTableData.loading = false
+    codeTableData.loading = true
+    codeTableData.page = page
+
+    getGenerateTableList({
+        page: codeTableData.page,
+        limit: codeTableData.limit,
+        ...codeTableData.searchParam
+    }).then(res => {
+        codeTableData.loading = false
+        codeTableData.data = res.data.data
+        codeTableData.total = res.data.total
+    }).catch(() => {
+        codeTableData.loading = false
     })
 }
 
 const addonList = ref<Array<any>>([])
 // 获取插件远程搜索
 const getAddonDevelopFn = (search: string) => {
-  getAddonDevelop({ search }).then((res) => {
-    addonList.value = res.data
-  })
+    getAddonDevelop({ search }).then(res => {
+        addonList.value = res.data
+    })
 }
 
 const addCodeDialog: Record<string, any> | null = ref(null)
@@ -354,25 +247,26 @@ const addCodeDialog: Record<string, any> | null = ref(null)
  * 添加代码生成
  */
 const addEvent = () => {
-  addCodeDialog.value.setFormData()
-  addCodeDialog.value.showDialog = true
+    addCodeDialog.value.setFormData()
+    addCodeDialog.value.showDialog = true
 }
 
 /**
  * 删除代码生成
  */
 const deleteEvent = (id: number) => {
-  ElMessageBox.confirm(t('codeDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    deleteGenerateTable(id)
-      .then(() => {
-        loadGenerateTableList()
-      })
-      .catch(() => {})
-  })
+    ElMessageBox.confirm(t('codeDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        deleteGenerateTable(id).then(() => {
+            loadGenerateTableList()
+        }).catch(() => {
+        })
+    })
 }
 
 /**
@@ -380,60 +274,55 @@ const deleteEvent = (id: number) => {
  * @param data
  */
 const editEvent = (data: any) => {
-  router.push('/tools/code/edit?id=' + data.id)
+    router.push('/tools/code/edit?id=' + data.id)
 }
 
 /**
  * 同步校验
  */
-const generatorCheckFileFn = (id: any) => {
-  generatorCheckFile({ id })
-    .then((res: any) => {
-      codeTableData.loading = false
-      ElMessageBox.confirm(
-        res.msg != '2' ? t('saveAndSyncText') : t('saveAndSyncText1'),
-        t('warning'),
-        {
-          confirmButtonText: t('confirm'),
-          cancelButtonText: t('cancel'),
-        }
-      )
-        .then(() => {
-          generateCreateFn(id, 3)
+const generatorCheckFileFn = ((id: any) => {
+    generatorCheckFile({ id }).then((res: any) => {
+        codeTableData.loading = false
+        ElMessageBox.confirm(
+                res.msg != '2' ? t('saveAndSyncText') : t('saveAndSyncText1'),
+                t('warning'),
+                {
+                    confirmButtonText: t('confirm'),
+                    cancelButtonText: t('cancel')
+                }
+        ).then(() => {
+            generateCreateFn(id, 3)
+        }).catch(() => {
         })
-        .catch(() => {})
-    })
-    .catch(() => {
-      codeTableData.loading = false
+    }).catch(() => {
+        codeTableData.loading = false
     })
-}
+})
 
 /**
  * 同步or下载
  */
 const generateCreateFn = (id: any, generate_type: any) => {
-  codeTableData.loading = true
-  generateCreate({ id, generate_type })
-    .then((res) => {
-      ElMessage({
-        type: 'success',
-        message: '操作成功',
-      })
-      if (generate_type != 3) {
+    codeTableData.loading = true
+    generateCreate({ id, generate_type }).then(res => {
+        ElMessage({
+            type: 'success',
+            message: '操作成功'
+        })
+        if (generate_type != 3) {
+            codeTableData.loading = false
+            window.open(img(res.data.file), '_blank')
+        } else {
+            loadGenerateTableList()
+        }
+    }).catch(() => {
         codeTableData.loading = false
-        window.open(img(res.data.file), '_blank')
-      } else {
-        loadGenerateTableList()
-      }
-    })
-    .catch(() => {
-      codeTableData.loading = false
     })
 }
 
 /*
- *代码预览
- */
+*代码预览
+*/
 const previewList = ref<Array<any>>([])
 const dialogVisible = ref<boolean>(false)
 const treeData = ref([])
@@ -441,61 +330,53 @@ const codeLoading = ref(false)
 const code = ref('')
 const treeKey = ref('')
 const generatePreviewFn = (id: number) => {
-  dialogVisible.value = true
-  codeLoading.value = true
-  code.value = ''
-  treeData.value = []
-  treeKey.value = ''
-  generatePreview(id)
-    .then((res) => {
-      previewList.value = res.data
-      treeData.value = listToTree(
-        res.data.map((el: any) => el.file_dir + el.name)
-      )
-      code.value = previewList.value[0].content
-      codeLoading.value = false
-    })
-    .catch(() => {
-      codeLoading.value = false
+    dialogVisible.value = true
+    codeLoading.value = true
+    code.value = ''
+    treeData.value = []
+    treeKey.value = ''
+    generatePreview(id).then(res => {
+        previewList.value = res.data
+        treeData.value = listToTree(res.data.map((el:any) => el.file_dir + el.name))
+        code.value = previewList.value[0].content
+        codeLoading.value = false
+    }).catch(() => {
+        codeLoading.value = false
     })
 }
 
 const nodeClick = (node: { path: any }) => {
-  previewList.value.forEach((el) => {
-    if (node.path === el.file_dir + el.name) code.value = el.content
-  })
+    previewList.value.forEach(el => {
+        if (node.path === el.file_dir + el.name) code.value = el.content
+    })
 }
-const listToTree = (arr: any) => {
-  const ret: any[] = []
-  if (Array.isArray(arr)) {
-    for (let i = 0; i < arr.length; ++i) {
-      const path = arr[i].split('/')
-      let _ret = ret
-      for (let j = 0; j < path.length; ++j) {
-        const name = path[j]
-        let obj = null
-        for (var k = 0; k < _ret.length; ++k) {
-          const _obj = _ret[k]
-          if (_obj.name === name) {
-            obj = _obj
-            break
-          }
-        }
-        if (!obj) {
-          obj = {
-            name: name,
-            path: name.indexOf('.') < 0 ? '' : arr[i],
-            key: 'k' + i + j + k,
-          }
-          if (name.indexOf('.') < 0) obj.children = []
-          if (obj.path === arr[0]) treeKey.value = obj.key
-          _ret.push(obj)
+const listToTree = (arr:any) => {
+    const ret: any[] = []
+    if (Array.isArray(arr)) {
+        for (let i = 0; i < arr.length; ++i) {
+            const path = arr[i].split('/')
+            let _ret = ret
+            for (let j = 0; j < path.length; ++j) {
+                const name = path[j]
+                let obj = null
+                for (var k = 0; k < _ret.length; ++k) {
+                    const _obj = _ret[k]
+                    if (_obj.name === name) {
+                        obj = _obj
+                        break
+                    }
+                }
+                if (!obj) {
+                    obj = { name: name, path: name.indexOf('.') < 0 ? '' : arr[i], key: 'k' + i + j + k }
+                    if (name.indexOf('.') < 0) obj.children = []
+                    if (obj.path === arr[0]) treeKey.value = obj.key
+                    _ret.push(obj)
+                }
+                if (obj.children) _ret = obj.children
+            }
         }
-        if (obj.children) _ret = obj.children
-      }
     }
-  }
-  return ret
+    return ret
 }
 </script>
 
diff --git a/admin/src/app/views/tools/detection.vue b/admin/src/app/views/tools/detection.vue
index 667d9036..aa2d6d87 100644
--- a/admin/src/app/views/tools/detection.vue
+++ b/admin/src/app/views/tools/detection.vue
@@ -1,126 +1,74 @@
 <template>
-  <!--环境检测-->
-  <div class="main-container min-h-[70vh]" v-loading="loading">
-    <el-card
-      class="box-card !border-none"
-      shadow="never"
-      v-if="Object.keys(systemService).length"
-    >
-      <div>
-        <h3 class="panel-title !text-sm">{{ t('serverInformation') }}</h3>
+    <!--环境检测-->
+    <div class="main-container min-h-[70vh]" v-loading="loading">
+        <el-card class="box-card !border-none" shadow="never" v-if="Object.keys(systemService).length">
 
-        <div class="text-[14px]">
-          <el-table :data="systemService.server" size="large">
-            <el-table-column
-              prop="name"
-              :label="t('environment')"
-              align="left"
-              min-width="200"
-            />
-            <el-table-column
-              prop="server"
-              :label="t('version')"
-              align="left"
-              min-width="140"
-            />
-          </el-table>
-        </div>
-      </div>
+            <div>
+                <h3 class="panel-title !text-sm">{{ t('serverInformation') }}</h3>
 
-      <div class="mt-[20px]">
-        <h3 class="panel-title !text-sm">{{ t('systemDemand') }}</h3>
+                <div class="text-[14px]">
+                    <el-table :data="systemService.server" size="large">
+                        <el-table-column prop="name" :label="t('environment')" align="left" min-width="200" />
+                        <el-table-column prop="server" :label="t('version')" align="left" min-width="140" />
+                    </el-table>
+                </div>
+            </div>
 
-        <div class="text-[14px]">
-          <el-table :data="systemService.server_version" size="large">
-            <el-table-column
-              prop="name"
-              :label="t('environment')"
-              align="left"
-              min-width="200"
-            />
-            <el-table-column
-              prop="demand"
-              :label="t('demand')"
-              align="left"
-              min-width="140"
-            />
-            <el-table-column
-              prop="server"
-              :label="t('version')"
-              align="left"
-              min-width="140"
-            />
-          </el-table>
-        </div>
-      </div>
+            <div class="mt-[20px]">
+                <h3 class="panel-title !text-sm">{{ t('systemDemand') }}</h3>
 
-      <div class="mt-[20px]">
-        <h3 class="panel-title !text-sm">{{ t('authorityStatus') }}</h3>
+                <div class="text-[14px]">
+                    <el-table :data="systemService.server_version" size="large">
+                        <el-table-column prop="name" :label="t('environment')" align="left" min-width="200" />
+                        <el-table-column prop="demand" :label="t('demand')" align="left" min-width="140" />
+                        <el-table-column prop="server" :label="t('version')" align="left" min-width="140" />
+                    </el-table>
+                </div>
+            </div>
 
-        <div class="text-[14px]">
-          <el-table :data="systemService.system_variables" size="large">
-            <el-table-column
-              prop="name"
-              :label="t('name')"
-              align="left"
-              min-width="200"
-            />
-            <el-table-column
-              prop="need"
-              :label="t('demand')"
-              align="left"
-              min-width="140"
-            />
-            <el-table-column :label="t('status')" align="left" min-width="140">
-              <template #default="{ row }">
-                <span v-if="row.status"
-                  ><el-icon color="green"><Select /></el-icon
-                ></span>
-                <span v-else>
-                  <el-icon color="red">
-                    <CloseBold />
-                  </el-icon>
-                </span>
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-      </div>
+            <div class="mt-[20px]">
+                <h3 class="panel-title !text-sm">{{ t('authorityStatus') }}</h3>
 
-      <div class="mt-[20px]">
-        <h3 class="panel-title !text-sm">{{ t('process') }}</h3>
+                <div class="text-[14px]">
+                    <el-table :data="systemService.system_variables" size="large">
+                        <el-table-column prop="name" :label="t('name')" align="left" min-width="200" />
+                        <el-table-column prop="need" :label="t('demand')" align="left" min-width="140" />
+                        <el-table-column :label="t('status')" align="left" min-width="140">
+                            <template #default="{ row }">
+                                <span v-if="row.status"><el-icon color="green"><Select /></el-icon></span>
+                                <span v-else>
+                                    <el-icon color="red">
+                                        <CloseBold />
+                                    </el-icon>
+                                </span>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </div>
+            </div>
 
-        <div class="text-[14px]">
-          <el-table :data="systemService.process" size="large">
-            <el-table-column
-              prop="name"
-              :label="t('name')"
-              align="left"
-              min-width="200"
-            />
-            <el-table-column
-              prop="need"
-              :label="t('demand')"
-              align="left"
-              min-width="140"
-            />
-            <el-table-column :label="t('status')" align="left" min-width="140">
-              <template #default="{ row }">
-                <span v-if="row.status"
-                  ><el-icon color="green"><Select /></el-icon
-                ></span>
-                <span v-else>
-                  <el-icon color="red">
-                    <CloseBold />
-                  </el-icon>
-                </span>
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-      </div>
-    </el-card>
-  </div>
+            <div class="mt-[20px]">
+                <h3 class="panel-title !text-sm">{{ t('process') }}</h3>
+
+                <div class="text-[14px]">
+                    <el-table :data="systemService.process" size="large">
+                        <el-table-column prop="name" :label="t('name')" align="left" min-width="200" />
+                        <el-table-column prop="need" :label="t('demand')" align="left" min-width="140" />
+                        <el-table-column :label="t('status')" align="left" min-width="140">
+                            <template #default="{ row }">
+                                <span v-if="row.status"><el-icon color="green"><Select /></el-icon></span>
+                                <span v-else>
+                                    <el-icon color="red">
+                                        <CloseBold />
+                                    </el-icon>
+                                </span>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </div>
+            </div>
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -133,12 +81,12 @@ const route = useRoute()
 const pageName = route.meta.title
 
 const systemService = ref({})
-const loading = ref(true)
+const loading = ref(true);
 const getSystemService = () => {
-  getSystem().then((res) => {
-    systemService.value = res.data
-    loading.value = false
-  })
+    getSystem().then(res => {
+        systemService.value = res.data
+        loading.value = false
+    })
 }
 getSystemService()
 </script>
diff --git a/admin/src/app/views/tools/schedule.vue b/admin/src/app/views/tools/schedule.vue
index 861cb6ba..81721576 100644
--- a/admin/src/app/views/tools/schedule.vue
+++ b/admin/src/app/views/tools/schedule.vue
@@ -1,265 +1,152 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center mb-[20px]">
-        <span class="text-page-title">{{ pageName }}</span>
-        <el-button type="primary" @click="showEvent">{{
-          t('addCron')
-        }}</el-button>
-      </div>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
 
-      <el-alert type="info">
-        <template #default>
-          <div class="flex items-center">
-            <div>
-              <p>
-                {{ t('cronTipsOne') }}
-              </p>
-              <p class="mt-2">
-                {{ t('cronTipsTwo') }}
-              </p>
+            <div class="flex justify-between items-center mb-[20px]">
+                <span class="text-page-title">{{ pageName }}</span>
+                <el-button type="primary" @click="showEvent">{{ t('addCron') }}</el-button>
             </div>
-          </div>
-        </template>
-      </el-alert>
 
-      <el-card
-        class="box-card !border-none mb-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <div class="flex justify-between">
-          <el-form
-            :inline="true"
-            :model="cronTableData.searchParam"
-            ref="searchFormRef"
-          >
-            <el-form-item :label="t('title')" prop="key">
-              <el-select
-                v-model="cronTableData.searchParam.key"
-                placeholder="全部"
-                filterable
-                remote
-                clearable
-                :remote-method="getAddonDevelopFn"
-              >
-                <el-option label="全部" value="all" />
-                <el-option
-                  v-for="item in templateList"
-                  :key="item.key"
-                  :label="item.name"
-                  :value="item.key"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item :label="t('status')" prop="status">
-              <el-select
-                v-model="cronTableData.searchParam.status"
-                placeholder="全部"
-                filterable
-                remote
-                clearable
-                :remote-method="getAddonDevelopFn"
-              >
-                <el-option label="全部" value="all" />
-                <el-option label="启用" value="1" />
-                <el-option label="关闭" value="0" />
-              </el-select>
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" @click="loadCronList()">{{
-                t('search')
-              }}</el-button>
-              <el-button @click="resetForm(searchFormRef)">{{
-                t('reset')
-              }}</el-button>
-            </el-form-item>
-          </el-form>
-        </div>
-      </el-card>
+            <el-alert type="info">
+                <template #default>
+                    <div class="flex items-center">
+                        <div>
+                            <p>
+                                {{ t('cronTipsOne') }}
+                            </p>
+                            <p class="mt-2">
+                                {{ t('cronTipsTwo') }}
+                            </p>
+                        </div>
+                    </div>
+                </template>
+            </el-alert>
 
-      <div class="mt-[20px]">
-        <el-table
-          :data="cronTableData.data"
-          size="large"
-          v-loading="cronTableData.loading"
-        >
-          <template #empty>
-            <span>{{ !cronTableData.loading ? t('emptyData') : '' }}</span>
-          </template>
+            <el-card class="box-card !border-none mb-[10px] table-search-wrap" shadow="never">
+                <div class="flex justify-between">
+                    <el-form :inline="true" :model="cronTableData.searchParam" ref="searchFormRef">
+                        <el-form-item :label="t('title')" prop="key">
+                            <el-select v-model="cronTableData.searchParam.key" placeholder="全部" filterable remote clearable :remote-method="getAddonDevelopFn">
+                                <el-option label="全部" value="all" />
+                                <el-option v-for="item in templateList" :key="item.key" :label="item.name" :value="item.key" />
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item :label="t('status')" prop="status">
+                            <el-select v-model="cronTableData.searchParam.status" placeholder="全部" filterable remote clearable :remote-method="getAddonDevelopFn">
+                                <el-option label="全部" value="all" />
+                                <el-option label="启用" value="1" />
+                                <el-option label="关闭" value="0" />
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item>
+                            <el-button type="primary" @click="loadCronList()">{{ t('search') }}</el-button>
+                            <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                        </el-form-item>
+                    </el-form>
+                </div>
+            </el-card>
 
-          <el-table-column prop="key" :label="t('key')" min-width="150" />
-          <el-table-column prop="name" :label="t('title')" min-width="150" />
-          <el-table-column :label="t('crondType')" min-width="150">
-            <template #default="{ row }">
-              {{ row.crontab_content }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="status_name"
-            :label="t('openStatus')"
-            min-width="100"
-          />
-          <el-table-column
-            :label="t('operation')"
-            align="right"
-            fixed="right"
-            width="180"
-          >
-            <template #default="{ row }">
-              <div class="flex items-center">
-                <el-button type="primary" link @click="editEvent(row)">{{
-                  t('edit')
-                }}</el-button>
-                <el-button type="primary" link @click="deleteEvent(row.id)">{{
-                  t('delete')
-                }}</el-button>
-                <el-dropdown class="ml-[12px]">
-                  <span class="el-dropdown-link text-primary">
-                    {{ t('more') }}
-                  </span>
-                  <template #dropdown>
-                    <el-dropdown-menu>
-                      <el-dropdown-item @click="doEvent(row)">{{
-                        t('doOne')
-                      }}</el-dropdown-item>
-                      <el-dropdown-item @click="toLogList(row.id)">{{
-                        t('cronLog')
-                      }}</el-dropdown-item>
-                    </el-dropdown-menu>
-                  </template>
-                </el-dropdown>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="cronTableData.page"
-            v-model:page-size="cronTableData.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="cronTableData.total"
-            @size-change="loadCronList()"
-            @current-change="loadCronList"
-          />
-        </div>
-      </div>
-    </el-card>
+            <div class="mt-[20px]">
+                <el-table :data="cronTableData.data" size="large" v-loading="cronTableData.loading">
+                    <template #empty>
+                        <span>{{ !cronTableData.loading ? t('emptyData') : '' }}</span>
+                    </template>
+                    
+                    <el-table-column prop="key" :label="t('key')" min-width="150" />
+                    <el-table-column prop="name" :label="t('title')" min-width="150" />
+                    <el-table-column :label="t('crondType')" min-width="150">
+                        <template #default="{ row }">
+                            {{ row.crontab_content }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="status_name" :label="t('openStatus')" min-width="100" />
+                    <el-table-column :label="t('operation')" align="right" fixed="right" width="180">
+                        <template #default="{ row }">
+                            <div class="flex items-center">
+                                <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+                                <el-button type="primary" link @click="deleteEvent(row.id)">{{ t('delete') }}</el-button>
+                                <el-dropdown class="ml-[12px]">
+                                    <span class="el-dropdown-link text-primary">
+                                        {{ t('more') }}
+                                    </span>
+                                    <template #dropdown>
+                                    <el-dropdown-menu>
+                                        <el-dropdown-item @click="doEvent(row)">{{ t('doOne') }}</el-dropdown-item>
+                                        <el-dropdown-item @click="toLogList(row.id)">{{ t('cronLog') }}</el-dropdown-item>
+                                    </el-dropdown-menu>
+                                    </template>
+                                </el-dropdown>
+                            </div>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="cronTableData.page" v-model:page-size="cronTableData.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="cronTableData.total"
+                        @size-change="loadCronList()" @current-change="loadCronList" />
+                </div>
+            </div>
+        </el-card>
 
-    <cron-info ref="cronDialog" @complete="loadCronList" />
+        <cron-info ref="cronDialog" @complete="loadCronList" />
 
-    <el-dialog
-      v-model="showDialog"
-      :title="t('editCron')"
-      width="750px"
-      :destroy-on-close="true"
-    >
-      <el-form
-        :model="formData"
-        label-width="110px"
-        ref="formRef"
-        :rules="formRules"
-        class="page-form"
-        v-loading="loading"
-      >
-        <el-form-item
-          :label="t('cronTemplate')"
-          class="items-center"
-          prop="key"
-        >
-          <el-select v-model="formData.key">
-            <el-option
-              v-for="item in templateList"
-              :key="item.key"
-              :label="item.name"
-              :value="item.key"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="t('cronTime')" prop="timeDate">
-          <el-select v-model="formData.time.type" class="w-[150px]">
-            <el-option
-              v-for="(item, index) in date_type"
-              :key="index"
-              :label="item"
-              :value="index"
-            />
-          </el-select>
-          <div class="flex">
-            <el-select
-              v-model="formData.time.week"
-              class="ml-2 w-[120px]"
-              v-if="formData.time.type == 'week'"
-            >
-              <el-option
-                v-for="(item, index) in week_list"
-                :key="index"
-                :label="item"
-                :value="index"
-              />
-            </el-select>
-            <el-input
-              v-model.trim="formData.time.day"
-              class="ml-2 w-[120px]"
-              v-if="['month', 'day'].indexOf(formData.time.type) != -1"
-            >
-              <template #append>{{ t('day') }}</template>
-            </el-input>
-            <el-input
-              v-model.trim="formData.time.hour"
-              class="ml-2 w-[120px]"
-              v-if="
-                ['month', 'day', 'hour', 'week'].indexOf(formData.time.type) !=
-                -1
-              "
-            >
-              <template #append>{{ t('hour') }}</template>
-            </el-input>
-            <el-input
-              v-model.trim="formData.time.min"
-              class="ml-2 w-[120px]"
-              v-if="
-                ['month', 'day', 'hour', 'week', 'min'].indexOf(
-                  formData.time.type
-                ) != -1
-              "
-            >
-              <template #append>{{ t('min') }}</template>
-            </el-input>
-          </div>
-        </el-form-item>
-        <el-form-item :label="t('isopen')">
-          <div class="input-width flex items-center text-sm">
-            <el-radio-group v-model="formData.status">
-              <el-radio :label="1">{{ t('yes') }}</el-radio>
-              <el-radio :label="2">{{ t('no') }}</el-radio>
-            </el-radio-group>
-          </div>
-        </el-form-item>
-      </el-form>
+        <el-dialog v-model="showDialog" :title="t('editCron')" width="750px" :destroy-on-close="true">
+            <el-form :model="formData" label-width="110px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('cronTemplate')" class="items-center" prop="key">
+                    <el-select v-model="formData.key">
+                        <el-option v-for="item in templateList" :key="item.key" :label="item.name" :value="item.key" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item :label="t('cronTime')" prop="timeDate">
+                    <el-select v-model="formData.time.type" class="w-[150px]">
+                        <el-option v-for="(item, index) in date_type" :key="index" :label="item" :value="index" />
+                    </el-select>
+                    <div class="flex">
+                        <el-select v-model="formData.time.week" class="ml-2 w-[120px]" v-if="formData.time.type == 'week'">
+                            <el-option v-for="(item, index) in week_list" :key="index" :label="item" :value="index" />
+                        </el-select>
+                        <el-input v-model.trim="formData.time.day" class="ml-2 w-[120px]" v-if="['month', 'day'].indexOf(formData.time.type) != -1">
+                            <template #append>{{ t('day') }}</template>
+                        </el-input>
+                        <el-input v-model.trim="formData.time.hour" class="ml-2 w-[120px]" v-if="['month', 'day', 'hour', 'week'].indexOf(formData.time.type) != -1">
+                            <template #append>{{ t('hour') }}</template>
+                        </el-input>
+                        <el-input v-model.trim="formData.time.min" class="ml-2 w-[120px]" v-if="['month', 'day', 'hour', 'week', 'min'].indexOf(formData.time.type) != -1">
+                            <template #append>{{ t('min') }}</template>
+                        </el-input>
+                    </div>
+                </el-form-item>
+                <el-form-item :label="t('isopen')">
+                    <div class="input-width flex items-center text-sm">
+                        <el-radio-group v-model="formData.status">
+                            <el-radio :label="1">{{ t('yes') }}</el-radio>
+                            <el-radio :label="2">{{ t('no') }}</el-radio>
+                        </el-radio-group>
+                    </div>
+                </el-form-item>
+            </el-form>
 
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button type="primary" @click="addEvent(formRef)">{{
-            t('confirm')
-          }}</el-button>
-        </span>
-      </template>
-    </el-dialog>
-  </div>
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button type="primary" @click="addEvent(formRef)">{{ t('confirm') }}</el-button>
+                </span>
+            </template>
+        </el-dialog>
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref, computed } from 'vue'
 import { t } from '@/lang'
 import {
-  getCronList,
-  getCronTemplate,
-  getCronDateType,
-  getWeek,
-  addCron,
-  editCron,
-  deleteCron,
-  doCron,
+    getCronList,
+    getCronTemplate,
+    getCronDateType,
+    getWeek,
+    addCron,
+    editCron,
+    deleteCron,
+    doCron
 } from '@/app/api/sys'
 import { ElMessageBox, FormInstance } from 'element-plus'
 import { useRouter, useRoute } from 'vue-router'
@@ -269,15 +156,15 @@ const route = useRoute()
 const pageName = route.meta.title
 
 const cronTableData = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    type: '',
-    status: 'all',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        type: '',
+        status: 'all'
+    }
 })
 const templateList = ref([])
 const date_type = ref([])
@@ -285,15 +172,15 @@ const week_list = ref([])
 const searchFormRef = ref<FormInstance>()
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadCronList()
+    if (!formEl) return
+    formEl.resetFields()
+    loadCronList()
 }
 
 const setTypeList = async () => {
-  templateList.value = await (await getCronTemplate()).data
-  date_type.value = await (await getCronDateType()).data
-  week_list.value = await (await getWeek()).data
+    templateList.value = await (await getCronTemplate()).data
+    date_type.value = await (await getCronDateType()).data
+    week_list.value = await (await getWeek()).data
 }
 setTypeList()
 
@@ -301,21 +188,19 @@ setTypeList()
  * 获取任务列表
  */
 const loadCronList = (page: number = 1) => {
-  cronTableData.loading = true
-  cronTableData.page = page
+    cronTableData.loading = true
+    cronTableData.page = page
 
-  getCronList({
-    page: cronTableData.page,
-    limit: cronTableData.limit,
-    ...cronTableData.searchParam,
-  })
-    .then((res) => {
-      cronTableData.loading = false
-      cronTableData.data = res.data.data
-      cronTableData.total = res.data.total
-    })
-    .catch(() => {
-      cronTableData.loading = false
+    getCronList({
+        page: cronTableData.page,
+        limit: cronTableData.limit,
+        ...cronTableData.searchParam
+    }).then(res => {
+        cronTableData.loading = false
+        cronTableData.data = res.data.data
+        cronTableData.total = res.data.total
+    }).catch(() => {
+        cronTableData.loading = false
     })
 }
 loadCronList()
@@ -324,134 +209,116 @@ const router = useRouter()
 
 const showDialog = ref(false)
 const initialFormData = {
-  id: 0,
-  key: '',
-  status: 2,
-  time: {
-    type: 'min',
-    week: '',
-    day: '',
-    hour: '',
-    min: '',
-  },
+    id: 0,
+    key: '',
+    status: 2,
+    time: {
+        type: 'min',
+        week: '',
+        day: '',
+        hour: '',
+        min: ''
+    }
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 const formRef = ref<FormInstance>()
 
 const showEvent = () => {
-  ;(formData.id = 0),
-    (formData.key = ''),
-    (formData.status = 2),
-    (formData.time.type = 'min'),
-    (formData.time.week = ''),
-    (formData.time.day = ''),
-    (formData.time.hour = ''),
-    (formData.time.min = ''),
-    (showDialog.value = true)
+    formData.id = 0,
+    formData.key = '',
+    formData.status = 2,
+    formData.time.type = 'min',
+    formData.time.week = '',
+    formData.time.day = '',
+    formData.time.hour = '',
+    formData.time.min = '',
+    showDialog.value = true
 }
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    key: [{ required: true, message: t('titlePlaceholder'), trigger: 'blur' }],
-    timeDate: [{ required: true, validator: validatePass, trigger: 'blur' }],
-  }
+    return {
+        key: [
+            { required: true, message: t('titlePlaceholder'), trigger: 'blur' }
+        ],
+        timeDate: [
+            { required: true, validator: validatePass, trigger: 'blur' }
+        ],
+    }
 })
 
 const validatePass = (rule: any, value: any, callback: any) => {
-  if (formData.time.type == 'min' && formData.time.min != '') {
-    return callback()
-  }
-  if (
-    formData.time.type == 'week' &&
-    formData.time.week != '' &&
-    formData.time.hour != '' &&
-    formData.time.min != ''
-  ) {
-    return callback()
-  }
-  if (
-    formData.time.type == 'month' &&
-    formData.time.day != '' &&
-    formData.time.hour != '' &&
-    formData.time.min != ''
-  ) {
-    return callback()
-  }
-  if (
-    formData.time.type == 'day' &&
-    formData.time.day != '' &&
-    formData.time.hour != '' &&
-    formData.time.min != ''
-  ) {
-    return callback()
-  }
-  if (
-    formData.time.type == 'hour' &&
-    formData.time.hour != '' &&
-    formData.time.min != ''
-  ) {
-    return callback()
-  }
-  return callback(new Error(t('cronTimeTips')))
+    if (formData.time.type == 'min' && formData.time.min != '') {
+        return callback()
+    }
+    if (formData.time.type == 'week' && formData.time.week != '' && formData.time.hour != '' && formData.time.min != '') {
+        return callback()
+    }
+    if (formData.time.type == 'month' && formData.time.day != '' && formData.time.hour != '' && formData.time.min != '') {
+        return callback()
+    }
+    if (formData.time.type == 'day' && formData.time.day != '' && formData.time.hour != '' && formData.time.min != '') {
+        return callback()
+    }
+    if (formData.time.type == 'hour' && formData.time.hour != '' && formData.time.min != '') {
+        return callback()
+    }
+    return callback(new Error(t('cronTimeTips')))
 }
 const save_type = ref(false)
 const addEvent = async (formEl: FormInstance | undefined) => {
-  if (save_type.value || !formEl) return
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      save_type.value = true
-      const data = formData
-      const save = formData.id > 0 ? editCron : addCron
-      save(data)
-        .then((res) => {
-          save_type.value = false
-          showDialog.value = false
-          loadCronList()
-        })
-        .catch(() => {
-          save_type.value = false
-        })
-    }
-  })
+    if (save_type.value || !formEl) return
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            save_type.value = true
+            const data = formData
+            const save = formData.id > 0 ? editCron : addCron
+            save(data).then(res => {
+                save_type.value = false
+                showDialog.value = false
+                loadCronList()
+            }).catch(() => {
+                save_type.value = false
+            })
+        }
+    })
 }
 
-const editEvent = (item: any) => {
-  ;(formData.id = item.id),
-    (formData.key = item.key),
-    (formData.status = item.status)
-  formData.time = item.time
-  showDialog.value = true
+const editEvent = (item:any) => {
+    formData.id = item.id,
+    formData.key = item.key,
+    formData.status = item.status
+    formData.time = item.time
+    showDialog.value = true
 }
 
 const deleteEvent = (id: number) => {
-  ElMessageBox.confirm(t('cronDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    deleteCron(id)
-      .then(() => {
-        loadCronList()
-      })
-      .catch(() => {})
-  })
+    ElMessageBox.confirm(t('cronDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        deleteCron(id).then(() => {
+            loadCronList()
+        }).catch(() => {
+        })
+    })
 }
 
 const doEvent = (row: any) => {
-  ElMessageBox.confirm(
-    t(`确认要立即执行一次"${row.name}"任务吗？`),
-    t('warning'),
-    {
-      confirmButtonText: t('confirm'),
-      cancelButtonText: t('cancel'),
-      type: 'warning',
-    }
-  ).then(() => {
-    doCron({ id: row.id })
-      .then((res) => {})
-      .catch(() => {})
-  })
+    ElMessageBox.confirm(t(`确认要立即执行一次"${row.name}"任务吗？`), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        doCron({id: row.id}).then((res) => {
+        }).catch(() => {
+        })
+    })
 }
 
 const cronDialog: Record<string, any> | null = ref(null)
@@ -460,13 +327,14 @@ const cronDialog: Record<string, any> | null = ref(null)
  * @param data
  */
 const infoEvent = (data: any) => {
-  cronDialog.value.setFormData(data)
-  cronDialog.value.showDialog = true
+    cronDialog.value.setFormData(data)
+    cronDialog.value.showDialog = true
 }
 
 const toLogList = (id: number) => {
-  router.push({ path: '/tools/schedule_log', query: { id: id } })
+    router.push({ path: '/tools/schedule_log', query: { id: id } })
 }
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/tools/schedule_log.vue b/admin/src/app/views/tools/schedule_log.vue
index 50bfc9b1..aa11308c 100644
--- a/admin/src/app/views/tools/schedule_log.vue
+++ b/admin/src/app/views/tools/schedule_log.vue
@@ -1,212 +1,123 @@
 <template>
-  <div class="main-container">
-    <el-card class="card !border-none" shadow="never">
-      <el-page-header :icon="ArrowLeft" @back="back()">
-        <template #content>
-          <span class="text-large font-600 mr-3">{{ pageName }}</span>
-        </template>
-      </el-page-header>
-    </el-card>
-
-    <el-card class="box-card !border-none" shadow="never">
-      <el-card
-        class="box-card !border-none mb-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <div class="flex justify-between">
-          <el-form
-            :inline="true"
-            :model="cronTableData.searchParam"
-            ref="searchFormRef"
-          >
-            <el-form-item :label="t('name')" prop="key">
-              <el-select
-                v-model="cronTableData.searchParam.key"
-                placeholder="全部"
-                filterable
-                remote
-                clearable
-              >
-                <el-option label="全部" value="all" />
-                <el-option
-                  v-for="item in templateList"
-                  :key="item.key"
-                  :label="item.name"
-                  :value="item.key"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item :label="t('status')" prop="status">
-              <el-select
-                v-model="cronTableData.searchParam.status"
-                placeholder="全部"
-                filterable
-                remote
-                clearable
-              >
-                <el-option label="全部" value="all" />
-                <el-option label="成功" value="success" />
-                <el-option label="失败" value="error" />
-              </el-select>
-            </el-form-item>
-            <el-form-item :label="t('executeTime')" prop="execute_time">
-              <el-date-picker
-                v-model="cronTableData.searchParam.execute_time"
-                type="datetimerange"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                :start-placeholder="t('startDate')"
-                :end-placeholder="t('endDate')"
-              />
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" @click="loadCronLogList()">{{
-                t('search')
-              }}</el-button>
-              <el-button @click="resetForm(searchFormRef)">{{
-                t('reset')
-              }}</el-button>
-            </el-form-item>
-          </el-form>
-        </div>
-      </el-card>
-
-      <div class="mt-[20px]">
-        <div class="mb-[10px] flex items-center">
-          <el-checkbox
-            v-model="toggleCheckbox"
-            size="large"
-            class="px-[14px]"
-            @change="toggleChange"
-            :indeterminate="isIndeterminate"
-          />
-          <el-button
-            @click="batchDelete"
-            size="small"
-            :loading="deleteLoading"
-            >{{ t('batchDelete') }}</el-button
-          >
-          <el-button @click="clearAll" size="small" :loading="clearLoading">{{
-            t('clearAll')
-          }}</el-button>
-        </div>
-
-        <el-table
-          :data="cronTableData.data"
-          size="large"
-          v-loading="cronTableData.loading"
-          ref="cronLogListTableRef"
-          @selection-change="handleSelectionChange"
-        >
-          <template #empty>
-            <span>{{ !cronTableData.loading ? t('emptyData') : '' }}</span>
-          </template>
-          <el-table-column type="selection" width="55" />
-          <el-table-column prop="id" :label="t('id')" min-width="80" />
-          <el-table-column prop="name" :label="t('name')" min-width="150" />
-          <el-table-column prop="key" :label="t('key')" min-width="150" />
-          <el-table-column prop="class" :label="t('class')" min-width="150" />
-          <el-table-column :label="t('executeResult')" min-width="150">
-            <template #default="{ row }">
-              {{ row.execute_result }}
+    <div class="main-container">
+
+        <el-card class="card !border-none" shadow="never">
+            <el-page-header :icon="ArrowLeft" @back="back()">
+                <template #content>
+                    <span class="text-large font-600 mr-3">{{ pageName }}</span>
+                </template>
+            </el-page-header>
+        </el-card>
+
+        <el-card class="box-card !border-none" shadow="never">
+
+            <el-card class="box-card !border-none mb-[10px] table-search-wrap" shadow="never">
+                <div class="flex justify-between">
+                    <el-form :inline="true" :model="cronTableData.searchParam" ref="searchFormRef">
+                        <el-form-item :label="t('name')" prop="key">
+                            <el-select v-model="cronTableData.searchParam.key" placeholder="全部" filterable remote clearable>
+                                <el-option label="全部" value="all" />
+                                <el-option v-for="item in templateList" :key="item.key" :label="item.name" :value="item.key" />
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item :label="t('status')" prop="status">
+                            <el-select v-model="cronTableData.searchParam.status" placeholder="全部" filterable remote clearable>
+                                <el-option label="全部" value="all" />
+                                <el-option label="成功" value="success" />
+                                <el-option label="失败" value="error" />
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item :label="t('executeTime')" prop="execute_time">
+                            <el-date-picker v-model="cronTableData.searchParam.execute_time" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+                        </el-form-item>
+                        <el-form-item>
+                            <el-button type="primary" @click="loadCronLogList()">{{ t('search') }}</el-button>
+                            <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                        </el-form-item>
+                    </el-form>
+                </div>
+            </el-card>
+
+            <div class="mt-[20px]">
+                <div class="mb-[10px] flex items-center">
+                    <el-checkbox v-model="toggleCheckbox" size="large" class="px-[14px]" @change="toggleChange" :indeterminate="isIndeterminate" />
+                    <el-button @click="batchDelete" size="small" :loading="deleteLoading">{{ t('batchDelete') }}</el-button>
+                    <el-button @click="clearAll" size="small" :loading="clearLoading">{{ t('clearAll') }}</el-button>
+                </div>
+
+                <el-table :data="cronTableData.data" size="large" v-loading="cronTableData.loading" ref="cronLogListTableRef" @selection-change="handleSelectionChange">
+                    <template #empty>
+                        <span>{{ !cronTableData.loading ? t('emptyData') : '' }}</span>
+                    </template>
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column prop="id" :label="t('id')" min-width="80" />
+                    <el-table-column prop="name" :label="t('name')" min-width="150" />
+                    <el-table-column prop="key" :label="t('key')" min-width="150" />
+                    <el-table-column prop="class" :label="t('class')" min-width="150" />
+                    <el-table-column :label="t('executeResult')" min-width="150">
+                        <template #default="{ row }">
+                            {{ row.execute_result }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="status_name" :label="t('status')" min-width="100" />
+                    <el-table-column prop="execute_time" :label="t('executeTime')" min-width="100" />
+                    <el-table-column :label="t('operation')" align="right" fixed="right" width="130">
+                        <template #default="{ row }">
+                            <el-button type="primary" link @click="infoEvent(row)">{{ t('info') }}</el-button>
+                            <el-button type="primary" link @click="delEvent(row)">{{ t('delete') }}</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="cronTableData.page" v-model:page-size="cronTableData.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="cronTableData.total"
+                        @size-change="loadCronLogList()" @current-change="loadCronLogList" />
+                </div>
+            </div>
+        </el-card>
+
+        <el-dialog v-model="showDialog" :title="t('cronInfo')" width="550px" :destroy-on-close="true">
+            <el-form :model="formData" label-width="110px" ref="formRef" class="page-form" v-loading="loading">
+
+                <el-form-item :label="t('name')" >
+                    <div class="input-width"> {{ formData.name }} </div>
+                </el-form-item>
+
+                <el-form-item :label="t('key')" >
+                    <div class="input-width"> {{ formData.key }} </div>
+                </el-form-item>
+
+                <el-form-item :label="t('class')" >
+                    <div class="input-width"> {{ formData.class }} </div>
+                </el-form-item>
+
+                <el-form-item :label="t('executeResult')" >
+                    <div class="input-width"> {{ formData.execute_result }} </div>
+                </el-form-item>
+
+                <el-form-item :label="t('status')" >
+                    <div class="input-width"> {{ formData.status_name }} </div>
+                </el-form-item>
+
+                <el-form-item :label="t('executeTime')" >
+                    <div class="input-width"> {{ formData.execute_time }} </div>
+                </el-form-item>
+
+            </el-form>
+
+            <template #footer>
+            <span class="dialog-footer">
+                <el-button type="primary" @click="showDialog = false">{{ t('confirm') }}</el-button>
+            </span>
             </template>
-          </el-table-column>
-          <el-table-column
-            prop="status_name"
-            :label="t('status')"
-            min-width="100"
-          />
-          <el-table-column
-            prop="execute_time"
-            :label="t('executeTime')"
-            min-width="100"
-          />
-          <el-table-column
-            :label="t('operation')"
-            align="right"
-            fixed="right"
-            width="130"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="infoEvent(row)">{{
-                t('info')
-              }}</el-button>
-              <el-button type="primary" link @click="delEvent(row)">{{
-                t('delete')
-              }}</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="cronTableData.page"
-            v-model:page-size="cronTableData.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="cronTableData.total"
-            @size-change="loadCronLogList()"
-            @current-change="loadCronLogList"
-          />
-        </div>
-      </div>
-    </el-card>
-
-    <el-dialog
-      v-model="showDialog"
-      :title="t('cronInfo')"
-      width="550px"
-      :destroy-on-close="true"
-    >
-      <el-form
-        :model="formData"
-        label-width="110px"
-        ref="formRef"
-        class="page-form"
-        v-loading="loading"
-      >
-        <el-form-item :label="t('name')">
-          <div class="input-width">{{ formData.name }}</div>
-        </el-form-item>
-
-        <el-form-item :label="t('key')">
-          <div class="input-width">{{ formData.key }}</div>
-        </el-form-item>
-
-        <el-form-item :label="t('class')">
-          <div class="input-width">{{ formData.class }}</div>
-        </el-form-item>
-
-        <el-form-item :label="t('executeResult')">
-          <div class="input-width">{{ formData.execute_result }}</div>
-        </el-form-item>
-
-        <el-form-item :label="t('status')">
-          <div class="input-width">{{ formData.status_name }}</div>
-        </el-form-item>
-
-        <el-form-item :label="t('executeTime')">
-          <div class="input-width">{{ formData.execute_time }}</div>
-        </el-form-item>
-      </el-form>
-
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button type="primary" @click="showDialog = false">{{
-            t('confirm')
-          }}</el-button>
-        </span>
-      </template>
-    </el-dialog>
-  </div>
+        </el-dialog>
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref, computed } from 'vue'
 import { t } from '@/lang'
-import {
-  getCronLogList,
-  getCronTemplate,
-  deleteCronLog,
-  clearCronLog,
-} from '@/app/api/sys'
+import { getCronLogList, getCronTemplate, deleteCronLog, clearCronLog } from '@/app/api/sys'
 import { ElMessageBox, ElMessage, FormInstance } from 'element-plus'
 import { useRouter, useRoute } from 'vue-router'
 
@@ -214,33 +125,33 @@ const route = useRoute()
 const router = useRouter()
 const pageName = route.meta.title
 const back = () => {
-  router.push('/tools/schedule')
+    router.push('/tools/schedule')
 }
 
 const cronTableData = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    schedule_id: route.query.id,
-    key: '',
-    status: 'all',
-    execute_time: [],
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        schedule_id: route.query.id,
+        key: '',
+        status: 'all',
+        execute_time: []
+    }
 })
 const templateList = ref([])
 const searchFormRef = ref<FormInstance>()
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadCronLogList()
+    if (!formEl) return
+    formEl.resetFields()
+    loadCronLogList()
 }
 
 const setTypeList = async () => {
-  templateList.value = await (await getCronTemplate()).data
+    templateList.value = await (await getCronTemplate()).data
 }
 setTypeList()
 
@@ -248,21 +159,19 @@ setTypeList()
  * 获取日志列表
  */
 const loadCronLogList = (page: number = 1) => {
-  cronTableData.loading = true
-  cronTableData.page = page
-
-  getCronLogList({
-    page: cronTableData.page,
-    limit: cronTableData.limit,
-    ...cronTableData.searchParam,
-  })
-    .then((res) => {
-      cronTableData.loading = false
-      cronTableData.data = res.data.data
-      cronTableData.total = res.data.total
-    })
-    .catch(() => {
-      cronTableData.loading = false
+    cronTableData.loading = true
+    cronTableData.page = page
+
+    getCronLogList({
+        page: cronTableData.page,
+        limit: cronTableData.limit,
+        ...cronTableData.searchParam
+    }).then(res => {
+        cronTableData.loading = false
+        cronTableData.data = res.data.data
+        cronTableData.total = res.data.total
+    }).catch(() => {
+        cronTableData.loading = false
     })
 }
 loadCronLogList()
@@ -276,15 +185,15 @@ const clearLoading = ref(false)
 /**
  * 表单数据
  */
-const initialFormData = {
-  id: '',
-  name: '',
-  key: '',
-  execute_result: '',
-  status_name: '',
-  class: '',
-  job: '',
-  execute_time: '',
+ const initialFormData = {
+    id: '',
+    name: '',
+    key: '',
+    execute_result: '',
+    status_name: '',
+    class: '',
+    job: '',
+    execute_time: ''
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -293,42 +202,42 @@ const formData: Record<string, any> = reactive({ ...initialFormData })
  * @param row
  */
 const infoEvent = (row: any) => {
-  loading.value = true
-  Object.assign(formData, initialFormData)
+    loading.value = true
+    Object.assign(formData, initialFormData)
 
-  if (row) {
-    Object.keys(formData).forEach((key: string) => {
-      if (row[key] != undefined) formData[key] = row[key]
-    })
-  }
+    if (row) {
+        Object.keys(formData).forEach((key: string) => {
+            if (row[key] != undefined) formData[key] = row[key]
+        })
+    }
 
-  loading.value = false
-  showDialog.value = true
+    loading.value = false
+    showDialog.value = true
 }
 
 // 删除日志
 const delEvent = (data: any) => {
-  ElMessageBox.confirm(t('deleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    if (repeat.value) return
-    repeat.value = true
-
-    deleteCronLog({
-      ids: data.id,
-    })
-      .then((res: any) => {
-        if (res.code == 1) {
-          loadCronLogList()
+    ElMessageBox.confirm(t('deleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
         }
-        repeat.value = false
-      })
-      .catch(() => {
-        repeat.value = false
-      })
-  })
+    ).then(() => {
+        if (repeat.value) return
+        repeat.value = true
+
+        deleteCronLog({
+            ids: data.id
+        }).then((res: any) => {
+            if (res.code == 1) {
+                loadCronLogList()
+            }
+            repeat.value = false
+        }).catch(() => {
+            repeat.value = false
+        })
+    })
 }
 
 // 批量复选框
@@ -339,8 +248,8 @@ const isIndeterminate = ref(false)
 
 // 监听批量复选框事件
 const toggleChange = (value: any) => {
-  isIndeterminate.value = false
-  cronLogListTableRef.value.toggleAllSelection()
+    isIndeterminate.value = false
+    cronLogListTableRef.value.toggleAllSelection()
 }
 
 const cronLogListTableRef = ref()
@@ -350,95 +259,90 @@ const multipleSelection: any = ref([])
 
 // 监听表格单行选中
 const handleSelectionChange = (val: []) => {
-  multipleSelection.value = val
-
-  toggleCheckbox.value = false
-  if (
-    multipleSelection.value.length > 0 &&
-    multipleSelection.value.length < cronTableData.data.length
-  ) {
-    isIndeterminate.value = true
-  } else {
-    isIndeterminate.value = false
-  }
-
-  if (
-    multipleSelection.value.length == cronTableData.data.length &&
-    cronTableData.data.length &&
-    multipleSelection.value.length
-  ) {
-    toggleCheckbox.value = true
-  }
+    multipleSelection.value = val
+
+    toggleCheckbox.value = false
+    if (multipleSelection.value.length > 0 && multipleSelection.value.length < cronTableData.data.length) {
+        isIndeterminate.value = true
+    } else {
+        isIndeterminate.value = false
+    }
+
+    if (multipleSelection.value.length == cronTableData.data.length && cronTableData.data.length && multipleSelection.value.length) {
+        toggleCheckbox.value = true
+    }
 }
 
 // 批量删除
 const batchDelete = () => {
-  if (multipleSelection.value.length == 0) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('batchEmptySelectedCronLogTips')}`,
-    })
-    return
-  }
-
-  ElMessageBox.confirm(t('batchDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    if (repeat.value) return
-    repeat.value = true
-    deleteLoading.value = true
-
-    const ids: any = []
-    multipleSelection.value.forEach((item: any) => {
-      ids.push(item.id)
-    })
-
-    deleteCronLog({
-      ids: ids,
+    if (multipleSelection.value.length == 0) {
+        ElMessage({
+            type: 'warning',
+            message: `${t('batchEmptySelectedCronLogTips')}`
+        })
+        return
+    }
+
+    ElMessageBox.confirm(t('batchDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        if (repeat.value) return
+        repeat.value = true
+        deleteLoading.value = true
+
+        const ids: any = []
+        multipleSelection.value.forEach((item: any) => {
+            ids.push(item.id)
+        })
+
+        deleteCronLog({
+            ids: ids
+        }).then(() => {
+            loadCronLogList()
+            toggleCheckbox.value = false
+            repeat.value = false
+            deleteLoading.value = false
+        }).catch(() => {
+            repeat.value = false
+            deleteLoading.value = false
+        })
     })
-      .then(() => {
-        loadCronLogList()
-        toggleCheckbox.value = false
-        repeat.value = false
-        deleteLoading.value = false
-      })
-      .catch(() => {
-        repeat.value = false
-        deleteLoading.value = false
-      })
-  })
 }
 
 // 清空日志
 const clearAll = () => {
-  ElMessageBox.confirm(t('clearAllTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    if (repeat.value) return
-    repeat.value = true
-    clearLoading.value = true
-
-    const schedule_id = route.query.id ?? ''
-
-    clearCronLog({
-      schedule_id: schedule_id,
+    
+    ElMessageBox.confirm(t('clearAllTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        if (repeat.value) return
+        repeat.value = true
+        clearLoading.value = true
+
+        const schedule_id = route.query.id ?? ''
+
+        clearCronLog({
+            schedule_id: schedule_id
+        }).then(() => {
+            loadCronLogList()
+            toggleCheckbox.value = false
+            repeat.value = false
+            clearLoading.value = false
+        }).catch(() => {
+            repeat.value = false
+            clearLoading.value = false
+        })
     })
-      .then(() => {
-        loadCronLogList()
-        toggleCheckbox.value = false
-        repeat.value = false
-        clearLoading.value = false
-      })
-      .catch(() => {
-        repeat.value = false
-        clearLoading.value = false
-      })
-  })
 }
+
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/app/views/tools/updatecache.vue b/admin/src/app/views/tools/updatecache.vue
index 209c26cb..108bdc29 100644
--- a/admin/src/app/views/tools/updatecache.vue
+++ b/admin/src/app/views/tools/updatecache.vue
@@ -1,39 +1,23 @@
 <template>
-  <div class="main-container h-[500px] w-full p-5 bg-white" v-loading="loading">
-    <div class="flex flex-wrap px-2 plug-list pb-10">
-      <div
-        class="flex items-center bg-[#F7F8FA] p-3 w-[295px] relative plug-item mr-4 mb-4 cursor-pointer"
-      >
-        <div class="flex flex-col ml-2">
-          <span class="text-sm truncate w-[190px]">{{ t('refreshMenu') }}</span>
-          <span
-            class="text-xs text-gray-400 mt-1 truncate w-[190px]"
-            :title="t('refreshMenuDesc')"
-            >{{ t('refreshMenuDesc') }}</span
-          >
-        </div>
-        <span class="plug-item-operate" @click="refreshMenu()">{{
-          t('refresh')
-        }}</span>
-      </div>
+    <div class="main-container h-[500px] w-full p-5 bg-white" v-loading="loading">
+        <div class="flex flex-wrap px-2 plug-list pb-10">
+           <div class="flex items-center bg-[#F7F8FA] p-3 w-[295px] relative plug-item mr-4 mb-4 cursor-pointer">
+               <div class="flex flex-col ml-2">
+                   <span class="text-sm truncate w-[190px]">{{t('refreshMenu')}}</span>
+                   <span class="text-xs text-gray-400 mt-1 truncate w-[190px]" :title="t('refreshMenuDesc')">{{t('refreshMenuDesc')}}</span>
+               </div>
+               <span class="plug-item-operate" @click="refreshMenu()">{{t('refresh')}}</span>
+           </div>
 
-      <div
-        class="flex items-center bg-[#F7F8FA] p-3 w-[295px] relative plug-item mr-4 mb-4 cursor-pointer"
-      >
-        <div class="flex flex-col ml-2">
-          <span class="text-sm truncate w-[190px]">{{ t('dataCache') }}</span>
-          <span
-            class="text-xs text-gray-400 mt-1 truncate w-[190px]"
-            :title="t('dataCacheDesc')"
-            >{{ t('dataCacheDesc') }}</span
-          >
+            <div class="flex items-center bg-[#F7F8FA] p-3 w-[295px] relative plug-item mr-4 mb-4 cursor-pointer">
+                <div class="flex flex-col ml-2">
+                    <span class="text-sm truncate w-[190px]">{{t('dataCache')}}</span>
+                    <span class="text-xs text-gray-400 mt-1 truncate w-[190px]" :title="t('dataCacheDesc')">{{t('dataCacheDesc')}}</span>
+                </div>
+                <span class="plug-item-operate" @click="schemaCache()">{{t('refresh')}}</span>
+            </div>
         </div>
-        <span class="plug-item-operate" @click="schemaCache()">{{
-          t('refresh')
-        }}</span>
-      </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
@@ -45,26 +29,23 @@ const loading = ref<Boolean>(false)
 
 // 数据缓存
 const schemaCache = () => {
-  loading.value = true
-  clearSchemaCache({})
-    .then((res) => {
-      loading.value = false
-    })
-    .catch(() => {
-      loading.value = false
+    loading.value = true
+    clearSchemaCache({}).then(res => {
+        loading.value = false
+    }).catch(() => {
+        loading.value = false
     })
 }
 // 更新菜单
 const refreshMenu = () => {
-  loading.value = true
-  menuRefresh({})
-    .then((res) => {
-      loading.value = false
-    })
-    .catch(() => {
-      loading.value = false
+    loading.value = true
+    menuRefresh({}).then(res => {
+        loading.value = false
+    }).catch(() => {
+        loading.value = false
     })
 }
+
 </script>
 
 <style lang="scss" scoped>
@@ -74,10 +55,10 @@ const refreshMenu = () => {
   font-size: 32px;
   font-weight: 600;
 }
-.plug-item {
-  .plug-item-operate {
-    @apply text-xs absolute right-3 cursor-pointer;
-    color: var(--el-color-primary);
-  }
+.plug-item{
+    .plug-item-operate{
+        @apply text-xs absolute right-3 cursor-pointer;
+        color: var(--el-color-primary);
+    }
 }
 </style>
diff --git a/admin/src/app/views/web/adv.vue b/admin/src/app/views/web/adv.vue
index 0858db6a..a190224e 100644
--- a/admin/src/app/views/web/adv.vue
+++ b/admin/src/app/views/web/adv.vue
@@ -1,102 +1,59 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center mb-[15px] ml-[15px]">
-        <div class="flex items-center">
-          <div
-            class="text-[#666] cursor-pointer text-[14px]"
-            @click="router.push(`/web/adv_position`)"
-          >
-            <span class="iconfont iconxiangzuojiantou !text-xs"></span>
-            <span class="ml-[1px]">{{ t('returnToPreviousPage') }}</span>
-          </div>
-          <span class="text-[#999] mx-[12px]">|</span>
-          <span class="right">{{ pageName }}</span>
-        </div>
-        <el-button type="primary" @click="addEvent">{{
-          t('addAdv')
-        }}</el-button>
-      </div>
-      <div class="mt-[10px]">
-        <el-table
-          :data="advTable.data"
-          size="large"
-          v-loading="advTable.loading"
-        >
-          <template #empty>
-            <span>{{ !advTable.loading ? t('emptyData') : '' }}</span>
-          </template>
-          <el-table-column
-            prop="adv_title"
-            :label="t('advName')"
-            min-width="120"
-          />
-          <el-table-column :label="t('advUrl')" min-width="120">
-            <template #default="{ row }">
-              <div>{{ row.adv_url ? row.adv_url.url : '' }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="ap_name"
-            :label="t('advPosition')"
-            min-width="120"
-          />
-          <el-table-column :label="t('advImg')" min-width="180">
-            <template #default="{ row }">
-              <div class="w-[40px] h-[40px] flex items-center">
-                <el-image
-                  :src="img(row.adv_image)"
-                  :zoom-rate="1.2"
-                  :max-scale="7"
-                  :min-scale="0.2"
-                  :preview-src-list="[img(row.adv_image)]"
-                  :initial-index="4"
-                  fit="cover"
-                />
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('sort')" min-width="120">
-            <template #default="{ row }">
-              <el-input
-                v-model.trim="row.sort"
-                class="!w-[70px]"
-                maxlength="8"
-                @blur="sortInputListener(row.sort, row)"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column
-            :label="t('operation')"
-            fixed="right"
-            min-width="120"
-            align="right"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="editEvent(row)">{{
-                t('edit')
-              }}</el-button>
-              <el-button type="primary" link @click="deleteEvent(row.adv_id)">{{
-                t('delete')
-              }}</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="advTable.page"
-            v-model:page-size="advTable.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="advTable.total"
-            @size-change="loadAdvList()"
-            @current-change="loadAdvList"
-          />
-        </div>
-      </div>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+            <div class="flex justify-between items-center mb-[15px] ml-[15px]">
+                <div class="flex items-center">
+                    <div class="text-[#666] cursor-pointer text-[14px]" @click="router.push(`/web/adv_position`)">
+                        <span class="iconfont iconxiangzuojiantou !text-xs"></span>
+                        <span class="ml-[1px]">{{ t('returnToPreviousPage') }}</span>
+                    </div>
+                    <span class="text-[#999] mx-[12px]">|</span>
+                    <span class="right">{{ pageName }}</span>
+                </div>
+                <el-button type="primary" @click="addEvent">{{ t('addAdv') }}</el-button>
+            </div>
+            <div class="mt-[10px]">
+                <el-table :data="advTable.data" size="large" v-loading="advTable.loading">
+                    <template #empty>
+                        <span>{{ !advTable.loading ? t('emptyData') : '' }}</span>
+                    </template>
+                    <el-table-column prop="adv_title" :label="t('advName')" min-width="120" />
+                    <el-table-column :label="t('advUrl')" min-width="120">
+                        <template #default="{ row }">
+                            <div>{{ row.adv_url ? row.adv_url.url : '' }}</div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="ap_name" :label="t('advPosition')" min-width="120" />
+                    <el-table-column :label="t('advImg')" min-width="180">
+                        <template #default="{ row }">
+                            <div class="w-[40px] h-[40px] flex items-center">
+                                <el-image :src="img(row.adv_image)" :zoom-rate="1.2" :max-scale="7" :min-scale="0.2" :preview-src-list="[img(row.adv_image)]" :initial-index="4" fit="cover" />
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('sort')" min-width="120">
+                        <template #default="{ row }">
+                            <el-input v-model.trim="row.sort" class="!w-[70px]" maxlength="8" @blur="sortInputListener(row.sort, row)" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('operation')" fixed="right" min-width="120" align="right">
+                        <template #default="{ row }">
+                            <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+                            <el-button type="primary" link @click="deleteEvent(row.adv_id)">{{ t('delete') }}</el-button>
+                        </template>
+                    </el-table-column>
 
-      <edit ref="editAdvDialog" @complete="loadAdvList" />
-    </el-card>
-  </div>
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="advTable.page" v-model:page-size="advTable.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="advTable.total"
+                        @size-change="loadAdvList()" @current-change="loadAdvList" />
+                </div>
+            </div>
+
+            <edit ref="editAdvDialog" @complete="loadAdvList" />
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -114,32 +71,30 @@ const pageName = route.meta.title
 const advKey = route.query.adv_key
 const apName = route.query.ap_name
 const advTable = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: []
 })
 
 /**
  * 获取广告列表
  */
 const loadAdvList = (page: number = 1) => {
-  advTable.loading = true
-  advTable.page = page
+    advTable.loading = true
+    advTable.page = page
 
-  getAdvList({
-    page: advTable.page,
-    limit: advTable.limit,
-    adv_key: advKey,
-  })
-    .then((res) => {
-      advTable.loading = false
-      advTable.data = res.data.data
-      advTable.total = res.data.total
-    })
-    .catch(() => {
-      advTable.loading = false
+    getAdvList({
+        page: advTable.page,
+        limit: advTable.limit,
+        adv_key: advKey
+    }).then(res => {
+        advTable.loading = false
+        advTable.data = res.data.data
+        advTable.total = res.data.total
+    }).catch(() => {
+        advTable.loading = false
     })
 }
 loadAdvList()
@@ -150,8 +105,8 @@ const editAdvDialog: Record<string, any> | null = ref(null)
  * 添加广告
  */
 const addEvent = () => {
-  editAdvDialog.value.setFormData({ adv_key: advKey, ap_name: apName })
-  editAdvDialog.value.showDialog = true
+    editAdvDialog.value.setFormData({adv_key: advKey, ap_name: apName})
+    editAdvDialog.value.showDialog = true
 }
 
 /**
@@ -159,56 +114,57 @@ const addEvent = () => {
  * @param data
  */
 const editEvent = (data: any) => {
-  editAdvDialog.value.setFormData(data)
-  editAdvDialog.value.showDialog = true
+    editAdvDialog.value.setFormData(data)
+    editAdvDialog.value.showDialog = true
 }
 
 /**
  * 删除广告
  */
 const deleteEvent = (id: number) => {
-  ElMessageBox.confirm(t('advDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    deleteAdv(id)
-      .then(() => {
-        loadAdvList()
-      })
-      .catch(() => {})
-  })
+    ElMessageBox.confirm(t('advDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        deleteAdv(id).then(() => {
+            loadAdvList()
+        }).catch(() => {
+        })
+    })
 }
 
 // 正则表达式
 const regExp = {
-  number: /^\d{0,10}$/,
-  digit: /^\d{0,10}(.?\d{0,2})$/,
+    number: /^\d{0,10}$/,
+    digit: /^\d{0,10}(.?\d{0,2})$/
 }
 
 // 修改排序号
 const sortInputListener = debounce((sort, row) => {
-  if (isNaN(sort) || !regExp.number.test(sort)) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('sortTips')}`,
+    if (isNaN(sort) || !regExp.number.test(sort)) {
+        ElMessage({
+            type: 'warning',
+            message: `${t('sortTips')}`
+        })
+        return
+    }
+    if (sort > 99999999) {
+        row.sort = 99999999
+    }
+    editAdvSort({
+        id: row.adv_id,
+        sort
+    }).then((res: any) => {
+        loadAdvList()
     })
-    return
-  }
-  if (sort > 99999999) {
-    row.sort = 99999999
-  }
-  editAdvSort({
-    id: row.adv_id,
-    sort,
-  }).then((res: any) => {
-    loadAdvList()
-  })
 })
 </script>
 
 <style lang="scss" scoped>
 .input-width-sort {
-  width: 70px;
+    width: 70px;
 }
 </style>
diff --git a/admin/src/app/views/web/adv_position.vue b/admin/src/app/views/web/adv_position.vue
index c45dd015..efb10ce9 100644
--- a/admin/src/app/views/web/adv_position.vue
+++ b/admin/src/app/views/web/adv_position.vue
@@ -1,39 +1,25 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center mb-[20px]">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+            <div class="flex justify-between items-center mb-[20px]">
+                <span class="text-page-title">{{ pageName }}</span>
+            </div>
 
-      <el-table
-        :data="avdPositionTableData.data"
-        size="large"
-        v-loading="avdPositionTableData.loading"
-      >
-        <template #empty>
-          <span>{{ !avdPositionTableData.loading ? t('emptyData') : '' }}</span>
-        </template>
-        <el-table-column prop="ap_name" :label="t('apName')" min-width="120" />
-        <el-table-column
-          prop="keywords"
-          :label="t('keywords')"
-          min-width="120"
-        />
-        <el-table-column
-          :label="t('operation')"
-          fixed="right"
-          align="right"
-          min-width="160"
-        >
-          <template #default="{ row }">
-            <el-button type="primary" link @click="toLink(row)">{{
-              t('manageAdv')
-            }}</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
-  </div>
+            <el-table :data="avdPositionTableData.data" size="large" v-loading="avdPositionTableData.loading">
+                <template #empty>
+                    <span>{{ !avdPositionTableData.loading ? t('emptyData') : '' }}</span>
+                </template>
+                <el-table-column prop="ap_name" :label="t('apName')" min-width="120" />
+                <el-table-column prop="keywords" :label="t('keywords')" min-width="120" />
+                <el-table-column :label="t('operation')" fixed="right" align="right" min-width="160">
+                    <template #default="{ row }">
+                        <el-button type="primary" link @click="toLink(row)">{{ t('manageAdv') }}</el-button>
+                    </template>
+                </el-table-column>
+
+            </el-table>
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -46,25 +32,24 @@ const route = useRoute()
 const router = useRouter()
 const pageName = route.meta.title
 const avdPositionTableData: any = reactive({
-  loading: true,
-  data: [],
+    loading: true,
+    data: []
 })
 
 // 获取广告位列表
 const loadAvdPositionList = () => {
-  getAvdPositionList({})
-    .then((res) => {
-      avdPositionTableData.loading = false
-      avdPositionTableData.data = res.data
-    })
-    .catch(() => {
-      avdPositionTableData.loading = false
+    getAvdPositionList({}).then(res => {
+        avdPositionTableData.loading = false
+        avdPositionTableData.data = res.data
+    }).catch(() => {
+        avdPositionTableData.loading = false
     })
 }
 loadAvdPositionList()
 const toLink = (data: any) => {
-  router.push(`/web/adv?adv_key=${data.keywords}&ap_name=${data.ap_name}`)
+    router.push(`/web/adv?adv_key=${data.keywords}&ap_name=${data.ap_name}`)
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
diff --git a/admin/src/app/views/web/components/adv-edit.vue b/admin/src/app/views/web/components/adv-edit.vue
index ca487520..b249b845 100644
--- a/admin/src/app/views/web/components/adv-edit.vue
+++ b/admin/src/app/views/web/components/adv-edit.vue
@@ -1,70 +1,33 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="formData.adv_id ? t('updateAdv') : t('addAdv')"
-    width="30%"
-    class="diy-dialog-wrap"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="120px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('advName')" prop="adv_title">
-        <el-input
-          v-model.trim="formData.adv_title"
-          clearable
-          :placeholder="t('advNamePlaceholder')"
-          class="input-width"
-          maxlength="20"
-        />
-      </el-form-item>
-      <el-form-item :label="t('advPosition')" prop="ap_name">
-        <el-input
-          v-model.trim="formData.ap_name"
-          disabled
-          class="input-width"
-        />
-      </el-form-item>
-      <el-form-item :label="t('advUrl')">
-        <web-link v-model="formData.adv_url" />
-      </el-form-item>
-      <el-form-item :label="t('advImg')" prop="adv_image">
-        <upload-image v-model="formData.adv_image" />
-      </el-form-item>
-      <el-form-item :label="t('background')">
-        <el-color-picker v-model="formData.background" />
-      </el-form-item>
-      <el-form-item :label="t('sort')" prop="sort">
-        <el-input
-          v-model.trim="formData.sort"
-          clearable
-          :placeholder="t('sortPlaceholder')"
-          class="input-width"
-          show-word-limit
-          maxlength="8"
-          @keyup="filterNumber($event)"
-          @blur="formData.sort = $event.target.value"
-        />
-      </el-form-item>
-    </el-form>
+    <el-dialog v-model="showDialog" :title="formData.adv_id ? t('updateAdv') : t('addAdv')" width="30%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+            <el-form-item :label="t('advName')" prop="adv_title">
+                <el-input v-model.trim="formData.adv_title" clearable :placeholder="t('advNamePlaceholder')" class="input-width" maxlength="20" />
+            </el-form-item>
+            <el-form-item :label="t('advPosition')" prop="ap_name">
+                <el-input v-model.trim="formData.ap_name" disabled class="input-width" />
+            </el-form-item>
+            <el-form-item :label="t('advUrl')">
+                <web-link v-model="formData.adv_url" />
+            </el-form-item>
+            <el-form-item :label="t('advImg')" prop="adv_image">
+                <upload-image v-model="formData.adv_image" />
+            </el-form-item>
+            <el-form-item :label="t('background')">
+                <el-color-picker v-model="formData.background" />
+            </el-form-item>
+            <el-form-item :label="t('sort')" prop="sort">
+                <el-input v-model.trim="formData.sort" clearable :placeholder="t('sortPlaceholder')" class="input-width" show-word-limit maxlength="8" @keyup="filterNumber($event)" @blur="formData.sort = $event.target.value" />
+            </el-form-item>
+        </el-form>
 
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -80,16 +43,17 @@ const loading = ref(false)
  * 表单数据
  */
 const initialFormData = {
-  adv_key: '',
-  ap_name: '',
-  adv_id: '',
-  adv_title: '',
-  adv_url: {
-    name: '',
-  },
-  adv_image: '',
-  sort: '',
-  background: '',
+    adv_key: '',
+    ap_name: '',
+    adv_id: '',
+    adv_title: '',
+    adv_url: {
+        name : ''
+    },
+    adv_image: '',
+    sort: '',
+    background: ''
+
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -97,31 +61,31 @@ const formRef = ref<FormInstance>()
 
 // 正则表达式
 const regExp: any = {
-  number: /^\d{0,10}$/,
+    number: /^\d{0,10}$/
 }
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    adv_title: [
-      { required: true, message: t('advNamePlaceholder'), trigger: 'blur' },
-    ],
-    adv_image: [
-      { required: true, message: t('advImagePlaceholder'), trigger: 'blur' },
-    ],
-    sort: [
-      {
-        trigger: 'blur',
-        validator: (rule: any, value: any, callback: any) => {
-          if (isNaN(value) || !regExp.number.test(value)) {
-            callback(new Error(t('sortTips')))
-          } else {
-            callback()
-          }
-        },
-      },
-    ],
-  }
+    return {
+        adv_title: [
+            { required: true, message: t('advNamePlaceholder'), trigger: 'blur' }
+        ],
+        adv_image: [
+            { required: true, message: t('advImagePlaceholder'), trigger: 'blur' }
+        ],
+        sort: [
+            {
+                trigger: 'blur',
+                validator: (rule: any, value: any, callback: any) => {
+                    if (isNaN(value) || !regExp.number.test(value)) {
+                        callback(new Error(t('sortTips')))
+                    } else {
+                        callback()
+                    }
+                }
+            }
+        ],
+    }
 })
 
 const emit = defineEmits(['complete'])
@@ -131,54 +95,52 @@ const emit = defineEmits(['complete'])
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  const save = formData.adv_id ? editAdv : addAdv
+    if (loading.value || !formEl) return
+    const save = formData.adv_id ? editAdv : addAdv
 
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      const data = formData
-      save(data)
-        .then((res) => {
-          loading.value = false
-          showDialog.value = false
-          emit('complete')
-        })
-        .catch(() => {
-          loading.value = false
-        })
-    }
-  })
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+            const data = formData
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
 }
 const setFormData = async (row: any = null) => {
-  Object.assign(formData, initialFormData)
-  loading.value = true
-  if (row.adv_id) {
-    const data = await (await getAdvInfo(row.adv_id)).data
-    if (data) {
-      Object.keys(formData).forEach((key: string) => {
-        if (data[key] != undefined) formData[key] = data[key]
-      })
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if (row.adv_id) {
+        const data = await (await getAdvInfo(row.adv_id)).data
+        if (data) {
+            Object.keys(formData).forEach((key: string) => {
+                if (data[key] != undefined) formData[key] = data[key]
+            })
+        }
+    } else {
+        formData.adv_key = row.adv_key
+        formData.ap_name = row.ap_name
     }
-  } else {
-    formData.adv_key = row.adv_key
-    formData.ap_name = row.ap_name
-  }
-  loading.value = false
+    loading.value = false
 }
 
 // 展示链接
 const link: any = ref([])
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
 <style lang="scss" scoped></style>
 <style lang="scss">
 .diy-dialog-wrap .el-form-item__label {
-  height: auto !important;
+    height: auto !important;
 }
 </style>
diff --git a/admin/src/app/views/web/components/friendly-link-edit.vue b/admin/src/app/views/web/components/friendly-link-edit.vue
index 8cd582bf..5e4e45db 100644
--- a/admin/src/app/views/web/components/friendly-link-edit.vue
+++ b/admin/src/app/views/web/components/friendly-link-edit.vue
@@ -1,83 +1,37 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="formData.id ? t('updateFriendlyLink') : t('addFriendlyLink')"
-    width="500px"
-    class="diy-dialog-wrap"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="120px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('linkPic')">
-        <upload-image v-model="formData.link_pic" />
-      </el-form-item>
-      <el-form-item :label="t('linkTitle')" prop="link_title">
-        <el-input
-          v-model="formData.link_title"
-          clearable
-          :placeholder="t('linkTitlePlaceholder')"
-          class="input-width"
-          maxlength="20"
-        />
-      </el-form-item>
-      <el-form-item :label="t('linkUrl')" prop="link_url">
-        <el-input
-          v-model="formData.link_url"
-          clearable
-          :placeholder="t('linkUrlPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-      <el-form-item :label="t('sort')" prop="sort">
-        <el-input
-          v-model.trim="formData.sort"
-          clearable
-          :placeholder="t('sortPlaceholder')"
-          class="input-width"
-          show-word-limit
-          maxlength="8"
-          @keyup="filterNumber($event)"
-          @blur="formData.sort = $event.target.value"
-        />
-      </el-form-item>
-      <el-form-item :label="t('isShow')">
-        <el-switch
-          v-model="formData.is_show"
-          :active-value="1"
-          :inactive-value="0"
-        />
-      </el-form-item>
-    </el-form>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('updateFriendlyLink') : t('addFriendlyLink')" width="500px" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+            <el-form-item :label="t('linkPic')">
+                <upload-image v-model="formData.link_pic" />
+            </el-form-item>
+            <el-form-item :label="t('linkTitle')" prop="link_title">
+                <el-input v-model="formData.link_title" clearable :placeholder="t('linkTitlePlaceholder')" class="input-width" maxlength="20" />
+            </el-form-item>
+            <el-form-item :label="t('linkUrl')" prop="link_url">
+                <el-input v-model="formData.link_url" clearable :placeholder="t('linkUrlPlaceholder')" class="input-width" />
+            </el-form-item>
+            <el-form-item :label="t('sort')" prop="sort">
+                <el-input v-model.trim="formData.sort" clearable :placeholder="t('sortPlaceholder')" class="input-width" show-word-limit maxlength="8" @keyup="filterNumber($event)" @blur="formData.sort = $event.target.value" />
+            </el-form-item>
+            <el-form-item :label="t('isShow')">
+                <el-switch v-model="formData.is_show" :active-value="1" :inactive-value="0" />
+            </el-form-item>
+        </el-form>
 
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
 import { ref, reactive, computed } from 'vue'
 import { t } from '@/lang'
 import type { FormInstance } from 'element-plus'
-import {
-  addFriendlyLink,
-  editFriendlyLink,
-  getFriendlyLinkInfo,
-} from '@/app/api/web'
+import { addFriendlyLink, editFriendlyLink, getFriendlyLinkInfo } from '@/app/api/web'
 
 const showDialog = ref(false)
 const loading = ref(false)
@@ -86,12 +40,12 @@ const loading = ref(false)
  * 表单数据
  */
 const initialFormData = {
-  id: '',
-  link_pic: '',
-  link_title: '',
-  link_url: '',
-  sort: '',
-  is_show: 1,
+    id: '',
+    link_pic: '',
+    link_title: '',
+    link_url: '',
+    sort: '',
+    is_show: 1
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -99,44 +53,42 @@ const formRef = ref<FormInstance>()
 
 // 正则表达式
 const regExp: any = {
-  number: /^\d{0,10}$/,
+    number: /^\d{0,10}$/,
 }
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    link_pic: [
-      { required: true, message: t('linkPicPlaceholder'), trigger: 'blur' },
-    ],
-    link_title: [
-      { required: true, message: t('linkTitlePlaceholder'), trigger: 'blur' },
-    ],
-    link_url: [
-      { required: true, message: t('linkUrlPlaceholder'), trigger: 'blur' },
-      {
-        validator: (rule: any, value: string, callback: any) => {
-          const pattern = /^(http|https):\/\/.+/
-          if (value && !pattern.test(value)) {
-            callback(new Error(t('addressTips')))
-          } else {
-            callback()
-          }
-        },
-      },
-    ],
-    sort: [
-      {
-        trigger: 'blur',
-        validator: (rule: any, value: any, callback: any) => {
-          if (isNaN(value) || !regExp.number.test(value)) {
-            callback(new Error(t('sortTips')))
-          } else {
-            callback()
-          }
-        },
-      },
-    ],
-  }
+    return {
+        link_pic: [
+            { required: true, message: t('linkPicPlaceholder'), trigger: 'blur' }
+        ],
+        link_title: [
+            { required: true, message: t('linkTitlePlaceholder'), trigger: 'blur' }
+        ],
+        link_url: [
+            { required: true, message: t('linkUrlPlaceholder'), trigger: 'blur' },
+            {
+                validator: (rule: any, value: string, callback: any) => {
+                    const pattern = /^(http|https):\/\/.+/
+                    if (value && !pattern.test(value)) {
+                        callback(new Error(t('addressTips')))
+                    } else { callback() }
+                }
+            }
+        ],
+        sort: [
+            {
+                trigger: 'blur',
+                validator: (rule: any, value: any, callback: any) => {
+                    if (isNaN(value) || !regExp.number.test(value)) {
+                        callback(new Error(t('sortTips')))
+                    } else {
+                        callback()
+                    }
+                }
+            }
+        ],
+    }
 })
 
 const emit = defineEmits(['complete'])
@@ -146,51 +98,49 @@ const emit = defineEmits(['complete'])
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  const save = formData.id ? editFriendlyLink : addFriendlyLink
+    if (loading.value || !formEl) return
+    const save = formData.id ? editFriendlyLink : addFriendlyLink
 
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
 
-      const data = formData
+            const data = formData
 
-      save(data)
-        .then((res) => {
-          loading.value = false
-          showDialog.value = false
-          emit('complete')
-        })
-        .catch(() => {
-          loading.value = false
-        })
-    }
-  })
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
 }
 
 const setFormData = async (row: any = null) => {
-  Object.assign(formData, initialFormData)
-  loading.value = true
-  if (row) {
-    const data = await (await getFriendlyLinkInfo(row.id)).data
-    if (data) {
-      Object.keys(formData).forEach((key: string) => {
-        if (data[key] != undefined) formData[key] = data[key]
-      })
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if (row) {
+        const data = await (await getFriendlyLinkInfo(row.id)).data
+        if (data) {
+            Object.keys(formData).forEach((key: string) => {
+                if (data[key] != undefined) formData[key] = data[key]
+            })
+        }
     }
-  }
-  loading.value = false
+    loading.value = false
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
 <style lang="scss" scoped></style>
 <style lang="scss">
 .diy-dialog-wrap .el-form-item__label {
-  height: auto !important;
+    height: auto !important;
 }
 </style>
diff --git a/admin/src/app/views/web/components/nav-edit.vue b/admin/src/app/views/web/components/nav-edit.vue
index 7f029342..37e56975 100644
--- a/admin/src/app/views/web/components/nav-edit.vue
+++ b/admin/src/app/views/web/components/nav-edit.vue
@@ -1,72 +1,31 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="formData.id ? t('updateNav') : t('addNav')"
-    width="500px"
-    class="diy-dialog-wrap"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="120px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('navTitle')" prop="nav_title">
-        <el-input
-          v-model.trim="formData.nav_title"
-          clearable
-          :placeholder="t('navTitlePlaceholder')"
-          class="input-width"
-          maxlength="20"
-        />
-      </el-form-item>
-      <el-form-item :label="t('navUrl')" prop="nav_url">
-        <web-link v-model="formData.nav_url" />
-      </el-form-item>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('updateNav') : t('addNav')" width="500px" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+            <el-form-item :label="t('navTitle')" prop="nav_title">
+                <el-input v-model.trim="formData.nav_title" clearable :placeholder="t('navTitlePlaceholder')" class="input-width" maxlength="20" />
+            </el-form-item>
+            <el-form-item :label="t('navUrl')" prop="nav_url">
+                <web-link v-model="formData.nav_url" />
+            </el-form-item>
 
-      <el-form-item :label="t('sort')" prop="sort">
-        <el-input
-          v-model.trim="formData.sort"
-          clearable
-          :placeholder="t('sortPlaceholder')"
-          class="input-width"
-          show-word-limit
-          maxlength="8"
-          @keyup="filterNumber($event)"
-          @blur="formData.sort = $event.target.value"
-        />
-      </el-form-item>
-      <el-form-item :label="t('isBlank')">
-        <el-switch
-          v-model="formData.is_blank"
-          :active-value="1"
-          :inactive-value="0"
-        />
-      </el-form-item>
-      <el-form-item :label="t('isShow')">
-        <el-switch
-          v-model="formData.is_show"
-          :active-value="1"
-          :inactive-value="0"
-        />
-      </el-form-item>
-    </el-form>
+            <el-form-item :label="t('sort')" prop="sort">
+                <el-input v-model.trim="formData.sort" clearable :placeholder="t('sortPlaceholder')" class="input-width" show-word-limit maxlength="8" @keyup="filterNumber($event)" @blur="formData.sort = $event.target.value" />
+            </el-form-item>
+            <el-form-item :label="t('isBlank')">
+                <el-switch v-model="formData.is_blank" :active-value="1" :inactive-value="0" />
+            </el-form-item>
+            <el-form-item :label="t('isShow')">
+                <el-switch v-model="formData.is_show" :active-value="1" :inactive-value="0" />
+            </el-form-item>
+        </el-form>
 
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -83,14 +42,14 @@ const loading = ref(false)
  * 表单数据
  */
 const initialFormData = {
-  id: '',
-  nav_title: '',
-  nav_url: {
-    name: '',
-  },
-  sort: '',
-  is_blank: 1,
-  is_show: 1,
+    id: '',
+    nav_title: '',
+    nav_url: {
+        name : ''
+    },
+    sort: '',
+    is_blank: 1,
+    is_show: 1
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -98,44 +57,44 @@ const formRef = ref<FormInstance>()
 
 // 正则表达式
 const regExp: any = {
-  number: /^\d{0,10}$/,
+    number: /^\d{0,10}$/,
 }
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
-    nav_title: [
-      { required: true, message: t('navTitlePlaceholder'), trigger: 'blur' },
-    ],
-    nav_url: [
-      {
-        required: true,
-        trigger: 'blur',
-        validator: (rule: any, value: any, callback: any) => {
-          if (!value.url) {
-            callback(new Error(t('navUrlPlaceholder')))
-          } else {
-            callback()
-          }
-        },
-      },
-    ],
-    is_blank: [
-      { required: true, message: t('isBlankPlaceholder'), trigger: 'blur' },
-    ],
-    sort: [
-      {
-        trigger: 'blur',
-        validator: (rule: any, value: any, callback: any) => {
-          if (isNaN(value) || !regExp.number.test(value)) {
-            callback(new Error(t('sortTips')))
-          } else {
-            callback()
-          }
-        },
-      },
-    ],
-  }
+    return {
+        nav_title: [
+            { required: true, message: t('navTitlePlaceholder'), trigger: 'blur' }
+        ],
+        nav_url: [
+            {
+                required: true,
+                trigger: 'blur',
+                validator: (rule: any, value: any, callback: any) => {
+                    if (!value.url) {
+                        callback(new Error(t('navUrlPlaceholder')))
+                    } else {
+                        callback()
+                    }
+                }
+            }
+        ],
+        is_blank: [
+            { required: true, message: t('isBlankPlaceholder'), trigger: 'blur' }
+        ],
+        sort: [
+            {
+                trigger: 'blur',
+                validator: (rule: any, value: any, callback: any) => {
+                    if (isNaN(value) || !regExp.number.test(value)) {
+                        callback(new Error(t('sortTips')))
+                    } else {
+                        callback()
+                    }
+                }
+            }
+        ],
+    }
 })
 
 const emit = defineEmits(['complete'])
@@ -145,50 +104,48 @@ const emit = defineEmits(['complete'])
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  const save = formData.id ? editNav : addNav
+    if (loading.value || !formEl) return
+    const save = formData.id ? editNav : addNav
 
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      const data = formData
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+            const data = formData
 
-      save(data)
-        .then((res) => {
-          loading.value = false
-          showDialog.value = false
-          emit('complete')
-        })
-        .catch(() => {
-          loading.value = false
-        })
-    }
-  })
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
 }
 
 const setFormData = async (row: any = null) => {
-  Object.assign(formData, initialFormData)
-  loading.value = true
-  if (row) {
-    const data = await (await getNavInfo(row.id)).data
-    if (data) {
-      Object.keys(formData).forEach((key: string) => {
-        if (data[key] != undefined) formData[key] = data[key]
-      })
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if (row) {
+        const data = await (await getNavInfo(row.id)).data
+        if (data) {
+            Object.keys(formData).forEach((key: string) => {
+                if (data[key] != undefined) formData[key] = data[key]
+            })
+        }
     }
-  }
-  loading.value = false
+    loading.value = false
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
 <style lang="scss" scoped></style>
 <style lang="scss">
 .diy-dialog-wrap .el-form-item__label {
-  height: auto !important;
+    height: auto !important;
 }
 </style>
diff --git a/admin/src/app/views/web/friendly_link.vue b/admin/src/app/views/web/friendly_link.vue
index 61dcc1bb..b2329131 100644
--- a/admin/src/app/views/web/friendly_link.vue
+++ b/admin/src/app/views/web/friendly_link.vue
@@ -1,116 +1,67 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-lg">{{ pageName }}</span>
-        <el-button type="primary" @click="addEvent">{{
-          t('addFriendlyLink')
-        }}</el-button>
-      </div>
-
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="friendlyLinkTable.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('linkTitle')" prop="link_title">
-            <el-input
-              v-model="friendlyLinkTable.searchParam.link_title"
-              :placeholder="t('linkTitlePlaceholder')"
-            />
-          </el-form-item>
-
-          <el-form-item>
-            <el-button type="primary" @click="loadFriendlyLinkList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
-
-      <div class="mt-[10px]">
-        <el-table
-          :data="friendlyLinkTable.data"
-          size="large"
-          v-loading="friendlyLinkTable.loading"
-        >
-          <template #empty>
-            <span>{{ !friendlyLinkTable.loading ? t('emptyData') : '' }}</span>
-          </template>
-          <el-table-column
-            prop="link_title"
-            :label="t('linkTitle')"
-            min-width="120"
-          />
-          <el-table-column
-            prop="link_url"
-            :label="t('linkUrl')"
-            min-width="200"
-          />
-          <el-table-column prop="sort" :label="t('sort')" min-width="120">
-            <template #default="{ row }">
-              <el-input
-                v-model.trim="row.sort"
-                class="!w-[70px]"
-                maxlength="8"
-                @blur="sortInputListener(row.sort, row)"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('isShow')" min-width="180" align="center">
-            <template #default="{ row }">
-              {{ row.is_show == 1 ? t('show') : t('hidden') }}
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            :label="t('operation')"
-            fixed="right"
-            min-width="120"
-            align="right"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="editEvent(row)">{{
-                t('edit')
-              }}</el-button>
-              <el-button type="primary" link @click="deleteEvent(row.id)">{{
-                t('delete')
-              }}</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="friendlyLinkTable.page"
-            v-model:page-size="friendlyLinkTable.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="friendlyLinkTable.total"
-            @size-change="loadFriendlyLinkList()"
-            @current-change="loadFriendlyLinkList"
-          />
-        </div>
-      </div>
-
-      <edit ref="editFriendlyLinkDialog" @complete="loadFriendlyLinkList" />
-    </el-card>
-  </div>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+
+            <div class="flex justify-between items-center">
+                <span class="text-lg">{{ pageName }}</span>
+                <el-button type="primary" @click="addEvent">{{ t('addFriendlyLink') }}</el-button>
+            </div>
+
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="friendlyLinkTable.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('linkTitle')" prop="link_title">
+                        <el-input v-model="friendlyLinkTable.searchParam.link_title" :placeholder="t('linkTitlePlaceholder')" />
+                    </el-form-item>
+
+                    <el-form-item>
+                        <el-button type="primary" @click="loadFriendlyLinkList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+
+            <div class="mt-[10px]">
+                <el-table :data="friendlyLinkTable.data" size="large" v-loading="friendlyLinkTable.loading">
+                    <template #empty>
+                        <span>{{ !friendlyLinkTable.loading ? t('emptyData') : '' }}</span>
+                    </template>
+                    <el-table-column prop="link_title" :label="t('linkTitle')" min-width="120" />
+                    <el-table-column prop="link_url" :label="t('linkUrl')" min-width="200" />
+                    <el-table-column prop="sort" :label="t('sort')" min-width="120">
+                        <template #default="{ row }">
+                            <el-input v-model.trim="row.sort" class="!w-[70px]" maxlength="8" @blur="sortInputListener(row.sort, row)" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('isShow')" min-width="180" align="center">
+                        <template #default="{ row }">
+                            {{ row.is_show == 1 ? t('show') : t('hidden') }}
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column :label="t('operation')" fixed="right" min-width="120" align="right">
+                        <template #default="{ row }">
+                            <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+                            <el-button type="primary" link @click="deleteEvent(row.id)">{{ t('delete') }}</el-button>
+                        </template>
+                    </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="friendlyLinkTable.page" v-model:page-size="friendlyLinkTable.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="friendlyLinkTable.total"
+                        @size-change="loadFriendlyLinkList()" @current-change="loadFriendlyLinkList" />
+                </div>
+            </div>
+
+            <edit ref="editFriendlyLinkDialog" @complete="loadFriendlyLinkList" />
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
 import { t } from '@/lang'
-import {
-  getFriendlyLinkList,
-  deleteFriendlyLink,
-  editFriendlyLinkSort,
-} from '@/app/api/web'
+import { getFriendlyLinkList, deleteFriendlyLink, editFriendlyLinkSort } from '@/app/api/web'
 import { debounce } from '@/utils/common'
 import { ElMessageBox, ElMessage, FormInstance } from 'element-plus'
 import Edit from '@/app/views/web/components/friendly-link-edit.vue'
@@ -120,14 +71,14 @@ const route = useRoute()
 const pageName = route.meta.title
 
 const friendlyLinkTable = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    link_title: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        link_title: ''
+    }
 })
 
 const searchFormRef = ref<FormInstance>()
@@ -136,21 +87,19 @@ const searchFormRef = ref<FormInstance>()
  * 获取友情链接列表
  */
 const loadFriendlyLinkList = (page: number = 1) => {
-  friendlyLinkTable.loading = true
-  friendlyLinkTable.page = page
-
-  getFriendlyLinkList({
-    page: friendlyLinkTable.page,
-    limit: friendlyLinkTable.limit,
-    ...friendlyLinkTable.searchParam,
-  })
-    .then((res) => {
-      friendlyLinkTable.loading = false
-      friendlyLinkTable.data = res.data.data
-      friendlyLinkTable.total = res.data.total
-    })
-    .catch(() => {
-      friendlyLinkTable.loading = false
+    friendlyLinkTable.loading = true
+    friendlyLinkTable.page = page
+
+    getFriendlyLinkList({
+        page: friendlyLinkTable.page,
+        limit: friendlyLinkTable.limit,
+        ...friendlyLinkTable.searchParam
+    }).then(res => {
+        friendlyLinkTable.loading = false
+        friendlyLinkTable.data = res.data.data
+        friendlyLinkTable.total = res.data.total
+    }).catch(() => {
+        friendlyLinkTable.loading = false
     })
 }
 loadFriendlyLinkList()
@@ -161,8 +110,8 @@ const editFriendlyLinkDialog: Record<string, any> | null = ref(null)
  * 添加友情链接
  */
 const addEvent = () => {
-  editFriendlyLinkDialog.value.setFormData()
-  editFriendlyLinkDialog.value.showDialog = true
+    editFriendlyLinkDialog.value.setFormData()
+    editFriendlyLinkDialog.value.showDialog = true
 }
 
 /**
@@ -170,57 +119,59 @@ const addEvent = () => {
  * @param data
  */
 const editEvent = (data: any) => {
-  editFriendlyLinkDialog.value.setFormData(data)
-  editFriendlyLinkDialog.value.showDialog = true
+    editFriendlyLinkDialog.value.setFormData(data)
+    editFriendlyLinkDialog.value.showDialog = true
 }
 
 /**
  * 删除友情链接
  */
 const deleteEvent = (id: number) => {
-  ElMessageBox.confirm(t('friendlyLinkDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    deleteFriendlyLink(id)
-      .then(() => {
-        loadFriendlyLinkList()
-      })
-      .catch(() => {})
-  })
+    ElMessageBox.confirm(t('friendlyLinkDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        deleteFriendlyLink(id).then(() => {
+            loadFriendlyLinkList()
+        }).catch(() => {
+        })
+    })
 }
 
 // 正则表达式
 const regExp = {
-  number: /^\d{0,10}$/,
-  digit: /^\d{0,10}(.?\d{0,2})$/,
+    number: /^\d{0,10}$/,
+    digit: /^\d{0,10}(.?\d{0,2})$/
 }
 
 // 修改排序号
 const sortInputListener = debounce((sort, row) => {
-  if (isNaN(sort) || !regExp.number.test(sort)) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('sortTips')}`,
+    if (isNaN(sort) || !regExp.number.test(sort)) {
+        ElMessage({
+            type: 'warning',
+            message: `${t('sortTips')}`
+        })
+        return
+    }
+    if (sort > 99999999) {
+        row.sort = 99999999
+    }
+    editFriendlyLinkSort({
+        id: row.id,
+        sort
+    }).then((res: any) => {
+        loadFriendlyLinkList()
     })
-    return
-  }
-  if (sort > 99999999) {
-    row.sort = 99999999
-  }
-  editFriendlyLinkSort({
-    id: row.id,
-    sort,
-  }).then((res: any) => {
-    loadFriendlyLinkList()
-  })
 })
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadFriendlyLinkList()
+    if (!formEl) return
+    formEl.resetFields()
+    loadFriendlyLinkList()
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
diff --git a/admin/src/app/views/web/nav.vue b/admin/src/app/views/web/nav.vue
index 52442d58..d24bad25 100644
--- a/admin/src/app/views/web/nav.vue
+++ b/admin/src/app/views/web/nav.vue
@@ -1,120 +1,74 @@
 <template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-lg">{{ pageName }}</span>
-        <el-button type="primary" @click="addEvent">{{
-          t('addNav')
-        }}</el-button>
-      </div>
-
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="navTable.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('navTitle')" prop="nav_title">
-            <el-input
-              v-model="navTable.searchParam.nav_title"
-              :placeholder="t('navTitlePlaceholder')"
-              maxlength="20"
-            />
-          </el-form-item>
-
-          <el-form-item>
-            <el-button type="primary" @click="loadNavList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
-
-      <div class="mt-[10px]">
-        <el-table
-          :data="navTable.data"
-          size="large"
-          v-loading="navTable.loading"
-        >
-          <template #empty>
-            <span>{{ !navTable.loading ? t('emptyData') : '' }}</span>
-          </template>
-          <el-table-column
-            prop="nav_title"
-            :label="t('navTitle')"
-            min-width="120"
-          />
-          <el-table-column prop="nav_url" :label="t('navUrl')" min-width="120">
-            <template #default="{ row }">
-              <div>{{ row.nav_url ? row.nav_url.url : '' }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="sort" :label="t('sort')" min-width="120">
-            <template #default="{ row }">
-              <el-input
-                v-model.trim="row.sort"
-                class="!w-[70px]"
-                maxlength="8"
-                @blur="sortInputListener(row.sort, row)"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('isBlank')" min-width="180" align="center">
-            <template #default="{ row }">
-              {{ row.is_blank == 1 ? t('yes') : t('no') }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            :label="t('createTime')"
-            min-width="180"
-            align="center"
-          >
-            <template #default="{ row }">
-              {{ row.create_time || '' }}
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('isShow')" min-width="180" align="center">
-            <template #default="{ row }">
-              {{ row.is_show == 1 ? t('show') : t('hidden') }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            :label="t('operation')"
-            fixed="right"
-            min-width="120"
-            align="right"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="editEvent(row)">{{
-                t('edit')
-              }}</el-button>
-              <el-button type="primary" link @click="deleteEvent(row.id)">{{
-                t('delete')
-              }}</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="navTable.page"
-            v-model:page-size="navTable.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="navTable.total"
-            @size-change="loadNavList()"
-            @current-change="loadNavList"
-          />
-        </div>
-      </div>
-
-      <edit ref="editNavDialog" @complete="loadNavList" />
-    </el-card>
-  </div>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+
+            <div class="flex justify-between items-center">
+                <span class="text-lg">{{ pageName }}</span>
+                <el-button type="primary" @click="addEvent">{{ t('addNav') }}</el-button>
+            </div>
+
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="navTable.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('navTitle')" prop="nav_title">
+                        <el-input v-model="navTable.searchParam.nav_title" :placeholder="t('navTitlePlaceholder')" maxlength="20" />
+                    </el-form-item>
+
+                    <el-form-item>
+                        <el-button type="primary" @click="loadNavList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+
+            <div class="mt-[10px]">
+                <el-table :data="navTable.data" size="large" v-loading="navTable.loading">
+                    <template #empty>
+                        <span>{{ !navTable.loading ? t('emptyData') : '' }}</span>
+                    </template>
+                    <el-table-column prop="nav_title" :label="t('navTitle')" min-width="120" />
+                    <el-table-column prop="nav_url" :label="t('navUrl')" min-width="120" >
+                        <template #default="{ row }">
+                            <div>{{ row.nav_url ? row.nav_url.url : '' }}</div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="sort" :label="t('sort')" min-width="120">
+                        <template #default="{ row }">
+                            <el-input v-model.trim="row.sort" class="!w-[70px]" maxlength="8" @blur="sortInputListener(row.sort, row)" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('isBlank')" min-width="180" align="center" >
+                        <template #default="{ row }">
+                            {{ row.is_blank == 1 ? t('yes') : t('no') }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('createTime')" min-width="180" align="center">
+                        <template #default="{ row }">
+                            {{ row.create_time || '' }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('isShow')" min-width="180" align="center">
+                        <template #default="{ row }">
+                            {{ row.is_show == 1 ? t('show') : t('hidden') }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('operation')" fixed="right" min-width="120" align="right">
+                        <template #default="{ row }">
+                            <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+                            <el-button type="primary" link @click="deleteEvent(row.id)">{{ t('delete') }}</el-button>
+                        </template>
+                    </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="navTable.page" v-model:page-size="navTable.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="navTable.total"
+                        @size-change="loadNavList()" @current-change="loadNavList" />
+                </div>
+            </div>
+
+            <edit ref="editNavDialog" @complete="loadNavList" />
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -130,14 +84,14 @@ const route = useRoute()
 const pageName = route.meta.title
 
 const navTable = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    nav_title: '',
-  },
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        nav_title: ''
+    }
 })
 
 const searchFormRef = ref<FormInstance>(null)
@@ -146,21 +100,19 @@ const searchFormRef = ref<FormInstance>(null)
  * 获取PC导航管理列表
  */
 const loadNavList = (page: number = 1) => {
-  navTable.loading = true
-  navTable.page = page
-
-  getNavList({
-    page: navTable.page,
-    limit: navTable.limit,
-    ...navTable.searchParam,
-  })
-    .then((res) => {
-      navTable.loading = false
-      navTable.data = res.data.data
-      navTable.total = res.data.total
-    })
-    .catch(() => {
-      navTable.loading = false
+    navTable.loading = true
+    navTable.page = page
+
+    getNavList({
+        page: navTable.page,
+        limit: navTable.limit,
+        ...navTable.searchParam
+    }).then(res => {
+        navTable.loading = false
+        navTable.data = res.data.data
+        navTable.total = res.data.total
+    }).catch(() => {
+        navTable.loading = false
     })
 }
 loadNavList()
@@ -171,8 +123,8 @@ const editNavDialog: Record<string, any> | null = ref(null)
  * 添加PC导航管理
  */
 const addEvent = () => {
-  editNavDialog.value.setFormData()
-  editNavDialog.value.showDialog = true
+    editNavDialog.value.setFormData()
+    editNavDialog.value.showDialog = true
 }
 
 /**
@@ -180,57 +132,59 @@ const addEvent = () => {
  * @param data
  */
 const editEvent = (data: any) => {
-  editNavDialog.value.setFormData(data)
-  editNavDialog.value.showDialog = true
+    editNavDialog.value.setFormData(data)
+    editNavDialog.value.showDialog = true
 }
 
 /**
  * 删除PC导航管理
  */
 const deleteEvent = (id: number) => {
-  ElMessageBox.confirm(t('navDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    deleteNav(id)
-      .then(() => {
-        loadNavList()
-      })
-      .catch(() => {})
-  })
+    ElMessageBox.confirm(t('navDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        deleteNav(id).then(() => {
+            loadNavList()
+        }).catch(() => {
+        })
+    })
 }
 
 // 正则表达式
 const regExp = {
-  number: /^\d{0,10}$/,
-  digit: /^\d{0,10}(.?\d{0,2})$/,
+    number: /^\d{0,10}$/,
+    digit: /^\d{0,10}(.?\d{0,2})$/
 }
 
 // 修改排序号
 const sortInputListener = debounce((sort, row) => {
-  if (isNaN(sort) || !regExp.number.test(sort)) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('sortTips')}`,
+    if (isNaN(sort) || !regExp.number.test(sort)) {
+        ElMessage({
+            type: 'warning',
+            message: `${t('sortTips')}`
+        })
+        return
+    }
+    if (sort > 99999999) {
+        row.sort = 99999999
+    }
+    editNavSort({
+        id: row.id,
+        sort
+    }).then((res: any) => {
+        loadNavList()
     })
-    return
-  }
-  if (sort > 99999999) {
-    row.sort = 99999999
-  }
-  editNavSort({
-    id: row.id,
-    sort,
-  }).then((res: any) => {
-    loadNavList()
-  })
 })
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadNavList()
+    if (!formEl) return
+    formEl.resetFields()
+    loadNavList()
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
diff --git a/admin/src/components/diy-link/index.vue b/admin/src/components/diy-link/index.vue
index dbff01fd..3d11f5a9 100644
--- a/admin/src/components/diy-link/index.vue
+++ b/admin/src/components/diy-link/index.vue
@@ -1,159 +1,99 @@
 <template>
-  <div>
-    <div @click="show">
-      <slot>
-        <el-input
-          v-model="value.title"
-          :placeholder="t('linkPlaceholder')"
-          readonly
-          class="link-input"
-        >
-          <template #suffix>
-            <div @click.stop="clear">
-              <el-icon v-if="value.name">
-                <Close />
-              </el-icon>
-              <el-icon v-else>
-                <ArrowRight />
-              </el-icon>
+    <div>
+        <div @click="show">
+            <slot>
+                <el-input v-model="value.title" :placeholder="t('linkPlaceholder')" readonly class="link-input">
+                    <template #suffix>
+                        <div @click.stop="clear">
+                            <el-icon v-if="value.name">
+                                <Close />
+                            </el-icon>
+                            <el-icon v-else>
+                                <ArrowRight />
+                            </el-icon>
+                        </div>
+                    </template>
+                </el-input>
+            </slot>
+        </div>
+        <el-dialog v-model="showDialog" :title="t('selectLinkTips')" width="40%" :close-on-press-escape="false" :destroy-on-close="true" :close-on-click-modal="false" @close="cancel">
+
+            <div class="flex items-start">
+                <el-scrollbar class="w-[140px] border-r h-[350px]">
+                    <div v-for="(item, index) in link" :key="index"
+                        class="h-[40px] leading-[40px] cursor-pointer hover:bg-primary-light-9 px-[10px] hover:text-primary"
+                        :class="[item.name == parentLinkName ? 'bg-primary-light-9 text-primary' : '']"
+                        @click="changeParentLink(item)">
+                        {{ item.title }}
+                    </div>
+                </el-scrollbar>
+                <el-scrollbar class="pl-4 h-[350px] flex-1">
+                    <el-form label-width="100px" class="px-[10px]">
+                        <template v-if="parentLinkName == 'DIY_LINK'">
+                            <div class="mb-[16px]">
+                                <el-form-item :label="t('diyLinkName')">
+                                    <el-input v-model="selectLink.title" :placeholder="t('diyLinkNamePlaceholder')" />
+                                </el-form-item>
+                            </div>
+                            <div class="mb-[16px]">
+                                <el-form-item :label="t('diyLinkUrl')">
+                                    <el-input v-model="selectLink.url" :placeholder="t('diyLinkUrlPlaceholder')" />
+                                </el-form-item>
+                            </div>
+                            <el-form-item label=" ">
+                                <div class="text-sm text-gray-400 select-text">路径必须以“/”开头，例：/app/pages/index/index</div>
+                            </el-form-item>
+                            <el-form-item label=" ">
+                                <div class="text-sm text-gray-400 select-text">跳转外部链接“http”或“https”开头，例：https://baidu.com</div>
+                            </el-form-item>
+                        </template>
+                        <template v-if="parentLinkName == 'DIY_JUMP_OTHER_APPLET'">
+                            <div class="mb-[16px]">
+                                <el-form-item :label="t('diyAppletId')">
+                                    <el-input v-model="selectLink.appid" :placeholder="t('diyAppletIdPlaceholder')" clearable maxlength="50"  />
+                                </el-form-item>
+                            </div>
+                            <div class="mb-[16px]">
+                                <el-form-item :label="t('diyAppletPage')">
+                                    <el-input v-model="selectLink.page" :placeholder="t('diyAppletPagePlaceholder')" clearable maxlength="100" />
+                                </el-form-item>
+                            </div>
+                            <el-form-item label=" ">
+                                <div class="text-sm text-gray-400 select-text">仅支持小程序之间的跳转，不支持从其他渠道跳转小程序</div>
+                            </el-form-item>
+                            <el-form-item label=" ">
+                                <div class="text-sm text-gray-400 select-text">小程序路径格式如：app/pages/index/index</div>
+                            </el-form-item>
+                        </template>
+                        <template v-if="parentLinkName == 'DIY_MAKE_PHONE_CALL'">
+                            <div class="mb-[16px]">
+                                <el-form-item :label="t('diyMakePhone')">
+                                    <el-input v-model="selectLink.mobile" :placeholder="t('diyMakePhonePlaceholder')" clearable maxlength="50" />
+                                </el-form-item>
+                            </div>
+                            <el-form-item label=" ">
+                                <div class="text-sm text-gray-400 select-text">电话号码支持手机号码和固定电话</div>
+                            </el-form-item>
+                        </template>
+                        <div v-else class="flex flex-wrap">
+                            <div v-for="(item, index) in childList" :key="index"
+                                class="border border-br rounded-[3px] mr-[10px] mb-[10px] px-4 h-[32px] leading-[32px] cursor-pointer hover:bg-primary-light-9 px-[10px] hover:text-primary"
+                                 :class="{ 'border-primary text-primary': (parentLinkName != 'DIY_PAGE' && item.name == selectLink.name) || (parentLinkName == 'DIY_PAGE' && item.url == selectLink.url) }"
+                                @click="changeChildLink(item)">{{ item.title }}
+                            </div>
+                        </div>
+                    </el-form>
+                </el-scrollbar>
             </div>
-          </template>
-        </el-input>
-      </slot>
-    </div>
-    <el-dialog
-      v-model="showDialog"
-      :title="t('selectLinkTips')"
-      width="40%"
-      :close-on-press-escape="false"
-      :destroy-on-close="true"
-      :close-on-click-modal="false"
-      @close="cancel"
-    >
-      <div class="flex items-start">
-        <el-scrollbar class="w-[140px] border-r h-[350px]">
-          <div
-            v-for="(item, index) in link"
-            :key="index"
-            class="h-[40px] leading-[40px] cursor-pointer hover:bg-primary-light-9 px-[10px] hover:text-primary"
-            :class="[
-              item.name == parentLinkName
-                ? 'bg-primary-light-9 text-primary'
-                : '',
-            ]"
-            @click="changeParentLink(item)"
-          >
-            {{ item.title }}
-          </div>
-        </el-scrollbar>
-        <el-scrollbar class="pl-4 h-[350px] flex-1">
-          <el-form label-width="100px" class="px-[10px]">
-            <template v-if="parentLinkName == 'DIY_LINK'">
-              <div class="mb-[16px]">
-                <el-form-item :label="t('diyLinkName')">
-                  <el-input
-                    v-model="selectLink.title"
-                    :placeholder="t('diyLinkNamePlaceholder')"
-                  />
-                </el-form-item>
-              </div>
-              <div class="mb-[16px]">
-                <el-form-item :label="t('diyLinkUrl')">
-                  <el-input
-                    v-model="selectLink.url"
-                    :placeholder="t('diyLinkUrlPlaceholder')"
-                  />
-                </el-form-item>
-              </div>
-              <el-form-item label=" ">
-                <div class="text-sm text-gray-400 select-text">
-                  路径必须以“/”开头，例：/app/pages/index/index
-                </div>
-              </el-form-item>
-              <el-form-item label=" ">
-                <div class="text-sm text-gray-400 select-text">
-                  跳转外部链接“http”或“https”开头，例：https://baidu.com
-                </div>
-              </el-form-item>
-            </template>
-            <template v-if="parentLinkName == 'DIY_JUMP_OTHER_APPLET'">
-              <div class="mb-[16px]">
-                <el-form-item :label="t('diyAppletId')">
-                  <el-input
-                    v-model="selectLink.appid"
-                    :placeholder="t('diyAppletIdPlaceholder')"
-                    clearable
-                    maxlength="50"
-                  />
-                </el-form-item>
-              </div>
-              <div class="mb-[16px]">
-                <el-form-item :label="t('diyAppletPage')">
-                  <el-input
-                    v-model="selectLink.page"
-                    :placeholder="t('diyAppletPagePlaceholder')"
-                    clearable
-                    maxlength="100"
-                  />
-                </el-form-item>
-              </div>
-              <el-form-item label=" ">
-                <div class="text-sm text-gray-400 select-text">
-                  仅支持小程序之间的跳转，不支持从其他渠道跳转小程序
-                </div>
-              </el-form-item>
-              <el-form-item label=" ">
-                <div class="text-sm text-gray-400 select-text">
-                  小程序路径格式如：app/pages/index/index
-                </div>
-              </el-form-item>
-            </template>
-            <template v-if="parentLinkName == 'DIY_MAKE_PHONE_CALL'">
-              <div class="mb-[16px]">
-                <el-form-item :label="t('diyMakePhone')">
-                  <el-input
-                    v-model="selectLink.mobile"
-                    :placeholder="t('diyMakePhonePlaceholder')"
-                    clearable
-                    maxlength="50"
-                  />
-                </el-form-item>
-              </div>
-              <el-form-item label=" ">
-                <div class="text-sm text-gray-400 select-text">
-                  电话号码支持手机号码和固定电话
-                </div>
-              </el-form-item>
+
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="cancel">{{ t('cancel') }}</el-button>
+                    <el-button type="primary" @click="save">{{ t('confirm') }}</el-button>
+                </span>
             </template>
-            <div v-else class="flex flex-wrap">
-              <div
-                v-for="(item, index) in childList"
-                :key="index"
-                class="border border-br rounded-[3px] mr-[10px] mb-[10px] px-4 h-[32px] leading-[32px] cursor-pointer hover:bg-primary-light-9 px-[10px] hover:text-primary"
-                :class="{
-                  'border-primary text-primary':
-                    (parentLinkName != 'DIY_PAGE' &&
-                      item.name == selectLink.name) ||
-                    (parentLinkName == 'DIY_PAGE' &&
-                      item.url == selectLink.url),
-                }"
-                @click="changeChildLink(item)"
-              >
-                {{ item.title }}
-              </div>
-            </div>
-          </el-form>
-        </el-scrollbar>
-      </div>
-
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="cancel">{{ t('cancel') }}</el-button>
-          <el-button type="primary" @click="save">{{ t('confirm') }}</el-button>
-        </span>
-      </template>
-    </el-dialog>
-  </div>
+        </el-dialog>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -164,25 +104,25 @@ import { getLink } from '@/app/api/diy'
 import { ElMessage } from 'element-plus'
 
 const prop = defineProps({
-  modelValue: {
-    type: Object,
-    default: () => {},
-  },
-  ignore: {
-    type: Array,
-    default: [],
-  },
+    modelValue: {
+        type: Object,
+        default: () => { }
+    },
+    ignore:{
+        type:Array,
+        default:[]
+    }
 })
 
-const emit = defineEmits(['update:modelValue', 'confirm', 'success'])
+const emit = defineEmits(['update:modelValue', 'confirm','success'])
 
 const value: any = computed({
-  get() {
-    return prop.modelValue
-  },
-  set(value) {
-    emit('update:modelValue', value)
-  },
+    get () {
+        return prop.modelValue
+    },
+    set (value) {
+        emit('update:modelValue', value)
+    }
 })
 
 const showDialog = ref(false)
@@ -198,172 +138,175 @@ const childList: any = ref([])
 const selectLink: any = ref([])
 
 const show = () => {
-  getLinkFn(() => {
-    // 每次打开时赋值
-    if (value.value.name != '') {
-      selectLink.value = cloneDeep(value.value)
-      parentLinkName.value = selectLink.value.parent
-      for (let key in link.value) {
-        if (link.value[key].name == parentLinkName.value) {
-          changeParentLink(link.value[key])
+    getLinkFn(() => {
+        // 每次打开时赋值
+        if (value.value.name != '') {
+            selectLink.value = cloneDeep(value.value)
+            parentLinkName.value = selectLink.value.parent
+            for (let key in link.value) {
+                if (link.value[key].name == parentLinkName.value) {
+                    changeParentLink(link.value[key])
+                }
+            }
         }
-      }
-    }
-    showDialog.value = true
-    isDrag.value = true
-    emit('confirm', isDrag.value)
-  })
+        showDialog.value = true
+        isDrag.value = true
+        emit('confirm', isDrag.value)
+    })
 }
 
-const getLinkFn = (callback: any = null) => {
-  getLink({}).then((res: any) => {
-    link.value = res.data
-    if (prop.ignore && prop.ignore.length) {
-      for (let key in link.value) {
-        for (let i = 0; i < prop.ignore.length; i++) {
-          if (key == prop.ignore[i]) {
-            delete link.value[key]
-            break
-          }
+const getLinkFn = (callback:any=null)=> {
+    getLink({}).then((res: any) => {
+        link.value = res.data
+        if (prop.ignore && prop.ignore.length) {
+            for (let key in link.value) {
+                for (let i = 0; i < prop.ignore.length; i++) {
+                    if (key == prop.ignore[i]) {
+                        delete link.value[key];
+                        break;
+                    }
+                }
+            }
         }
-      }
-    }
 
-    childList.value = Object.values(link.value)[0].child_list
-    if (value.value.name != '') {
-      selectLink.value = cloneDeep(value.value)
-    } else {
-      selectLink.value = {
-        parent: Object.values(link.value)[0].name,
-      }
-    }
-    parentLinkName.value = selectLink.value.parent
+        childList.value = Object.values(link.value)[0].child_list
+        if (value.value.name != '') {
+            selectLink.value = cloneDeep(value.value)
+        } else {
+            selectLink.value = {
+                parent: Object.values(link.value)[0].name
+            }
+        }
+        parentLinkName.value = selectLink.value.parent
 
-    if (callback) callback()
-  })
+        if (callback) callback()
+    })
 }
 
 // 选择父级链接
 const changeParentLink = (item: any) => {
-  childList.value = item.child_list
-  parentLinkName.value = item.name
+    childList.value = item.child_list
+    parentLinkName.value = item.name
 }
 
 // 选择子链接
 const changeChildLink = (item: any) => {
-  delete item.is_share
-  Object.assign(selectLink.value, item)
+    delete item.is_share
+    Object.assign(selectLink.value, item)
 }
 
 const clear = () => {
-  value.value = {
-    name: '',
-    parent: '',
-    title: '',
-    url: '',
-  }
+    value.value = {
+        name: '',
+        parent: '',
+        title: '',
+        url: ''
+    }
 }
 
 const save = () => {
-  if (parentLinkName.value === 'DIY_LINK') {
-    // 自定义链接
-
-    if (!selectLink.value.title) {
-      ElMessage({
-        message: t('diyLinkNameNotEmpty'),
-        type: 'warning',
-      })
-      return
-    }
+    if (parentLinkName.value === 'DIY_LINK') {
+        // 自定义链接
+
+        if (!selectLink.value.title) {
+            ElMessage({
+                message: t('diyLinkNameNotEmpty'),
+                type: 'warning'
+            });
+            return
+        }
 
-    if (!selectLink.value.url) {
-      ElMessage({
-        message: t('diyLinkUrlNotEmpty'),
-        type: 'warning',
-      })
-      return
-    }
+        if (!selectLink.value.url) {
+            ElMessage({
+                message: t('diyLinkUrlNotEmpty'),
+                type: 'warning'
+            });
+            return
+        }
 
-    selectLink.value.parent = parentLinkName.value
-    selectLink.value.name = parentLinkName.value
-    selectLink.value.action = ''
-
-    delete selectLink.value.appid
-    delete selectLink.value.mobile
-  } else if (parentLinkName.value == 'DIY_PAGE') {
-    // 自定义页面
-
-    selectLink.value.name = parentLinkName.value
-    selectLink.value.parent = parentLinkName.value
-    selectLink.value.action = 'decorate'
-
-    delete selectLink.value.appid
-    delete selectLink.value.mobile
-  } else if (parentLinkName.value == 'DIY_JUMP_OTHER_APPLET') {
-    // 小程序跳转
-
-    if (!selectLink.value.appid) {
-      ElMessage({
-        message: t('diyAppletIdNotEmpty'),
-        type: 'warning',
-      })
-      return
-    }
+        selectLink.value.parent = parentLinkName.value
+        selectLink.value.name = parentLinkName.value
+        selectLink.value.action = '';
 
-    if (!selectLink.value.page) {
-      ElMessage({
-        message: t('diyAppletPageNotEmpty'),
-        type: 'warning',
-      })
-      return
-    }
+        delete selectLink.value.appid;
+        delete selectLink.value.mobile;
 
-    selectLink.value.name = parentLinkName.value
-    selectLink.value.parent = parentLinkName.value
-    selectLink.value.title = '微信小程序-' + selectLink.value.appid
-    selectLink.value.action = ''
-
-    delete selectLink.value.url
-    delete selectLink.value.mobile
-  } else if (parentLinkName.value == 'DIY_MAKE_PHONE_CALL') {
-    // 拨打电话
-
-    if (!selectLink.value.mobile) {
-      ElMessage({
-        message: t('diyMakePhoneNotEmpty'),
-        type: 'warning',
-      })
-      return
-    }
+    } else if (parentLinkName.value == 'DIY_PAGE') {
+        // 自定义页面
+
+        selectLink.value.name = parentLinkName.value
+        selectLink.value.parent = parentLinkName.value
+        selectLink.value.action = 'decorate';
+
+        delete selectLink.value.appid;
+        delete selectLink.value.mobile;
+
+    } else if (parentLinkName.value == 'DIY_JUMP_OTHER_APPLET') {
+        // 小程序跳转
+
+        if (!selectLink.value.appid) {
+            ElMessage({
+                message: t('diyAppletIdNotEmpty'),
+                type: 'warning'
+            });
+            return
+        }
+
+        if (!selectLink.value.page) {
+            ElMessage({
+                message: t('diyAppletPageNotEmpty'),
+                type: 'warning'
+            });
+            return
+        }
+
+        selectLink.value.name = parentLinkName.value
+        selectLink.value.parent = parentLinkName.value
+        selectLink.value.title = '微信小程序-' + selectLink.value.appid
+        selectLink.value.action = '';
 
-    selectLink.value.name = parentLinkName.value
-    selectLink.value.parent = parentLinkName.value
-    selectLink.value.title = '拨打电话：' + selectLink.value.mobile
-    selectLink.value.action = ''
+        delete selectLink.value.url;
+        delete selectLink.value.mobile;
 
-    delete selectLink.value.url
-    delete selectLink.value.appid
-  }
+    } else if (parentLinkName.value == 'DIY_MAKE_PHONE_CALL') {
+        // 拨打电话
 
-  value.value = cloneDeep(selectLink.value)
-  showDialog.value = false
-  isDrag.value = false
-  emit('confirm', isDrag.value)
-  emit('success')
+        if (!selectLink.value.mobile) {
+            ElMessage({
+                message: t('diyMakePhoneNotEmpty'),
+                type: 'warning'
+            });
+            return
+        }
+
+        selectLink.value.name = parentLinkName.value
+        selectLink.value.parent = parentLinkName.value
+        selectLink.value.title = '拨打电话：' + selectLink.value.mobile
+        selectLink.value.action = '';
+
+        delete selectLink.value.url;
+        delete selectLink.value.appid;
+    }
+
+    value.value = cloneDeep(selectLink.value)
+    showDialog.value = false
+    isDrag.value = false
+    emit('confirm', isDrag.value)
+    emit('success')
 }
 
 const cancel = () => {
-  showDialog.value = false
-  isDrag.value = false
-  emit('confirm', isDrag.value)
+    showDialog.value = false
+    isDrag.value = false
+    emit('confirm', isDrag.value)
 }
 defineExpose({
-  showDialog,
+    showDialog
 })
 </script>
 
 <style lang="scss">
-.link-input .el-input__inner {
-  cursor: pointer;
-}
+    .link-input .el-input__inner{
+        cursor: pointer;
+    }
 </style>
diff --git a/admin/src/components/editor/index.vue b/admin/src/components/editor/index.vue
index 9c6301d0..331aa3e7 100644
--- a/admin/src/components/editor/index.vue
+++ b/admin/src/components/editor/index.vue
@@ -1,17 +1,7 @@
 <template>
-  <upload-attachment
-    type="image"
-    ref="imageRef"
-    limit=""
-    @confirm="imageSelect"
-  />
-  <upload-attachment type="video" ref="videoRef" @confirm="videoSelect" />
-  <vue-ueditor-wrap
-    v-model="content"
-    :config="editorConfig"
-    :editorDependencies="['ueditor.config.js', 'ueditor.all.js']"
-    ref="editorRef"
-  ></vue-ueditor-wrap>
+    <upload-attachment type="image" ref="imageRef" limit="" @confirm="imageSelect" />
+    <upload-attachment type="video" ref="videoRef" @confirm="videoSelect" />
+    <vue-ueditor-wrap v-model="content" :config="editorConfig"  :editorDependencies="['ueditor.config.js','ueditor.all.js']" ref="editorRef"></vue-ueditor-wrap>
 </template>
 
 <script lang="ts" setup>
@@ -23,18 +13,18 @@ import storage from '@/utils/storage'
 const editorRef = ref()
 
 const prop = defineProps({
-  modelValue: {
-    type: String,
-    default: '',
-  },
-  mode: {
-    type: String,
-    default: 'simple',
-  },
-  height: {
-    type: Number,
-    default: 600,
-  },
+    modelValue: {
+        type: String,
+        default: ''
+    },
+    mode: {
+        type: String,
+        default: 'simple'
+    },
+    height: {
+        type: Number,
+        default: 600
+    }
 })
 
 const emit = defineEmits(['update:modelValue', 'handleBlur'])
@@ -43,58 +33,52 @@ const imageRef: Record<string, any> | null = ref(null)
 const videoRef: Record<string, any> | null = ref(null)
 
 const content = computed({
-  get() {
-    return prop.modelValue
-  },
-  set(value) {
-    emit('update:modelValue', value)
-  },
+    get () {
+        return prop.modelValue
+    },
+    set (value) {
+        emit('update:modelValue', value)
+    }
 })
 
 let editorEl = null
 
 const serverHeaders = {}
 serverHeaders[import.meta.env.VITE_REQUEST_HEADER_TOKEN_KEY] = getToken()
-const baseUrl =
-  import.meta.env.VITE_APP_BASE_URL.substr(-1) == '/'
-    ? import.meta.env.VITE_APP_BASE_URL
-    : `${import.meta.env.VITE_APP_BASE_URL}/`
+const baseUrl = import.meta.env.VITE_APP_BASE_URL.substr(-1) == '/' ? import.meta.env.VITE_APP_BASE_URL : `${import.meta.env.VITE_APP_BASE_URL}/`
 
 const editorConfig = ref({
-  debug: false,
-  UEDITOR_HOME_URL:
-    import.meta.env.MODE == 'development'
-      ? '/public/ueditor/'
-      : '/admin/ueditor/',
-  serverUrl: `${baseUrl}sys/ueditor`,
-  serverHeaders,
-  // 编辑器不自动被内容撑高
-  autoHeightEnabled: false,
-  // 初始容器高度
-  initialFrameHeight: prop.height,
-  // 初始容器宽度
-  initialFrameWidth: '100%',
-  toolbarCallback: function (cmd, editor) {
-    editorEl = editor
-    switch (cmd) {
-      case 'insertimage':
-        imageRef.value.showDialog = true
-        return true
-      case 'insertvideo':
-        videoRef.value.showDialog = true
-        return true
+    debug: false,
+    UEDITOR_HOME_URL: import.meta.env.MODE == 'development' ? '/public/ueditor/' : '/admin/ueditor/',
+    serverUrl: `${baseUrl}sys/ueditor`,
+    serverHeaders,
+    // 编辑器不自动被内容撑高
+    autoHeightEnabled: false,
+    // 初始容器高度
+    initialFrameHeight: prop.height,
+    // 初始容器宽度
+    initialFrameWidth: '100%',
+    toolbarCallback: function(cmd, editor) {
+        editorEl = editor
+        switch (cmd) {
+            case 'insertimage':
+                imageRef.value.showDialog = true
+                return true
+            case 'insertvideo':
+                videoRef.value.showDialog = true
+                return true
+        }
     }
-  },
 })
 
 const imageSelect = (data: Record<string, any>) => {
-  data.forEach((item: any) => {
-    editorEl?.execCommand('insertHtml', `<img src="${img(item.url)}">`)
-  })
+    data.forEach((item: any) => {
+        editorEl?.execCommand('insertHtml', `<img src="${img(item.url)}">`)
+    })
 }
 
 const videoSelect = (data: Record<string, any>) => {
-  editorEl?.execCommand('insertHtml', `<video src="${img(data.url)}">`)
+    editorEl?.execCommand('insertHtml', `<video src="${img(data.url)}">`)
 }
 </script>
 
diff --git a/admin/src/components/export-sure/index.vue b/admin/src/components/export-sure/index.vue
index 4988c5b9..1d5e2f47 100644
--- a/admin/src/components/export-sure/index.vue
+++ b/admin/src/components/export-sure/index.vue
@@ -1,25 +1,13 @@
 <template>
-  <el-dialog
-    v-model="status"
-    :title="t('exportTip')"
-    width="300px"
-    :close-on-click-modal="true"
-    :close-on-press-escape="false"
-    :show-close="false"
-  >
-    <span>{{ t('exportPlaceholder') }}</span>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="close">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          @click="detectionExportFn"
-          :loading="loading"
-          >{{ t('exportConfirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+    <el-dialog v-model="status" :title="t('exportTip')" width="300px" :close-on-click-modal="true" :close-on-press-escape="false" :show-close="false">
+        <span>{{ t('exportPlaceholder') }}</span>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="close">{{ t('cancel') }}</el-button>
+                <el-button type="primary" @click="detectionExportFn" :loading="loading">{{ t('exportConfirm') }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -30,31 +18,31 @@ import { useRouter } from 'vue-router'
 import { ElMessage } from 'element-plus'
 
 const prop = defineProps({
-  show: {
-    type: Boolean,
-    default: false,
-  },
-  type: {
-    type: String,
-    default: '',
-  },
-  searchParam: {
-    type: Object,
-    default: () => {
-      return {}
+    show: {
+        type: Boolean,
+        default: false
     },
-  },
+    type: {
+        type: String,
+        default: ''
+    },
+    searchParam: {
+        type: Object,
+        default: () => {
+            return {}
+        }
+    }
 })
 
 const loading = ref(false)
 
 const status = computed({
-  get() {
-    return prop.show
-  },
-  set(value) {
-    emit('update:show', value)
-  },
+    get() {
+        return prop.show
+    },
+    set(value) {
+        emit('update:show', value)
+    }
 })
 const emit = defineEmits(['update:show', 'close'])
 
@@ -64,32 +52,30 @@ const router = useRouter()
  * 导出报表并跳转到下载页
  */
 const detectionExportFn = () => {
-  loading.value = true
-  const url = router.resolve({
-    path: '/admin/setting/export',
-  })
-  exportDataCheck(prop.type, { page: 1, limit: 1, ...prop.searchParam })
-    .then((res: any) => {
-      if (res.data) {
-        exportData(prop.type, prop.searchParam).then(() => {
-          loading.value = false
-          emit('close', false)
-          setTimeout(() => {
-            window.open(url.href)
-          }, 100)
-        })
-      } else {
-        loading.value = false
-        ElMessage.error(res.msg)
-      }
+    loading.value = true
+    const url = router.resolve({
+        path: '/admin/setting/export'
     })
-    .catch(() => {
-      loading.value = false
+    exportDataCheck(prop.type, { page: 1, limit: 1, ...prop.searchParam }).then((res: any) => {
+        if (res.data) {
+            exportData(prop.type, prop.searchParam).then(() => {
+                loading.value = false
+                emit('close', false)
+                setTimeout(() => {
+                    window.open(url.href)
+                }, 100)
+            })
+        } else {
+            loading.value = false
+            ElMessage.error(res.msg)
+        }
+    }).catch(() => {
+        loading.value = false
     })
 }
 // 关闭弹框
 const close = () => {
-  emit('close', false)
+    emit('close', false)
 }
 </script>
 
diff --git a/admin/src/components/heat-map/index.vue b/admin/src/components/heat-map/index.vue
index 53b03ca4..919d198d 100644
--- a/admin/src/components/heat-map/index.vue
+++ b/admin/src/components/heat-map/index.vue
@@ -1,136 +1,86 @@
 <template>
-  <div>
-    <div @click="show">
-      <slot>
-        <div v-if="value.heatMapData.length" class="cursor-pointer">
-          {{ t('selected')
-          }}<span class="text-primary p-[4px]">{{
-            value.heatMapData.length
-          }}</span
-          >{{ t('selectedAfterHotArea') }}
+    <div>
+        <div @click="show">
+            <slot>
+                <div v-if="value.heatMapData.length" class="cursor-pointer">{{ t('selected') }}<span class="text-primary p-[4px]">{{ value.heatMapData.length }}</span>{{ t('selectedAfterHotArea') }}</div>
+                <div v-else class="cursor-pointer">{{ t('addHotArea') }}</div>
+            </slot>
         </div>
-        <div v-else class="cursor-pointer">{{ t('addHotArea') }}</div>
-      </slot>
-    </div>
-    <el-dialog
-      v-model="showDialog"
-      :title="t('hotAreaSet')"
-      width="810px"
-      :close-on-press-escape="false"
-      :destroy-on-close="true"
-      :close-on-click-modal="false"
-    >
-      <div class="flex">
-        <div
-          class="hot-area-img-wrap content-box relative bg-gray-100 border border-dashed border-gray-500 bg-no-repeat"
-          :style="{
-            backgroundImage: 'url(' + img(value.imageUrl) + ')',
-            width: contentBoxWidth + 'px',
-            height: contentBoxHeight + 'px',
-          }"
-        >
-          <div
-            v-for="(item, index) in dragBoxArr"
-            :id="'box_' + index"
-            :key="index"
-            class="area-box border border-solid border-[#ccc] w-[100px] h-[100px] absolute top-0 left-0 select-none p-[5px]"
-            :style="{
-              left: item.left + item.unit,
-              top: item.top + item.unit,
-              width: item.width + item.unit,
-              height: item.height + item.unit,
-            }"
-            @mousedown="mouseDown($event, index)"
-          >
-            <span>{{ index + 1 }}</span>
-            <template v-if="item.link.title">
-              <span class="p-[4px]">|</span>
-              <span>{{ item.link.title }}</span>
-            </template>
-            <span
-              class="box1"
-              @mousedown.stop="resizeMouseDown($event, index)"
-            ></span>
-            <span
-              class="box2"
-              @mousedown.stop="resizeMouseDown($event, index)"
-            ></span>
-            <span
-              class="box3"
-              @mousedown.stop="resizeMouseDown($event, index)"
-            ></span>
-            <span
-              class="box4"
-              @mousedown.stop="resizeMouseDown($event, index)"
-            ></span>
-          </div>
-        </div>
-
-        <el-form label-width="80px" class="pl-[20px]">
-          <h3 class="mb-[10px] text-lg text-black">{{ t('hotAreaManage') }}</h3>
-          <el-button
-            type="primary"
-            plain
-            size="small"
-            class="mb-[10px]"
-            @click="addArea"
-            >{{ t('addHotArea') }}</el-button
-          >
-          <div class="overflow-y-auto h-[300px]">
-            <template v-for="(item, index) in dragBoxArr" :key="index">
-              <div class="mb-[16px]" v-if="item">
-                <el-form-item :label="t('hotArea') + (index + 1)">
-                  <div class="flex items-center">
-                    <diy-link v-model="item.link" />
-                    <icon
-                      class="del cursor-pointer mx-[10px]"
-                      name="element CircleCloseFilled"
-                      color="#bbb"
-                      size="20px"
-                      @click="dragBoxArr.splice(index, 1)"
-                    />
-                  </div>
-                </el-form-item>
-              </div>
+        <el-dialog v-model="showDialog" :title="t('hotAreaSet')" width="810px" :close-on-press-escape="false" :destroy-on-close="true" :close-on-click-modal="false">
+
+            <div class="flex">
+
+                <div class="hot-area-img-wrap content-box relative bg-gray-100 border border-dashed border-gray-500 bg-no-repeat" :style="{ backgroundImage: 'url(' + img(value.imageUrl) + ')', width: contentBoxWidth + 'px', height: contentBoxHeight + 'px' }">
+                    <div v-for="(item, index) in dragBoxArr" :id="'box_' + index" :key="index"
+                        class="area-box border border-solid border-[#ccc] w-[100px] h-[100px] absolute top-0 left-0 select-none p-[5px]"
+                        :style="{ left: item.left + item.unit, top: item.top + item.unit, width: item.width + item.unit, height: item.height + item.unit }"
+                        @mousedown="mouseDown($event, index)">
+                        <span>{{ index + 1 }}</span>
+                        <template v-if="item.link.title">
+                            <span class="p-[4px]">|</span>
+                            <span>{{ item.link.title }}</span>
+                        </template>
+                        <span class="box1" @mousedown.stop="resizeMouseDown($event, index)"></span>
+                        <span class="box2" @mousedown.stop="resizeMouseDown($event, index)"></span>
+                        <span class="box3" @mousedown.stop="resizeMouseDown($event, index)"></span>
+                        <span class="box4" @mousedown.stop="resizeMouseDown($event, index)"></span>
+                    </div>
+                </div>
+
+                <el-form label-width="80px" class="pl-[20px]">
+                    <h3 class="mb-[10px] text-lg text-black">{{ t('hotAreaManage') }}</h3>
+                    <el-button type="primary" plain size="small" class="mb-[10px]" @click="addArea">{{ t('addHotArea') }}</el-button>
+                    <div class="overflow-y-auto h-[300px]">
+                        <template v-for="(item, index) in dragBoxArr" :key="index">
+                            <div class="mb-[16px]" v-if="item">
+                                <el-form-item :label="t('hotArea') + (index + 1)">
+                                    <div class="flex items-center">
+                                        <diy-link v-model="item.link" />
+                                        <icon class="del cursor-pointer mx-[10px]" name="element CircleCloseFilled" color="#bbb" size="20px" @click="dragBoxArr.splice(index, 1)" />
+                                    </div>
+                                </el-form-item>
+                            </div>
+                        </template>
+                    </div>
+                </el-form>
+
+            </div>
+
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                    <el-button type="primary" @click="save">{{ t('confirm') }}</el-button>
+                </span>
             </template>
-          </div>
-        </el-form>
-      </div>
-
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-          <el-button type="primary" @click="save">{{ t('confirm') }}</el-button>
-        </span>
-      </template>
-    </el-dialog>
-  </div>
+        </el-dialog>
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { t } from '@/lang'
 import { ref, reactive, computed } from 'vue'
 import { ElMessage } from 'element-plus'
-import { img, deepClone } from '@/utils/common'
+import { img,deepClone } from '@/utils/common'
 
 const prop = defineProps({
-  modelValue: {
-    type: String,
-    default: '',
-  },
+    modelValue: {
+        type: String,
+        default: ''
+    }
 })
 
 const emit = defineEmits(['update:modelValue'])
 
 const value: any = computed({
-  get() {
-    return prop.modelValue
-  },
-  set(value) {
-    emit('update:modelValue', value)
-  },
+    get () {
+        return prop.modelValue
+    },
+    set (value) {
+        emit('update:modelValue', value)
+    }
 })
 
+
 /**
  * 公式：
  * 宽度：400
@@ -143,562 +93,550 @@ const contentBoxWidth = ref(400)
 const contentBoxHeight = ref(400)
 const dragBoxArr: any = reactive([])
 
-const imgRatio = ref(1) // 图片比例
+const imgRatio = ref(1); // 图片比例
 
 // 热区尺寸
 const areaRadio = ref(0.25) // 占位图比例
 const areaWidth = ref(100)
 const areaHeight = ref(100)
-const areaNum = ref(4) // 每行显示的数量
+const areaNum = ref(4); // 每行显示的数量
 
 // 添加热区
 const addArea = () => {
-  let left = (dragBoxArr.length % areaNum.value) * areaWidth.value
-  let top = Math.floor(dragBoxArr.length / areaNum.value) * areaHeight.value
-  let edgeHeight = top + areaHeight.value / 2
-  if (top >= contentBoxHeight.value || edgeHeight >= contentBoxHeight.value) {
-    top = 0
-    left = 0
-  }
-
-  dragBoxArr.push({
-    left,
-    top,
-    width: areaWidth.value,
-    height: areaHeight.value,
-    unit: 'px',
-    link: {
-      name: '',
-    },
-  })
+    let left = dragBoxArr.length % areaNum.value * areaWidth.value
+    let top = Math.floor(dragBoxArr.length / areaNum.value) * areaHeight.value
+    let edgeHeight = top + (areaHeight.value / 2)
+    if (top >= contentBoxHeight.value || edgeHeight >= contentBoxHeight.value) {
+        top = 0
+        left = 0
+    }
+
+    dragBoxArr.push({
+        left,
+        top,
+        width: areaWidth.value,
+        height: areaHeight.value,
+        unit: 'px',
+        link: {
+            name: ''
+        }
+    })
 }
 
 // 移动事件
 const mouseDown = (e: any, index: number) => {
-  const box: any = document.getElementById('box_' + index)
-  const disX = e.clientX - box.offsetLeft
-  const disY = e.clientY - box.offsetTop
-
-  // 鼠标移动时
-  document.onmousemove = function (e) {
-    box.style.left = e.clientX - disX + 'px'
-    box.style.top = e.clientY - disY + 'px'
-
-    // 边界判断
-    if (e.clientX - disX < 0) {
-      box.style.left = 0
-    }
+    const box: any = document.getElementById('box_' + index)
+    const disX = e.clientX - box.offsetLeft
+    const disY = e.clientY - box.offsetTop
 
-    if (e.clientX - disX > contentBoxWidth.value - box.offsetWidth) {
-      box.style.left = contentBoxWidth.value - box.offsetWidth + 'px'
-    }
+    // 鼠标移动时
+    document.onmousemove = function (e) {
+        box.style.left = e.clientX - disX + 'px'
+        box.style.top = e.clientY - disY + 'px'
 
-    if (e.clientY - disY < 0) {
-      box.style.top = 0
-    }
+        // 边界判断
+        if (e.clientX - disX < 0) {
+            box.style.left = 0
+        }
+
+        if (e.clientX - disX > contentBoxWidth.value - box.offsetWidth) {
+            box.style.left = contentBoxWidth.value - box.offsetWidth + 'px'
+        }
+
+        if (e.clientY - disY < 0) {
+            box.style.top = 0
+        }
+
+        if (e.clientY - disY > contentBoxHeight.value - box.offsetHeight) {
+            box.style.top = contentBoxHeight.value - box.offsetHeight + 'px'
+        }
 
-    if (e.clientY - disY > contentBoxHeight.value - box.offsetHeight) {
-      box.style.top = contentBoxHeight.value - box.offsetHeight + 'px'
+        dragBoxArr[index].left = box.offsetLeft
+        dragBoxArr[index].top = box.offsetTop
+        dragBoxArr[index].width = box.offsetWidth
+        dragBoxArr[index].height = box.offsetHeight
+        dragBoxArr[index].unit = 'px'
     }
 
-    dragBoxArr[index].left = box.offsetLeft
-    dragBoxArr[index].top = box.offsetTop
-    dragBoxArr[index].width = box.offsetWidth
-    dragBoxArr[index].height = box.offsetHeight
-    dragBoxArr[index].unit = 'px'
-  }
-
-  // 鼠标抬起时
-  document.onmouseup = function (e) {
-    document.onmousemove = null
-  }
+    // 鼠标抬起时
+    document.onmouseup = function (e) {
+        document.onmousemove = null
+    }
 }
 
 // 拖拽大小事件
 const resizeMouseDown = (e: any, index: number) => {
-  const oEv = e
-  oEv.stopPropagation()
-  const box: any = document.getElementById('box_' + index)
-  const className = e.target.className
+    const oEv = e
+    oEv.stopPropagation()
+    const box: any = document.getElementById('box_' + index)
+    const className = e.target.className
+
+    // 获取移动前盒子的宽高，
+    const oldWidth = box.offsetWidth
+    const oldHeight = box.offsetHeight
+
+    // 获取鼠标距离屏幕的left和top值
+    const oldX = oEv.clientX
+    const oldY = oEv.clientY
+
+    // 元素相对于最近的父级定位
+    const oldLeft = box.offsetLeft
+    const oldTop = box.offsetTop
+
+    // 设置最小的宽度
+    const minWidth = 50
+    const minHeight = 50
+
+    document.onmousemove = function (e) {
+        const oEv = e
+        // console.log('move', "width：" + oldWidth,
+        //     '，oldLeft: ' + oldLeft, '，oldTop: ' + oldTop,
+        //     '，oldX：clientX-- ' + oldX + '：' + oEv.clientX,
+        //     '，oldY：clientY-- ' + oldY + '：' + oEv.clientY,
+        // )
+
+        // 左上角
+        if (className == 'box1') {
+            let width = oldWidth - (oEv.clientX - oldX)
+            const maxWidth = contentBoxWidth.value
+
+            let height = oldHeight - (oEv.clientY - oldY)
+            const maxHeight = contentBoxHeight.value - oldTop
+
+            let left = oldLeft + (oEv.clientX - oldX)
+            let top = oldTop + (oEv.clientY - oldY)
+
+            if (width < minWidth) {
+                width = minWidth
+            }
+            if (width > maxWidth) {
+                width = maxWidth
+            }
+
+            if (height < minHeight) {
+                height = minHeight
+            }
+            if (height > maxHeight) {
+                height = maxHeight
+            }
+
+            if (oldLeft == 0 && oldTop == 0) {
+                // 坐标：left = 0，top = 0
+
+                if (width == minWidth && height == minHeight) {
+                    // 宽高 = 最小值，left = 最小宽度，top = 最小高度
+                    left = minWidth
+                    top = minHeight
+                } else if (width == minWidth && height > minHeight) {
+                    // 宽 = 最小值，高 > 最小值，left = 最小宽度，top = 不予处理
+                    left = minWidth
+                } else if (width > minWidth && height == minHeight) {
+                    // 宽 > 最小值，高 = 最小值，left = 不予处理，top = 最小高度
+                    top = minHeight
+                } else if (width > minWidth && height > minHeight) {
+                    // 宽 > 最小值，高 > 最小值，left = 不予处理，top = 不予处理
+                }
+            } else if (oldLeft == 0 && oldTop > 0) {
+                // 坐标：left = 0，top > 0
+
+                if (width == minWidth && height == minHeight) {
+                    // 宽高 = 最小值，left = 最小宽度，top = 元素上偏移位置
+                    left = minWidth
+                    top = box.offsetTop
+                } else if (width == minWidth && height > minHeight) {
+                    // 宽 = 最小值，高 > 最小值，left = 最小宽度，top = 元素上偏移位置
+                    left = minWidth
+                    top = box.offsetTop
+                } else if (width > minWidth && height == minHeight) {
+                    // 宽 > 最小值，高 = 最小值，left = 不予处理，top = 元素上偏移位置
+                    top = box.offsetTop
+                } else if (width > minWidth && height > minHeight) {
+                    // 宽 > 最小值，高 > 最小值，left = 不予处理，top = 不予处理
+                }
+            } else if (oldLeft > 0 && oldTop == 0) {
+                // 坐标：left > 0，top = 0
+
+                if (width == minWidth && height == minHeight) {
+                    // 宽高 = 最小值，left = 元素左偏移位置，top = 元素上偏移位置
+                    left = box.offsetLeft
+                    top = box.offsetTop
+                } else if (width == minWidth && height > minHeight) {
+                    // 宽 = 最小值，高 > 最小值，left = 元素左偏移位置，top = 0
+                    left = box.offsetLeft
+                    top = 0
+                } else if (width > minWidth && height == minHeight) {
+                    // 宽 > 最小值，高 = 最小值，left = 不予处理，top = 元素上偏移位置
+                    top = box.offsetTop
+                } else if (width > minWidth && height > minHeight) {
+                    // 宽 > 最小值，高 > 最小值，left = 不予处理，top = 不予处理
+                }
+            } else if (oldLeft > 0 && oldTop > 0) {
+                // 坐标：left > 0，top > 0
+
+                if (width == minWidth && height == minHeight) {
+                    // 宽高 = 最小值，left = 元素左偏移位置，top = 元素上偏移位置
+                    left = box.offsetLeft
+                    top = box.offsetTop
+                } else if (width == minWidth && height > minHeight) {
+                    // 宽 = 最小值，高 > 最小值，left = 元素左偏移位置，top = 元素上偏移位置
+                    left = box.offsetLeft
+                    top = box.offsetTop
+                } else if (width > minWidth && height == minHeight) {
+                    // 宽 > 最小值，高 = 最小值，left = 不予处理，top = 元素上偏移位置
+                    top = box.offsetTop
+                } else if (width > minWidth && height > minHeight) {
+                    // 宽 > 最小值，高 > 最小值，left = 不予处理，top = 不予处理
+                }
+            }
+
+            // 左上宽
+            if (left < 0) {
+                left = 0
+                width = oldWidth - (oEv.clientX - oldX) + (oldLeft + (oEv.clientX - oldX))
+            }
+
+            // 左上 高
+            if (top < 0) {
+                top = 0
+                height = oldTop + (oEv.clientY - oldY) + (oldHeight - (oEv.clientY - oldY))
+            }
+
+            box.style.width = width + 'px'
+            box.style.height = height + 'px'
+            box.style.left = left + 'px'
+            box.style.top = top + 'px'
+        } else if (className == 'box2') {
+            // 右上角
+
+            let width = oldWidth + (oEv.clientX - oldX)
+            const maxWidth = contentBoxWidth.value - oldLeft
+
+            let height = oldHeight - (oEv.clientY - oldY)
+            const maxHeight = contentBoxHeight.value - oldTop
+
+            let top = oldTop + (oEv.clientY - oldY)
+
+            if (width < minWidth) {
+                width = minWidth
+            }
+            if (width > maxWidth) {
+                width = maxWidth
+            }
+
+            if (height < minHeight) {
+                height = minHeight
+            }
+            if (height > maxHeight) {
+                height = maxHeight
+            }
+
+            if (oldLeft == 0 && oldTop == 0) {
+                // 坐标：left = 0，top = 0
+
+                if (width == minWidth && height == minHeight) {
+                    // 宽高 = 最小值，top = 最小高度
+                    top = minHeight
+                } else if (width == minWidth && height > minHeight) {
+                    // 宽 = 最小值，高 > 最小值，不予处理
+                } else if (width > minWidth && height == minHeight) {
+                    // 宽 > 最小值，高 = 最小值，top = 最小高度
+                    top = minHeight
+                } else if (width > minWidth && height > minHeight) {
+                    // 宽 > 最小值，高 > 最小值，不予处理
+                }
+            } else if (oldLeft == 0 && oldTop > 0) {
+                // 坐标：left = 0，top > 0
+
+                if (width == minWidth && height == minHeight) {
+                    // 宽高 = 最小值，top = 元素上偏移位置
+                    top = box.offsetTop
+                } else if (width == minWidth && height > minHeight) {
+                    // 宽 = 最小值，高 > 最小值，top = 元素上偏移位置
+                    top = box.offsetTop
+                } else if (width > minWidth && height == minHeight) {
+                    // 宽 > 最小值，高 = 最小值，top = 元素上偏移位置
+                    top = box.offsetTop
+                } else if (width > minWidth && height > minHeight) {
+                    // 宽 > 最小值，高 > 最小值，不予处理
+                }
+            } else if (oldLeft > 0 && oldTop == 0) {
+                // 坐标：left = 0，top = 0
+
+                if (width == minWidth && height == minHeight) {
+                    // 宽高 = 最小值，top = 元素上偏移位置
+                    top = box.offsetTop
+                } else if (width == minWidth && height > minHeight) {
+                    // 宽 = 最小值，高 > 最小值，top = 0
+                    top = 0
+                } else if (width > minWidth && height == minHeight) {
+                    // 宽 > 最小值，高 = 最小值，top = 元素上偏移位置
+                    top = box.offsetTop
+                } else if (width > minWidth && height > minHeight) {
+                    // 宽 > 最小值，高 > 最小值，不予处理
+                }
+            } else if (oldLeft > 0 && oldTop > 0) {
+                // 坐标：left > 0，top > 0
+
+                if (width == minWidth && height == minHeight) {
+                    // 宽高 = 最小值，top = 元素上偏移位置
+                    top = box.offsetTop
+                } else if (width == minWidth && height > minHeight) {
+                    // 宽 = 最小值，高 > 最小值，top = 元素上偏移位置
+                    top = box.offsetTop
+                } else if (width > minWidth && height == minHeight) {
+                    // 宽 > 最小值，高 = 最小值，top = 元素上偏移位置
+                    top = box.offsetTop
+                } else if (width > minWidth && height > minHeight) {
+                    // 宽 > 最小值，高 > 最小值，不予处理
+                }
+            }
+
+            // 右上高
+            if (top < 0) {
+                top = 0
+                height = oldTop + (oEv.clientY - oldY) + (oldHeight - (oEv.clientY - oldY))
+            }
+
+            box.style.width = width + 'px'
+            box.style.height = height + 'px'
+            box.style.top = top + 'px'
+        } else if (className == 'box3') {
+            // 左下角
+
+            let width = oldWidth - (oEv.clientX - oldX)
+            const maxWidth = contentBoxWidth.value
+
+            let height = oldHeight + (oEv.clientY - oldY)
+            const maxHeight = contentBoxHeight.value - oldTop
+
+            let left = oldLeft + (oEv.clientX - oldX)
+
+            if (width < minWidth) {
+                width = minWidth
+            }
+            if (width > maxWidth) {
+                width = maxWidth
+            }
+
+            if (height < minHeight) {
+                height = minHeight
+            }
+            if (height > maxHeight) {
+                height = maxHeight
+            }
+
+            if (oldLeft == 0 && oldTop == 0) {
+                // 坐标：left = 0，top = 0
+
+                if (width == minWidth && height == minHeight) {
+                    // 宽高 = 最小值，left = 最小宽度
+                    left = minWidth
+                } else if (width == minWidth && height > minHeight) {
+                    // 宽 = 最小值，高 > 最小值，left = 最小宽度
+                    left = minWidth
+                } else if (width > minWidth && height == minHeight) {
+                    // 宽 > 最小值，高 = 最小值，不予处理
+                } else if (width > minWidth && height > minHeight) {
+                    // 宽 > 最小值，高 > 最小值，不予处理
+                }
+            } else if (oldLeft == 0 && oldTop > 0) {
+                // 坐标：left = 0，top > 0
+
+                if (width == minWidth && height == minHeight) {
+                    // 宽高 = 最小值，left = 最小宽度
+                    left = minWidth
+                } else if (width == minWidth && height > minHeight) {
+                    // 宽 = 最小值，高 > 最小值，left = 最小宽度
+                    left = minWidth
+                } else if (width > minWidth && height == minHeight) {
+                    // 宽 > 最小值，高 = 最小值，不予处理
+                } else if (width > minWidth && height > minHeight) {
+                    // 宽 > 最小值，高 > 最小值，不予处理
+                }
+            } else if (oldLeft > 0 && oldTop == 0) {
+                // 坐标：left > 0，top = 0
+
+                if (width == minWidth && height == minHeight) {
+                    // 宽高 = 最小值，left = 元素左偏移位置
+                    left = box.offsetLeft
+                } else if (width == minWidth && height > minHeight) {
+                    // 宽 = 最小值，高 > 最小值，left = 元素左偏移位置
+                    left = box.offsetLeft
+                } else if (width > minWidth && height == minHeight) {
+                    // 宽 > 最小值，高 = 最小值，不予处理
+                } else if (width > minWidth && height > minHeight) {
+                    // 宽 > 最小值，高 > 最小值，不予处理
+                }
+            } else if (oldLeft > 0 && oldTop > 0) {
+                // 坐标：left > 0，top > 0
+
+                if (width == minWidth && height == minHeight) {
+                    // 宽高 = 最小值，left = 元素左偏移位置
+                    left = box.offsetLeft
+                } else if (width == minWidth && height > minHeight) {
+                    // 宽 = 最小值，高 > 最小值，left = 元素左偏移位置
+                    left = box.offsetLeft
+                } else if (width > minWidth && height == minHeight) {
+                    // 宽 > 最小值，高 = 最小值，不予处理
+                } else if (width > minWidth && height > minHeight) {
+                    // 宽 > 最小值，高 > 最小值，不予处理
+                }
+            }
+
+            if (left < 0) {
+                left = 0
+                width = oldWidth - (oEv.clientX - oldX) + (oldLeft + (oEv.clientX - oldX))
+            }
+
+            box.style.width = width + 'px'
+            box.style.height = height + 'px'
+            box.style.left = left + 'px'
+        } else if (className == 'box4') {
+            // 右下角
+
+            let width = oldWidth + (oEv.clientX - oldX)
+            const maxWidth = contentBoxWidth.value - oldLeft
+
+            let height = oldHeight + (oEv.clientY - oldY)
+            const maxHeight = contentBoxHeight.value - oldTop
+
+            if (width < minWidth) {
+                width = minWidth
+            }
+            if (width > maxWidth) {
+                width = maxWidth
+            }
+
+            if (height < minHeight) {
+                height = minHeight
+            }
+            if (height > maxHeight) {
+                height = maxHeight
+            }
+
+            box.style.width = width + 'px'
+            box.style.height = height + 'px'
+        }
 
-  // 获取移动前盒子的宽高，
-  const oldWidth = box.offsetWidth
-  const oldHeight = box.offsetHeight
+        dragBoxArr[index].left = box.offsetLeft
+        dragBoxArr[index].top = box.offsetTop
+        dragBoxArr[index].width = box.offsetWidth
+        dragBoxArr[index].height = box.offsetHeight
+        dragBoxArr[index].unit = 'px'
+    }
 
-  // 获取鼠标距离屏幕的left和top值
-  const oldX = oEv.clientX
-  const oldY = oEv.clientY
+    // 鼠标抬起时
+    document.onmouseup = function () {
+        document.onmousemove = null
+        document.onmouseup = null
+    }
+}
 
-  // 元素相对于最近的父级定位
-  const oldLeft = box.offsetLeft
-  const oldTop = box.offsetTop
+const show = () => {
+    // 每次打开时赋值
+    if (!value.value.imageUrl) {
+        ElMessage({
+            type: 'warning',
+            message: `${t('imageUrlTip')}`
+        })
+        return
+    }
 
-  // 设置最小的宽度
-  const minWidth = 50
-  const minHeight = 50
+    // 计算图片比例
+    imgRatio.value = value.value.imgHeight / value.value.imgWidth;
 
-  document.onmousemove = function (e) {
-    const oEv = e
-    // console.log('move', "width：" + oldWidth,
-    //     '，oldLeft: ' + oldLeft, '，oldTop: ' + oldTop,
-    //     '，oldX：clientX-- ' + oldX + '：' + oEv.clientX,
-    //     '，oldY：clientY-- ' + oldY + '：' + oEv.clientY,
-    // )
-
-    // 左上角
-    if (className == 'box1') {
-      let width = oldWidth - (oEv.clientX - oldX)
-      const maxWidth = contentBoxWidth.value
-
-      let height = oldHeight - (oEv.clientY - oldY)
-      const maxHeight = contentBoxHeight.value - oldTop
-
-      let left = oldLeft + (oEv.clientX - oldX)
-      let top = oldTop + (oEv.clientY - oldY)
-
-      if (width < minWidth) {
-        width = minWidth
-      }
-      if (width > maxWidth) {
-        width = maxWidth
-      }
-
-      if (height < minHeight) {
-        height = minHeight
-      }
-      if (height > maxHeight) {
-        height = maxHeight
-      }
-
-      if (oldLeft == 0 && oldTop == 0) {
-        // 坐标：left = 0，top = 0
-
-        if (width == minWidth && height == minHeight) {
-          // 宽高 = 最小值，left = 最小宽度，top = 最小高度
-          left = minWidth
-          top = minHeight
-        } else if (width == minWidth && height > minHeight) {
-          // 宽 = 最小值，高 > 最小值，left = 最小宽度，top = 不予处理
-          left = minWidth
-        } else if (width > minWidth && height == minHeight) {
-          // 宽 > 最小值，高 = 最小值，left = 不予处理，top = 最小高度
-          top = minHeight
-        } else if (width > minWidth && height > minHeight) {
-          // 宽 > 最小值，高 > 最小值，left = 不予处理，top = 不予处理
-        }
-      } else if (oldLeft == 0 && oldTop > 0) {
-        // 坐标：left = 0，top > 0
-
-        if (width == minWidth && height == minHeight) {
-          // 宽高 = 最小值，left = 最小宽度，top = 元素上偏移位置
-          left = minWidth
-          top = box.offsetTop
-        } else if (width == minWidth && height > minHeight) {
-          // 宽 = 最小值，高 > 最小值，left = 最小宽度，top = 元素上偏移位置
-          left = minWidth
-          top = box.offsetTop
-        } else if (width > minWidth && height == minHeight) {
-          // 宽 > 最小值，高 = 最小值，left = 不予处理，top = 元素上偏移位置
-          top = box.offsetTop
-        } else if (width > minWidth && height > minHeight) {
-          // 宽 > 最小值，高 > 最小值，left = 不予处理，top = 不予处理
-        }
-      } else if (oldLeft > 0 && oldTop == 0) {
-        // 坐标：left > 0，top = 0
-
-        if (width == minWidth && height == minHeight) {
-          // 宽高 = 最小值，left = 元素左偏移位置，top = 元素上偏移位置
-          left = box.offsetLeft
-          top = box.offsetTop
-        } else if (width == minWidth && height > minHeight) {
-          // 宽 = 最小值，高 > 最小值，left = 元素左偏移位置，top = 0
-          left = box.offsetLeft
-          top = 0
-        } else if (width > minWidth && height == minHeight) {
-          // 宽 > 最小值，高 = 最小值，left = 不予处理，top = 元素上偏移位置
-          top = box.offsetTop
-        } else if (width > minWidth && height > minHeight) {
-          // 宽 > 最小值，高 > 最小值，left = 不予处理，top = 不予处理
-        }
-      } else if (oldLeft > 0 && oldTop > 0) {
-        // 坐标：left > 0，top > 0
-
-        if (width == minWidth && height == minHeight) {
-          // 宽高 = 最小值，left = 元素左偏移位置，top = 元素上偏移位置
-          left = box.offsetLeft
-          top = box.offsetTop
-        } else if (width == minWidth && height > minHeight) {
-          // 宽 = 最小值，高 > 最小值，left = 元素左偏移位置，top = 元素上偏移位置
-          left = box.offsetLeft
-          top = box.offsetTop
-        } else if (width > minWidth && height == minHeight) {
-          // 宽 > 最小值，高 = 最小值，left = 不予处理，top = 元素上偏移位置
-          top = box.offsetTop
-        } else if (width > minWidth && height > minHeight) {
-          // 宽 > 最小值，高 > 最小值，left = 不予处理，top = 不予处理
-        }
-      }
+    // 根据图片比例，调整图片高度
+    contentBoxHeight.value = Math.floor(contentBoxWidth.value * imgRatio.value);
 
-      // 左上宽
-      if (left < 0) {
-        left = 0
-        width =
-          oldWidth - (oEv.clientX - oldX) + (oldLeft + (oEv.clientX - oldX))
-      }
+    areaWidth.value = Math.floor(areaRadio.value * contentBoxHeight.value);
+    areaHeight.value = areaWidth.value;
+    areaNum.value = Math.floor(contentBoxWidth.value / areaWidth.value)
 
-      // 左上 高
-      if (top < 0) {
-        top = 0
-        height =
-          oldTop + (oEv.clientY - oldY) + (oldHeight - (oEv.clientY - oldY))
-      }
-
-      box.style.width = width + 'px'
-      box.style.height = height + 'px'
-      box.style.left = left + 'px'
-      box.style.top = top + 'px'
-    } else if (className == 'box2') {
-      // 右上角
-
-      let width = oldWidth + (oEv.clientX - oldX)
-      const maxWidth = contentBoxWidth.value - oldLeft
-
-      let height = oldHeight - (oEv.clientY - oldY)
-      const maxHeight = contentBoxHeight.value - oldTop
-
-      let top = oldTop + (oEv.clientY - oldY)
-
-      if (width < minWidth) {
-        width = minWidth
-      }
-      if (width > maxWidth) {
-        width = maxWidth
-      }
-
-      if (height < minHeight) {
-        height = minHeight
-      }
-      if (height > maxHeight) {
-        height = maxHeight
-      }
-
-      if (oldLeft == 0 && oldTop == 0) {
-        // 坐标：left = 0，top = 0
-
-        if (width == minWidth && height == minHeight) {
-          // 宽高 = 最小值，top = 最小高度
-          top = minHeight
-        } else if (width == minWidth && height > minHeight) {
-          // 宽 = 最小值，高 > 最小值，不予处理
-        } else if (width > minWidth && height == minHeight) {
-          // 宽 > 最小值，高 = 最小值，top = 最小高度
-          top = minHeight
-        } else if (width > minWidth && height > minHeight) {
-          // 宽 > 最小值，高 > 最小值，不予处理
-        }
-      } else if (oldLeft == 0 && oldTop > 0) {
-        // 坐标：left = 0，top > 0
-
-        if (width == minWidth && height == minHeight) {
-          // 宽高 = 最小值，top = 元素上偏移位置
-          top = box.offsetTop
-        } else if (width == minWidth && height > minHeight) {
-          // 宽 = 最小值，高 > 最小值，top = 元素上偏移位置
-          top = box.offsetTop
-        } else if (width > minWidth && height == minHeight) {
-          // 宽 > 最小值，高 = 最小值，top = 元素上偏移位置
-          top = box.offsetTop
-        } else if (width > minWidth && height > minHeight) {
-          // 宽 > 最小值，高 > 最小值，不予处理
-        }
-      } else if (oldLeft > 0 && oldTop == 0) {
-        // 坐标：left = 0，top = 0
-
-        if (width == minWidth && height == minHeight) {
-          // 宽高 = 最小值，top = 元素上偏移位置
-          top = box.offsetTop
-        } else if (width == minWidth && height > minHeight) {
-          // 宽 = 最小值，高 > 最小值，top = 0
-          top = 0
-        } else if (width > minWidth && height == minHeight) {
-          // 宽 > 最小值，高 = 最小值，top = 元素上偏移位置
-          top = box.offsetTop
-        } else if (width > minWidth && height > minHeight) {
-          // 宽 > 最小值，高 > 最小值，不予处理
-        }
-      } else if (oldLeft > 0 && oldTop > 0) {
-        // 坐标：left > 0，top > 0
-
-        if (width == minWidth && height == minHeight) {
-          // 宽高 = 最小值，top = 元素上偏移位置
-          top = box.offsetTop
-        } else if (width == minWidth && height > minHeight) {
-          // 宽 = 最小值，高 > 最小值，top = 元素上偏移位置
-          top = box.offsetTop
-        } else if (width > minWidth && height == minHeight) {
-          // 宽 > 最小值，高 = 最小值，top = 元素上偏移位置
-          top = box.offsetTop
-        } else if (width > minWidth && height > minHeight) {
-          // 宽 > 最小值，高 > 最小值，不予处理
-        }
-      }
+    if (Object.keys(value.value.heatMapData).length) {
+        dragBoxArr.splice(0, dragBoxArr.length, ...value.value.heatMapData)
+    } else {
+        dragBoxArr.splice(0, dragBoxArr.length)
+        addArea()
+    }
+    showDialog.value = true
+}
 
-      // 右上高
-      if (top < 0) {
-        top = 0
-        height =
-          oldTop + (oEv.clientY - oldY) + (oldHeight - (oEv.clientY - oldY))
-      }
-
-      box.style.width = width + 'px'
-      box.style.height = height + 'px'
-      box.style.top = top + 'px'
-    } else if (className == 'box3') {
-      // 左下角
-
-      let width = oldWidth - (oEv.clientX - oldX)
-      const maxWidth = contentBoxWidth.value
-
-      let height = oldHeight + (oEv.clientY - oldY)
-      const maxHeight = contentBoxHeight.value - oldTop
-
-      let left = oldLeft + (oEv.clientX - oldX)
-
-      if (width < minWidth) {
-        width = minWidth
-      }
-      if (width > maxWidth) {
-        width = maxWidth
-      }
-
-      if (height < minHeight) {
-        height = minHeight
-      }
-      if (height > maxHeight) {
-        height = maxHeight
-      }
-
-      if (oldLeft == 0 && oldTop == 0) {
-        // 坐标：left = 0，top = 0
-
-        if (width == minWidth && height == minHeight) {
-          // 宽高 = 最小值，left = 最小宽度
-          left = minWidth
-        } else if (width == minWidth && height > minHeight) {
-          // 宽 = 最小值，高 > 最小值，left = 最小宽度
-          left = minWidth
-        } else if (width > minWidth && height == minHeight) {
-          // 宽 > 最小值，高 = 最小值，不予处理
-        } else if (width > minWidth && height > minHeight) {
-          // 宽 > 最小值，高 > 最小值，不予处理
-        }
-      } else if (oldLeft == 0 && oldTop > 0) {
-        // 坐标：left = 0，top > 0
-
-        if (width == minWidth && height == minHeight) {
-          // 宽高 = 最小值，left = 最小宽度
-          left = minWidth
-        } else if (width == minWidth && height > minHeight) {
-          // 宽 = 最小值，高 > 最小值，left = 最小宽度
-          left = minWidth
-        } else if (width > minWidth && height == minHeight) {
-          // 宽 > 最小值，高 = 最小值，不予处理
-        } else if (width > minWidth && height > minHeight) {
-          // 宽 > 最小值，高 > 最小值，不予处理
-        }
-      } else if (oldLeft > 0 && oldTop == 0) {
-        // 坐标：left > 0，top = 0
-
-        if (width == minWidth && height == minHeight) {
-          // 宽高 = 最小值，left = 元素左偏移位置
-          left = box.offsetLeft
-        } else if (width == minWidth && height > minHeight) {
-          // 宽 = 最小值，高 > 最小值，left = 元素左偏移位置
-          left = box.offsetLeft
-        } else if (width > minWidth && height == minHeight) {
-          // 宽 > 最小值，高 = 最小值，不予处理
-        } else if (width > minWidth && height > minHeight) {
-          // 宽 > 最小值，高 > 最小值，不予处理
-        }
-      } else if (oldLeft > 0 && oldTop > 0) {
-        // 坐标：left > 0，top > 0
-
-        if (width == minWidth && height == minHeight) {
-          // 宽高 = 最小值，left = 元素左偏移位置
-          left = box.offsetLeft
-        } else if (width == minWidth && height > minHeight) {
-          // 宽 = 最小值，高 > 最小值，left = 元素左偏移位置
-          left = box.offsetLeft
-        } else if (width > minWidth && height == minHeight) {
-          // 宽 > 最小值，高 = 最小值，不予处理
-        } else if (width > minWidth && height > minHeight) {
-          // 宽 > 最小值，高 > 最小值，不予处理
+const save = () => {
+    let isOk = true
+    for (let i = 0; i < dragBoxArr.length; i++) {
+        if (!dragBoxArr[i].link.title) {
+            ElMessage({
+                type: 'warning',
+                message: t('selectedHotArea') + (i + 1) + t('hotAreaLink')
+            })
+            isOk = false
+            break
         }
-      }
-
-      if (left < 0) {
-        left = 0
-        width =
-          oldWidth - (oEv.clientX - oldX) + (oldLeft + (oEv.clientX - oldX))
-      }
-
-      box.style.width = width + 'px'
-      box.style.height = height + 'px'
-      box.style.left = left + 'px'
-    } else if (className == 'box4') {
-      // 右下角
-
-      let width = oldWidth + (oEv.clientX - oldX)
-      const maxWidth = contentBoxWidth.value - oldLeft
-
-      let height = oldHeight + (oEv.clientY - oldY)
-      const maxHeight = contentBoxHeight.value - oldTop
-
-      if (width < minWidth) {
-        width = minWidth
-      }
-      if (width > maxWidth) {
-        width = maxWidth
-      }
-
-      if (height < minHeight) {
-        height = minHeight
-      }
-      if (height > maxHeight) {
-        height = maxHeight
-      }
-
-      box.style.width = width + 'px'
-      box.style.height = height + 'px'
     }
 
-    dragBoxArr[index].left = box.offsetLeft
-    dragBoxArr[index].top = box.offsetTop
-    dragBoxArr[index].width = box.offsetWidth
-    dragBoxArr[index].height = box.offsetHeight
-    dragBoxArr[index].unit = 'px'
-  }
-
-  // 鼠标抬起时
-  document.onmouseup = function () {
-    document.onmousemove = null
-    document.onmouseup = null
-  }
-}
+    if (!isOk) return
 
-const show = () => {
-  // 每次打开时赋值
-  if (!value.value.imageUrl) {
-    ElMessage({
-      type: 'warning',
-      message: `${t('imageUrlTip')}`,
+    dragBoxArr.forEach((item: any, index: number) => {
+        const box: any = document.getElementById('box_' + index)
+        item.width = parseFloat(box.offsetWidth / contentBoxWidth.value * 100).toFixed(2)
+        item.height = parseFloat(box.offsetHeight / contentBoxHeight.value * 100).toFixed(2)
+        item.left = parseFloat(box.offsetLeft / contentBoxWidth.value * 100).toFixed(2)
+        item.top = parseFloat(box.offsetTop / contentBoxHeight.value * 100).toFixed(2)
+        item.unit = '%'
     })
-    return
-  }
-
-  // 计算图片比例
-  imgRatio.value = value.value.imgHeight / value.value.imgWidth
-
-  // 根据图片比例，调整图片高度
-  contentBoxHeight.value = Math.floor(contentBoxWidth.value * imgRatio.value)
-
-  areaWidth.value = Math.floor(areaRadio.value * contentBoxHeight.value)
-  areaHeight.value = areaWidth.value
-  areaNum.value = Math.floor(contentBoxWidth.value / areaWidth.value)
-
-  if (Object.keys(value.value.heatMapData).length) {
-    dragBoxArr.splice(0, dragBoxArr.length, ...value.value.heatMapData)
-  } else {
-    dragBoxArr.splice(0, dragBoxArr.length)
-    addArea()
-  }
-  showDialog.value = true
-}
 
-const save = () => {
-  let isOk = true
-  for (let i = 0; i < dragBoxArr.length; i++) {
-    if (!dragBoxArr[i].link.title) {
-      ElMessage({
-        type: 'warning',
-        message: t('selectedHotArea') + (i + 1) + t('hotAreaLink'),
-      })
-      isOk = false
-      break
-    }
-  }
-
-  if (!isOk) return
+    value.value.heatMapData = deepClone(dragBoxArr)
 
-  dragBoxArr.forEach((item: any, index: number) => {
-    const box: any = document.getElementById('box_' + index)
-    item.width = parseFloat(
-      (box.offsetWidth / contentBoxWidth.value) * 100
-    ).toFixed(2)
-    item.height = parseFloat(
-      (box.offsetHeight / contentBoxHeight.value) * 100
-    ).toFixed(2)
-    item.left = parseFloat(
-      (box.offsetLeft / contentBoxWidth.value) * 100
-    ).toFixed(2)
-    item.top = parseFloat(
-      (box.offsetTop / contentBoxHeight.value) * 100
-    ).toFixed(2)
-    item.unit = '%'
-  })
-
-  value.value.heatMapData = deepClone(dragBoxArr)
-
-  showDialog.value = false
+    showDialog.value = false
 }
 
 defineExpose({
-  showDialog,
+    showDialog
 })
 </script>
 
 <style lang="scss" scoped>
 .area-box {
-  background-color: rgba(255, 255, 255, 0.7);
+    background-color: rgba(255, 255, 255, 0.7);
 }
 
-.hot-area-img-wrap {
-  background-size: 100%;
+.hot-area-img-wrap{
+    background-size: 100%;
 }
 
 .box1,
 .box2,
 .box3,
 .box4 {
-  width: 10px;
-  height: 10px;
-  background-color: #fff;
-  position: absolute;
-  border-radius: 50%;
-  border: 1px solid #333;
+    width: 10px;
+    height: 10px;
+    background-color: #fff;
+    position: absolute;
+    border-radius: 50%;
+    border: 1px solid #333;
 }
 
 .box1 {
-  top: -5px;
-  left: -5px;
-  cursor: nw-resize;
+    top: -5px;
+    left: -5px;
+    cursor: nw-resize;
 }
 
 .box2 {
-  top: -5px;
-  right: -5px;
-  cursor: ne-resize;
+    top: -5px;
+    right: -5px;
+    cursor: ne-resize;
 }
 
 .box3 {
-  left: -5px;
-  bottom: -5px;
-  cursor: sw-resize;
+    left: -5px;
+    bottom: -5px;
+    cursor: sw-resize;
 }
 
 .box4 {
-  bottom: -5px;
-  right: -5px;
-  cursor: se-resize;
+    bottom: -5px;
+    right: -5px;
+    cursor: se-resize;
 }
 </style>
diff --git a/admin/src/components/icon/index.vue b/admin/src/components/icon/index.vue
index 0b4b61ad..5ff09b5a 100644
--- a/admin/src/components/icon/index.vue
+++ b/admin/src/components/icon/index.vue
@@ -1,55 +1,48 @@
 <template>
-  <el-icon
-    v-if="type == 'element'"
-    :style="style"
-    :class="['icon el-icon', props.class]"
-  >
-    <component :is="name" />
-  </el-icon>
-  <i v-else :class="[type, name, props.class]" :style="style"></i>
+	<el-icon v-if="type=='element'" :style="style" :class="['icon el-icon',props.class]">
+		<component :is="name"/>
+	</el-icon>
+	<i v-else :class="[type,name,props.class]" :style="style"></i>
 </template>
 <script lang="ts" setup>
 import { watch, ref, reactive } from 'vue'
 
 const props = defineProps({
-  name: {
-    type: String,
-    required: true,
-  },
-  color: {
-    type: String,
-    default: 'var(--color)',
-  },
-  class: {
-    type: [String, Object],
-    default: '',
-  },
-  size: {
-    type: String,
-    default: '16px',
-  },
+    name: {
+        type: String,
+        required: true
+    },
+    color: {
+        type: String,
+        default: 'var(--color)'
+    },
+    class: {
+        type: [String, Object],
+        default: ''
+    },
+    size: {
+        type: String,
+        default: '16px'
+    }
 })
 
 const type = ref('')
 const name = ref('')
 
 const style = reactive({
-  color: props.color,
-  fontSize: props.size,
+    color: props.color,
+    fontSize: props.size
 })
 
 const load = () => {
-  const arr = props.name.split(' ')
-  type.value = arr[0]
-  name.value = arr[1]
+    const arr = props.name.split(' ')
+    type.value = arr[0]
+    name.value = arr[1]
 }
 
 load()
 
-watch(
-  () => props.name,
-  () => {
+watch(() => props.name, () => {
     load()
-  }
-)
+})
 </script>
diff --git a/admin/src/components/popover-input/index.vue b/admin/src/components/popover-input/index.vue
index a3c1c44d..066d153a 100644
--- a/admin/src/components/popover-input/index.vue
+++ b/admin/src/components/popover-input/index.vue
@@ -1,63 +1,51 @@
 <template>
-  <el-popover
-    placement="top"
-    trigger="click"
-    :width="prop.width"
-    v-model:visible="visible"
-  >
-    <el-input
-      v-model="value"
-      :placeholder="prop.placeholder"
-      clearable
-      class="mr-[10px]"
-      :maxlength="prop.maxlength"
-      :show-word-limit="true"
-    />
-    <div class="text-right mt-[15px]">
-      <el-button @click="visible = false">{{ t('cancel') }}</el-button>
-      <el-button type="primary" @click="confirm">{{ t('confirm') }}</el-button>
-    </div>
-    <template #reference>
-      <slot></slot>
-    </template>
-  </el-popover>
+    <el-popover placement="top" trigger="click" :width="prop.width" v-model:visible="visible">
+        <el-input v-model="value" :placeholder="prop.placeholder" clearable class="mr-[10px]" :maxlength="prop.maxlength" :show-word-limit="true" />
+        <div class="text-right mt-[15px]">
+            <el-button @click="visible = false">{{ t('cancel') }}</el-button>
+            <el-button type="primary" @click="confirm">{{ t('confirm') }}</el-button>
+        </div>
+        <template #reference>
+            <slot></slot>
+        </template>
+    </el-popover>
 </template>
 
 <script lang="ts" setup>
-import { computed, ref, watch } from 'vue'
+import {computed, ref, watch} from 'vue'
 import { t } from '@/lang'
 import { ElMessage } from 'element-plus'
 
 const prop = defineProps({
-  width: {
-    type: String,
-    default: '350px',
-  },
-  modelValue: {
-    type: String,
-    default: '',
-  },
-  placeholder: {
-    type: String,
-    default: '',
-  },
-  required: {
-    type: Boolean,
-    default: true,
-  },
-  maxlength: {
-    type: Number,
-    default: 10,
-  },
+    width: {
+        type: String,
+        default: '350px'
+    },
+    modelValue: {
+        type: String,
+        default: ''
+    },
+    placeholder: {
+        type: String,
+        default: ''
+    },
+    required: {
+        type: Boolean,
+        default: true
+    },
+    maxlength: {
+        type: Number,
+        default: 10
+    }
 })
 
 const value = computed({
-  get() {
-    return prop.modelValue
-  },
-  set(value) {
-    emit('update:modelValue', value)
-  },
+    get () {
+        return prop.modelValue
+    },
+    set (value) {
+        emit('update:modelValue', value)
+    }
 })
 const visible = ref(false)
 
@@ -70,12 +58,12 @@ const visible = ref(false)
 const emit = defineEmits(['confirm'])
 
 const confirm = () => {
-  if (!/[\S]+/.test(value.value)) {
-    ElMessage.error(prop.placeholder || '不能为空')
-    return
-  }
-  emit('confirm', value.value)
-  visible.value = false
+    if (!/[\S]+/.test(value.value)) {
+        ElMessage.error(prop.placeholder || '不能为空')
+        return
+    }
+    emit('confirm', value.value)
+    visible.value = false
 }
 </script>
 
diff --git a/admin/src/components/range-input/index.vue b/admin/src/components/range-input/index.vue
index f2832e3d..572e06ee 100644
--- a/admin/src/components/range-input/index.vue
+++ b/admin/src/components/range-input/index.vue
@@ -1,24 +1,9 @@
 <template>
-  <div
-    class="el-date-editor el-input__wrapper el-range-editor el-tooltip__trigger el-tooltip__trigger"
-    :class="{ 'is-active': isActive }"
-  >
-    <input
-      class="el-range-input"
-      v-model="props.modelValue[0]"
-      @blur="isActive = false"
-      @focus="isActive = true"
-      :placeholder="props.startPlaceholder"
-    />
-    <span class="el-range-separator">-</span>
-    <input
-      class="el-range-input"
-      v-model="props.modelValue[1]"
-      @blur="isActive = false"
-      @focus="isActive = true"
-      :placeholder="props.endPlaceholder"
-    />
-  </div>
+    <div class="el-date-editor el-input__wrapper el-range-editor el-tooltip__trigger el-tooltip__trigger" :class="{'is-active': isActive}">
+        <input class="el-range-input" v-model="props.modelValue[0]" @blur="isActive = false" @focus="isActive = true" :placeholder="props.startPlaceholder">
+        <span class="el-range-separator">-</span>
+        <input class="el-range-input" v-model="props.modelValue[1]" @blur="isActive = false" @focus="isActive = true" :placeholder="props.endPlaceholder">
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -27,21 +12,24 @@ import { ref } from 'vue'
 const isActive = ref(false)
 
 const props = defineProps({
-  startPlaceholder: {
-    type: String,
-    default: '',
-  },
-  endPlaceholder: {
-    type: String,
-    default: '',
-  },
-  modelValue: {
-    type: Array,
-    default: () => {
-      return ['', '']
+    startPlaceholder: {
+        type: String,
+        default: ''
     },
-  },
+    endPlaceholder: {
+        type: String,
+        default: ''
+    },
+    modelValue: {
+        type: Array,
+        default: () => {
+            return ['', '']
+        }
+    }
 })
+
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+
+</style>
diff --git a/admin/src/components/select-area/index.vue b/admin/src/components/select-area/index.vue
index 4e76cb8f..6dbd7d5c 100644
--- a/admin/src/components/select-area/index.vue
+++ b/admin/src/components/select-area/index.vue
@@ -1,51 +1,18 @@
 <template>
-  <div class="area-component">
-    <!-- 省 -->
-    <el-select
-      :placeholder="t('provincePlaceholder')"
-      v-model="state.province"
-      clearable
-      @change="changeArea('province')"
-    >
-      <el-option
-        v-for="item in state.provinceList"
-        :key="item.id"
-        :label="item.name"
-        :value="item.id"
-      />
-    </el-select>
-    <!-- 市 -->
-    <el-select
-      :placeholder="t('cityPlaceholder')"
-      style="margin: 0 10px"
-      :disabled="!state.province"
-      v-model="state.city"
-      clearable
-      @change="changeArea('city')"
-    >
-      <el-option
-        v-for="item in state.citiesList"
-        :key="item.id"
-        :label="item.name"
-        :value="item.id"
-      />
-    </el-select>
-    <!-- 区 -->
-    <el-select
-      :placeholder="t('districtPlaceholder')"
-      :disabled="!state.province || !state.city"
-      v-model="state.area"
-      clearable
-      @change="changeArea('area')"
-    >
-      <el-option
-        v-for="item in state.areasList"
-        :key="item.id"
-        :label="item.name"
-        :value="item.id"
-      />
-    </el-select>
-  </div>
+    <div class="area-component">
+        <!-- 省 -->
+        <el-select :placeholder="t('provincePlaceholder')" v-model="state.province" clearable @change="changeArea('province')">
+            <el-option v-for="item in state.provinceList" :key="item.id" :label="item.name" :value="item.id"/>
+        </el-select>
+        <!-- 市 -->
+        <el-select :placeholder="t('cityPlaceholder')" style="margin: 0 10px;" :disabled="!state.province" v-model="state.city" clearable @change="changeArea('city')">
+            <el-option v-for="item in state.citiesList" :key="item.id" :label="item.name" :value="item.id"/>
+        </el-select>
+        <!-- 区 -->
+        <el-select :placeholder="t('districtPlaceholder')" :disabled="!state.province || !state.city" v-model="state.area" clearable @change="changeArea('area')">
+            <el-option v-for="item in state.areasList" :key="item.id" :label="item.name" :value="item.id"/>
+        </el-select>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -62,116 +29,107 @@ export interface areaType {
 }
 
 const prop = defineProps({
-  initData: {
-    type: Object,
-    default: {
-      province: '',
-      city: '',
-      area: '',
-    },
-  },
+    initData: {
+        type: Object,
+        default: {
+            province: '',
+            city: '',
+            area: ''
+        }
+    }
 })
 
-const emits = defineEmits<{ (e: 'areaChange', value: any): void }>()
+const emits = defineEmits<{(e: 'areaChange', value: any):void}>()
 
 const state = reactive({
-  // 用于展示的省市区数据
-  provinceList: [] as areaType[],
-  citiesList: [] as areaType[],
-  areasList: [] as areaType[],
-  // 最终选择的省市区
-  province: '',
-  city: '',
-  area: '',
+    // 用于展示的省市区数据
+    provinceList: [] as areaType[],
+    citiesList: [] as areaType[],
+    areasList: [] as areaType[],
+    // 最终选择的省市区
+    province: '',
+    city: '',
+    area: ''
 })
 
 onBeforeMount(async () => {
-  state.provinceList = (await getAreaListByPid(0)).data
+    state.provinceList = (await getAreaListByPid(0)).data
 })
 
-watch(
-  () => prop.initData.province,
-  async (val) => {
+watch(() => prop.initData.province, async (val) => {
     state['province'] = prop.initData['province']
     state['city'] = prop.initData['city']
     state['area'] = prop.initData['area']
     state.citiesList = (await getAreaListByPid(parseInt(state.province))).data
     state.areasList = (await getAreaListByPid(parseInt(state.city))).data
     emitsArea()
-  }
-)
+})
 
-watch(
-  () => state.area,
-  (val) => {
+watch(() => state.area, (val) => {
     if (val) {
-      emitsArea()
+        emitsArea()
     }
-  }
-)
+})
 
-watch(
-  () => state.province,
-  (val) => {
+watch(() => state.province, (val) => {
     if (val) {
-      emitsArea()
+        emitsArea()
     }
-  }
-)
+})
 
-watch(
-  () => state.city,
-  (val) => {
+watch(() => state.city, (val) => {
     if (val) {
-      emitsArea()
+        emitsArea()
     }
-  }
-)
+})
 
 const emitsArea = () => {
-  const paramsData = {
-    province: {} as areaType,
-    city: {} as areaType,
-    area: {} as areaType,
-  }
-  let tmp = state.provinceList.find((item) => item.id === state.province)
-  paramsData.province.name = tmp ? tmp.name : ''
-  paramsData.province.id = tmp ? tmp.id : ''
-  tmp = state.citiesList.find((item) => item.id === state.city) as any
-  paramsData.city.name = tmp ? tmp.name : ''
-  paramsData.city.id = tmp ? tmp.id : ''
-  tmp = state.areasList.find((item) => item.id === state.area) as any
-  paramsData.area.name = tmp ? tmp.name : ''
-  paramsData.area.id = tmp ? tmp.id : ''
-
-  emits('areaChange', paramsData)
+    const paramsData = {
+        province: {} as areaType,
+        city: {} as areaType,
+        area: {} as areaType
+    }
+    let tmp = state.provinceList.find((item) => item.id === state.province)
+    paramsData.province.name = tmp ? tmp.name : ''
+    paramsData.province.id = tmp ? tmp.id : ''
+    tmp = state.citiesList.find((item) => item.id === state.city) as any
+    paramsData.city.name = tmp ? tmp.name : ''
+    paramsData.city.id = tmp ? tmp.id : ''
+    tmp = state.areasList.find((item) => item.id === state.area) as any
+    paramsData.area.name = tmp ? tmp.name : ''
+    paramsData.area.id = tmp ? tmp.id : ''
+
+    emits('areaChange', paramsData)
 }
 
-const changeArea = async (data: any) => {
-  if (data == 'province') {
-    state.city = ''
-    state.area = ''
-    if (!state.province) {
-      emitsArea()
-      return false
+const changeArea = async (data : any) => {
+    if (data == 'province') {
+        state.city = ''
+        state.area = ''
+        if (!state.province) {
+            emitsArea()
+            return false
+        }
+        state.citiesList = (await getAreaListByPid(parseInt(state.province))).data
     }
-    state.citiesList = (await getAreaListByPid(parseInt(state.province))).data
-  }
-  if (data == 'city') {
-    state.area = ''
-    if (!state.city) {
-      emitsArea()
-      return false
+    if (data == 'city') {
+        state.area = ''
+        if (!state.city) {
+            emitsArea()
+            return false
+        }
+        state.areasList = (await getAreaListByPid(parseInt(state.city))).data
     }
-    state.areasList = (await getAreaListByPid(parseInt(state.city))).data
-  }
-  if (data == 'area') {
-    if (!state.area) {
-      emitsArea()
-      return false
+    if (data == 'area') {
+        if (!state.area) {
+            emitsArea()
+            return false
+        }
     }
-  }
 }
+
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+
+</style>
diff --git a/admin/src/components/select-icon/index.vue b/admin/src/components/select-icon/index.vue
index 80b4e4bc..9e522ba8 100644
--- a/admin/src/components/select-icon/index.vue
+++ b/admin/src/components/select-icon/index.vue
@@ -1,87 +1,45 @@
 <template>
-  <div class="flex flex-wrap">
-    <template v-if="limit == 1">
-      <div
-        class="rounded cursor-pointer overflow-hidden relative border border-dashed border-color icon-wrap mr-[10px]"
-        :style="style"
-      >
-        <div class="w-full h-full relative" v-if="icons.data.length">
-          <div class="w-full h-full flex items-center justify-center">
-            <icon :name="icons.data[0]" size="40px"></icon>
-          </div>
-          <div
-            class="absolute z-[1] flex items-center justify-center w-full h-full inset-0 bg-black bg-opacity-60 operation"
-          >
-            <icon
-              name="element Delete"
-              color="#fff"
-              size="18px"
-              @click="removeIcon"
-            />
-          </div>
-        </div>
-        <upload-attachment
-          :limit="limit"
-          type="icon"
-          @confirm="confirmSelect"
-          v-else
-        >
-          <div class="w-full h-full flex items-center justify-center flex-col">
-            <icon
-              name="element Plus"
-              size="20px"
-              color="var(--el-text-color-secondary)"
-            />
-            <div class="leading-none text-xs mt-[10px] text-secondary">
-              {{ iconText || t('upload.selecticon') }}
-            </div>
-          </div>
-        </upload-attachment>
-      </div>
-    </template>
-    <template v-else>
-      <div
-        class="rounded cursor-pointer overflow-hidden relative border border-dashed border-color icon-wrap mr-[10px]"
-        :style="style"
-        v-for="(item, index) in icons.data"
-        :key="index"
-      >
-        <div class="w-full h-full relative">
-          <div class="w-full h-full flex items-center justify-center">
-            <icon :name="item" size="40px"></icon>
-          </div>
-          <div
-            class="absolute z-[1] flex items-center justify-center w-full h-full inset-0 bg-black bg-opacity-60 operation"
-          >
-            <icon
-              name="element Delete"
-              color="#fff"
-              size="18px"
-              @click="removeIcon(index)"
-            />
-          </div>
-        </div>
-      </div>
-      <div
-        class="rounded cursor-pointer overflow-hidden relative border border-dashed border-color"
-        :style="style"
-        v-if="icons.data.length < limit"
-      >
-        <upload-attachment :limit="limit" @confirm="confirmSelect">
-          <div class="w-full h-full flex items-center justify-center flex-col">
-            <icon
-              name="element Plus"
-              size="20px"
-              color="var(--el-text-color-secondary)"
-            />
-            <div class="leading-none text-xs mt-[10px] text-secondary">
-              {{ iconText || t('upload.selecticon') }}
-            </div>
-          </div>
-        </upload-attachment>
-      </div>
-    </template>
-  </div>
+	<div class="flex flex-wrap">
+		<template v-if="limit == 1">
+			<div class="rounded cursor-pointer overflow-hidden relative border border-dashed border-color icon-wrap mr-[10px]" :style="style">
+				<div class="w-full h-full relative" v-if="icons.data.length">
+					<div class="w-full h-full flex items-center justify-center">
+						<icon :name="icons.data[0]" size="40px"></icon>
+					</div>
+					<div class="absolute z-[1] flex items-center justify-center w-full h-full inset-0 bg-black bg-opacity-60 operation">
+						<icon name="element Delete" color="#fff" size="18px" @click="removeIcon"/>
+					</div>
+				</div>
+				<upload-attachment :limit="limit" type="icon" @confirm="confirmSelect" v-else>
+					<div class="w-full h-full flex items-center justify-center flex-col">
+						<icon name="element Plus" size="20px" color="var(--el-text-color-secondary)"/>
+						<div class="leading-none text-xs mt-[10px] text-secondary">{{ iconText || t('upload.selecticon') }}</div>
+					</div>
+				</upload-attachment>
+			</div>
+		</template>
+		<template v-else>
+			<div class="rounded cursor-pointer overflow-hidden relative border border-dashed border-color icon-wrap mr-[10px]" :style="style" v-for="(item, index) in icons.data" :key="index">
+				<div class="w-full h-full relative">
+					<div class="w-full h-full flex items-center justify-center">
+						<icon :name="item" size="40px"></icon>
+					</div>
+					<div class="absolute z-[1] flex items-center justify-center w-full h-full inset-0 bg-black bg-opacity-60 operation">
+						<icon name="element Delete" color="#fff" size="18px" @click="removeIcon(index)"/>
+					</div>
+				</div>
+			</div>
+			<div class="rounded cursor-pointer overflow-hidden relative border border-dashed border-color" :style="style" v-if="icons.data.length < limit">
+				<upload-attachment :limit="limit" @confirm="confirmSelect">
+					<div class="w-full h-full flex items-center justify-center flex-col">
+						<icon name="element Plus" size="20px" color="var(--el-text-color-secondary)"/>
+						<div class="leading-none text-xs mt-[10px] text-secondary">{{ iconText || t('upload.selecticon') }}</div>
+					</div>
+				</upload-attachment>
+			</div>
+		</template>
+	</div>
+
 </template>
 
 <script lang="ts" setup>
@@ -89,80 +47,76 @@ import { computed, reactive, watch, toRaw } from 'vue'
 import { t } from '@/lang'
 
 const prop = defineProps({
-  modelValue: {
-    type: String,
-    default: '',
-  },
-  width: {
-    type: String,
-    default: '100px',
-  },
-  height: {
-    type: String,
-    default: '100px',
-  },
-  iconText: {
-    type: String,
-  },
-  limit: {
-    type: Number,
-    default: 1,
-  },
+    modelValue: {
+        type: String,
+        default: ''
+    },
+    width: {
+        type: String,
+        default: '100px'
+    },
+    height: {
+        type: String,
+        default: '100px'
+    },
+    iconText: {
+        type: String
+    },
+    limit: {
+        type: Number,
+        default: 1
+    }
 })
 
 const emit = defineEmits(['update:modelValue', 'change'])
 
 const value = computed({
-  get() {
-    return prop.modelValue
-  },
-  set(value) {
-    emit('update:modelValue', value)
-  },
+    get () {
+        return prop.modelValue
+    },
+    set (value) {
+        emit('update:modelValue', value)
+    }
 })
 
 const icons: Record<string, any> = reactive({
-  data: [],
+    data: []
 })
 
 const setValue = () => {
-  value.value = toRaw(icons.data).toString()
+    value.value = toRaw(icons.data).toString()
 }
 
-watch(
-  () => value.value,
-  () => {
+watch(() => value.value, () => {
     icons.data = [
-      ...value.value.split(',').filter((item: string) => {
-        return item
-      }),
+        ...value.value.split(',').filter((item: string) => {
+            return item
+        })
     ]
     setValue()
-  },
-  { immediate: true }
-)
+}, { immediate: true })
 
 const style = computed(() => {
-  return {
-    width: prop.width,
-    height: prop.height,
-  }
+    return {
+        width: prop.width,
+        height: prop.height
+    }
 })
 
 /**
  * 选择图标
  */
 const confirmSelect = (data: Record<string, any>) => {
-  if (prop.limit == 1) {
-    icons.data.splice(0, 1)
-    data && icons.data.push(data.url)
-  } else {
-    data.forEach((item: any) => {
-      if (icons.data.length < prop.limit) icons.data.push(item.url)
-    })
-  }
-  setValue()
-  emit('change', value.value)
+    if (prop.limit == 1) {
+        icons.data.splice(0, 1)
+        data && icons.data.push(data.url)
+    } else {
+        data.forEach((item: any) => {
+            if (icons.data.length < prop.limit) icons.data.push(item.url)
+        })
+    }
+    setValue()
+    emit('change', value.value)
 }
 
 /**
@@ -170,21 +124,22 @@ const confirmSelect = (data: Record<string, any>) => {
  * @param index
  */
 const removeIcon = (index: number = 0) => {
-  icons.data.splice(index, 1)
-  setValue()
+    icons.data.splice(index, 1)
+    setValue()
 }
+
 </script>
 
 <style lang="scss" scoped>
-.icon-wrap {
-  .operation {
-    display: none;
-  }
+	.icon-wrap {
+		.operation {
+			display: none;
+		}
 
-  &:hover {
-    .operation {
-      display: flex;
-    }
-  }
-}
+		&:hover {
+			.operation {
+				display: flex;
+			}
+		}
+	}
 </style>
diff --git a/admin/src/components/upload-attachment/attachment.vue b/admin/src/components/upload-attachment/attachment.vue
index 80915a2f..8bbdde59 100644
--- a/admin/src/components/upload-attachment/attachment.vue
+++ b/admin/src/components/upload-attachment/attachment.vue
@@ -1,410 +1,203 @@
 <template>
-  <div
-    class="flex border-t border-b main-wrap border-color w-full"
-    :class="scene == 'select' ? 'h-[40vh]' : 'h-full'"
-  >
-    <!-- 分组 -->
-    <div
-      class="group-wrap w-[180px] p-[15px] h-full border-r border-color flex flex-col"
-    >
-      <el-input
-        v-model="categoryParam.name"
-        class="m-0"
-        :placeholder="t('upload.attachmentCategoryPlaceholder')"
-        clearable
-        prefix-icon="Search"
-        @input="getAttachmentCategoryList()"
-      />
-      <div class="group-list flex-1 my-[10px] h-0">
-        <el-scrollbar>
-          <div
-            class="group-item p-[10px] leading-none text-xs rounded cursor-pointer"
-            :class="{ active: attachmentParam.cate_id == 0 }"
-            @click="attachmentParam.cate_id = 0"
-          >
-            {{ t('selectPlaceholder') }}
-          </div>
-          <div
-            class="group-item px-[10px] text-xs rounded cursor-pointer flex"
-            v-for="(item, index) in attachmentCategory.data"
-            :key="index"
-            :class="{ active: attachmentParam.cate_id == item.id }"
-          >
-            <div
-              class="flex-1 leading-none truncate py-[10px]"
-              @click="attachmentParam.cate_id = item.id"
-            >
-              {{ item.name }}
-            </div>
-            <div
-              class="leading-none operate py-[10px]"
-              v-if="scene == 'attachment' && prop.type != 'icon'"
-            >
-              <!-- 图片操作 -->
-              <el-dropdown :hide-on-click="false" v-if="scene == 'attachment'">
-                <icon
-                  name="element MoreFilled"
-                  class="cursor-pointer ml-[10px]"
-                  size="14px"
-                />
-                {{ item.name }}
-                <template #dropdown>
-                  <el-dropdown-menu>
-                    <el-dropdown-item class="text-center">
-                      <popover-input
-                        :placeholder="t('upload.attachmentCategoryPlaceholder')"
-                        @confirm="updateAttachmentCategory($event, index)"
-                        v-model="item.name"
-                      >
-                        <span>{{ t('edit') }}</span>
-                      </popover-input>
-                    </el-dropdown-item>
-                    <el-dropdown-item @click="deleteAttachmentCategory(index)">
-                      <div class="text-center w-full">{{ t('delete') }}</div>
-                    </el-dropdown-item>
-                  </el-dropdown-menu>
-                </template>
-              </el-dropdown>
-            </div>
-          </div>
-        </el-scrollbar>
-      </div>
-      <!-- 添加分组 -->
-      <popover-input
-        :placeholder="t('upload.attachmentCategoryPlaceholder')"
-        @confirm="addAttachmentCategory"
-        v-model="attachmentCategoryName"
-        v-if="prop.type != 'icon'"
-      >
-        <el-button>{{ t('upload.addAttachmentCategory') }}</el-button>
-      </popover-input>
-    </div>
-
-    <!-- 素材 -->
-    <div
-      class="attachment-list-wrap flex flex-col p-[15px] flex-1 overflow-hidden"
-    >
-      <el-row :gutter="15" class="h-[32px]">
-        <el-col :span="10">
-          <div class="flex">
-            <el-upload
-              v-bind="upload"
-              ref="uploadRef"
-              v-if="prop.type != 'icon'"
-            >
-              <el-button type="primary"
-                >{{ t('upload.upload' + type) }} {{ isOpen }}</el-button
-              >
-            </el-upload>
-            <div v-if="scene == 'attachment' && prop.type != 'icon'">
-              <el-button
-                v-if="operate === false"
-                class="ml-[10px]"
-                type="primary"
-                @click="operate = true"
-                >{{ t('edit') }}</el-button
-              >
-              <el-button
-                v-else
-                class="ml-[10px]"
-                type="primary"
-                @click="operate = false"
-                >{{ t('complete') }}</el-button
-              >
+    <div class="flex border-t border-b main-wrap border-color w-full" :class="scene == 'select' ? 'h-[40vh]' : 'h-full'">
+
+        <!-- 分组 -->
+        <div class="group-wrap w-[180px] p-[15px] h-full border-r border-color flex flex-col">
+
+            <el-input v-model="categoryParam.name" class="m-0" :placeholder="t('upload.attachmentCategoryPlaceholder')" clearable prefix-icon="Search" @input="getAttachmentCategoryList()" />
+            <div class="group-list flex-1 my-[10px] h-0">
+                <el-scrollbar>
+                    <div class="group-item p-[10px] leading-none text-xs rounded cursor-pointer" :class="{ active: attachmentParam.cate_id == 0 }" @click="attachmentParam.cate_id = 0">
+                        {{ t('selectPlaceholder') }}
+                    </div>
+                    <div class="group-item px-[10px] text-xs rounded cursor-pointer flex"
+                        v-for="(item, index) in attachmentCategory.data" :key="index"
+                        :class="{ active: attachmentParam.cate_id == item.id }">
+                        <div class="flex-1 leading-none truncate py-[10px]" @click="attachmentParam.cate_id = item.id">{{ item.name }}</div>
+                        <div class="leading-none operate py-[10px]" v-if="scene == 'attachment' && prop.type != 'icon'">
+                            <!-- 图片操作 -->
+                            <el-dropdown :hide-on-click="false" v-if="scene == 'attachment'">
+                                <icon name="element MoreFilled" class="cursor-pointer ml-[10px]" size="14px" />
+                                {{ item.name }}
+                                <template #dropdown>
+                                    <el-dropdown-menu>
+                                        <el-dropdown-item class="text-center">
+                                            <popover-input :placeholder="t('upload.attachmentCategoryPlaceholder')" @confirm="updateAttachmentCategory($event, index)" v-model="item.name">
+                                                <span>{{ t('edit') }}</span>
+                                            </popover-input>
+                                        </el-dropdown-item>
+                                        <el-dropdown-item @click="deleteAttachmentCategory(index)">
+                                            <div class="text-center w-full">{{ t('delete') }}</div>
+                                        </el-dropdown-item>
+                                    </el-dropdown-menu>
+                                </template>
+                            </el-dropdown>
+                        </div>
+                    </div>
+                </el-scrollbar>
             </div>
-          </div>
-        </el-col>
-        <el-col :span="14" class="text-right">
-          <el-input
-            v-model="attachmentParam.real_name"
-            class="m-0 !w-[200px]"
-            clearable
-            :placeholder="t('upload.placeholder' + type + 'Name')"
-            prefix-icon="Search"
-            @input="getAttachmentList()"
-          />
-        </el-col>
-      </el-row>
-      <div class="flex-1 my-[15px] h-0" v-loading="attachment.loading">
-        <el-scrollbar>
-          <!-- 选择弹出框 -->
-          <div
-            class="flex flex-wrap"
-            v-if="
-              attachment.data.length &&
-              (operate === true || scene != 'attachment')
-            "
-          >
-            <div
-              class="attachment-item mr-[10px]"
-              :class="scene == 'select' ? 'w-[100px]' : 'w-[120px]'"
-              v-for="(item, index) in attachment.data"
-              :key="index"
-            >
-              <div
-                class="attachment-wrap w-full rounded cursor-pointer overflow-hidden relative flex items-center justify-center"
-                :class="scene == 'select' ? 'h-[100px]' : 'h-[120px]'"
-                @click="selectFile(item)"
-              >
-                <el-image
-                  :src="img(item.url)"
-                  fit="contain"
-                  v-if="type == 'image'"
-                />
-                <video :src="img(item.url)" v-else-if="type == 'video'" />
-                <icon :name="item.url" size="24px" v-else-if="type == 'icon'" />
-                <div
-                  class="absolute z-[1] flex items-center justify-center w-full h-full inset-0 bg-black bg-opacity-60"
-                  v-show="selectedFile[item.att_id]"
-                >
-                  <icon name="element Select" color="#fff" size="40px" />
-                  <div
-                    class="file-box-active absolute z-[1] bottom-0 right-0 w-full h-full"
-                  >
-                    <span
-                      class="absolute bottom-[2px] right-[2px] text-white z-[2] leading-none"
-                      >{{ getFileIndex(item.att_id) }}</span
-                    >
-                  </div>
-                </div>
-              </div>
-
-              <div class="flex items-center">
-                <el-tooltip placement="top">
-                  <template #content>{{ item.real_name }}</template>
-                  <div
-                    class="truncate my-[10px] cursor-pointer text-base flex-1 text-center"
-                  >
-                    {{ item.real_name }}
-                  </div>
-                </el-tooltip>
-                <!-- 图片操作 -->
-                <el-dropdown
-                  :hide-on-click="false"
-                  v-if="scene == 'attachment'"
-                  class="attachment-action hidden"
-                >
-                  <icon
-                    name="element MoreFilled"
-                    class="cursor-pointer ml-[8px]"
-                    size="14px"
-                  />
-                  <template #dropdown>
-                    <el-dropdown-menu>
-                      <el-dropdown-item
-                        class="text-center"
-                        @click="previewImage(index)"
-                        v-if="item.att_type == 'image'"
-                      >
-                        <div class="text-center w-full">
-                          {{ t('lookOver') }}
+            <!-- 添加分组 -->
+            <popover-input :placeholder="t('upload.attachmentCategoryPlaceholder')" @confirm="addAttachmentCategory" v-model="attachmentCategoryName" v-if="prop.type != 'icon'">
+                <el-button>{{ t('upload.addAttachmentCategory') }}</el-button>
+            </popover-input>
+        </div>
+
+        <!-- 素材 -->
+        <div class="attachment-list-wrap flex flex-col p-[15px] flex-1 overflow-hidden">
+            <el-row :gutter="15" class="h-[32px]">
+                <el-col :span="10">
+                    <div class="flex">
+                        <el-upload v-bind="upload" ref="uploadRef" v-if="prop.type != 'icon'">
+                            <el-button type="primary">{{ t('upload.upload' + type) }} {{ isOpen }}</el-button>
+                        </el-upload>
+                        <div v-if="scene == 'attachment' && prop.type != 'icon'">
+                            <el-button v-if="operate === false" class="ml-[10px]" type="primary" @click="operate = true">{{ t('edit') }}</el-button>
+                            <el-button v-else class="ml-[10px]" type="primary" @click="operate = false">{{ t('complete') }}</el-button>
                         </div>
-                      </el-dropdown-item>
-                      <el-dropdown-item
-                        class="text-center"
-                        @click="previewVideo(index)"
-                        v-if="item.att_type == 'video'"
-                      >
-                        <div class="text-center w-full">
-                          {{ t('lookOver') }}
+                    </div>
+                </el-col>
+                <el-col :span="14" class="text-right">
+                    <el-input v-model="attachmentParam.real_name" class="m-0 !w-[200px]" clearable :placeholder="t('upload.placeholder' + type + 'Name')" prefix-icon="Search" @input="getAttachmentList()" />
+                </el-col>
+            </el-row>
+            <div class="flex-1 my-[15px] h-0" v-loading="attachment.loading">
+                <el-scrollbar>
+                    <!-- 选择弹出框 -->
+                    <div class="flex flex-wrap" v-if="attachment.data.length && (operate === true || scene != 'attachment')">
+                        <div class="attachment-item mr-[10px]" :class="scene == 'select' ? 'w-[100px]' : 'w-[120px]'" v-for="(item, index) in attachment.data" :key="index">
+                            <div class="attachment-wrap w-full rounded cursor-pointer overflow-hidden relative flex items-center justify-center" :class="scene == 'select' ? 'h-[100px]' : 'h-[120px]'" @click="selectFile(item)">
+
+                                <el-image :src="img(item.url)" fit="contain" v-if="type == 'image'"/>
+                                <video :src="img(item.url)" v-else-if="type == 'video'"/>
+                                <icon :name="item.url" size="24px" v-else-if="type == 'icon'"/>
+                                <div class="absolute z-[1] flex items-center justify-center w-full h-full inset-0 bg-black bg-opacity-60" v-show="selectedFile[item.att_id]">
+                                    <icon name="element Select" color="#fff" size="40px" />
+                                    <div class="file-box-active absolute z-[1] bottom-0 right-0 w-full h-full">
+                                        <span class="absolute bottom-[2px] right-[2px] text-white z-[2] leading-none">{{ getFileIndex(item.att_id) }}</span>
+                                    </div>
+                                </div>
+
+                            </div>
+
+                            <div class="flex items-center">
+                                <el-tooltip placement="top">
+                                    <template #content>{{ item.real_name }}</template>
+                                    <div class="truncate my-[10px] cursor-pointer text-base flex-1 text-center">{{ item.real_name }}</div>
+                                </el-tooltip>
+                                <!-- 图片操作 -->
+                                <el-dropdown :hide-on-click="false" v-if="scene == 'attachment'" class="attachment-action hidden ">
+                                    <icon name="element MoreFilled" class="cursor-pointer ml-[8px]" size="14px" />
+                                    <template #dropdown>
+                                        <el-dropdown-menu>
+                                            <el-dropdown-item class="text-center" @click="previewImage(index)" v-if="item.att_type == 'image'">
+                                                <div class="text-center w-full">{{ t('lookOver') }}</div>
+                                            </el-dropdown-item>
+                                            <el-dropdown-item class="text-center" @click="previewVideo(index)" v-if="item.att_type == 'video'">
+                                                <div class="text-center w-full">{{ t('lookOver') }}</div>
+                                            </el-dropdown-item>
+                                            <el-dropdown-item class="text-center" @click="moveAttachmentEvent(index)">
+                                                <div class="text-center w-full">{{ t('upload.move') }}</div>
+                                            </el-dropdown-item>
+                                            <el-dropdown-item @click="deleteAttachmentEvent(index)">
+                                                <div class="text-center w-full">{{ t('delete') }}</div>
+                                            </el-dropdown-item>
+                                        </el-dropdown-menu>
+                                    </template>
+                                </el-dropdown>
+                            </div>
                         </div>
-                      </el-dropdown-item>
-                      <el-dropdown-item
-                        class="text-center"
-                        @click="moveAttachmentEvent(index)"
-                      >
-                        <div class="text-center w-full">
-                          {{ t('upload.move') }}
+                    </div>
+
+                    <!-- 素材管理 -->
+                    <div class="flex flex-wrap" v-else-if="attachment.data.length && operate === false">
+                        <div class="attachment-item mr-[10px] w-[120px]" v-for="(item, index) in attachment.data" :key="index">
+                            <div class="attachment-wrap w-full rounded cursor-pointer overflow-hidden relative flex items-center justify-center h-[120px]">
+                                <el-image :src="img(item.url)" fit="contain" v-if="type == 'image'" :preview-src-list="item.image_list"/>
+                                <video :src="img(item.url)" v-else-if="type == 'video'" @click="previewVideo(index)"></video>
+                                <icon :name="item.url" size="24px" v-else-if="type == 'icon'"></icon>
+                            </div>
+                            <div class="flex items-center">
+                                <el-tooltip placement="top">
+                                    <template #content>{{ item.real_name }}</template>
+                                    <div class="truncate my-[10px] cursor-pointer text-base flex-1 text-center">{{ item.real_name }}</div>
+                                </el-tooltip>
+                            </div>
                         </div>
-                      </el-dropdown-item>
-                      <el-dropdown-item @click="deleteAttachmentEvent(index)">
-                        <div class="text-center w-full">{{ t('delete') }}</div>
-                      </el-dropdown-item>
-                    </el-dropdown-menu>
-                  </template>
-                </el-dropdown>
-              </div>
-            </div>
-          </div>
-
-          <!-- 素材管理 -->
-          <div
-            class="flex flex-wrap"
-            v-else-if="attachment.data.length && operate === false"
-          >
-            <div
-              class="attachment-item mr-[10px] w-[120px]"
-              v-for="(item, index) in attachment.data"
-              :key="index"
-            >
-              <div
-                class="attachment-wrap w-full rounded cursor-pointer overflow-hidden relative flex items-center justify-center h-[120px]"
-              >
-                <el-image
-                  :src="img(item.url)"
-                  fit="contain"
-                  v-if="type == 'image'"
-                  :preview-src-list="item.image_list"
-                />
-                <video
-                  :src="img(item.url)"
-                  v-else-if="type == 'video'"
-                  @click="previewVideo(index)"
-                ></video>
-                <icon
-                  :name="item.url"
-                  size="24px"
-                  v-else-if="type == 'icon'"
-                ></icon>
-              </div>
-              <div class="flex items-center">
-                <el-tooltip placement="top">
-                  <template #content>{{ item.real_name }}</template>
-                  <div
-                    class="truncate my-[10px] cursor-pointer text-base flex-1 text-center"
-                  >
-                    {{ item.real_name }}
-                  </div>
-                </el-tooltip>
-              </div>
-            </div>
-          </div>
-          <div
-            class="flex absolute top-0 left-0 right-0 bottom-0 items-center justify-center"
-            v-else
-          >
-            <div class="flex flex-col items-center" v-if="!attachment.loading">
-              <img
-                src="@/app/assets/images/no_attachment.png"
-                class="max-w-[160px] max-h-[120px] mb-[15px]"
-              />
-              <span class="text-[var(--el-text-color-secondary)] text-[14px]">{{
-                type == 'icon'
-                  ? t('upload.iconEmpty')
-                  : t('upload.attachmentEmpty')
-              }}</span>
+                    </div>
+                    <div class="flex absolute top-0 left-0 right-0 bottom-0 items-center justify-center" v-else>
+                        <div class="flex flex-col items-center" v-if="!attachment.loading">
+                            <img src="@/app/assets/images/no_attachment.png" class="max-w-[160px] max-h-[120px] mb-[15px]">
+                            <span class="text-[var(--el-text-color-secondary)] text-[14px]">{{type == 'icon' ? t('upload.iconEmpty') : t('upload.attachmentEmpty')}}</span>
+                        </div>
+                    </div>
+                </el-scrollbar>
             </div>
-          </div>
-        </el-scrollbar>
-      </div>
-      <el-row :gutter="20">
-        <el-col :span="8" v-if="scene == 'attachment' && operate === true">
-          <div class="flex items-center">
-            <el-checkbox
-              v-model="selectAll"
-              :label="t('selectAll')"
-              size="large"
-            />
-            <el-button
-              class="ml-[15px]"
-              :disabled="batchOperateDisabled"
-              @click="deleteAttachmentEvent()"
-              >{{ t('delete') }}</el-button
-            >
-            <el-button
-              :disabled="batchOperateDisabled"
-              @click="moveAttachmentEvent()"
-              >{{ t('upload.move') }}</el-button
-            >
-          </div>
-        </el-col>
-        <el-col :span="24">
-          <div class="flex h-full justify-end items-center">
-            <el-pagination
-              v-model:current-page="attachment.page"
-              :small="true"
-              v-model:page-size="attachment.limit"
-              :page-sizes="[10, 20, 30, 40, 60]"
-              layout="total, sizes, prev, pager, next, jumper"
-              :total="attachment.total"
-              @size-change="getAttachmentList()"
-              @current-change="getAttachmentList"
-            />
-          </div>
-        </el-col>
-      </el-row>
-    </div>
+            <el-row :gutter="20">
+                <el-col :span="8" v-if="scene == 'attachment' && operate === true">
+                    <div class="flex items-center">
+                        <el-checkbox v-model="selectAll" :label="t('selectAll')" size="large" />
+                        <el-button class="ml-[15px]" :disabled="batchOperateDisabled" @click="deleteAttachmentEvent()">{{ t('delete') }}</el-button>
+                        <el-button :disabled="batchOperateDisabled" @click="moveAttachmentEvent()">{{ t('upload.move') }}</el-button>
+                    </div>
+                </el-col>
+                <el-col :span="24">
+                    <div class="flex h-full justify-end items-center">
+                        <el-pagination v-model:current-page="attachment.page" :small="true"
+                            v-model:page-size="attachment.limit" :page-sizes="[10, 20, 30, 40, 60]"
+                            layout="total, sizes, prev, pager, next, jumper" :total="attachment.total"
+                            @size-change="getAttachmentList()" @current-change="getAttachmentList" />
+                    </div>
+                </el-col>
+            </el-row>
+        </div>
+
+        <template v-if="scene == 'attachment'">
+            <!-- 移动附件分组 -->
+            <el-dialog v-model="moveAttachmentData.visible" :title="t('upload.moveCategory')" width="350px">
+                <el-form label-width="60px">
+                    <el-form-item :label="t('upload.moveTo')" style="margin-bottom: 0;">
+                        <el-select v-model="moveAttachmentData.cateId" class="input-width">
+                            <el-option :label="item.name" :value="item.id" v-for="(item, index) in attachmentCategory.data" :key="index" />
+                        </el-select>
+                    </el-form-item>
+                </el-form>
+
+                <template #footer>
+                    <span class="dialog-footer">
+                        <el-button @click="moveAttachmentData.visible = false">{{ t('cancel') }}</el-button>
+                        <el-button type="primary" :loading="moveAttachmentData.loading" @click="moveAttachmentData.confirm()">{{ t('confirm') }}</el-button>
+                    </span>
+                </template>
+            </el-dialog>
+
+            <!-- 图片预览 -->
+            <el-image-viewer :url-list="previewImageList" v-if="imageViewer.show" @close="imageViewer.show = false" :initial-index="imageViewer.index" :zoom-rate="1" />
+
+            <!-- 视频预览 -->
+            <el-dialog v-model="videoViewer.visible" width="50%" align-center :destroy-on-close="true" custom-class="video-preview">
+                <video-player :src="videoViewer.src" width="100%" />
+            </el-dialog>
 
-    <template v-if="scene == 'attachment'">
-      <!-- 移动附件分组 -->
-      <el-dialog
-        v-model="moveAttachmentData.visible"
-        :title="t('upload.moveCategory')"
-        width="350px"
-      >
-        <el-form label-width="60px">
-          <el-form-item :label="t('upload.moveTo')" style="margin-bottom: 0">
-            <el-select v-model="moveAttachmentData.cateId" class="input-width">
-              <el-option
-                :label="item.name"
-                :value="item.id"
-                v-for="(item, index) in attachmentCategory.data"
-                :key="index"
-              />
-            </el-select>
-          </el-form-item>
-        </el-form>
-
-        <template #footer>
-          <span class="dialog-footer">
-            <el-button @click="moveAttachmentData.visible = false">{{
-              t('cancel')
-            }}</el-button>
-            <el-button
-              type="primary"
-              :loading="moveAttachmentData.loading"
-              @click="moveAttachmentData.confirm()"
-              >{{ t('confirm') }}</el-button
-            >
-          </span>
         </template>
-      </el-dialog>
-
-      <!-- 图片预览 -->
-      <el-image-viewer
-        :url-list="previewImageList"
-        v-if="imageViewer.show"
-        @close="imageViewer.show = false"
-        :initial-index="imageViewer.index"
-        :zoom-rate="1"
-      />
-
-      <!-- 视频预览 -->
-      <el-dialog
-        v-model="videoViewer.visible"
-        width="50%"
-        align-center
-        :destroy-on-close="true"
-        custom-class="video-preview"
-      >
-        <video-player :src="videoViewer.src" width="100%" />
-      </el-dialog>
-    </template>
-  </div>
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { ref, reactive, watch, computed, toRaw } from 'vue'
 import { t } from '@/lang'
 import {
-  getAttachmentCategoryList as attachmentCategoryList,
-  getAttachmentList as attachmentList,
-  addAttachmentCategory as addCategory,
-  editAttachmentCategory as updateCategory,
-  deleteAttachmentCategory as deleteCategory,
-  deleteAttachment,
-  moveAttachment,
-  getIconCategoryList,
-  getIconList,
+    getAttachmentCategoryList as attachmentCategoryList,
+    getAttachmentList as attachmentList,
+    addAttachmentCategory as addCategory,
+    editAttachmentCategory as updateCategory,
+    deleteAttachmentCategory as deleteCategory,
+    deleteAttachment,
+    moveAttachment,
+    getIconCategoryList,
+    getIconList
 } from '@/app/api/sys'
 import { debounce, img, getToken } from '@/utils/common'
-import {
-  ElMessage,
-  UploadFile,
-  UploadFiles,
-  ElMessageBox,
-  MessageParams,
-} from 'element-plus'
+import { ElMessage, UploadFile, UploadFiles, ElMessageBox, MessageParams } from 'element-plus'
 import storage from '@/utils/storage'
 
 const attachmentCategoryName = ref('')
@@ -413,74 +206,73 @@ const operate = ref(false)
 const repeat = ref(false)
 
 const prop = defineProps({
-  // 选择数量限制
-  limit: {
-    type: Number,
-    default: 1,
-  },
-  type: {
-    type: String,
-    default: 'image',
-  },
-  // 场景
-  scene: {
-    type: String,
-    default: 'select', // select 选择图片 attachment 素材中心
-  },
+    // 选择数量限制
+    limit: {
+        type: Number,
+        default: 1
+    },
+    type: {
+        type: String,
+        default: 'image'
+    },
+    // 场景
+    scene: {
+        type: String,
+        default: 'select' // select 选择图片 attachment 素材中心
+    }
 })
 
 // 选中的文件
 const selectedFile: Record<string, any> = reactive({})
 
-const selectedFileIndex: any = reactive([])
+const selectedFileIndex:any = reactive([])
 
 const attachmentCategory: Record<string, any> = reactive({
-  data: [],
+    data: []
 })
 
 const attachment: Record<string, any> = reactive({
-  loading: true,
-  page: 1,
-  total: 0,
-  limit: prop.scene == 'select' ? 10 : 20,
-  data: [],
+    loading: true,
+    page: 1,
+    total: 0,
+    limit: prop.scene == 'select' ? 10 : 20,
+    data: []
 })
 
 if (prop.scene == 'select') {
-  attachment.limit = 10
-  if (prop.type == 'icon') {
-    attachment.limit = 20
-  }
+    attachment.limit = 10
+    if (prop.type == 'icon') {
+        attachment.limit = 20
+    }
 } else {
-  attachment.limit = 20
-  if (prop.type == 'icon') {
-    attachment.limit = 30
-  }
+    attachment.limit = 20
+    if (prop.type == 'icon') {
+        attachment.limit = 30
+    }
 }
 
 const categoryParam = reactive({
-  name: '',
+    name: ''
 })
 
 const attachmentParam = reactive({
-  real_name: '',
-  cate_id: 0,
+    real_name: '',
+    cate_id: 0
 })
 
 /**
  * 查询分组
  */
 const getAttachmentCategoryList = debounce(() => {
-  const getFn =
-    prop.type == 'icon' ? getIconCategoryList : attachmentCategoryList
-  getFn({
-    type: prop.type,
-    ...categoryParam,
-  })
-    .then((res) => {
-      attachmentCategory.data = res.data
+    const getFn = prop.type == 'icon' ? getIconCategoryList : attachmentCategoryList
+    getFn({
+        type: prop.type,
+        ...categoryParam
+    }).then(res => {
+        attachmentCategory.data = res.data
+    }).catch(() => {
+
     })
-    .catch(() => {})
 })
 
 getAttachmentCategoryList()
@@ -489,61 +281,54 @@ getAttachmentCategoryList()
  * 查询图片
  */
 const getAttachmentList = debounce((page: number = 1) => {
-  const getFn = prop.type == 'icon' ? getIconList : attachmentList
-
-  attachment.loading = true
-  attachment.page = page
-  getFn({
-    page: attachment.page,
-    limit: attachment.limit,
-    att_type: prop.type,
-    ...attachmentParam,
-  })
-    .then((res) => {
-      attachment.data = res.data.data
-      attachment.total = res.data.total
-      attachment.loading = false
-      prop.scene == 'attachment' && clearSelected()
-
-      if (prop.type != 'icon') {
-        for (let i = 0; i < attachment.data.length; i++) {
-          attachment.data[i]['image_list'] = []
-          attachment.data[i]['image_list'].push(img(res.data.data[i]['url']))
+    const getFn = prop.type == 'icon' ? getIconList : attachmentList
+
+    attachment.loading = true
+    attachment.page = page
+    getFn({
+        page: attachment.page,
+        limit: attachment.limit,
+        att_type: prop.type,
+        ...attachmentParam
+    }).then(res => {
+        attachment.data = res.data.data
+        attachment.total = res.data.total
+        attachment.loading = false
+        prop.scene == 'attachment' && clearSelected()
+
+        if (prop.type != 'icon') {
+            for (let i = 0; i < attachment.data.length; i++) {
+                attachment.data[i]['image_list'] = []
+                attachment.data[i]['image_list'].push(img(res.data.data[i]['url']))
+            }
         }
-      }
-    })
-    .catch(() => {
-      attachment.loading = false
+    }).catch(() => {
+        attachment.loading = false
     })
 })
 
 getAttachmentList()
 
-watch(
-  () => attachmentParam.cate_id,
-  () => {
+watch(() => attachmentParam.cate_id, () => {
     getAttachmentList()
-  }
-)
+})
 
 /**
  * 添加分组
  */
 const addAttachmentCategory = (name: string) => {
-  if (repeat.value) return
-  repeat.value = true
-
-  addCategory({
-    type: prop.type,
-    name,
-  })
-    .then((res) => {
-      repeat.value = false
-      attachmentCategoryName.value = ''
-      getAttachmentCategoryList(1)
-    })
-    .catch(() => {
-      repeat.value = false
+    if (repeat.value) return
+    repeat.value = true
+
+    addCategory({
+        type: prop.type,
+        name
+    }).then(res => {
+        repeat.value = false
+        attachmentCategoryName.value = ''
+        getAttachmentCategoryList(1)
+    }).catch(() => {
+        repeat.value = false
     })
 }
 
@@ -553,18 +338,16 @@ const addAttachmentCategory = (name: string) => {
  * @param index
  */
 const updateAttachmentCategory = (name: string, index: number) => {
-  if (repeat.value) return
-  repeat.value = true
-  updateCategory({
-    id: attachmentCategory.data[index].id,
-    name,
-  })
-    .then((res) => {
-      repeat.value = false
-      attachmentCategory.data[index].name = name
-    })
-    .catch(() => {
-      repeat.value = false
+    if (repeat.value) return
+    repeat.value = true
+    updateCategory({
+        id: attachmentCategory.data[index].id,
+        name
+    }).then(res => {
+        repeat.value = false
+        attachmentCategory.data[index].name = name
+    }).catch(() => {
+        repeat.value = false
     })
 }
 
@@ -572,136 +355,132 @@ const updateAttachmentCategory = (name: string, index: number) => {
  * 删除分组
  */
 const deleteAttachmentCategory = (index: number) => {
-  if (repeat.value) return
-  repeat.value = true
-  ElMessageBox.confirm(t('upload.deleteCategoryTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    deleteCategory(attachmentCategory.data[index].id)
-      .then(() => {
-        attachmentCategory.data.splice(index, 1)
-        repeat.value = false
-      })
-      .catch(() => {
-        repeat.value = false
-      })
-  })
+    if (repeat.value) return
+    repeat.value = true
+    ElMessageBox.confirm(t('upload.deleteCategoryTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        deleteCategory(attachmentCategory.data[index].id).then(() => {
+            attachmentCategory.data.splice(index, 1)
+            repeat.value = false
+        }).catch(() => {
+            repeat.value = false
+        })
+    })
 }
 
 const uploadRef = ref<Record<string, any> | null>(null)
 const time = ref<any>(null)
 // 上传文件
 const upload = computed(() => {
-  const headers: Record<string, any> = {}
-  headers[import.meta.env.VITE_REQUEST_HEADER_TOKEN_KEY] = getToken()
-
-  return {
-    action: `${import.meta.env.VITE_APP_BASE_URL}/sys/${prop.type}`,
-    multiple: true,
-    data: {
-      cate_id: attachmentParam.cate_id,
-    },
-    headers,
-    onSuccess: (
-      response: any,
-      uploadFile: UploadFile,
-      uploadFiles: UploadFiles
-    ) => {
-      if (response.code >= 1) {
-        getAttachmentList()
-        uploadRef.value?.handleRemove(uploadFile)
-      } else {
-        if (time.value == null) {
-          time.value = setTimeout(() => {
-            uploadFile.status = 'fail'
-            showElMessage({ message: response.msg, type: 'error' })
-            clearTimeout(time.value)
-            time.value = null
-          }, 500)
-        } else {
-          clearTimeout(time.value)
-          time.value = null
+    const headers: Record<string, any> = {}
+    headers[import.meta.env.VITE_REQUEST_HEADER_TOKEN_KEY] = getToken()
+
+    return {
+        action: `${import.meta.env.VITE_APP_BASE_URL}/sys/${prop.type}`,
+        multiple: true,
+        data: {
+            cate_id: attachmentParam.cate_id
+        },
+        headers,
+        onSuccess: (response: any, uploadFile: UploadFile, uploadFiles: UploadFiles) => {
+            if (response.code >= 1) {
+                getAttachmentList()
+                uploadRef.value?.handleRemove(uploadFile)
+            } else {
+                if(time.value==null) {
+                    time.value = setTimeout(() => {
+                        uploadFile.status = 'fail'
+                        showElMessage({ message: response.msg, type: 'error' })
+                        clearTimeout(time.value)
+                        time.value=null
+                    },500)
+
+                }else{
+                    clearTimeout(time.value)
+                    time.value=null
+                }
+            }
         }
-      }
-    },
-  }
+    }
 })
 
 const messageCache = new Map()
 
 const showElMessage = (options: MessageParams) => {
-  const cacheKey = options.message
-  const cachedMessage = messageCache.get(cacheKey)
-
-  if (!cachedMessage || Date.now() - cachedMessage.timestamp > 5000) {
-    // 5秒内重复内容不再弹出，可自定义过期时间
-    messageCache.set(cacheKey, { timestamp: Date.now() })
-    ElMessage(options)
-  }
+    const cacheKey = options.message
+    const cachedMessage = messageCache.get(cacheKey)
+
+    if (!cachedMessage || Date.now() - cachedMessage.timestamp > 5000) { // 5秒内重复内容不再弹出，可自定义过期时间
+        messageCache.set(cacheKey, { timestamp: Date.now() })
+        ElMessage(options)
+    }
 }
 
 // 全选
 const selectAll = ref(false)
 watch(selectAll, () => {
-  if (selectAll.value) {
-    const keys = Object.keys(toRaw(selectedFile))
-    attachment.data.forEach((item: Record<string, any>) => {
-      if (!keys.includes(item.att_id)) {
-        selectedFile[item.att_id] = toRaw(item)
-        selectedFileIndex.push(item.att_id)
-      }
-    })
-  } else {
-    clearSelected()
-  }
+    if (selectAll.value) {
+        const keys = Object.keys(toRaw(selectedFile))
+        attachment.data.forEach((item: Record<string, any>) => {
+            if (!keys.includes(item.att_id)) {
+                selectedFile[item.att_id] = toRaw(item)
+                selectedFileIndex.push(item.att_id)
+            }
+        })
+    } else {
+        clearSelected()
+    }
 })
 
 /**
  * 清空选中
  */
 const clearSelected = () => {
-  const keys = Object.keys(toRaw(selectedFile))
-  if (keys.length) {
-    keys.forEach((key) => {
-      delete selectedFile[key]
-      selectedFileIndex.splice(selectedFileIndex.indexOf(key), 1)
-    })
-    selectAll.value = false
-  }
+    const keys = Object.keys(toRaw(selectedFile))
+    if (keys.length) {
+        keys.forEach((key) => {
+            delete selectedFile[key]
+            selectedFileIndex.splice(selectedFileIndex.indexOf(key), 1)
+        })
+        selectAll.value = false
+    }
 }
 
 /**
  * 选择文件
  */
 const selectFile = (data: any) => {
-  if (selectedFile[data.att_id]) {
-    delete selectedFile[data.att_id]
-    selectedFileIndex.splice(selectedFileIndex.indexOf(data.att_id), 1)
-  } else if (prop.scene == 'select') {
-    const keys = Object.keys(toRaw(selectedFile))
-    const length = keys.length
-    if (prop.limit == 1 && length == prop.limit) {
-      delete selectedFile[keys[0]]
-      selectedFileIndex.splice(selectedFileIndex.indexOf(keys[0]), 1)
-    } else if (prop.limit && length >= prop.limit) {
-      ElMessage.info(t('upload.triggerUpperLimit'))
-      return
+    if (selectedFile[data.att_id]) {
+        delete selectedFile[data.att_id]
+        selectedFileIndex.splice(selectedFileIndex.indexOf(data.att_id),1);
+    } else if (prop.scene == 'select') {
+        const keys = Object.keys(toRaw(selectedFile))
+        const length = keys.length
+        if (prop.limit == 1 && length == prop.limit) {
+            delete selectedFile[keys[0]]
+            selectedFileIndex.splice(selectedFileIndex.indexOf(keys[0]),1);
+        } else if (prop.limit && length >= prop.limit) {
+            ElMessage.info(t('upload.triggerUpperLimit'))
+            return
+        }
+        selectedFile[data.att_id] = toRaw(data)
+        selectedFileIndex.push(data.att_id);
+    } else {
+        selectedFile[data.att_id] = toRaw(data)
+        selectedFileIndex.push(data.att_id);
     }
-    selectedFile[data.att_id] = toRaw(data)
-    selectedFileIndex.push(data.att_id)
-  } else {
-    selectedFile[data.att_id] = toRaw(data)
-    selectedFileIndex.push(data.att_id)
-  }
 }
 
 // 获取当前选中文件的下标
-const getFileIndex = (att_id: any) => {
-  let index = selectedFileIndex.indexOf(att_id)
-  if (index == -1) return 0
-  return index + 1
+const getFileIndex = (att_id:any)=>{
+    let index = selectedFileIndex.indexOf(att_id);
+    if(index == -1) return 0;
+    return index + 1;
 }
 
 /**
@@ -709,175 +488,167 @@ const getFileIndex = (att_id: any) => {
  * @param index
  */
 const deleteAttachmentEvent = (index: number | null = null) => {
-  const ids =
-    index === null
-      ? Object.keys(toRaw(selectedFile))
-      : [attachment.data[index].att_id]
-
-  ElMessageBox.confirm(t('upload.deleteAttachmentTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    deleteAttachment({ att_ids: ids })
-      .then(() => {
-        getAttachmentList()
-      })
-      .catch(() => {})
-  })
+    const ids = index === null ? Object.keys(toRaw(selectedFile)) : [attachment.data[index].att_id]
+
+    ElMessageBox.confirm(t('upload.deleteAttachmentTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        deleteAttachment({ att_ids: ids }).then(() => {
+            getAttachmentList()
+        }).catch(() => {
+        })
+    })
 }
 
 /**
  * 移动附件
  */
 const moveAttachmentData: Record<string, any> = reactive({
-  cateId: '',
-  loading: false,
-  visible: false,
+    cateId: '',
+    loading: false,
+    visible: false
 })
 
 const moveAttachmentEvent = (index: number | null = null) => {
-  const ids =
-    index === null
-      ? Object.keys(toRaw(selectedFile))
-      : [attachment.data[index].att_id]
-  moveAttachmentData.visible = true
-  moveAttachmentData.cateId = attachmentCategory.data[0].id
-
-  moveAttachmentData.confirm = () => {
-    moveAttachmentData.loading = true
-    moveAttachment({ cate_id: moveAttachmentData.cateId, att_ids: ids })
-      .then(() => {
-        moveAttachmentData.visible = false
-        moveAttachmentData.loading = false
-        getAttachmentList()
-      })
-      .catch(() => {
-        moveAttachmentData.loading = false
-      })
-  }
+    const ids = index === null ? Object.keys(toRaw(selectedFile)) : [attachment.data[index].att_id]
+    moveAttachmentData.visible = true
+    moveAttachmentData.cateId = attachmentCategory.data[0].id
+
+    moveAttachmentData.confirm = () => {
+        moveAttachmentData.loading = true
+        moveAttachment({ cate_id: moveAttachmentData.cateId, att_ids: ids }).then(() => {
+            moveAttachmentData.visible = false
+            moveAttachmentData.loading = false
+            getAttachmentList()
+        }).catch(() => {
+            moveAttachmentData.loading = false
+        })
+    }
 }
 
 // 批量操作是否可操作
 const batchOperateDisabled = ref(true)
 watch(selectedFile, () => {
-  batchOperateDisabled.value = Object.keys(toRaw(selectedFile)).length == 0
+    batchOperateDisabled.value = Object.keys(toRaw(selectedFile)).length == 0
 })
 
 /**
  * 查看图片
  */
 const imageViewer = reactive({
-  show: false,
-  index: 0,
+    show: false,
+    index: 0
 })
 
 const previewImage = (index: number) => {
-  imageViewer.show = true
-  imageViewer.index = index
+    imageViewer.show = true
+    imageViewer.index = index
 }
 const previewImageList = computed(() => {
-  return toRaw(attachment.data).map((item: Record<string, any>) => {
-    return img(item.url)
-  })
+    return toRaw(attachment.data).map((item: Record<string, any>) => {
+        return img(item.url)
+    })
 })
 
 /**
  * 视频预览
  */
 const videoViewer = reactive({
-  visible: false,
-  src: '',
+    visible: false,
+    src: ''
 })
 
 const previewVideo = (index: number) => {
-  videoViewer.visible = true
-  videoViewer.src = img(attachment.data[index].url)
+    videoViewer.visible = true
+    videoViewer.src = img(attachment.data[index].url)
 }
 
 defineExpose({
-  selectedFile,
-  selectedFileIndex,
+    selectedFile,
+    selectedFileIndex
 })
 </script>
 
 <style lang="scss" scoped>
 .group-list {
-  .group-item {
-    height: 32px;
-    margin-top: 3px;
+    .group-item {
+        height: 32px;
+        margin-top: 3px;
 
-    .operate {
-      display: none;
-    }
+        .operate {
+            display: none;
+        }
 
-    &.active {
-      background-color: var(--el-color-primary-light-9);
-      color: var(--el-color-primary);
-    }
+        &.active {
+            background-color: var(--el-color-primary-light-9);
+            color: var(--el-color-primary);
+        }
 
-    &:hover {
-      background-color: var(--el-color-primary-light-9);
+        &:hover {
+            background-color: var(--el-color-primary-light-9);
 
-      .operate {
-        display: block;
-      }
+            .operate {
+                display: block;
+            }
+        }
     }
-  }
 }
 
 .attachment-item:hover {
-  .attachment-action {
-    display: block;
-  }
+    .attachment-action {
+        display: block;
+    }
 }
 
 .attachment-list-wrap {
-  .attachment-wrap {
-    background: var(--el-border-color-extra-light);
-  }
+    .attachment-wrap {
+        background: var(--el-border-color-extra-light);
+    }
 }
 .file-box-active {
-  &:after {
-    content: '';
-    display: block;
-    position: absolute;
-    border: 15px solid;
-    border-bottom-color: var(--el-color-primary);
-    border-right-color: var(--el-color-primary);
-    border-top-color: transparent;
-    border-left-color: transparent;
-    bottom: 0;
-    right: 0;
-  }
-  span {
-    font-style: normal;
-  }
+    &:after {
+        content: '';
+        display: block;
+        position: absolute;
+        border: 15px solid;
+        border-bottom-color: var(--el-color-primary);
+        border-right-color: var(--el-color-primary);
+        border-top-color: transparent;
+        border-left-color: transparent;
+        bottom: 0;
+        right: 0;
+    }
+    span{
+        font-style: normal;
+    }
 }
 </style>
 <style lang="scss">
-.video-preview {
-  background: none !important;
-  box-shadow: none !important;
-
-  .el-dialog__headerbtn .el-dialog__close {
-    border-radius: 50%;
-    width: 34px;
-    height: 34px;
-    font-size: 24px;
-    color: #fff;
-    background-color: var(--el-text-color-regular);
-    border-color: #fff;
-  }
+    .video-preview {
+    background: none !important;
+    box-shadow: none !important;
+
+    .el-dialog__headerbtn .el-dialog__close {
+        border-radius: 50%;
+        width: 34px;
+        height: 34px;
+        font-size: 24px;
+        color: #fff;
+        background-color: var(--el-text-color-regular);
+        border-color: #fff;
+    }
 }
 
 .el-upload-list {
-  position: absolute !important;
-  z-index: 10;
+    position: absolute !important;
+    z-index: 10;
 
-  .el-upload-list__item {
-    background: #fff !important;
-    box-shadow: var(--el-box-shadow-light);
-  }
-}
-</style>
+    .el-upload-list__item {
+        background: #fff !important;
+        box-shadow: var(--el-box-shadow-light);
+    }
+}</style>
diff --git a/admin/src/components/upload-attachment/index.vue b/admin/src/components/upload-attachment/index.vue
index 0060d7b7..55b57107 100644
--- a/admin/src/components/upload-attachment/index.vue
+++ b/admin/src/components/upload-attachment/index.vue
@@ -1,25 +1,18 @@
 <template>
-  <span @click="openDialog" class="cursor-pointer">
-    <slot></slot>
-  </span>
-  <el-dialog
-    v-model="showDialog"
-    :title="t('upload.select' + type)"
-    width="60%"
-    class="attachment-dialog"
-    :destroy-on-close="true"
-  >
-    <attachment :limit="limit" :type="type" ref="attachmentRef" />
+    <span @click="openDialog" class="cursor-pointer">
+        <slot></slot>
+    </span>
+    <el-dialog v-model="showDialog" :title="t('upload.select' + type)" width="60%" class="attachment-dialog" :destroy-on-close="true">
 
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button type="primary" @click="confirm">{{
-          t('confirm')
-        }}</el-button>
-      </span>
-    </template>
-  </el-dialog>
+        <attachment :limit="limit" :type="type" ref="attachmentRef" />
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" @click="confirm">{{ t('confirm') }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -29,22 +22,22 @@ import { t } from '@/lang'
 import attachment from './attachment.vue'
 
 const prop = defineProps({
-  // 选择数量限制
-  limit: {
-    type: Number,
-    default: 1,
-  },
-  type: {
-    type: String,
-    default: 'image',
-  },
+    // 选择数量限制
+    limit: {
+        type: Number,
+        default: 1
+    },
+    type: {
+        type: String,
+        default: 'image'
+    }
 })
 
 const showDialog = ref(false)
 const attachmentRef: Record<string, any> | null = ref(null)
 
 const openDialog = () => {
-  showDialog.value = true
+    showDialog.value = true
 }
 
 const emit = defineEmits(['confirm'])
@@ -53,42 +46,42 @@ const emit = defineEmits(['confirm'])
  * 确认选择
  */
 const confirm = () => {
-  showDialog.value = false
-
-  let filesObj = attachmentRef?.value.selectedFile || {}
-  let filesIndexObj = attachmentRef?.value.selectedFileIndex || {}
-  // 整理图片顺序
-  let arr = []
-  Object.values(filesIndexObj).forEach((item, index) => {
-    for (let key in filesObj) {
-      if (item == key) {
-        arr.push(deepClone(filesObj[key]))
-      }
-    }
-  })
+    showDialog.value = false
 
-  emit('confirm', prop.limit == 1 ? (arr[0] ?? null) : arr)
+    let filesObj = attachmentRef?.value.selectedFile || {};
+    let filesIndexObj = attachmentRef?.value.selectedFileIndex || {};
+    // 整理图片顺序
+    let arr = [];
+    Object.values(filesIndexObj).forEach((item,index)=>{
+        for(let key in filesObj){
+            if(item == key){
+                arr.push(deepClone(filesObj[key]))
+            }
+        }
+    })
+    
+    emit('confirm', prop.limit == 1 ? arr[0] ?? null : arr)
 }
 
 defineExpose({
-  showDialog,
+    showDialog
 })
 </script>
 
 <style lang="scss">
 .attachment-dialog {
-  .el-dialog__body {
-    padding: 0 !important;
-  }
+    .el-dialog__body {
+        padding: 0 !important;
+    }
 
-  .el-upload-list {
-    position: absolute;
-    z-index: 5;
-  }
+    .el-upload-list {
+        position: absolute;
+        z-index: 5;
+    }
 
-  .el-upload-list__item {
-    background: var(--el-dialog-bg-color);
-    box-shadow: var(--el-dialog-box-shadow);
-  }
+    .el-upload-list__item {
+        background: var(--el-dialog-bg-color);
+        box-shadow: var(--el-dialog-box-shadow);
+    }
 }
 </style>
diff --git a/admin/src/components/upload-file/index.vue b/admin/src/components/upload-file/index.vue
index 5b323794..c05190cf 100644
--- a/admin/src/components/upload-file/index.vue
+++ b/admin/src/components/upload-file/index.vue
@@ -1,11 +1,11 @@
 <template>
-  <el-upload v-bind="upload" class="w-full upload-file">
-    <slot>
-      <el-input v-model="value" class="w-full" :readonly="true" :title="value">
-        <template #append>{{ t('upload.root') }}</template>
-      </el-input>
-    </slot>
-  </el-upload>
+    <el-upload v-bind="upload" class="w-full upload-file">
+        <slot>
+            <el-input v-model="value" class="w-full" :readonly="true" :title="value">
+                <template #append>{{ t('upload.root') }}</template>
+            </el-input>
+        </slot>
+    </el-upload>
 </template>
 
 <script lang="ts" setup>
@@ -16,46 +16,47 @@ import { UploadFile, ElMessage } from 'element-plus'
 import storage from '@/utils/storage'
 
 const prop = defineProps({
-  modelValue: {
-    type: String,
-    default: '',
-  },
-  api: {
-    type: String,
-    default: 'sys/document/document',
-  },
+    modelValue: {
+        type: String,
+        default: ''
+    },
+    api: {
+        type: String,
+        default: 'sys/document/document'
+    }
 })
 
 const emit = defineEmits(['update:modelValue'])
 
 const value = computed({
-  get() {
-    return prop.modelValue
-  },
-  set(value) {
-    emit('update:modelValue', value)
-  },
+    get () {
+        return prop.modelValue
+    },
+    set (value) {
+        emit('update:modelValue', value)
+    }
 })
 
 const upload: Record<string, any> = {
-  action: `${import.meta.env.VITE_APP_BASE_URL}/${prop.api}`,
-  showFileList: false,
-  headers: {},
-  accept: '.doc,.docx,.xml,.txt,.pem,.zip,.rar,.7z,.crt,.key,.xls,.xlsx',
-  onSuccess: (response: any, uploadFile: UploadFile) => {
-    if (response.code != undefined && response.code != 1) {
-      ElMessage({ message: response.msg, type: 'error' })
-      return
+    action: `${import.meta.env.VITE_APP_BASE_URL}/${prop.api}`,
+    showFileList: false,
+    headers: {},
+    accept: '.doc,.docx,.xml,.txt,.pem,.zip,.rar,.7z,.crt,.key,.xls,.xlsx',
+    onSuccess: (response: any, uploadFile: UploadFile) => {
+        if (response.code != undefined && response.code != 1) {
+            ElMessage({ message: response.msg, type: 'error' })
+            return
+        }
+        value.value = response.data.url
+        ElMessage({ message: t('upload.success'), type: 'success' })
     }
-    value.value = response.data.url
-    ElMessage({ message: t('upload.success'), type: 'success' })
-  },
 }
 upload.headers[import.meta.env.VITE_REQUEST_HEADER_TOKEN_KEY] = getToken()
+
 </script>
 
 <style lang="scss">
 .upload-file .el-upload {
-  width: 100%;
+    width: 100%;
 }
 </style>
diff --git a/admin/src/components/upload-image/index.vue b/admin/src/components/upload-image/index.vue
index 1896ee97..94d50ce5 100644
--- a/admin/src/components/upload-image/index.vue
+++ b/admin/src/components/upload-image/index.vue
@@ -1,119 +1,50 @@
 <template>
-  <div class="flex flex-wrap">
-    <template v-if="limit == 1">
-      <div
-        class="rounded cursor-pointer overflow-hidden relative border border-solid border-color image-wrap mr-[10px]"
-        :class="{ 'rounded-full': type == 'avatar' }"
-        :style="style"
-      >
-        <div class="w-full h-full relative" v-if="images.data.length">
-          <div class="w-full h-full flex items-center justify-center">
-            <el-image
-              class="w-full h-full"
-              :src="
-                images.data[0].indexOf('data:image') != -1
-                  ? images.data[0]
-                  : img(images.data[0])
-              "
-              :fit="imageFit"
-            ></el-image>
-          </div>
-          <div
-            class="absolute z-[1] flex items-center justify-center w-full h-full inset-0 bg-black bg-opacity-60 operation"
-          >
-            <icon
-              name="element ZoomIn"
-              color="#fff"
-              size="18px"
-              class="mr-[10px]"
-              @click="previewImage()"
-            />
-            <icon
-              name="element Delete"
-              color="#fff"
-              size="18px"
-              @click.stop="removeImage"
-            />
-          </div>
-        </div>
-        <upload-attachment :limit="limit" @confirm="confirmSelect" v-else>
-          <div
-            class="w-full h-full flex items-center justify-center flex-col content-wrap"
-          >
-            <icon
-              name="element Plus"
-              size="20px"
-              color="var(--el-text-color-secondary)"
-            />
-            <div class="leading-none text-xs mt-[10px] text-secondary">
-              {{ imageText || t('upload.root') }}
+    <div class="flex flex-wrap">
+        <template v-if="limit == 1">
+            <div class="rounded cursor-pointer overflow-hidden relative border border-solid border-color image-wrap mr-[10px]" :class="{'rounded-full': type=='avatar'}" :style="style">
+                <div class="w-full h-full relative" v-if="images.data.length">
+                    <div class="w-full h-full flex items-center justify-center">
+                        <el-image class="w-full h-full" :src="images.data[0].indexOf('data:image') != -1 ? images.data[0] : img(images.data[0])" :fit="imageFit"></el-image>
+                    </div>
+                    <div class="absolute z-[1] flex items-center justify-center w-full h-full inset-0 bg-black bg-opacity-60 operation">
+                        <icon name="element ZoomIn" color="#fff" size="18px" class="mr-[10px]" @click="previewImage()" />
+                        <icon name="element Delete" color="#fff" size="18px" @click.stop="removeImage" />
+                    </div>
+                </div>
+                <upload-attachment :limit="limit" @confirm="confirmSelect" v-else>
+                    <div class="w-full h-full flex items-center justify-center flex-col content-wrap">
+                        <icon name="element Plus" size="20px" color="var(--el-text-color-secondary)" />
+                        <div class="leading-none text-xs mt-[10px] text-secondary">{{ imageText || t('upload.root') }}</div>
+                    </div>
+                </upload-attachment>
             </div>
-          </div>
-        </upload-attachment>
-      </div>
-    </template>
-    <template v-else>
-      <div class="flex flex-wrap" ref="imgListRef">
-        <div
-          class="rounded cursor-pointer overflow-hidden relative border border-solid border-color image-wrap mr-[10px] mb-[10px]"
-          :style="style"
-          v-for="(item, index) in images.data"
-          :key="item + index"
-        >
-          <div class="w-full h-full relative">
-            <div class="w-full h-full flex items-center justify-center">
-              <el-image :src="img(item)" fit="contain"></el-image>
+        </template>
+        <template v-else>
+            <div class="flex flex-wrap" ref="imgListRef">
+                <div class="rounded cursor-pointer overflow-hidden relative border border-solid border-color image-wrap mr-[10px] mb-[10px]" :style="style" v-for="(item, index) in images.data" :key="item+index">
+                    <div class="w-full h-full relative">
+                        <div class="w-full h-full flex items-center justify-center">
+                            <el-image :src="img(item)" fit="contain"></el-image>
+                        </div>
+                        <div class="absolute z-[1] flex items-center justify-center w-full h-full inset-0 bg-black bg-opacity-60 operation">
+                            <icon name="element ZoomIn" color="#fff" size="18px" class="mr-[10px]" @click="previewImage(index)" />
+                            <icon name="element Delete" color="#fff" size="18px" @click="removeImage(index)" />
+                        </div>
+                    </div>
+                </div>
             </div>
-            <div
-              class="absolute z-[1] flex items-center justify-center w-full h-full inset-0 bg-black bg-opacity-60 operation"
-            >
-              <icon
-                name="element ZoomIn"
-                color="#fff"
-                size="18px"
-                class="mr-[10px]"
-                @click="previewImage(index)"
-              />
-              <icon
-                name="element Delete"
-                color="#fff"
-                size="18px"
-                @click="removeImage(index)"
-              />
+            <div class="rounded cursor-pointer overflow-hidden relative border border-dashed border-color" :style="style" v-if="images.data.length < limit">
+                <upload-attachment :limit="limit" @confirm="confirmSelect">
+                    <div class="w-full h-full flex items-center justify-center flex-col content-wrap">
+                        <icon name="element Plus" size="20px" color="var(--el-text-color-secondary)" />
+                        <div class="leading-none text-xs mt-[10px] text-secondary">{{ imageText || t('upload.root') }}</div>
+                    </div>
+                </upload-attachment>
             </div>
-          </div>
-        </div>
-      </div>
-      <div
-        class="rounded cursor-pointer overflow-hidden relative border border-dashed border-color"
-        :style="style"
-        v-if="images.data.length < limit"
-      >
-        <upload-attachment :limit="limit" @confirm="confirmSelect">
-          <div
-            class="w-full h-full flex items-center justify-center flex-col content-wrap"
-          >
-            <icon
-              name="element Plus"
-              size="20px"
-              color="var(--el-text-color-secondary)"
-            />
-            <div class="leading-none text-xs mt-[10px] text-secondary">
-              {{ imageText || t('upload.root') }}
-            </div>
-          </div>
-        </upload-attachment>
-      </div>
-    </template>
-  </div>
+        </template>
+    </div>
 
-  <el-image-viewer
-    :url-list="previewImageList"
-    v-if="imageViewer.show"
-    @close="imageViewer.show = false"
-    :initial-index="imageViewer.index"
-    :zoom-rate="1"
-  />
+    <el-image-viewer :url-list="previewImageList" v-if="imageViewer.show" @close="imageViewer.show = false" :initial-index="imageViewer.index" :zoom-rate="1" />
 </template>
 
 <script lang="ts" setup>
@@ -123,103 +54,97 @@ import Sortable from 'sortablejs'
 import { t } from '@/lang'
 
 const prop = defineProps({
-  type: {
-    type: String,
-    default: 'image',
-  },
-  imageFit: {
-    type: String,
-    default: 'contain',
-  },
-  modelValue: {
-    type: String,
-    default: '',
-  },
-  width: {
-    type: String,
-    default: '100px',
-  },
-  height: {
-    type: String,
-    default: '100px',
-  },
-  imageText: {
-    type: String,
-  },
-  limit: {
-    type: Number,
-    default: 1,
-  },
+    type: {
+        type: String,
+        default: 'image'
+    },
+    imageFit : {
+        type: String,
+        default: 'contain'
+    },
+    modelValue: {
+        type: String,
+        default: ''
+    },
+    width: {
+        type: String,
+        default: '100px'
+    },
+    height: {
+        type: String,
+        default: '100px'
+    },
+    imageText: {
+        type: String
+    },
+    limit: {
+        type: Number,
+        default: 1
+    }
 })
 
 const emit = defineEmits(['update:modelValue', 'change'])
 
 const value = computed({
-  get() {
-    return prop.modelValue
-  },
-  set(value) {
-    emit('update:modelValue', value)
-  },
+    get () {
+        return prop.modelValue
+    },
+    set (value) {
+        emit('update:modelValue', value)
+    }
 })
 
 const images: Record<string, any> = reactive({
-  data: [],
+    data: []
 })
 
 let previewImageList: string[] = reactive([])
 
 const setValue = () => {
-  value.value = toRaw(images.data).toString()
-  previewImageList = toRaw(images.data).map((url: string) => {
-    return url.indexOf('data:image') != -1 ? url : img(url)
-  })
+    value.value = toRaw(images.data).toString()
+    previewImageList = toRaw(images.data).map((url: string) => { return url.indexOf('data:image') != -1 ? url : img(url) })
 }
 
-watch(
-  () => value.value,
-  () => {
-    if (value.value.indexOf('data:image') != -1) {
-      images.data = [value.value]
-    } else {
-      images.data = [
-        ...value.value.split(',').filter((item: string) => {
-          return item
-        }),
-      ]
+watch(() => value.value, () => {
+    if(value.value.indexOf('data:image') != -1){
+        images.data = [value.value]
+    }else {
+        images.data = [
+            ...value.value.split(',').filter((item: string) => {
+                return item
+            })
+        ]
     }
     setValue()
-  },
-  { immediate: true }
-)
+}, { immediate: true })
 
 const style = computed(() => {
-  return {
-    width: prop.width,
-    height: prop.height,
-  }
-})
+    return {
+        width: prop.width,
+        height: prop.height
+    }
+}) 
 
 /**
  * 选择图片
  */
 const confirmSelect = (data: Record<string, any>) => {
-  if (prop.limit == 1) {
-    images.data.splice(0, 1)
-    data && images.data.push(data.url)
-  } else {
-    data.forEach((item: any) => {
-      if (images.data.length < prop.limit) images.data.push(item.url)
-    })
+    if (prop.limit == 1) {
+        images.data.splice(0, 1)
+        data && images.data.push(data.url)
+    } else {
+        data.forEach((item: any) => {
+            if (images.data.length < prop.limit) images.data.push(item.url)
+        })
+        nextTick(() => {
+            rowDrop()
+        })
+    }
+    setValue()
+     
     nextTick(() => {
-      rowDrop()
+        emit('change', value.value)
     })
-  }
-  setValue()
-
-  nextTick(() => {
-    emit('change', value.value)
-  })
 }
 
 /**
@@ -227,60 +152,61 @@ const confirmSelect = (data: Record<string, any>) => {
  * @param index
  */
 const removeImage = (index: number = 0) => {
-  images.data.splice(index, 1)
-  setValue()
+    images.data.splice(index, 1)
+    setValue()
 }
 
 /**
  * 查看图片
  */
 const imageViewer = reactive({
-  show: false,
-  index: 0,
+    show: false,
+    index: 0
 })
 const previewImage = (index: number = 0) => {
-  imageViewer.show = true
-  imageViewer.index = index
+    imageViewer.show = true
+    imageViewer.index = index
 }
 
 /**
  * 拖拽
  */
-const imgListRef: any = ref(null)
-onMounted(() => {
-  nextTick(() => {
-    rowDrop()
-  })
+const imgListRef:any = ref(null)
+onMounted(()=>{
+    nextTick(() => {
+        rowDrop()
+    })
 })
 
 const activeRows = ref<any[]>([])
 
 // 拖拽排序
 const rowDrop = () => {
-  if (prop.limit == 1) return
-  Sortable.create(imgListRef.value, {
-    group: 'image-wrap',
-    animation: 300,
-    onEnd: (event) => {
-      const temp = images.data[event.oldIndex!]
-      images.data.splice(event.oldIndex!, 1)
-      images.data.splice(event.newIndex!, 0, temp)
-      setValue()
-    },
-  })
+    if (prop.limit == 1) return;
+    Sortable.create(imgListRef.value, {
+        group: 'image-wrap',
+        animation: 300,
+        onEnd: event => {
+            const temp = images.data[event.oldIndex!]
+            images.data.splice(event.oldIndex!, 1)
+            images.data.splice(event.newIndex!, 0, temp)
+            setValue()
+        }
+    })
 }
+
 </script>
 
 <style lang="scss" scoped>
 .image-wrap {
-  .operation {
-    display: none;
-  }
-
-  &:hover {
     .operation {
-      display: flex;
+        display: none;
+    }
+
+    &:hover {
+        .operation {
+            display: flex;
+        }
     }
-  }
 }
 </style>
diff --git a/admin/src/components/upload-video/index.vue b/admin/src/components/upload-video/index.vue
index 8c38e2e8..3d6ef784 100644
--- a/admin/src/components/upload-video/index.vue
+++ b/admin/src/components/upload-video/index.vue
@@ -1,112 +1,52 @@
 <template>
-  <div class="flex flex-wrap">
-    <template v-if="limit == 1">
-      <div
-        class="rounded cursor-pointer relative bg-page video-wrap mr-[10px]"
-        :style="style"
-      >
-        <template v-if="videos.data.length">
-          <div
-            class="w-full h-full relative flex items-center overflow-hidden rounded"
-          >
-            <video :src="img(videos.data[0])" class="w-full" />
-            <div
-              class="absolute z-[1] flex items-center justify-center w-full h-full inset-0 bg-black bg-opacity-60 operation"
-            >
-              <icon
-                name="iconfont icon24gf-playCircle"
-                color="#fff"
-                size="25px"
-                @click="previewVideo()"
-              />
-            </div>
-          </div>
-          <icon
-            name="element CircleCloseFilled"
-            color="#bbb"
-            size="18px"
-            @click="removeVideo"
-            class="!absolute z-[2] top-[-9px] right-[-9px]"
-          />
-        </template>
-        <upload-attachment
-          :limit="limit"
-          type="video"
-          @confirm="confirmSelect"
-          v-else
-        >
-          <div class="w-full h-full flex items-center justify-center flex-col">
-            <slot name="icon">
-              <icon
-                name="iconfont icon24gf-playCircle"
-                size="25px"
-                color="var(--el-text-color-secondary)"
-              />
-            </slot>
-          </div>
-        </upload-attachment>
-      </div>
-    </template>
-    <template v-else>
-      <div
-        class="rounded cursor-pointer relative bg-page video-wrap mr-[10px]"
-        :style="style"
-        v-for="(item, index) in videos.data"
-        :key="index"
-      >
-        <div
-          class="w-full h-full relative flex items-center overflow-hidden rounded"
-        >
-          <video :src="img(item)" class="w-full" />
-          <div
-            class="absolute z-[1] flex items-center justify-center w-full h-full inset-0 bg-black bg-opacity-60 operation"
-          >
-            <icon
-              name="iconfont icon24gf-playCircle"
-              color="#fff"
-              size="25px"
-              @click="previewVideo(index)"
-            />
-          </div>
-        </div>
-        <icon
-          name="element CircleCloseFilled"
-          color="#bbb"
-          size="18px"
-          @click="removeVideo(index)"
-          class="absolute z-[2] top-[-9px] right-[-9px]"
-        />
-      </div>
-      <div
-        class="rounded cursor-pointer relative bg-page video-wrap mr-[10px]"
-        :style="style"
-        v-if="videos.data.length < limit"
-      >
-        <upload-attachment :limit="limit" type="video" @confirm="confirmSelect">
-          <div class="w-full h-full flex items-center justify-center flex-col">
-            <slot name="icon">
-              <icon
-                name="iconfont icon24gf-playCircle"
-                size="25px"
-                color="var(--el-text-color-secondary)"
-              />
-            </slot>
-          </div>
-        </upload-attachment>
-      </div>
-    </template>
+	<div class="flex flex-wrap">
+		<template v-if="limit == 1">
+			<div class="rounded cursor-pointer relative bg-page video-wrap mr-[10px]" :style="style">
+				<template v-if="videos.data.length">
+					<div class="w-full h-full relative flex items-center overflow-hidden rounded">
+						<video :src="img(videos.data[0])" class="w-full"/>
+						<div class="absolute z-[1] flex items-center justify-center w-full h-full inset-0 bg-black bg-opacity-60 operation">
+							<icon name="iconfont icon24gf-playCircle" color="#fff" size="25px" @click="previewVideo()"/>
+						</div>
+					</div>
+					<icon name="element CircleCloseFilled" color="#bbb" size="18px" @click="removeVideo" class="!absolute z-[2] top-[-9px] right-[-9px]"/>
+				</template>
+				<upload-attachment :limit="limit" type="video" @confirm="confirmSelect" v-else>
+					<div class="w-full h-full flex items-center justify-center flex-col">
+                        <slot name="icon">
+                            <icon name="iconfont icon24gf-playCircle" size="25px" color="var(--el-text-color-secondary)"/>
+                        </slot>
+					</div>
+				</upload-attachment>
+			</div>
+		</template>
+		<template v-else>
+			<div class="rounded cursor-pointer relative bg-page video-wrap mr-[10px]" :style="style" v-for="(item, index) in videos.data" :key="index">
+				<div class="w-full h-full relative flex items-center overflow-hidden rounded">
+					<video :src="img(item)" class="w-full"/>
+					<div class="absolute z-[1] flex items-center justify-center w-full h-full inset-0 bg-black bg-opacity-60 operation">
+						<icon name="iconfont icon24gf-playCircle" color="#fff" size="25px" @click="previewVideo(index)"/>
+					</div>
+				</div>
+				<icon name="element CircleCloseFilled" color="#bbb" size="18px" @click="removeVideo(index)" class="absolute z-[2] top-[-9px] right-[-9px]"/>
+			</div>
+			<div class="rounded cursor-pointer relative bg-page video-wrap mr-[10px]" :style="style" v-if="videos.data.length < limit">
+				<upload-attachment :limit="limit" type="video" @confirm="confirmSelect">
+					<div class="w-full h-full flex items-center justify-center flex-col">
+                        <slot name="icon">
+                            <icon name="iconfont icon24gf-playCircle" size="25px" color="var(--el-text-color-secondary)"/>
+                        </slot>
+					</div>
+				</upload-attachment>
+			</div>
+		</template>
 
-    <!-- 视频预览 -->
-    <el-dialog
-      v-model="videoViewer.visible"
-      width="50%"
-      align-center
-      :destroy-on-close="true"
-      custom-class="video-preview"
-    >
-      <video-player :src="videoViewer.src" width="100%" />
-    </el-dialog>
-  </div>
+		<!-- 视频预览 -->
+		<el-dialog v-model="videoViewer.visible" width="50%" align-center :destroy-on-close="true" custom-class="video-preview">
+			<video-player :src="videoViewer.src" width="100%"/>
+		</el-dialog>
+
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -114,76 +54,72 @@ import { computed, reactive, watch, toRaw } from 'vue'
 import { img } from '@/utils/common'
 
 const prop = defineProps({
-  modelValue: {
-    type: String,
-    default: '',
-  },
-  width: {
-    type: String,
-    default: '200px',
-  },
-  height: {
-    type: String,
-    default: '100px',
-  },
-  limit: {
-    type: Number,
-    default: 1,
-  },
+    modelValue: {
+        type: String,
+        default: ''
+    },
+    width: {
+        type: String,
+        default: '200px'
+    },
+    height: {
+        type: String,
+        default: '100px'
+    },
+    limit: {
+        type: Number,
+        default: 1
+    }
 })
 
 const emit = defineEmits(['update:modelValue'])
 
 const value = computed({
-  get() {
-    return prop.modelValue
-  },
-  set(value) {
-    emit('update:modelValue', value)
-  },
+    get () {
+        return prop.modelValue
+    },
+    set (value) {
+        emit('update:modelValue', value)
+    }
 })
 
 const videos: Record<string, any> = reactive({
-  data: [],
+    data: []
 })
 
 const setValue = () => {
-  value.value = toRaw(videos.data).toString()
+	value.value = toRaw(videos.data).toString()
 }
 
-watch(
-  () => value.value,
-  () => {
+watch(() => value.value, () => {
     videos.data = [
-      ...value.value.split(',').filter((item: string) => {
-        return item
-      }),
+        ...value.value.split(',').filter((item: string) => {
+            return item
+        })
     ]
     setValue()
-  },
-  { immediate: true }
-)
+}, { immediate: true })
 
 const style = computed(() => {
-  return {
-    width: prop.width,
-    height: prop.height,
-  }
+    return {
+        width: prop.width,
+        height: prop.height
+    }
 })
 
 /**
  * 选择视频
  */
 const confirmSelect = (data: Record<string, any>) => {
-  if (prop.limit == 1) {
-    videos.data.splice(0, 1)
-    data && videos.data.push(data.url)
-  } else {
-    data.forEach((item: any) => {
-      if (videos.data.length < prop.limit) videos.data.push(item.url)
-    })
-  }
-  setValue()
+    if (prop.limit == 1) {
+        videos.data.splice(0, 1)
+        data && videos.data.push(data.url)
+    } else {
+        data.forEach((item: any) => {
+            if (videos.data.length < prop.limit) videos.data.push(item.url)
+        })
+    }
+    setValue()
 }
 
 /**
@@ -191,36 +127,36 @@ const confirmSelect = (data: Record<string, any>) => {
  * @param index
  */
 const removeVideo = (index: number = 0) => {
-  videos.data.splice(index, 1)
-  setValue()
+    videos.data.splice(index, 1)
+    setValue()
 }
 
 /**
  * 查看视频
  */
 const videoViewer = reactive({
-  visible: false,
-  src: '',
+    visible: false,
+    src: ''
 })
 const previewVideo = (index: number = 0) => {
-  videoViewer.visible = true
-  videoViewer.src = img(videos.data[index])
+    videoViewer.visible = true
+    videoViewer.src = img(videos.data[index])
 }
 </script>
 
 <style lang="scss">
-.video-preview {
-  background: none !important;
-  box-shadow: none !important;
+	.video-preview {
+		background: none !important;
+		box-shadow: none !important;
 
-  .el-dialog__headerbtn .el-dialog__close {
-    border-radius: 50%;
-    width: 34px;
-    height: 34px;
-    font-size: 24px;
-    color: #fff;
-    background-color: var(--el-text-color-regular);
-    border-color: #fff;
-  }
-}
+		.el-dialog__headerbtn .el-dialog__close {
+			border-radius: 50%;
+			width: 34px;
+			height: 34px;
+			font-size: 24px;
+			color: #fff;
+			background-color: var(--el-text-color-regular);
+			border-color: #fff;
+		}
+	}
 </style>
diff --git a/admin/src/components/verifition/Verify.vue b/admin/src/components/verifition/Verify.vue
index ec28718c..f37ca196 100644
--- a/admin/src/components/verifition/Verify.vue
+++ b/admin/src/components/verifition/Verify.vue
@@ -1,460 +1,441 @@
 <template>
-  <div :class="mode == 'pop' ? 'mask' : ''" v-show="showBox">
-    <div
-      :class="mode == 'pop' ? 'verifybox' : ''"
-      :style="{ 'max-width': parseInt(imgSize.width) + 30 + 'px' }"
-    >
-      <div class="verifybox-top" v-if="mode == 'pop'">
-        请完成安全验证
-        <span class="verifybox-close" @click="closeBox">
-          <i class="iconfont icon-close"></i>
-        </span>
-      </div>
-      <div
-        class="verifybox-bottom"
-        :style="{ padding: mode == 'pop' ? '15px' : '0' }"
-      >
-        <!-- 验证码容器 -->
-        <component
-          v-if="componentType"
-          :is="componentType"
-          :captchaType="captchaType"
-          :type="verifyType"
-          :figure="figure"
-          :arith="arith"
-          :mode="mode"
-          :vSpace="vSpace"
-          :explain="explain"
-          :imgSize="imgSize"
-          :blockSize="blockSize"
-          :barSize="barSize"
-          ref="instance"
-        ></component>
-      </div>
-    </div>
-  </div>
+	<div :class="mode=='pop'?'mask':''" v-show="showBox">
+		<div :class="mode=='pop'?'verifybox':''" :style="{'max-width':parseInt(imgSize.width)+30+'px'}">
+			<div class="verifybox-top" v-if="mode=='pop'">
+				请完成安全验证
+				<span class="verifybox-close" @click="closeBox">
+                <i class="iconfont icon-close"></i>
+            </span>
+			</div>
+			<div class="verifybox-bottom" :style="{padding:mode=='pop'?'15px':'0'}">
+				<!-- 验证码容器 -->
+				<component v-if="componentType"
+				           :is="componentType"
+				           :captchaType="captchaType"
+				           :type="verifyType"
+				           :figure="figure"
+				           :arith="arith"
+				           :mode="mode"
+				           :vSpace="vSpace"
+				           :explain="explain"
+				           :imgSize="imgSize"
+				           :blockSize="blockSize"
+				           :barSize="barSize"
+				           ref="instance"></component>
+			</div>
+		</div>
+	</div>
 </template>
 <script type="text/babel">
-/**
- * Verify 验证码组件
- * @description 分发验证码使用
- * */
-import VerifySlide from './Verify/VerifySlide.vue'
-import VerifyPoints from './Verify/VerifyPoints.vue'
-import { computed, ref, toRefs, watchEffect } from 'vue'
-
-export default {
-  name: 'Vue2Verify',
-  components: {
-    VerifySlide,
-    VerifyPoints,
-  },
-  props: {
-    captchaType: {
-      type: String,
-      required: true,
-    },
-    figure: {
-      type: Number,
-    },
-    arith: {
-      type: Number,
-    },
-    mode: {
-      type: String,
-      default: 'pop',
-    },
-    vSpace: {
-      type: Number,
-    },
-    explain: {
-      type: String,
-    },
-    imgSize: {
-      type: Object,
-      default() {
-        return {
-          width: '310px',
-          height: '155px',
-        }
-      },
-    },
-    blockSize: {
-      type: Object,
-    },
-    barSize: {
-      type: Object,
-    },
-  },
-  setup(props) {
-    const {
-      captchaType,
-      figure,
-      arith,
-      mode,
-      vSpace,
-      explain,
-      imgSize,
-      blockSize,
-      barSize,
-    } = toRefs(props)
-    const clickShow = ref(false)
-    const verifyType = ref(undefined)
-    const componentType = ref(undefined)
-    const instance = ref({})
-
-    const showBox = computed(() => {
-      if (mode.value == 'pop') {
-        return clickShow.value
-      } else {
-        return true
-      }
-    })
     /**
-     * refresh
-     * @description 刷新
+     * Verify 验证码组件
+     * @description 分发验证码使用
      * */
-    const refresh = () => {
-      if (instance.value.refresh) {
-        instance.value.refresh()
-      }
-    }
-    const closeBox = () => {
-      clickShow.value = false
-      refresh()
-    }
-    const show = () => {
-      if (mode.value == 'pop') {
-        clickShow.value = true
-      }
-    }
-    watchEffect(() => {
-      switch (captchaType.value) {
-        case 'blockPuzzle':
-          verifyType.value = '2'
-          componentType.value = 'VerifySlide'
-          break
-        case 'clickWord':
-          verifyType.value = ''
-          componentType.value = 'VerifyPoints'
-          break
-      }
-    })
-
-    return {
-      clickShow,
-      verifyType,
-      componentType,
-      instance,
-      showBox,
-      closeBox,
-      show,
+    import VerifySlide from './Verify/VerifySlide.vue'
+    import VerifyPoints from './Verify/VerifyPoints.vue'
+    import { computed, ref, toRefs, watchEffect } from 'vue'
+
+    export default {
+        name: 'Vue2Verify',
+        components: {
+            VerifySlide,
+            VerifyPoints
+        },
+        props: {
+            captchaType: {
+                type: String,
+                required: true
+            },
+            figure: {
+                type: Number
+            },
+            arith: {
+                type: Number
+            },
+            mode: {
+                type: String,
+                default: 'pop'
+            },
+            vSpace: {
+                type: Number
+            },
+            explain: {
+                type: String
+            },
+            imgSize: {
+                type: Object,
+                default() {
+                    return {
+                        width: '310px',
+                        height: '155px'
+                    }
+                }
+            },
+            blockSize: {
+                type: Object
+            },
+            barSize: {
+                type: Object
+            }
+        },
+        setup(props) {
+            const { captchaType, figure, arith, mode, vSpace, explain, imgSize, blockSize, barSize } = toRefs(props)
+            const clickShow = ref(false)
+            const verifyType = ref(undefined)
+            const componentType = ref(undefined)
+            const instance = ref({})
+
+            const showBox = computed(() => {
+                if (mode.value == 'pop') {
+                    return clickShow.value
+                } else {
+                    return true
+                }
+            })
+            /**
+             * refresh
+             * @description 刷新
+             * */
+            const refresh = () => {
+                if (instance.value.refresh) {
+                    instance.value.refresh()
+                }
+            }
+            const closeBox = () => {
+                clickShow.value = false
+                refresh()
+            }
+            const show = () => {
+                if (mode.value == 'pop') {
+                    clickShow.value = true
+                }
+            }
+            watchEffect(() => {
+                switch (captchaType.value) {
+                    case 'blockPuzzle':
+                        verifyType.value = '2'
+                        componentType.value = 'VerifySlide'
+                        break
+                    case 'clickWord':
+                        verifyType.value = ''
+                        componentType.value = 'VerifyPoints'
+                        break
+                }
+            })
+
+            return {
+                clickShow,
+                verifyType,
+                componentType,
+                instance,
+                showBox,
+                closeBox,
+                show
+            }
+        }
     }
-  },
-}
 </script>
 <style>
-.verifybox {
-  position: relative;
-  box-sizing: border-box;
-  border-radius: 2px;
-  border: 1px solid #e4e7eb;
-  background-color: #fff;
-  box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
-  left: 50%;
-  top: 50%;
-  transform: translate(-50%, -50%);
-}
-
-.verifybox-top {
-  padding: 0 15px;
-  height: 50px;
-  line-height: 50px;
-  text-align: left;
-  font-size: 16px;
-  color: #45494c;
-  border-bottom: 1px solid #e4e7eb;
-  box-sizing: border-box;
-}
-
-.verifybox-bottom {
-  padding: 15px;
-  box-sizing: border-box;
-}
-
-.verifybox-close {
-  position: absolute;
-  top: 13px;
-  right: 9px;
-  width: 24px;
-  height: 24px;
-  text-align: center;
-  cursor: pointer;
-}
-
-.mask {
-  position: fixed;
-  top: 0;
-  left: 0;
-  z-index: 1001;
-  width: 100%;
-  height: 100vh;
-  background: rgba(0, 0, 0, 0.3);
-  /* display: none; */
-  transition: all 0.5s;
-}
-
-.verify-tips {
-  position: absolute;
-  left: 0px;
-  bottom: 0px;
-  width: 100%;
-  height: 30px;
-  line-height: 30px;
-  color: #fff;
-}
-
-.suc-bg {
-  background-color: rgba(92, 184, 92, 0.5);
-  filter: progid:DXImageTransform.Microsoft.gradient(startcolorstr=#7f5CB85C, endcolorstr=#7f5CB85C);
-}
-
-.err-bg {
-  background-color: rgba(217, 83, 79, 0.5);
-  filter: progid:DXImageTransform.Microsoft.gradient(startcolorstr=#7fD9534F, endcolorstr=#7fD9534F);
-}
-
-.tips-enter,
-.tips-leave-to {
-  bottom: -30px;
-}
-
-.tips-enter-active,
-.tips-leave-active {
-  transition: bottom 0.5s;
-}
-
-/* ---------------------------- */
-/*常规验证码*/
-.verify-code {
-  font-size: 20px;
-  text-align: center;
-  cursor: pointer;
-  margin-bottom: 5px;
-  border: 1px solid #ddd;
-}
-
-.cerify-code-panel {
-  height: 100%;
-  overflow: hidden;
-}
-
-.verify-code-area {
-  float: left;
-}
-
-.verify-input-area {
-  float: left;
-  width: 60%;
-  padding-right: 10px;
-}
-
-.verify-change-area {
-  line-height: 30px;
-  float: left;
-}
-
-.varify-input-code {
-  display: inline-block;
-  width: 100%;
-  height: 25px;
-}
-
-.verify-change-code {
-  color: #337ab7;
-  cursor: pointer;
-}
-
-.verify-btn {
-  width: 200px;
-  height: 30px;
-  background-color: #337ab7;
-  color: #ffffff;
-  border: none;
-  margin-top: 10px;
-}
-
-/*滑动验证码*/
-.verify-bar-area {
-  position: relative;
-  background: #ffffff;
-  text-align: center;
-  -webkit-box-sizing: content-box;
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
-  border: 1px solid #ddd;
-  -webkit-border-radius: 4px;
-}
-
-.verify-bar-area .verify-move-block {
-  position: absolute;
-  top: 0px;
-  left: 0;
-  background: #fff;
-  cursor: pointer;
-  -webkit-box-sizing: content-box;
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
-  box-shadow: 0 0 2px #888888;
-  -webkit-border-radius: 1px;
-}
-
-.verify-bar-area .verify-move-block:hover {
-  background-color: #337ab7;
-  color: #ffffff;
-}
-
-.verify-bar-area .verify-left-bar {
-  position: absolute;
-  top: -1px;
-  left: -1px;
-  background: #f0fff0;
-  cursor: pointer;
-  -webkit-box-sizing: content-box;
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
-  border: 1px solid #ddd;
-}
-
-.verify-img-panel {
-  margin: 0;
-  -webkit-box-sizing: content-box;
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
-  border-top: 1px solid #ddd;
-  border-bottom: 1px solid #ddd;
-  border-radius: 3px;
-  position: relative;
-}
-
-.verify-img-panel .verify-refresh {
-  width: 25px;
-  height: 25px;
-  text-align: center;
-  padding: 5px;
-  cursor: pointer;
-  position: absolute;
-  top: 0;
-  right: 0;
-  z-index: 2;
-}
-
-.verify-img-panel .icon-refresh {
-  font-size: 20px;
-  color: #fff;
-}
-
-.verify-img-panel .verify-gap {
-  background-color: #fff;
-  position: relative;
-  z-index: 2;
-  border: 1px solid #fff;
-}
-
-.verify-bar-area .verify-move-block .verify-sub-block {
-  position: absolute;
-  text-align: center;
-  z-index: 3;
-  /* border: 1px solid #fff; */
-}
-
-.verify-bar-area .verify-move-block .verify-icon {
-  font-size: 18px;
-}
-
-.verify-bar-area .verify-msg {
-  z-index: 3;
-}
-
-/*字体图标的css*/
-/*@font-face {font-family: "iconfont";*/
-/*src: url('../fonts/iconfont.eot?t=1508229193188'); !* IE9*!*/
-/*src: url('../fonts/iconfont.eot?t=1508229193188#iefix') format('embedded-opentype'), !* IE6-IE8 *!*/
-/*url('data:application/x-font-woff;charset=utf-8;base64,d09GRgABAAAAAAaAAAsAAAAACUwAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABHU1VCAAABCAAAADMAAABCsP6z7U9TLzIAAAE8AAAARAAAAFZW7kiSY21hcAAAAYAAAAB3AAABuM+qBlRnbHlmAAAB+AAAAnQAAALYnrUwT2hlYWQAAARsAAAALwAAADYPNwajaGhlYQAABJwAAAAcAAAAJAfeA4dobXR4AAAEuAAAABMAAAAYF+kAAGxvY2EAAATMAAAADgAAAA4CvAGsbWF4cAAABNwAAAAfAAAAIAEVAF1uYW1lAAAE/AAAAUUAAAJtPlT+fXBvc3QAAAZEAAAAPAAAAE3oPPXPeJxjYGRgYOBikGPQYWB0cfMJYeBgYGGAAJAMY05meiJQDMoDyrGAaQ4gZoOIAgCKIwNPAHicY2Bk/sM4gYGVgYOpk+kMAwNDP4RmfM1gxMjBwMDEwMrMgBUEpLmmMDgwVDxbwtzwv4EhhrmBoQEozAiSAwAw1A0UeJzFkcENgCAMRX8RjCGO4gTe9eQcnhzAfXC2rqG/hYsT8MmD9gdS0gJIAAaykAjIBYHppCvuD8juR6zMJ67A89Zdn/f1aNPikUn8RvYo8G20CjKim6Rf6b9m34+WWd/vBr+oW8V6q3vF5qKlYrPRp4L0Ad5nGL8AeJxFUc9rE0EYnTezu8lMsrvtbrqb3TRt0rS7bdOmdI0JbWmCtiItIv5oi14qevCk9SQVLFiQgqAF8Q9QLKIHLx48FkHo3ZNnFUXwD5C2B6dO6sFhmI83w7z3fe8RnZCjb2yX5YlLhskkmScXCIFRxYBFiyjH9Rqtoqes9/g5i8WVuJyqDNTYLPwBI+cljXrkGynDhoU+nCgnjbhGY5yst+gMEq8IBIXwsjPU67CnEPm4b0su0h309Fd67da4XBhr55KSm17POk7gOE/Shq6nKdVsC7d9j+tcGPKVboc9u/0jtB/ZIA7PXTVLBef6o/paccjnwOYm3ELJetPuDrvV3gg91wlSXWY6H5qVwRzWf2TybrYYfSdqoXOwh/Qa8RWIjBTiSI3h614/vKSNRhONOrsnQi6Xf4nQFQDTmJE1NKbhI6crHEJO/+S5QPxhYJRRyvBFBP+5T9EPpEAIVzzRQIrjmJ6jY1WTo+NXTMchuBsKuS8PRZATSMl9oTA4uNLkeIA0V1UeqOoGQh7IAxGo+7T83fn3T+voqCNPPAUazUYUI7LgKSV1Jk2oUeghYGhZ+cKOe2FjVu5ZKEY2VkE13AK1+jI4r1KLbPlZfrKiPhOXKPRj7q9sj9XJ7LFHNmrKJS3VCdhXGSdKrtmoQaWeMjQVt0KD6sGPOx0oH2fgtzoNROxtNq8F3tzYM/n+TjKSX5qf2jx941276TIr9FjXxKr8eX/6bK4yuopwo9py1sw8F9kdw4AmurRpLUM3tYx5ZnKpfHPi8dzz19vJ6MjyxYUrpqeb1uLs3eGV6vr21pSqpeWkqonAN9oUyIiXpv8XvlN5e3icY2BkYGAA4n0vN4fG89t8ZeBmYQCBa9wPPRH0/wcsDMwmQC4HAxNIFABAfAqaAHicY2BkYGBu+N/AEMPCAAJAkpEBFbABAEcMAm94nGNhYGBgfsnAwMKAigESnwEBAAAAAAAAdgCkANoBCAFsAAB4nGNgZGBgYGMIZGBlAAEmIOYCQgaG/2A+AwARSAFzAHicZY9NTsMwEIVf+gekEqqoYIfkBWIBKP0Rq25YVGr3XXTfpk6bKokjx63UA3AejsAJOALcgDvwSCebNpbH37x5Y08A3OAHHo7fLfeRPVwyO3INF7gXrlN/EG6QX4SbaONVuEX9TdjHM6bCbXRheYPXuGL2hHdhDx18CNdwjU/hOvUv4Qb5W7iJO/wKt9Dx6sI+5l5XuI1HL/bHVi+cXqnlQcWhySKTOb+CmV7vkoWt0uqca1vEJlODoF9JU51pW91T7NdD5yIVWZOqCas6SYzKrdnq0AUb5/JRrxeJHoQm5Vhj/rbGAo5xBYUlDowxQhhkiMro6DtVZvSvsUPCXntWPc3ndFsU1P9zhQEC9M9cU7qy0nk6T4E9XxtSdXQrbsuelDSRXs1JErJCXta2VELqATZlV44RelzRiT8oZ0j/AAlabsgAAAB4nGNgYoAALgbsgI2RiZGZkYWRlZGNkZ2BsYI1OSM1OZs1OSe/OJW1KDM9o4S9KDWtKLU4g4EBAJ79CeQ=') format('woff'),*/
-/*url('../fonts/iconfont.ttf?t=1508229193188') format('truetype'), !* chrome, firefox, opera, Safari, Android, iOS 4.2+*!*/
-/*url('../fonts/iconfont.svg?t=1508229193188#iconfont') format('svg'); !* iOS 4.1- *!*/
-/*}*/
-
-.iconfont {
-  font-family: 'iconfont' !important;
-  font-size: 16px;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-.icon-check:before {
-  content: ' ';
-  display: block;
-  width: 16px;
-  height: 16px;
-  position: absolute;
-  margin: auto;
-  left: 0;
-  right: 0;
-  top: 0;
-  bottom: 0;
-  z-index: 9999;
-  background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADIEAYAAAD9yHLdAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAZiS0dEAAAAAAAA+UO7fwAAAAlwSFlzAAAASAAAAEgARslrPgAAIlFJREFUeNrt3X1cVNW6B/BnbcS3xJd7fLmSeo+op/Qmyp4BFcQEwpd8Nyc9iZppgUfE49u1tCwlNcMySCM1S81jCoaioiJvKoYgswfUo5wSJ69SZFKCKSAws+4f2/GetFFRYG3g9/2Hz2xj+O2J4Zm19trrIQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKgjmOgAAADwOBhz83TzdPNs397qanW1ujJ2s8fNHjd7FBTkhuSG5IbculVdP1kSfeoAAPBwdFzHdXzgQN0S3RLdkpgY2SJbZMvNm9It6ZZ064cfGmQ2yGyQmZfX3KO5R3OPwkJdsi5Zl5yYKIfL4XL4mDHqs7AqGzhgBAIAoFFdI7pGdI1o1KjFlhZbWmxZv149OmXK4z3r4cPEiROfOFExKSbFVFDwqM+EEQgAgMY8y5/lz/LGjZu3bt66eev9+9Wjj1s4bAYNIkaMWHKyx3mP8x7nmzd/1GdyEP1CAQCASifrZJ3s6FjmWuZa5rprF3uLvcXeGjq0en5au3a8nJfz8k6d8lPyU/JTYmIq+wwYgQAAaIIk0WgaTaO/+IJm0SyaNWJEtf/IPMqjvJde0g/QD9APcHOrdGIhrxMAANzGmJwr58q569ZRLMVS7MSJNfajFVJIYYy/wF/gL7z0UmW/vUGNvk4AAHCHTqfT6XQrVtB4Gk/jg4KEBfmBfqAf+vSp7LdhBAIAUMPUwvH66+oj21eBSqmUStu3r+y3oYAAANQQtXDMmKE+WrlSdB4bvpwv58t/+62y34cCAgBQzeSt8lZ568SJFEiBFLh2reg8d2MD2UA28PTpyn4fCggAQDXRh+pD9aEjR1IABVDA5s20ntbTeklzf3eZF/NiXvv2Vfb7NHciAAC1nRwsB8vBvr5Wf6u/1X/nTubO3Jl7A+0tWvImb/LOyemc3zm/c/6ePZX9dmxlAgBQRfTd9N303Tw8rFusW6xbEhPZLDaLzXJyEp3rHjNoBs24dYt/wj/hn3h5mUwmk8mkKJV9GoxAAAAekz5AH6APeOYZ6znrOeu5Awc0WzgCKZACrVZ2hB1hR15++VELhw1GIAAAj0hdVdWli/ooNVX9WvnlsNUflHSk45wbuZEbg4LUwrFhw+M+LUYgAACV1CuoV1CvoCef5Kv4Kr4qIUE9qsHCcRsv4AW8YOHCqiocNtq7qAMAoFHqZoetW9MgGkSDDh+mhbSQFnbuLDrX/YWGmmJMMaaYsLCqfmZMYQEAPIBt23PLp5ZPLZ8mJ9MROkJHdDrRueyKpViKXbdO6aB0UDoEB1fXj8EUFgCAHX0v973c93KTJpbvLd9bvt+3T+uFg0/mk/nkL79UC0dISHX/PIxAAADuYuvLwQ/xQ/zQnj1sKBvKhj7/vOhc9vA4HsfjYmOd2jm1c2o3btxRdpQdZRUV1f1zMQIBALjNYDAYDAYHB9pEm2jTl19qvXBQGIVRWFKSWjgmTKipwmGDi+gAAERExJhZZ9aZdZGRNJ2m0/Tx40UnssuHfMgnPb2koKSgpGD0aIUpTGGlpTUdAwUEAOo9XbguXBf+/vu0lbbS1ldfFZ3HrgE0gAacPu0423G24+xhw5SOSkel440bouKggABAvaXjOq7j77xDetKTfv580Xns8iIv8srNlfKkPClv8OD0jukd0zv++qvoWLiIDgD1jrpnVXAwb86b8+Yffyw6jz18NV/NV+flWQZaBloGenufYqfYKXbxouhcNriIDgD1hi5Zl6xLnjyZL+AL+ILwcNF57OpLfanv1atsPpvP5vv7a61w2GAEAgB1nrpn1ejRPJNn8szoaM1ur05EREVF6ldfX0VRFEUxmUQnskejLyAAwOPT79fv1+9/7jn+E/+J/7Rjh7YLR3ExceLEhw9XTIpJMWm3cNho9IUEAHh08hB5iDykb1/+M/+Z/7x7N0VSJEU2aiQ61z30pCd9WZl1inWKdcoLL2R5ZnlmeR4/LjrWw8I1EACoM+S2clu5rasr+yv7K/vrgQO0jtbRumbNROe6G4/kkTzSYqFMyqTMgAC1cBw6JDpXZaGAAECt1zukd0jvkG7daBftol2HD1MERVBEq1aic93jdl8O9gv7hf0SGKhOVUVHi471qFBAAKDW0hfri/XFHTs6cAfuwBMS2Bw2h81p1050LruepWfp2fnzlaHKUGXopk2i4zwuFBAAqHVcw1zDXMPatrWSlayUkEBplEZp//VfonPZw86ys+zsm28qE5WJysQPPxSdp6qggABAraHuktuiRYOgBkENgg4dYt7Mm3k/9ZToXHZNpIk0MTzcWGosNZYuXy46TlXDfSAAoHnqfRxNm6qP4uPVr/37i85l11gaS2M3b1YWK4uVxa+8oh7kXHSsqoYRCABoVo+oHlE9oho2pME0mAbHxKhHNVw4IimSImNiXLJdsl2yp09XD9a9wmGDAgIAmmPry9G4f+P+jfv/4x8UT/EUP3iw6Fz3d/hwUXpRelH6Sy9FR0dHR0dbLKITVTfcSAgAGsPYhT4X+lzos2EDG8FGsBHjxolOZA9fxBfxRWlpFeYKc4V57NjckNyQ3JBbt0Tnqim4BgIAmiEvkhfJiz78kMWzeBY/Z47oPPbwpXwpX5qdbRlmGWYZ5uOjbnZYWCg6V03DFBYACKdbq1urW7tiheYLRypP5anffluRU5FTkTN4cH0tHDYYgQCAMOqeVX//O7vKrrKra9aIzmMPP86P8+NmM/fjftzP2zsrLSstK+3HH0XnEg0jEACocXJXuavcdepU1ol1Yp00fGNdP+pH/X78UUqSkqQkf38Ujt9DAQGAGqMP0YfoQ154gbbTdtq+cSMppJDCtDcTwokTLyiwvGh50fKiv79xuHG4cbjZLDqW1mjvfxwA1DluZjezm3nECMkgGSTD11+rRx0dRee6G8/gGTzj+nU+gA/gA/z81BGH0Sg6l1ZhBAIA1Ua9g9zHh/3MfmY/R0WpRzVYOE7yk/xkSYmUI+VIOSNHonA8HIxAAKDK6bvpu+m7eXhYt1i3WLckJrJZbBab5eQkOtcfKy9Xv44Zo7aQjYsTnai2cBAdAADqDn2APkAf8Mwz1gRrgjUhIYG9wF5gL7RsKTrXPQIpkAKtVlbMilnxpElKvBKvxO/eLTpWbYMRCAA8NnWqqksXddXSsWN0gk7QCWdn0bnuDao2dOJGbuTGoCCTyWQymTZsEB2rtsI1EAB4ZL2CegX1CnrySb6Kr+KrEhI0Wzhu4wW8gBcsXIjCUTWwFxYAVJral6N1axpEg2jQ4cO0kBbSws6dRee6v9BQU4wpxhQTFiY6SV2BKSwAeGge5z3Oe5xv3tzyreVby7dJSfQ2vU1v6/Wic9kVS7EUu26d0kHpoHQIDhYdp67BFBYAPFDfy30v973cpElFVkVWRdbevZovHJtpM23etk0tHCEhouPUVRiBAIBd6lSVoyMxYsRsq5SGDROdyx4ex+N4XGysUzundk7txo07yo6yo6yiQnSuugojEACwQ5L4dD6dT9+6VX2s3cJBYRRGYUlJauGYMAGFo2bUWAHps73P9j7b27Xr2bNnz549W7USfeIAYA9jslk2y+YNG9gmtoltmjBBdCJ7bA2dypVypVwZNUotHKWlonPVF1U+hfX7PW8CA9UtAnx9mQfzYB5Nmtz5Dz3IgzwKC+k1eo1ei4+naTSNpq1Zo5gUk2LKyBD9wgDUR/I5+Zx87oMP2CQ2iU2aO1d0HnvQ0EkbHruA9OK9eC/esmWD1AapDVK/+orm0ByaM2TIIz9hNEVT9IYNRfuL9hftDwmpby0iAUSQT8on5ZNLlrAZbAabsXSp6Dz28JV8JV/53XcVpypOVZzy9j694PSC0wt+/ll0rvrqkQuI15+8/uT1Jyen0smlk0snHz9Ox+gYHXN1rdp4KSnlE8onlE8YMUL9Rbl5U/QLBlCXqBfJQ0LUi+Th4aLz3N+lS+o2697e6kzFpUuiE9V3j3wNpHR26ezS2ZGR1VM4bHx8HHs59nLsdeBAj6geUT2imjUT9UIB1CVylBwlR738MulJT/qPPhKdxx6+hq/ha65ckWKlWCnW3x+FQ1sqPQJxN7gb3A29e1tbWVtZW5lMNdUQhifxJJ70zTdNujTp0qTL0KHf/PLNL9/88ttvYl42gNrJ7Te339x+GzuW5bAclhMVpU5ZOWhvU9UQCqGQa9es063TrdN9fLLKs8qzyk+dEh0Lfq/SIxBrf2t/a/+JE2u6kxjzY37Mz8ur9OXSl0tfTklRb2z6j/+o2ZcLoHZyi3aLdov285N2Sjulndu3a7ZwEBFRcTFP4Ak8YdQoFA5tq/wU1l/oL/QXLy9hiY/QETqi05U1L2te1vzgQdtFfGF5ADRMX6wv1hd7eqo9vWNjKZIiKbJRI9G57jGDZtCMW7fYUraULR01yrTNtM20LTVVdCy4v0qPINSLbrm56kW3Ll1EnwAtpaW01Ggse6PsjbI3Bg06c+bMmTNnrl0THQtApDtTza2tra2tU1LoJJ2kk9r7oMUzeSbPrKhg7syduRsMakOnPXtE54KHU+kRCF/Gl/FlGrr2cHtPHseVjisdVyYn39klFKAe6h3SO6R3SLduln9Y/mH5x8GDWi0ctr4cLJ7Fs/igIBSO2qnyU1i9qTf1zskRHfxu7G32Nnu7d2+1oCQmopBAfaL+vnfqJIVJYVJYUhLrx/qxfv/5n6Jz2cNSWApLCQlRhipDlaGbNonOA4+m8gWkM3WmzrGxooPbtYyW0bJevdQptuRk1zDXMNewtm1FxwKoDrYtgugNeoPeSExknsyTeXbsKDqXPewsO8vOvvmm8bzxvPH82rWi88DjqXQB6TK6y+guo3ftosW0mBafOyf6BO6vZ0/Hrxy/cvzq6FE3TzdPN0/tdkoDqAx1xNGiRfmI8hHlIw4epPfoPXqvWzfRueyaSBNpYni4sdRYaixdvlx0HKgaj7wMV5ZlWZZ1OsYYY+zYMfVo06aiT8genspTeeq331rmWuZa5vr5nfr01KenPv3hB9G5ACpD7T1ue5/Fx6tf+/cXncuusTSWxm7erCxWFiuLX3lFPci56FhQNR75TnS1p7Ci8Ml8Mp8cEKAeLS8XfUL2MG/mzbyfesphrMNYh7HJybZezqJzATyMrhFdI7pGNGrE5/F5fJ5tClm7hYNP49P4tB071MIxbdrtoygcdUyV3Qioy9Pl6fKef57n8Tye9/XXbCabyWY2biz6BO1aQAtowcWLFeMrxleMt+3mefGi6FgA/85gMBgMBgcH8wXzBfOFr75Sr+0ZDKJz3d/hw0VTiqYUTRk5Epuh1m1Vfie5foN+g37D0KFWV6ur1TUmRvOFxJM8yfN//9fhosNFh4s+Pif3ndx3ct/334uOBfD/fTk2bmQGZmAG2yd57bH15agwV5grzIMGYfPT+qHatiKRF8mL5EWDB1MohVLo7t339APRJNsmbb6+6rr0CxdEJ4L6SX3/fPihep/EnDmi89iDvhz1W7V1JDStMK0wrYiPV+8wHT1abSxVUiL6hO+vUyeextN4WkqKW5pbmlta166iE0H9oivVlepKly/XfOG4vSilIqcipyJn8GAUjvqp2lvaqtsvHz6sbss8ZAjNpJk088YN0Sduj20dPbvFbrFbKSm2O3tF54K6TU6UE+XE2bPJi7zIa9Ei0Xns4cf5cX7cbObP8ef4c76+aOhUv9XYbro2coAcIAd4e9Pf6G/0t7g4NovNYrOcnES/EPbwE/wEP/HTT9Z0a7o13c8ve0D2gOwBWr//BWoLW18OlsgSWeLnn9f0LtcPrR/1o34//siGsCFsiLe3cbhxuHG42Sw6FohV7SOQu9l22WTBLJgFP/88/5h/zD/W0N5ad7FtCSGRRBIlJ7uvdV/rvva//1t0LqjdbH056M/0Z/rzZ59ptnBw4sQLCqSnpaelpwcNQuGAf1fjBcRGndo6flzqLfWWeg8ZwjN4Bs+4fl30C2IPm8PmsDnt2llbWFtYW9g2bezZU3QuqF3U35tBg7Tel8P2frQ2tja2Nh46NDM4Mzgz+OxZ0blAW4QVEBtjU2NTY9O0NPIgD/Lw9eXhPJyH//qr6Fx2fUQf0Udt26pD+qQkua3cVm5bXS19oa6w9eVQf89jYrTal8O22IU5MAfmMGpUVlpWWlaa0Sg6F2iT5obM6lYNsqwWkoQENpvNZrM13HnQ1npzvXW9df2gQXjDwb+rLX05VLadJMaMUZexx8WJTgTaJnwEcjf1F9dkkhZJi6RFzz3H03k6T//lF9G57IqgCIpo1UrqJfWSeiUkuHd27+ze2d1ddCwQSx+qD9WHPvWUdaR1pHVkfLxmC0cgBVKg1cq6s+6s++TJKBxQGZobgdztzie4C9YL1gsJCepWDhru8+FBHuRRWEgZlEEZQ4ao13oyMkTHgpqh36/fr9/v4sIP8UP8UGoqnaATdEKDu0DfbujEjdzIjUFB6t52GzaIjgW1i+YLiI26aqV7d9aINWKNkpO13jBHVVTE2/A2vM2QIaZDpkOmQ+npohNB9bC1C2BJLIklpaay/qw/6+/iIjqXPczMzMy8cKHxmvGa8dr774vOA7WT5qaw7MlyynLKcsrJUQuHj496ND9fdK77a9GCXWVX2dVDh9wC3QLdAvv1E50Iqpat86U0X5ovzU9I0HrhUIWGonBAVag1BcRGnaP917/UR76+thucROe6vxYtJCYxiSUk6LiO6/jAgaITwePxOO9x3uN88+ZqB8yDB2k5LaflPXqIzmVXLMVS7Lp16vtnyRLRcaBuqDVTWPbYLlZyF+7CXZKS6EP6kD7UcJ8Pd3In95s3eQPegDcYOdK01rTWtDY5WXQseDh9L/e93PdykyZlT5Q9UfbEgQPMn/kzfw1/INhMm2nztm1KT6Wn0nPKFPWg1So6FtQNtb6A2Nj2rJLGSGOkMcnJbD6bz+Z36CA61/0VF1tft75ufX3kyCxDliHLkJQkOhH8MXWqytFRXcSxe7d6dNgw0bns4XE8jsfFxjq1c2rn1G7cuKPsKDvKKipE54K6pdZNYdmTHZEdkR1x/rxloGWgZaC3N1/FV/FVWu/r0bSp9J70nvTe3r26Ql2hrtDfX3Qi+COSxKfz6Xz61q3qY+0WDgqjMApLSlILx4QJKBxQnepMAbGxdRbk2TybZ/v42HYPFZ3r/po2pV20i3bt2yevkFfIK4YPF50IiIgY05l1Zp05MpJtYpvYpgkTRCeyy4d8yCc9vaSgpKCkYPRotXCUloqOBXVbnZnCskedeujUSX2UnKxOQXTpIjqXXXrSk76sjHVgHVgHg8H4lvEt41t794qOVd/I8+R58rxVq9gRdoQd+Z//EZ3n/s6ccdzjuMdxz8CB6R3TO6Z31PBWQFCn1LkRyN3UG/kuXWLH2XF23MdH7beQmys6l11GMpKxYUO1t3x0tO5fun/p/jVqlOhY9YW6lc5bb2m+cNz+PZZcJBfJZdAgFA4Qoc4XEBt108bLl6V8KV/K9/amxbSYFmu4r8ftQkJraA2tiYqSw+VwOXzMGNGx6ir5oHxQPvi3v6mPli0Tnccevpqv5qvz8irCK8Irwv39M6MzozOjf/pJdC6on+pNAbGxveEalDYobVDq68vf5e/ydzW8TfXtQsK2sq1s686dd/pIQJVQd1MOCGCX2WV2+eOPReexqy/1pb5Xr6qrC/39bdf6RMeC+q3eFRCbjJcyXsp46coVx2uO1xyv+fnxo/woP/rPf4rOdX+OjiyH5bCcqCh5q7xV3jpxouhEtdWdqcGf6Cf66YsvaD2tp/WSRt8PRUWUTumUPmTI72+kBRBLo2+YmmMrJBWRFZEVkX5+6tEzZ0TnsudOA6Kn6Wl6essW2ydo0blqC7dot2i3aD8/XsgLeeGOHcyduTP3Bg1E5/pjxcW8O+/Ou48YYdulWnQigH9X51dhVVbvY72P9T7Wpo3DbofdDrsTE+kYHaNj2m0YxSN5JI+0WNgNdoPdeOUVxVfxVXxt9yuAjboar08fCqZgCk5MpHW0jtY1ayY61z1ur8KzTrFOsU4ZNSrLM8szy/PQIdGxAP5IvR+B3C17QPaA7AFXr5YlliWWJQ4cSEtpKS3VboMo24iEN+PNeLPPP5ej5Cg56uWXRefSClvrYR7BI3jEgQNaLRy2DwKUSZmUGRCAwgG1AUYgD9CL9+K9eMuWDtcdrjtcj49nvsyX+Xp4iM5l1+0+D6SQQsrMmerUR2Sk6Fg1zS3NLc0trWtXpmd6pk9N1ez2/7b/X2NoDI159VVlqDJUGbppk+hYAA8DI5AHUFe7FBZamluaW5oPHkycOHENN4hSSCGFMfUP07p18gB5gDxg5kzRsWqKuktuhw7SJemSdCkhQbOFw+ZZepaenT8fhQNqI4xAKkmdEmnRgnzJl3wPHaIUSqGUvn1F57If+PYnXH/yJ//ZsxWDYlAMGl6u+ojuXLuKcYhxiDl6lFIplVK7dxedyx52lp1lZ99801hqLDWWLl8uOg/Ao3AQHaC2yc/Pz8/Pv3WrzZg2Y9qM2bFDWiOtkdZ4erIv2Zfsyz//WXS+ewNTPuUzRiVUQiVDhjhzZ+7Mr11Tz0PDI6mHZCvoUrwUL8UnJNAlukSXtLvoQRURoVxWLiuXFy0SnQTgcaCAPKIrCVcSriSUl7dp3aZ1m9a7djn80+GfDv+0dRzs3Fl0vnvYCome9KQfMqR9m/Zt2rcpKsrPzc/Nz619rXbVLUeaNqXn6Dl67sAB+p6+p+81PBIcS2Np7ObNyjZlm7JtxgzRcQCqAq6BPKbTC04vOL3g5k310fDh6lSRhhtE3b5GorbaXbNGDpAD5IDa80m4R1SPqB5RDRvy2Xw2n71rFyVREiV5e4vOZVckRVJkTIxLtku2S/b06epBzkXHAqgKGIFUEXVKqLzcucS5xLlk1y4+j8/j8/r0YSfYCXZCuz2yWQErYAV+fs6hzqHOoRZL/t78vfl7jx0TnetuBoPBYDA4ONzYd2PfjX3bt7MMlsEytL7J5OHDRa2LWhe1Hjfu+AfHPzj+QXm56EQAVQkX0avJndanTcqalDWJjWWD2WA2WPsNo9T7Ed5+2+Rh8jB5aGVTQcZks2yWzRs3MgMzMMO0aaIT2cMX8UV8UVpahbnCXGEeNOj3I1SAugUFpJp1jega0TWiUaMW+hb6FvroaJpFs2jWiBGicz0I/4J/wb9YtcrkanI1ub7+uqgc8jn5nHzugw/YJDaJTZo7V/TrYg9fypfypdnZlmGWYZZhPj625d+icwFUJ1wDqWa5IbkhuSG3bpXkleSV5I0bx2fymXym9htEsalsKpu6cKF8Wj4tn37vvZr++bJJNsmm0FDNF46VfCVf+d13FTkVORU5gwejcEB9ghFIDbNdBG6yqsmqJqt27lSPjh4tOtcDJVESJYWFKS2VlkrL6mu0pC7LDQlRO0eGh4s+7fu7dEm9sdTb29a4THQigJqEEUgNO/fiuRfPvVhWpv7hefFF2yod0bkeyI/8yG/BAvUP/OrVVf306rLcKVPUZcYffST6dO3qR/2o348/sqVsKVvq44PCAfUZVmEJoq7aslr7F/Yv7F/49dfXrl27du1a167qv/bsKTqfXYwYMU/P9lPbT20/tUWL/NT81PzUw4cf9enuNMjqQ32oz7ZtbCPbyDZqsC8HJ068oEDyl/wlfz8/Y4AxwBjw3XeiYwGIpL03aj0THR0dHR1tsbi4uLi4uEyeTJtpM23etk10rgdh8Syexc+ZI+fKuXLuJ5/cPvrQU6K6Ql2hrtDfX9op7ZR2bt9+p8+JxvAMnsEzrl+3NrY2tjYeOjQzODM4M1jDHSwBahCugWiM7X6HC/0v9L/Q/4sv1Fa2kyaJzvVA0RRN0Rs2KC6Ki+Jiu9Paar37P9MX64v1xZ6efC6fy+cePqxuX/7EE6Lj342f5Cf5yZISJjGJSc8/rzCFKezIEdG5ALQEBUSjbIXEbDabzWbbLq1TpojO9UCcOPHPPlOvDQQGqgetVneDu8Hd0Lu3tbW1tbV1SgqdpJN0smVL0XH/mO2GvzFj1O3w4+JEJwLQIs1NGYDq3Llz586d41y9VrJ3r3OKc4pzSqdOFEMxFOPmJjqfXYwYMVluP6/9vPbzOnZ0/sX5F+dfvvvOusS6xLokMZF9zj5nn7duLTrmPQIpkAKtVlbMilnxpElKvBKvxO/eLToWgJZhBFKrSJK6Cmr9evUPtW1vJQ273aKVjGQkY8OGouPc4/Z293wYH8aHBQaaRplGmUZt3Cg6FkBtgAJSKzEmvyO/I78TEcH2sX1sX3Cw6ES1FTMzMzMvXGi8ZrxmvPb++6LzANQmmMKqpfKP5B/JP3LokLOzs7Ozc6tW6tE+fUTnql1CQxWzYlbM774rOglAbYRlvLUa5+pF3r//nQ7SQTqo4RvwtGI8jafxn3yivm5LloiOA1CbYQqrjtGV6kp1pcuXkxd5kVft6fNR7W7fX6P0VHoqPW2r2e5dZgwADw8jkDpGaaw0VhovXsw38o18I6ZmeByP43Gxsc2eafZMs2emTlWPonAAVAUUkDrKJJtkk/zWW/QqvUqvaqWvRw0KozAKS0pyaufUzqndhAlH2VF2lFVUiI4FUJeggNRxSpASpAS9/ba6jHbpUtF5qh0nTjwjo6SgpKCkYPRotXCUloqOBVAXoYDUE+pWHO+8QyEUQiHiGkRVrzNnHGMdYx1jn39e3fX4xg3RiQDqMizjrWfy9+Tvyd/zzTdPlj5Z+mRpSQm1olbUSvutdu3yIi/yys2VHCVHydHX9+T0k9NPTr96VXQsgPoAq7DqOfmYfEw+Nn8+m8PmsDlhYaLzPCy+mq/mq/PyLAMtAy0Dvb3VToAXL4rOBVCfYAqrnjMNMA0wDVi9mubSXJo7b57oPA/Ul/pS36tX2Xw2n83390fhABAHIxD4HV2sLlYXGxREcRRHcZ98QgoppDx8n4/qVVSkfvX1VW8ENJlEJwKoz3ANBH4nf0f+jvwdRmN73p635/n5LIgFsaBhw8QWkuJi3p13592HDTPFm+JN8RkZol8nAMAIBB5AjpVj5dhXX2VX2BV25dNPaT2tp/U10HL29i6+TMd0TDd6tPE142vG1w4eFP16AMD/QwGBh6I7qDuoOzhtGl2my3R5w4bqKiQ8kkfySItFHfn89a9qY6roaNHnDwD3QgGBSpG7yl3lrlOn0nbaTts3bqyqXua2wiEtk5ZJy6ZONe437jfu//JL0ecLAPbhGghUSv6v+b/m/5qd3b5N+zbt22RksLFsLBvbvz+lURqlVb5FLU/lqTz122+l36TfpN8MBuMc4xzjnL17RZ8nADwYlvHCIzGtMK0wrYiPbza+2fhm47t3V48uWcJX8pV85Xff2fu+3//7kiXXP7v+2fXPevUy9jT2NPY8elT0eQHAw8MUFlQL1zDXMNewJ55o2L1h94bd27UryynLKcu5cuX0gtMLTi+4eVN0PgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAO/4PSBxbMqgmA24AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTctMTItMTVUMTU6NTc6MjcrMDg6MDCiEb4vAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE3LTEyLTE1VDE1OjU3OjI3KzA4OjAw00wGkwAAAE10RVh0c3ZnOmJhc2UtdXJpAGZpbGU6Ly8vaG9tZS9hZG1pbi9pY29uLWZvbnQvdG1wL2ljb25fY2sxYnphMHpqOWpqZGN4ci9jaGVjay5zdmfbTpDYAAAAAElFTkSuQmCC');
-  background-size: contain;
-}
-
-.icon-close:before {
-  content: ' ';
-  display: block;
-  width: 16px;
-  height: 16px;
-  position: absolute;
-  margin: auto;
-  left: 0;
-  right: 0;
-  top: 0;
-  bottom: 0;
-  z-index: 9999;
-  background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADIEAYAAAD9yHLdAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAZiS0dEAAAAAAAA+UO7fwAAAAlwSFlzAAAASAAAAEgARslrPgAADwRJREFUeNrt3V1sU+cZwPHndTAjwZ0mbZPKR/hKm0GqtiJJGZ9CIvMCawJoUksvOpC2XjSi4kMECaa2SO0qFEEhgFCQSqWOVWqJEGJJuyYYWCG9QCIOhQvYlgGCIFmatrVSUhzixO8ujNM1gSZOfPye857/7wYlfPg5xj5/n/fExyIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABATizsWti1sCs/v6y0rLSsdMaMZ/Y8s+eZPZMnm54LQO6kn/fp/UB6v2B6LrdRpgcwZf7e+Xvn7505MxAIBAKBrVt1ja7RNdXVaqlaqpbOmTP0z+u9eq/ee/euFEqhFH7ySeCjwEeBj+rr299of6P9jb//3fT2AMhcWVlZWVnZ3Ln6uD6uj2/eLF3SJV1VVapW1ara6dOH/nn9hf5Cf3HzpupW3aq7qSl5LHkseay+/nLt5drLtbdvm96eXPNZQJQqn1Q+qXzS73+vN+gNesObb0q7tEv7xImZ/kv6kr6kL/X3q0PqkDpUXx/aFNoU2rRz53l1Xp1X/f2mtxTAcMv1cr1cT5jQfb37evf1ujrpkR7p2bxZ1agaVZOXl/E/WCM1UnP/vv5cf64/f+utjg87Puz4cPfu1G9qbXp7neaTgChVeqD0QOmBP/5RHVPH1LHf/CbrN1EplVLZ2iqt0iqtv/51NBqNRqP37pnecgDpI42CgtTz9OTJ1PO0sjLbt6PX6/V6/Z/+1LG5Y3PH5g0bHnzX2pBkXlyPKTtadrTs6Ouvq/fV++r9LVscu6EbckNuPPGEhCUs4UWLpsanxqfGT5yIxWKxWCyRMH0/AH40GI6whCXc3Cyn5bScDoeduj11RV1RV559dkrFlIopFX19sauxq7GrbW2m7wenBEwP4JT0OY7UV6+/nrMbjkhEIitWSIVUSEVLS0ljSWNJYyhk+v4A/GQwHHtkj+xpahp8XuaImqwmq8m7di2oXlC9oHr2bNP3h1OsDUhgfWB9YP2WLdIgDdLwgx/kfICzclbOLluW35Hfkd/x5z8PPqABOGbYEcd22S7bKypyPsiDc6v9df11/XWvvWb6fnGKtQHRj+nH9GOrV5ueY/CVz4MHNCEBsm9YOHJ8xPEo6og6oo64YD/k1PaZHiDbvruD/uYb0/MMUyEVUtHWFi+Pl8fLf/Wray9ee/Haiz09pscCvGjYUpWpI44RBE8FTwVPFRRcLLxYeLEwHjc9T7ZYdwSi2lSbavvxj03P8UgsbQHj5pqlqlFK9iZ7k70u3i+NkXUB6Tvcd7jv8H//a3qOEXGyHciY6ZPjYzXw0sBLAy95YL+UIeuWsNJK75feL71/545arBarxYWFpucZUVjCEj53LvWEqK7mfSTAt9x6jmNEi2WxLL59O3ooeih6aNYs0+Nkm3VHIIO6pEu6Pv3U9Bijxsl2YBjPhiOtUAql0EP7oQxZG5C8SXmT8ibt35++5IjpeUaNpS3As0tVabpBN+iGgQE5Lsfl+KFDpudxirUBuTT90vRL0//xj/S1qkzPkzFOtsOHvHZy/FFUsSpWxfv2pZai//Y30/M4xfpLmRR/VvxZ8Wd//Wvf7b7bfbd//vPBS454xU25KTdnz+YSKbCZ55eq0h5cE2/OB3M+mPPBb3977dq1a9eu2XstLGtPog+Vvp5/X1tfW19bU5N6V72r3v3FL0zPlTHeRwKLeOV9HCPaLbtl94UL8a/jX8e/fv55vzwvfROQNEICmEc47OC7gKQREiD3CIddfBuQNEICOI9w2Mn3AUkjJED2EQ67EZAhCAkwfoTDHwjIIxASIHOEw18IyAgICTAywuFPBGSUCAkwHOHwNwKSIUICEA6kEJAxIiTwI8KB/0dAxomQwA8IBx6GgGQJIYGNCAe+DwHJMkICGxAOjAYBcQghgRcRDmSCgDiMkMALCAfGgoDkCCGBGxEOjAcByTFCAjcgHMgGAmIIIYEJhAPZREAMIyTIBcIBJxAQlyAkcALhgJMIiMsQEmQD4UAuEBCXIiQYC8KBXCIgLkdIMBqEAyYQEI8gJHgYwgGTCIjHEBKIEA64AwHxKELiT4QDbkJAPI6Q+APhgBsREEsQEjsRDrgZAbEMIbED4YAXEBBLERJvIhzwEgJiOULiDYQDXkRAfIKQuBPhgJcREJ8hJO5AOGADAuJThMQMwgGbEBCfIyS5QThgIwICESEkTiEcsBkBwXcQkuwgHPADAoKHIiRjQzjgJwQE34uQjA7hgB8REIwKIXk4wgE/IyDICCFJIRwAAcEY+TUkhAP4FgHBuPglJIQDGI6AICtsDUl+XX5dfl0ySTiA4QgIsmrwlXpYwhJubpaIRCSyYoXpuTIWlrCEz50b/Nrr2xGRiESqq6PRaDQavXfP9FiwAwGBI6w5IvEqjjiQAwQEjiIkOUY4kEMEBDlBSBxGOGAAAUFOEZIsIxwwiIDACEIyToQDLkBAYBQhyRDhgIsQELgCIRkB4YALERC4CiEZgnDAxQgIXMn3ISEc8AACAlfzXUgIBzyEgMATrA8J4YAHERB4inUhIRzwsIDpAYBMJNYm1ibWKqUeV4+rx5X3XwCdkTNyxoLtgC/xwIUnWPN5HI/i8Ge2A04gIHA168MxFCGBhxAQuJLvwjEUIYEHEBC4iu/DMRQhgYsRELgC4RgBIYELERAYRTgyREjgIgQERhCOcSIkcAECgpwiHFlGSGAQAUFOEA6HERIYQEDgKMKRY4QEOURA4AjCYRghQQ7kmR4AdhkMR1jCEm5uliNyRI54MBxhCUv43DkpkiIpunVLbspNuTl7tumxRu2W3JJbM2cGC4IFwYKFC6fGp8anxk+ciMVisVgskTA9HuzAxRSRFcOOOCISkciKFabnylj66ril8dJ46Zo1wY3BjcGNVVV6m96mt505Y3q8jKX/HyqkQipaWkoaSxpLGkMh02PBDixhYVysWaoa4bLq1lxGnqUtZBEBwZj4JRxDERLgWwQEGfFrOIYiJAABwSgRjocjJPAzAoLvRThGh5DAjwgIHopwjA0hgZ8QEHwH4cgOQgI/ICAQEcLhFEICmxEQnyMcuUFIYCMC4lOEwwxCApsQEJ8hHO5ASGADAuIThMOdCAm8jIBYjnB4AyGBFxEQSxEObyIk8BICYhnCYQdCAi8gIJYgHHYiJHAzAuJxhMMfCAnciIB4FOHwJ0ICNyEgHkM4IEJI4A4ExCMIBx6GkMAkAuJyhAOjQUhgAgFxKcKBsSAkyCUC4jKEA9lASJALBMQlCAecQEjgJAJiGOFALhASOIGAGEI4YAIhQTYRkBwjHHADQoJsICA5QjjgRoQE4xEwPYDtbAtH4kriSuIKT1BbXCy8WHixMB6fuGzisonLVq/W2/Q2ve3MGdNzZeysnJWzy5blt+e357f/5S8ljSWNJY2hkOmxbMcRiENsDcfV7Ve3X93+zTemx4IzOCJBJghIlhEO2ICQYDQISJYQDtiIkOD7EJBxIhzwA0KChyEgY0Q44EeEBP+PgGSIcACEBCkEZJQIBzAcIfE3AjICwgGMjJD4EwF5BMIBZI6Q+AsBGYJwAONHSPyBgDxAOIDsIyR2831ACAfgPEJiJ98GhHAAuUdI7OK7gBAOwDxCYgffBIRwAO5DSLzN+oAs18v1cj1hQk95T3lP+aefpr77y1+anitje2SP7Dl7NhW+1auj0Wg0Gr13z/RYQDYMvsALS1jCzc0SkYhEVqwwPVfGKqVSKltbQ++E3gm9U1V1Xp1X51V/v+mxnGL9B0p1X+++3n29ri71FeEA3GjwcR2RiESqq1MhOXfO9FwZa5VWaa2s7DnYc7Dn4O7dpsdxmrUBKX+7/O3yt3/2M5krc2Xupk2m58lYeqkqmogmomvWEA74QfpxHtwY3BjcWFXl1U9I1Iv0Ir1o69b53fO753fPm2d6HqdYG5BkXjIvmbd1q3pOPaeemzDB9Dyjlj7i2Ck7ZeeqVZzjgB+lP2o3dU5kzRqvHZGoGlWjavLyAg2BhkDDa6+Znscp1gZEzVQz1cyqKtNzjBpLVcAwnl/aOi7H5biH9kMZsi4gCzoXdC7o/OEPZZ/sk33TppmeZ0QsVQEj8vbS1owZJY0ljSWNoZDpSbLNuoAMrBtYN7DuRz8yPceIWKoCMubVpa3Q/ND80HwP7JcyZF1ARIkS9e9/mx7jkTjiAMbNa0ckgUmBSYFJ//mP6Tmyzdr3gZTGS+Ol8Rs31FK1VC2dM8f0POkjjuCTwSeDT1ZXp19JmR4LsIFr30eyQ3bIjs7O6AvRF6IvFBebHifb7DsCeUA1qAbV0Nxseg7CATjPrSfb9VP6Kf2UC/ZDDrE2IMlkMplM7t8vNVIjNffv53yAIUtVhANwnluWtvRhfVgf7u1VL6uX1csHDpi+X5xibUAu116uvVx7+3bqqz/8IWc3nD7imBecF5y3ciUnx4HcM36yPSlJSb71VrQj2hHtuHPH9P3hlDzTAzgt1hRrijW1tU3ZMWXHlB1z5qgr6oq68uyzWb+h/bJf9re0BIuCRcGitWs54gDMi8VisVgskZganxqfGj9xInWtqvJyuSE35MYTT2T79vRJfVKfPHas4+mOpzuerq01vf1Osz4gabGWWEus5dSpaV9N+2raV4mE7JJdsmvJEmmXdmnP/J3q+pK+pC/190undErn3r1FkaJIUeR3vzv9yulXTr/S12d6ewF8Kx2S4gvFF4ovfPxxX29fb19vQYE+qo/qowsWqPfUe+q9QMYrMumlKlklq2TVm29+Nxxam95up1n7U1gjKSstKy0rnTFDr9Qr9cotW1SLalEtq1enfgy4qOjhf+vOHVkn62TdJ58M3B24O3C3vv7Lg18e/PJgZ6fp7QGQufQ18/QpfUqf2rw59d3nn0/9OmPGsL+wRJbIkn/+U7+qX9WvNjUFZgVmBWbV17cXtBe0F3R1md6eXPNtQB4l/fkEiTWJNYk1P/1p+n0lvF8D8I/BHwvWokX/5CehaCgaiv7rX6nLs/f2mp4PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAtvsf2vlfs7i0WI4AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTctMTItMTVUMTU6NTc6MjcrMDg6MDCiEb4vAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE3LTEyLTE1VDE1OjU3OjI3KzA4OjAw00wGkwAAAE10RVh0c3ZnOmJhc2UtdXJpAGZpbGU6Ly8vaG9tZS9hZG1pbi9pY29uLWZvbnQvdG1wL2ljb25fY2sxYnphMHpqOWpqZGN4ci9jbG9zZS5zdmdHkn2WAAAAAElFTkSuQmCC');
-  background-size: contain;
-}
-
-.icon-right:before {
-  content: ' ';
-  display: block;
-  width: 16px;
-  height: 16px;
-  position: absolute;
-  margin: auto;
-  left: 0;
-  right: 0;
-  top: 0;
-  bottom: 0;
-  background-size: cover;
-  z-index: 9999;
-  background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADIEAYAAAD9yHLdAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAZiS0dEAAAAAAAA+UO7fwAAAAlwSFlzAAAASAAAAEgARslrPgAAJ4pJREFUeNrt3XtcVXW6P/Dn2VwCBxUzNbnkkXRSGzXW2huQRLyMIqKRJF7Q1CkrDS+VGp3Gy9g5YzI6qVsNfTmlqGmipQiIiJqAcnOvhaKRHidshoatpKaBogL7OX+s6Mz8flO5CfzutXne/+zXWhR8QOXZ3+93Pd8vAHuAEKW10lpp7dix0mXpsnR5/34pX8qX8r/7TpZlWZaJGl//9f6+fY3/X+PnEf2dMMYY/yJqYcbbxtvG2/7+lEM5lLN7NyyCRbBowICmfj56m96mt/PzDZGGSEPkxImWNpY2ljYVFaK/T8ZY6+MiOoCzMn1t+tr09a9/TQfpIB0sLITlsByW9+r1Sz8v5mEe5vn7Q3toD+0nT/Y77Xfa73ROTuWNyhuVNyorRX/fjLHWg0cgzUybcmrThvIoj/JUFcMwDMOeeKLFvmA8xEN8TQ2sh/Ww/rnnFFVRFfXwYdE/B8aY8zOIDuBsqDf1pt6vvdbihaPRBtgAG7y8wAQmMKWlyflyvpw/aZLonwNjzPlxAWlWiOiN3ugdH//Av7QFLGBxd4dzcA7O7dgh75H3yHvmzBH9E2GMOS+ewmomplhTrCn2qads5bZyW3lJieg8jWgADaABf/yjul5dr65fvPj7uyQ6F2NM/3gE0kxsb9vetr3do4foHP8vLMACLPj977W1mS1bwimcwsnVVXQuxpj+cQFpLt/Ct/BtmzaiY/y0adNqltYsrVmakqIVEg8P0YkYY/rFj/E2E5+zPmd9znbpAggI+PzzovP8qItwES727n23w90OdzuEhfl86fOlz5f79lmtVqvVeveu6HiMMf3gEUgzqVfqlXqluFi7qqsTnefnYCImYmJ4OOVSLuWeONF/Zv+Z/Wf6+orOxRjTD15Eb2ZSlVQlVWVkYCRGYuSoUaLz3C86QSfoRHk5lVAJlURElISWhJaE/vWvonMxxhwXj0CaGT1Lz9KzS5eCDDLI+nnaCQfiQBwYEID1WI/1J05oi+6SJDoXY8xx8RpIM7tccbnickVlZdekrkldk4gwAzMwY8gQ0bnuF2ZhFmZ5eWkd7pMn+1T4VPhUKIq2RvLll6LzMcYcB09htShE6YJ0Qbqwdi3GYRzG6bCxbxbMgll372ojqilTlEAlUAncu1d0LMaYeDyF1aKI1CfUJ9Qn5s6FuTAX5r71lt6mtiAJkiDpoYeojuqo7uOP5VQ5VU6dOVN0LMaYeDwCecCkFClFSpk+HcbBOBi3eTOa0IQm/TX20RbaQlsSE9V+aj+131tvic7DGHvwuIAIIp+Xz8vno6OpJ/Wknrt2YRAGYZCnp+hcdpsAE2DC++8rbypvKm82TtHZbKJjMcZaHhcQwYxnjWeNZ8PDaTpNp+mpqdrd9u1F52qa/fu9LF4WL8ukSTmYgzl4547oRIyxlsNrIIJZ+lr6Wvrm5GBv7I29Bw6EN+ANeOMf/xCdq2mefbbGWGOsMR48GHQx6GLQxXbtRCdijLUcfozXQVSWVpZWllZV+df51/nX7dtH8RRP8aNGwQk4ASc6dhSdzz7du9NVukpXR4zoFNMpplPM/v1Xsq9kX8m+dUt0MsZY8+ERiIMpTitOK067dMm1zrXOtS4sTLurqqJz2e04HIfjsuw623W26+yCgsD8wPzAfMfbrZgx1nRcQBxUUVxRXFHclSu1CbUJtQnh4dpd/R1V+0OHuxGNaMzLazw3RXQuxtgvx4voOtEnpU9KnxR3d88yzzLPsu3bIQ3SIG38eNG57BYEQRB04wZVUzVVP/OMukPdoe7IyxMdizFmPx6B6ETZ+LLxZePv3Qv4PODzgM/j4mg37abdGzeKzmW3YiiGYm9vHIyDcXB2tlwil8gl48aJjsUYsx+PQHROTpaT5eSEBDCDGcwrVojOYy9KoiRKamgAK1jBOmuWGq1Gq9GbN4vOxRj7eVxAnISUKWVKma++ihVYgRXr1sEm2ASbDPoZYTZu8bIJNsGmd95RUEEF//AH0bEYYz9OP79g2E9SI9VINfL996mWaql23DjaQBtog44a+RRQQEEEIxjBuHSptgml2ax9UEeFkLFWhEcgTko7z2PIECqiIiravx+DMRiD9drYt3MnEBDQ9OmKqqiK6vgnPjLWGvA7OyelKIqiKJ99pj31NHQovAavwWtVVaJzNU1cHKyCVbAqM/Ppjk93fLpj27aiEzHGeATSahjTjenG9IAAOkyH6XBWFpyEk3BSf419tISW0JJTp2wdbB1sHaKiTg86Pej0oG++EZ2LsdaIC0grozXyPfpow7SGaQ3TMjNxKS7FpTps7CMgoPPntYuICG1q6+9/Fx2LsdaEC0gr1Z/6U3/y9nZNcE1wTThwAI7CUTjauHWK3litVEEVVDFypFqlVqlVpaWiEzHWGvAaSCt1Bs/gGbxx46bfTb+bfsOHUxqlUZpej6rt2hVX4kpcefy4sYOxg7HD00+LTsRYa8AjEAYAALGxsbGxsS4u5XK5XC4nJcEe2AN7XnpJdK6muX1bex0/XnuYICNDdCLGnBEXEPZvIMokk0xLlzb2ZYhOZK/GDne8htfw2iuvKJFKpBL5wQeiczHmTPg8EPZvWZdZl1mXHT/uY/Yx+5ivX4cn4Ul4MiLih4Y/B4cZmIEZBgPchJtwc8wY33Lfct/y2trKO5V3Ku+cPCk6H2POwOF/ETDHoDUmxsVpV1u3aq9ubqJzNY3ZrE1tvf66ds1nuDPWFFxAmF0C9wTuCdwzbBj6oi/67tuHc3AOztFfYx9Npak0dft2TMZkTH7xRe5wZ8x+XEBYk5i6m7qbuptMtlG2UbZRGRlQCIVQ2KmT6Fx2i4RIiExPh0zIhMwJE7SRSeMiPGPsp3ABYb+INrXVq5d2lZWlvT72mOhcdiMgoKIi7WL0aG1EcvWq6FiMOTLuA2G/iPaOvbEjPCQEBsEgGKTDRj4EBAwOhkWwCBbl5BhvG28bb/v7i47FmCPjEQhrVn379u3bt2+HDm55bnlueWlpOAyH4TAdNvaFQiiE/u1v2Bk7Y+eICMtiy2LL4gsXRMdizJHwY7ysWVVVVVVVVd2545Ptk+2T/fHH2t3GvbZ+/WvR+e5bBVRAhbc3zaJZNCsu7lG3R90edcvLu6xcVi4rX38tOh5jjoCnsFiLaFyMDggICAgIiI6mPbSH9uivkQ/n4Tyc9/DDBjSgAbOzA/MD8wPzR44UnYsxR8BTWOwBQpTmS/Ol+StW4HE8jsfffFN0IrsZwQjGe/dgGkyDadOnK6FKqBK6a5foWIyJwFNY7IGyFlgLrAVHjnTd3nV71+03buDj+Dg+PmKEXjrcoRIqodLFBaqgCqpiYnzAB3ygpsZqtVqt1oIC0fEYe5C4gDAhrNus26zbiop8yZd86dIlqIEaqBk9Wvuoi+P/vbSCFayNBW/EiK5ZXbO6Znl6WpOsSdako0dFx2PsQXD8d3ysVZCWS8ul5aNH4yf4CX6ye7d2t00b0bmaJjnZy+Jl8bLMmJGDOZiD9fWiEzHWEriAMIciS7IkS8HB2lV6utaf8cgjonPZi+IpnuIPHHAf7j7cffjEiYX+hf6F/rW1onMx1pz4KSzmULQO8KKihjUNaxrWhIdTPuVTfkWF6Fz2wg24ATc888y9gnsF9woyM7XC2L696FyMNScuIMwhnR50etDpQWVltI7W0bqwMMqjPMrTXyMfJmIiJoaHUy7lUu6JE/1n9p/Zf6avr+hcjDUHnsJiuhBSEVIRUvHww3Xn6s7VnUtP17YcGTBAdC57USIlUuKlS7YDtgO2AxERp82nzafNFy+KzsVYU/AIhOmCtoZw/bpWQIYPh9WwGlYfOiQ6l70wARMwoXt3wzjDOMO4vDxtM0pJEp2LsabgAsJ0pXRh6cLShbdu1V6uvVx7OTqaUimVUvXXyIev4+v4epcuEA/xEJ+To62RjBghOhdj9uApLOYEELVfwCtXak9tzZ8vOpHdvu9wJ5lkkp9/Xn1ZfVl9OSVFdCzGforjN2wxdh+0TvDDh31W+KzwWXHnDtRDPdQPG/avDX8OrLHDfQbMgBkxMT6jfUb7jK6qsn5s/dj6scUiOh5j/47j/8NirAm0tYVp0+gUnaJTf/kLmtCEJldX0bnsRVtoC21JTFT7qf3Ufm+9JToPY/+MCwhzavJ5+bx8PjqaelJP6rlrFwZhEAZ5eorOZbcJMAEmvP++8qbypvLmnDnaTZtNdCzWunEBYa2C8azxrPFseDhNp+k0PTVVu6vDxr4oiIKoffu8lnkt81oWF6dtlXLnjuhYrHXip7BYq2Dpa+lr6ZuTg72xN/YeOBDegDfgjX/8Q3Quu2VABmSMHVtjrDHWGA8eDLoYdDHoYrt2omOx1okX0VmrUllaWVpZWlXlX+df51+3b5+2Z9WoUXACTsCJjh1F57NP9+50la7S1REjOsV0iukUs3//lewr2Veyb90SnYy1DjwCYa1ScVpxWnHapUuuda51rnVhYdpdVRWdy27H4Tgcl2XX2a6zXWcXFGgnJvboIToWax24gLBWrSiuKK4o7sqV2oTahNqE8HDt7uHDonPZCwfiQBwYEIBGNKIxL88Ua4o1xTaeRc9Yy+BFdMb+SZ+UPil9UtzdPcs8yzzLtm+HNEiDtPHjReeyWxAEQdCNG1RN1VT9zDPqDnWHuiMvT3Qs5lx4BMLYPykbXza+bPy9ewGfB3we8HlcHO2m3bR740bRuexWDMVQ7O2Ng3EwDs7OlkvkErlk3DjRsZhz4REIY/dBTpaT5eSEBDCDGcwrVojOYy9KoiRKamjQOvNnzVKj1Wg1evNm0bmYvnEBYcwOUqaUKWW++ipWYAVWrFsHm2ATbDLoZyQvgwwykZb7nXcUVFDBP/xBdCymT/r5i8+YA1Aj1Ug18v33qZZqqXbcONpAG2iDjhr5FFBAQdQ2b1y6VLogXZAumM3aB3VUCJlD4BEIY7+AtufWkCFUREVUtH8/BmMwBuu1sW/nTiAgoOnTtaOF6+pEJ2KOjd9xMPYLKIqiKMpnn2lPPQ0dCq/Ba/BaVZXoXE0TFwerYBWsysx8uuPTHZ/u2Lat6ETMsfEIhLFmZEw3phvTAwLoMB2mw1lZcBJOwkn9NfbRElpCS06dsnWwdbB1iIrSzqj/5hvRuZhj4QLCWAvQGvkefbRhWsO0hmmZmbgUl+JSHTb2ERDQ+fPaRUSENrX197+LjsUcAxcQxlpQf+pP/cnb2zXBNcE14cABOApH4Wjj1il6Y7VSBVVQxciRapVapVaVlopOxMTiNRDGWtAZPINn8MaNm343/W76DR9OaZRGaXv3is7VNF274kpciSuPHzd2MHYwdnj6adGJmFg8AmHsAYqNjY2NjXVxKZfL5XI5KQn2wB7Y89JLonM1ze3b2uv48drDBBkZohOxB4sLCGPCIMokk0xLlzb2ZYhOZK/GDne8htfw2iuvKJFKpBL5wQeic7EHg88DYUwg6zLrMuuy48d9zD5mH/P16/AkPAlPRkT80PDn4DADMzDDYICbcBNujhnjW+5b7lteW1t5p/JO5Z2TJ0XnYy3L4f+CMtaaaI2JcXHa1dat2qubm+hcTWM2a1Nbr7+uXfMZ7s6GCwhjDihwT+CewD3DhqEv+qLvvn04B+fgHP019tFUmkpTt2/HZEzG5Bdf5A5358IFhDEHZupu6m7qbjLZRtlG2UZlZEAhFEJhp06ic9ktEiIhMj0dMiETMidM0EYmjYvwTK+4gDCmA9rUVq9e2lVWlvb62GOic9mNgICKigwHDAcMB6KiTvmd8jvld+2a6FisabgPhDEd0N6xN3aEh4TAIBgEg3TYyIeAgMHBtmJbsa04NzfoYtDFoIt+fqJjsabhEQhjOtS3b9++fft26OCW55bnlpeWhsNwGA7TYWNfKIRC6N/+hp2xM3aOiLAstiy2LL5wQXQsdn/4MV7GdKiqqqqqqurOHZ9sn2yf7I8/1u427rX161+LznffKqACKry9aRbNollxcY+6Per2qFte3mXlsnJZ+fpr0fHYT+MpLMZ0rHExOiAgICAgIDqa9tAe2qO/Rj6ch/Nw3sMPG9CABszODswPzA/MHzlSdC7203gKizGngyjNl+ZL81eswON4HI+/+aboRHYzghGM9+7hLbyFt6ZNs+yw7LDsaBxpMUfBU1iMOSFrgbXAWnDkSNftXbd33X7jBj6Oj+PjI0bopcMdKqESKl1coBt0g27PPecDPuADNTVWq9VqtRYUiI7HNFxAGHNi1m3WbdZtRUW+5Eu+dOkS1EAN1IwerX3UxfH//VvBCtbGgjdiRNesrlldszw9rUnWJGvS0aOi47V2jv9OhDHWbKTl0nJp+ejR+Al+gp/s3q3dbdNGdC67xUAMxGzd6vW219teb7/0Ug7mYA7W14uO1dpwAWGsFZIlWZKl4GDtKj1d68945BHRuexFGZRBGamp7nXude51kyYV+hf6F/rX1orO1VrwU1iMtULanlRFRQ1rGtY0rAkPp3zKp/yKCtG57IVRGIVR0dH3Cu4V3CvIzNQKY/v2onO1FlxAGGvFTg86Pej0oLIyWkfraF1YGOVRHuXpr5EPEzERE8PDKZdyKffEif4z+8/sP9PXV3QuZ8dTWIyxHzyV+1TuU7mdOhm+NXxr+DYjA9/Bd/Adk0l0LnvRCTpBJ8rLaRgNo2FhYSX5Jfkl+ZWVonM5Gx6BMMZ+oI1Ivvnmzt07d+/cHTpUu3v4sOhc9sKBOBAHBgQYFhsWGxbv3dsnpU9KnxR3d9G5nA2PQBhjP6rxF69HqEeoR+jWrRiN0Rg9aZLoXE3z6qta535SkugkzoILCGPsPhkM0gXpgnRhzRqMwziMmzNHdKL7thAWwsKvvlImKhOVid27i47jLLiAMMbsJifLyXJyQgKchJNw8t139dLhjs/is/hsr16862/z4DUQxpjdlGnKNGVaYiJFURRFvfIKJVESJTU0iM71s76Bb+Cb3/xGdAxnwQWEMdZkarQarUZv3ky9qTf1Hj8eXoFX4BWbTXSuH0PP0rP07K9+JTqHs+ACwhhrstjY2NjYWBcX3ISbcFNUFGyCTbDJ4Li/VxbCQljIW540F8f9g2aMOSztjPY2bb7c8OWGLzccOIC7cBfueuEF0bl+ViqkQuqNG6JjOAtX0QEYY/rReJQuHaWjdFRHR+nKIINMVLerblfdLotFdBxnwQWEMfazgi4GXQy66OfXcLbhbMPZrCwYBsNgWJ8+onPdL/oT/Yn+lJ9f6l3qXepdVSU6j7PgAsIY+1HaVFWvXg0TGyY2TMzK0u4+9pjoXPYypBhSDCl//KPoHM6G10AYY/8fU3dTd1N3kwlCIARCcnO1u/orHPQcPUfPbdpkednysuXlzEzReZwNj0AYYz+Q3pbelt6OiLBdt123Xf/kEyiEQijU32OvFE/xFH/gwHc139V8VzNvnug8zsrhO0cZYy1Pm6qKi9Outm7VXt3cROeyF31Kn9Kn27bhWByLY2fM0M49qasTnctZ8RQWY62Ysaexp7Hn7NlaA+D27dpd/RUOjdmsdlO7qd2mT+fC8WC4iA7AGHvwftjL6jSchtPvvaeXvaz+7xvQHssld3In94QE9Zh6TD22eLHoWK0Nj0AYawUaO8blcrlcLt+0CcxgBvOKFaJz2YtO0Sk6VV+P5/E8np8xQ/1U/VT9dOVK0blaK/2842CM2a2HuYe5h/mhh9pvbb+1/dbt2wEBAWNjRedqmtu3tU7y2FjFT/FT/A4eFJ2oteMRCGNOSDsIysurXVy7uHZxaWm6LRxzYS7M/fZbLMdyLB8xgguHY+ERCGNOJHhn8M7gnV261I2pG1M3JjMTB+NgHBwYKDqX3QbAABhQWQn5kA/5I0dqi+Jnz4qOxf4Vj0AYcwJBY4LGBI3p3r3erd6t3i0vT7eFIwzCIOyLL7TCMWAAFw7HxiMQxnTMOMU4xTjlN78hb/Im76wsKIACKPDxEZ3LXrSEltCSU6dwGS7DZaNGaYXj6lXRudhP4050xnRIJplkGjyYjGQk4/792t327UXnshfNp/k0/8gRzxc8X/B8ISbm5LWT105eq64WnYvdH57CYkxH5PPyefl8dDQVUREVNe7tpL/CAdEQDdEffYSrcBWuGjWKC4c+8RQWYzogpUgpUsr06TAOxsG4zZvRhCY0uep0BsFsVhRFUZTXX9euHfcIXPbTuIAw5sB+6BjXaeNfY8e4dtTtO+8oqKCCf/iD6Fiseej0HQxjzgxRKpPKpLJVq+B5eB6ef+MN0YnsRUmUREkNDWAFK1hnzVJRRRU3bxadizUvHoEw5gC0xj93d4+rHlc9riYn4wf4AX4wcaLoXHabBbNg1t27WIqlWDp5ssVsMVvMn3wiOhZrGVxAGBOo38p+K/ut/NWv3ILdgt2C9+6F1+F1eH3kSNG57BYEQRB04wZVUzVVP/OMukPdoe7IyxMdi7UsLiCMCRBSEVIRUvHww3Xn6s7VnUtPh0WwCBYNGCA6V9NYrbZSW6mtNDKypK6krqTuzBnRidiDwY/xMvYABa4KXBW4qlu3ex3vdbzXMT9fr4WDTtAJOlFerl2FhXHhaJ14EZ2xB+Cp3Kdyn8rt0weDMRiDDx3CUAzFUH9/0bnstgyWwTKLpX59/fr69VFRpUqpUqpUVYmOxcTgKSzGWpAsyZIsBQdrV+np2q64jzwiOpfdhsNwGH7smMuLLi+6vDh2bHHP4p7FPb/7TnQsJhZPYTHWAqTl0nJp+ejRWsE4dky3hSMKoiBq3z6vd73e9Xo3KooLB/tnPAJhrBlJnaXOUucpU9Af/dH/ww+1uzo8YzwVUiF1wwbt/I25c7Wb3DHO/hWfic5YM5COSEekI/PmYSAGYuDGjdoZ4/rbaoS20Bbakpio9lR7qj0bGxiJROdijkl3f8EZcxyIUqlUKpW++y7+Dn+Hv0tIEJ3IXo0d42hFK1pnz1b7qf3Ufhs3is7F9IGnsBizQ2xsbGxsrItL+ZflX5Z/uXGjtrYxY4boXHb7vmOcbGQj29Sp6svqy+rLKSmiYzF94QLC2H3oYe5h7mF+6KH2Ie1D2ofs3Kn9Ao6JEZ3LbvEQD/E1NRADMRATE6N4K96Kd3a26FhMn7iAMPYT+lN/6k/e3q5GV6OrMS1NuztwoOhc9qLVtJpWX7liWGRYZFgUGWnJteRacktKROdi+sZrIIz9G7Isy7LctSscgANwoPHgpv79ReeyFyVSIiVeumTba9tr2xsRoeaquWruxYuiczHnwCMQxv6JVjgefxwICCgrS1vjePxx0bnsRTmUQznnzjUsaFjQsGDkyDMbz2w8s/Ef/xCdizkXbiRkDAACQwNDA0ONRgiBEAgpKNBt4UigBErIycFBOAgHDRzIhYO1JB6BsFZNmi3NlmYPHQprYA2s2bdP26uqXTvRuexFGZRBGamp7nXude51kyYV+hf6F/rX1orOxZwbr4GwVklaK62V1o4dC8EQDME7d2qFw8NDdC67xUAMxGzd2rZL2y5tu7z0Ug7mYA7W14uOxVoHHoGwVkUaJA2SBsXH4xScglPMZu2sboPupnJ/6Bjvp/ZT+731lug8rHXiAsJaBTlZTpaTExLADGYwr1ghOo/93wDIIBNBOIRD+IIFymRlsjL5vfdEx2Ktm+7eeTF2Pxo7xqW/Sn+V/pqUpNvCYQQjGO/dw9t4G2/HxXHhYI6ERyDMqfzQMX69/fX217dtgzRIg7Tx40XnspsJTGC6dcs21TbVNnXcuJLQktCS0EOHRMdi7J/xCIQ5hT4pfVL6pHh5tYtrF9cuLi1Nr4WD1tJaWnv9uo1sZKPhw7lwMEfGIxCma8E7g3cG7+zSpf7P9X+u//PBg9pdSRKdy26hEAqhf/sbdsbO2DkiwrLYstiy+MIF0bEY+yn8GC/TpaAxQWOCxnTvXu9W71bvlpWl3e3ZU3Quu/0efg+/Lytz6evS16VvRIR24t/XX4uOxdj94ALCdMU4xTjFOOU3v2mIbIhsiDx0CFbACljh6ys6l90ICKioyBBkCDIERUUV+xX7FftduyY6FmP24CkspgvGs8azxrPh4TSdptP01FTtbvv2onPZbR2sg3VpaW7+bv5u/hMmcMc40zNeRGcOzfhfxv8y/tczz9j62PrY+jTuiqu/wkGf0qf06bZtMBtmw+znnuPCwZwBj0CYQ9J2xZ02jU7RKTr1l7+gCU1o0t8Z4xqzWVEURVFee0275jPGmXPgEQhzKD90jMsgg7xli+4Kx/cd49SNulG3N9/UCse8edoHuXAw58IjEOYAEOW18lp57Z/+BNtgG2xbsEB0IntpI6X6esNgw2DD4Fde0U78+/BD0bkYa0n6eWfHnIrW+Ofu7hHqEeoRunUrREM0RE+aJDpX09y+jZVYiZWxsVrhaOxHYcy58RQWe6D6rey3st/KX/3K447HHY87+/djNEajHgvHXJgLc7/9FsuxHMtHjFD8FD/FjwsHa11cRAdgrUNIRUhFSMXDD9Ntuk23MzNxFa7CVUOHis5ltwEwAAZUVsJe2At7f/tb5ZJySblksYiOxZgIvAbCWpR2VKyPj+Gu4a7hbuOeTn37is5ltzAIg7AvvoBcyIXckSMVVVEV9e9/Fx2LMZF4Cou1iMDqwOrA6t698TP8DD8rLNTu6q9w0BJaQktOndIKx6BBXDgY+z88AmHNytjT2NPYMyiI2lJbapuRAQgI+MgjonPZbSWshJVHj3rEesR6xI4de/LayWsnr1VXi47FmCPhEQhrFsZ0Y7ox/be/tSXbkm3JR47otnBEQzREf/QRLIAFsCAykgsHYz+ORyDsF5E6S52lzlOmoD/6o39j34Obm+hc9qKdtJN2rlunPqE+oT7R2DFus4nOxZgj4xEIaxJZkiVZmjsX/xv/G/87OVm7q6PC0XjGuAUsYFm2TCscc+dqH+TCwdj94BEIswOiTDLJtHSpdlb30qWiE9mLkiiJkhoawApWsM6apUar0Wr05s2iczGmR1xA2E+KjY2NjY11cSmXy+VyOSkJ9sAe2PPSS6Jz2W0WzIJZd+9iKZZi6eTJFrPFbDF/8onoWIzpGRcQ9m/1MPcw9zA/9FA7j3Ye7Tw++gg34Sbc9NxzonPZLQiCIOjGDaqmaqp+5hl1h7pD3ZGXJzoWY86A10DYv+hP/ak/eXu3/7r91+2/zs7Wa+GgAiqggsuXDVcNVw1XhwzhwsFY8+OtTBgAAJhiTbGm2EcfhTbQBtpkZ+OH+CF+GBwsOpe96ASdoBPl5aSSSurQocp8Zb4yv6xMdC7GnBEXkFZO698ICKAqqqKqY8dwG27DbX36iM5lt8EwGAYrSn1ZfVl92dChZyaemXhmYkWF6FiMOTPezr2VkiRJkiRZpm/pW/r24EE4CSfhZOfOonM1zWefucx0meky89lnlZ5KT6Xnd9+JTsRYa8BrIK2MdlTskCFQDMVQfOwYrIE1sEaHhSMKoiBq3z4vi5fFyzJqVHHP4p7FXDgYe6D4KaxWQlorrZXWjh0LwRAMwTt3YjzGY7yHh+hcdkuFVEjdsEE7f4Mb/xgTiUcgTk7KlDKlzFdfRU/0RM+9e/VaOGgLbaEtiYla4Zg9W7vLhYMxkXgNxEnJyXKynJyQAItgESxasUJ0Hns1doyjFa1onT1b7af2U/tt3Cg6F2Ps//BTWE6isWPc44DHAY8D77+PC3EhLnzrLdG57PZ9x7i21ciUKepkdbI6uXGvLcaYI+E1EJ3rk9InpU+Ku7tnmWeZZ9n27ZAGaZA2frzoXHaLh3iIr6mBGIiBmJgYxVvxVryzs0XHYoz9OC4gOqUVDi8vz0TPRM/Exj2dRowQnctetJpW0+orVwyLDIsMiyIjLbmWXEtuSYnoXIyxn8drIDoTvDN4Z/DOLl3qE+sT6xMPHtTuSpLoXPaiREqkxEuXbHtte217IyLUXDVXzb14UXQuxtj946ewdELbo+o//qPukbpH6h7JzdXu6rBw5FAO5Zw717C3YW/D3rCw0+bT5tNmLhyM6RFPYTk403rTetP6J5+0dbB1sHXIyoL34D14z9dXdC57UQIlUEJODq7AFbgiOlpRFVVRb94UnYsx1nRcQByUNFIaKY0MCdEWxdPTMQRDMKRjR9G57EUZlEEZqanude517nWTJhX6F/oX+tfWis7FGPvleA3EwQSWB5YHlo8ZA92gG3TbvRuDMAiDPD1F57JbDMRAzNatbbu07dK2y0sv5WAO5mB9vehYjLHmwyMQByEfk4/Jx6ZOpcE0mAZ/8AGa0IQmV90V+MaOca3xT4d9KIyx+8YFRDDpiHREOjJvHqZgCqasXg0KKKCgfv5cZJBBJoJwCIfwBQuUycpkZfJ774mOxRhrebp7h+scEOUb8g35RmIiDINhMGzhQtGJ7GYEIxjv3cNbeAtvTZtmmWyZbJn88ceiYzHGHhwuIA9IOIVTOLm6Vv+5+s/Vf960SSscL7wgOpfdTGAC061btqm2qbap48aVhJaEloQeOiQ6FmPsweM+kBamnb/Rpk31N9XfVH+Tmoq7cBfu0l/hoLW0ltZev24jG9lo+HAuHIwx/cy168zTHZ/u+HTHtm3v/O7O7+787vBh+Aw+g89CQkTnsttCWAgLv/rKMNAw0DAwIuKU3ym/U37/8z+iYzHGxOMC0iIQ5Xw5X85PTYU5MAfmjBkjOlHTnD1re8j2kO2hkSNL8kvyS/IrK0UnYow5Di4gzcw4xTjFOGXiRPqCvqAvdu0SncduBARUVGQ4YDhgOBAVpY04rl0THYsx5nh4DaSZUSfqRJ3+8z9F57DbOlgH69LS3FLdUt1ShwzhwsEY+zlcQJqJMd2YbkwPCIBcyIXcfv1E57lvH8FH8NGWLV4DvAZ4DYiJ4a1GGGP3ix/jbSbUg3pQj759Reewj9ms9FJ6Kb1ee+3774JEJ2KM6QePQJoJlVIplXboIDrHj/q+Y1w7Y/yNNxRFURRl3rzv03PhYIzZjQtIMyEjGcnoeGsGdIpO0an6ejyP5/H8jBmWSkulpXL1atG5GGP65yI6gLN4rPyx8sfK6+qomqqpuvGdvUDfd4wbrAarwRoTY1lvWW9Zv2eP6FiMMefBI5BmUpxWnFacdukSLIElsOTMGVE5qJAKqfDaNfqKvqKvfvtby8uWly0vZ2aK/vkwxpwPF5BmRlfoCl1ZvlzMV7dawRd8wXfoUPWQekg9VFgo+ufBGHNe3EjYIhCly9Jl6fK+fRiFURgVHd1iXyoMwiDsiy9wOS7H5RERljaWNpY2FRWifwKMMefHI5AWQeT5pOeTnk8+/zy8C+/Cu7m5zf4lvv+8hgWGBYYFYWFcOBhjDxovoreQitqK2orae/d8Pvf53Ofzjz4CBAR0c6NiKqZiWcbNuBk3u7nd7+fT/r/aWqzHeqxftQpWwkpY+cILloWWhZaFNTWiv1/GWOvDU1gPWGBoYGhgqI+Py1cuX7l8NWEC7aW9tHfIELpO1+m6v3/jf4cP48P4cEUFvUPv0DvHjtF39B19l5LCmxoyxhzF/wKeYeMy/zPC/wAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNy0xMi0xNVQxNTo1NzoyNyswODowMKIRvi8AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTctMTItMTVUMTU6NTc6MjcrMDg6MDDTTAaTAAAATXRFWHRzdmc6YmFzZS11cmkAZmlsZTovLy9ob21lL2FkbWluL2ljb24tZm9udC90bXAvaWNvbl9jazFiemEwemo5ampkY3hyL3JpZ2h0LnN2Z7O3J80AAAAASUVORK5CYII=');
-  background-size: contain;
-}
-
-.icon-refresh:before {
-  content: ' ';
-  display: block;
-  width: 16px;
-  height: 16px;
-  position: absolute;
-  margin: auto;
-  left: 0;
-  right: 0;
-  top: 0;
-  bottom: 0;
-  z-index: 9999;
-  background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADIEAYAAAD9yHLdAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAZiS0dEAAAAAAAA+UO7fwAAAAlwSFlzAAAASAAAAEgARslrPgAAMQpJREFUeNrt3XlcVHX3B/Bz7rCISi6IC+ijkpZpIswMyBLgluVuKm4pqWmEuG/hUpr5uFYoiuaSFrklZvroo+jPFRURZgYVxZ1K3HIXUBSGe35/XC9PWpYL8J2B8/6H1wwGn3sb5sz93u/3fAEYY4wxxhhjjDHGGGOMMcYYY4wxxhhjjDHGGGOMMcYYY4wxxhhjjDHGGGOMMcYYY4wxxhhjjDHGGGOM/QUUHYCx59F0ddPVTVdXq5YXkxeTF1O3Ll7H63jdzY3eoDfojTp1UIta1FatCm/D2/C2kxPchttwu0oVyIRMyKxShVpSS2pZuTIkQzIklyuHv+Av+IudHURBFERJkvJbKlQo+IWhEAqhsgz2YA/2d+8WPP/oMXWkjtTx4UMMwAAMuH4d2kE7aHf9OoVQCIX8/jvuxJ2489o1WkJLaMmlS+AHfuB37hwmYAImnDtnNBlNRlNGhvJDiUSfX/ZygiiIgqhMmayJWROzJgYF4Xbcjtv9/akX9aJerq7QE3pCTwcHiIEYiMnMxNpYG2ufOYNTcApOOXDAcNZw1nA2KUn0cTwrLiBMKO+z3me9z9asKa+V18prtVr5tHxaPv3mmzgaR+Nod3cYCANhYMOGyr9+9VXla9myonMXFoqmaIp+8ADDMRzDz56FTtAJOh07RgmUQAkGA17Da3jNYMjrldcrr1dKyrGxx8YeG3vvnujc7I8QdbG6WF3skCFUjapRtYkTcSSOxJHVqr3Yz0tNVb6OH280Go1G43//K/oIn3rkogOwkgzR09bT1tPW3V3jrHHWOLdoIRtkg2zw84PTcBpO+/jgGByDY2rWFJ3U0tEiWkSL8vNxDa7BNSdOkAM5kMOuXTgYB+PgnTvz1uStyVuzbx8XmOKh0+q0Oq2tLW2hLbRl9WrsgB2wQ7duhf17aAWtoBWzZpncTe4m94gI0cf9JC4g7KU0oSbUhCpW1FTTVNNUa98eTGACU9u2uAf34J6WLWEuzIW5VauKzlni6UEP+txcZYju0CGoDtWh+pYt+QH5AfkB69cfxaN4FH/9VXTMkkJ3UXdRd3HBAuWKMTy8yH8hAQENH64MeUZFiT5+FRcQ9kwaN27cuHHjSpVsbW1tbW2DgxEREbt2Vb7bvLny1dZWdE721+gz+ow+S06W+kn9pH7r1+fdyruVd2vdOi4sz0f7rvZd7bs+Pvgv/Bf+KyEBjGAEIxb5+yjNp/k0PytLE6mJ1ES+9lpybHJscuzVq6LPBxcQ9hjlJqCNTbY+W5+tb98eFsEiWNS3LxyDY3CsXTvlsb296JzsJT2aHEBdqAt12bULMzADM5YsgQ/hQ/hw0yblk25enuiYlka7XLtcu3zTJozGaIzu2LG4fz85kzM5jxxpijPFmeLmzhV9PriAlHKefp5+nn4uLtgQG2LDQYOwDJbBMh99BIfgEBxycRGdjxUvOkSH6NDVq7gEl+CSFSvMx83Hzcejo49+c/Sbo99cuiQ6nyjKPY8qVchABjJcuYJe6IVeNjbFHqQNtIE2W7YYpxmnGad16CD6vEiiA7DipfwhNG6sS9Wl6lJ/+EF6KD2UHv76K6ZgCqZMmcKFo3RDX/RF3+rVYQWsgBXjx9uQDdlQero2XZuuTV+2zOui10Wvi6+9JjpncaMP6AP6ICBAWOFQc0RQBEXUqSP6fKj4CqSEKxizvY7X8fqkSaADHejati2usVtWwqhDX+2pPbXfsIFqU22qPW1aSl5KXkre0aOi4xUV3QPdA92Df/8b/MEf/CdMEJvmwgVlem/t2qLPC1+BlDAe8R7xHvENGypXGuvWFdzsAwCAdu24cLCXshgWw2JJUqetSv2l/lL/lBT19abfot+i3+LmJjpmYaMbdINu1K0rOgf4gi/4irsCehIXECvX5OMmHzf52NVVO087TzsvJkZzSnNKcyo1FRAQMDiYCwYrUurr69HrTa4iV5GrnDihu6O7o7sze7Y6e090zJeFC3ABLnjRhYGFiICALGe2IxcQK+OT4ZPhk+HgoNPpdDrdp5/agA3YwOnTGIMxGNO3r/oJUXROVjopK+rLlIGW0BJajh1rF2gXaBd4+rRut263bndIyKN/ZX0faHbADthRrpzoGCCDDDIXEPacPL/0/NLzy8DAXKdcp1ynlBTl2alT1Z5OovMx9pcSIRESnZ1hLIyFsd9/rxunG6cbt2+fOtQqOt4zQ0BAC3jj9gIvEHgT/0lcQCyUcqVRubJypfHdd9IZ6Yx0Zu9epWnf66+LzsfYC9kFu2BXQIDmjOaM5ozJpCMd6WjKFLU1iOh4Fo+vQNjfUWdN5Z7OPZ172mBQnv3gA76XwUoUdUGqHvSgnzwZpsJUmJqQoP9C/4X+C/6A9DTkTu7kzlcg7JHg4ODg4GCNRv0kpvwhHTiAn+An+IkFzPpgrDhMhskwWa+nS3SJLhmNWq1Wq9V+9JHoWJYGwzAMwzQa5ZH4e53CA5RW+vv6+/r7tWqlD0oflD5o9271k9jjLxDGShl1nxZERFy8WHtVe1V7deNGtWmn6HiWol5Uvah6UeKHsizmUqi00J3SndKd6tRJNskm2bR8OY7H8Ti+cmXRuUobSqIkSsrJUVYW37sHw2E4DH+Gwn0QDsLBihV5SLF4YDtsh+06dbLxt/G38U9OVu6VdOmi9OpS980oerSX9tJeRGyGzbCZ6LMCUPZh2YdlH6pDWQ8fisrBfwDFRNtH20fbZ8IELItlsey0afwG9ILCIAzCHj6kntSTep49C6thNaw+fRpDMARDTp/GbtgNu506BTNgBsy4cEFpQXHrltnb7G32vnXLYaLDRIeJt24l1kqslVgrJ+d5f/3jzSadneVj8jH5WNWqmmhNtCbaxYXqUT2q5+xMy2k5La9ZU9mBsHFj/Ba/xW8bNVKuNF9/HQxgAIOdnejTaXW8wAu87t3DbMzG7IEDDSsNKw0r164t6l+rzdJmabNMJqWAeHqKPg1mg9lgNlSqpHRTvnNHVA5+Aysij88qWbhQmQY4cKDoXJaODtABOpCeDtfgGlw7cADfw/fwvf37lfN34ICbm5ubm9vZs7GxsbGxsfn5ovM+L/V1kT83f27+3Pr1bZbYLLFZ4u5OJ+kknQwMpP20n/a3aMGz7Z4RAQF99ZVyRTJunPKkLBf2r9Fu0W7RbklJwck4GSd7eIg+bOW4nZ2V475xQ1QMHsIqZMoWra+8kt8zv2d+z9hY5dnWrUXnshjhEA7h2dlwAS7Aha1boTW0htYbN5pjzDHmmPj4ow5HHY46PL3rq9IDSPRBvLiCNumBEAiBaWnKs+rXtWuhLJSFsn/oknwOz+G5Fi0wHuMxvkUL6A29oXeHDkpBrVJF9PEIh4CAo0frknRJuqS6dW1r2NawrdGnz4teYVoLZYtjSVI2cBOXgwtIIVH/4M3VzdXN1bdsUXo7iL/UFev+faX99O7d0AJaQIvY2JwbOTdybmzYkDYlbUralOxsmAJTYIronJYnJSElISXh8mXl0cqV0AAaQIOVK9VZe+nn08+nn/f1LWhZQ0BAvXuX2sISBmEQ1qVLHuVRHu3Z4z7HfY77nI4dlS1+r1172R+P+ZiP+Tzk/CQuIC9JWejXoIHyyXrnTmgGzaCZq6voXMVN3fEOHdERHRcsKN+8fPPyzdet24f7cB8+eADTYBpME53S+j0+dHfggPpVmZUzblyF7yt8X+H7Nm0gEiIhMjQUVsJKWPnOO6XmnhsCAjZtalvHto5tnQMHlL/PNm2UK9fz50XHKyz2SfZJ9knip/GW/BdUEfFM8EzwTKhXT1otrZZW79tXavbReLT3tjLdctMmnIpTceqSJYb2hvaG9jt3io7HHlfwOh0qDZWGDh2q3IT+8MPS0gKHIimSIn//HbpBN+jWurXpmuma6dqxY8/7c3QjdSN1I48ehXiIh3h3d9HHJblJbpJbjRqit7blAvKcvDt4d/DuULeueb15vXn9vn3oh37oV6uW6FxFpWC6axZmYdaCBTZbbbbabP3qq8O9D/c+3Pv330XnY89H2RDKySn/Qv6F/AsffYRDcAgOGTWqpA99USIlUuLNm+iDPujTurVyRWJ65rsHllZAZHvZXrZ3dX18qLP48RDWM1IX/pkTzAnmhF27SmrhoGRKpmSzGebDfJi/Zk2+lC/lS599drTi0YpHK/76q+h87OUk10yumVzz5k3l0YwZDdc1XNdw3fz5DjkOOQ454eFUn+pT/YkTcSgOxaGOjqLzFhalcDg5KY9271b+ntu2NZQ1lDWUVffL+RvxEA/xljMEKLvL7rI7IiRAAvxz+iIjfAzN0qn7bdBb9Ba9tWdPiWsxogMd6IigA3SADuvWaS5rLmsuN2pkGm4abhoeEqLMM+fCUVKldU/rntY9O9v4gfED4wezZtEYGkNjGjSAYAiG4KVLCz5QlCgVKtBaWktrt29X7pE0b/6P/0kgBEIgkejkKvvR9qPtR4svaMIDWCp1Ixw7WztbO9uEBOUSv0ED0bkKjT/4g/+5c8rK6o8+Ui7p9+wRHYtZFrXtunRdui5dX7oUp+N0nO7nJzpXYVGHaKVvpW+lb7t2NXxk+Mjw0bZtT/47pdCo904aNxadW5l1V7u2Mi38wgVRMfgK5AnqSmPb8bbjbcevW1dSCof6SZKaUTNqNnu27VjbsbZj3d25cLC/cyTwSOCRwLQ0U1dTV1PXgAByJmdyHjlS+e79+6LzvSz0Rm/0dnAgIxnJuHGjsrPne++p31c6SAQEwAgYASMsYEfCR+Tecm+5N1+BWBztae1p7emoKOyNvbH30KGi8xQOkwnLYTksN3CgId4Qb4hXN6Ri7MUon8hffVV5tHSp8vUZhoIsXMGQ3VbYCluPH7eYledPUFqZ1K0reoiZC8gjavtotQuo6DwvTL2nYQADGL7+uryxvLG8MSJCWY9R0saymWVA1LvoXfQuI0bIF+WL8sXZs5UmlZazb0VJo3HRuGhc3NySNidtTtr8yy+icpT6ISx9qj5VnxoUpBSOBQtE53lRdJgO0+HMTPkr+Sv5q27dlLHRMWO4cLCiR2S4bLhsuBwZSV/T1/R1y5Z0iA7RIXHrE1jxKLUFRNlfoE4dpVvr+vXKs+L767+Y1FTNVc1VzVUvrxTHFMcUxw0bRCdipVPKmJQxKWPi45V7bTodTaAJNOEZpsmy55IXlBeUF1T4TSOfV6krIGovIRu9jd5G/8MPVruAahksg2U//qg88PFR5vefOSM6FmMA/+vl9SD/Qf6D/ObN6Uf6kX785hvRuUoKzWDNYM1g8QWk1I1Rnrc/b3/e/pNPlGaHb70lOs9z2wSbYFN0tLGmsaax5rBhypPiX0iM/RVlnUlurvIoLEz3ve573fe//gpREAVRM2eKzmet8lvlt8pvJX47g1JzBaIP1AfqAz09ldlIkyeLzvO8aAWtoBWzZimFY8gQ5VkuHMy6FCxYnEbTaFp4OIRCKITy6/h52bjauNq4ij9vJb6AKF1K7e3pHt2je99/by07wdEiWkSL8vPhM/gMPgsLM7mb3E3uERGiczFWGExtTG1MbRYuhMWwGBb37as8m5cnOpe1eOj90PuhNxeQIlehZ4WeFXqql8oWsIL0n6ifyE7BKTj1wQfGTsZOxk48dsxKJmUh6+rVFEIhFNKjR8EHJ/a3bNfYrrFdwwWkyHh+6fml55eBgbARNsJG9V6B5aOVtJJWDhtmCjGFmEJWrRKdh7HioPRe+/lnyIRMyBw9WnQeS2e7yXaT7SYuIIVOnWUl1ZfqS/WjopRLZPEbr/wT8iRP8pwyxRRvijfFR0eLzsOYCKZWplamVvPm0WbaTJvV6fXsSXmd8jrldRJ/pWbxb6zPKz09PT09/aOPYCpMhalNmojO848ezaoyLTMtMy37/HPRcRizBPI5+Zx8bvBg8AEf8Ll+XXQeS1PmtzK/lfmNr0AKjU+GT4ZPRuXKysYxX3whOs8/WgSLYNGGDY9Px2WMAahNHK9fV3b6DA8XncfSZEVkRWRFcAEpNHmYh3k4derjG8dYHppBM2jGmTOaSppKmkr9+yvPin8hMGaJlJY8sbE8pPW4SmMqjak0hoewXpq+j76Pvs+bb5ILuZBLaKjoPE8VDuEQnp0tl5HLyGXeey+pflL9pPqZmaJjMWYNzKvMq8yrwsOVfTBu3BCdR7RsXbYuWye+gFj9SnQ6SSfp5FdfWXr3TzKTmcwffqjuryA6D2N/5BXsFewVXL268qh6dfm8fF4+b2+PU3EqTnV0pMk0mSaXL6+8gf9Fz7gFsAAW2NjQEBpCQ/6wFe7H8DF8fOcOfoPf4DfPsKMfAgLev4+f4+f4+cOHT36belJP6rluHfwIP8KPgweLPm/F7lG3beMS4xLjEvHrZqy2nbtOq9PqtE2bKi+4xETReZ6G3qF36J3ISNN003TT9FGjROdhpZPSPLRiRRudjc5GFxKi/N107qxcGXt5QTREQ3T58qJzsn+gBz3oc3ONi42LjYvt7UXHsdohLNpKW2nr+PGiczzVRJgIE9PSMqtnVs+sbsE5WYmm3abdpt02eLDmoOag5uD580rhmDdP+W7z5lw4rExTaApN1d5i4lnskM/TFNzz+Iw+o886dhSd508erSSXt8vb5e0DB55bfG7xucV/vhRnrCjpZutm62ZHR8MkmASTSuFQT0mlAQ1oxA9dqazuCoReo9fotYgIMIIRjOL3BP6TztAZOkdFpSxOWZyy+NAh0XFY6aIM7Q4bVmrvEZRwVJfqUl3LuQKxmgKi36Lfot/i5kaTaBJN6tFDdJ4/GQtjYeyvv+bszdmbs/fTT0XHYaWLUjgqVFCGOHhBaollYUNYVlNA5GPyMfnYuHEWO9tqNsyG2aGhyv4H2dmi47DShcpTeSrfpw8kQRIkVawoOg8rIjLIIPMQ1jPzPut91vvsK6/gT/gT/qS2fbY0O3YoC5527BCdhJVO2AybYbOWLUXnYEWMgIC4gDwzcw9zD3OPnj2VR2XLis5T4LGNcHiWFRNMBzrQubmJjsGKFgZgAAbwENYzwxbYAluoLT8syFW4ClfXrFH2MzCZRMdhpRu1ptbU+g8L+FgJxlcg/8gj3iPeI75hQ9gDe2CPj4/oPAXCIAzCHj7UJGuSNcl8s5xZBpyEk3DS7duic7Ai1hyaQ3O+AvlHmhRNiibFAq88FsEiWLR8edLmpM1Jm3/5RXQcxgAAoA/0gT7nzomOwYrYHtgDe65eFR1DZXEFRJmOaGurbLBkQTfNH93zkDZJm6RNc+eKjsPYH+FwHI7DeRJHiXcQDsJBy+mlZ3EFRF4vr5fXv/sujsSROLJaNdF5CiyGxbB427bkmsk1k2ueOSM6DmN/ZH/C/oT9idhYZT+cmzdF52FFQ+or9ZX6xsaKzlGQR3SAPwXqJnWTullgi5JdsAt2qT2EGLMsB28evHnwZlYWtISW0HLyZNF5WFHYuDE5Njk2OfbIEdFJVBZWQBBhNIyG0W3aiE6iomk0jaadOGGsaKxorLhzp+g8jP0dU7wp3hQfHU0hFEIhP/wgOg97Sf7gD/7nzklukpvkFhYmOs6TLKaA6AP1gfpADw/4Gr6Gr11dRedRKbNboqOVR8+wnwFjFsA03DTcNLxfP+XRzJm0iBbRIvEbELFn1BJaQsv9+8255lxzbrNmypWH5dw8V1lMAVFaMLRtKzrG4/LylJWfljPmyNizk2VlndL48VKUFCVFeXjQJtpEm9asocN0mA7zjpjCPdogSpmeq+5r9P77xtnG2cbZzZod/eboN0e/uXRJdMynsZhuttqftD9pfzp4EKfjdJzu5yc6D0RCJETGxRkDjYHGQMsZUmOsMDRc13Bdw3V2duViy8WWi23Y0DzLPMs8q1YtTT9NP00/Z2c5W86Ws//ccw5H42gcXb48mMEM5r/YmTAKoiCqXDlaQStohZ3d8+bCnbgTd5Ypo3S1dnB40eOjZbSMlt27Bz2hJ/QshHUTs2E2zM7MxLfxbXz7+a/kcASOwBFEspPsJDtdvy6Nk8ZJ465exbbYFtsmJSmTc6xv8oPwAuKT4ZPhk1G5cu6V3Cu5V65dwzAMwzCNRnQumANzYM4HHxhbGFsYW8TEiI7DGGOWRnhXW/N483jz+Nat8SSexJPiCwdFUzRFP3hg42TjZOO0caPoPIwxZqmE3wMhLWlJazmtSjAcwzE8Li6pflL9pPo8RswYY08jvIDAG/AGvOHtLTqGSpm2+3//JzoHY4xZOmEFJIiCKIhsbJQuoh4eok+Eit6it+itPXtE52CMMUsn7B7I/e73u9/v/uabmI7pmP7isy0KzQgYASOuXUtxTHFMcTx1SnQcxhizdMKuQPL75PfJ7+PlJfoEqCiLsihr9+5Hj3jBIGOM/QNx90BOwAk4odOJPgEFJ2KptFRaunev6ByMMWYthBUQvIk38aZeL/oEqEgiiaTkZNE5GGPMWggrIDSLZtGs+vVFn4DH9zbnex+MMfasir2AqCvPsSk2xaavvCL6BMBxOA7H09OVnkH374uOwxhj1qLYC4j5ffP75vdr1xZ94AUOwkE4ePy46BiMMWZtir2AyF3lrnLXOnVEH7iKfMmXfE+cEJ2DMcasTfHfA2kEjaDRv/4l+sALTsCv0q/Sr6dPi87BGGPWptgLCLqjO7pb0BXISlpJKy1voxbGGLN0xX8F0gbaQBvLKSDSIGmQNOj6ddE5GGPM2hR/ASEgoBo1RB+4StnA6sYN0TkYY8zaFHsBoZk0k2ZWqiT6wFXZKdkp2SnXronOwRhj1qb4r0DKQBkoU6GC6ANX3L2b1j2te1r3QtjykjHGSpniLyB2YAd2llJAeOEgY4y9qOKfhbUcl+Nye3vRBw6+4Au+3HWXMcZeVLEVkODg4ODgYI0GjGAEI6LoA+cCwhhjL6fYCkhKQEpASoCNsA2sGGOMFa5iKyB21e2q21XnT/yMMVZSFFsBUWY75eWBDnSgs4BCcggOwSELGEpjjDErVcw30YnAG7zBW/y0WepDfahP5cqiczDGmLUq/mm8RjCCMSdH9IFjOIZjeJky/k7+Tv5Ojo6i8zDGmLUp/gISBEEQdOeO6ANXPajzoM6DOlWris7BGGPWpvgLyByYA3Nu3RJ94CpyJmdydnYWnYMxxqxN8ffC2k7bafvNm6IPvOAE+Ev+kj9fgTDG2PMq/pXoC3EhLrSc5oWyXtbL+po1RedgjDFrU/xDWJWhMlS+cEH0gauwMTbGxg0bis7BGGPWpvgLyApYASsyMkQfuIrKUlkq26iR6ByMMWZtir+AAACABV2BfIqf4qdcQBhj7HkVewGR58vz5fmnT4s+8AKJkAiJzs4e8R7xHvE8G4sxxp5VsReQepH1IutF/vILRVM0RT94IPoEFJyIddI6aV3jxqJzMMaYtdAU9y9MS0tLS0sjcnF0cXRx7N4dfoPf4Ldq1USfCGm7tF3afvbsZfNl82Xz/v2i8zDGmKUTdA8EAKpAFahiMok+ASoaQSNoRIsWonMwxpi1EFZA6Cf6iX46dEj0CSjI05k6U2c/P58MnwyfDAcH0XkYY8zSCdvgCQEBwXIKiNpcMdc31zfX19dXeXb3btG5GGPMUgm7AjGajCaj6cQJ5dHdu6JPRIEBMAAGNG8uOgZjjFk6cfdAAABAlpWvhw+LPhEFMiADMt55R3QMxhizdIILCAAYwAAGCxrKmopTcaqXl8cwj2Eew+rXF52HMcYslfgCchfuwt2DB0XHeJLGXeOuce/RQ3QOxhizVMILyN2YuzF3Y+Lj6TAdpsOZmaLzFFgIC2Hh+++LjsEYY5aq2BcSPunWtlvbbm3Lz3eRXCQXydMTzsAZOGMBvakQELBKlZpv1Xyr5lubNl1Ou5x2Oe3qVdGxGGPMUgi/AinQGlpD640bRcd4krxUXiov7d1bdA7GGLM0llNAhsAQGLJ1K+hBD/rcXNFxVHScjtPxDz90n+M+x31OuXKi8zDGmKUQPoSlunLlypUrVx4+dIl0iXSJ9PeH7bAdtterJzoXxmEcxjk4SD2lnlLPS5eurLqy6sqq5GTRuRhjRcfrotdFr4uvvVa9SvUq1av4+ro2c23m2qxBg2oPqz2s9tDRMcAnwCfA5/ff1d5+ovOKImwl+tPgcByOwzduJIkkkt59V3SeglzZmI3ZI0Yoj775RvmqrmNhjFmj4ODg4OBgjSb9fPr59PP9+9NMmkkzx46VO8md5E6vvaZ0zAAgICAAkEACCQDS09PT09Pv3tVO107XTl+7Vr4qX5WvfvXVkagjUUeizp4VfVzFBUUHeJIyVFS1qu0523O25zIylHUidnaic6kohEIopEsX03DTcNPwn38WnYcx9vx0Wp1Wp61ShSIogiLWr8dZOAtnBQW93E/Ny4NBMAgGzZgBS2AJLJk2Tem4kZcn+niLisUVEJUuRZeiS1m7FgbCQBhoOesxaBftol0HD5oqmiqaKr71lug8jLFnpwxNOTnJHeWOcscDB5TZlg0aFPovagNtoM2WLXer3q16t2q3bueGnRt2btjDh6KPv7BZzk30J3mAB3ioQ0WWA1tiS2zp76+7qLuou9i2reg8jLF/pg5VyWlympy2YUORFQ7VNtgG29q3f6XtK21faTt3rujjLyoWW0CMaEQj7tsHARAAASdPis7zJEqlVEqdPVt9YYrOwxh7uvT26e3T248ZA+NhPIwPDCyu34uzcTbODg319PP08/TT60Wfh8Jm8W98NSrWqFijoq0t3sf7eN+Cbqrvxt24u2rVW7du3bp169IlZRaZ0Sg6F2Psf7wWeC3wWtCokTIpZ80a5Z6qTfFNHroCV+AKIprRjGZJUt4nNm8WfV4Ki8VegajyLuVdyrv0/feUREmUlJMjOs+fzIW5MHfqVH8nfyd/J0dH0XEYYwBBFERBZGMj15HryHW++w4WwSJYZG8vNlXJu2dq8QUkNTU1NTX19m2IhEiIXLNGdJ4n4UgciSOrVXtw6cGlB5ciIkTnYYwBZK/OXp29etgwmAyTYbL4oSNKpmRKrl1bdI7CZvEFRCVfkC/IF2bOVP5HmM2i8/yJP/iD/9ix+kB9oD7Q01N0HMZKoybUhJpQnTqwH/bD/qlTRecpkAzJkIwWO+v1RVlNAVEX6OAMnIEzVq4Uneev2dqSjnSk++67husarmu4znLWrzBW8iHa7LfZb7N/0SLlDdtyWg/halyNqy9eFJ2jsFlNASmwATbAhmnTlAcWuEAnHuIh3t29TL0y9crU+/RT0XEYKw309fX19fXDw2EkjISRljPZpkAf6AN9jh0THaOwWV0BMRqNRqPx/HnqRb2o1w8/iM7zVB7gAR4REV51vep61fXyEh2HsZJI30ffR9/nzTflU/Ip+dTs2aLzPA2GYiiG7tghOkdhs7oCorLZZ7PPZp/lXomgF3qhl41N/on8E/knfvjB+6z3We+zr7wiOhdjJYHaHZvSKI3SYmPRG73R28FBdK4/CYMwCHv40DzPPM88b8MG0XEKm9UWkKTNSZuTNv/yC8RCLMSuWCE6z9NgAAZgwOuvmx3NjmbHmJhHz5a4m2mMFSebXja9bHotXVrkK8pfEt2je3Rv3bojgUcCjwRevy46T2Gz2gKiyvsp76e8nz79FIbBMBh2+7boPE+D7bAdtuvUSZukTdIm8b0Rxl6EvpK+kr7SuHHYCTthp169ROd5GlpEi2hRfj4NoAE0YMYM0XmKSon5JKzT6XQ6XViY8mjhQtF5nioUQiFUlukG3aAbnTqZJpgmmCZs2SI6FmOWTDtBO0E74Z13oDN0hs7//S+GYRiGWXALIQICWrZM6cY7aJDoOEWlxBQQhSRpN2k3aTclJuJUnIpTLf3m9d27+Aa+gW+89ZZhpWGlYeXx46ITMWZJ1FYksqPsKDvu3w9REAVRlSqJzvU0lEiJlHjzJjbFpti0QQOlgNy4ITpXUbH6IazHyTJ8Dp/D52Fh6iWk6ER/r0IFeofeoXd27dJ/of9C/8Xrr4tOxJglaPJxk4+bfOzqKq+QV8grtm619MJRYCtsha3jx5f0wqGy3EvAF3TlkRquNVxruDo74xk8g2e8vUXneqpESITEcuWoP/Wn/u3aVS1btWzVsuvX/2743fC7IStLdDzGipNPhk+GT0blyuAADuCwZ4+yolz81tb/hCbQBJqQkGB6z/Se6b2hQx89W+K3ui1xBUTlkumS6ZKZkAB+4Ad+ISFwES7CRcttdog7cSfurFRJ6i/1l/q/+67LWZezLmfXrVPK4f37ovMxVpSUHQIrVJCvydfka9u2QQzEQIzltwRSm7xiCIZgSLt2yt9ryZtt9TQlbAjrf5RLyLt35SA5SA4KCVFvXovO9Y/+Df+GfzdsqExP3L7dI94j3iPe2Vl0LMaKglo4oAW0gBZxcbAH9sAeHx/RuZ7ZQTgIBz/7TFngfOqU6DjFrcQWEFVKcEpwSvCuXeRDPuQzZ47oPM9Hq5UeSA+kBwcOeHfw7uDdoW5d0YkYKwwFhQMAALZvt7bCoW5t/er8V+e/Oj8yUnQeUUrYLKynU/cHyI7LjsuOi4+HSTAJJvn6is71rOgQHaJDV69KraRWUqu2bQ3xhnhDfEqK6FyMPQ9lun2NGsojdfq6Vis61zPzBm/wvnPHvNC80LzQ0/MoHsWj+OuvomOJUuKvQFT7cB/uQ7MZ8zEf8/v0ocN0mA5nZorO9azQF33Rt3p16kf9qF98vO6O7o7uzttvi87F2LPwzPLM8sx64w3lnuShQ8qzVlQ4HsEszMKssLDSXjhUJfYm+tNcXn159eXVt2/XqFejXo16GRl4GA/j4S5dROd6ZsmQDMl2dpAGaZDWo0eNcjXK1Sh3+/aV3678duW35GTR8Rj7Ix3pSEfNmuFaXItrd+yA9bAe1levLjrXi1m0yLjduN24fdYs0UksRakZwnoa5ZJaXbmurmS3VqtX53yS80nOJ6Ghad3Tuqd1z84WnYiVTrpVulW6VaNGKV2zZ81Sm4uKzvW81Om5D/If5D/Ib95c+bvKzRWdy1KUmiGspylvKG8obxg2DN6Bd+Cd7dtF53k5vXs72DjYONgcPlwwZMBYMVA2UCtfXpeiS9GlrF0LX8PX8PVXX1lr4QBf8AXfy5dxOk7H6d26ceH4a6W+gKj3RjT9Nf01/bt3p320j/ZZcUuRR9OApVgpVopNStJqtVqt9qOPlG9yF2BWuLTvat/Vvuvj44AO6IAmEwyEgTCwRw/RuV6Uuq4DEiABErp0UabnXrkiOpel4jeUJ6gtFGwCbAJsAg4fVj5JubqKzlU4DhzAztgZOw8caPjU8Knh09OnRSdi1qVgNmNMdkx2zOjRSouRL75QvmtrKzrfC3u0TkzuJfeSewUHpzimOKY4lrz9OwobF5CnUHcSlCvLleXKe/cqz5YtKzrXyyr4hPVoAZQ6jz02NjY2NtbSe4cxUTxDPUM9Q319sQN2wA4LF+JknIyTPTxE5yoseAWv4JVRowyXDZcNl0vvuo7nxQXkH+hO6U7pTnXqBO/D+/B+bKzyrBV/0noC7aW9tDclheIojuLGjlUXXorOxcTyuuh10euik1N+bn5ufu6sWTgTZ+LMAQPACEYwlqCh0P7QH/rPmGEcYhxiHDJhgug41qbkvBCKmH6Yfph+WNeudJAO0sE1a5RnS04hedyOHVgOy2G5iAhesFg6KLMRy5ZVNmYbOpRepVfp1XHjcDgOx+GVK4vOV9ioA3WgDgsWmKaYppimqM0P2fPiAvKclNlNXbpIzaRmUrO1a5VnS2AhUXuHLYbFsHjtWnm+PF+eP3lyil+KX4rfuXOi47GXUy+qXlS9KHv7ivMrzq84f9Ag+YR8Qj4xcaK6YFV0vqJCsRRLsd9+a3IzuZnc1I2eSn7X3KJS6mdhPa/Hb6699x6EQRiEPXwoOlehWwyLYbH06PXRu7d0XDouHT99Wrtau1q7+v/+zzPdM90zvUMH5fslaEijhFJ7T2l3andqdw4fXsGpglMFp/Pn6RV6hV6ZP7+kFw6IhViIXbJEKRzqrEQuHC+L//BfknLp37kz6EEP+h9/BAMYwGBnJzpXcaHP6XP6/MgRuA/34f68eZlXM69mXl2z5tywc8PODSuBhdVKKAWjaVNl5feAARAMwRDcp4/yXeufDPLMtsE22DZ3rrGqsaqx6qhRypNcOAoLF5BCohSSdu0gHMIhfO1aiIZoiC5fXnSuYjcMhsGw27fpOl2n6z//jANxIA5cu9ZtkNsgt0G7d/Nsr8Klv6+/r79fq5ZskA2yoUcPvIE38Eb//gXbApQ2j4ZeqQE1oAaffGIKNAWaAr/8UnSskooLSCHzCvYK9gr28MgfnD84f/DmzTgGx+CYmjVF5xKNIimSIn//Hd3QDd3WrwdXcAXX9etzYnNic2ITEnil79/TVtVW1VZ1d1dWRnfsCCfhJJzs3BmyIAuytNoSNzvqhdy/L++V98p7+/bldRzFo5S/4IqOp5+nn6efi4s0QZogTdi0CSbDZJis14vOZZnu36fRNJpGJyRIA6QB0oC9e+EW3IJbe/aUcyjnUM4hKUntGCA6aWFTF+Zl2mXaZdo1aiStllZLqwMDyZ/8yT8wEHfhLtwVGAhzYS7MrVpVdF5Lo25zoHld87rm9Y4dk39J/iX5F24qWly4gBQxdXokhVIohcbE4GJcjIu7dhWdy2p4gRd43btHs2gWzTpxQlnwdeKE0uTu5EnpXeld6d3jx/MG5Q3KG3TypNJm+7fflP+4+Me63ee4z3GfU66c3VG7o3ZH69bNn5o/NX9q3bo4GAfj4FdfhVbQClo1boxrcA2u8fBQJmE0agSLYBEssrcXfbqtS2oqEBBQ+/bKDqQXLohOVNpwASlWiLoFugW6Bf/+NxyDY3AsIoKHHgoXJVMyJZvNYAYzmG/cgFzIhdz/fcUojMKoa9cgBEIg5M6dZ/65QECg0WAwBmOwkxO0hJbQ0slJ+blVqkAe5EFelSqQCImQyFsQF5l20A7a/fyzpq+mr6Zvv35J9ZPqJ9W3nn19Shp+4xKkYEOoltASWn7/vfKsulMbYwwAgKIpmqIfPIBsyIbsiAhTK1MrU6t580TnYgouIIJ5xHvEe8Q7O2t2aHZodixfrkw7bN9edC7GRKJpNI2mnTiBE3EiTuzVSxmiSk0VnYs9jguIRUFU2q8PGoSIiKg2dStF8/ZZ6aQDHeiIIAIiIGLpUltbW1tb2xEjEmsl1kqslZMjOh77a1xALJQ6bRPSIR3SV63CIAzCoDffFJ2LsULlB37g99tvShv1jz9WWuXExYmOxZ4NtzKxUKZrpmuma8eOYSAGYqBWq8xCGjGCDtNhOsw3DZk1y8tTvkZF5QTkBOQEvPkmFw7rxFcgVkZdX4I9sAf2mDkTT+AJPNGnD8/mYpZvz578yPzI/MghQ44EHgk8EpiWJjoRezn8hmPl9Kn6VH1qUBD1o37Ub/585dnGjUXnYqXcoz3FoQt0gS7jxxtbGFsYW8TEiI7FChcPYVk5Q2NDY0PjffuUhQo6nTrUBT7gAz7Xr4vOx0oHdUU4jIJRMGr0aDgEh+BQ/fpcOEo2vgIpodQV0TaeNp42ngMHKiu4J0zglhisUIyAETDi2jWQQQb566+VvdHnzzcajUaj8f590fFY8eACUkp4n/U+6332lVfMn5g/MX8SGoou6IIuI0YonxRdXETnYxZuFIyCUZcugR3Ygd2sWeW7le9WvtvSpUqPsgcPRMdjYvAQVimhtnwwbTBtMG2YMycnMCcwJ7BuXWXr2g8/LNjXgzEAUDok7N+PNbAG1ggJuXvz7s27N1991RhsDDYGz5/PhYMB8BUIe4JnqGeoZ6ivLzbEhtgwLAyaQlNoGhyM4RiO4WXKiM7HChfNo3k079YtfA1fw9diYmQH2UF2WLJEaYd+8qTofMyycQFhf6sJNaEmVLGiTZxNnE1c166URVmU1bcv3sE7eCcg4PGtb5lly8tT2ubv26c0m/zuO8e+jn0d+/70E19RsBfBBYS9EHUnPPov/Zf+27mzsg6lc2eaTtNpemAgeqEXetnYiM5ZOt29C8tgGSyLi4McyIGcTZtyQ3NDc0Pj4lJTU1NTU2/fFp2QlQxcQFih8snwyfDJqFw51y3XLdft7bexMTbGxq1awTgYB+NatYI5MAfm1KkjOqfVerRlK1SBKlDl1Ck6Rsfo2O7dOAJH4Ij//CdnR86OnB379vEOj6w4cAFhxUq/Rb9Fv8XNTR4gD5AH+PmhCU1o8vGBTtAJOvn6Kv9KXQhpays6b7FT95RHQsLERGgADaBBYiJshI2w8fBhjMM4jEtMVLrT3r0rOi4r3biAMIui0+q0Oq2tLV2ki3TxjTfgS/gSvmzcGDMxEzMbNYIgCIKgWrXgB/gBfqhdW5k95uqKq3AVrnJ1tZid/fSgB31urrID4W+/QTWoBtXOnwc3cAO38+dhH+yDfenpShfa8+el8lJ5qfzJk8k1k2sm1zx7Vvkhxb+jImPPgwsIK1G8gr2CvYKrVzdfMl8yX6pZU1ouLZeWu7pCb+gNve3sKIIiKKJcOZgJM2GmnZ2UJWVJWXZ2NIkm0aRy5ZQFcYjkS77kW768ci8nK0uZrXT7Ni7ABbggKwuGwlAYmpmpdJHNytL8R/MfzX+ysiAO4iDuxo26H9T9oO4Hly/HxsbGxsbm54s+L4wxxhhjjDHGGGOMMcYYY4wxxhhjjDHGGGOMMcYYY4wxxhhjjDHGGGOMMcYYY4wxxhhjjDHGGGOMMcYYKzb/D4DEm9oGCaFQAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE3LTEyLTE1VDE1OjU3OjI3KzA4OjAwohG+LwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNy0xMi0xNVQxNTo1NzoyNyswODowMNNMBpMAAABPdEVYdHN2ZzpiYXNlLXVyaQBmaWxlOi8vL2hvbWUvYWRtaW4vaWNvbi1mb250L3RtcC9pY29uX2NrMWJ6YTB6ajlqamRjeHIvcmVmcmVzaC5zdmejF0ikAAAAAElFTkSuQmCC');
-  background-size: contain;
-}
+	.verifybox {
+		position: relative;
+		box-sizing: border-box;
+		border-radius: 2px;
+		border: 1px solid #e4e7eb;
+		background-color: #fff;
+		box-shadow: 0 0 10px rgba(0, 0, 0, .3);
+		left: 50%;
+		top: 50%;
+		transform: translate(-50%, -50%);
+	}
+
+	.verifybox-top {
+		padding: 0 15px;
+		height: 50px;
+		line-height: 50px;
+		text-align: left;
+		font-size: 16px;
+		color: #45494c;
+		border-bottom: 1px solid #e4e7eb;
+		box-sizing: border-box;
+	}
+
+	.verifybox-bottom {
+		padding: 15px;
+		box-sizing: border-box;
+	}
+
+	.verifybox-close {
+		position: absolute;
+		top: 13px;
+		right: 9px;
+		width: 24px;
+		height: 24px;
+		text-align: center;
+		cursor: pointer;
+	}
+
+	.mask {
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 1001;
+		width: 100%;
+		height: 100vh;
+		background: rgba(0, 0, 0, .3);
+		/* display: none; */
+		transition: all .5s;
+	}
+
+	.verify-tips {
+		position: absolute;
+		left: 0px;
+		bottom: 0px;
+		width: 100%;
+		height: 30px;
+		line-height: 30px;
+		color: #fff;
+	}
+
+	.suc-bg {
+		background-color: rgba(92, 184, 92, .5);
+		filter: progid:DXImageTransform.Microsoft.gradient(startcolorstr=#7f5CB85C, endcolorstr=#7f5CB85C);
+	}
+
+	.err-bg {
+		background-color: rgba(217, 83, 79, .5);
+		filter: progid:DXImageTransform.Microsoft.gradient(startcolorstr=#7fD9534F, endcolorstr=#7fD9534F);
+	}
+
+	.tips-enter, .tips-leave-to {
+		bottom: -30px;
+	}
+
+	.tips-enter-active, .tips-leave-active {
+		transition: bottom .5s;
+	}
+
+	/* ---------------------------- */
+	/*常规验证码*/
+	.verify-code {
+		font-size: 20px;
+		text-align: center;
+		cursor: pointer;
+		margin-bottom: 5px;
+		border: 1px solid #ddd;
+	}
+
+	.cerify-code-panel {
+		height: 100%;
+		overflow: hidden;
+	}
+
+	.verify-code-area {
+		float: left;
+	}
+
+	.verify-input-area {
+		float: left;
+		width: 60%;
+		padding-right: 10px;
+
+	}
+
+	.verify-change-area {
+		line-height: 30px;
+		float: left;
+	}
+
+	.varify-input-code {
+		display: inline-block;
+		width: 100%;
+		height: 25px;
+	}
+
+	.verify-change-code {
+		color: #337AB7;
+		cursor: pointer;
+	}
+
+	.verify-btn {
+		width: 200px;
+		height: 30px;
+		background-color: #337AB7;
+		color: #FFFFFF;
+		border: none;
+		margin-top: 10px;
+	}
+
+	/*滑动验证码*/
+	.verify-bar-area {
+		position: relative;
+		background: #FFFFFF;
+		text-align: center;
+		-webkit-box-sizing: content-box;
+		-moz-box-sizing: content-box;
+		box-sizing: content-box;
+		border: 1px solid #ddd;
+		-webkit-border-radius: 4px;
+	}
+
+	.verify-bar-area .verify-move-block {
+		position: absolute;
+		top: 0px;
+		left: 0;
+		background: #fff;
+		cursor: pointer;
+		-webkit-box-sizing: content-box;
+		-moz-box-sizing: content-box;
+		box-sizing: content-box;
+		box-shadow: 0 0 2px #888888;
+		-webkit-border-radius: 1px;
+	}
+
+	.verify-bar-area .verify-move-block:hover {
+		background-color: #337ab7;
+		color: #FFFFFF;
+	}
+
+	.verify-bar-area .verify-left-bar {
+		position: absolute;
+		top: -1px;
+		left: -1px;
+		background: #f0fff0;
+		cursor: pointer;
+		-webkit-box-sizing: content-box;
+		-moz-box-sizing: content-box;
+		box-sizing: content-box;
+		border: 1px solid #ddd;
+	}
+
+	.verify-img-panel {
+		margin: 0;
+		-webkit-box-sizing: content-box;
+		-moz-box-sizing: content-box;
+		box-sizing: content-box;
+		border-top: 1px solid #ddd;
+		border-bottom: 1px solid #ddd;
+		border-radius: 3px;
+		position: relative;
+	}
+
+	.verify-img-panel .verify-refresh {
+		width: 25px;
+		height: 25px;
+		text-align: center;
+		padding: 5px;
+		cursor: pointer;
+		position: absolute;
+		top: 0;
+		right: 0;
+		z-index: 2;
+	}
+
+	.verify-img-panel .icon-refresh {
+		font-size: 20px;
+		color: #fff;
+	}
+
+	.verify-img-panel .verify-gap {
+		background-color: #fff;
+		position: relative;
+		z-index: 2;
+		border: 1px solid #fff;
+	}
+
+	.verify-bar-area .verify-move-block .verify-sub-block {
+		position: absolute;
+		text-align: center;
+		z-index: 3;
+		/* border: 1px solid #fff; */
+	}
+
+	.verify-bar-area .verify-move-block .verify-icon {
+		font-size: 18px;
+	}
+
+	.verify-bar-area .verify-msg {
+		z-index: 3;
+	}
+
+	/*字体图标的css*/
+	/*@font-face {font-family: "iconfont";*/
+	/*src: url('../fonts/iconfont.eot?t=1508229193188'); !* IE9*!*/
+	/*src: url('../fonts/iconfont.eot?t=1508229193188#iefix') format('embedded-opentype'), !* IE6-IE8 *!*/
+	/*url('data:application/x-font-woff;charset=utf-8;base64,d09GRgABAAAAAAaAAAsAAAAACUwAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABHU1VCAAABCAAAADMAAABCsP6z7U9TLzIAAAE8AAAARAAAAFZW7kiSY21hcAAAAYAAAAB3AAABuM+qBlRnbHlmAAAB+AAAAnQAAALYnrUwT2hlYWQAAARsAAAALwAAADYPNwajaGhlYQAABJwAAAAcAAAAJAfeA4dobXR4AAAEuAAAABMAAAAYF+kAAGxvY2EAAATMAAAADgAAAA4CvAGsbWF4cAAABNwAAAAfAAAAIAEVAF1uYW1lAAAE/AAAAUUAAAJtPlT+fXBvc3QAAAZEAAAAPAAAAE3oPPXPeJxjYGRgYOBikGPQYWB0cfMJYeBgYGGAAJAMY05meiJQDMoDyrGAaQ4gZoOIAgCKIwNPAHicY2Bk/sM4gYGVgYOpk+kMAwNDP4RmfM1gxMjBwMDEwMrMgBUEpLmmMDgwVDxbwtzwv4EhhrmBoQEozAiSAwAw1A0UeJzFkcENgCAMRX8RjCGO4gTe9eQcnhzAfXC2rqG/hYsT8MmD9gdS0gJIAAaykAjIBYHppCvuD8juR6zMJ67A89Zdn/f1aNPikUn8RvYo8G20CjKim6Rf6b9m34+WWd/vBr+oW8V6q3vF5qKlYrPRp4L0Ad5nGL8AeJxFUc9rE0EYnTezu8lMsrvtbrqb3TRt0rS7bdOmdI0JbWmCtiItIv5oi14qevCk9SQVLFiQgqAF8Q9QLKIHLx48FkHo3ZNnFUXwD5C2B6dO6sFhmI83w7z3fe8RnZCjb2yX5YlLhskkmScXCIFRxYBFiyjH9Rqtoqes9/g5i8WVuJyqDNTYLPwBI+cljXrkGynDhoU+nCgnjbhGY5yst+gMEq8IBIXwsjPU67CnEPm4b0su0h309Fd67da4XBhr55KSm17POk7gOE/Shq6nKdVsC7d9j+tcGPKVboc9u/0jtB/ZIA7PXTVLBef6o/paccjnwOYm3ELJetPuDrvV3gg91wlSXWY6H5qVwRzWf2TybrYYfSdqoXOwh/Qa8RWIjBTiSI3h614/vKSNRhONOrsnQi6Xf4nQFQDTmJE1NKbhI6crHEJO/+S5QPxhYJRRyvBFBP+5T9EPpEAIVzzRQIrjmJ6jY1WTo+NXTMchuBsKuS8PRZATSMl9oTA4uNLkeIA0V1UeqOoGQh7IAxGo+7T83fn3T+voqCNPPAUazUYUI7LgKSV1Jk2oUeghYGhZ+cKOe2FjVu5ZKEY2VkE13AK1+jI4r1KLbPlZfrKiPhOXKPRj7q9sj9XJ7LFHNmrKJS3VCdhXGSdKrtmoQaWeMjQVt0KD6sGPOx0oH2fgtzoNROxtNq8F3tzYM/n+TjKSX5qf2jx941276TIr9FjXxKr8eX/6bK4yuopwo9py1sw8F9kdw4AmurRpLUM3tYx5ZnKpfHPi8dzz19vJ6MjyxYUrpqeb1uLs3eGV6vr21pSqpeWkqonAN9oUyIiXpv8XvlN5e3icY2BkYGAA4n0vN4fG89t8ZeBmYQCBa9wPPRH0/wcsDMwmQC4HAxNIFABAfAqaAHicY2BkYGBu+N/AEMPCAAJAkpEBFbABAEcMAm94nGNhYGBgfsnAwMKAigESnwEBAAAAAAAAdgCkANoBCAFsAAB4nGNgZGBgYGMIZGBlAAEmIOYCQgaG/2A+AwARSAFzAHicZY9NTsMwEIVf+gekEqqoYIfkBWIBKP0Rq25YVGr3XXTfpk6bKokjx63UA3AejsAJOALcgDvwSCebNpbH37x5Y08A3OAHHo7fLfeRPVwyO3INF7gXrlN/EG6QX4SbaONVuEX9TdjHM6bCbXRheYPXuGL2hHdhDx18CNdwjU/hOvUv4Qb5W7iJO/wKt9Dx6sI+5l5XuI1HL/bHVi+cXqnlQcWhySKTOb+CmV7vkoWt0uqca1vEJlODoF9JU51pW91T7NdD5yIVWZOqCas6SYzKrdnq0AUb5/JRrxeJHoQm5Vhj/rbGAo5xBYUlDowxQhhkiMro6DtVZvSvsUPCXntWPc3ndFsU1P9zhQEC9M9cU7qy0nk6T4E9XxtSdXQrbsuelDSRXs1JErJCXta2VELqATZlV44RelzRiT8oZ0j/AAlabsgAAAB4nGNgYoAALgbsgI2RiZGZkYWRlZGNkZ2BsYI1OSM1OZs1OSe/OJW1KDM9o4S9KDWtKLU4g4EBAJ79CeQ=') format('woff'),*/
+	/*url('../fonts/iconfont.ttf?t=1508229193188') format('truetype'), !* chrome, firefox, opera, Safari, Android, iOS 4.2+*!*/
+	/*url('../fonts/iconfont.svg?t=1508229193188#iconfont') format('svg'); !* iOS 4.1- *!*/
+	/*}*/
+
+	.iconfont {
+		font-family: "iconfont" !important;
+		font-size: 16px;
+		font-style: normal;
+		-webkit-font-smoothing: antialiased;
+		-moz-osx-font-smoothing: grayscale;
+	}
+
+	.icon-check:before {
+		content: " ";
+		display: block;
+		width: 16px;
+		height: 16px;
+		position: absolute;
+		margin: auto;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		z-index: 9999;
+		background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADIEAYAAAD9yHLdAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAZiS0dEAAAAAAAA+UO7fwAAAAlwSFlzAAAASAAAAEgARslrPgAAIlFJREFUeNrt3X1cVNW6B/BnbcS3xJd7fLmSeo+op/Qmyp4BFcQEwpd8Nyc9iZppgUfE49u1tCwlNcMySCM1S81jCoaioiJvKoYgswfUo5wSJ69SZFKCKSAws+4f2/GetFFRYG3g9/2Hz2xj+O2J4Zm19trrIQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKgjmOgAAADwOBhz83TzdPNs397qanW1ujJ2s8fNHjd7FBTkhuSG5IbculVdP1kSfeoAAPBwdFzHdXzgQN0S3RLdkpgY2SJbZMvNm9It6ZZ064cfGmQ2yGyQmZfX3KO5R3OPwkJdsi5Zl5yYKIfL4XL4mDHqs7AqGzhgBAIAoFFdI7pGdI1o1KjFlhZbWmxZv149OmXK4z3r4cPEiROfOFExKSbFVFDwqM+EEQgAgMY8y5/lz/LGjZu3bt66eev9+9Wjj1s4bAYNIkaMWHKyx3mP8x7nmzd/1GdyEP1CAQCASifrZJ3s6FjmWuZa5rprF3uLvcXeGjq0en5au3a8nJfz8k6d8lPyU/JTYmIq+wwYgQAAaIIk0WgaTaO/+IJm0SyaNWJEtf/IPMqjvJde0g/QD9APcHOrdGIhrxMAANzGmJwr58q569ZRLMVS7MSJNfajFVJIYYy/wF/gL7z0UmW/vUGNvk4AAHCHTqfT6XQrVtB4Gk/jg4KEBfmBfqAf+vSp7LdhBAIAUMPUwvH66+oj21eBSqmUStu3r+y3oYAAANQQtXDMmKE+WrlSdB4bvpwv58t/+62y34cCAgBQzeSt8lZ568SJFEiBFLh2reg8d2MD2UA28PTpyn4fCggAQDXRh+pD9aEjR1IABVDA5s20ntbTeklzf3eZF/NiXvv2Vfb7NHciAAC1nRwsB8vBvr5Wf6u/1X/nTubO3Jl7A+0tWvImb/LOyemc3zm/c/6ePZX9dmxlAgBQRfTd9N303Tw8rFusW6xbEhPZLDaLzXJyEp3rHjNoBs24dYt/wj/hn3h5mUwmk8mkKJV9GoxAAAAekz5AH6APeOYZ6znrOeu5Awc0WzgCKZACrVZ2hB1hR15++VELhw1GIAAAj0hdVdWli/ooNVX9WvnlsNUflHSk45wbuZEbg4LUwrFhw+M+LUYgAACV1CuoV1CvoCef5Kv4Kr4qIUE9qsHCcRsv4AW8YOHCqiocNtq7qAMAoFHqZoetW9MgGkSDDh+mhbSQFnbuLDrX/YWGmmJMMaaYsLCqfmZMYQEAPIBt23PLp5ZPLZ8mJ9MROkJHdDrRueyKpViKXbdO6aB0UDoEB1fXj8EUFgCAHX0v973c93KTJpbvLd9bvt+3T+uFg0/mk/nkL79UC0dISHX/PIxAAADuYuvLwQ/xQ/zQnj1sKBvKhj7/vOhc9vA4HsfjYmOd2jm1c2o3btxRdpQdZRUV1f1zMQIBALjNYDAYDAYHB9pEm2jTl19qvXBQGIVRWFKSWjgmTKipwmGDi+gAAERExJhZZ9aZdZGRNJ2m0/Tx40UnssuHfMgnPb2koKSgpGD0aIUpTGGlpTUdAwUEAOo9XbguXBf+/vu0lbbS1ldfFZ3HrgE0gAacPu0423G24+xhw5SOSkel440bouKggABAvaXjOq7j77xDetKTfv580Xns8iIv8srNlfKkPClv8OD0jukd0zv++qvoWLiIDgD1jrpnVXAwb86b8+Yffyw6jz18NV/NV+flWQZaBloGenufYqfYKXbxouhcNriIDgD1hi5Zl6xLnjyZL+AL+ILwcNF57OpLfanv1atsPpvP5vv7a61w2GAEAgB1nrpn1ejRPJNn8szoaM1ur05EREVF6ldfX0VRFEUxmUQnskejLyAAwOPT79fv1+9/7jn+E/+J/7Rjh7YLR3ExceLEhw9XTIpJMWm3cNho9IUEAHh08hB5iDykb1/+M/+Z/7x7N0VSJEU2aiQ61z30pCd9WZl1inWKdcoLL2R5ZnlmeR4/LjrWw8I1EACoM+S2clu5rasr+yv7K/vrgQO0jtbRumbNROe6G4/kkTzSYqFMyqTMgAC1cBw6JDpXZaGAAECt1zukd0jvkG7daBftol2HD1MERVBEq1aic93jdl8O9gv7hf0SGKhOVUVHi471qFBAAKDW0hfri/XFHTs6cAfuwBMS2Bw2h81p1050LruepWfp2fnzlaHKUGXopk2i4zwuFBAAqHVcw1zDXMPatrWSlayUkEBplEZp//VfonPZw86ys+zsm28qE5WJysQPPxSdp6qggABAraHuktuiRYOgBkENgg4dYt7Mm3k/9ZToXHZNpIk0MTzcWGosNZYuXy46TlXDfSAAoHnqfRxNm6qP4uPVr/37i85l11gaS2M3b1YWK4uVxa+8oh7kXHSsqoYRCABoVo+oHlE9oho2pME0mAbHxKhHNVw4IimSImNiXLJdsl2yp09XD9a9wmGDAgIAmmPry9G4f+P+jfv/4x8UT/EUP3iw6Fz3d/hwUXpRelH6Sy9FR0dHR0dbLKITVTfcSAgAGsPYhT4X+lzos2EDG8FGsBHjxolOZA9fxBfxRWlpFeYKc4V57NjckNyQ3JBbt0Tnqim4BgIAmiEvkhfJiz78kMWzeBY/Z47oPPbwpXwpX5qdbRlmGWYZ5uOjbnZYWCg6V03DFBYACKdbq1urW7tiheYLRypP5anffluRU5FTkTN4cH0tHDYYgQCAMOqeVX//O7vKrrKra9aIzmMPP86P8+NmM/fjftzP2zsrLSstK+3HH0XnEg0jEACocXJXuavcdepU1ol1Yp00fGNdP+pH/X78UUqSkqQkf38Ujt9DAQGAGqMP0YfoQ154gbbTdtq+cSMppJDCtDcTwokTLyiwvGh50fKiv79xuHG4cbjZLDqW1mjvfxwA1DluZjezm3nECMkgGSTD11+rRx0dRee6G8/gGTzj+nU+gA/gA/z81BGH0Sg6l1ZhBAIA1Ua9g9zHh/3MfmY/R0WpRzVYOE7yk/xkSYmUI+VIOSNHonA8HIxAAKDK6bvpu+m7eXhYt1i3WLckJrJZbBab5eQkOtcfKy9Xv44Zo7aQjYsTnai2cBAdAADqDn2APkAf8Mwz1gRrgjUhIYG9wF5gL7RsKTrXPQIpkAKtVlbMilnxpElKvBKvxO/eLTpWbYMRCAA8NnWqqksXddXSsWN0gk7QCWdn0bnuDao2dOJGbuTGoCCTyWQymTZsEB2rtsI1EAB4ZL2CegX1CnrySb6Kr+KrEhI0Wzhu4wW8gBcsXIjCUTWwFxYAVJral6N1axpEg2jQ4cO0kBbSws6dRee6v9BQU4wpxhQTFiY6SV2BKSwAeGge5z3Oe5xv3tzyreVby7dJSfQ2vU1v6/Wic9kVS7EUu26d0kHpoHQIDhYdp67BFBYAPFDfy30v973cpElFVkVWRdbevZovHJtpM23etk0tHCEhouPUVRiBAIBd6lSVoyMxYsRsq5SGDROdyx4ex+N4XGysUzundk7txo07yo6yo6yiQnSuugojEACwQ5L4dD6dT9+6VX2s3cJBYRRGYUlJauGYMAGFo2bUWAHps73P9j7b27Xr2bNnz549W7USfeIAYA9jslk2y+YNG9gmtoltmjBBdCJ7bA2dypVypVwZNUotHKWlonPVF1U+hfX7PW8CA9UtAnx9mQfzYB5Nmtz5Dz3IgzwKC+k1eo1ei4+naTSNpq1Zo5gUk2LKyBD9wgDUR/I5+Zx87oMP2CQ2iU2aO1d0HnvQ0EkbHruA9OK9eC/esmWD1AapDVK/+orm0ByaM2TIIz9hNEVT9IYNRfuL9hftDwmpby0iAUSQT8on5ZNLlrAZbAabsXSp6Dz28JV8JV/53XcVpypOVZzy9j694PSC0wt+/ll0rvrqkQuI15+8/uT1Jyen0smlk0snHz9Ox+gYHXN1rdp4KSnlE8onlE8YMUL9Rbl5U/QLBlCXqBfJQ0LUi+Th4aLz3N+lS+o2697e6kzFpUuiE9V3j3wNpHR26ezS2ZGR1VM4bHx8HHs59nLsdeBAj6geUT2imjUT9UIB1CVylBwlR738MulJT/qPPhKdxx6+hq/ha65ckWKlWCnW3x+FQ1sqPQJxN7gb3A29e1tbWVtZW5lMNdUQhifxJJ70zTdNujTp0qTL0KHf/PLNL9/88ttvYl42gNrJ7Te339x+GzuW5bAclhMVpU5ZOWhvU9UQCqGQa9es063TrdN9fLLKs8qzyk+dEh0Lfq/SIxBrf2t/a/+JE2u6kxjzY37Mz8ur9OXSl0tfTklRb2z6j/+o2ZcLoHZyi3aLdov285N2Sjulndu3a7ZwEBFRcTFP4Ak8YdQoFA5tq/wU1l/oL/QXLy9hiY/QETqi05U1L2te1vzgQdtFfGF5ADRMX6wv1hd7eqo9vWNjKZIiKbJRI9G57jGDZtCMW7fYUraULR01yrTNtM20LTVVdCy4v0qPINSLbrm56kW3Ll1EnwAtpaW01Ggse6PsjbI3Bg06c+bMmTNnrl0THQtApDtTza2tra2tU1LoJJ2kk9r7oMUzeSbPrKhg7syduRsMakOnPXtE54KHU+kRCF/Gl/FlGrr2cHtPHseVjisdVyYn39klFKAe6h3SO6R3SLduln9Y/mH5x8GDWi0ctr4cLJ7Fs/igIBSO2qnyU1i9qTf1zskRHfxu7G32Nnu7d2+1oCQmopBAfaL+vnfqJIVJYVJYUhLrx/qxfv/5n6Jz2cNSWApLCQlRhipDlaGbNonOA4+m8gWkM3WmzrGxooPbtYyW0bJevdQptuRk1zDXMNewtm1FxwKoDrYtgugNeoPeSExknsyTeXbsKDqXPewsO8vOvvmm8bzxvPH82rWi88DjqXQB6TK6y+guo3ftosW0mBafOyf6BO6vZ0/Hrxy/cvzq6FE3TzdPN0/tdkoDqAx1xNGiRfmI8hHlIw4epPfoPXqvWzfRueyaSBNpYni4sdRYaixdvlx0HKgaj7wMV5ZlWZZ1OsYYY+zYMfVo06aiT8genspTeeq331rmWuZa5vr5nfr01KenPv3hB9G5ACpD7T1ue5/Fx6tf+/cXncuusTSWxm7erCxWFiuLX3lFPci56FhQNR75TnS1p7Ci8Ml8Mp8cEKAeLS8XfUL2MG/mzbyfesphrMNYh7HJybZezqJzATyMrhFdI7pGNGrE5/F5fJ5tClm7hYNP49P4tB071MIxbdrtoygcdUyV3Qioy9Pl6fKef57n8Tye9/XXbCabyWY2biz6BO1aQAtowcWLFeMrxleMt+3mefGi6FgA/85gMBgMBgcH8wXzBfOFr75Sr+0ZDKJz3d/hw0VTiqYUTRk5Epuh1m1Vfie5foN+g37D0KFWV6ur1TUmRvOFxJM8yfN//9fhosNFh4s+Pif3ndx3ct/334uOBfD/fTk2bmQGZmAG2yd57bH15agwV5grzIMGYfPT+qHatiKRF8mL5EWDB1MohVLo7t339APRJNsmbb6+6rr0CxdEJ4L6SX3/fPihep/EnDmi89iDvhz1W7V1JDStMK0wrYiPV+8wHT1abSxVUiL6hO+vUyeextN4WkqKW5pbmlta166iE0H9oivVlepKly/XfOG4vSilIqcipyJn8GAUjvqp2lvaqtsvHz6sbss8ZAjNpJk088YN0Sduj20dPbvFbrFbKSm2O3tF54K6TU6UE+XE2bPJi7zIa9Ei0Xns4cf5cX7cbObP8ef4c76+aOhUv9XYbro2coAcIAd4e9Pf6G/0t7g4NovNYrOcnES/EPbwE/wEP/HTT9Z0a7o13c8ve0D2gOwBWr//BWoLW18OlsgSWeLnn9f0LtcPrR/1o34//siGsCFsiLe3cbhxuHG42Sw6FohV7SOQu9l22WTBLJgFP/88/5h/zD/W0N5ad7FtCSGRRBIlJ7uvdV/rvva//1t0LqjdbH056M/0Z/rzZ59ptnBw4sQLCqSnpaelpwcNQuGAf1fjBcRGndo6flzqLfWWeg8ZwjN4Bs+4fl30C2IPm8PmsDnt2llbWFtYW9g2bezZU3QuqF3U35tBg7Tel8P2frQ2tja2Nh46NDM4Mzgz+OxZ0blAW4QVEBtjU2NTY9O0NPIgD/Lw9eXhPJyH//qr6Fx2fUQf0Udt26pD+qQkua3cVm5bXS19oa6w9eVQf89jYrTal8O22IU5MAfmMGpUVlpWWlaa0Sg6F2iT5obM6lYNsqwWkoQENpvNZrM13HnQ1npzvXW9df2gQXjDwb+rLX05VLadJMaMUZexx8WJTgTaJnwEcjf1F9dkkhZJi6RFzz3H03k6T//lF9G57IqgCIpo1UrqJfWSeiUkuHd27+ze2d1ddCwQSx+qD9WHPvWUdaR1pHVkfLxmC0cgBVKg1cq6s+6s++TJKBxQGZobgdztzie4C9YL1gsJCepWDhru8+FBHuRRWEgZlEEZQ4ao13oyMkTHgpqh36/fr9/v4sIP8UP8UGoqnaATdEKDu0DfbujEjdzIjUFB6t52GzaIjgW1i+YLiI26aqV7d9aINWKNkpO13jBHVVTE2/A2vM2QIaZDpkOmQ+npohNB9bC1C2BJLIklpaay/qw/6+/iIjqXPczMzMy8cKHxmvGa8dr774vOA7WT5qaw7MlyynLKcsrJUQuHj496ND9fdK77a9GCXWVX2dVDh9wC3QLdAvv1E50Iqpat86U0X5ovzU9I0HrhUIWGonBAVag1BcRGnaP917/UR76+thucROe6vxYtJCYxiSUk6LiO6/jAgaITwePxOO9x3uN88+ZqB8yDB2k5LaflPXqIzmVXLMVS7Lp16vtnyRLRcaBuqDVTWPbYLlZyF+7CXZKS6EP6kD7UcJ8Pd3In95s3eQPegDcYOdK01rTWtDY5WXQseDh9L/e93PdykyZlT5Q9UfbEgQPMn/kzfw1/INhMm2nztm1KT6Wn0nPKFPWg1So6FtQNtb6A2Nj2rJLGSGOkMcnJbD6bz+Z36CA61/0VF1tft75ufX3kyCxDliHLkJQkOhH8MXWqytFRXcSxe7d6dNgw0bns4XE8jsfFxjq1c2rn1G7cuKPsKDvKKipE54K6pdZNYdmTHZEdkR1x/rxloGWgZaC3N1/FV/FVWu/r0bSp9J70nvTe3r26Ql2hrtDfX3Qi+COSxKfz6Xz61q3qY+0WDgqjMApLSlILx4QJKBxQnepMAbGxdRbk2TybZ/v42HYPFZ3r/po2pV20i3bt2yevkFfIK4YPF50IiIgY05l1Zp05MpJtYpvYpgkTRCeyy4d8yCc9vaSgpKCkYPRotXCUloqOBXVbnZnCskedeujUSX2UnKxOQXTpIjqXXXrSk76sjHVgHVgHg8H4lvEt41t794qOVd/I8+R58rxVq9gRdoQd+Z//EZ3n/s6ccdzjuMdxz8CB6R3TO6Z31PBWQFCn1LkRyN3UG/kuXWLH2XF23MdH7beQmys6l11GMpKxYUO1t3x0tO5fun/p/jVqlOhY9YW6lc5bb2m+cNz+PZZcJBfJZdAgFA4Qoc4XEBt108bLl6V8KV/K9/amxbSYFmu4r8ftQkJraA2tiYqSw+VwOXzMGNGx6ir5oHxQPvi3v6mPli0Tnccevpqv5qvz8irCK8Irwv39M6MzozOjf/pJdC6on+pNAbGxveEalDYobVDq68vf5e/ydzW8TfXtQsK2sq1s686dd/pIQJVQd1MOCGCX2WV2+eOPReexqy/1pb5Xr6qrC/39bdf6RMeC+q3eFRCbjJcyXsp46coVx2uO1xyv+fnxo/woP/rPf4rOdX+OjiyH5bCcqCh5q7xV3jpxouhEtdWdqcGf6Cf66YsvaD2tp/WSRt8PRUWUTumUPmTI72+kBRBLo2+YmmMrJBWRFZEVkX5+6tEzZ0TnsudOA6Kn6Wl6essW2ydo0blqC7dot2i3aD8/XsgLeeGOHcyduTP3Bg1E5/pjxcW8O+/Ou48YYdulWnQigH9X51dhVVbvY72P9T7Wpo3DbofdDrsTE+kYHaNj2m0YxSN5JI+0WNgNdoPdeOUVxVfxVXxt9yuAjboar08fCqZgCk5MpHW0jtY1ayY61z1ur8KzTrFOsU4ZNSrLM8szy/PQIdGxAP5IvR+B3C17QPaA7AFXr5YlliWWJQ4cSEtpKS3VboMo24iEN+PNeLPPP5ej5Cg56uWXRefSClvrYR7BI3jEgQNaLRy2DwKUSZmUGRCAwgG1AUYgD9CL9+K9eMuWDtcdrjtcj49nvsyX+Xp4iM5l1+0+D6SQQsrMmerUR2Sk6Fg1zS3NLc0trWtXpmd6pk9N1ez2/7b/X2NoDI159VVlqDJUGbppk+hYAA8DI5AHUFe7FBZamluaW5oPHkycOHENN4hSSCGFMfUP07p18gB5gDxg5kzRsWqKuktuhw7SJemSdCkhQbOFw+ZZepaenT8fhQNqI4xAKkmdEmnRgnzJl3wPHaIUSqGUvn1F57If+PYnXH/yJ//ZsxWDYlAMGl6u+ojuXLuKcYhxiDl6lFIplVK7dxedyx52lp1lZ99801hqLDWWLl8uOg/Ao3AQHaC2yc/Pz8/Pv3WrzZg2Y9qM2bFDWiOtkdZ4erIv2Zfsyz//WXS+ewNTPuUzRiVUQiVDhjhzZ+7Mr11Tz0PDI6mHZCvoUrwUL8UnJNAlukSXtLvoQRURoVxWLiuXFy0SnQTgcaCAPKIrCVcSriSUl7dp3aZ1m9a7djn80+GfDv+0dRzs3Fl0vnvYCome9KQfMqR9m/Zt2rcpKsrPzc/Nz619rXbVLUeaNqXn6Dl67sAB+p6+p+81PBIcS2Np7ObNyjZlm7JtxgzRcQCqAq6BPKbTC04vOL3g5k310fDh6lSRhhtE3b5GorbaXbNGDpAD5IDa80m4R1SPqB5RDRvy2Xw2n71rFyVREiV5e4vOZVckRVJkTIxLtku2S/b06epBzkXHAqgKGIFUEXVKqLzcucS5xLlk1y4+j8/j8/r0YSfYCXZCuz2yWQErYAV+fs6hzqHOoRZL/t78vfl7jx0TnetuBoPBYDA4ONzYd2PfjX3bt7MMlsEytL7J5OHDRa2LWhe1Hjfu+AfHPzj+QXm56EQAVQkX0avJndanTcqalDWJjWWD2WA2WPsNo9T7Ed5+2+Rh8jB5aGVTQcZks2yWzRs3MgMzMMO0aaIT2cMX8UV8UVpahbnCXGEeNOj3I1SAugUFpJp1jega0TWiUaMW+hb6FvroaJpFs2jWiBGicz0I/4J/wb9YtcrkanI1ub7+uqgc8jn5nHzugw/YJDaJTZo7V/TrYg9fypfypdnZlmGWYZZhPj625d+icwFUJ1wDqWa5IbkhuSG3bpXkleSV5I0bx2fymXym9htEsalsKpu6cKF8Wj4tn37vvZr++bJJNsmm0FDNF46VfCVf+d13FTkVORU5gwejcEB9ghFIDbNdBG6yqsmqJqt27lSPjh4tOtcDJVESJYWFKS2VlkrL6mu0pC7LDQlRO0eGh4s+7fu7dEm9sdTb29a4THQigJqEEUgNO/fiuRfPvVhWpv7hefFF2yod0bkeyI/8yG/BAvUP/OrVVf306rLcKVPUZcYffST6dO3qR/2o348/sqVsKVvq44PCAfUZVmEJoq7aslr7F/Yv7F/49dfXrl27du1a167qv/bsKTqfXYwYMU/P9lPbT20/tUWL/NT81PzUw4cf9enuNMjqQ32oz7ZtbCPbyDZqsC8HJ068oEDyl/wlfz8/Y4AxwBjw3XeiYwGIpL03aj0THR0dHR1tsbi4uLi4uEyeTJtpM23etk10rgdh8Syexc+ZI+fKuXLuJ5/cPvrQU6K6Ql2hrtDfX9op7ZR2bt9+p8+JxvAMnsEzrl+3NrY2tjYeOjQzODM4M1jDHSwBahCugWiM7X6HC/0v9L/Q/4sv1Fa2kyaJzvVA0RRN0Rs2KC6Ki+Jiu9Paar37P9MX64v1xZ6efC6fy+cePqxuX/7EE6Lj342f5Cf5yZISJjGJSc8/rzCFKezIEdG5ALQEBUSjbIXEbDabzWbbLq1TpojO9UCcOPHPPlOvDQQGqgetVneDu8Hd0Lu3tbW1tbV1SgqdpJN0smVL0XH/mO2GvzFj1O3w4+JEJwLQIs1NGYDq3Llz586d41y9VrJ3r3OKc4pzSqdOFEMxFOPmJjqfXYwYMVluP6/9vPbzOnZ0/sX5F+dfvvvOusS6xLokMZF9zj5nn7duLTrmPQIpkAKtVlbMilnxpElKvBKvxO/eLToWgJZhBFKrSJK6Cmr9evUPtW1vJQ273aKVjGQkY8OGouPc4/Z293wYH8aHBQaaRplGmUZt3Cg6FkBtgAJSKzEmvyO/I78TEcH2sX1sX3Cw6ES1FTMzMzMvXGi8ZrxmvPb++6LzANQmmMKqpfKP5B/JP3LokLOzs7Ozc6tW6tE+fUTnql1CQxWzYlbM774rOglAbYRlvLUa5+pF3r//nQ7SQTqo4RvwtGI8jafxn3yivm5LloiOA1CbYQqrjtGV6kp1pcuXkxd5kVft6fNR7W7fX6P0VHoqPW2r2e5dZgwADw8jkDpGaaw0VhovXsw38o18I6ZmeByP43Gxsc2eafZMs2emTlWPonAAVAUUkDrKJJtkk/zWW/QqvUqvaqWvRw0KozAKS0pyaufUzqndhAlH2VF2lFVUiI4FUJeggNRxSpASpAS9/ba6jHbpUtF5qh0nTjwjo6SgpKCkYPRotXCUloqOBVAXoYDUE+pWHO+8QyEUQiHiGkRVrzNnHGMdYx1jn39e3fX4xg3RiQDqMizjrWfy9+Tvyd/zzTdPlj5Z+mRpSQm1olbUSvutdu3yIi/yys2VHCVHydHX9+T0k9NPTr96VXQsgPoAq7DqOfmYfEw+Nn8+m8PmsDlhYaLzPCy+mq/mq/PyLAMtAy0Dvb3VToAXL4rOBVCfYAqrnjMNMA0wDVi9mubSXJo7b57oPA/Ul/pS36tX2Xw2n83390fhABAHIxD4HV2sLlYXGxREcRRHcZ98QgoppDx8n4/qVVSkfvX1VW8ENJlEJwKoz3ANBH4nf0f+jvwdRmN73p635/n5LIgFsaBhw8QWkuJi3p13592HDTPFm+JN8RkZol8nAMAIBB5AjpVj5dhXX2VX2BV25dNPaT2tp/U10HL29i6+TMd0TDd6tPE142vG1w4eFP16AMD/QwGBh6I7qDuoOzhtGl2my3R5w4bqKiQ8kkfySItFHfn89a9qY6roaNHnDwD3QgGBSpG7yl3lrlOn0nbaTts3bqyqXua2wiEtk5ZJy6ZONe437jfu//JL0ecLAPbhGghUSv6v+b/m/5qd3b5N+zbt22RksLFsLBvbvz+lURqlVb5FLU/lqTz122+l36TfpN8MBuMc4xzjnL17RZ8nADwYlvHCIzGtMK0wrYiPbza+2fhm47t3V48uWcJX8pV85Xff2fu+3//7kiXXP7v+2fXPevUy9jT2NPY8elT0eQHAw8MUFlQL1zDXMNewJ55o2L1h94bd27UryynLKcu5cuX0gtMLTi+4eVN0PgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAO/4PSBxbMqgmA24AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTctMTItMTVUMTU6NTc6MjcrMDg6MDCiEb4vAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE3LTEyLTE1VDE1OjU3OjI3KzA4OjAw00wGkwAAAE10RVh0c3ZnOmJhc2UtdXJpAGZpbGU6Ly8vaG9tZS9hZG1pbi9pY29uLWZvbnQvdG1wL2ljb25fY2sxYnphMHpqOWpqZGN4ci9jaGVjay5zdmfbTpDYAAAAAElFTkSuQmCC");
+		background-size: contain;
+	}
+
+	.icon-close:before {
+		content: " ";
+		display: block;
+		width: 16px;
+		height: 16px;
+		position: absolute;
+		margin: auto;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		z-index: 9999;
+		background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADIEAYAAAD9yHLdAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAZiS0dEAAAAAAAA+UO7fwAAAAlwSFlzAAAASAAAAEgARslrPgAADwRJREFUeNrt3V1sU+cZwPHndTAjwZ0mbZPKR/hKm0GqtiJJGZ9CIvMCawJoUksvOpC2XjSi4kMECaa2SO0qFEEhgFCQSqWOVWqJEGJJuyYYWCG9QCIOhQvYlgGCIFmatrVSUhzixO8ujNM1gSZOfPye857/7wYlfPg5xj5/n/fExyIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABATizsWti1sCs/v6y0rLSsdMaMZ/Y8s+eZPZMnm54LQO6kn/fp/UB6v2B6LrdRpgcwZf7e+Xvn7505MxAIBAKBrVt1ja7RNdXVaqlaqpbOmTP0z+u9eq/ee/euFEqhFH7ySeCjwEeBj+rr299of6P9jb//3fT2AMhcWVlZWVnZ3Ln6uD6uj2/eLF3SJV1VVapW1ara6dOH/nn9hf5Cf3HzpupW3aq7qSl5LHkseay+/nLt5drLtbdvm96eXPNZQJQqn1Q+qXzS73+vN+gNesObb0q7tEv7xImZ/kv6kr6kL/X3q0PqkDpUXx/aFNoU2rRz53l1Xp1X/f2mtxTAcMv1cr1cT5jQfb37evf1ujrpkR7p2bxZ1agaVZOXl/E/WCM1UnP/vv5cf64/f+utjg87Puz4cPfu1G9qbXp7neaTgChVeqD0QOmBP/5RHVPH1LHf/CbrN1EplVLZ2iqt0iqtv/51NBqNRqP37pnecgDpI42CgtTz9OTJ1PO0sjLbt6PX6/V6/Z/+1LG5Y3PH5g0bHnzX2pBkXlyPKTtadrTs6Ouvq/fV++r9LVscu6EbckNuPPGEhCUs4UWLpsanxqfGT5yIxWKxWCyRMH0/AH40GI6whCXc3Cyn5bScDoeduj11RV1RV559dkrFlIopFX19sauxq7GrbW2m7wenBEwP4JT0OY7UV6+/nrMbjkhEIitWSIVUSEVLS0ljSWNJYyhk+v4A/GQwHHtkj+xpahp8XuaImqwmq8m7di2oXlC9oHr2bNP3h1OsDUhgfWB9YP2WLdIgDdLwgx/kfICzclbOLluW35Hfkd/x5z8PPqABOGbYEcd22S7bKypyPsiDc6v9df11/XWvvWb6fnGKtQHRj+nH9GOrV5ueY/CVz4MHNCEBsm9YOHJ8xPEo6og6oo64YD/k1PaZHiDbvruD/uYb0/MMUyEVUtHWFi+Pl8fLf/Wray9ee/Haiz09pscCvGjYUpWpI44RBE8FTwVPFRRcLLxYeLEwHjc9T7ZYdwSi2lSbavvxj03P8UgsbQHj5pqlqlFK9iZ7k70u3i+NkXUB6Tvcd7jv8H//a3qOEXGyHciY6ZPjYzXw0sBLAy95YL+UIeuWsNJK75feL71/545arBarxYWFpucZUVjCEj53LvWEqK7mfSTAt9x6jmNEi2WxLL59O3ooeih6aNYs0+Nkm3VHIIO6pEu6Pv3U9Bijxsl2YBjPhiOtUAql0EP7oQxZG5C8SXmT8ibt35++5IjpeUaNpS3As0tVabpBN+iGgQE5Lsfl+KFDpudxirUBuTT90vRL0//xj/S1qkzPkzFOtsOHvHZy/FFUsSpWxfv2pZai//Y30/M4xfpLmRR/VvxZ8Wd//Wvf7b7bfbd//vPBS454xU25KTdnz+YSKbCZ55eq0h5cE2/OB3M+mPPBb3977dq1a9eu2XstLGtPog+Vvp5/X1tfW19bU5N6V72r3v3FL0zPlTHeRwKLeOV9HCPaLbtl94UL8a/jX8e/fv55vzwvfROQNEICmEc47OC7gKQREiD3CIddfBuQNEICOI9w2Mn3AUkjJED2EQ67EZAhCAkwfoTDHwjIIxASIHOEw18IyAgICTAywuFPBGSUCAkwHOHwNwKSIUICEA6kEJAxIiTwI8KB/0dAxomQwA8IBx6GgGQJIYGNCAe+DwHJMkICGxAOjAYBcQghgRcRDmSCgDiMkMALCAfGgoDkCCGBGxEOjAcByTFCAjcgHMgGAmIIIYEJhAPZREAMIyTIBcIBJxAQlyAkcALhgJMIiMsQEmQD4UAuEBCXIiQYC8KBXCIgLkdIMBqEAyYQEI8gJHgYwgGTCIjHEBKIEA64AwHxKELiT4QDbkJAPI6Q+APhgBsREEsQEjsRDrgZAbEMIbED4YAXEBBLERJvIhzwEgJiOULiDYQDXkRAfIKQuBPhgJcREJ8hJO5AOGADAuJThMQMwgGbEBCfIyS5QThgIwICESEkTiEcsBkBwXcQkuwgHPADAoKHIiRjQzjgJwQE34uQjA7hgB8REIwKIXk4wgE/IyDICCFJIRwAAcEY+TUkhAP4FgHBuPglJIQDGI6AICtsDUl+XX5dfl0ySTiA4QgIsmrwlXpYwhJubpaIRCSyYoXpuTIWlrCEz50b/Nrr2xGRiESqq6PRaDQavXfP9FiwAwGBI6w5IvEqjjiQAwQEjiIkOUY4kEMEBDlBSBxGOGAAAUFOEZIsIxwwiIDACEIyToQDLkBAYBQhyRDhgIsQELgCIRkB4YALERC4CiEZgnDAxQgIXMn3ISEc8AACAlfzXUgIBzyEgMATrA8J4YAHERB4inUhIRzwsIDpAYBMJNYm1ibWKqUeV4+rx5X3XwCdkTNyxoLtgC/xwIUnWPN5HI/i8Ge2A04gIHA168MxFCGBhxAQuJLvwjEUIYEHEBC4iu/DMRQhgYsRELgC4RgBIYELERAYRTgyREjgIgQERhCOcSIkcAECgpwiHFlGSGAQAUFOEA6HERIYQEDgKMKRY4QEOURA4AjCYRghQQ7kmR4AdhkMR1jCEm5uliNyRI54MBxhCUv43DkpkiIpunVLbspNuTl7tumxRu2W3JJbM2cGC4IFwYKFC6fGp8anxk+ciMVisVgskTA9HuzAxRSRFcOOOCISkciKFabnylj66ril8dJ46Zo1wY3BjcGNVVV6m96mt505Y3q8jKX/HyqkQipaWkoaSxpLGkMh02PBDixhYVysWaoa4bLq1lxGnqUtZBEBwZj4JRxDERLgWwQEGfFrOIYiJAABwSgRjocjJPAzAoLvRThGh5DAjwgIHopwjA0hgZ8QEHwH4cgOQgI/ICAQEcLhFEICmxEQnyMcuUFIYCMC4lOEwwxCApsQEJ8hHO5ASGADAuIThMOdCAm8jIBYjnB4AyGBFxEQSxEObyIk8BICYhnCYQdCAi8gIJYgHHYiJHAzAuJxhMMfCAnciIB4FOHwJ0ICNyEgHkM4IEJI4A4ExCMIBx6GkMAkAuJyhAOjQUhgAgFxKcKBsSAkyCUC4jKEA9lASJALBMQlCAecQEjgJAJiGOFALhASOIGAGEI4YAIhQTYRkBwjHHADQoJsICA5QjjgRoQE4xEwPYDtbAtH4kriSuIKT1BbXCy8WHixMB6fuGzisonLVq/W2/Q2ve3MGdNzZeysnJWzy5blt+e357f/5S8ljSWNJY2hkOmxbMcRiENsDcfV7Ve3X93+zTemx4IzOCJBJghIlhEO2ICQYDQISJYQDtiIkOD7EJBxIhzwA0KChyEgY0Q44EeEBP+PgGSIcACEBCkEZJQIBzAcIfE3AjICwgGMjJD4EwF5BMIBZI6Q+AsBGYJwAONHSPyBgDxAOIDsIyR2831ACAfgPEJiJ98GhHAAuUdI7OK7gBAOwDxCYgffBIRwAO5DSLzN+oAs18v1cj1hQk95T3lP+aefpr77y1+anitje2SP7Dl7NhW+1auj0Wg0Gr13z/RYQDYMvsALS1jCzc0SkYhEVqwwPVfGKqVSKltbQ++E3gm9U1V1Xp1X51V/v+mxnGL9B0p1X+++3n29ri71FeEA3GjwcR2RiESqq1MhOXfO9FwZa5VWaa2s7DnYc7Dn4O7dpsdxmrUBKX+7/O3yt3/2M5krc2Xupk2m58lYeqkqmogmomvWEA74QfpxHtwY3BjcWFXl1U9I1Iv0Ir1o69b53fO753fPm2d6HqdYG5BkXjIvmbd1q3pOPaeemzDB9Dyjlj7i2Ck7ZeeqVZzjgB+lP2o3dU5kzRqvHZGoGlWjavLyAg2BhkDDa6+Znscp1gZEzVQz1cyqKtNzjBpLVcAwnl/aOi7H5biH9kMZsi4gCzoXdC7o/OEPZZ/sk33TppmeZ0QsVQEj8vbS1owZJY0ljSWNoZDpSbLNuoAMrBtYN7DuRz8yPceIWKoCMubVpa3Q/ND80HwP7JcyZF1ARIkS9e9/mx7jkTjiAMbNa0ckgUmBSYFJ//mP6Tmyzdr3gZTGS+Ol8Rs31FK1VC2dM8f0POkjjuCTwSeDT1ZXp19JmR4LsIFr30eyQ3bIjs7O6AvRF6IvFBebHifb7DsCeUA1qAbV0Nxseg7CATjPrSfb9VP6Kf2UC/ZDDrE2IMlkMplM7t8vNVIjNffv53yAIUtVhANwnluWtvRhfVgf7u1VL6uX1csHDpi+X5xibUAu116uvVx7+3bqqz/8IWc3nD7imBecF5y3ciUnx4HcM36yPSlJSb71VrQj2hHtuHPH9P3hlDzTAzgt1hRrijW1tU3ZMWXHlB1z5qgr6oq68uyzWb+h/bJf9re0BIuCRcGitWs54gDMi8VisVgskZganxqfGj9xInWtqvJyuSE35MYTT2T79vRJfVKfPHas4+mOpzuerq01vf1Osz4gabGWWEus5dSpaV9N+2raV4mE7JJdsmvJEmmXdmnP/J3q+pK+pC/190undErn3r1FkaJIUeR3vzv9yulXTr/S12d6ewF8Kx2S4gvFF4ovfPxxX29fb19vQYE+qo/qowsWqPfUe+q9QMYrMumlKlklq2TVm29+Nxxam95up1n7U1gjKSstKy0rnTFDr9Qr9cotW1SLalEtq1enfgy4qOjhf+vOHVkn62TdJ58M3B24O3C3vv7Lg18e/PJgZ6fp7QGQufQ18/QpfUqf2rw59d3nn0/9OmPGsL+wRJbIkn/+U7+qX9WvNjUFZgVmBWbV17cXtBe0F3R1md6eXPNtQB4l/fkEiTWJNYk1P/1p+n0lvF8D8I/BHwvWokX/5CehaCgaiv7rX6nLs/f2mp4PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAtvsf2vlfs7i0WI4AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTctMTItMTVUMTU6NTc6MjcrMDg6MDCiEb4vAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE3LTEyLTE1VDE1OjU3OjI3KzA4OjAw00wGkwAAAE10RVh0c3ZnOmJhc2UtdXJpAGZpbGU6Ly8vaG9tZS9hZG1pbi9pY29uLWZvbnQvdG1wL2ljb25fY2sxYnphMHpqOWpqZGN4ci9jbG9zZS5zdmdHkn2WAAAAAElFTkSuQmCC");
+		background-size: contain;
+	}
+
+	.icon-right:before {
+		content: " ";
+		display: block;
+		width: 16px;
+		height: 16px;
+		position: absolute;
+		margin: auto;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		background-size: cover;
+		z-index: 9999;
+		background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADIEAYAAAD9yHLdAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAZiS0dEAAAAAAAA+UO7fwAAAAlwSFlzAAAASAAAAEgARslrPgAAJ4pJREFUeNrt3XtcVXW6P/Dn2VwCBxUzNbnkkXRSGzXW2huQRLyMIqKRJF7Q1CkrDS+VGp3Gy9g5YzI6qVsNfTmlqGmipQiIiJqAcnOvhaKRHidshoatpKaBogL7OX+s6Mz8flO5CfzutXne/+zXWhR8QOXZ3+93Pd8vAHuAEKW10lpp7dix0mXpsnR5/34pX8qX8r/7TpZlWZaJGl//9f6+fY3/X+PnEf2dMMYY/yJqYcbbxtvG2/7+lEM5lLN7NyyCRbBowICmfj56m96mt/PzDZGGSEPkxImWNpY2ljYVFaK/T8ZY6+MiOoCzMn1t+tr09a9/TQfpIB0sLITlsByW9+r1Sz8v5mEe5vn7Q3toD+0nT/Y77Xfa73ROTuWNyhuVNyorRX/fjLHWg0cgzUybcmrThvIoj/JUFcMwDMOeeKLFvmA8xEN8TQ2sh/Ww/rnnFFVRFfXwYdE/B8aY8zOIDuBsqDf1pt6vvdbihaPRBtgAG7y8wAQmMKWlyflyvpw/aZLonwNjzPlxAWlWiOiN3ugdH//Av7QFLGBxd4dzcA7O7dgh75H3yHvmzBH9E2GMOS+ewmomplhTrCn2qads5bZyW3lJieg8jWgADaABf/yjul5dr65fvPj7uyQ6F2NM/3gE0kxsb9vetr3do4foHP8vLMACLPj977W1mS1bwimcwsnVVXQuxpj+cQFpLt/Ct/BtmzaiY/y0adNqltYsrVmakqIVEg8P0YkYY/rFj/E2E5+zPmd9znbpAggI+PzzovP8qItwES727n23w90OdzuEhfl86fOlz5f79lmtVqvVeveu6HiMMf3gEUgzqVfqlXqluFi7qqsTnefnYCImYmJ4OOVSLuWeONF/Zv+Z/Wf6+orOxRjTD15Eb2ZSlVQlVWVkYCRGYuSoUaLz3C86QSfoRHk5lVAJlURElISWhJaE/vWvonMxxhwXj0CaGT1Lz9KzS5eCDDLI+nnaCQfiQBwYEID1WI/1J05oi+6SJDoXY8xx8RpIM7tccbnickVlZdekrkldk4gwAzMwY8gQ0bnuF2ZhFmZ5eWkd7pMn+1T4VPhUKIq2RvLll6LzMcYcB09htShE6YJ0Qbqwdi3GYRzG6bCxbxbMgll372ojqilTlEAlUAncu1d0LMaYeDyF1aKI1CfUJ9Qn5s6FuTAX5r71lt6mtiAJkiDpoYeojuqo7uOP5VQ5VU6dOVN0LMaYeDwCecCkFClFSpk+HcbBOBi3eTOa0IQm/TX20RbaQlsSE9V+aj+131tvic7DGHvwuIAIIp+Xz8vno6OpJ/Wknrt2YRAGYZCnp+hcdpsAE2DC++8rbypvKm82TtHZbKJjMcZaHhcQwYxnjWeNZ8PDaTpNp+mpqdrd9u1F52qa/fu9LF4WL8ukSTmYgzl4547oRIyxlsNrIIJZ+lr6Wvrm5GBv7I29Bw6EN+ANeOMf/xCdq2mefbbGWGOsMR48GHQx6GLQxXbtRCdijLUcfozXQVSWVpZWllZV+df51/nX7dtH8RRP8aNGwQk4ASc6dhSdzz7du9NVukpXR4zoFNMpplPM/v1Xsq9kX8m+dUt0MsZY8+ERiIMpTitOK067dMm1zrXOtS4sTLurqqJz2e04HIfjsuw623W26+yCgsD8wPzAfMfbrZgx1nRcQBxUUVxRXFHclSu1CbUJtQnh4dpd/R1V+0OHuxGNaMzLazw3RXQuxtgvx4voOtEnpU9KnxR3d88yzzLPsu3bIQ3SIG38eNG57BYEQRB04wZVUzVVP/OMukPdoe7IyxMdizFmPx6B6ETZ+LLxZePv3Qv4PODzgM/j4mg37abdGzeKzmW3YiiGYm9vHIyDcXB2tlwil8gl48aJjsUYsx+PQHROTpaT5eSEBDCDGcwrVojOYy9KoiRKamgAK1jBOmuWGq1Gq9GbN4vOxRj7eVxAnISUKWVKma++ihVYgRXr1sEm2ASbDPoZYTZu8bIJNsGmd95RUEEF//AH0bEYYz9OP79g2E9SI9VINfL996mWaql23DjaQBtog44a+RRQQEEEIxjBuHSptgml2ax9UEeFkLFWhEcgTko7z2PIECqiIiravx+DMRiD9drYt3MnEBDQ9OmKqqiK6vgnPjLWGvA7OyelKIqiKJ99pj31NHQovAavwWtVVaJzNU1cHKyCVbAqM/Ppjk93fLpj27aiEzHGeATSahjTjenG9IAAOkyH6XBWFpyEk3BSf419tISW0JJTp2wdbB1sHaKiTg86Pej0oG++EZ2LsdaIC0grozXyPfpow7SGaQ3TMjNxKS7FpTps7CMgoPPntYuICG1q6+9/Fx2LsdaEC0gr1Z/6U3/y9nZNcE1wTThwAI7CUTjauHWK3litVEEVVDFypFqlVqlVpaWiEzHWGvAaSCt1Bs/gGbxx46bfTb+bfsOHUxqlUZpej6rt2hVX4kpcefy4sYOxg7HD00+LTsRYa8AjEAYAALGxsbGxsS4u5XK5XC4nJcEe2AN7XnpJdK6muX1bex0/XnuYICNDdCLGnBEXEPZvIMokk0xLlzb2ZYhOZK/GDne8htfw2iuvKJFKpBL5wQeiczHmTPg8EPZvWZdZl1mXHT/uY/Yx+5ivX4cn4Ul4MiLih4Y/B4cZmIEZBgPchJtwc8wY33Lfct/y2trKO5V3Ku+cPCk6H2POwOF/ETDHoDUmxsVpV1u3aq9ubqJzNY3ZrE1tvf66ds1nuDPWFFxAmF0C9wTuCdwzbBj6oi/67tuHc3AOztFfYx9Npak0dft2TMZkTH7xRe5wZ8x+XEBYk5i6m7qbuptMtlG2UbZRGRlQCIVQ2KmT6Fx2i4RIiExPh0zIhMwJE7SRSeMiPGPsp3ABYb+INrXVq5d2lZWlvT72mOhcdiMgoKIi7WL0aG1EcvWq6FiMOTLuA2G/iPaOvbEjPCQEBsEgGKTDRj4EBAwOhkWwCBbl5BhvG28bb/v7i47FmCPjEQhrVn379u3bt2+HDm55bnlueWlpOAyH4TAdNvaFQiiE/u1v2Bk7Y+eICMtiy2LL4gsXRMdizJHwY7ysWVVVVVVVVd2545Ptk+2T/fHH2t3GvbZ+/WvR+e5bBVRAhbc3zaJZNCsu7lG3R90edcvLu6xcVi4rX38tOh5jjoCnsFiLaFyMDggICAgIiI6mPbSH9uivkQ/n4Tyc9/DDBjSgAbOzA/MD8wPzR44UnYsxR8BTWOwBQpTmS/Ol+StW4HE8jsfffFN0IrsZwQjGe/dgGkyDadOnK6FKqBK6a5foWIyJwFNY7IGyFlgLrAVHjnTd3nV71+03buDj+Dg+PmKEXjrcoRIqodLFBaqgCqpiYnzAB3ygpsZqtVqt1oIC0fEYe5C4gDAhrNus26zbiop8yZd86dIlqIEaqBk9Wvuoi+P/vbSCFayNBW/EiK5ZXbO6Znl6WpOsSdako0dFx2PsQXD8d3ysVZCWS8ul5aNH4yf4CX6ye7d2t00b0bmaJjnZy+Jl8bLMmJGDOZiD9fWiEzHWEriAMIciS7IkS8HB2lV6utaf8cgjonPZi+IpnuIPHHAf7j7cffjEiYX+hf6F/rW1onMx1pz4KSzmULQO8KKihjUNaxrWhIdTPuVTfkWF6Fz2wg24ATc888y9gnsF9woyM7XC2L696FyMNScuIMwhnR50etDpQWVltI7W0bqwMMqjPMrTXyMfJmIiJoaHUy7lUu6JE/1n9p/Zf6avr+hcjDUHnsJiuhBSEVIRUvHww3Xn6s7VnUtP17YcGTBAdC57USIlUuKlS7YDtgO2AxERp82nzafNFy+KzsVYU/AIhOmCtoZw/bpWQIYPh9WwGlYfOiQ6l70wARMwoXt3wzjDOMO4vDxtM0pJEp2LsabgAsJ0pXRh6cLShbdu1V6uvVx7OTqaUimVUvXXyIev4+v4epcuEA/xEJ+To62RjBghOhdj9uApLOYEELVfwCtXak9tzZ8vOpHdvu9wJ5lkkp9/Xn1ZfVl9OSVFdCzGforjN2wxdh+0TvDDh31W+KzwWXHnDtRDPdQPG/avDX8OrLHDfQbMgBkxMT6jfUb7jK6qsn5s/dj6scUiOh5j/47j/8NirAm0tYVp0+gUnaJTf/kLmtCEJldX0bnsRVtoC21JTFT7qf3Ufm+9JToPY/+MCwhzavJ5+bx8PjqaelJP6rlrFwZhEAZ5eorOZbcJMAEmvP++8qbypvLmnDnaTZtNdCzWunEBYa2C8azxrPFseDhNp+k0PTVVu6vDxr4oiIKoffu8lnkt81oWF6dtlXLnjuhYrHXip7BYq2Dpa+lr6ZuTg72xN/YeOBDegDfgjX/8Q3Quu2VABmSMHVtjrDHWGA8eDLoYdDHoYrt2omOx1okX0VmrUllaWVpZWlXlX+df51+3b5+2Z9WoUXACTsCJjh1F57NP9+50la7S1REjOsV0iukUs3//lewr2Veyb90SnYy1DjwCYa1ScVpxWnHapUuuda51rnVhYdpdVRWdy27H4Tgcl2XX2a6zXWcXFGgnJvboIToWax24gLBWrSiuKK4o7sqV2oTahNqE8HDt7uHDonPZCwfiQBwYEIBGNKIxL88Ua4o1xTaeRc9Yy+BFdMb+SZ+UPil9UtzdPcs8yzzLtm+HNEiDtPHjReeyWxAEQdCNG1RN1VT9zDPqDnWHuiMvT3Qs5lx4BMLYPykbXza+bPy9ewGfB3we8HlcHO2m3bR740bRuexWDMVQ7O2Ng3EwDs7OlkvkErlk3DjRsZhz4REIY/dBTpaT5eSEBDCDGcwrVojOYy9KoiRKamjQOvNnzVKj1Wg1evNm0bmYvnEBYcwOUqaUKWW++ipWYAVWrFsHm2ATbDLoZyQvgwwykZb7nXcUVFDBP/xBdCymT/r5i8+YA1Aj1Ug18v33qZZqqXbcONpAG2iDjhr5FFBAQdQ2b1y6VLogXZAumM3aB3VUCJlD4BEIY7+AtufWkCFUREVUtH8/BmMwBuu1sW/nTiAgoOnTtaOF6+pEJ2KOjd9xMPYLKIqiKMpnn2lPPQ0dCq/Ba/BaVZXoXE0TFwerYBWsysx8uuPTHZ/u2Lat6ETMsfEIhLFmZEw3phvTAwLoMB2mw1lZcBJOwkn9NfbRElpCS06dsnWwdbB1iIrSzqj/5hvRuZhj4QLCWAvQGvkefbRhWsO0hmmZmbgUl+JSHTb2ERDQ+fPaRUSENrX197+LjsUcAxcQxlpQf+pP/cnb2zXBNcE14cABOApH4Wjj1il6Y7VSBVVQxciRapVapVaVlopOxMTiNRDGWtAZPINn8MaNm343/W76DR9OaZRGaXv3is7VNF274kpciSuPHzd2MHYwdnj6adGJmFg8AmHsAYqNjY2NjXVxKZfL5XI5KQn2wB7Y89JLonM1ze3b2uv48drDBBkZohOxB4sLCGPCIMokk0xLlzb2ZYhOZK/GDne8htfw2iuvKJFKpBL5wQeic7EHg88DYUwg6zLrMuuy48d9zD5mH/P16/AkPAlPRkT80PDn4DADMzDDYICbcBNujhnjW+5b7lteW1t5p/JO5Z2TJ0XnYy3L4f+CMtaaaI2JcXHa1dat2qubm+hcTWM2a1Nbr7+uXfMZ7s6GCwhjDihwT+CewD3DhqEv+qLvvn04B+fgHP019tFUmkpTt2/HZEzG5Bdf5A5358IFhDEHZupu6m7qbjLZRtlG2UZlZEAhFEJhp06ic9ktEiIhMj0dMiETMidM0EYmjYvwTK+4gDCmA9rUVq9e2lVWlvb62GOic9mNgICKigwHDAcMB6KiTvmd8jvld+2a6FisabgPhDEd0N6xN3aEh4TAIBgEg3TYyIeAgMHBtmJbsa04NzfoYtDFoIt+fqJjsabhEQhjOtS3b9++fft26OCW55bnlpeWhsNwGA7TYWNfKIRC6N/+hp2xM3aOiLAstiy2LL5wQXQsdn/4MV7GdKiqqqqqqurOHZ9sn2yf7I8/1u427rX161+LznffKqACKry9aRbNollxcY+6Per2qFte3mXlsnJZ+fpr0fHYT+MpLMZ0rHExOiAgICAgIDqa9tAe2qO/Rj6ch/Nw3sMPG9CABszODswPzA/MHzlSdC7203gKizGngyjNl+ZL81eswON4HI+/+aboRHYzghGM9+7hLbyFt6ZNs+yw7LDsaBxpMUfBU1iMOSFrgbXAWnDkSNftXbd33X7jBj6Oj+PjI0bopcMdKqESKl1coBt0g27PPecDPuADNTVWq9VqtRYUiI7HNFxAGHNi1m3WbdZtRUW+5Eu+dOkS1EAN1IwerX3UxfH//VvBCtbGgjdiRNesrlldszw9rUnWJGvS0aOi47V2jv9OhDHWbKTl0nJp+ejR+Al+gp/s3q3dbdNGdC67xUAMxGzd6vW219teb7/0Ug7mYA7W14uO1dpwAWGsFZIlWZKl4GDtKj1d68945BHRuexFGZRBGamp7nXude51kyYV+hf6F/rX1orO1VrwU1iMtULanlRFRQ1rGtY0rAkPp3zKp/yKCtG57IVRGIVR0dH3Cu4V3CvIzNQKY/v2onO1FlxAGGvFTg86Pej0oLIyWkfraF1YGOVRHuXpr5EPEzERE8PDKZdyKffEif4z+8/sP9PXV3QuZ8dTWIyxHzyV+1TuU7mdOhm+NXxr+DYjA9/Bd/Adk0l0LnvRCTpBJ8rLaRgNo2FhYSX5Jfkl+ZWVonM5Gx6BMMZ+oI1Ivvnmzt07d+/cHTpUu3v4sOhc9sKBOBAHBgQYFhsWGxbv3dsnpU9KnxR3d9G5nA2PQBhjP6rxF69HqEeoR+jWrRiN0Rg9aZLoXE3z6qta535SkugkzoILCGPsPhkM0gXpgnRhzRqMwziMmzNHdKL7thAWwsKvvlImKhOVid27i47jLLiAMMbsJifLyXJyQgKchJNw8t139dLhjs/is/hsr16862/z4DUQxpjdlGnKNGVaYiJFURRFvfIKJVESJTU0iM71s76Bb+Cb3/xGdAxnwQWEMdZkarQarUZv3ky9qTf1Hj8eXoFX4BWbTXSuH0PP0rP07K9+JTqHs+ACwhhrstjY2NjYWBcX3ISbcFNUFGyCTbDJ4Li/VxbCQljIW540F8f9g2aMOSztjPY2bb7c8OWGLzccOIC7cBfueuEF0bl+ViqkQuqNG6JjOAtX0QEYY/rReJQuHaWjdFRHR+nKIINMVLerblfdLotFdBxnwQWEMfazgi4GXQy66OfXcLbhbMPZrCwYBsNgWJ8+onPdL/oT/Yn+lJ9f6l3qXepdVSU6j7PgAsIY+1HaVFWvXg0TGyY2TMzK0u4+9pjoXPYypBhSDCl//KPoHM6G10AYY/8fU3dTd1N3kwlCIARCcnO1u/orHPQcPUfPbdpkednysuXlzEzReZwNj0AYYz+Q3pbelt6OiLBdt123Xf/kEyiEQijU32OvFE/xFH/gwHc139V8VzNvnug8zsrhO0cZYy1Pm6qKi9Outm7VXt3cROeyF31Kn9Kn27bhWByLY2fM0M49qasTnctZ8RQWY62Ysaexp7Hn7NlaA+D27dpd/RUOjdmsdlO7qd2mT+fC8WC4iA7AGHvwftjL6jSchtPvvaeXvaz+7xvQHssld3In94QE9Zh6TD22eLHoWK0Nj0AYawUaO8blcrlcLt+0CcxgBvOKFaJz2YtO0Sk6VV+P5/E8np8xQ/1U/VT9dOVK0blaK/2842CM2a2HuYe5h/mhh9pvbb+1/dbt2wEBAWNjRedqmtu3tU7y2FjFT/FT/A4eFJ2oteMRCGNOSDsIysurXVy7uHZxaWm6LRxzYS7M/fZbLMdyLB8xgguHY+ERCGNOJHhn8M7gnV261I2pG1M3JjMTB+NgHBwYKDqX3QbAABhQWQn5kA/5I0dqi+Jnz4qOxf4Vj0AYcwJBY4LGBI3p3r3erd6t3i0vT7eFIwzCIOyLL7TCMWAAFw7HxiMQxnTMOMU4xTjlN78hb/Im76wsKIACKPDxEZ3LXrSEltCSU6dwGS7DZaNGaYXj6lXRudhP4050xnRIJplkGjyYjGQk4/792t327UXnshfNp/k0/8gRzxc8X/B8ISbm5LWT105eq64WnYvdH57CYkxH5PPyefl8dDQVUREVNe7tpL/CAdEQDdEffYSrcBWuGjWKC4c+8RQWYzogpUgpUsr06TAOxsG4zZvRhCY0uep0BsFsVhRFUZTXX9euHfcIXPbTuIAw5sB+6BjXaeNfY8e4dtTtO+8oqKCCf/iD6Fiseej0HQxjzgxRKpPKpLJVq+B5eB6ef+MN0YnsRUmUREkNDWAFK1hnzVJRRRU3bxadizUvHoEw5gC0xj93d4+rHlc9riYn4wf4AX4wcaLoXHabBbNg1t27WIqlWDp5ssVsMVvMn3wiOhZrGVxAGBOo38p+K/ut/NWv3ILdgt2C9+6F1+F1eH3kSNG57BYEQRB04wZVUzVVP/OMukPdoe7IyxMdi7UsLiCMCRBSEVIRUvHww3Xn6s7VnUtPh0WwCBYNGCA6V9NYrbZSW6mtNDKypK6krqTuzBnRidiDwY/xMvYABa4KXBW4qlu3ex3vdbzXMT9fr4WDTtAJOlFerl2FhXHhaJ14EZ2xB+Cp3Kdyn8rt0weDMRiDDx3CUAzFUH9/0bnstgyWwTKLpX59/fr69VFRpUqpUqpUVYmOxcTgKSzGWpAsyZIsBQdrV+np2q64jzwiOpfdhsNwGH7smMuLLi+6vDh2bHHP4p7FPb/7TnQsJhZPYTHWAqTl0nJp+ejRWsE4dky3hSMKoiBq3z6vd73e9Xo3KooLB/tnPAJhrBlJnaXOUucpU9Af/dH/ww+1uzo8YzwVUiF1wwbt/I25c7Wb3DHO/hWfic5YM5COSEekI/PmYSAGYuDGjdoZ4/rbaoS20Bbakpio9lR7qj0bGxiJROdijkl3f8EZcxyIUqlUKpW++y7+Dn+Hv0tIEJ3IXo0d42hFK1pnz1b7qf3Ufhs3is7F9IGnsBizQ2xsbGxsrItL+ZflX5Z/uXGjtrYxY4boXHb7vmOcbGQj29Sp6svqy+rLKSmiYzF94QLC2H3oYe5h7mF+6KH2Ie1D2ofs3Kn9Ao6JEZ3LbvEQD/E1NRADMRATE6N4K96Kd3a26FhMn7iAMPYT+lN/6k/e3q5GV6OrMS1NuztwoOhc9qLVtJpWX7liWGRYZFgUGWnJteRacktKROdi+sZrIIz9G7Isy7LctSscgANwoPHgpv79ReeyFyVSIiVeumTba9tr2xsRoeaquWruxYuiczHnwCMQxv6JVjgefxwICCgrS1vjePxx0bnsRTmUQznnzjUsaFjQsGDkyDMbz2w8s/Ef/xCdizkXbiRkDAACQwNDA0ONRgiBEAgpKNBt4UigBErIycFBOAgHDRzIhYO1JB6BsFZNmi3NlmYPHQprYA2s2bdP26uqXTvRuexFGZRBGamp7nXude51kyYV+hf6F/rX1orOxZwbr4GwVklaK62V1o4dC8EQDME7d2qFw8NDdC67xUAMxGzd2rZL2y5tu7z0Ug7mYA7W14uOxVoHHoGwVkUaJA2SBsXH4xScglPMZu2sboPupnJ/6Bjvp/ZT+731lug8rHXiAsJaBTlZTpaTExLADGYwr1ghOo/93wDIIBNBOIRD+IIFymRlsjL5vfdEx2Ktm+7eeTF2Pxo7xqW/Sn+V/pqUpNvCYQQjGO/dw9t4G2/HxXHhYI6ERyDMqfzQMX69/fX217dtgzRIg7Tx40XnspsJTGC6dcs21TbVNnXcuJLQktCS0EOHRMdi7J/xCIQ5hT4pfVL6pHh5tYtrF9cuLi1Nr4WD1tJaWnv9uo1sZKPhw7lwMEfGIxCma8E7g3cG7+zSpf7P9X+u//PBg9pdSRKdy26hEAqhf/sbdsbO2DkiwrLYstiy+MIF0bEY+yn8GC/TpaAxQWOCxnTvXu9W71bvlpWl3e3ZU3Quu/0efg+/Lytz6evS16VvRIR24t/XX4uOxdj94ALCdMU4xTjFOOU3v2mIbIhsiDx0CFbACljh6ys6l90ICKioyBBkCDIERUUV+xX7FftduyY6FmP24CkspgvGs8azxrPh4TSdptP01FTtbvv2onPZbR2sg3VpaW7+bv5u/hMmcMc40zNeRGcOzfhfxv8y/tczz9j62PrY+jTuiqu/wkGf0qf06bZtMBtmw+znnuPCwZwBj0CYQ9J2xZ02jU7RKTr1l7+gCU1o0t8Z4xqzWVEURVFee0275jPGmXPgEQhzKD90jMsgg7xli+4Kx/cd49SNulG3N9/UCse8edoHuXAw58IjEOYAEOW18lp57Z/+BNtgG2xbsEB0IntpI6X6esNgw2DD4Fde0U78+/BD0bkYa0n6eWfHnIrW+Ofu7hHqEeoRunUrREM0RE+aJDpX09y+jZVYiZWxsVrhaOxHYcy58RQWe6D6rey3st/KX/3K447HHY87+/djNEajHgvHXJgLc7/9FsuxHMtHjFD8FD/FjwsHa11cRAdgrUNIRUhFSMXDD9Ntuk23MzNxFa7CVUOHis5ltwEwAAZUVsJe2At7f/tb5ZJySblksYiOxZgIvAbCWpR2VKyPj+Gu4a7hbuOeTn37is5ltzAIg7AvvoBcyIXckSMVVVEV9e9/Fx2LMZF4Cou1iMDqwOrA6t698TP8DD8rLNTu6q9w0BJaQktOndIKx6BBXDgY+z88AmHNytjT2NPYMyiI2lJbapuRAQgI+MgjonPZbSWshJVHj3rEesR6xI4de/LayWsnr1VXi47FmCPhEQhrFsZ0Y7ox/be/tSXbkm3JR47otnBEQzREf/QRLIAFsCAykgsHYz+ORyDsF5E6S52lzlOmoD/6o39j34Obm+hc9qKdtJN2rlunPqE+oT7R2DFus4nOxZgj4xEIaxJZkiVZmjsX/xv/G/87OVm7q6PC0XjGuAUsYFm2TCscc+dqH+TCwdj94BEIswOiTDLJtHSpdlb30qWiE9mLkiiJkhoawApWsM6apUar0Wr05s2iczGmR1xA2E+KjY2NjY11cSmXy+VyOSkJ9sAe2PPSS6Jz2W0WzIJZd+9iKZZi6eTJFrPFbDF/8onoWIzpGRcQ9m/1MPcw9zA/9FA7j3Ye7Tw++gg34Sbc9NxzonPZLQiCIOjGDaqmaqp+5hl1h7pD3ZGXJzoWY86A10DYv+hP/ak/eXu3/7r91+2/zs7Wa+GgAiqggsuXDVcNVw1XhwzhwsFY8+OtTBgAAJhiTbGm2EcfhTbQBtpkZ+OH+CF+GBwsOpe96ASdoBPl5aSSSurQocp8Zb4yv6xMdC7GnBEXkFZO698ICKAqqqKqY8dwG27DbX36iM5lt8EwGAYrSn1ZfVl92dChZyaemXhmYkWF6FiMOTPezr2VkiRJkiRZpm/pW/r24EE4CSfhZOfOonM1zWefucx0meky89lnlZ5KT6Xnd9+JTsRYa8BrIK2MdlTskCFQDMVQfOwYrIE1sEaHhSMKoiBq3z4vi5fFyzJqVHHP4p7FXDgYe6D4KaxWQlorrZXWjh0LwRAMwTt3YjzGY7yHh+hcdkuFVEjdsEE7f4Mb/xgTiUcgTk7KlDKlzFdfRU/0RM+9e/VaOGgLbaEtiYla4Zg9W7vLhYMxkXgNxEnJyXKynJyQAItgESxasUJ0Hns1doyjFa1onT1b7af2U/tt3Cg6F2Ps//BTWE6isWPc44DHAY8D77+PC3EhLnzrLdG57PZ9x7i21ciUKepkdbI6uXGvLcaYI+E1EJ3rk9InpU+Ku7tnmWeZZ9n27ZAGaZA2frzoXHaLh3iIr6mBGIiBmJgYxVvxVryzs0XHYoz9OC4gOqUVDi8vz0TPRM/Exj2dRowQnctetJpW0+orVwyLDIsMiyIjLbmWXEtuSYnoXIyxn8drIDoTvDN4Z/DOLl3qE+sT6xMPHtTuSpLoXPaiREqkxEuXbHtte217IyLUXDVXzb14UXQuxtj946ewdELbo+o//qPukbpH6h7JzdXu6rBw5FAO5Zw717C3YW/D3rCw0+bT5tNmLhyM6RFPYTk403rTetP6J5+0dbB1sHXIyoL34D14z9dXdC57UQIlUEJODq7AFbgiOlpRFVVRb94UnYsx1nRcQByUNFIaKY0MCdEWxdPTMQRDMKRjR9G57EUZlEEZqanude517nWTJhX6F/oX+tfWis7FGPvleA3EwQSWB5YHlo8ZA92gG3TbvRuDMAiDPD1F57JbDMRAzNatbbu07dK2y0sv5WAO5mB9vehYjLHmwyMQByEfk4/Jx6ZOpcE0mAZ/8AGa0IQmV90V+MaOca3xT4d9KIyx+8YFRDDpiHREOjJvHqZgCqasXg0KKKCgfv5cZJBBJoJwCIfwBQuUycpkZfJ774mOxRhrebp7h+scEOUb8g35RmIiDINhMGzhQtGJ7GYEIxjv3cNbeAtvTZtmmWyZbJn88ceiYzHGHhwuIA9IOIVTOLm6Vv+5+s/Vf960SSscL7wgOpfdTGAC061btqm2qbap48aVhJaEloQeOiQ6FmPsweM+kBamnb/Rpk31N9XfVH+Tmoq7cBfu0l/hoLW0ltZev24jG9lo+HAuHIwx/cy168zTHZ/u+HTHtm3v/O7O7+787vBh+Aw+g89CQkTnsttCWAgLv/rKMNAw0DAwIuKU3ym/U37/8z+iYzHGxOMC0iIQ5Xw5X85PTYU5MAfmjBkjOlHTnD1re8j2kO2hkSNL8kvyS/IrK0UnYow5Di4gzcw4xTjFOGXiRPqCvqAvdu0SncduBARUVGQ4YDhgOBAVpY04rl0THYsx5nh4DaSZUSfqRJ3+8z9F57DbOlgH69LS3FLdUt1ShwzhwsEY+zlcQJqJMd2YbkwPCIBcyIXcfv1E57lvH8FH8NGWLV4DvAZ4DYiJ4a1GGGP3ix/jbSbUg3pQj759Reewj9ms9FJ6Kb1ee+3774JEJ2KM6QePQJoJlVIplXboIDrHj/q+Y1w7Y/yNNxRFURRl3rzv03PhYIzZjQtIMyEjGcnoeGsGdIpO0an6ejyP5/H8jBmWSkulpXL1atG5GGP65yI6gLN4rPyx8sfK6+qomqqpuvGdvUDfd4wbrAarwRoTY1lvWW9Zv2eP6FiMMefBI5BmUpxWnFacdukSLIElsOTMGVE5qJAKqfDaNfqKvqKvfvtby8uWly0vZ2aK/vkwxpwPF5BmRlfoCl1ZvlzMV7dawRd8wXfoUPWQekg9VFgo+ufBGHNe3EjYIhCly9Jl6fK+fRiFURgVHd1iXyoMwiDsiy9wOS7H5RERljaWNpY2FRWifwKMMefHI5AWQeT5pOeTnk8+/zy8C+/Cu7m5zf4lvv+8hgWGBYYFYWFcOBhjDxovoreQitqK2orae/d8Pvf53Ofzjz4CBAR0c6NiKqZiWcbNuBk3u7nd7+fT/r/aWqzHeqxftQpWwkpY+cILloWWhZaFNTWiv1/GWOvDU1gPWGBoYGhgqI+Py1cuX7l8NWEC7aW9tHfIELpO1+m6v3/jf4cP48P4cEUFvUPv0DvHjtF39B19l5LCmxoyxhzF/wKeYeMy/zPC/wAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNy0xMi0xNVQxNTo1NzoyNyswODowMKIRvi8AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTctMTItMTVUMTU6NTc6MjcrMDg6MDDTTAaTAAAATXRFWHRzdmc6YmFzZS11cmkAZmlsZTovLy9ob21lL2FkbWluL2ljb24tZm9udC90bXAvaWNvbl9jazFiemEwemo5ampkY3hyL3JpZ2h0LnN2Z7O3J80AAAAASUVORK5CYII=");
+		background-size: contain;
+	}
+
+	.icon-refresh:before {
+		content: " ";
+		display: block;
+		width: 16px;
+		height: 16px;
+		position: absolute;
+		margin: auto;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		z-index: 9999;
+		background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADIEAYAAAD9yHLdAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAZiS0dEAAAAAAAA+UO7fwAAAAlwSFlzAAAASAAAAEgARslrPgAAMQpJREFUeNrt3XlcVHX3B/Bz7rCISi6IC+ijkpZpIswMyBLgluVuKm4pqWmEuG/hUpr5uFYoiuaSFrklZvroo+jPFRURZgYVxZ1K3HIXUBSGe35/XC9PWpYL8J2B8/6H1wwGn3sb5sz93u/3fAEYY4wxxhhjjDHGGGOMMcYYY4wxxhhjjDHGGGOMMcYYY4wxxhhjjDHGGGOMMcYYY4wxxhhjjDHGGGOM/QUUHYCx59F0ddPVTVdXq5YXkxeTF1O3Ll7H63jdzY3eoDfojTp1UIta1FatCm/D2/C2kxPchttwu0oVyIRMyKxShVpSS2pZuTIkQzIklyuHv+Av+IudHURBFERJkvJbKlQo+IWhEAqhsgz2YA/2d+8WPP/oMXWkjtTx4UMMwAAMuH4d2kE7aHf9OoVQCIX8/jvuxJ2489o1WkJLaMmlS+AHfuB37hwmYAImnDtnNBlNRlNGhvJDiUSfX/ZygiiIgqhMmayJWROzJgYF4Xbcjtv9/akX9aJerq7QE3pCTwcHiIEYiMnMxNpYG2ufOYNTcApOOXDAcNZw1nA2KUn0cTwrLiBMKO+z3me9z9asKa+V18prtVr5tHxaPv3mmzgaR+Nod3cYCANhYMOGyr9+9VXla9myonMXFoqmaIp+8ADDMRzDz56FTtAJOh07RgmUQAkGA17Da3jNYMjrldcrr1dKyrGxx8YeG3vvnujc7I8QdbG6WF3skCFUjapRtYkTcSSOxJHVqr3Yz0tNVb6OH280Go1G43//K/oIn3rkogOwkgzR09bT1tPW3V3jrHHWOLdoIRtkg2zw84PTcBpO+/jgGByDY2rWFJ3U0tEiWkSL8vNxDa7BNSdOkAM5kMOuXTgYB+PgnTvz1uStyVuzbx8XmOKh0+q0Oq2tLW2hLbRl9WrsgB2wQ7duhf17aAWtoBWzZpncTe4m94gI0cf9JC4g7KU0oSbUhCpW1FTTVNNUa98eTGACU9u2uAf34J6WLWEuzIW5VauKzlni6UEP+txcZYju0CGoDtWh+pYt+QH5AfkB69cfxaN4FH/9VXTMkkJ3UXdRd3HBAuWKMTy8yH8hAQENH64MeUZFiT5+FRcQ9kwaN27cuHHjSpVsbW1tbW2DgxEREbt2Vb7bvLny1dZWdE721+gz+ow+S06W+kn9pH7r1+fdyruVd2vdOi4sz0f7rvZd7bs+Pvgv/Bf+KyEBjGAEIxb5+yjNp/k0PytLE6mJ1ES+9lpybHJscuzVq6LPBxcQ9hjlJqCNTbY+W5+tb98eFsEiWNS3LxyDY3CsXTvlsb296JzsJT2aHEBdqAt12bULMzADM5YsgQ/hQ/hw0yblk25enuiYlka7XLtcu3zTJozGaIzu2LG4fz85kzM5jxxpijPFmeLmzhV9PriAlHKefp5+nn4uLtgQG2LDQYOwDJbBMh99BIfgEBxycRGdjxUvOkSH6NDVq7gEl+CSFSvMx83Hzcejo49+c/Sbo99cuiQ6nyjKPY8qVchABjJcuYJe6IVeNjbFHqQNtIE2W7YYpxmnGad16CD6vEiiA7DipfwhNG6sS9Wl6lJ/+EF6KD2UHv76K6ZgCqZMmcKFo3RDX/RF3+rVYQWsgBXjx9uQDdlQero2XZuuTV+2zOui10Wvi6+9JjpncaMP6AP6ICBAWOFQc0RQBEXUqSP6fKj4CqSEKxizvY7X8fqkSaADHejati2usVtWwqhDX+2pPbXfsIFqU22qPW1aSl5KXkre0aOi4xUV3QPdA92Df/8b/MEf/CdMEJvmwgVlem/t2qLPC1+BlDAe8R7xHvENGypXGuvWFdzsAwCAdu24cLCXshgWw2JJUqetSv2l/lL/lBT19abfot+i3+LmJjpmYaMbdINu1K0rOgf4gi/4irsCehIXECvX5OMmHzf52NVVO087TzsvJkZzSnNKcyo1FRAQMDiYCwYrUurr69HrTa4iV5GrnDihu6O7o7sze7Y6e090zJeFC3ABLnjRhYGFiICALGe2IxcQK+OT4ZPhk+HgoNPpdDrdp5/agA3YwOnTGIMxGNO3r/oJUXROVjopK+rLlIGW0BJajh1rF2gXaBd4+rRut263bndIyKN/ZX0faHbADthRrpzoGCCDDDIXEPacPL/0/NLzy8DAXKdcp1ynlBTl2alT1Z5OovMx9pcSIRESnZ1hLIyFsd9/rxunG6cbt2+fOtQqOt4zQ0BAC3jj9gIvEHgT/0lcQCyUcqVRubJypfHdd9IZ6Yx0Zu9epWnf66+LzsfYC9kFu2BXQIDmjOaM5ozJpCMd6WjKFLU1iOh4Fo+vQNjfUWdN5Z7OPZ172mBQnv3gA76XwUoUdUGqHvSgnzwZpsJUmJqQoP9C/4X+C/6A9DTkTu7kzlcg7JHg4ODg4GCNRv0kpvwhHTiAn+An+IkFzPpgrDhMhskwWa+nS3SJLhmNWq1Wq9V+9JHoWJYGwzAMwzQa5ZH4e53CA5RW+vv6+/r7tWqlD0oflD5o9271k9jjLxDGShl1nxZERFy8WHtVe1V7deNGtWmn6HiWol5Uvah6UeKHsizmUqi00J3SndKd6tRJNskm2bR8OY7H8Ti+cmXRuUobSqIkSsrJUVYW37sHw2E4DH+Gwn0QDsLBihV5SLF4YDtsh+06dbLxt/G38U9OVu6VdOmi9OpS980oerSX9tJeRGyGzbCZ6LMCUPZh2YdlH6pDWQ8fisrBfwDFRNtH20fbZ8IELItlsey0afwG9ILCIAzCHj6kntSTep49C6thNaw+fRpDMARDTp/GbtgNu506BTNgBsy4cEFpQXHrltnb7G32vnXLYaLDRIeJt24l1kqslVgrJ+d5f/3jzSadneVj8jH5WNWqmmhNtCbaxYXqUT2q5+xMy2k5La9ZU9mBsHFj/Ba/xW8bNVKuNF9/HQxgAIOdnejTaXW8wAu87t3DbMzG7IEDDSsNKw0r164t6l+rzdJmabNMJqWAeHqKPg1mg9lgNlSqpHRTvnNHVA5+Aysij88qWbhQmQY4cKDoXJaODtABOpCeDtfgGlw7cADfw/fwvf37lfN34ICbm5ubm9vZs7GxsbGxsfn5ovM+L/V1kT83f27+3Pr1bZbYLLFZ4u5OJ+kknQwMpP20n/a3aMGz7Z4RAQF99ZVyRTJunPKkLBf2r9Fu0W7RbklJwck4GSd7eIg+bOW4nZ2V475xQ1QMHsIqZMoWra+8kt8zv2d+z9hY5dnWrUXnshjhEA7h2dlwAS7Aha1boTW0htYbN5pjzDHmmPj4ow5HHY46PL3rq9IDSPRBvLiCNumBEAiBaWnKs+rXtWuhLJSFsn/oknwOz+G5Fi0wHuMxvkUL6A29oXeHDkpBrVJF9PEIh4CAo0frknRJuqS6dW1r2NawrdGnz4teYVoLZYtjSVI2cBOXgwtIIVH/4M3VzdXN1bdsUXo7iL/UFev+faX99O7d0AJaQIvY2JwbOTdybmzYkDYlbUralOxsmAJTYIronJYnJSElISXh8mXl0cqV0AAaQIOVK9VZe+nn08+nn/f1LWhZQ0BAvXuX2sISBmEQ1qVLHuVRHu3Z4z7HfY77nI4dlS1+r1172R+P+ZiP+Tzk/CQuIC9JWejXoIHyyXrnTmgGzaCZq6voXMVN3fEOHdERHRcsKN+8fPPyzdet24f7cB8+eADTYBpME53S+j0+dHfggPpVmZUzblyF7yt8X+H7Nm0gEiIhMjQUVsJKWPnOO6XmnhsCAjZtalvHto5tnQMHlL/PNm2UK9fz50XHKyz2SfZJ9knip/GW/BdUEfFM8EzwTKhXT1otrZZW79tXavbReLT3tjLdctMmnIpTceqSJYb2hvaG9jt3io7HHlfwOh0qDZWGDh2q3IT+8MPS0gKHIimSIn//HbpBN+jWurXpmuma6dqxY8/7c3QjdSN1I48ehXiIh3h3d9HHJblJbpJbjRqit7blAvKcvDt4d/DuULeueb15vXn9vn3oh37oV6uW6FxFpWC6axZmYdaCBTZbbbbabP3qq8O9D/c+3Pv330XnY89H2RDKySn/Qv6F/AsffYRDcAgOGTWqpA99USIlUuLNm+iDPujTurVyRWJ65rsHllZAZHvZXrZ3dX18qLP48RDWM1IX/pkTzAnmhF27SmrhoGRKpmSzGebDfJi/Zk2+lC/lS599drTi0YpHK/76q+h87OUk10yumVzz5k3l0YwZDdc1XNdw3fz5DjkOOQ454eFUn+pT/YkTcSgOxaGOjqLzFhalcDg5KY9271b+ntu2NZQ1lDWUVffL+RvxEA/xljMEKLvL7rI7IiRAAvxz+iIjfAzN0qn7bdBb9Ba9tWdPiWsxogMd6IigA3SADuvWaS5rLmsuN2pkGm4abhoeEqLMM+fCUVKldU/rntY9O9v4gfED4wezZtEYGkNjGjSAYAiG4KVLCz5QlCgVKtBaWktrt29X7pE0b/6P/0kgBEIgkejkKvvR9qPtR4svaMIDWCp1Ixw7WztbO9uEBOUSv0ED0bkKjT/4g/+5c8rK6o8+Ui7p9+wRHYtZFrXtunRdui5dX7oUp+N0nO7nJzpXYVGHaKVvpW+lb7t2NXxk+Mjw0bZtT/47pdCo904aNxadW5l1V7u2Mi38wgVRMfgK5AnqSmPb8bbjbcevW1dSCof6SZKaUTNqNnu27VjbsbZj3d25cLC/cyTwSOCRwLQ0U1dTV1PXgAByJmdyHjlS+e79+6LzvSz0Rm/0dnAgIxnJuHGjsrPne++p31c6SAQEwAgYASMsYEfCR+Tecm+5N1+BWBztae1p7emoKOyNvbH30KGi8xQOkwnLYTksN3CgId4Qb4hXN6Ri7MUon8hffVV5tHSp8vUZhoIsXMGQ3VbYCluPH7eYledPUFqZ1K0reoiZC8gjavtotQuo6DwvTL2nYQADGL7+uryxvLG8MSJCWY9R0saymWVA1LvoXfQuI0bIF+WL8sXZs5UmlZazb0VJo3HRuGhc3NySNidtTtr8yy+icpT6ISx9qj5VnxoUpBSOBQtE53lRdJgO0+HMTPkr+Sv5q27dlLHRMWO4cLCiR2S4bLhsuBwZSV/T1/R1y5Z0iA7RIXHrE1jxKLUFRNlfoE4dpVvr+vXKs+L767+Y1FTNVc1VzVUvrxTHFMcUxw0bRCdipVPKmJQxKWPi45V7bTodTaAJNOEZpsmy55IXlBeUF1T4TSOfV6krIGovIRu9jd5G/8MPVruAahksg2U//qg88PFR5vefOSM6FmMA/+vl9SD/Qf6D/ObN6Uf6kX785hvRuUoKzWDNYM1g8QWk1I1Rnrc/b3/e/pNPlGaHb70lOs9z2wSbYFN0tLGmsaax5rBhypPiX0iM/RVlnUlurvIoLEz3ve573fe//gpREAVRM2eKzmet8lvlt8pvJX47g1JzBaIP1AfqAz09ldlIkyeLzvO8aAWtoBWzZimFY8gQ5VkuHMy6FCxYnEbTaFp4OIRCKITy6/h52bjauNq4ij9vJb6AKF1K7e3pHt2je99/by07wdEiWkSL8vPhM/gMPgsLM7mb3E3uERGiczFWGExtTG1MbRYuhMWwGBb37as8m5cnOpe1eOj90PuhNxeQIlehZ4WeFXqql8oWsIL0n6ifyE7BKTj1wQfGTsZOxk48dsxKJmUh6+rVFEIhFNKjR8EHJ/a3bNfYrrFdwwWkyHh+6fml55eBgbARNsJG9V6B5aOVtJJWDhtmCjGFmEJWrRKdh7HioPRe+/lnyIRMyBw9WnQeS2e7yXaT7SYuIIVOnWUl1ZfqS/WjopRLZPEbr/wT8iRP8pwyxRRvijfFR0eLzsOYCKZWplamVvPm0WbaTJvV6fXsSXmd8jrldRJ/pWbxb6zPKz09PT09/aOPYCpMhalNmojO848ezaoyLTMtMy37/HPRcRizBPI5+Zx8bvBg8AEf8Ll+XXQeS1PmtzK/lfmNr0AKjU+GT4ZPRuXKysYxX3whOs8/WgSLYNGGDY9Px2WMAahNHK9fV3b6DA8XncfSZEVkRWRFcAEpNHmYh3k4derjG8dYHppBM2jGmTOaSppKmkr9+yvPin8hMGaJlJY8sbE8pPW4SmMqjak0hoewXpq+j76Pvs+bb5ILuZBLaKjoPE8VDuEQnp0tl5HLyGXeey+pflL9pPqZmaJjMWYNzKvMq8yrwsOVfTBu3BCdR7RsXbYuWye+gFj9SnQ6SSfp5FdfWXr3TzKTmcwffqjuryA6D2N/5BXsFewVXL268qh6dfm8fF4+b2+PU3EqTnV0pMk0mSaXL6+8gf9Fz7gFsAAW2NjQEBpCQ/6wFe7H8DF8fOcOfoPf4DfPsKMfAgLev4+f4+f4+cOHT36belJP6rluHfwIP8KPgweLPm/F7lG3beMS4xLjEvHrZqy2nbtOq9PqtE2bKi+4xETReZ6G3qF36J3ISNN003TT9FGjROdhpZPSPLRiRRudjc5GFxKi/N107qxcGXt5QTREQ3T58qJzsn+gBz3oc3ONi42LjYvt7UXHsdohLNpKW2nr+PGiczzVRJgIE9PSMqtnVs+sbsE5WYmm3abdpt02eLDmoOag5uD580rhmDdP+W7z5lw4rExTaApN1d5i4lnskM/TFNzz+Iw+o886dhSd508erSSXt8vb5e0DB55bfG7xucV/vhRnrCjpZutm62ZHR8MkmASTSuFQT0mlAQ1oxA9dqazuCoReo9fotYgIMIIRjOL3BP6TztAZOkdFpSxOWZyy+NAh0XFY6aIM7Q4bVmrvEZRwVJfqUl3LuQKxmgKi36Lfot/i5kaTaBJN6tFDdJ4/GQtjYeyvv+bszdmbs/fTT0XHYaWLUjgqVFCGOHhBaollYUNYVlNA5GPyMfnYuHEWO9tqNsyG2aGhyv4H2dmi47DShcpTeSrfpw8kQRIkVawoOg8rIjLIIPMQ1jPzPut91vvsK6/gT/gT/qS2fbY0O3YoC5527BCdhJVO2AybYbOWLUXnYEWMgIC4gDwzcw9zD3OPnj2VR2XLis5T4LGNcHiWFRNMBzrQubmJjsGKFgZgAAbwENYzwxbYAluoLT8syFW4ClfXrFH2MzCZRMdhpRu1ptbU+g8L+FgJxlcg/8gj3iPeI75hQ9gDe2CPj4/oPAXCIAzCHj7UJGuSNcl8s5xZBpyEk3DS7duic7Ai1hyaQ3O+AvlHmhRNiibFAq88FsEiWLR8edLmpM1Jm3/5RXQcxgAAoA/0gT7nzomOwYrYHtgDe65eFR1DZXEFRJmOaGurbLBkQTfNH93zkDZJm6RNc+eKjsPYH+FwHI7DeRJHiXcQDsJBy+mlZ3EFRF4vr5fXv/sujsSROLJaNdF5CiyGxbB427bkmsk1k2ueOSM6DmN/ZH/C/oT9idhYZT+cmzdF52FFQ+or9ZX6xsaKzlGQR3SAPwXqJnWTullgi5JdsAt2qT2EGLMsB28evHnwZlYWtISW0HLyZNF5WFHYuDE5Njk2OfbIEdFJVBZWQBBhNIyG0W3aiE6iomk0jaadOGGsaKxorLhzp+g8jP0dU7wp3hQfHU0hFEIhP/wgOg97Sf7gD/7nzklukpvkFhYmOs6TLKaA6AP1gfpADw/4Gr6Gr11dRedRKbNboqOVR8+wnwFjFsA03DTcNLxfP+XRzJm0iBbRIvEbELFn1BJaQsv9+8255lxzbrNmypWH5dw8V1lMAVFaMLRtKzrG4/LylJWfljPmyNizk2VlndL48VKUFCVFeXjQJtpEm9asocN0mA7zjpjCPdogSpmeq+5r9P77xtnG2cbZzZod/eboN0e/uXRJdMynsZhuttqftD9pfzp4EKfjdJzu5yc6D0RCJETGxRkDjYHGQMsZUmOsMDRc13Bdw3V2duViy8WWi23Y0DzLPMs8q1YtTT9NP00/Z2c5W86Ws//ccw5H42gcXb48mMEM5r/YmTAKoiCqXDlaQStohZ3d8+bCnbgTd5Ypo3S1dnB40eOjZbSMlt27Bz2hJ/QshHUTs2E2zM7MxLfxbXz7+a/kcASOwBFEspPsJDtdvy6Nk8ZJ465exbbYFtsmJSmTc6xv8oPwAuKT4ZPhk1G5cu6V3Cu5V65dwzAMwzCNRnQumANzYM4HHxhbGFsYW8TEiI7DGGOWRnhXW/N483jz+Nat8SSexJPiCwdFUzRFP3hg42TjZOO0caPoPIwxZqmE3wMhLWlJazmtSjAcwzE8Li6pflL9pPo8RswYY08jvIDAG/AGvOHtLTqGSpm2+3//JzoHY4xZOmEFJIiCKIhsbJQuoh4eok+Eit6it+itPXtE52CMMUsn7B7I/e73u9/v/uabmI7pmP7isy0KzQgYASOuXUtxTHFMcTx1SnQcxhizdMKuQPL75PfJ7+PlJfoEqCiLsihr9+5Hj3jBIGOM/QNx90BOwAk4odOJPgEFJ2KptFRaunev6ByMMWYthBUQvIk38aZeL/oEqEgiiaTkZNE5GGPMWggrIDSLZtGs+vVFn4DH9zbnex+MMfasir2AqCvPsSk2xaavvCL6BMBxOA7H09OVnkH374uOwxhj1qLYC4j5ffP75vdr1xZ94AUOwkE4ePy46BiMMWZtir2AyF3lrnLXOnVEH7iKfMmXfE+cEJ2DMcasTfHfA2kEjaDRv/4l+sALTsCv0q/Sr6dPi87BGGPWptgLCLqjO7pb0BXISlpJKy1voxbGGLN0xX8F0gbaQBvLKSDSIGmQNOj6ddE5GGPM2hR/ASEgoBo1RB+4StnA6sYN0TkYY8zaFHsBoZk0k2ZWqiT6wFXZKdkp2SnXronOwRhj1qb4r0DKQBkoU6GC6ANX3L2b1j2te1r3QtjykjHGSpniLyB2YAd2llJAeOEgY4y9qOKfhbUcl+Nye3vRBw6+4Au+3HWXMcZeVLEVkODg4ODgYI0GjGAEI6LoA+cCwhhjL6fYCkhKQEpASoCNsA2sGGOMFa5iKyB21e2q21XnT/yMMVZSFFsBUWY75eWBDnSgs4BCcggOwSELGEpjjDErVcw30YnAG7zBW/y0WepDfahP5cqiczDGmLUq/mm8RjCCMSdH9IFjOIZjeJky/k7+Tv5Ojo6i8zDGmLUp/gISBEEQdOeO6ANXPajzoM6DOlWris7BGGPWpvgLyByYA3Nu3RJ94CpyJmdydnYWnYMxxqxN8ffC2k7bafvNm6IPvOAE+Ev+kj9fgTDG2PMq/pXoC3EhLrSc5oWyXtbL+po1RedgjDFrU/xDWJWhMlS+cEH0gauwMTbGxg0bis7BGGPWpvgLyApYASsyMkQfuIrKUlkq26iR6ByMMWZtir+AAACABV2BfIqf4qdcQBhj7HkVewGR58vz5fmnT4s+8AKJkAiJzs4e8R7xHvE8G4sxxp5VsReQepH1IutF/vILRVM0RT94IPoEFJyIddI6aV3jxqJzMMaYtdAU9y9MS0tLS0sjcnF0cXRx7N4dfoPf4Ldq1USfCGm7tF3afvbsZfNl82Xz/v2i8zDGmKUTdA8EAKpAFahiMok+ASoaQSNoRIsWonMwxpi1EFZA6Cf6iX46dEj0CSjI05k6U2c/P58MnwyfDAcH0XkYY8zSCdvgCQEBwXIKiNpcMdc31zfX19dXeXb3btG5GGPMUgm7AjGajCaj6cQJ5dHdu6JPRIEBMAAGNG8uOgZjjFk6cfdAAABAlpWvhw+LPhEFMiADMt55R3QMxhizdIILCAAYwAAGCxrKmopTcaqXl8cwj2Eew+rXF52HMcYslfgCchfuwt2DB0XHeJLGXeOuce/RQ3QOxhizVMILyN2YuzF3Y+Lj6TAdpsOZmaLzFFgIC2Hh+++LjsEYY5aq2BcSPunWtlvbbm3Lz3eRXCQXydMTzsAZOGMBvakQELBKlZpv1Xyr5lubNl1Ou5x2Oe3qVdGxGGPMUgi/AinQGlpD640bRcd4krxUXiov7d1bdA7GGLM0llNAhsAQGLJ1K+hBD/rcXNFxVHScjtPxDz90n+M+x31OuXKi8zDGmKUQPoSlunLlypUrVx4+dIl0iXSJ9PeH7bAdtterJzoXxmEcxjk4SD2lnlLPS5eurLqy6sqq5GTRuRhjRcfrotdFr4uvvVa9SvUq1av4+ro2c23m2qxBg2oPqz2s9tDRMcAnwCfA5/ff1d5+ovOKImwl+tPgcByOwzduJIkkkt59V3SeglzZmI3ZI0Yoj775RvmqrmNhjFmj4ODg4OBgjSb9fPr59PP9+9NMmkkzx46VO8md5E6vvaZ0zAAgICAAkEACCQDS09PT09Pv3tVO107XTl+7Vr4qX5WvfvXVkagjUUeizp4VfVzFBUUHeJIyVFS1qu0523O25zIylHUidnaic6kohEIopEsX03DTcNPwn38WnYcx9vx0Wp1Wp61ShSIogiLWr8dZOAtnBQW93E/Ny4NBMAgGzZgBS2AJLJk2Tem4kZcn+niLisUVEJUuRZeiS1m7FgbCQBhoOesxaBftol0HD5oqmiqaKr71lug8jLFnpwxNOTnJHeWOcscDB5TZlg0aFPovagNtoM2WLXer3q16t2q3bueGnRt2btjDh6KPv7BZzk30J3mAB3ioQ0WWA1tiS2zp76+7qLuou9i2reg8jLF/pg5VyWlympy2YUORFQ7VNtgG29q3f6XtK21faTt3rujjLyoWW0CMaEQj7tsHARAAASdPis7zJEqlVEqdPVt9YYrOwxh7uvT26e3T248ZA+NhPIwPDCyu34uzcTbODg319PP08/TT60Wfh8Jm8W98NSrWqFijoq0t3sf7eN+Cbqrvxt24u2rVW7du3bp169IlZRaZ0Sg6F2Psf7wWeC3wWtCokTIpZ80a5Z6qTfFNHroCV+AKIprRjGZJUt4nNm8WfV4Ki8VegajyLuVdyrv0/feUREmUlJMjOs+fzIW5MHfqVH8nfyd/J0dH0XEYYwBBFERBZGMj15HryHW++w4WwSJYZG8vNlXJu2dq8QUkNTU1NTX19m2IhEiIXLNGdJ4n4UgciSOrVXtw6cGlB5ciIkTnYYwBZK/OXp29etgwmAyTYbL4oSNKpmRKrl1bdI7CZvEFRCVfkC/IF2bOVP5HmM2i8/yJP/iD/9ix+kB9oD7Q01N0HMZKoybUhJpQnTqwH/bD/qlTRecpkAzJkIwWO+v1RVlNAVEX6OAMnIEzVq4Uneev2dqSjnSk++67husarmu4znLWrzBW8iHa7LfZb7N/0SLlDdtyWg/halyNqy9eFJ2jsFlNASmwATbAhmnTlAcWuEAnHuIh3t29TL0y9crU+/RT0XEYKw309fX19fXDw2EkjISRljPZpkAf6AN9jh0THaOwWV0BMRqNRqPx/HnqRb2o1w8/iM7zVB7gAR4REV51vep61fXyEh2HsZJI30ffR9/nzTflU/Ip+dTs2aLzPA2GYiiG7tghOkdhs7oCorLZZ7PPZp/lXomgF3qhl41N/on8E/knfvjB+6z3We+zr7wiOhdjJYHaHZvSKI3SYmPRG73R28FBdK4/CYMwCHv40DzPPM88b8MG0XEKm9UWkKTNSZuTNv/yC8RCLMSuWCE6z9NgAAZgwOuvmx3NjmbHmJhHz5a4m2mMFSebXja9bHotXVrkK8pfEt2je3Rv3bojgUcCjwRevy46T2Gz2gKiyvsp76e8nz79FIbBMBh2+7boPE+D7bAdtuvUSZukTdIm8b0Rxl6EvpK+kr7SuHHYCTthp169ROd5GlpEi2hRfj4NoAE0YMYM0XmKSon5JKzT6XQ6XViY8mjhQtF5nioUQiFUlukG3aAbnTqZJpgmmCZs2SI6FmOWTDtBO0E74Z13oDN0hs7//S+GYRiGWXALIQICWrZM6cY7aJDoOEWlxBQQhSRpN2k3aTclJuJUnIpTLf3m9d27+Aa+gW+89ZZhpWGlYeXx46ITMWZJ1FYksqPsKDvu3w9REAVRlSqJzvU0lEiJlHjzJjbFpti0QQOlgNy4ITpXUbH6IazHyTJ8Dp/D52Fh6iWk6ER/r0IFeofeoXd27dJ/of9C/8Xrr4tOxJglaPJxk4+bfOzqKq+QV8grtm619MJRYCtsha3jx5f0wqGy3EvAF3TlkRquNVxruDo74xk8g2e8vUXneqpESITEcuWoP/Wn/u3aVS1btWzVsuvX/2743fC7IStLdDzGipNPhk+GT0blyuAADuCwZ4+yolz81tb/hCbQBJqQkGB6z/Se6b2hQx89W+K3ui1xBUTlkumS6ZKZkAB+4Ad+ISFwES7CRcttdog7cSfurFRJ6i/1l/q/+67LWZezLmfXrVPK4f37ovMxVpSUHQIrVJCvydfka9u2QQzEQIzltwRSm7xiCIZgSLt2yt9ryZtt9TQlbAjrf5RLyLt35SA5SA4KCVFvXovO9Y/+Df+GfzdsqExP3L7dI94j3iPe2Vl0LMaKglo4oAW0gBZxcbAH9sAeHx/RuZ7ZQTgIBz/7TFngfOqU6DjFrcQWEFVKcEpwSvCuXeRDPuQzZ47oPM9Hq5UeSA+kBwcOeHfw7uDdoW5d0YkYKwwFhQMAALZvt7bCoW5t/er8V+e/Oj8yUnQeUUrYLKynU/cHyI7LjsuOi4+HSTAJJvn6is71rOgQHaJDV69KraRWUqu2bQ3xhnhDfEqK6FyMPQ9lun2NGsojdfq6Vis61zPzBm/wvnPHvNC80LzQ0/MoHsWj+OuvomOJUuKvQFT7cB/uQ7MZ8zEf8/v0ocN0mA5nZorO9azQF33Rt3p16kf9qF98vO6O7o7uzttvi87F2LPwzPLM8sx64w3lnuShQ8qzVlQ4HsEszMKssLDSXjhUJfYm+tNcXn159eXVt2/XqFejXo16GRl4GA/j4S5dROd6ZsmQDMl2dpAGaZDWo0eNcjXK1Sh3+/aV3678duW35GTR8Rj7Ix3pSEfNmuFaXItrd+yA9bAe1levLjrXi1m0yLjduN24fdYs0UksRakZwnoa5ZJaXbmurmS3VqtX53yS80nOJ6Ghad3Tuqd1z84WnYiVTrpVulW6VaNGKV2zZ81Sm4uKzvW81Om5D/If5D/Ib95c+bvKzRWdy1KUmiGspylvKG8obxg2DN6Bd+Cd7dtF53k5vXs72DjYONgcPlwwZMBYMVA2UCtfXpeiS9GlrF0LX8PX8PVXX1lr4QBf8AXfy5dxOk7H6d26ceH4a6W+gKj3RjT9Nf01/bt3p320j/ZZcUuRR9OApVgpVopNStJqtVqt9qOPlG9yF2BWuLTvat/Vvuvj44AO6IAmEwyEgTCwRw/RuV6Uuq4DEiABErp0UabnXrkiOpel4jeUJ6gtFGwCbAJsAg4fVj5JubqKzlU4DhzAztgZOw8caPjU8Knh09OnRSdi1qVgNmNMdkx2zOjRSouRL75QvmtrKzrfC3u0TkzuJfeSewUHpzimOKY4lrz9OwobF5CnUHcSlCvLleXKe/cqz5YtKzrXyyr4hPVoAZQ6jz02NjY2NtbSe4cxUTxDPUM9Q319sQN2wA4LF+JknIyTPTxE5yoseAWv4JVRowyXDZcNl0vvuo7nxQXkH+hO6U7pTnXqBO/D+/B+bKzyrBV/0noC7aW9tDclheIojuLGjlUXXorOxcTyuuh10euik1N+bn5ufu6sWTgTZ+LMAQPACEYwlqCh0P7QH/rPmGEcYhxiHDJhgug41qbkvBCKmH6Yfph+WNeudJAO0sE1a5RnS04hedyOHVgOy2G5iAhesFg6KLMRy5ZVNmYbOpRepVfp1XHjcDgOx+GVK4vOV9ioA3WgDgsWmKaYppimqM0P2fPiAvKclNlNXbpIzaRmUrO1a5VnS2AhUXuHLYbFsHjtWnm+PF+eP3lyil+KX4rfuXOi47GXUy+qXlS9KHv7ivMrzq84f9Ag+YR8Qj4xcaK6YFV0vqJCsRRLsd9+a3IzuZnc1I2eSn7X3KJS6mdhPa/Hb6699x6EQRiEPXwoOlehWwyLYbH06PXRu7d0XDouHT99Wrtau1q7+v/+zzPdM90zvUMH5fslaEijhFJ7T2l3andqdw4fXsGpglMFp/Pn6RV6hV6ZP7+kFw6IhViIXbJEKRzqrEQuHC+L//BfknLp37kz6EEP+h9/BAMYwGBnJzpXcaHP6XP6/MgRuA/34f68eZlXM69mXl2z5tywc8PODSuBhdVKKAWjaVNl5feAARAMwRDcp4/yXeufDPLMtsE22DZ3rrGqsaqx6qhRypNcOAoLF5BCohSSdu0gHMIhfO1aiIZoiC5fXnSuYjcMhsGw27fpOl2n6z//jANxIA5cu9ZtkNsgt0G7d/Nsr8Klv6+/r79fq5ZskA2yoUcPvIE38Eb//gXbApQ2j4ZeqQE1oAaffGIKNAWaAr/8UnSskooLSCHzCvYK9gr28MgfnD84f/DmzTgGx+CYmjVF5xKNIimSIn//Hd3QDd3WrwdXcAXX9etzYnNic2ITEnil79/TVtVW1VZ1d1dWRnfsCCfhJJzs3BmyIAuytNoSNzvqhdy/L++V98p7+/bldRzFo5S/4IqOp5+nn6efi4s0QZogTdi0CSbDZJis14vOZZnu36fRNJpGJyRIA6QB0oC9e+EW3IJbe/aUcyjnUM4hKUntGCA6aWFTF+Zl2mXaZdo1aiStllZLqwMDyZ/8yT8wEHfhLtwVGAhzYS7MrVpVdF5Lo25zoHld87rm9Y4dk39J/iX5F24qWly4gBQxdXokhVIohcbE4GJcjIu7dhWdy2p4gRd43btHs2gWzTpxQlnwdeKE0uTu5EnpXeld6d3jx/MG5Q3KG3TypNJm+7fflP+4+Me63ee4z3GfU66c3VG7o3ZH69bNn5o/NX9q3bo4GAfj4FdfhVbQClo1boxrcA2u8fBQJmE0agSLYBEssrcXfbqtS2oqEBBQ+/bKDqQXLohOVNpwASlWiLoFugW6Bf/+NxyDY3AsIoKHHgoXJVMyJZvNYAYzmG/cgFzIhdz/fcUojMKoa9cgBEIg5M6dZ/65QECg0WAwBmOwkxO0hJbQ0slJ+blVqkAe5EFelSqQCImQyFsQF5l20A7a/fyzpq+mr6Zvv35J9ZPqJ9W3nn19Shp+4xKkYEOoltASWn7/vfKsulMbYwwAgKIpmqIfPIBsyIbsiAhTK1MrU6t580TnYgouIIJ5xHvEe8Q7O2t2aHZodixfrkw7bN9edC7GRKJpNI2mnTiBE3EiTuzVSxmiSk0VnYs9jguIRUFU2q8PGoSIiKg2dStF8/ZZ6aQDHeiIIAIiIGLpUltbW1tb2xEjEmsl1kqslZMjOh77a1xALJQ6bRPSIR3SV63CIAzCoDffFJ2LsULlB37g99tvShv1jz9WWuXExYmOxZ4NtzKxUKZrpmuma8eOYSAGYqBWq8xCGjGCDtNhOsw3DZk1y8tTvkZF5QTkBOQEvPkmFw7rxFcgVkZdX4I9sAf2mDkTT+AJPNGnD8/mYpZvz578yPzI/MghQ44EHgk8EpiWJjoRezn8hmPl9Kn6VH1qUBD1o37Ub/585dnGjUXnYqXcoz3FoQt0gS7jxxtbGFsYW8TEiI7FChcPYVk5Q2NDY0PjffuUhQo6nTrUBT7gAz7Xr4vOx0oHdUU4jIJRMGr0aDgEh+BQ/fpcOEo2vgIpodQV0TaeNp42ngMHKiu4J0zglhisUIyAETDi2jWQQQb566+VvdHnzzcajUaj8f590fFY8eACUkp4n/U+6332lVfMn5g/MX8SGoou6IIuI0YonxRdXETnYxZuFIyCUZcugR3Ygd2sWeW7le9WvtvSpUqPsgcPRMdjYvAQVimhtnwwbTBtMG2YMycnMCcwJ7BuXWXr2g8/LNjXgzEAUDok7N+PNbAG1ggJuXvz7s27N1991RhsDDYGz5/PhYMB8BUIe4JnqGeoZ6ivLzbEhtgwLAyaQlNoGhyM4RiO4WXKiM7HChfNo3k079YtfA1fw9diYmQH2UF2WLJEaYd+8qTofMyycQFhf6sJNaEmVLGiTZxNnE1c166URVmU1bcv3sE7eCcg4PGtb5lly8tT2ubv26c0m/zuO8e+jn0d+/70E19RsBfBBYS9EHUnPPov/Zf+27mzsg6lc2eaTtNpemAgeqEXetnYiM5ZOt29C8tgGSyLi4McyIGcTZtyQ3NDc0Pj4lJTU1NTU2/fFp2QlQxcQFih8snwyfDJqFw51y3XLdft7bexMTbGxq1awTgYB+NatYI5MAfm1KkjOqfVerRlK1SBKlDl1Ck6Rsfo2O7dOAJH4Ij//CdnR86OnB379vEOj6w4cAFhxUq/Rb9Fv8XNTR4gD5AH+PmhCU1o8vGBTtAJOvn6Kv9KXQhpays6b7FT95RHQsLERGgADaBBYiJshI2w8fBhjMM4jEtMVLrT3r0rOi4r3biAMIui0+q0Oq2tLV2ki3TxjTfgS/gSvmzcGDMxEzMbNYIgCIKgWrXgB/gBfqhdW5k95uqKq3AVrnJ1tZid/fSgB31urrID4W+/QTWoBtXOnwc3cAO38+dhH+yDfenpShfa8+el8lJ5qfzJk8k1k2sm1zx7Vvkhxb+jImPPgwsIK1G8gr2CvYKrVzdfMl8yX6pZU1ouLZeWu7pCb+gNve3sKIIiKKJcOZgJM2GmnZ2UJWVJWXZ2NIkm0aRy5ZQFcYjkS77kW768ci8nK0uZrXT7Ni7ABbggKwuGwlAYmpmpdJHNytL8R/MfzX+ysiAO4iDuxo26H9T9oO4Hly/HxsbGxsbm54s+L4wxxhhjjDHGGGOMMcYYY4wxxhhjjDHGGGOMMcYYY4wxxhhjjDHGGGOMMcYYY4wxxhhjjDHGGGOMMcYYKzb/D4DEm9oGCaFQAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE3LTEyLTE1VDE1OjU3OjI3KzA4OjAwohG+LwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNy0xMi0xNVQxNTo1NzoyNyswODowMNNMBpMAAABPdEVYdHN2ZzpiYXNlLXVyaQBmaWxlOi8vL2hvbWUvYWRtaW4vaWNvbi1mb250L3RtcC9pY29uX2NrMWJ6YTB6ajlqamRjeHIvcmVmcmVzaC5zdmejF0ikAAAAAElFTkSuQmCC");
+		background-size: contain;
+	}
 </style>
diff --git a/admin/src/components/verifition/Verify/VerifyPoints.vue b/admin/src/components/verifition/Verify/VerifyPoints.vue
index c955b5b2..da201f8a 100644
--- a/admin/src/components/verifition/Verify/VerifyPoints.vue
+++ b/admin/src/components/verifition/Verify/VerifyPoints.vue
@@ -1,295 +1,261 @@
 <template>
-  <div style="position: relative">
-    <div class="verify-img-out">
-      <div
-        class="verify-img-panel"
-        :style="{
-          width: setSize.imgWidth,
-          height: setSize.imgHeight,
-          'background-size': setSize.imgWidth + ' ' + setSize.imgHeight,
-          'margin-bottom': vSpace + 'px',
-        }"
-      >
-        <div
-          class="verify-refresh"
-          style="z-index: 3"
-          @click="refresh"
-          v-show="showRefresh"
-        >
-          <i class="iconfont icon-refresh"></i>
-        </div>
-        <img
-          :src="'data:image/png;base64,' + pointBackImgBase"
-          ref="canvas"
-          alt=""
-          style="width: 100%; height: 100%; display: block"
-          @click="bindingClick ? canvasClick($event) : undefined"
-        />
+	<div style="position: relative">
+		<div class="verify-img-out">
+			<div class="verify-img-panel" :style="{'width': setSize.imgWidth,
+                                                   'height': setSize.imgHeight,
+                                                   'background-size' : setSize.imgWidth + ' '+ setSize.imgHeight,
+                                                   'margin-bottom': vSpace + 'px'}"
+			>
+				<div class="verify-refresh" style="z-index:3" @click="refresh" v-show="showRefresh">
+					<i class="iconfont icon-refresh"></i>
+				</div>
+				<img :src="'data:image/png;base64,'+pointBackImgBase"
+				     ref="canvas"
+				     alt="" style="width:100%;height:100%;display:block"
+				     @click="bindingClick?canvasClick($event):undefined">
 
-        <div
-          v-for="(tempPoint, index) in tempPoints"
-          :key="index"
-          class="point-area"
-          :style="{
-            'background-color': '#1abd6c',
-            color: '#fff',
-            'z-index': 9999,
-            width: '20px',
-            height: '20px',
-            'text-align': 'center',
-            'line-height': '20px',
-            'border-radius': '50%',
-            position: 'absolute',
-            top: parseInt(tempPoint.y - 10) + 'px',
-            left: parseInt(tempPoint.x - 10) + 'px',
-          }"
-        >
-          {{ index + 1 }}
-        </div>
-      </div>
-    </div>
-    <!-- 'height': this.barSize.height, -->
-    <div
-      class="verify-bar-area"
-      :style="{
-        width: setSize.imgWidth,
-        color: this.barAreaColor,
-        'border-color': this.barAreaBorderColor,
-        'line-height': this.barSize.height,
-      }"
-    >
-      <span class="verify-msg">{{ text }}</span>
-    </div>
-  </div>
+				<div v-for="(tempPoint, index) in tempPoints" :key="index" class="point-area"
+				     :style="{
+                        'background-color':'#1abd6c',
+                        color:'#fff',
+                        'z-index':9999,
+                        width:'20px',
+                        height:'20px',
+                        'text-align':'center',
+                        'line-height':'20px',
+                        'border-radius': '50%',
+                        position:'absolute',
+                        top:parseInt(tempPoint.y-10) + 'px',
+                        left:parseInt(tempPoint.x-10) + 'px'
+                     }">
+					{{index + 1}}
+				</div>
+			</div>
+		</div>
+		<!-- 'height': this.barSize.height, -->
+		<div class="verify-bar-area"
+		     :style="{'width': setSize.imgWidth,
+                      'color': this.barAreaColor,
+                      'border-color': this.barAreaBorderColor,
+                      'line-height':this.barSize.height}">
+			<span class="verify-msg">{{text}}</span>
+		</div>
+	</div>
 </template>
 <script type="text/babel">
-/**
- * VerifyPoints
- * @description 点选
- * */
-import { resetSize } from './../utils/util'
-import { aesEncrypt } from './../utils/ase'
-import { reqGet, reqCheck } from './../api/index'
-import {
-  onMounted,
-  reactive,
-  ref,
-  nextTick,
-  toRefs,
-  getCurrentInstance,
-} from 'vue'
+    /**
+     * VerifyPoints
+     * @description 点选
+     * */
+    import { resetSize } from './../utils/util'
+    import { aesEncrypt } from './../utils/ase'
+    import { reqGet, reqCheck } from './../api/index'
+    import { onMounted, reactive, ref, nextTick, toRefs, getCurrentInstance } from 'vue'
 
-export default {
-  name: 'VerifyPoints',
-  props: {
-    // 弹出式pop，固定fixed
-    mode: {
-      type: String,
-      default: 'fixed',
-    },
-    captchaType: {
-      type: String,
-    },
-    // 间隔
-    vSpace: {
-      type: Number,
-      default: 5,
-    },
-    imgSize: {
-      type: Object,
-      default() {
-        return {
-          width: '310px',
-          height: '155px',
-        }
-      },
-    },
-    barSize: {
-      type: Object,
-      default() {
-        return {
-          width: '310px',
-          height: '40px',
-        }
-      },
-    },
-  },
-  setup(props, context) {
-    const { mode, captchaType, vSpace, imgSize, barSize } = toRefs(props)
-    const { proxy } = getCurrentInstance()
-    const secretKey = ref('') // 后端返回的ase加密秘钥
-    const checkNum = ref(3) // 默认需要点击的字数
-    const fontPos = reactive([]) // 选中的坐标信息
-    const checkPosArr = reactive([]) // 用户点击的坐标
-    const num = ref(1) // 点击的记数
-    const pointBackImgBase = ref('') // 后端获取到的背景图片
-    const pointTextList = reactive([]) // 后端返回的点击字体顺序
-    const backToken = ref('') // 后端返回的token值
-    const setSize = reactive({
-      imgHeight: 0,
-      imgWidth: 0,
-      barHeight: 0,
-      barWidth: 0,
-    })
-    const tempPoints = reactive([])
-    const text = ref('')
-    const barAreaColor = ref(undefined)
-    const barAreaBorderColor = ref(undefined)
-    const showRefresh = ref(true)
-    const bindingClick = ref(true)
-    const init = () => {
-      // 加载页面
-      fontPos.splice(0, fontPos.length)
-      checkPosArr.splice(0, checkPosArr.length)
-      num.value = 1
-      getPictrue()
-      nextTick(() => {
-        const { imgHeight, imgWidth, barHeight, barWidth } = resetSize(proxy)
-        setSize.imgHeight = imgHeight
-        setSize.imgWidth = imgWidth
-        setSize.barHeight = barHeight
-        setSize.barWidth = barWidth
-        proxy.$parent.$emit('ready', proxy)
-      })
-    }
-    onMounted(() => {
-      // 禁止拖拽
-      init()
-      proxy.$el.onselectstart = function () {
-        return false
-      }
-    })
-    const canvas = ref(null)
-    const canvasClick = (e) => {
-      checkPosArr.push(getMousePos(canvas, e))
-      if (num.value == checkNum.value) {
-        num.value = createPoint(getMousePos(canvas, e))
-        // 按比例转换坐标值
-        const arr = pointTransfrom(checkPosArr, setSize)
-        checkPosArr.length = 0
-        checkPosArr.push(...arr)
-        // 等创建坐标执行完
-        setTimeout(() => {
-          // var flag = this.comparePos(this.fontPos, this.checkPosArr);
-          // 发送后端请求
-          const captchaVerification = secretKey.value
-            ? aesEncrypt(
-                backToken.value + '---' + JSON.stringify(checkPosArr),
-                secretKey.value
-              )
-            : backToken.value + '---' + JSON.stringify(checkPosArr)
-          const data = {
-            captchaType: captchaType.value,
-            captcha_code: secretKey.value
-              ? aesEncrypt(JSON.stringify(checkPosArr), secretKey.value)
-              : JSON.stringify(checkPosArr),
-            captcha_key: backToken.value,
-          }
-          reqCheck(data).then((res) => {
-            if (res.code == 1) {
-              barAreaColor.value = '#4cae4c'
-              barAreaBorderColor.value = '#5cb85c'
-              text.value = '验证成功'
-              bindingClick.value = false
-              if (mode.value == 'pop') {
-                setTimeout(() => {
-                  proxy.$parent.clickShow = false
-                  refresh()
-                }, 1500)
-              }
-              proxy.$parent.$emit('success', { captchaVerification })
-            } else {
-              proxy.$parent.$emit('error', proxy)
-              barAreaColor.value = '#d9534f'
-              barAreaBorderColor.value = '#d9534f'
-              text.value = '验证失败'
-              setTimeout(() => {
-                refresh()
-              }, 700)
+    export default {
+        name: 'VerifyPoints',
+        props: {
+            // 弹出式pop，固定fixed
+            mode: {
+                type: String,
+                default: 'fixed'
+            },
+            captchaType: {
+                type: String
+            },
+            // 间隔
+            vSpace: {
+                type: Number,
+                default: 5
+            },
+            imgSize: {
+                type: Object,
+                default() {
+                    return {
+                        width: '310px',
+                        height: '155px'
+                    }
+                }
+            },
+            barSize: {
+                type: Object,
+                default() {
+                    return {
+                        width: '310px',
+                        height: '40px'
+                    }
+                }
+            }
+        },
+        setup(props, context) {
+            const { mode, captchaType, vSpace, imgSize, barSize } = toRefs(props)
+            const { proxy } = getCurrentInstance()
+            const secretKey = ref('') // 后端返回的ase加密秘钥
+            const checkNum = ref(3) // 默认需要点击的字数
+            const fontPos = reactive([]) // 选中的坐标信息
+            const checkPosArr = reactive([]) // 用户点击的坐标
+            const num = ref(1) // 点击的记数
+            const pointBackImgBase = ref('') // 后端获取到的背景图片
+            const pointTextList = reactive([]) // 后端返回的点击字体顺序
+            const backToken = ref('') // 后端返回的token值
+            const setSize = reactive({
+                imgHeight: 0,
+                imgWidth: 0,
+                barHeight: 0,
+                barWidth: 0
+            })
+            const tempPoints = reactive([])
+            const text = ref('')
+            const barAreaColor = ref(undefined)
+            const barAreaBorderColor = ref(undefined)
+            const showRefresh = ref(true)
+            const bindingClick = ref(true)
+            const init = () => {
+                // 加载页面
+                fontPos.splice(0, fontPos.length)
+                checkPosArr.splice(0, checkPosArr.length)
+                num.value = 1
+                getPictrue()
+                nextTick(() => {
+                    const { imgHeight, imgWidth, barHeight, barWidth } = resetSize(proxy)
+                    setSize.imgHeight = imgHeight
+                    setSize.imgWidth = imgWidth
+                    setSize.barHeight = barHeight
+                    setSize.barWidth = barWidth
+                    proxy.$parent.$emit('ready', proxy)
+                })
+            }
+            onMounted(() => {
+                // 禁止拖拽
+                init()
+                proxy.$el.onselectstart = function () {
+                    return false
+                }
+            })
+            const canvas = ref(null)
+            const canvasClick = (e) => {
+                checkPosArr.push(getMousePos(canvas, e))
+                if (num.value == checkNum.value) {
+                    num.value = createPoint(getMousePos(canvas, e))
+                    // 按比例转换坐标值
+                    const arr = pointTransfrom(checkPosArr, setSize)
+                    checkPosArr.length = 0
+                    checkPosArr.push(...arr)
+                    // 等创建坐标执行完
+                    setTimeout(() => {
+                        // var flag = this.comparePos(this.fontPos, this.checkPosArr);
+                        // 发送后端请求
+                        const captchaVerification = secretKey.value ? aesEncrypt(backToken.value + '---' + JSON.stringify(checkPosArr), secretKey.value) : backToken.value + '---' + JSON.stringify(checkPosArr)
+                        const data = {
+                            captchaType: captchaType.value,
+                            'captcha_code': secretKey.value ? aesEncrypt(JSON.stringify(checkPosArr), secretKey.value) : JSON.stringify(checkPosArr),
+                            'captcha_key': backToken.value
+                        }
+                        reqCheck(data).then(res => {
+                            if (res.code == 1) {
+                                barAreaColor.value = '#4cae4c'
+                                barAreaBorderColor.value = '#5cb85c'
+                                text.value = '验证成功'
+                                bindingClick.value = false
+                                if (mode.value == 'pop') {
+                                    setTimeout(() => {
+                                        proxy.$parent.clickShow = false
+                                        refresh()
+                                    }, 1500)
+                                }
+                                proxy.$parent.$emit('success', { captchaVerification })
+                            } else {
+                                proxy.$parent.$emit('error', proxy)
+                                barAreaColor.value = '#d9534f'
+                                barAreaBorderColor.value = '#d9534f'
+                                text.value = '验证失败'
+                                setTimeout(() => {
+                                    refresh()
+                                }, 700)
+                            }
+                        })
+                    }, 400)
+                }
+                if (num.value < checkNum.value) {
+                    num.value = createPoint(getMousePos(canvas, e))
+                }
+            }
+            // 获取坐标
+            const getMousePos = function (obj, e) {
+                const x = e.offsetX
+                const y = e.offsetY
+                return { x, y }
+            }
+            // 创建坐标点
+            const createPoint = function (pos) {
+                tempPoints.push(Object.assign({}, pos))
+                return num.value + 1
+            }
+            const refresh = function () {
+                tempPoints.splice(0, tempPoints.length)
+                barAreaColor.value = '#000'
+                barAreaBorderColor.value = '#ddd'
+                bindingClick.value = true
+                fontPos.splice(0, fontPos.length)
+                checkPosArr.splice(0, checkPosArr.length)
+                num.value = 1
+                getPictrue()
+                text.value = '验证失败'
+                showRefresh.value = true
             }
-          })
-        }, 400)
-      }
-      if (num.value < checkNum.value) {
-        num.value = createPoint(getMousePos(canvas, e))
-      }
-    }
-    // 获取坐标
-    const getMousePos = function (obj, e) {
-      const x = e.offsetX
-      const y = e.offsetY
-      return { x, y }
-    }
-    // 创建坐标点
-    const createPoint = function (pos) {
-      tempPoints.push(Object.assign({}, pos))
-      return num.value + 1
-    }
-    const refresh = function () {
-      tempPoints.splice(0, tempPoints.length)
-      barAreaColor.value = '#000'
-      barAreaBorderColor.value = '#ddd'
-      bindingClick.value = true
-      fontPos.splice(0, fontPos.length)
-      checkPosArr.splice(0, checkPosArr.length)
-      num.value = 1
-      getPictrue()
-      text.value = '验证失败'
-      showRefresh.value = true
-    }
 
-    // 请求背景图片和验证图片
-    function getPictrue() {
-      const data = {
-        captchaType: captchaType.value,
-      }
-      reqGet(data).then((res) => {
-        if (res.code == 1) {
-          pointBackImgBase.value = res.data.originalImageBase64
-          backToken.value = res.data.token
-          secretKey.value = res.data.secretKey
-          pointTextList.value = res.data.wordList
-          text.value = '请依次点击【' + pointTextList.value.join(',') + '】'
-        } else {
-          text.value = res.msg
-        }
-      })
-    }
+            // 请求背景图片和验证图片
+            function getPictrue() {
+                const data = {
+                    captchaType: captchaType.value
+                }
+                reqGet(data).then(res => {
+                    if (res.code == 1) {
+                        pointBackImgBase.value = res.data.originalImageBase64
+                        backToken.value = res.data.token
+                        secretKey.value = res.data.secretKey
+                        pointTextList.value = res.data.wordList
+                        text.value = '请依次点击【' + pointTextList.value.join(',') + '】'
+                    } else {
+                        text.value = res.msg
+                    }
+                })
+            }
 
-    // 坐标转换函数
-    const pointTransfrom = function (pointArr, imgSize) {
-      const newPointArr = pointArr.map((p) => {
-        const x = Math.round((310 * p.x) / parseInt(imgSize.imgWidth))
-        const y = Math.round((155 * p.y) / parseInt(imgSize.imgHeight))
-        return { x, y }
-      })
-      return newPointArr
-    }
-    return {
-      secretKey,
-      checkNum,
-      fontPos,
-      checkPosArr,
-      num,
-      pointBackImgBase,
-      pointTextList,
-      backToken,
-      setSize,
-      tempPoints,
-      text,
-      barAreaColor,
-      barAreaBorderColor,
-      showRefresh,
-      bindingClick,
-      init,
-      canvas,
-      canvasClick,
-      getMousePos,
-      createPoint,
-      refresh,
-      getPictrue,
-      pointTransfrom,
+            // 坐标转换函数
+            const pointTransfrom = function (pointArr, imgSize) {
+                const newPointArr = pointArr.map(p => {
+                    const x = Math.round(310 * p.x / parseInt(imgSize.imgWidth))
+                    const y = Math.round(155 * p.y / parseInt(imgSize.imgHeight))
+                    return { x, y }
+                })
+                return newPointArr
+            }
+            return {
+                secretKey,
+                checkNum,
+                fontPos,
+                checkPosArr,
+                num,
+                pointBackImgBase,
+                pointTextList,
+                backToken,
+                setSize,
+                tempPoints,
+                text,
+                barAreaColor,
+                barAreaBorderColor,
+                showRefresh,
+                bindingClick,
+                init,
+                canvas,
+                canvasClick,
+                getMousePos,
+                createPoint,
+                refresh,
+                getPictrue,
+                pointTransfrom
+            }
+        }
     }
-  },
-}
 </script>
diff --git a/admin/src/components/verifition/Verify/VerifySlide.vue b/admin/src/components/verifition/Verify/VerifySlide.vue
index c9fca5b1..261ac40e 100644
--- a/admin/src/components/verifition/Verify/VerifySlide.vue
+++ b/admin/src/components/verifition/Verify/VerifySlide.vue
@@ -1,475 +1,379 @@
 <template>
-  <div style="position: relative">
-    <div
-      v-if="type === '2'"
-      class="verify-img-out"
-      :style="{ height: parseInt(setSize.imgHeight) + vSpace + 'px' }"
-    >
-      <div
-        class="verify-img-panel"
-        :style="{ width: setSize.imgWidth, height: setSize.imgHeight }"
-      >
-        <img
-          :src="'data:image/png;base64,' + backImgBase"
-          alt=""
-          style="width: 100%; height: 100%; display: block"
-        />
-        <div class="verify-refresh" @click="refresh" v-show="showRefresh">
-          <i class="iconfont icon-refresh"></i>
-        </div>
-        <transition name="tips">
-          <span
-            class="verify-tips"
-            v-if="tipWords"
-            :class="passFlag ? 'suc-bg' : 'err-bg'"
-            >{{ tipWords }}</span
-          >
-        </transition>
-      </div>
-    </div>
-    <!-- 公共部分 -->
-    <div
-      class="verify-bar-area"
-      :style="{
-        width: setSize.imgWidth,
-        height: barSize.height,
-        'line-height': barSize.height,
-      }"
-    >
-      <span class="verify-msg" v-text="text"></span>
-      <div
-        class="verify-left-bar"
-        :style="{
-          width: leftBarWidth !== undefined ? leftBarWidth : barSize.height,
-          height: barSize.height,
-          'border-color': leftBarBorderColor,
-          transaction: transitionWidth,
-        }"
-      >
-        <span class="verify-msg" v-text="finishText"></span>
-        <div
-          class="verify-move-block"
-          @touchstart="start"
-          @mousedown="start"
-          :style="{
-            width: barSize.height,
-            height: barSize.height,
-            'background-color': moveBlockBackgroundColor,
-            left: moveBlockLeft,
-            transition: transitionLeft,
-          }"
-        >
-          <i
-            :class="['verify-icon iconfont', iconClass]"
-            :style="{ color: iconColor }"
-          ></i>
-          <div
-            v-if="type === '2'"
-            class="verify-sub-block"
-            :style="{
-              width: Math.floor((parseInt(setSize.imgWidth) * 47) / 310) + 'px',
-              height: setSize.imgHeight,
-              top: '-' + (parseInt(setSize.imgHeight) + vSpace) + 'px',
-              'background-size': setSize.imgWidth + ' ' + setSize.imgHeight,
-            }"
-          >
-            <img
-              :src="'data:image/png;base64,' + blockBackImgBase"
-              alt=""
-              style="
-                width: 100%;
-                height: 100%;
-                display: block;
-                -webkit-user-drag: none;
-              "
-            />
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
+	<div style="position: relative;">
+		<div v-if="type === '2'" class="verify-img-out"
+		     :style="{height: (parseInt(setSize.imgHeight) + vSpace) + 'px'}"
+		>
+			<div class="verify-img-panel" :style="{width: setSize.imgWidth,
+                                                   height: setSize.imgHeight,}">
+				<img :src="'data:image/png;base64,'+backImgBase" alt="" style="width:100%;height:100%;display:block">
+				<div class="verify-refresh" @click="refresh" v-show="showRefresh"><i class="iconfont icon-refresh"></i>
+				</div>
+				<transition name="tips">
+					<span class="verify-tips" v-if="tipWords" :class="passFlag ?'suc-bg':'err-bg'">{{tipWords}}</span>
+				</transition>
+			</div>
+		</div>
+		<!-- 公共部分 -->
+		<div class="verify-bar-area" :style="{width: setSize.imgWidth,
+                                              height: barSize.height,
+                                              'line-height':barSize.height}">
+			<span class="verify-msg" v-text="text"></span>
+			<div class="verify-left-bar"
+			     :style="{width: (leftBarWidth!==undefined)?leftBarWidth: barSize.height, height: barSize.height, 'border-color': leftBarBorderColor, transaction: transitionWidth}">
+				<span class="verify-msg" v-text="finishText"></span>
+				<div class="verify-move-block"
+				     @touchstart="start"
+				     @mousedown="start"
+				     :style="{width: barSize.height, height: barSize.height, 'background-color': moveBlockBackgroundColor, left: moveBlockLeft, transition: transitionLeft}">
+					<i :class="['verify-icon iconfont', iconClass]"
+					   :style="{color: iconColor}"></i>
+					<div v-if="type === '2'" class="verify-sub-block"
+					     :style="{'width':Math.floor(parseInt(setSize.imgWidth)*47/310)+ 'px',
+                                  'height': setSize.imgHeight,
+                                  'top':'-' + (parseInt(setSize.imgHeight) + vSpace) + 'px',
+                                  'background-size': setSize.imgWidth + ' ' + setSize.imgHeight,
+                                  }">
+						<img :src="'data:image/png;base64,'+blockBackImgBase" alt=""
+						     style="width:100%;height:100%;display:block;-webkit-user-drag:none;">
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
 </template>
 <script type="text/babel">
-/**
- * VerifySlide
- * @description 滑块
- * */
-import { aesEncrypt } from './../utils/ase'
-import { resetSize } from './../utils/util'
-import { reqGet, reqCheck } from './../api/index'
-import {
-  computed,
-  onMounted,
-  reactive,
-  ref,
-  watch,
-  nextTick,
-  toRefs,
-  getCurrentInstance,
-} from 'vue'
-//  "captchaType":"blockPuzzle",
-export default {
-  name: 'VerifySlide',
-  props: {
-    captchaType: {
-      type: String,
-    },
-    type: {
-      type: String,
-      default: '1',
-    },
-    // 弹出式pop，固定fixed
-    mode: {
-      type: String,
-      default: 'fixed',
-    },
-    vSpace: {
-      type: Number,
-      default: 5,
-    },
-    explain: {
-      type: String,
-      default: '向右滑动完成验证',
-    },
-    imgSize: {
-      type: Object,
-      default() {
-        return {
-          width: '310px',
-          height: '155px',
-        }
-      },
-    },
-    blockSize: {
-      type: Object,
-      default() {
-        return {
-          width: '50px',
-          height: '50px',
-        }
-      },
-    },
-    barSize: {
-      type: Object,
-      default() {
-        return {
-          width: '310px',
-          height: '40px',
-        }
-      },
-    },
-  },
-  setup(props, context) {
-    const {
-      mode,
-      captchaType,
-      vSpace,
-      imgSize,
-      barSize,
-      type,
-      blockSize,
-      explain,
-    } = toRefs(props)
-    const { proxy } = getCurrentInstance()
-    const secretKey = ref(''), // 后端返回的ase加密秘钥
-      passFlag = ref(''), // 是否通过的标识
-      backImgBase = ref(''), // 验证码背景图片
-      blockBackImgBase = ref(''), // 验证滑块的背景图片
-      backToken = ref(''), // 后端返回的唯一token值
-      startMoveTime = ref(''), // 移动开始的时间
-      endMoveTime = ref(''), // 移动结束的时间
-      tipsBackColor = ref(''), // 提示词的背景颜色
-      tipWords = ref(''),
-      text = ref(''),
-      finishText = ref(''),
-      setSize = reactive({
-        imgHeight: 0,
-        imgWidth: 0,
-        barHeight: 0,
-        barWidth: 0,
-      }),
-      top = ref(0),
-      left = ref(0),
-      moveBlockLeft = ref(undefined),
-      leftBarWidth = ref(undefined),
-      // 移动中样式
-      moveBlockBackgroundColor = ref(undefined),
-      leftBarBorderColor = ref('#ddd'),
-      iconColor = ref(undefined),
-      iconClass = ref('icon-right'),
-      status = ref(false), // 鼠标状态
-      isEnd = ref(false), // 是够验证完成
-      showRefresh = ref(true),
-      transitionLeft = ref(''),
-      transitionWidth = ref(''),
-      startLeft = ref(0)
+    /**
+     * VerifySlide
+     * @description 滑块
+     * */
+    import { aesEncrypt } from './../utils/ase'
+    import { resetSize } from './../utils/util'
+    import { reqGet, reqCheck } from './../api/index'
+    import { computed, onMounted, reactive, ref, watch, nextTick, toRefs, getCurrentInstance } from 'vue'
+    //  "captchaType":"blockPuzzle",
+    export default {
+        name: 'VerifySlide',
+        props: {
+            captchaType: {
+                type: String
+            },
+            type: {
+                type: String,
+                default: '1'
+            },
+            // 弹出式pop，固定fixed
+            mode: {
+                type: String,
+                default: 'fixed'
+            },
+            vSpace: {
+                type: Number,
+                default: 5
+            },
+            explain: {
+                type: String,
+                default: '向右滑动完成验证'
+            },
+            imgSize: {
+                type: Object,
+                default() {
+                    return {
+                        width: '310px',
+                        height: '155px'
+                    }
+                }
+            },
+            blockSize: {
+                type: Object,
+                default() {
+                    return {
+                        width: '50px',
+                        height: '50px'
+                    }
+                }
+            },
+            barSize: {
+                type: Object,
+                default() {
+                    return {
+                        width: '310px',
+                        height: '40px'
+                    }
+                }
+            }
+        },
+        setup(props, context) {
+            const { mode, captchaType, vSpace, imgSize, barSize, type, blockSize, explain } = toRefs(props)
+            const { proxy } = getCurrentInstance()
+            const secretKey = ref(''), // 后端返回的ase加密秘钥
+                passFlag = ref(''), // 是否通过的标识
+                backImgBase = ref(''), // 验证码背景图片
+                blockBackImgBase = ref(''), // 验证滑块的背景图片
+                backToken = ref(''), // 后端返回的唯一token值
+                startMoveTime = ref(''), // 移动开始的时间
+                endMoveTime = ref(''), // 移动结束的时间
+                tipsBackColor = ref(''), // 提示词的背景颜色
+                tipWords = ref(''),
+                text = ref(''),
+                finishText = ref(''),
+                setSize = reactive({
+                    imgHeight: 0,
+                    imgWidth: 0,
+                    barHeight: 0,
+                    barWidth: 0
+                }),
+                top = ref(0),
+                left = ref(0),
+                moveBlockLeft = ref(undefined),
+                leftBarWidth = ref(undefined),
+                // 移动中样式
+                moveBlockBackgroundColor = ref(undefined),
+                leftBarBorderColor = ref('#ddd'),
+                iconColor = ref(undefined),
+                iconClass = ref('icon-right'),
+                status = ref(false), // 鼠标状态
+                isEnd = ref(false),		// 是够验证完成
+                showRefresh = ref(true),
+                transitionLeft = ref(''),
+                transitionWidth = ref(''),
+                startLeft = ref(0)
 
-    const barArea = computed(() => {
-      return proxy.$el.querySelector('.verify-bar-area')
-    })
+            const barArea = computed(() => {
+                return proxy.$el.querySelector('.verify-bar-area')
+            })
 
-    function init() {
-      text.value = explain.value
-      getPictrue()
-      nextTick(() => {
-        let { imgHeight, imgWidth, barHeight, barWidth } = resetSize(proxy)
-        setSize.imgHeight = imgHeight
-        setSize.imgWidth = imgWidth
-        setSize.barHeight = barHeight
-        setSize.barWidth = barWidth
-        proxy.$parent.$emit('ready', proxy)
-      })
+            function init() {
+                text.value = explain.value
+                getPictrue()
+                nextTick(() => {
+                    let { imgHeight, imgWidth, barHeight, barWidth } = resetSize(proxy)
+                    setSize.imgHeight = imgHeight
+                    setSize.imgWidth = imgWidth
+                    setSize.barHeight = barHeight
+                    setSize.barWidth = barWidth
+                    proxy.$parent.$emit('ready', proxy)
+                })
 
-      window.removeEventListener('touchmove', function (e) {
-        move(e)
-      })
-      window.removeEventListener('mousemove', function (e) {
-        move(e)
-      })
+                window.removeEventListener('touchmove', function (e) {
+                    move(e)
+                })
+                window.removeEventListener('mousemove', function (e) {
+                    move(e)
+                })
 
-      // 鼠标松开
-      window.removeEventListener('touchend', function () {
-        end()
-      })
-      window.removeEventListener('mouseup', function () {
-        end()
-      })
+                // 鼠标松开
+                window.removeEventListener('touchend', function () {
+                    end()
+                })
+                window.removeEventListener('mouseup', function () {
+                    end()
+                })
 
-      window.addEventListener('touchmove', function (e) {
-        move(e)
-      })
-      window.addEventListener('mousemove', function (e) {
-        move(e)
-      })
+                window.addEventListener('touchmove', function (e) {
+                    move(e)
+                })
+                window.addEventListener('mousemove', function (e) {
+                    move(e)
+                })
 
-      // 鼠标松开
-      window.addEventListener('touchend', function () {
-        end()
-      })
-      window.addEventListener('mouseup', function () {
-        end()
-      })
-    }
+                // 鼠标松开
+                window.addEventListener('touchend', function () {
+                    end()
+                })
+                window.addEventListener('mouseup', function () {
+                    end()
+                })
+            }
 
-    watch(type, () => {
-      init()
-    })
-    onMounted(() => {
-      // 禁止拖拽
-      init()
-      proxy.$el.onselectstart = function () {
-        return false
-      }
-    })
+            watch(type, () => {
+                init()
+            })
+            onMounted(() => {
+                // 禁止拖拽
+                init()
+                proxy.$el.onselectstart = function () {
+                    return false
+                }
+            })
 
-    // 鼠标按下
-    function start(e) {
-      e = e || window.event
-      if (!e.touches) {
-        // 兼容PC端
-        var x = e.clientX
-      } else {
-        // 兼容移动端
-        var x = e.touches[0].pageX
-      }
-      startLeft.value = Math.floor(
-        x - barArea.value.getBoundingClientRect().left
-      )
-      startMoveTime.value = +new Date() // 开始滑动的时间
-      if (isEnd.value == false) {
-        text.value = ''
-        moveBlockBackgroundColor.value = '#337ab7'
-        leftBarBorderColor.value = '#337AB7'
-        iconColor.value = '#fff'
-        e.stopPropagation()
-        status.value = true
-      }
-    }
+            // 鼠标按下
+            function start(e) {
+                e = e || window.event
+                if (!e.touches) { // 兼容PC端
+                    var x = e.clientX
+                } else { // 兼容移动端
+                    var x = e.touches[0].pageX
+                }
+                startLeft.value = Math.floor(x - barArea.value.getBoundingClientRect().left)
+                startMoveTime.value = +new Date() // 开始滑动的时间
+                if (isEnd.value == false) {
+                    text.value = ''
+                    moveBlockBackgroundColor.value = '#337ab7'
+                    leftBarBorderColor.value = '#337AB7'
+                    iconColor.value = '#fff'
+                    e.stopPropagation()
+                    status.value = true
+                }
+            }
 
-    // 鼠标移动
-    function move(e) {
-      e = e || window.event
-      if (status.value && isEnd.value == false) {
-        if (!e.touches) {
-          // 兼容PC端
-          var x = e.clientX
-        } else {
-          // 兼容移动端
-          var x = e.touches[0].pageX
-        }
-        var bar_area_left = barArea.value.getBoundingClientRect().left
-        var move_block_left = x - bar_area_left // 小方块相对于父元素的left值
-        if (
-          move_block_left >=
-          barArea.value.offsetWidth -
-            parseInt(parseInt(blockSize.value.width) / 2) -
-            2
-        ) {
-          move_block_left =
-            barArea.value.offsetWidth -
-            parseInt(parseInt(blockSize.value.width) / 2) -
-            2
-        }
-        if (move_block_left <= 0) {
-          move_block_left = parseInt(parseInt(blockSize.value.width) / 2)
-        }
-        // 拖动后小方块的left值
-        moveBlockLeft.value = move_block_left - startLeft.value + 'px'
-        leftBarWidth.value = move_block_left - startLeft.value + 'px'
-      }
-    }
+            // 鼠标移动
+            function move(e) {
+                e = e || window.event
+                if (status.value && isEnd.value == false) {
+                    if (!e.touches) { // 兼容PC端
+                        var x = e.clientX
+                    } else { // 兼容移动端
+                        var x = e.touches[0].pageX
+                    }
+                    var bar_area_left = barArea.value.getBoundingClientRect().left
+                    var move_block_left = x - bar_area_left // 小方块相对于父元素的left值
+                    if (move_block_left >= barArea.value.offsetWidth - parseInt(parseInt(blockSize.value.width) / 2) - 2) {
+                        move_block_left = barArea.value.offsetWidth - parseInt(parseInt(blockSize.value.width) / 2) - 2
+                    }
+                    if (move_block_left <= 0) {
+                        move_block_left = parseInt(parseInt(blockSize.value.width) / 2)
+                    }
+                    // 拖动后小方块的left值
+                    moveBlockLeft.value = ( move_block_left - startLeft.value ) + 'px'
+                    leftBarWidth.value = ( move_block_left - startLeft.value ) + 'px'
+                }
+            }
 
-    // 鼠标松开
-    function end() {
-      endMoveTime.value = +new Date()
-      // 判断是否重合
-      if (status.value && isEnd.value == false) {
-        var moveLeftDistance = parseInt(
-          (moveBlockLeft.value || '').replace('px', '')
-        )
-        moveLeftDistance = (moveLeftDistance * 310) / parseInt(setSize.imgWidth)
-        const data = {
-          captchaType: captchaType.value,
-          captcha_code: secretKey.value
-            ? aesEncrypt(
-                JSON.stringify({
-                  x: moveLeftDistance,
-                  y: 5.0,
-                }),
-                secretKey.value
-              )
-            : JSON.stringify({ x: moveLeftDistance, y: 5.0 }),
-          captcha_key: backToken.value,
-        }
-        reqCheck(data).then((res) => {
-          if (res.code == 1) {
-            moveBlockBackgroundColor.value = '#5cb85c'
-            leftBarBorderColor.value = '#5cb85c'
-            iconColor.value = '#fff'
-            iconClass.value = 'icon-check'
-            showRefresh.value = false
-            isEnd.value = true
-            if (mode.value == 'pop') {
-              setTimeout(() => {
-                proxy.$parent.clickShow = false
-                refresh()
-              }, 1500)
+            // 鼠标松开
+            function end() {
+                endMoveTime.value = +new Date()
+                // 判断是否重合
+                if (status.value && isEnd.value == false) {
+                    var moveLeftDistance = parseInt(( moveBlockLeft.value || '' ).replace('px', ''))
+                    moveLeftDistance = moveLeftDistance * 310 / parseInt(setSize.imgWidth)
+                    const data = {
+                        captchaType: captchaType.value,
+                        'captcha_code': secretKey.value ? aesEncrypt(JSON.stringify({
+                            x: moveLeftDistance,
+                            y: 5.0
+                        }), secretKey.value) : JSON.stringify({ x: moveLeftDistance, y: 5.0 }),
+                        'captcha_key': backToken.value
+                    }
+                    reqCheck(data).then(res => {
+                        if (res.code == 1) {
+                            moveBlockBackgroundColor.value = '#5cb85c'
+                            leftBarBorderColor.value = '#5cb85c'
+                            iconColor.value = '#fff'
+                            iconClass.value = 'icon-check'
+                            showRefresh.value = false
+                            isEnd.value = true
+                            if (mode.value == 'pop') {
+                                setTimeout(() => {
+                                    proxy.$parent.clickShow = false
+                                    refresh()
+                                }, 1500)
+                            }
+                            passFlag.value = true
+                            tipWords.value = `${ ( ( endMoveTime.value - startMoveTime.value ) / 1000 ).toFixed(2) }s验证成功`
+                            var captchaVerification = secretKey.value ? aesEncrypt(backToken.value + '---' + JSON.stringify({
+                                x: moveLeftDistance,
+                                y: 5.0
+                            }), secretKey.value) : backToken.value + '---' + JSON.stringify({
+                                x: moveLeftDistance,
+                                y: 5.0
+                            })
+                            setTimeout(() => {
+                                tipWords.value = ''
+                                proxy.$parent.closeBox()
+                                proxy.$parent.$emit('success', { captchaVerification })
+                            }, 1000)
+                        } else {
+                            moveBlockBackgroundColor.value = '#d9534f'
+                            leftBarBorderColor.value = '#d9534f'
+                            iconColor.value = '#fff'
+                            iconClass.value = 'icon-close'
+                            passFlag.value = false
+                            setTimeout(function () {
+                                refresh()
+                            }, 1000)
+                            proxy.$parent.$emit('error', proxy)
+                            tipWords.value = '验证失败'
+                            setTimeout(() => {
+                                tipWords.value = ''
+                            }, 1000)
+                        }
+                    })
+                    status.value = false
+                }
             }
-            passFlag.value = true
-            tipWords.value = `${((endMoveTime.value - startMoveTime.value) / 1000).toFixed(2)}s验证成功`
-            var captchaVerification = secretKey.value
-              ? aesEncrypt(
-                  backToken.value +
-                    '---' +
-                    JSON.stringify({
-                      x: moveLeftDistance,
-                      y: 5.0,
-                    }),
-                  secretKey.value
-                )
-              : backToken.value +
-                '---' +
-                JSON.stringify({
-                  x: moveLeftDistance,
-                  y: 5.0,
-                })
-            setTimeout(() => {
-              tipWords.value = ''
-              proxy.$parent.closeBox()
-              proxy.$parent.$emit('success', { captchaVerification })
-            }, 1000)
-          } else {
-            moveBlockBackgroundColor.value = '#d9534f'
-            leftBarBorderColor.value = '#d9534f'
-            iconColor.value = '#fff'
-            iconClass.value = 'icon-close'
-            passFlag.value = false
-            setTimeout(function () {
-              refresh()
-            }, 1000)
-            proxy.$parent.$emit('error', proxy)
-            tipWords.value = '验证失败'
-            setTimeout(() => {
-              tipWords.value = ''
-            }, 1000)
-          }
-        })
-        status.value = false
-      }
-    }
 
-    const refresh = () => {
-      showRefresh.value = true
-      finishText.value = ''
+            const refresh = () => {
+                showRefresh.value = true
+                finishText.value = ''
 
-      transitionLeft.value = 'left .3s'
-      moveBlockLeft.value = 0
+                transitionLeft.value = 'left .3s'
+                moveBlockLeft.value = 0
 
-      leftBarWidth.value = undefined
-      transitionWidth.value = 'width .3s'
+                leftBarWidth.value = undefined
+                transitionWidth.value = 'width .3s'
 
-      leftBarBorderColor.value = '#ddd'
-      moveBlockBackgroundColor.value = '#fff'
-      iconColor.value = '#000'
-      iconClass.value = 'icon-right'
-      isEnd.value = false
+                leftBarBorderColor.value = '#ddd'
+                moveBlockBackgroundColor.value = '#fff'
+                iconColor.value = '#000'
+                iconClass.value = 'icon-right'
+                isEnd.value = false
 
-      getPictrue()
-      setTimeout(() => {
-        transitionWidth.value = ''
-        transitionLeft.value = ''
-        text.value = explain.value
-      }, 300)
-    }
+                getPictrue()
+                setTimeout(() => {
+                    transitionWidth.value = ''
+                    transitionLeft.value = ''
+                    text.value = explain.value
+                }, 300)
+            }
 
-    // 请求背景图片和验证图片
-    function getPictrue() {
-      const data = {
-        captchaType: captchaType.value,
-      }
-      reqGet(data).then((res) => {
-        if (res.code == 1) {
-          backImgBase.value = res.data.originalImageBase64
-          blockBackImgBase.value = res.data.jigsawImageBase64
-          backToken.value = res.data.token
-          secretKey.value = res.data.secretKey
-        } else {
-          tipWords.value = res.msg
-        }
-      })
-    }
+            // 请求背景图片和验证图片
+            function getPictrue() {
+                const data = {
+                    captchaType: captchaType.value
+                }
+                reqGet(data).then(res => {
+                    if (res.code == 1) {
+                        backImgBase.value = res.data.originalImageBase64
+                        blockBackImgBase.value = res.data.jigsawImageBase64
+                        backToken.value = res.data.token
+                        secretKey.value = res.data.secretKey
+                    } else {
+                        tipWords.value = res.msg
+                    }
+                })
+            }
 
-    return {
-      secretKey, // 后端返回的ase加密秘钥
-      passFlag, // 是否通过的标识
-      backImgBase, // 验证码背景图片
-      blockBackImgBase, // 验证滑块的背景图片
-      backToken, // 后端返回的唯一token值
-      startMoveTime, // 移动开始的时间
-      endMoveTime, // 移动结束的时间
-      tipsBackColor, // 提示词的背景颜色
-      tipWords,
-      text,
-      finishText,
-      setSize,
-      top,
-      left,
-      moveBlockLeft,
-      leftBarWidth,
-      // 移动中样式
-      moveBlockBackgroundColor,
-      leftBarBorderColor,
-      iconColor,
-      iconClass,
-      status, // 鼠标状态
-      isEnd, // 是够验证完成
-      showRefresh,
-      transitionLeft,
-      transitionWidth,
-      barArea,
-      refresh,
-      start,
+            return {
+                secretKey, // 后端返回的ase加密秘钥
+                passFlag, // 是否通过的标识
+                backImgBase, // 验证码背景图片
+                blockBackImgBase, // 验证滑块的背景图片
+                backToken, // 后端返回的唯一token值
+                startMoveTime, // 移动开始的时间
+                endMoveTime, // 移动结束的时间
+                tipsBackColor, // 提示词的背景颜色
+                tipWords,
+                text,
+                finishText,
+                setSize,
+                top,
+                left,
+                moveBlockLeft,
+                leftBarWidth,
+                // 移动中样式
+                moveBlockBackgroundColor,
+                leftBarBorderColor,
+                iconColor,
+                iconClass,
+                status, // 鼠标状态
+                isEnd,		// 是够验证完成
+                showRefresh,
+                transitionLeft,
+                transitionWidth,
+                barArea,
+                refresh,
+                start
+            }
+        }
     }
-  },
-}
 </script>
diff --git a/admin/src/components/verifition/api/index.js b/admin/src/components/verifition/api/index.js
index f8d09e66..271a3e7b 100644
--- a/admin/src/components/verifition/api/index.js
+++ b/admin/src/components/verifition/api/index.js
@@ -2,27 +2,29 @@
  * 此处可直接引用自己项目封装好的 axios 配合后端联调
  */
 
-import request from './../utils/axios' //组件内部封装的axios
+import request from "./../utils/axios"  //组件内部封装的axios
 // import request from "@/app/api/axios.js"       //调用项目封装的axios
 
 //获取验证图片  以及token
 export function reqGet(data) {
-  return request.get('/captcha/create', { params: { ...data } })
+    return request.get('/captcha/create',{params:{...data}});
 
-  // return  request({
-  //     url: '/captcha/create',
-  //     method: 'get',
-  //     data
-  // })
+	// return  request({
+    //     url: '/captcha/create',
+    //     method: 'get',
+    //     data
+    // })
 }
 
 //滑动或者点选验证
 export function reqCheck(data) {
-  return request.get('/captcha/check', { params: { ...data } })
+    return request.get('/captcha/check',{params:{...data}});
 
-  // return  request({
-  //     url: '/captcha/check',
-  //     method: 'post',
-  //     data
-  // })
+	// return  request({
+    //     url: '/captcha/check',
+    //     method: 'post',
+    //     data
+    // })
 }
+
+
diff --git a/admin/src/components/verifition/utils/ase.js b/admin/src/components/verifition/utils/ase.js
index 3b8cd74a..4c1c5594 100644
--- a/admin/src/components/verifition/utils/ase.js
+++ b/admin/src/components/verifition/utils/ase.js
@@ -3,12 +3,9 @@ import CryptoJS from 'crypto-js'
  * @word 要加密的内容
  * @keyWord String  服务器随机返回的关键字
  *  */
-export function aesEncrypt(word, keyWord = 'XwKsGlMcdPMEhR1B') {
-  var key = CryptoJS.enc.Utf8.parse(keyWord)
-  var srcs = CryptoJS.enc.Utf8.parse(word)
-  var encrypted = CryptoJS.AES.encrypt(srcs, key, {
-    mode: CryptoJS.mode.ECB,
-    padding: CryptoJS.pad.Pkcs7,
-  })
-  return encrypted.toString()
+export function aesEncrypt(word,keyWord="XwKsGlMcdPMEhR1B"){
+  var key = CryptoJS.enc.Utf8.parse(keyWord);
+  var srcs = CryptoJS.enc.Utf8.parse(word);
+  var encrypted = CryptoJS.AES.encrypt(srcs, key, {mode:CryptoJS.mode.ECB,padding: CryptoJS.pad.Pkcs7});
+  return encrypted.toString();
 }
diff --git a/admin/src/components/verifition/utils/axios.js b/admin/src/components/verifition/utils/axios.js
index 8aa6a301..979b44ce 100644
--- a/admin/src/components/verifition/utils/axios.js
+++ b/admin/src/components/verifition/utils/axios.js
@@ -1,29 +1,30 @@
-import axios from 'axios'
+import axios from 'axios';
 
-axios.defaults.baseURL = import.meta.env.VITE_APP_BASE_URL
+axios.defaults.baseURL = import.meta.env.VITE_APP_BASE_URL;
 
 const service = axios.create({
   timeout: 40000,
   headers: {
     'X-Requested-With': 'XMLHttpRequest',
-    'Content-Type': 'application/json; charset=UTF-8',
+    'Content-Type': 'application/json; charset=UTF-8'
   },
 })
 service.interceptors.request.use(
-  (config) => {
+  config => {
     return config
   },
-  (error) => {
+  error => {
     Promise.reject(error)
   }
 )
 
 // response interceptor
 service.interceptors.response.use(
-  (response) => {
-    const res = response.data
+  response => {
+    const res = response.data;
     return res
   },
-  (error) => {}
+  error => {
+  }
 )
 export default service
diff --git a/admin/src/components/verifition/utils/util.js b/admin/src/components/verifition/utils/util.js
index cab6d8ff..4cd1ad9b 100644
--- a/admin/src/components/verifition/utils/util.js
+++ b/admin/src/components/verifition/utils/util.js
@@ -1,109 +1,35 @@
 export function resetSize(vm) {
-  var img_width, img_height, bar_width, bar_height //图片的宽度、高度，移动条的宽度、高度
+    var img_width, img_height, bar_width, bar_height;	//图片的宽度、高度，移动条的宽度、高度
 
-  var parentWidth = vm.$el.parentNode.offsetWidth || window.offsetWidth
-  var parentHeight = vm.$el.parentNode.offsetHeight || window.offsetHeight
-  if (vm.imgSize.width.indexOf('%') != -1) {
-    img_width = (parseInt(vm.imgSize.width) / 100) * parentWidth + 'px'
-  } else {
-    img_width = vm.imgSize.width
-  }
+    var parentWidth = vm.$el.parentNode.offsetWidth || window.offsetWidth
+    var parentHeight = vm.$el.parentNode.offsetHeight || window.offsetHeight
+    if (vm.imgSize.width.indexOf('%') != -1) {
+        img_width = parseInt(vm.imgSize.width) / 100 * parentWidth + 'px'
+    } else {
+        img_width = vm.imgSize.width;
+    }
 
-  if (vm.imgSize.height.indexOf('%') != -1) {
-    img_height = (parseInt(vm.imgSize.height) / 100) * parentHeight + 'px'
-  } else {
-    img_height = vm.imgSize.height
-  }
+    if (vm.imgSize.height.indexOf('%') != -1) {
+        img_height = parseInt(vm.imgSize.height) / 100 * parentHeight + 'px'
+    } else {
+        img_height = vm.imgSize.height
+    }
 
-  if (vm.barSize.width.indexOf('%') != -1) {
-    bar_width = (parseInt(vm.barSize.width) / 100) * parentWidth + 'px'
-  } else {
-    bar_width = vm.barSize.width
-  }
+    if (vm.barSize.width.indexOf('%') != -1) {
+        bar_width = parseInt(vm.barSize.width) / 100 * parentWidth + 'px'
+    } else {
+        bar_width = vm.barSize.width
+    }
 
-  if (vm.barSize.height.indexOf('%') != -1) {
-    bar_height = (parseInt(vm.barSize.height) / 100) * parentHeight + 'px'
-  } else {
-    bar_height = vm.barSize.height
-  }
+    if (vm.barSize.height.indexOf('%') != -1) {
+        bar_height = parseInt(vm.barSize.height) / 100 * parentHeight + 'px'
+    } else {
+        bar_height = vm.barSize.height
+    }
 
-  return {
-    imgWidth: img_width,
-    imgHeight: img_height,
-    barWidth: bar_width,
-    barHeight: bar_height,
-  }
+    return {imgWidth: img_width, imgHeight: img_height, barWidth: bar_width, barHeight: bar_height}
 }
 
-export const _code_chars = [
-  1,
-  2,
-  3,
-  4,
-  5,
-  6,
-  7,
-  8,
-  9,
-  'a',
-  'b',
-  'c',
-  'd',
-  'e',
-  'f',
-  'g',
-  'h',
-  'i',
-  'j',
-  'k',
-  'l',
-  'm',
-  'n',
-  'o',
-  'p',
-  'q',
-  'r',
-  's',
-  't',
-  'u',
-  'v',
-  'w',
-  'x',
-  'y',
-  'z',
-  'A',
-  'B',
-  'C',
-  'D',
-  'E',
-  'F',
-  'G',
-  'H',
-  'I',
-  'J',
-  'K',
-  'L',
-  'M',
-  'N',
-  'O',
-  'P',
-  'Q',
-  'R',
-  'S',
-  'T',
-  'U',
-  'V',
-  'W',
-  'X',
-  'Y',
-  'Z',
-]
+export const _code_chars = [1, 2, 3, 4, 5, 6, 7, 8, 9, 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z']
 export const _code_color1 = ['#fffff0', '#f0ffff', '#f0fff0', '#fff0f0']
-export const _code_color2 = [
-  '#FF0033',
-  '#006699',
-  '#993366',
-  '#FF9900',
-  '#66CC66',
-  '#FF33CC',
-]
+export const _code_color2 = ['#FF0033', '#006699', '#993366', '#FF9900', '#66CC66', '#FF33CC']
\ No newline at end of file
diff --git a/admin/src/components/video-player/index.vue b/admin/src/components/video-player/index.vue
index 111e0933..e9e738e3 100644
--- a/admin/src/components/video-player/index.vue
+++ b/admin/src/components/video-player/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <video-play />
+    <video-play />
 </template>
 
 <script lang="ts" setup>
diff --git a/admin/src/components/web-link/web-link.vue b/admin/src/components/web-link/web-link.vue
index 6ebfe974..df9114bb 100644
--- a/admin/src/components/web-link/web-link.vue
+++ b/admin/src/components/web-link/web-link.vue
@@ -1,107 +1,69 @@
 <template>
-  <div>
-    <div @click="show">
-      <slot>
-        <el-input
-          v-model="value.title"
-          :placeholder="t('linkPlaceholder')"
-          readonly
-          class="link-input"
-        >
-          <template #suffix>
-            <div @click.stop="clear">
-              <el-icon v-if="value.name">
-                <Close />
-              </el-icon>
-              <el-icon v-else>
-                <ArrowRight />
-              </el-icon>
+    <div>
+        <div @click="show">
+            <slot>
+                <el-input v-model="value.title" :placeholder="t('linkPlaceholder')" readonly class="link-input">
+                    <template #suffix>
+                        <div @click.stop="clear">
+                            <el-icon v-if="value.name">
+                                <Close />
+                            </el-icon>
+                            <el-icon v-else>
+                                <ArrowRight />
+                            </el-icon>
+                        </div>
+                    </template>
+                </el-input>
+            </slot>
+        </div>
+        <el-dialog v-model="showDialog" :title="t('selectLinkTips')" width="40%" :close-on-press-escape="false" :destroy-on-close="true" :close-on-click-modal="false">
+
+            <div class="flex items-start">
+                <el-scrollbar class="w-[140px] border-r h-[350px]">
+                    <div v-for="(item, index) in link" :key="index"
+                        class="h-[40px] leading-[40px] cursor-pointer hover:bg-primary-light-9 px-[10px] hover:text-primary"
+                        :class="[item.name == parentLinkName ? 'bg-primary-light-9 text-primary' : '']"
+                        @click="changeParentLink(item)">
+                        {{ item.title }}
+                    </div>
+                </el-scrollbar>
+                <el-scrollbar class="pl-4 h-[350px] flex-1">
+                    <template v-if="parentLinkName == 'DIY_LINK'">
+                        <div class="mb-[16px]">
+                            <el-form-item :label="t('diyLinkName')">
+                                <el-input v-model="selectLink.title" :placeholder="t('diyLinkNamePlaceholder')" class="w-6/12" />
+                            </el-form-item>
+                        </div>
+                        <div class="mb-[16px]">
+                            <el-form-item :label="t('diyLinkUrl')">
+                                <el-input v-model="selectLink.url" :placeholder="t('diyLinkUrlPlaceholder')" class="w-6/12" />
+                            </el-form-item>
+                        </div>
+                        <el-form-item label=" ">
+                            <div class="text-sm text-gray-400 select-text">路径必须以“/”开头，例：/index/index</div>
+                        </el-form-item>
+                        <el-form-item label=" ">
+                            <div class="text-sm text-gray-400 select-text">跳转外部链接“http”或“https”开头，例：https://baidu.com</div>
+                        </el-form-item>
+                    </template>
+                    <div v-else class="flex flex-wrap">
+                        <div v-for="(item, index) in childList" :key="index"
+                            class="border border-br rounded-[3px] mr-[10px] mb-[10px] px-4 h-[32px] leading-[32px] cursor-pointer hover:bg-primary-light-9 px-[10px] hover:text-primary"
+                            :class="[item.name == selectLink.name ? 'border-primary text-primary' : '']"
+                            @click="changeChildLink(item)">{{ item.title }}
+                        </div>
+                    </div>
+                </el-scrollbar>
             </div>
-          </template>
-        </el-input>
-      </slot>
+
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                    <el-button type="primary" @click="save">{{ t('confirm') }}</el-button>
+                </span>
+            </template>
+        </el-dialog>
     </div>
-    <el-dialog
-      v-model="showDialog"
-      :title="t('selectLinkTips')"
-      width="40%"
-      :close-on-press-escape="false"
-      :destroy-on-close="true"
-      :close-on-click-modal="false"
-    >
-      <div class="flex items-start">
-        <el-scrollbar class="w-[140px] border-r h-[350px]">
-          <div
-            v-for="(item, index) in link"
-            :key="index"
-            class="h-[40px] leading-[40px] cursor-pointer hover:bg-primary-light-9 px-[10px] hover:text-primary"
-            :class="[
-              item.name == parentLinkName
-                ? 'bg-primary-light-9 text-primary'
-                : '',
-            ]"
-            @click="changeParentLink(item)"
-          >
-            {{ item.title }}
-          </div>
-        </el-scrollbar>
-        <el-scrollbar class="pl-4 h-[350px] flex-1">
-          <template v-if="parentLinkName == 'DIY_LINK'">
-            <div class="mb-[16px]">
-              <el-form-item :label="t('diyLinkName')">
-                <el-input
-                  v-model="selectLink.title"
-                  :placeholder="t('diyLinkNamePlaceholder')"
-                  class="w-6/12"
-                />
-              </el-form-item>
-            </div>
-            <div class="mb-[16px]">
-              <el-form-item :label="t('diyLinkUrl')">
-                <el-input
-                  v-model="selectLink.url"
-                  :placeholder="t('diyLinkUrlPlaceholder')"
-                  class="w-6/12"
-                />
-              </el-form-item>
-            </div>
-            <el-form-item label=" ">
-              <div class="text-sm text-gray-400 select-text">
-                路径必须以“/”开头，例：/index/index
-              </div>
-            </el-form-item>
-            <el-form-item label=" ">
-              <div class="text-sm text-gray-400 select-text">
-                跳转外部链接“http”或“https”开头，例：https://baidu.com
-              </div>
-            </el-form-item>
-          </template>
-          <div v-else class="flex flex-wrap">
-            <div
-              v-for="(item, index) in childList"
-              :key="index"
-              class="border border-br rounded-[3px] mr-[10px] mb-[10px] px-4 h-[32px] leading-[32px] cursor-pointer hover:bg-primary-light-9 px-[10px] hover:text-primary"
-              :class="[
-                item.name == selectLink.name
-                  ? 'border-primary text-primary'
-                  : '',
-              ]"
-              @click="changeChildLink(item)"
-            >
-              {{ item.title }}
-            </div>
-          </div>
-        </el-scrollbar>
-      </div>
-
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-          <el-button type="primary" @click="save">{{ t('confirm') }}</el-button>
-        </span>
-      </template>
-    </el-dialog>
-  </div>
 </template>
 
 <script lang="ts" setup>
@@ -112,21 +74,21 @@ import { getLink } from '@/app/api/web'
 import { ElMessage } from 'element-plus'
 
 const prop = defineProps({
-  modelValue: {
-    type: Object,
-    default: () => {},
-  },
+    modelValue: {
+        type: Object,
+        default: () => {}
+    }
 })
 
 const emit = defineEmits(['update:modelValue'])
 
 const value: any = computed({
-  get() {
-    return prop.modelValue
-  },
-  set(value) {
-    emit('update:modelValue', value)
-  },
+    get () {
+        return prop.modelValue
+    },
+    set (value) {
+        emit('update:modelValue', value)
+    }
 })
 
 const showDialog = ref(false)
@@ -141,112 +103,112 @@ const childList: any = ref([])
 const selectLink: any = ref({})
 
 const show = () => {
-  getLinkFn(() => {
-    // 每次打开时赋值
-    if (value.value.name != '') {
-      selectLink.value = cloneDeep(value.value)
-      parentLinkName.value = selectLink.value.parent
-      for (let key in link.value) {
-        if (link.value[key].name == parentLinkName.value) {
-          changeParentLink(link.value[key])
+    getLinkFn(() => {
+        // 每次打开时赋值
+        if (value.value.name != '') {
+            selectLink.value = cloneDeep(value.value)
+            parentLinkName.value = selectLink.value.parent
+            for (let key in link.value) {
+                if (link.value[key].name == parentLinkName.value) {
+                    changeParentLink(link.value[key])
+                }
+            }
         }
-      }
-    }
-    showDialog.value = true
-  })
+        showDialog.value = true
+    })
 }
 
-const getLinkFn = (callback: any = null) => {
-  getLink({}).then((res: any) => {
-    link.value = res.data
-    if (prop.ignore && prop.ignore.length) {
-      for (let key in link.value) {
-        for (let i = 0; i < prop.ignore.length; i++) {
-          if (key == prop.ignore[i]) {
-            delete link.value[key]
-            break
-          }
+const getLinkFn = (callback:any=null)=> {
+    getLink({}).then((res: any) => {
+        link.value = res.data
+        if (prop.ignore && prop.ignore.length) {
+            for (let key in link.value) {
+                for (let i = 0; i < prop.ignore.length; i++) {
+                    if (key == prop.ignore[i]) {
+                        delete link.value[key];
+                        break;
+                    }
+                }
+            }
         }
-      }
-    }
 
-    childList.value = Object.values(link.value)[0].child_list
-    if (value.value.name != '') {
-      selectLink.value = cloneDeep(value.value)
-    } else {
-      selectLink.value = {
-        parent: Object.values(link.value)[0].name,
-      }
-    }
-    parentLinkName.value = selectLink.value.parent
+        childList.value = Object.values(link.value)[0].child_list
+        if (value.value.name != '') {
+            selectLink.value = cloneDeep(value.value)
+        } else {
+            selectLink.value = {
+                parent: Object.values(link.value)[0].name
+            }
+        }
+        parentLinkName.value = selectLink.value.parent
 
-    if (callback) callback()
-  })
+        if (callback) callback()
+    })
 }
 
 // 选择父级链接
 const changeParentLink = (item: any) => {
-  childList.value = item.child_list
-  parentLinkName.value = item.name
+    childList.value = item.child_list
+    parentLinkName.value = item.name
 }
 
 // 选择子链接
 const changeChildLink = (item: any) => {
-  delete item.is_share
-  selectLink.value = cloneDeep(item)
+    delete item.is_share
+    selectLink.value = cloneDeep(item)
 }
 
 const clear = () => {
-  value.value = {
-    name: '',
-    parent: '',
-    title: '',
-    url: '',
-  }
+    value.value = {
+        name: '',
+        parent: '',
+        title: '',
+        url: ''
+    }
 }
 
 const save = () => {
-  if (parentLinkName.value === 'DIY_LINK') {
-    // 自定义链接
-
-    if (!selectLink.value.title) {
-      ElMessage({
-        message: t('diyLinkNameNotEmpty'),
-        type: 'warning',
-      })
-      return
-    }
+    if (parentLinkName.value === 'DIY_LINK') {
+        // 自定义链接
+
+        if (!selectLink.value.title) {
+            ElMessage({
+                message: t('diyLinkNameNotEmpty'),
+                type: 'warning'
+            })
+            return
+        }
 
-    if (!selectLink.value.url) {
-      ElMessage({
-        message: t('diyLinkUrlNotEmpty'),
-        type: 'warning',
-      })
-      return
-    }
+        if (!selectLink.value.url) {
+            ElMessage({
+                message: t('diyLinkUrlNotEmpty'),
+                type: 'warning'
+            })
+            return
+        }
 
-    selectLink.value.parent = parentLinkName.value
-    selectLink.value.name = parentLinkName.value
-    selectLink.value.action = ''
-  } else if (parentLinkName.value == 'DIY_PAGE') {
-    // 自定义页面
-    selectLink.value.parent = parentLinkName.value
-    selectLink.value.action = 'decorate'
-  }
+        selectLink.value.parent = parentLinkName.value
+        selectLink.value.name = parentLinkName.value
+        selectLink.value.action = ''
+    } else if (parentLinkName.value == 'DIY_PAGE') {
+        // 自定义页面
+        selectLink.value.parent = parentLinkName.value
+        selectLink.value.action = 'decorate'
+    }
 
-  value.value = cloneDeep(selectLink.value)
-  showDialog.value = false
+    value.value = cloneDeep(selectLink.value)
+    showDialog.value = false
 
-  emit('success')
+    emit('success')
 }
 
 defineExpose({
-  showDialog,
+    showDialog
 })
 </script>
 
 <style lang="scss">
 .link-input .el-input__inner {
-  cursor: pointer;
+    cursor: pointer;
 }
 </style>
diff --git a/admin/src/lang/en/common.json b/admin/src/lang/en/common.json
index 34a2024a..4e491a4b 100644
--- a/admin/src/lang/en/common.json
+++ b/admin/src/lang/en/common.json
@@ -1,38 +1,38 @@
 {
-  "edit": "Edit",
-  "delete": "Delete",
-  "createTime": "Create Time",
-  "sort": "Sort",
-  "status": "Status",
-  "operation": "Operation",
-  "statusNormal": "Normal",
-  "statusDeactivate": "Deactivate",
-  "confirm": "Confirm",
-  "cancel": "Cancel",
-  "warning": "Warning",
-  "isShow": "Show or not",
-  "show": "show",
-  "hidden": "hidden",
-  "icon": "Icon",
-  "layout": {
-    "layoutSetting": "Layout configuration",
-    "darkMode": "Dark mode",
-    "themeColor": "Theme color"
-  },
-  "axios": {
-    "unknownError": "Unknown Error",
-    "400": "Wrong request            ",
-    "401": "Please login again",
-    "403": "Access denied",
-    "404": "Request error, the resource was not found",
-    "405": "Request method not allowed",
-    "408": "Request timeout",
-    "500": "Server side error",
-    "501": "Network not implemented",
-    "502": "Network error",
-    "503": "Service unavailable",
-    "504": "Network Timeout",
-    "505": "The http version does not support the request",
-    "timeout": "Network request timeout!"
-  }
-}
+    "edit": "Edit",
+    "delete": "Delete",
+    "createTime": "Create Time",
+    "sort": "Sort",
+    "status": "Status",
+    "operation": "Operation",
+    "statusNormal": "Normal",
+    "statusDeactivate": "Deactivate",
+    "confirm": "Confirm",
+    "cancel": "Cancel",
+    "warning": "Warning",
+    "isShow": "Show or not",
+    "show": "show",
+    "hidden": "hidden",
+    "icon": "Icon",
+    "layout": {
+        "layoutSetting": "Layout configuration",
+        "darkMode": "Dark mode",
+        "themeColor": "Theme color"
+    },
+    "axios": {
+        "unknownError": "Unknown Error",
+        "400": "Wrong request            ",
+        "401": "Please login again",
+        "403": "Access denied",
+        "404": "Request error, the resource was not found",
+        "405": "Request method not allowed",
+        "408": "Request timeout",
+        "500": "Server side error",
+        "501": "Network not implemented",
+        "502": "Network error",
+        "503": "Service unavailable",
+        "504": "Network Timeout",
+        "505": "The http version does not support the request",
+        "timeout": "Network request timeout!"
+    }
+}
\ No newline at end of file
diff --git a/admin/src/lang/i18n.ts b/admin/src/lang/i18n.ts
index 9f0dc2a9..3409efa7 100644
--- a/admin/src/lang/i18n.ts
+++ b/admin/src/lang/i18n.ts
@@ -1,35 +1,33 @@
-import { createI18n } from 'vue-i18n'
+import { createI18n } from "vue-i18n"
 
-import Language from './language'
-import zhCn from './zh-cn/common.json'
-import en from './en/common.json'
+import Language from "./language"
+import zhCn from "./zh-cn/common.json";
+import en from "./en/common.json"
 
-const addonZhCnCommon = import.meta.globEager(
-  '@/addon/**/lang/zh-cn/common.json'
-)
+const addonZhCnCommon = import.meta.globEager('@/addon/**/lang/zh-cn/common.json')
 const addonEnCommon = import.meta.globEager('@/addon/**/lang/en/common.json')
 
 for (let key in addonZhCnCommon) {
-  Object.assign(zhCn, addonZhCnCommon[key].default)
+    Object.assign(zhCn, addonZhCnCommon[key].default)
 }
 for (let key in addonEnCommon) {
-  Object.assign(en, addonEnCommon[key].default)
+    Object.assign(en, addonEnCommon[key].default)
 }
 
 //创建实例
 let i18n = createI18n({
-  datetimeFormats: {},
-  numberFormats: {},
-  globalInjection: true, //是否全局注入
-  silentTranslationWarn: true,
-  messages: {
-    'zh-cn': zhCn,
-    en,
-  },
-  silentFallbackWarn: true,
-})
+    datetimeFormats: {},
+    numberFormats: {},
+    globalInjection: true, //是否全局注入
+    silentTranslationWarn: true,
+    messages: {
+        "zh-cn": zhCn,
+        en
+    },
+    silentFallbackWarn: true
+});
 
-const language = new Language(i18n)
+const language = new Language(i18n);
 
-export { language }
-export default i18n
+export { language };
+export default i18n;
diff --git a/admin/src/lang/index.ts b/admin/src/lang/index.ts
index c0c60afd..07eb7230 100644
--- a/admin/src/lang/index.ts
+++ b/admin/src/lang/index.ts
@@ -1,22 +1,21 @@
-import i18n, { language } from './i18n'
+import i18n, { language } from "./i18n"
 import useAppStore from '@/stores/modules/app'
 
 const t = (message: string) => {
-  const route = useAppStore().route
-  const path = route.meta.view || route.path
-  const file =
-    path == '/'
-      ? 'index'
-      : path.replace(/^(\/admin\/|\/site\/|\/)/, '').replaceAll('/', '.')
-  const key = `${file}.${message}`
-  return i18n.global.t(key) != key ? i18n.global.t(key) : i18n.global.t(message)
+    const route = useAppStore().route
+    const path = route.meta.view || route.path
+    const file = path == '/' ? 'index' : path.replace(/^(\/admin\/|\/site\/|\/)/, '').replaceAll('/', '.')
+    const key = `${file}.${message}`
+    return i18n.global.t(key) != key ? i18n.global.t(key) : i18n.global.t(message)
 }
 
 export { language, t }
 
 export default {
-  install(app: any) {
-    //注册i18n
-    app.use(i18n)
-  },
-}
+    install(app: any) {
+        //注册i18n
+        app.use(i18n);
+    }
+};
+
+
diff --git a/admin/src/lang/language.ts b/admin/src/lang/language.ts
index 87ea08b0..f6e1cd74 100644
--- a/admin/src/lang/language.ts
+++ b/admin/src/lang/language.ts
@@ -1,74 +1,65 @@
 import { nextTick } from 'vue'
 
 class Language {
-  private i18n: any
-  private loadLocale: Array<string> = [] //已加载的语言
+    private i18n: any;
+    private loadLocale: Array<string> = []; //已加载的语言
 
-  constructor(i18n: any) {
-    this.i18n = i18n
-  }
+    constructor(i18n: any) {
+        this.i18n = i18n
+    }
 
-  /**
-   *
-   * @param locale 设置语言
-   */
-  public setI18nLanguage(locale: string) {
-    if (this.i18n.mode === 'legacy') {
-      this.i18n.global.locale = locale
-    } else {
-      this.i18n.global.locale = locale
+    /**
+     *
+     * @param locale 设置语言
+     */
+    public setI18nLanguage(locale: string) {
+        if (this.i18n.mode === 'legacy') {
+            this.i18n.global.locale = locale
+        } else {
+            this.i18n.global.locale = locale
+        }
+        let html = document.querySelector('html')
+        html && html.setAttribute('lang', locale)
     }
-    let html = document.querySelector('html')
-    html && html.setAttribute('lang', locale)
-  }
 
-  /**
-   * 加载语言包
-   * @param path
-   * @param locale
-   * @returns
-   */
-  public async loadLocaleMessages(app: string, path: string, locale: string) {
-    try {
-      const file =
-        path == '/'
-          ? 'index'
-          : path.replace(/^(\/admin\/|\/site\/|\/)/, '').replaceAll('/', '.')
+    /**
+     * 加载语言包
+     * @param path
+     * @param locale
+     * @returns
+     */
+    public async loadLocaleMessages(app: string, path: string, locale: string) {
+        try {
+            const file = path == '/' ? 'index' : path.replace(/^(\/admin\/|\/site\/|\/)/, '').replaceAll('/', '.')
+
+            // 引入语言包文件
+            const messages = await import(app ? `@/addon/${app}/lang/${locale}/${file}.json` : `@/app/lang/${locale}/${file}.json`)
 
-      // 引入语言包文件
-      const messages = await import(
-        app
-          ? `@/addon/${app}/lang/${locale}/${file}.json`
-          : `@/app/lang/${locale}/${file}.json`
-      )
+            let data: Record<string, string> = {}
+            Object.keys(messages.default).forEach(key => {
+                data[`${file}.${key}`] = messages.default[key]
+            })
 
-      let data: Record<string, string> = {}
-      Object.keys(messages.default).forEach((key) => {
-        data[`${file}.${key}`] = messages.default[key]
-      })
+            // 查询插件的公共语言包
+            if (app) {
+                try {
+                    var messagesCommon = await import( `@/${app}/lang/${locale}/common.json`)
+                    Object.keys(messagesCommon.default).forEach(key => {
+                        data[`${file}.${key}`] = messagesCommon.default[key]
+                    })
+                } catch (e) {
+                    // console.log('未找到插件公共语言包')
+                }
+            }
 
-      // 查询插件的公共语言包
-      if (app) {
-        try {
-          var messagesCommon = await import(
-            `@/${app}/lang/${locale}/common.json`
-          )
-          Object.keys(messagesCommon.default).forEach((key) => {
-            data[`${file}.${key}`] = messagesCommon.default[key]
-          })
+            this.i18n.global.mergeLocaleMessage(locale, data)
+            this.setI18nLanguage(locale)
+            return nextTick()
         } catch (e) {
-          // console.log('未找到插件公共语言包')
+            this.setI18nLanguage(locale)
+            return nextTick()
         }
-      }
-
-      this.i18n.global.mergeLocaleMessage(locale, data)
-      this.setI18nLanguage(locale)
-      return nextTick()
-    } catch (e) {
-      this.setI18nLanguage(locale)
-      return nextTick()
     }
-  }
 }
 
 export default Language
diff --git a/admin/src/lang/zh-cn/common.json b/admin/src/lang/zh-cn/common.json
index f51ddd49..0f68f212 100644
--- a/admin/src/lang/zh-cn/common.json
+++ b/admin/src/lang/zh-cn/common.json
@@ -29,7 +29,7 @@
   "headImg": "头像",
   "accountNumber": "账号",
   "accountSettings": "账号设置",
-  "realName": "名称",
+  "realName":"名称",
   "realNamePlaceholder": "请输入用户名称",
   "password": "密码",
   "confirmPassword": "确认密码",
diff --git a/admin/src/layout/decorate/index.vue b/admin/src/layout/decorate/index.vue
index 39a953fe..77929b24 100644
--- a/admin/src/layout/decorate/index.vue
+++ b/admin/src/layout/decorate/index.vue
@@ -1,9 +1,10 @@
 <template>
-  <el-container class="w-screen h-screen min-w-[1200px]">
-    <router-view></router-view>
-  </el-container>
+	<el-container class="w-screen h-screen min-w-[1200px]">
+		<router-view></router-view>
+	</el-container>
 </template>
 
-<script lang="ts" setup></script>
+<script lang="ts" setup>
+</script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/layout/default/components/aside/index.vue b/admin/src/layout/default/components/aside/index.vue
index 084a9a3c..c30b7137 100644
--- a/admin/src/layout/default/components/aside/index.vue
+++ b/admin/src/layout/default/components/aside/index.vue
@@ -1,19 +1,13 @@
 <template>
-  <el-aside class="layout-aside w-auto">
-    <side class="hidden-xs-only slide" />
-  </el-aside>
+    <el-aside class="layout-aside w-auto">
+        <side class="hidden-xs-only slide" />
+    </el-aside>
 
-  <el-drawer
-    v-model="systemStore.menuDrawer"
-    direction="ltr"
-    :with-header="false"
-    custom-class="aside-drawer"
-    size="210px"
-  >
-    <template #default>
-      <side />
-    </template>
-  </el-drawer>
+    <el-drawer v-model="systemStore.menuDrawer" direction="ltr" :with-header="false" custom-class="aside-drawer" size="210px">
+        <template #default>
+            <side />
+        </template>
+    </el-drawer>
 </template>
 
 <script lang="ts" setup>
@@ -24,51 +18,51 @@ import useSystemStore from '@/stores/modules/system'
 
 const systemStore = useSystemStore()
 const dark = computed(() => {
-  return systemStore.dark
+    return systemStore.dark
 })
 
 const route = useRoute()
 watch(route, () => {
-  systemStore.$patch((state) => {
-    state.menuDrawer = false
-  })
+    systemStore.$patch(state => {
+        state.menuDrawer = false
+    })
 })
 </script>
 
 <style lang="scss">
 .layout-aside {
-  &.bright {
-    background-color: #f5f7f9;
+    &.bright {
+        background-color: #F5F7F9;
 
-    li {
-      background-color: #f5f7f9;
+        li {
+            background-color: #F5F7F9;
 
-      &.is-active:not(.is-opened) {
-        position: relative;
-        color: #333;
-        background-color: #fff;
+            &.is-active:not(.is-opened) {
+                position: relative;
+                color: #333;
+                background-color: #fff;
 
-        &::after {
-          content: '';
-          position: absolute;
-          top: 0;
-          bottom: 0;
-          left: 0;
-          width: 2px;
-          background-color: var(--el-menu-active-color);
+                &::after {
+                    content: "";
+                    position: absolute;
+                    top: 0;
+                    bottom: 0;
+                    left: 0;
+                    width: 2px;
+                    background-color: var(--el-menu-active-color);
+                }
+            }
         }
-      }
     }
-  }
 
-  .slide {
-    border-right: 1px solid var(--el-border-color-extra-light);
-  }
+    .slide {
+        border-right: 1px solid var(--el-border-color-extra-light);
+    }
 }
 
 .aside-drawer {
-  .el-drawer__body {
-    padding: 0px !important;
-  }
+    .el-drawer__body {
+        padding: 0px !important;
+    }
 }
 </style>
diff --git a/admin/src/layout/default/components/aside/menu-item.vue b/admin/src/layout/default/components/aside/menu-item.vue
index f953feff..ff388a53 100644
--- a/admin/src/layout/default/components/aside/menu-item.vue
+++ b/admin/src/layout/default/components/aside/menu-item.vue
@@ -1,77 +1,45 @@
 <template>
-  <template v-if="meta.show">
-    <el-sub-menu v-if="routes.children" :index="String(routes.name)">
-      <template #title>
-        <div
-          class="w-[16px] h-[16px] relative flex items-center"
-          v-if="props.level == 1"
-        >
-          <icon v-if="meta.icon" :name="meta.icon" class="absolute !w-auto" />
-        </div>
-        <span class="ml-[10px]">{{ meta.title }}</span>
-      </template>
-      <menu-item
-        v-for="(route, index) in routes.children"
-        :routes="route"
-        :key="index"
-        :level="props.level + 1"
-      />
-      <template v-if="routes.name == 'addon_list'">
-        <template v-if="addonsMenus">
-          <menu-item
-            :routes="addonsMenus"
-            :key="index"
-            :level="props.level + 1"
-          />
-        </template>
-      </template>
-    </el-sub-menu>
-    <template v-else>
-      <el-menu-item
-        :index="String(routes.name)"
-        @click="router.push({ name: routes.name })"
-        v-if="meta.addon && meta.parent_route && meta.parent_route.addon == ''"
-      >
-        <template #title>
-          <el-tooltip placement="right" effect="light">
-            <template #content>
-              该功能仅限{{ addons[meta.addon].title }}使用
+    <template v-if="meta.show">
+        <el-sub-menu v-if="routes.children" :index="String(routes.name)">
+            <template #title>
+                <div class="w-[16px] h-[16px] relative flex items-center" v-if="props.level == 1">
+                    <icon v-if="meta.icon" :name="meta.icon" class="absolute !w-auto" />
+                </div>
+                <span class="ml-[10px]">{{ meta.title }}</span>
             </template>
-            <div
-              class="w-[16px] h-[16px] relative flex items-center"
-              v-if="props.level == 1"
-            >
-              <icon
-                v-if="meta.icon"
-                :name="meta.icon"
-                class="absolute !w-auto"
-              />
-            </div>
-            <span class="ml-[10px]">{{ meta.title }}</span>
-          </el-tooltip>
-        </template>
-      </el-menu-item>
-      <el-menu-item
-        :index="String(routes.name)"
-        @click="router.push({ name: routes.name })"
-        v-else
-      >
-        <template #title>
-          <div
-            class="w-[16px] h-[16px] relative flex items-center"
-            v-if="props.level == 1"
-          >
-            <icon v-if="meta.icon" :name="meta.icon" class="absolute !w-auto" />
-          </div>
-          <span class="ml-[10px]">{{ meta.title }}</span>
+            <menu-item v-for="(route, index) in routes.children" :routes="route" :key="index" :level="props.level + 1" />
+            <template v-if="routes.name == 'addon_list'">
+                <template v-if="addonsMenus">
+                    <menu-item :routes="addonsMenus" :key="index" :level="props.level + 1"/>
+                </template>
+            </template>
+        </el-sub-menu>
+        <template v-else>
+            <el-menu-item :index="String(routes.name)" @click="router.push({ name: routes.name })" v-if="meta.addon && meta.parent_route && meta.parent_route.addon == ''">
+                <template #title>
+                    <el-tooltip placement="right" effect="light">
+                        <template #content>
+                            该功能仅限{{ addons[meta.addon].title }}使用
+                        </template>
+                        <div class="w-[16px] h-[16px] relative flex items-center" v-if="props.level == 1">
+                            <icon v-if="meta.icon" :name="meta.icon" class="absolute !w-auto" />
+                        </div>
+                        <span class="ml-[10px]">{{ meta.title }}</span>
+                    </el-tooltip>
+                </template>
+            </el-menu-item>
+            <el-menu-item :index="String(routes.name)" @click="router.push({ name: routes.name })" v-else>
+                <template #title>
+                    <div class="w-[16px] h-[16px] relative flex items-center" v-if="props.level == 1">
+                        <icon v-if="meta.icon" :name="meta.icon" class="absolute !w-auto" />
+                    </div>
+                    <span class="ml-[10px]">{{ meta.title }}</span>
+                </template>
+            </el-menu-item>
         </template>
-      </el-menu-item>
+        <div v-if="routes.is_border" class="!border-0 !border-t-[1px] border-solid mx-[25px] bg-[#f7f7f7] my-[5px]"></div>
     </template>
-    <div
-      v-if="routes.is_border"
-      class="!border-0 !border-t-[1px] border-solid mx-[25px] bg-[#f7f7f7] my-[5px]"
-    ></div>
-  </template>
+
 </template>
 
 <script lang="ts" setup>
@@ -87,70 +55,59 @@ const route = useRoute()
 const userStore = useUserStore()
 const routers = useUserStore().routers
 const props = defineProps({
-  routes: {
-    type: Object,
-    required: true,
-  },
-  level: {
-    type: Number,
-    default: 1,
-  },
+    routes: {
+        type: Object,
+        required: true
+    },
+    level: {
+        type: Number,
+        default: 1
+    }
 })
 const systemStore = useSystemStore()
 const meta = computed(() => props.routes.meta)
 
 const addons = computed(() => {
-  const addons: Record<string, any> = {}
-  systemStore?.apps.forEach((item: any) => {
-    addons[item.key] = item
-  })
-  systemStore?.addons.forEach((item: any) => {
-    addons[item.key] = item
-  })
-  return addons
+    const addons:Record<string, any> = {}
+    systemStore?.apps.forEach((item: any) => { addons[item.key] = item })
+    systemStore?.addons.forEach((item: any) => { addons[item.key] = item })
+    return addons
 })
 
 const systemAddonKeys = computed(() => {
-  return systemStore?.addons.map((item: any) => item.key)
+    return systemStore?.addons.map((item: any) => item.key)
 })
 
 const addonRouters: Record<string, any> = {}
-routers.forEach((item) => {
-  item.original_name = item.name
-  if (item.meta.addon) {
-    addonRouters[item.meta.addon] = item
-  }
-  if (item.meta.attr) {
-    addonRouters[item.meta.attr] = item
-  }
+routers.forEach(item => {
+    item.original_name = item.name
+    if (item.meta.addon) {
+        addonRouters[item.meta.addon] = item
+    }
+    if (item.meta.attr) {
+        addonRouters[item.meta.attr] = item
+    }
 })
 
 const addonsMenus = ref(null)
 
-watch(
-  route,
-  () => {
+watch(route, () => {
     if (props.routes.name != 'addon_list') return
 
-    if (
-      systemAddonKeys.value.includes(route.meta.addon) &&
-      addonRouters[route.meta.addon]
-    ) {
-      addonsMenus.value = addonRouters[route.meta.addon]
+    if (systemAddonKeys.value.includes(route.meta.addon) && addonRouters[route.meta.addon]) {
+        addonsMenus.value = addonRouters[route.meta.addon]
     } else if (route.meta.attr && addonRouters[route.meta.attr]) {
-      addonsMenus.value = addonRouters[route.meta.attr]
+        addonsMenus.value = addonRouters[route.meta.attr]
     } else {
-      addonsMenus.value = null
+        addonsMenus.value = null
     }
-  },
-  { immediate: true }
-)
+}, { immediate: true })
 </script>
 
 <style lang="scss">
-.el-sub-menu {
-  .el-icon {
-    width: auto;
-  }
+.el-sub-menu{
+    .el-icon{
+        width: auto;
+    }
 }
 </style>
diff --git a/admin/src/layout/default/components/aside/side.vue b/admin/src/layout/default/components/aside/side.vue
index beca5058..34ef7f5d 100644
--- a/admin/src/layout/default/components/aside/side.vue
+++ b/admin/src/layout/default/components/aside/side.vue
@@ -1,48 +1,25 @@
 <template>
-  <el-container class="w-[200px] h-screen layout-aside flex flex-col">
-    <el-header class="logo-wrap flex items-center justify-center h-[64px]">
-      <div
-        class="logo flex items-center justify-center m-auto w-full h-[64px]"
-        v-if="!systemStore.menuIsCollapse"
-      >
-        <template v-if="webSite">
-          <img
-            class="max-h-[40px] max-w-[70%]"
-            v-if="webSite.logo"
-            :src="img(webSite.logo)"
-            alt=""
-          />
-          <img
-            class="max-h-[40px] max-w-[70%]"
-            src="@/app/assets/images/login_logo.png"
-            alt=""
-            v-else
-          />
-        </template>
-      </div>
-      <div class="logo flex items-center justify-center h-[64px]" v-else>
-        <i class="text-3xl iconfont iconyunkongjian"></i>
-      </div>
-    </el-header>
-    <el-main class="menu-wrap">
-      <el-scrollbar>
-        <el-menu
-          :default-active="route.name"
-          :router="true"
-          class="aside-menu h-full"
-          :unique-opened="true"
-          :collapse="systemStore.menuIsCollapse"
-        >
-          <menu-item
-            v-for="(route, index) in menuData"
-            :routes="route"
-            :key="index"
-          />
-        </el-menu>
-        <div class="h-[48px]"></div>
-      </el-scrollbar>
-    </el-main>
-  </el-container>
+    <el-container class="w-[200px] h-screen layout-aside flex flex-col">
+        <el-header class="logo-wrap flex items-center justify-center h-[64px]">
+            <div class="logo flex items-center justify-center m-auto w-full h-[64px]" v-if="!systemStore.menuIsCollapse">
+                <template v-if="webSite">
+                    <img class="max-h-[40px] max-w-[70%]" v-if="webSite.logo" :src="img(webSite.logo)" alt="">
+                    <img class="max-h-[40px] max-w-[70%]" src="@/app/assets/images/login_logo.png" alt="" v-else>
+                </template>
+            </div>
+            <div class="logo flex items-center justify-center h-[64px]" v-else>
+                <i class="text-3xl iconfont iconyunkongjian"></i>
+            </div>
+        </el-header>
+        <el-main class="menu-wrap">
+            <el-scrollbar>
+                <el-menu :default-active="route.name" :router="true" class="aside-menu h-full" :unique-opened="true" :collapse="systemStore.menuIsCollapse" >
+                    <menu-item v-for="(route, index) in menuData" :routes="route" :key="index" />
+                </el-menu>
+                <div class="h-[48px]"></div>
+            </el-scrollbar>
+        </el-main>
+    </el-container>
 </template>
 
 <script lang="ts" setup>
@@ -53,7 +30,7 @@ import useUserStore from '@/stores/modules/user'
 import menuItem from './menu-item.vue'
 import { img } from '@/utils/common'
 import { findFirstValidRoute } from '@/router/routers'
-import { getWebConfig } from '@/app/api/sys'
+import { getWebConfig } from "@/app/api/sys"
 
 const systemStore = useSystemStore()
 const userStore = useUserStore()
@@ -65,67 +42,62 @@ const menuData = ref<Record<string, any>[]>([])
 const addonRouters: Record<string, any> = {}
 
 getWebConfig().then(({ data }) => {
-  webSite.value = data
+    webSite.value = data
 })
 
-routers.forEach((item) => {
-  item.original_name = item.name
-  if (item.meta.addon == '') {
-    if (item.meta.attr == '') {
-      if (item.children && item.children.length) {
-        item.name = findFirstValidRoute(item.children)
-      }
-      menuData.value.push(item)
-    }
-  } else if (
-    item.meta.addon != '' &&
-    systemStore?.apps.length == 1 &&
-    systemStore?.apps[0].key == item.meta.addon
-  ) {
-    if (item.children) {
-      item.children.forEach((citem: Record<string, any>) => {
-        citem.original_name = citem.name
-        if (citem.children && citem.children.length) {
-          citem.name = findFirstValidRoute(citem.children)
+routers.forEach(item => {
+    item.original_name = item.name
+    if (item.meta.addon == '') {
+        if (item.meta.attr == '') {
+            if (item.children && item.children.length) {
+                item.name = findFirstValidRoute(item.children)
+            }
+            menuData.value.push(item)
+        }
+    } else if (item.meta.addon != '' && systemStore?.apps.length == 1 && systemStore?.apps[0].key == item.meta.addon) {
+        if (item.children) {
+            item.children.forEach((citem: Record<string, any>) => {
+                citem.original_name = citem.name
+                if (citem.children && citem.children.length) {
+                    citem.name = findFirstValidRoute(citem.children)
+                }
+            })
+            menuData.value.unshift(...item.children)
+        } else {
+            menuData.value.unshift(item)
         }
-      })
-      menuData.value.unshift(...item.children)
     } else {
-      menuData.value.unshift(item)
+        addonRouters[item.meta.addon] = item
     }
-  } else {
-    addonRouters[item.meta.addon] = item
-  }
 })
 
 // 多应用时将应用插入菜单
 if (systemStore?.apps.length > 1) {
-  const routers: Record<string, any>[] = []
-  systemStore?.apps.forEach((item: Record<string, any>) => {
-    if (addonRouters[item.key]) {
-      addonRouters[item.key].name = addonIndexRoute[item.key]
-      routers.push(addonRouters[item.key])
-    }
-  })
-  menuData.value.unshift(...routers)
+    const routers:Record<string, any>[] = []
+    systemStore?.apps.forEach((item: Record<string, any>) => {
+        if (addonRouters[item.key]) {
+            addonRouters[item.key].name = addonIndexRoute[item.key]
+            routers.push(addonRouters[item.key])
+        }
+    })
+    menuData.value.unshift(...routers)
 }
 </script>
 
 <style lang="scss">
 .menu-wrap {
-  padding: 0 !important;
+    padding: 0!important;
 
-  .el-menu {
-    border-right: 0 !important;
+    .el-menu {
+        border-right: 0!important;
 
-    .el-menu-item,
-    .el-sub-menu__title {
-      --el-menu-item-height: 40px;
-    }
+        .el-menu-item, .el-sub-menu__title {
+            --el-menu-item-height: 40px;
+        }
 
-    .el-sub-menu .el-menu-item {
-      --el-menu-sub-item-height: 40px;
+        .el-sub-menu .el-menu-item {
+            --el-menu-sub-item-height: 40px;
+        }
     }
-  }
 }
 </style>
diff --git a/admin/src/layout/default/components/header/index.vue b/admin/src/layout/default/components/header/index.vue
index 42a2761a..a9dde821 100644
--- a/admin/src/layout/default/components/header/index.vue
+++ b/admin/src/layout/default/components/header/index.vue
@@ -1,88 +1,60 @@
 <template>
-  <el-container
-    :class="[
-      'h-full px-[10px]',
-      { 'layout-header border-b border-color': !dark },
-    ]"
-  >
-    <el-row class="w-100 h-full w-full">
-      <el-col :span="12">
-        <div class="left-panel h-full flex items-center">
-          <!-- 左侧菜单折叠 -->
-          <div
-            class="hidden-sm-and-up navbar-item flex items-center h-full cursor-pointer"
-            @click="toggleMenuCollapse"
-          >
-            <icon name="element Expand" v-if="systemStore.menuIsCollapse" />
-            <icon name="element Fold" v-else />
-          </div>
-          <!-- 刷新当前页 -->
-          <div
-            class="navbar-item flex items-center h-full cursor-pointer"
-            @click="refreshRouter"
-          >
-            <icon name="element Refresh" />
-          </div>
-          <!-- 面包屑导航 -->
-          <div class="flex items-center h-full pl-[10px]">
-            <el-breadcrumb separator="/">
-              <el-breadcrumb-item
-                v-for="(route, index) in breadcrumb"
-                :key="index"
-                >{{ route.meta.title }}</el-breadcrumb-item
-              >
-            </el-breadcrumb>
-          </div>
-        </div>
-      </el-col>
-      <el-col :span="12">
-        <div class="right-panel h-full flex items-center justify-end">
-          <!-- 预览 只有站点时展示-->
-          <i
-            class="iconfont iconicon_huojian1 cursor-pointer px-[8px]"
-            :title="t('visitWap')"
-            @click="toPreview"
-          ></i>
-          <!-- 切换语言 -->
-          <div class="navbar-item flex items-center h-full cursor-pointer">
-            <switch-lang />
-          </div>
-          <!-- 切换全屏 -->
-          <!-- <div class="navbar-item flex items-center h-full cursor-pointer" @click="toggleFullscreen">
+    <el-container :class="['h-full px-[10px]',{'layout-header border-b border-color': !dark}]" >
+        <el-row class="w-100 h-full w-full">
+            <el-col :span="12">
+                <div class="left-panel h-full flex items-center">
+                    <!-- 左侧菜单折叠 -->
+                    <div class="hidden-sm-and-up navbar-item flex items-center h-full cursor-pointer" @click="toggleMenuCollapse">
+                        <icon name="element Expand" v-if="systemStore.menuIsCollapse" />
+                        <icon name="element Fold" v-else />
+                    </div>
+                    <!-- 刷新当前页 -->
+                    <div class="navbar-item flex items-center h-full cursor-pointer" @click="refreshRouter">
+                        <icon name="element Refresh" />
+                    </div>
+                    <!-- 面包屑导航 -->
+                    <div class="flex items-center h-full pl-[10px]">
+                        <el-breadcrumb separator="/">
+                            <el-breadcrumb-item v-for="(route, index) in breadcrumb" :key="index">{{route.meta.title }}</el-breadcrumb-item>
+                        </el-breadcrumb>
+                    </div>
+                </div>
+            </el-col>
+            <el-col :span="12">
+                <div class="right-panel h-full flex items-center justify-end">
+                    <!-- 预览 只有站点时展示-->
+                    <i class="iconfont iconicon_huojian1 cursor-pointer px-[8px]" :title="t('visitWap')" @click="toPreview"></i>
+                    <!-- 切换语言 -->
+                    <div class="navbar-item flex items-center h-full cursor-pointer">
+                        <switch-lang />
+                    </div>
+                    <!-- 切换全屏 -->
+                    <!-- <div class="navbar-item flex items-center h-full cursor-pointer" @click="toggleFullscreen">
                         <icon name="iconfont icontuichuquanping" v-if="isFullscreen" />
                         <icon name="iconfont iconquanping" v-else />
                     </div> -->
-          <!-- 布局设置 -->
-          <div class="navbar-item flex items-center h-full cursor-pointer">
-            <layout-setting />
-          </div>
-          <!-- 用户信息 -->
-          <div class="navbar-item flex items-center h-full cursor-pointer">
-            <user-info />
-          </div>
-        </div>
-      </el-col>
-    </el-row>
-    <input type="hidden" v-model="comparisonToken" />
+                    <!-- 布局设置 -->
+                    <div class="navbar-item flex items-center h-full cursor-pointer">
+                        <layout-setting />
+                    </div>
+                    <!-- 用户信息 -->
+                    <div class="navbar-item flex items-center h-full cursor-pointer">
+                        <user-info />
+                    </div>
+                </div>
+            </el-col>
+        </el-row>
+        <input type="hidden" v-model="comparisonToken">
 
-    <el-dialog
-      v-model="detectionLoginDialog"
-      :title="t('layout.detectionLoginTip')"
-      width="30%"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :show-close="false"
-    >
-      <span>{{ t('layout.detectionLoginContent') }}</span>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="detectionLoginFn">{{
-            t('layout.detectionLoginOperation')
-          }}</el-button>
-        </span>
-      </template>
-    </el-dialog>
-  </el-container>
+        <el-dialog v-model="detectionLoginDialog" :title="t('layout.detectionLoginTip')" width="30%" :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false">
+            <span>{{ t('layout.detectionLoginContent') }}</span>
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="detectionLoginFn">{{ t('layout.detectionLoginOperation') }}</el-button>
+                </span>
+            </template>
+        </el-dialog>
+    </el-container>
 </template>
 
 <script lang="ts" setup>
@@ -93,7 +65,7 @@ import switchLang from './switch-lang.vue'
 import { useFullscreen } from '@vueuse/core'
 import useSystemStore from '@/stores/modules/system'
 import useAppStore from '@/stores/modules/app'
-import { useRoute, useRouter } from 'vue-router'
+import { useRoute,useRouter } from 'vue-router'
 import { t } from '@/lang'
 import storage from '@/utils/storage'
 
@@ -102,49 +74,39 @@ const systemStore = useSystemStore()
 const appStore = useAppStore()
 const route = useRoute()
 const router = useRouter()
-const screenWidth = ref(
-  window.innerWidth ||
-    document.documentElement.clientWidth ||
-    document.body.clientWidth
-)
+const screenWidth = ref(window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth)
 
 const dark = computed(() => {
-  return systemStore.dark
+    return systemStore.dark
 })
 
 // 检测登录 start
 const detectionLoginDialog = ref(false)
 const comparisonToken = ref('')
 if (storage.get('comparisonTokenStorage')) {
-  comparisonToken.value = storage.get('comparisonTokenStorage')
-  // storage.remove(['comparisonTokenStorage']);
+    comparisonToken.value = storage.get('comparisonTokenStorage')
+    // storage.remove(['comparisonTokenStorage']);
 }
 // 监听标签页面切换
-document.addEventListener('visibilitychange', (e) => {
-  if (
-    document.visibilityState === 'visible' &&
-    comparisonToken.value != storage.get('token')
-  ) {
-    detectionLoginDialog.value = true
-  }
+document.addEventListener('visibilitychange', e => {
+    if (document.visibilityState === 'visible' && (comparisonToken.value != storage.get('token'))) {
+        detectionLoginDialog.value = true
+    }
 })
 
 const detectionLoginFn = () => {
-  detectionLoginDialog.value = false
-  location.href = `${location.origin}/`
+    detectionLoginDialog.value = false
+    location.href = `${location.origin}/`
 }
 // 检测登录 end
 
 onMounted(() => {
-  // 监听窗体宽度变化
-  window.onresize = () => {
-    return (() => {
-      screenWidth.value =
-        window.innerWidth ||
-        document.documentElement.clientWidth ||
-        document.body.clientWidth
-    })()
-  }
+    // 监听窗体宽度变化
+    window.onresize = () => {
+        return (() => {
+            screenWidth.value = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth
+        })()
+    }
 })
 
 // watch(screenWidth, () => {
@@ -157,61 +119,60 @@ onMounted(() => {
 
 // 菜单栏展开折叠
 const toggleMenuCollapse = () => {
-  systemStore.$patch((state) => {
-    if (screenWidth.value < 768) {
-      state.menuDrawer = true
-      state.menuIsCollapse = false
-    } else {
-      systemStore.toggleMenuCollapse(!systemStore.menuIsCollapse)
-    }
-  })
+    systemStore.$patch((state) => {
+        if (screenWidth.value < 768) {
+            state.menuDrawer = true
+            state.menuIsCollapse = false
+        } else {
+            systemStore.toggleMenuCollapse(!systemStore.menuIsCollapse)
+        }
+    })
 }
 
 // 刷新路由
 const refreshRouter = () => {
-  if (!appStore.routeRefreshTag) return
-  appStore.refreshRouterView()
+    if (!appStore.routeRefreshTag) return
+    appStore.refreshRouterView()
 }
 
 // 面包屑导航
 const breadcrumb = computed(() => {
-  const matched = route.matched.filter((item) => {
-    return item.meta.title
-  })
-  if (matched[0] && matched[0].path == '/') matched.splice(0, 1)
-  return matched
+    const matched = route.matched.filter(item => { return item.meta.title })
+    if (matched[0] && matched[0].path == '/') matched.splice(0, 1)
+    return matched
 })
 
 // 跳转去预览
 const toPreview = () => {
-  const url = router.resolve({
-    path: '/preview/wap',
-    query: {
-      page: '/',
-    },
-  })
-  window.open(url.href)
+    const url = router.resolve({
+        path: '/preview/wap',
+        query: {
+            page:'/'
+        }
+    })
+    window.open(url.href)
 }
 </script>
 
 <style lang="scss" scoped>
-.layout-header {
-  position: relative;
-  z-index: 5;
-  box-shadow: 0px 0px 4px 0px rgba(0, 145, 255, 0.1);
+.layout-header{
+    position: relative;
+    z-index: 5;
+    box-shadow: 0px 0px 4px 0px rgba(0,145,255,0.1);
 }
 .navbar-item {
-  padding: 0 8px;
-  &:hover {
-    background-color: var(--el-bg-color-page);
-  }
+    padding: 0 8px;
+    &:hover {
+        background-color: var(--el-bg-color-page);
+    }
 }
 .index-item {
-  border: 1px solid;
-  border-color: var(--el-color-primary);
-  &:hover {
-    color: #fff;
-    background-color: var(--el-color-primary);
-  }
+	border: 1px solid;
+	border-color: var(--el-color-primary);
+    &:hover {
+		color: #fff;
+        background-color: var(--el-color-primary);
+    }
 }
+
 </style>
diff --git a/admin/src/layout/default/components/header/layout-setting.vue b/admin/src/layout/default/components/header/layout-setting.vue
index 697980ef..aced6c10 100644
--- a/admin/src/layout/default/components/header/layout-setting.vue
+++ b/admin/src/layout/default/components/header/layout-setting.vue
@@ -1,50 +1,37 @@
 <template>
-  <div class="flex">
-    <icon name="element Setting" @click="drawer = true" />
+    <div class="flex">
+        <icon name="element Setting" @click="drawer = true" />
 
-    <el-drawer v-model="drawer" :title="t('layout.layoutSetting')" size="300px">
-      <el-scrollbar>
-        <!-- 黑暗模式 -->
-        <div class="setting-item flex items-center justify-between mb-[10px]">
-          <div class="title text-base text-tx-secondary">
-            {{ t('layout.darkMode') }}
-          </div>
-          <div>
-            <el-switch
-              v-model="dark"
-              :active-value="true"
-              :inactive-value="false"
-            />
-          </div>
-        </div>
-        <!-- 主题颜色 -->
-        <div class="setting-item flex items-center justify-between mb-[10px]">
-          <div class="title text-base text-tx-secondary">
-            {{ t('layout.themeColor') }}
-          </div>
-          <div>
-            <el-color-picker v-model="theme" />
-          </div>
-        </div>
-        <!-- 布局风格 -->
-        <div class="setting-item mb-[10px]">
-          <div class="title text-base text-tx-secondary">
-            {{ t('layout.layoutStyle') }}
-          </div>
-          <div class="flex mt-[10px] layout-style flex-wrap">
-            <div
-              class="relative w-[125px] h-[100px] border mr-[10px] mb-[10px] hover:border-primary"
-              :class="{ 'border-primary': currLayout == item.key }"
-              v-for="(item, index) in layouts"
-              @click="handleSetLayout(item.key)"
-            >
-              <img :src="item.image" alt="" class="w-full h-full" />
-            </div>
-          </div>
-        </div>
-      </el-scrollbar>
-    </el-drawer>
-  </div>
+        <el-drawer v-model="drawer" :title="t('layout.layoutSetting')" size="300px">
+            <el-scrollbar>
+                <!-- 黑暗模式 -->
+                <div class="setting-item flex items-center justify-between mb-[10px]">
+                    <div class="title text-base text-tx-secondary">{{ t('layout.darkMode') }}</div>
+                    <div>
+                        <el-switch v-model="dark" :active-value="true" :inactive-value="false" />
+                    </div>
+                </div>
+                <!-- 主题颜色 -->
+                <div class="setting-item flex items-center justify-between mb-[10px]">
+                    <div class="title text-base text-tx-secondary">{{ t('layout.themeColor') }}</div>
+                    <div>
+                        <el-color-picker v-model="theme" />
+                    </div>
+                </div>
+                <!-- 布局风格 -->
+                <div class="setting-item mb-[10px]">
+                    <div class="title text-base text-tx-secondary">{{ t('layout.layoutStyle') }}</div>
+                    <div class="flex mt-[10px] layout-style flex-wrap">
+                        <div class="relative w-[125px] h-[100px] border mr-[10px] mb-[10px] hover:border-primary"
+                             :class="{ 'border-primary': currLayout == item.key }" v-for="(item, index) in layouts"
+                             @click="handleSetLayout(item.key)">
+                            <img :src="item.image" alt="" class="w-full h-full">
+                        </div>
+                    </div>
+                </div>
+            </el-scrollbar>
+        </el-drawer>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -56,14 +43,8 @@ import { t } from '@/lang'
 import Storage from '@/utils/storage'
 
 const layouts = ref([
-  {
-    key: 'default',
-    image: new URL('@/app/assets/images/theme_white.png', import.meta.url),
-  },
-  {
-    key: 'major',
-    image: new URL('@/app/assets/images/theme_black.png', import.meta.url),
-  },
+    { key: 'default', image: new URL('@/app/assets/images/theme_white.png', import.meta.url) },
+    { key: 'major', image: new URL('@/app/assets/images/theme_black.png', import.meta.url) }
 ])
 const currLayout = ref(Storage.get('layout') || 'default')
 
@@ -71,43 +52,44 @@ const drawer = ref(false)
 const systemStore = useSystemStore()
 
 const handleSetLayout = (key: string) => {
-  Storage.set({ key: 'layout', data: key })
-  location.reload()
+    Storage.set({ key: 'layout', data: key })
+    location.reload()
 }
 
 const isDark = useDark()
 const toggleDark = useToggle(isDark)
 
 const dark = computed({
-  get() {
-    return systemStore.dark
-  },
-  set(val) {
-    systemStore.setTheme('dark', val)
-    toggleDark(val)
-    setThemeColor(systemStore.theme, systemStore.dark ? 'dark' : 'light')
-  },
+    get () {
+        return systemStore.dark
+    },
+    set (val) {
+        systemStore.setTheme('dark', val)
+        toggleDark(val)
+        setThemeColor(systemStore.theme, systemStore.dark ? 'dark' : 'light')
+    }
 })
 
 const theme = computed({
-  get() {
-    return systemStore.theme
-  },
-  set(val) {
-    systemStore.setTheme('theme', val)
-    setThemeColor(systemStore.theme, systemStore.dark ? 'dark' : 'light')
-  },
+    get () {
+        return systemStore.theme
+    },
+    set (val) {
+        systemStore.setTheme('theme', val)
+        setThemeColor(systemStore.theme, systemStore.dark ? 'dark' : 'light')
+    }
 })
+
 </script>
 
 <style lang="scss" scoped>
 :deep(.el-drawer__header) {
-  margin-bottom: 0 !important;
+    margin-bottom: 0 !important;
 }
 
 .layout-style {
-  & > div:nth-child(2n + 2) {
-    margin-right: 0;
-  }
+    &>div:nth-child(2n+2) {
+        margin-right: 0;
+    }
 }
 </style>
diff --git a/admin/src/layout/default/components/header/switch-lang.vue b/admin/src/layout/default/components/header/switch-lang.vue
index a0180ba1..811aa68e 100644
--- a/admin/src/layout/default/components/header/switch-lang.vue
+++ b/admin/src/layout/default/components/header/switch-lang.vue
@@ -1,19 +1,13 @@
 <template>
-  <el-dropdown @command="switchLang" :tabindex="1">
-    <icon name="iconfont iconfanyi" />
-    <template #dropdown>
-      <el-dropdown-menu>
-        <el-dropdown-item
-          command="zh-cn"
-          :disabled="systemStore.lang == 'zh-cn'"
-          >简体中文</el-dropdown-item
-        >
-        <el-dropdown-item command="en" :disabled="systemStore.lang == 'en'"
-          >English</el-dropdown-item
-        >
-      </el-dropdown-menu>
-    </template>
-  </el-dropdown>
+    <el-dropdown @command="switchLang" :tabindex="1">
+        <icon name="iconfont iconfanyi" />
+        <template #dropdown>
+            <el-dropdown-menu>
+                <el-dropdown-item command="zh-cn" :disabled="systemStore.lang == 'zh-cn'">简体中文</el-dropdown-item>
+                <el-dropdown-item command="en" :disabled="systemStore.lang == 'en'">English</el-dropdown-item>
+            </el-dropdown-menu>
+        </template>
+    </el-dropdown>
 </template>
 
 <script lang="ts" setup>
@@ -26,12 +20,12 @@ const route = useRoute()
 const systemStore = useSystemStore()
 
 const switchLang = (command: string) => {
-  systemStore.$patch((state) => {
-    state.lang = command
-    storage.set({ key: 'lang', data: command })
-  })
-  language.loadLocaleMessages(route.path, systemStore.lang)
-  location.reload()
+    systemStore.$patch((state) => {
+        state.lang = command
+        storage.set({ key: 'lang', data: command })
+    })
+    language.loadLocaleMessages(route.path, systemStore.lang)
+    location.reload()
 }
 </script>
 
diff --git a/admin/src/layout/default/components/header/user-info.vue b/admin/src/layout/default/components/header/user-info.vue
index 207450fe..8ab73e42 100644
--- a/admin/src/layout/default/components/header/user-info.vue
+++ b/admin/src/layout/default/components/header/user-info.vue
@@ -1,104 +1,61 @@
 <template>
-  <div>
-    <el-dropdown @command="clickEvent" :tabindex="1">
-      <div class="userinfo flex h-full items-center">
-        <el-avatar
-          v-if="userStore.userInfo.head_img"
-          :size="25"
-          :icon="UserFilled"
-          :src="img(userStore.userInfo.head_img)"
-        />
-        <img
-          v-else
-          src="@/app/assets/images/member_head.png"
-          class="w-[25px] rounded-full"
-        />
-        <div class="user-name pl-[8px]">{{ userStore.userInfo.username }}</div>
-        <icon name="element ArrowDown" class="ml-[5px]" />
-      </div>
-      <template #dropdown>
-        <el-dropdown-menu>
-          <el-dropdown-item @click="getUserInfoFn">
-            <!-- <router-link to="/user/center"> -->
-            <div class="flex items-center leading-[1] py-[5px]">
-              <span
-                class="iconfont iconshezhi1 ml-[4px] !text-[14px] mr-[10px]"
-              ></span>
-              <span class="text-[14px]">账号设置</span>
+    <div>
+        <el-dropdown @command="clickEvent" :tabindex="1">
+            <div class="userinfo flex h-full items-center">
+                <el-avatar v-if="userStore.userInfo.head_img" :size="25" :icon="UserFilled" :src="img(userStore.userInfo.head_img)"/>
+                <img v-else src="@/app/assets/images/member_head.png" class="w-[25px] rounded-full" />
+                <div class="user-name pl-[8px]">{{ userStore.userInfo.username }}</div>
+                <icon name="element ArrowDown" class="ml-[5px]" />
             </div>
-            <!-- </router-link> -->
-          </el-dropdown-item>
-          <el-dropdown-item @click="changePasswordDialog = true">
-            <div class="flex items-center leading-[1] py-[5px]">
-              <span
-                class="iconfont iconxiugai ml-[4px] !text-[14px] mr-[10px]"
-              ></span>
-              <span class="text-[14px]">修改密码</span>
+            <template #dropdown>
+                <el-dropdown-menu>
+                    <el-dropdown-item @click="getUserInfoFn">
+                        <!-- <router-link to="/user/center"> -->
+                            <div class="flex items-center leading-[1] py-[5px]">
+                                <span class="iconfont iconshezhi1 ml-[4px] !text-[14px] mr-[10px]"></span>
+                                <span class="text-[14px]">账号设置</span>
+                            </div>
+                        <!-- </router-link> -->
+                    </el-dropdown-item>
+                    <el-dropdown-item @click="changePasswordDialog=true">
+                        <div class="flex items-center leading-[1] py-[5px]">
+                            <span class="iconfont iconxiugai ml-[4px] !text-[14px] mr-[10px]"></span>
+                            <span class="text-[14px]">修改密码</span>
+                        </div>
+                    </el-dropdown-item>
+                    <el-dropdown-item @click="logout">
+                        <div class="flex items-center leading-[1] py-[5px]">
+                            <span class="iconfont icontuichudenglu ml-[4px] !text-[14px] mr-[10px]"></span>
+                            <span class="text-[14px]">退出登录</span>
+                        </div>
+                    </el-dropdown-item>
+                </el-dropdown-menu>
+            </template>
+        </el-dropdown>
+        <el-dialog v-model="changePasswordDialog" width="450px" title="修改密码">
+            <div>
+                <el-form :model="saveInfo" label-width="90px" ref="formRef" :rules="formRules" class="page-form">
+                    <el-form-item :label="t('originalPassword')" prop="original_password">
+                        <el-input v-model="saveInfo.original_password" type="password" :placeholder="t('originalPasswordPlaceholder')" clearable class="input-width" />
+                    </el-form-item>
+                    <el-form-item :label="t('newPassword')" prop="password">
+                        <el-input v-model="saveInfo.password" type="password" :placeholder="t('passwordPlaceholder')" clearable class="input-width" />
+                        <div class="form-tip">{{t('passwordTip')}}</div>
+                    </el-form-item>
+                    <el-form-item :label="t('passwordCopy')" prop="password_copy">
+                        <el-input v-model="saveInfo.password_copy" type="password" :placeholder="t('passwordPlaceholder')" clearable class="input-width" />
+                    </el-form-item>
+                </el-form>
             </div>
-          </el-dropdown-item>
-          <el-dropdown-item @click="logout">
-            <div class="flex items-center leading-[1] py-[5px]">
-              <span
-                class="iconfont icontuichudenglu ml-[4px] !text-[14px] mr-[10px]"
-              ></span>
-              <span class="text-[14px]">退出登录</span>
-            </div>
-          </el-dropdown-item>
-        </el-dropdown-menu>
-      </template>
-    </el-dropdown>
-    <el-dialog v-model="changePasswordDialog" width="450px" title="修改密码">
-      <div>
-        <el-form
-          :model="saveInfo"
-          label-width="90px"
-          ref="formRef"
-          :rules="formRules"
-          class="page-form"
-        >
-          <el-form-item :label="t('originalPassword')" prop="original_password">
-            <el-input
-              v-model="saveInfo.original_password"
-              type="password"
-              :placeholder="t('originalPasswordPlaceholder')"
-              clearable
-              class="input-width"
-            />
-          </el-form-item>
-          <el-form-item :label="t('newPassword')" prop="password">
-            <el-input
-              v-model="saveInfo.password"
-              type="password"
-              :placeholder="t('passwordPlaceholder')"
-              clearable
-              class="input-width"
-            />
-            <div class="form-tip">{{ t('passwordTip') }}</div>
-          </el-form-item>
-          <el-form-item :label="t('passwordCopy')" prop="password_copy">
-            <el-input
-              v-model="saveInfo.password_copy"
-              type="password"
-              :placeholder="t('passwordPlaceholder')"
-              clearable
-              class="input-width"
-            />
-          </el-form-item>
-        </el-form>
-      </div>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="changePasswordDialog = false">{{
-            t('cancel')
-          }}</el-button>
-          <el-button type="primary" @click="submitForm(formRef)">{{
-            t('save')
-          }}</el-button>
-        </span>
-      </template>
-    </el-dialog>
-    <user-info-edit ref="userInfoEditRef" />
-  </div>
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="changePasswordDialog = false">{{t('cancel')}}</el-button>
+                    <el-button type="primary" @click="submitForm(formRef)">{{t('save')}}</el-button>
+                </span>
+            </template>
+        </el-dialog>
+        <user-info-edit ref="userInfoEditRef" />
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -110,94 +67,78 @@ import useUserStore from '@/stores/modules/user'
 import { setUserInfo } from '@/app/api/personal'
 import { t } from '@/lang'
 import userInfoEdit from '@/app/components/user-info-edit/index.vue'
-import { img } from '@/utils/common'
+import { img } from "@/utils/common";
 
 const userStore = useUserStore()
 const router = useRouter()
 const clickEvent = (command: string) => {
-  switch (command) {
-    case 'logout':
-      userStore.logout()
-      break
-  }
+    switch (command) {
+        case 'logout':
+            userStore.logout()
+            break
+    }
 }
 
 const logout = () => {
-  userStore.logout()
+    userStore.logout();
 }
 const toLink = (link) => {
-  router.push(link)
+    router.push(link)
 }
 const userInfoEditRef = ref(null)
-const getUserInfoFn = () => {
-  userInfoEditRef.value?.open()
+const getUserInfoFn = ()=>{
+    userInfoEditRef.value?.open()
 }
 // 修改密码 --- start
 const changePasswordDialog = ref(false)
-const formRef = ref<FormInstance>()
+const formRef = ref<FormInstance>();
 // 提交信息
 const saveInfo = reactive({
-  original_password: '',
-  password: '',
-  password_copy: '',
-})
+    original_password: '',
+    password: '',
+    password_copy: ''
+});
 // 表单验证规则
 const formRules = reactive<FormRules>({
   original_password: [
-    {
-      required: true,
-      message: t('originalPasswordPlaceholder'),
-      trigger: 'blur',
-    },
+    { required: true, message: t("originalPasswordPlaceholder"), trigger: "blur" },
   ],
   password: [
-    { required: true, message: t('passwordPlaceholder'), trigger: 'blur' },
+    { required: true, message: t("passwordPlaceholder"), trigger: "blur" },
   ],
   password_copy: [
-    { required: true, message: t('passwordPlaceholder'), trigger: 'blur' },
-  ],
-})
+    { required: true, message: t("passwordPlaceholder"), trigger: "blur" },
+  ]
+});
 const submitForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.validate((valid) => {
-    if (valid) {
-      let msg = ''
-      if (saveInfo.password && !saveInfo.original_password)
-        msg = t('originalPasswordHint')
-      if (
-        saveInfo.password &&
-        saveInfo.original_password &&
-        !saveInfo.password_copy
-      )
-        msg = t('newPasswordHint')
-      if (
-        saveInfo.password &&
-        saveInfo.original_password &&
-        saveInfo.password_copy &&
-        saveInfo.password != saveInfo.password_copy
-      )
-        msg = t('doubleCipherHint')
-      if (msg) {
-        ElNotification({
-          type: 'error',
-          message: msg,
-        })
-        return
-      }
+    if (!formEl) return
+    formEl.validate((valid) => {
+        if (valid) {
+            let msg = "";
+            if (saveInfo.password && !saveInfo.original_password) msg = t('originalPasswordHint');
+            if (saveInfo.password && saveInfo.original_password && !saveInfo.password_copy) msg = t('newPasswordHint');
+            if (saveInfo.password && saveInfo.original_password && saveInfo.password_copy && saveInfo.password != saveInfo.password_copy) msg = t('doubleCipherHint');
+            if (msg) {
+                ElNotification({
+                    type: 'error',
+                    message: msg,
+                })
+                return;
+            }
 
-      setUserInfo(saveInfo).then((res: any) => {
-        changePasswordDialog.value = false
-      })
-    } else {
-      return false
-    }
-  })
+            setUserInfo(saveInfo).then((res: any) => {
+                changePasswordDialog.value = false;
+            })
+        } else {
+            return false
+        }
+    });
 }
 // 修改密码 --- end
 </script>
 
 <style lang="scss" scoped>
-.el-popper .el-dropdown-menu {
-  width: 150px;
+.el-popper .el-dropdown-menu{
+    width: 150px;
 }
 </style>
diff --git a/admin/src/layout/default/components/tabs.vue b/admin/src/layout/default/components/tabs.vue
index c9f58d8d..561663f9 100644
--- a/admin/src/layout/default/components/tabs.vue
+++ b/admin/src/layout/default/components/tabs.vue
@@ -1,50 +1,22 @@
 <template>
-  <div class="tab-wrap w-full px-[16px]">
-    <el-tabs
-      :closable="tabbarStore.tabLength > 1"
-      :model-value="route.path"
-      @tab-click="tabClick"
-      @tab-remove="removeTab"
-    >
-      <el-tab-pane
-        v-for="(tab, key, index) in tabbarStore.tabs"
-        :name="tab.path"
-        :key="index"
-      >
-        <template #label>
-          <el-dropdown trigger="contextmenu" placement="bottom-start">
-            <span
-              :class="{ 'text-primary': route.path == tab.path }"
-              class="tab-name"
-              >{{ tab.title }}</span
-            >
-            <template #dropdown>
-              <el-dropdown-menu>
-                <el-dropdown-item
-                  icon="Back"
-                  :disabled="index == 0"
-                  @click="closeLeft(tab.path)"
-                  >{{ t('tabs.closeLeft') }}</el-dropdown-item
-                >
-                <el-dropdown-item
-                  icon="Right"
-                  :disabled="index == tabbarStore.tabLength - 1"
-                  @click="closeRight(tab.path)"
-                  >{{ t('tabs.closeRight') }}</el-dropdown-item
-                >
-                <el-dropdown-item
-                  icon="Close"
-                  :disabled="tabbarStore.tabLength == 1"
-                  @click="closeOther(tab.path)"
-                  >{{ t('tabs.closeOther') }}</el-dropdown-item
-                >
-              </el-dropdown-menu>
-            </template>
-          </el-dropdown>
-        </template>
-      </el-tab-pane>
-    </el-tabs>
-  </div>
+    <div class="tab-wrap w-full px-[16px]">
+        <el-tabs :closable="tabbarStore.tabLength > 1" :model-value="route.path" @tab-click="tabClick" @tab-remove="removeTab">
+            <el-tab-pane v-for="(tab, key, index) in tabbarStore.tabs" :name="tab.path" :key="index">
+                <template #label>
+                    <el-dropdown trigger="contextmenu" placement="bottom-start">
+                        <span :class="{ 'text-primary': route.path == tab.path }" class="tab-name">{{ tab.title }}</span>
+                        <template #dropdown>
+                            <el-dropdown-menu>
+                                <el-dropdown-item icon="Back" :disabled="index == 0" @click="closeLeft(tab.path)">{{t('tabs.closeLeft') }}</el-dropdown-item>
+                                <el-dropdown-item icon="Right" :disabled="index == (tabbarStore.tabLength - 1)" @click="closeRight(tab.path)">{{t('tabs.closeRight') }}</el-dropdown-item>
+                                <el-dropdown-item icon="Close" :disabled="tabbarStore.tabLength == 1" @click="closeOther(tab.path)">{{t('tabs.closeOther') }}</el-dropdown-item>
+                            </el-dropdown-menu>
+                        </template>
+                    </el-dropdown>
+                </template>
+            </el-tab-pane>
+        </el-tabs>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -58,11 +30,11 @@ const route = useRoute()
 const router = useRouter()
 
 onMounted(() => {
-  tabbarStore.addTab(route)
+    tabbarStore.addTab(route)
 })
 
 watch(route, (nval: any) => {
-  tabbarStore.addTab(nval)
+    tabbarStore.addTab(nval)
 })
 
 /**
@@ -70,8 +42,8 @@ watch(route, (nval: any) => {
  * @param content
  */
 const tabClick = (content: any) => {
-  const tabRoute = tabbarStore.tabs[content.props.name]
-  router.push({ path: tabRoute.path, query: tabRoute.query })
+    const tabRoute = tabbarStore.tabs[content.props.name]
+    router.push({ path: tabRoute.path, query: tabRoute.query })
 }
 
 /**
@@ -79,11 +51,11 @@ const tabClick = (content: any) => {
  * @param content
  */
 const removeTab = (content: any) => {
-  if (route.path == content) {
-    const tabs = Object.keys(tabbarStore.tabs)
-    router.push({ path: tabs[tabs.indexOf(content) - 1] })
-  }
-  tabbarStore.removeTab(content)
+    if (route.path == content) {
+        const tabs = Object.keys(tabbarStore.tabs)
+        router.push({ path: tabs[tabs.indexOf(content) - 1] })
+    }
+    tabbarStore.removeTab(content)
 }
 
 /**
@@ -91,11 +63,11 @@ const removeTab = (content: any) => {
  * @param path
  */
 const closeLeft = (path: string) => {
-  const tabs = Object.keys(tabbarStore.tabs)
-  for (let i = tabs.indexOf(path) - 1; i >= 0; i--) {
-    delete tabbarStore.tabs[tabs[i]]
-  }
-  router.push({ path })
+    const tabs = Object.keys(tabbarStore.tabs)
+    for (let i = tabs.indexOf(path) - 1; i >= 0; i--) {
+        delete tabbarStore.tabs[tabs[i]]
+    }
+    router.push({ path })
 }
 
 /**
@@ -103,11 +75,11 @@ const closeLeft = (path: string) => {
  * @param path
  */
 const closeRight = (path: string) => {
-  const tabs = Object.keys(tabbarStore.tabs)
-  for (let i = tabs.indexOf(path) + 1; i < tabs.length; i++) {
-    delete tabbarStore.tabs[tabs[i]]
-  }
-  router.push({ path })
+    const tabs = Object.keys(tabbarStore.tabs)
+    for (let i = tabs.indexOf(path) + 1; i < tabs.length; i++) {
+        delete tabbarStore.tabs[tabs[i]]
+    }
+    router.push({ path })
 }
 
 /**
@@ -115,52 +87,50 @@ const closeRight = (path: string) => {
  * @param path
  */
 const closeOther = (path: string) => {
-  const tabs = Object.keys(tabbarStore.tabs)
-  tabs.forEach((key: string) => {
-    key != path && delete tabbarStore.tabs[key]
-  })
-  router.push({ path })
+    const tabs = Object.keys(tabbarStore.tabs)
+    tabs.forEach((key: string) => { key != path && delete tabbarStore.tabs[key] })
+    router.push({ path })
 }
 </script>
 
 <style lang="scss" scoped>
 :deep(.el-tabs) {
-  .el-tabs--border-card {
-    border: none;
-  }
+    .el-tabs--border-card {
+        border: none;
+    }
 
-  .el-tabs__header {
-    margin: 0;
-  }
+    .el-tabs__header {
+        margin: 0;
+    }
 
-  .el-tabs__nav-wrap {
-    margin-bottom: 0;
+    .el-tabs__nav-wrap {
+        margin-bottom: 0;
 
-    &::after {
-      display: none;
+        &::after {
+            display: none;
+        }
     }
-  }
 
-  .el-tabs__content {
-    display: none;
-  }
+    .el-tabs__content {
+        display: none;
+    }
 
-  .el-tabs__item {
-    display: inline-flex !important;
-    padding: 0 20px !important;
-    align-items: center;
+    .el-tabs__item {
+        display: inline-flex !important;
+        padding: 0 20px !important;
+        align-items: center;
 
-    .tab-name:focus {
-      outline: none !important;
+        .tab-name:focus {
+            outline: none !important;
+        }
     }
-  }
 
-  .el-tabs__active-bar {
-    display: none;
-  }
+    .el-tabs__active-bar {
+        display: none;
+    }
 
-  .el-tabs__item.is-active {
-    background-color: var(--el-color-primary-light-9);
-  }
+    .el-tabs__item.is-active {
+        background-color: var(--el-color-primary-light-9);
+    }
 }
 </style>
diff --git a/admin/src/layout/default/index.vue b/admin/src/layout/default/index.vue
index 6d2fa179..13121b35 100644
--- a/admin/src/layout/default/index.vue
+++ b/admin/src/layout/default/index.vue
@@ -1,34 +1,31 @@
 <template>
-  <div class="flex w-full h-screen">
-    <!-- 左侧边栏 -->
-    <layout-aside></layout-aside>
-    <!-- 左侧边栏 end -->
+    <div class="flex w-full h-screen">
+        <!-- 左侧边栏 -->
+        <layout-aside></layout-aside>
+        <!-- 左侧边栏 end -->
 
-    <el-container>
-      <!-- 顶部 -->
-      <el-header>
-        <layout-header></layout-header>
-      </el-header>
-      <!-- 顶部 end -->
+        <el-container>
+            <!-- 顶部 -->
+            <el-header>
+                <layout-header></layout-header>
+            </el-header>
+            <!-- 顶部 end -->
 
-      <!-- 主体 -->
-      <el-main class="h-full p-0 bg-page">
-        <el-scrollbar>
-          <div class="p-[15px]">
-            <router-view
-              v-slot="{ Component, route }"
-              v-if="appStore.routeRefreshTag"
-            >
-              <keep-alive :include="tabbarStore.tabNames">
-                <component :is="Component" :key="route.fullPath" />
-              </keep-alive>
-            </router-view>
-          </div>
-        </el-scrollbar>
-      </el-main>
-      <!-- 主体 end -->
-    </el-container>
-  </div>
+            <!-- 主体 -->
+            <el-main class="h-full p-0 bg-page">
+                <el-scrollbar>
+                    <div class="p-[15px]">
+                        <router-view v-slot="{ Component, route }" v-if="appStore.routeRefreshTag">
+                            <keep-alive :include="tabbarStore.tabNames">
+                                <component :is="Component" :key="route.fullPath" />
+                            </keep-alive>
+                        </router-view>
+                    </div>
+                </el-scrollbar>
+            </el-main>
+            <!-- 主体 end -->
+        </el-container>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -43,7 +40,7 @@ const appStore = useAppStore()
 const tabbarStore = useTabbarStore()
 const systemStore = useSystemStore()
 const dark = computed(() => {
-  return systemStore.dark
+    return systemStore.dark
 })
 </script>
 
diff --git a/admin/src/layout/index.vue b/admin/src/layout/index.vue
index 6dc7df83..d321460f 100644
--- a/admin/src/layout/index.vue
+++ b/admin/src/layout/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <component :is="layout" />
+    <component :is="layout" />
 </template>
 
 <script lang="ts" setup>
@@ -16,24 +16,21 @@ let siteLayout = Storage.get('layout') || 'default'
 
 const layout = ref<any>(null)
 
-Object.keys(modules).forEach((key) => {
-  key.indexOf(siteLayout) !== -1 &&
-    (layout.value = markRaw(defineAsyncComponent(modules[key])))
+Object.keys(modules).forEach(key => {
+    key.indexOf(siteLayout) !== -1 && (layout.value = markRaw(defineAsyncComponent(modules[key])))
 })
 
-!layout.value &&
-  (layout.value = markRaw(defineAsyncComponent(modules['./default/index.vue'])))
+!layout.value && (layout.value = markRaw(defineAsyncComponent(modules['./default/index.vue'])))
 
 /**
  * 监听某些页面需要独立配置布局
  */
 provide('setLayout', (name: any) => {
-  if (siteLayout == name) return
-  siteLayout = name
-  Object.keys(modules).forEach((key) => {
-    key.indexOf(name) !== -1 &&
-      (layout.value = markRaw(defineAsyncComponent(modules[key])))
-  })
+    if (siteLayout == name) return
+    siteLayout = name
+    Object.keys(modules).forEach(key => {
+        key.indexOf(name) !== -1 && (layout.value = markRaw(defineAsyncComponent(modules[key])))
+    })
 })
 </script>
 
diff --git a/admin/src/layout/major/components/aside/index.vue b/admin/src/layout/major/components/aside/index.vue
index 8052b813..c2c9bfe2 100644
--- a/admin/src/layout/major/components/aside/index.vue
+++ b/admin/src/layout/major/components/aside/index.vue
@@ -1,19 +1,13 @@
 <template>
-  <el-aside :class="['h-screen layout-aside w-auto', { bright: !dark }]">
-    <side class="hidden-xs-only" />
-  </el-aside>
-
-  <el-drawer
-    v-model="systemStore.menuDrawer"
-    direction="ltr"
-    :with-header="false"
-    custom-class="aside-drawer"
-    size="210px"
-  >
-    <template #default>
-      <side />
-    </template>
-  </el-drawer>
+    <el-aside :class="['h-screen layout-aside w-auto', { 'bright': !dark }]">
+        <side class="hidden-xs-only" />
+    </el-aside>
+
+    <el-drawer v-model="systemStore.menuDrawer" direction="ltr" :with-header="false" custom-class="aside-drawer" size="210px">
+        <template #default>
+            <side />
+        </template>
+    </el-drawer>
 </template>
 
 <script lang="ts" setup>
@@ -23,39 +17,39 @@ import side from './side.vue'
 import useSystemStore from '@/stores/modules/system'
 const systemStore = useSystemStore()
 const dark = computed(() => {
-  return systemStore.dark
+    return systemStore.dark
 })
 
 const route = useRoute()
 watch(route, () => {
-  systemStore.$patch((state) => {
-    state.menuDrawer = false
-  })
+    systemStore.$patch(state => {
+        state.menuDrawer = false
+    })
 })
 </script>
 
 <style lang="scss">
 .layout-aside {
-  background-color: var(--side-dark-color, var(--el-bg-color));
-  border-right: 1px solid var(--el-border-color-lighter);
+    background-color: var(--side-dark-color, var(--el-bg-color));
+    border-right: 1px solid var(--el-border-color-lighter);
 
-  &.bright {
-    // background-color: #F5F7F9;
+    &.bright {
+        // background-color: #F5F7F9;
 
-    li {
-      // background-color: #F5F7F9;
+        li {
+            // background-color: #F5F7F9;
 
-      &.is-active:not(.is-opened) {
-        position: relative;
-        color: var(--el-color-primary);
-      }
+            &.is-active:not(.is-opened) {
+                position: relative;
+                color: var(--el-color-primary);
+            }
+        }
     }
-  }
 }
 
 .aside-drawer {
-  .el-drawer__body {
-    padding: 0px !important;
-  }
+    .el-drawer__body {
+        padding: 0px !important;
+    }
 }
 </style>
diff --git a/admin/src/layout/major/components/aside/menu-item.vue b/admin/src/layout/major/components/aside/menu-item.vue
index 0bac3241..24c941a6 100644
--- a/admin/src/layout/major/components/aside/menu-item.vue
+++ b/admin/src/layout/major/components/aside/menu-item.vue
@@ -1,65 +1,31 @@
 <template>
-  <template v-if="meta.show">
-    <el-sub-menu v-if="routes.children" :index="String(routes.name)">
-      <template #title>
-        <span :class="['ml-[10px]']">{{ meta.title }}</span>
-      </template>
-      <menu-item
-        v-for="(route, index) in routes.children"
-        :routes="route"
-        :key="index"
-      />
-    </el-sub-menu>
-    <template v-else>
-      <el-menu-item
-        :index="String(routes.name)"
-        @click="router.push({ name: routes.name })"
-        v-if="meta.addon && meta.parent_route && meta.parent_route.addon == ''"
-      >
-        <template #title>
-          <el-tooltip placement="right" effect="light">
-            <template #content>
-              该功能仅限{{ addons[meta.addon].title }}使用
+    <template v-if="meta.show">
+        <el-sub-menu v-if="routes.children" :index="String(routes.name)">
+            <template #title>
+                <span :class="['ml-[10px]']">{{ meta.title }}</span>
             </template>
-            <span
-              :class="[
-                { 'text-[15px]': routes.meta.class == 1 },
-                { 'text-[14px]': routes.meta.class != 1 },
-                {
-                  'ml-[10px]': routes.meta.class == 2,
-                  'ml-[15px]': routes.meta.class == 3,
-                },
-              ]"
-              >{{ meta.title }}</span
-            >
-          </el-tooltip>
+            <menu-item v-for="(route, index) in routes.children" :routes="route" :key="index" />
+        </el-sub-menu>
+        <template v-else>
+            <el-menu-item :index="String(routes.name)" @click="router.push({ name: routes.name })" v-if="meta.addon && meta.parent_route && meta.parent_route.addon == ''">
+                <template #title>
+                    <el-tooltip placement="right" effect="light">
+                        <template #content>
+                            该功能仅限{{ addons[meta.addon].title }}使用
+                        </template>
+                        <span :class="[{'text-[15px]': routes.meta.class == 1}, {'text-[14px]': routes.meta.class != 1}, {'ml-[10px]': routes.meta.class == 2, 'ml-[15px]': routes.meta.class == 3}]">{{ meta.title }}</span>
+                    </el-tooltip>
+                </template>
+            </el-menu-item>
+            <el-menu-item :index="String(routes.name)" @click="router.push({ name: routes.name })" v-else>
+                <template #title>
+                    <span :class="[{'text-[15px]': routes.meta.class == 1}, {'text-[14px]': routes.meta.class != 1}, {'ml-[10px]': routes.meta.class == 2, 'ml-[15px]': routes.meta.class == 3}]">{{ meta.title }}</span>
+                </template>
+            </el-menu-item>
         </template>
-      </el-menu-item>
-      <el-menu-item
-        :index="String(routes.name)"
-        @click="router.push({ name: routes.name })"
-        v-else
-      >
-        <template #title>
-          <span
-            :class="[
-              { 'text-[15px]': routes.meta.class == 1 },
-              { 'text-[14px]': routes.meta.class != 1 },
-              {
-                'ml-[10px]': routes.meta.class == 2,
-                'ml-[15px]': routes.meta.class == 3,
-              },
-            ]"
-            >{{ meta.title }}</span
-          >
-        </template>
-      </el-menu-item>
+        <div v-if="routes.is_border" class="!border-0 !border-t-[1px] border-solid mx-[25px] bg-[#f7f7f7] my-[5px]"></div>
     </template>
-    <div
-      v-if="routes.is_border"
-      class="!border-0 !border-t-[1px] border-solid mx-[25px] bg-[#f7f7f7] my-[5px]"
-    ></div>
-  </template>
+
 </template>
 
 <script lang="ts" setup>
@@ -68,37 +34,34 @@ import { computed } from 'vue'
 import { img } from '@/utils/common'
 import menuItem from './menu-item.vue'
 import useUserStore from '@/stores/modules/user'
-import useSystemStore from '@/stores/modules/system'
+import useSystemStore from "@/stores/modules/system";
 
 const router = useRouter()
 const props = defineProps({
-  routes: {
-    type: Object,
-    required: true,
-  },
+    routes: {
+        type: Object,
+        required: true
+    }
 })
 const systemStore = useSystemStore()
 const meta = computed(() => props.routes.meta)
 
 const addons = computed(() => {
-  const addons: Record<string, any> = {}
-  systemStore?.apps.forEach((item: any) => {
-    addons[item.key] = item
-  })
-  systemStore?.addons.forEach((item: any) => {
-    addons[item.key] = item
-  })
-  return addons
+    const addons:Record<string, any> = {}
+    systemStore?.apps.forEach((item: any) => { addons[item.key] = item })
+    systemStore?.addons.forEach((item: any) => { addons[item.key] = item })
+    return addons
 })
+
 </script>
 
 <style lang="scss">
-.el-sub-menu {
-  .el-icon {
-    width: auto;
-  }
-  li {
-    font-size: 15px;
-  }
+.el-sub-menu{
+    .el-icon{
+        width: auto;
+    }
+    li{
+        font-size: 15px;
+    }
 }
 </style>
diff --git a/admin/src/layout/major/components/aside/side.vue b/admin/src/layout/major/components/aside/side.vue
index e9991d33..4f864e29 100644
--- a/admin/src/layout/major/components/aside/side.vue
+++ b/admin/src/layout/major/components/aside/side.vue
@@ -1,90 +1,46 @@
 <template>
-  <el-container class="w-100 h-screen">
-    <el-main class="p-0 flex">
-      <div class="w-[124px] px-[8px] bg-[#282c34] h-screen one-menu">
-        <el-header class="logo-wrap">
-          <div
-            class="logo flex items-center m-auto h-[64px]"
-            v-if="!systemStore.menuIsCollapse"
-          >
-            <!--                        <img class="max-h-[40px] max-w-[40px] rounded-full" v-if="siteInfo.logo" :src="img(siteInfo.logo)" alt="">-->
-            <!--                        <img class="max-h-[40px] max-w-[40px] rounded-full" v-else src="@/app/assets/images/icon-addon.png" alt="">-->
-            <img
-              class="max-h-[40px] max-w-[40px] rounded-full"
-              src="@/app/assets/images/icon-addon.png"
-              alt=""
-            />
-          </div>
-          <div class="logo flex items-center justify-center h-[64px]" v-else>
-            <i class="text-3xl iconfont iconyunkongjian"></i>
-          </div>
-        </el-header>
-        <el-scrollbar class="h-[calc( 100vh - 64px )]">
-          <el-menu
-            :default-active="oneMenuActive"
-            :router="true"
-            class="aside-menu"
-            unique-opened="true"
-            :collapse="systemStore.menuIsCollapse"
-          >
-            <template v-for="(item, index) in oneMenuData" :key="index">
-              <el-menu-item
-                :index="item.original_name"
-                @click="router.push({ name: item.name })"
-                v-if="item.meta.show"
-              >
-                <div
-                  v-if="item.meta.icon"
-                  class="w-[16px] h-[16px] relative flex justify-center"
-                >
-                  <el-image
-                    class="w-[16px] h-[16px] rounded-[50%] overflow-hidden"
-                    :src="item.meta.icon"
-                    fit="fill"
-                    v-if="isUrl(item.meta.icon)"
-                  />
-                  <icon
-                    :name="item.meta.icon"
-                    class="absolute top-[50%] -translate-y-[50%]"
-                    v-else
-                  />
-                </div>
-                <div v-else class="w-[16px] h-[16px]"></div>
-                <template #title>
-                  <div class="relative flex-1 w-0">
-                    <span class="ml-[10px] w-full truncate">{{
-                      item.meta.short_title || item.meta.title
-                    }}</span>
-                  </div>
-                </template>
-              </el-menu-item>
-            </template>
-          </el-menu>
-          <div class="h-[48px]"></div>
-        </el-scrollbar>
-      </div>
-      <el-scrollbar v-if="twoMenuData.length" class="two-menu w-[140px]">
-        <div
-          class="w-[140px] h-[64px] flex items-center justify-center text-[16px] border-0 border-b-[1px] border-solid border-[#eee]"
-        >
-          {{ route.matched[1].meta.title }}
-        </div>
-        <el-menu
-          :default-active="route.name"
-          :router="true"
-          class="aside-menu"
-          :collapse="systemStore.menuIsCollapse"
-        >
-          <menu-item
-            v-for="(route, index) in twoMenuData"
-            :routes="route"
-            :key="index"
-          />
-        </el-menu>
-        <div class="h-[48px]"></div>
-      </el-scrollbar>
-    </el-main>
-  </el-container>
+    <el-container class="w-100 h-screen">
+        <el-main class="p-0 flex">
+            <div class="w-[124px] px-[8px] bg-[#282c34] h-screen one-menu">
+                <el-header class="logo-wrap">
+                    <div class="logo flex items-center m-auto h-[64px]" v-if="!systemStore.menuIsCollapse">
+<!--                        <img class="max-h-[40px] max-w-[40px] rounded-full" v-if="siteInfo.logo" :src="img(siteInfo.logo)" alt="">-->
+<!--                        <img class="max-h-[40px] max-w-[40px] rounded-full" v-else src="@/app/assets/images/icon-addon.png" alt="">-->
+                        <img class="max-h-[40px] max-w-[40px] rounded-full" src="@/app/assets/images/icon-addon.png" alt="">
+                    </div>
+                    <div class="logo flex items-center justify-center h-[64px]" v-else>
+                        <i class="text-3xl iconfont iconyunkongjian"></i>
+                    </div>
+                </el-header>
+                <el-scrollbar class="h-[calc( 100vh - 64px )]">
+                    <el-menu :default-active="oneMenuActive" :router="true" class="aside-menu" unique-opened="true" :collapse="systemStore.menuIsCollapse">
+                        <template v-for="(item, index) in oneMenuData" :key="index">
+                            <el-menu-item :index="item.original_name" @click="router.push({ name: item.name })" v-if="item.meta.show">
+                                <div v-if="item.meta.icon" class="w-[16px] h-[16px] relative flex justify-center">
+                                    <el-image class="w-[16px] h-[16px] rounded-[50%] overflow-hidden" :src="item.meta.icon" fit="fill" v-if="isUrl(item.meta.icon)"/>
+                                    <icon :name="item.meta.icon" class="absolute top-[50%] -translate-y-[50%]" v-else />
+                                </div>
+                                <div v-else class="w-[16px] h-[16px]"></div>
+                                <template #title>
+                                    <div class="relative flex-1 w-0">
+                                        <span class="ml-[10px] w-full truncate">{{ item.meta.short_title || item.meta.title }}</span>
+                                    </div>
+                                </template>
+                            </el-menu-item>
+                        </template>
+                    </el-menu>
+                    <div class="h-[48px]"></div>
+                </el-scrollbar>
+            </div>
+            <el-scrollbar v-if="twoMenuData.length" class="two-menu w-[140px]">
+                <div class="w-[140px] h-[64px] flex items-center justify-center text-[16px] border-0 border-b-[1px] border-solid border-[#eee]">{{ route.matched[1].meta.title }}</div>
+                <el-menu :default-active="route.name" :router="true" class="aside-menu" :collapse="systemStore.menuIsCollapse">
+                    <menu-item v-for="(route, index) in twoMenuData" :routes="route" :key="index" />
+                </el-menu>
+                <div class="h-[48px]"></div>
+            </el-scrollbar>
+        </el-main>
+    </el-container>
 </template>
 
 <script lang="ts" setup>
@@ -107,183 +63,175 @@ const oneMenuData = ref<Record<string, any>[]>([])
 const twoMenuData = ref<Record<string, any>[]>([])
 const addonRouters: Record<string, any> = {}
 
-routers.forEach((item) => {
-  item.original_name = item.name
-  if (item.meta.addon == '') {
-    if (item.children && item.children.length) {
-      item.name = findFirstValidRoute(item.children)
-    }
-    oneMenuData.value.push(item)
-  } else if (
-    item.meta.addon != '' &&
-    systemStore?.apps.length == 1 &&
-    systemStore?.apps[0].key == item.meta.addon
-  ) {
-    if (item.children) {
-      item.children.forEach((citem: Record<string, any>) => {
-        citem.original_name = citem.name
-        if (citem.children && citem.children.length) {
-          citem.name = findFirstValidRoute(citem.children)
+routers.forEach(item => {
+    item.original_name = item.name
+    if (item.meta.addon == '') {
+        if (item.children && item.children.length) {
+            item.name = findFirstValidRoute(item.children)
+        }
+        oneMenuData.value.push(item)
+    } else if (item.meta.addon != '' && systemStore?.apps.length == 1 && systemStore?.apps[0].key == item.meta.addon) {
+        if (item.children) {
+            item.children.forEach((citem: Record<string, any>) => {
+                citem.original_name = citem.name
+                if (citem.children && citem.children.length) {
+                    citem.name = findFirstValidRoute(citem.children)
+                }
+            })
+            oneMenuData.value.unshift(...item.children)
+        } else {
+            oneMenuData.value.unshift(item)
         }
-      })
-      oneMenuData.value.unshift(...item.children)
     } else {
-      oneMenuData.value.unshift(item)
+        addonRouters[item.meta.addon] = item
     }
-  } else {
-    addonRouters[item.meta.addon] = item
-  }
 })
 
 // 多应用时将应用插入菜单
 if (systemStore?.apps.length > 1) {
-  const routers: Record<string, any>[] = []
-  systemStore?.apps.forEach((item: Record<string, any>) => {
-    routers.push({
-      path: addonRouters[item.key] ? addonRouters[item.key].path : '',
-      meta: {
-        icon: addonRouters[item.key]?.meta.icon || 'element-Setting',
-        addon: item.key,
-        title: item.title,
-        app: item.app,
-        show: true,
-      },
-      original_name: item.key,
-      name: addonIndexRoute[item.key],
+    const routers:Record<string, any>[] = []
+    systemStore?.apps.forEach((item: Record<string, any>) => {
+        routers.push({
+            path: addonRouters[item.key] ? addonRouters[item.key].path : '',
+            meta: {
+                icon: addonRouters[item.key]?.meta.icon || 'element-Setting',
+                addon: item.key,
+                title: item.title,
+                app: item.app,
+                show: true
+            },
+            original_name: item.key,
+            name: addonIndexRoute[item.key]
+        })
     })
-  })
-  oneMenuData.value.unshift(...routers)
+    oneMenuData.value.unshift(...routers)
 }
 
 const oneMenuActive = ref(route.matched[1].name)
 
-watch(
-  route,
-  () => {
+watch(route, () => {
     // 多应用
     if (systemStore?.apps.length > 1) {
-      twoMenuData.value = route.matched[1].children
-      oneMenuActive.value = route.matched[1].name
-    } else {
-      // 单应用
-      const oneMenu = route.matched[1]
-      if (oneMenu.meta.addon == '') {
+        twoMenuData.value = route.matched[1].children
         oneMenuActive.value = route.matched[1].name
-        twoMenuData.value = route.matched[1].children ?? []
-      } else {
-        if (oneMenu.meta.addon == systemStore?.apps[0].key) {
-          oneMenuActive.value = route.matched[2].name
-          twoMenuData.value = route.matched[2].children ?? []
+    } else {
+        // 单应用
+        const oneMenu = route.matched[1]
+        if (oneMenu.meta.addon == '') {
+            oneMenuActive.value = route.matched[1].name
+            twoMenuData.value = route.matched[1].children ?? []
         } else {
-          oneMenuActive.value = route.matched[1].name
-          twoMenuData.value = route.matched[1].children ?? []
+            if (oneMenu.meta.addon == systemStore?.apps[0].key) {
+                oneMenuActive.value = route.matched[2].name
+                twoMenuData.value = route.matched[2].children ?? []
+            } else {
+                oneMenuActive.value = route.matched[1].name
+                twoMenuData.value = route.matched[1].children ?? []
+            }
         }
-      }
     }
-  },
-  { immediate: true }
-)
+}, { immediate: true })
 </script>
 
 <style lang="scss">
-.one-menu {
-  .aside-menu:not(.el-menu--collapse) {
-    background-color: transparent;
-    .el-menu-item {
-      margin-bottom: 4px;
-      height: 40px;
-      padding-left: 12px !important;
-      color: rgba(255, 255, 255, 0.7);
-      font-size: 14px;
-      border-radius: 2px;
-      &:hover {
-        background-color: var(--el-color-primary);
-        color: #fff;
-      }
-      &.is-active {
-        background-color: var(--el-color-primary) !important;
-        color: #fff;
-      }
-      span {
-        font-size: 14px;
-        margin-left: 8px;
-      }
+.one-menu{
+    .aside-menu:not(.el-menu--collapse) {
+        background-color: transparent;
+        .el-menu-item{
+            margin-bottom: 4px;
+            height: 40px;
+            padding-left: 12px !important;
+            color: rgba(255,255,255,.7);
+            font-size: 14px;
+            border-radius: 2px;
+            &:hover{
+                background-color: var(--el-color-primary);
+                color: #fff;
+            }
+            &.is-active{
+                background-color: var(--el-color-primary) !important;
+                color: #fff;
+            }
+            span{
+                font-size: 14px;
+                margin-left: 8px;
+            }
+        }
     }
-  }
-  .el-menu {
-    border: 0;
-  }
-  .el-scrollbar {
-    height: calc(100vh - 65px);
-  }
-}
-.two-menu {
-  .aside-menu:not(.el-menu--collapse) {
-    width: 140px;
-    border: 0;
-    padding-top: 16px;
-    .el-menu-item {
-      height: 36px;
-      margin: 0 8px 4px;
-      padding: 0 8px !important;
-      border-radius: 2px;
-      span {
-        margin-left: 8px;
-        font-size: 14px;
-      }
-      &.is-active {
-        background-color: var(--el-color-primary-light-9) !important;
-      }
-      &:hover {
-        background-color: #f7f7f7;
-        color: var(--el-color-primary);
-      }
+    .el-menu{
+        border: 0;
     }
-    .el-sub-menu {
-      margin-bottom: 8px;
-      .el-sub-menu__title {
-        margin: 0 8px 4px;
-        height: 36px;
-        padding-left: 8px;
-        border-radius: 2px;
-        span {
-          height: 36px;
-          display: flex;
-          align-items: center;
-          font-size: 14px;
-        }
-        &:hover {
-          background-color: #f7f7f7;
-          color: var(--el-color-primary);
+    .el-scrollbar{
+        height: calc(100vh - 65px);
+    }
+}
+.two-menu{
+    .aside-menu:not(.el-menu--collapse) {
+        width: 140px;
+        border: 0;
+        padding-top: 16px;
+        .el-menu-item{
+            height: 36px;
+            margin: 0 8px 4px;
+            padding: 0 8px !important;
+            border-radius: 2px;
+            span{
+                margin-left: 8px;
+                font-size: 14px;
+            }
+            &.is-active{
+                background-color: var(--el-color-primary-light-9) !important;
+            }
+            &:hover{
+                background-color: #f7f7f7;
+                color: var(--el-color-primary);
+            }
         }
-        .el-icon.el-sub-menu__icon-arrow {
-          right: 5px;
+        .el-sub-menu{
+            margin-bottom: 8px;
+            .el-sub-menu__title{
+                margin: 0 8px 4px;
+                height: 36px;
+                padding-left: 8px;
+                border-radius: 2px;
+                span{
+                    height: 36px;
+                    display: flex;
+                    align-items: center;
+                    font-size: 14px;
+                }
+                &:hover{
+                    background-color: #f7f7f7;
+                    color: var(--el-color-primary);
+                }
+                .el-icon.el-sub-menu__icon-arrow{
+                    right: 5px;
+                }
+            }
+            .el-menu-item{
+                padding-left: 20px !important;
+            }
         }
-      }
-      .el-menu-item {
-        padding-left: 20px !important;
-      }
     }
-  }
 }
 
 .logo-wrap {
-  padding: 0;
-  display: flex;
-  white-space: nowrap;
-  align-items: center;
+    padding: 0;
+    display: flex;
+    white-space: nowrap;
+    align-items: center;
 
-  .logo {
-    height: 100%;
-    box-sizing: border-box;
-  }
+    .logo {
+        height: 100%;
+        box-sizing: border-box;
+    }
 
-  .logo-title {
-    flex: 1;
-    width: 0;
-    text-overflow: ellipsis;
-    overflow: hidden;
-    font-size: var(--el-font-size-base);
-  }
+    .logo-title {
+        flex: 1;
+        width: 0;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        font-size: var(--el-font-size-base);
+    }
 }
 </style>
diff --git a/admin/src/layout/major/components/header/index.vue b/admin/src/layout/major/components/header/index.vue
index 48d1918d..c03e086c 100644
--- a/admin/src/layout/major/components/header/index.vue
+++ b/admin/src/layout/major/components/header/index.vue
@@ -1,87 +1,62 @@
 <template>
-  <el-container
-    :class="[
-      'h-full px-[10px]',
-      { 'layout-header border-b border-color': !dark },
-    ]"
-  >
-    <el-row class="w-100 h-full w-full">
-      <el-col :span="12">
-        <div class="left-panel h-full flex items-center">
-          <!-- 左侧菜单折叠 -->
-          <!-- <div class="navbar-item flex items-center h-full cursor-pointer" @click="toggleMenuCollapse">
+    <el-container :class="['h-full px-[10px]',{'layout-header border-b border-color': !dark}]" >
+        <el-row class="w-100 h-full w-full">
+            <el-col :span="12">
+                <div class="left-panel h-full flex items-center">
+                    <!-- 左侧菜单折叠 -->
+                    <!-- <div class="navbar-item flex items-center h-full cursor-pointer" @click="toggleMenuCollapse">
                         <icon name="element-Expand" v-if="systemStore.menuIsCollapse" />
                         <icon name="element-Fold" v-else />
                     </div> -->
-          <!-- 刷新当前页 -->
-          <div
-            class="navbar-item flex items-center h-full cursor-pointer"
-            @click="refreshRouter"
-          >
-            <icon name="element Refresh" />
-          </div>
-          <!-- 面包屑导航 -->
-          <div class="flex items-center h-full pl-[10px] hidden-xs-only">
-            <el-breadcrumb separator="/">
-              <el-breadcrumb-item
-                v-for="(route, index) in breadcrumb"
-                :key="index"
-                >{{ route.meta.title }}</el-breadcrumb-item
-              >
-            </el-breadcrumb>
-          </div>
-        </div>
-      </el-col>
-      <el-col :span="12">
-        <div class="right-panel h-full flex items-center justify-end">
-          <!-- 预览-->
-          <i
-            class="iconfont iconicon_huojian1 cursor-pointer px-[8px]"
-            :title="t('visitWap')"
-            @click="toPreview"
-          ></i>
-          <!-- 预览 只有站点时展示-->
-          <!--                    <i class="iconfont iconlingdang-xianxing cursor-pointer px-[8px]" :title="t('newInfo')" v-if="appType == 'admin'"></i>-->
-          <!-- 切换语言 -->
-          <div class="navbar-item flex items-center h-full cursor-pointer">
-            <switch-lang />
-          </div>
-          <!-- 切换全屏 -->
-          <!-- <div class="navbar-item flex items-center h-full cursor-pointer" @click="toggleFullscreen">
+                    <!-- 刷新当前页 -->
+                    <div class="navbar-item flex items-center h-full cursor-pointer" @click="refreshRouter">
+                        <icon name="element Refresh" />
+                    </div>
+                    <!-- 面包屑导航 -->
+                    <div class="flex items-center h-full pl-[10px] hidden-xs-only">
+                        <el-breadcrumb separator="/">
+                            <el-breadcrumb-item v-for="(route, index) in breadcrumb" :key="index">{{route.meta.title }}</el-breadcrumb-item>
+                        </el-breadcrumb>
+                    </div>
+                </div>
+            </el-col>
+            <el-col :span="12">
+                <div class="right-panel h-full flex items-center justify-end">
+                    <!-- 预览-->
+                    <i class="iconfont iconicon_huojian1 cursor-pointer px-[8px]" :title="t('visitWap')" @click="toPreview"></i>
+                    <!-- 预览 只有站点时展示-->
+<!--                    <i class="iconfont iconlingdang-xianxing cursor-pointer px-[8px]" :title="t('newInfo')" v-if="appType == 'admin'"></i>-->
+                    <!-- 切换语言 -->
+                    <div class="navbar-item flex items-center h-full cursor-pointer">
+                        <switch-lang />
+                    </div>
+                    <!-- 切换全屏 -->
+                    <!-- <div class="navbar-item flex items-center h-full cursor-pointer" @click="toggleFullscreen">
                         <icon name="iconfont-icontuichuquanping" v-if="isFullscreen" />
                         <icon name="iconfont-iconquanping" v-else />
                     </div> -->
-          <!-- 布局设置 -->
-          <div class="navbar-item flex items-center h-full cursor-pointer">
-            <layout-setting />
-          </div>
-          <!-- 用户信息 -->
-          <div class="navbar-item flex items-center h-full cursor-pointer">
-            <user-info />
-          </div>
-        </div>
-      </el-col>
-    </el-row>
-    <input type="hidden" v-model="comparisonToken" />
+                    <!-- 布局设置 -->
+                    <div class="navbar-item flex items-center h-full cursor-pointer">
+                        <layout-setting />
+                    </div>
+                    <!-- 用户信息 -->
+                    <div class="navbar-item flex items-center h-full cursor-pointer">
+                        <user-info />
+                    </div>
+                </div>
+            </el-col>
+        </el-row>
+        <input type="hidden" v-model="comparisonToken">
 
-    <el-dialog
-      v-model="detectionLoginDialog"
-      :title="t('layout.detectionLoginTip')"
-      width="30%"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :show-close="false"
-    >
-      <span>{{ t('layout.detectionLoginContent') }}</span>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="detectionLoginFn">{{
-            t('layout.detectionLoginOperation')
-          }}</el-button>
-        </span>
-      </template>
-    </el-dialog>
-  </el-container>
+        <el-dialog v-model="detectionLoginDialog" :title="t('layout.detectionLoginTip')" width="30%" :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false">
+            <span>{{ t('layout.detectionLoginContent') }}</span>
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="detectionLoginFn">{{ t('layout.detectionLoginOperation') }}</el-button>
+                </span>
+            </template>
+        </el-dialog>
+    </el-container>
 </template>
 
 <script lang="ts" setup>
@@ -92,7 +67,7 @@ import userInfo from './user-info.vue'
 import { useFullscreen } from '@vueuse/core'
 import useSystemStore from '@/stores/modules/system'
 import useAppStore from '@/stores/modules/app'
-import { useRoute, useRouter } from 'vue-router'
+import { useRoute,useRouter } from 'vue-router'
 import { t } from '@/lang'
 import storage from '@/utils/storage'
 
@@ -102,96 +77,86 @@ const systemStore = useSystemStore()
 const appStore = useAppStore()
 const route = useRoute()
 const router = useRouter()
-const screenWidth = ref(
-  window.innerWidth ||
-    document.documentElement.clientWidth ||
-    document.body.clientWidth
-)
+const screenWidth = ref(window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth)
 
 const dark = computed(() => {
-  return systemStore.dark
+    return systemStore.dark
 })
 
 // 检测登录 start
 const detectionLoginDialog = ref(false)
 const comparisonToken = ref('')
 if (storage.get('comparisonTokenStorage')) {
-  comparisonToken.value = storage.get('comparisonTokenStorage')
+    comparisonToken.value = storage.get('comparisonTokenStorage')
 }
 
 // 监听标签页面切换
-document.addEventListener('visibilitychange', (e) => {
-  if (
-    document.visibilityState === 'visible' &&
-    comparisonToken.value != storage.get('token')
-  ) {
-    detectionLoginDialog.value = true
-  }
+document.addEventListener('visibilitychange', e => {
+    if (document.visibilityState === 'visible' && comparisonToken.value != storage.get('token')) {
+        detectionLoginDialog.value = true
+    }
 })
 
 const detectionLoginFn = () => {
-  detectionLoginDialog.value = false
-  location.href = `${location.origin}/`
+    detectionLoginDialog.value = false
+    location.href = `${location.origin}/`
 }
 // 检测登录 end
 
 onMounted(() => {
-  // 监听窗体宽度变化
-  window.onresize = () => {
-    return (() => {
-      screenWidth.value =
-        window.innerWidth ||
-        document.documentElement.clientWidth ||
-        document.body.clientWidth
-    })()
-  }
+    // 监听窗体宽度变化
+    window.onresize = () => {
+        return (() => {
+            screenWidth.value = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth
+        })()
+    }
 })
 
 // 刷新路由
 const refreshRouter = () => {
-  if (!appStore.routeRefreshTag) return
-  appStore.refreshRouterView()
+    if (!appStore.routeRefreshTag) return
+    appStore.refreshRouterView()
 }
 
 // 面包屑导航
 const breadcrumb = computed(() => {
-  const matched = route.matched.filter((item) => {
-    return item.meta.title
-  })
-  if (matched[0] && matched[0].path == '/') matched.splice(0, 1)
-  return matched
+    const matched = route.matched.filter(item => { return item.meta.title })
+    if (matched[0] && matched[0].path == '/') matched.splice(0, 1)
+    return matched
 })
 
 // 跳转去预览
 const toPreview = () => {
-  const url = router.resolve({
-    path: '/preview/wap',
-    query: {
-      page: '/',
-    },
-  })
-  window.open(url.href)
+    const url = router.resolve({
+        path: '/preview/wap',
+        query: {
+            page:'/'
+        }
+    })
+    window.open(url.href)
 }
+
 </script>
 
 <style lang="scss" scoped>
-.layout-header {
-  position: relative;
-  z-index: 5;
-  box-shadow: 0px 0px 4px 0px rgba(0, 145, 255, 0.1);
+.layout-header{
+    position: relative;
+    z-index: 5;
+    box-shadow: 0px 0px 4px 0px rgba(0,145,255,0.1);
 }
 .navbar-item {
-  padding: 0 8px;
-  &:hover {
-    background-color: var(--el-bg-color-page);
-  }
+    padding: 0 8px;
+    &:hover {
+        background-color: var(--el-bg-color-page);
+    }
 }
 .index-item {
-  border: 1px solid;
-  border-color: var(--el-color-primary);
-  &:hover {
-    color: #fff;
-    background-color: var(--el-color-primary);
-  }
+	border: 1px solid;
+	border-color: var(--el-color-primary);
+    &:hover {
+		color: #fff;
+        background-color: var(--el-color-primary);
+    }
 }
+
 </style>
diff --git a/admin/src/layout/major/components/header/layout-setting.vue b/admin/src/layout/major/components/header/layout-setting.vue
index 697980ef..aced6c10 100644
--- a/admin/src/layout/major/components/header/layout-setting.vue
+++ b/admin/src/layout/major/components/header/layout-setting.vue
@@ -1,50 +1,37 @@
 <template>
-  <div class="flex">
-    <icon name="element Setting" @click="drawer = true" />
+    <div class="flex">
+        <icon name="element Setting" @click="drawer = true" />
 
-    <el-drawer v-model="drawer" :title="t('layout.layoutSetting')" size="300px">
-      <el-scrollbar>
-        <!-- 黑暗模式 -->
-        <div class="setting-item flex items-center justify-between mb-[10px]">
-          <div class="title text-base text-tx-secondary">
-            {{ t('layout.darkMode') }}
-          </div>
-          <div>
-            <el-switch
-              v-model="dark"
-              :active-value="true"
-              :inactive-value="false"
-            />
-          </div>
-        </div>
-        <!-- 主题颜色 -->
-        <div class="setting-item flex items-center justify-between mb-[10px]">
-          <div class="title text-base text-tx-secondary">
-            {{ t('layout.themeColor') }}
-          </div>
-          <div>
-            <el-color-picker v-model="theme" />
-          </div>
-        </div>
-        <!-- 布局风格 -->
-        <div class="setting-item mb-[10px]">
-          <div class="title text-base text-tx-secondary">
-            {{ t('layout.layoutStyle') }}
-          </div>
-          <div class="flex mt-[10px] layout-style flex-wrap">
-            <div
-              class="relative w-[125px] h-[100px] border mr-[10px] mb-[10px] hover:border-primary"
-              :class="{ 'border-primary': currLayout == item.key }"
-              v-for="(item, index) in layouts"
-              @click="handleSetLayout(item.key)"
-            >
-              <img :src="item.image" alt="" class="w-full h-full" />
-            </div>
-          </div>
-        </div>
-      </el-scrollbar>
-    </el-drawer>
-  </div>
+        <el-drawer v-model="drawer" :title="t('layout.layoutSetting')" size="300px">
+            <el-scrollbar>
+                <!-- 黑暗模式 -->
+                <div class="setting-item flex items-center justify-between mb-[10px]">
+                    <div class="title text-base text-tx-secondary">{{ t('layout.darkMode') }}</div>
+                    <div>
+                        <el-switch v-model="dark" :active-value="true" :inactive-value="false" />
+                    </div>
+                </div>
+                <!-- 主题颜色 -->
+                <div class="setting-item flex items-center justify-between mb-[10px]">
+                    <div class="title text-base text-tx-secondary">{{ t('layout.themeColor') }}</div>
+                    <div>
+                        <el-color-picker v-model="theme" />
+                    </div>
+                </div>
+                <!-- 布局风格 -->
+                <div class="setting-item mb-[10px]">
+                    <div class="title text-base text-tx-secondary">{{ t('layout.layoutStyle') }}</div>
+                    <div class="flex mt-[10px] layout-style flex-wrap">
+                        <div class="relative w-[125px] h-[100px] border mr-[10px] mb-[10px] hover:border-primary"
+                             :class="{ 'border-primary': currLayout == item.key }" v-for="(item, index) in layouts"
+                             @click="handleSetLayout(item.key)">
+                            <img :src="item.image" alt="" class="w-full h-full">
+                        </div>
+                    </div>
+                </div>
+            </el-scrollbar>
+        </el-drawer>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -56,14 +43,8 @@ import { t } from '@/lang'
 import Storage from '@/utils/storage'
 
 const layouts = ref([
-  {
-    key: 'default',
-    image: new URL('@/app/assets/images/theme_white.png', import.meta.url),
-  },
-  {
-    key: 'major',
-    image: new URL('@/app/assets/images/theme_black.png', import.meta.url),
-  },
+    { key: 'default', image: new URL('@/app/assets/images/theme_white.png', import.meta.url) },
+    { key: 'major', image: new URL('@/app/assets/images/theme_black.png', import.meta.url) }
 ])
 const currLayout = ref(Storage.get('layout') || 'default')
 
@@ -71,43 +52,44 @@ const drawer = ref(false)
 const systemStore = useSystemStore()
 
 const handleSetLayout = (key: string) => {
-  Storage.set({ key: 'layout', data: key })
-  location.reload()
+    Storage.set({ key: 'layout', data: key })
+    location.reload()
 }
 
 const isDark = useDark()
 const toggleDark = useToggle(isDark)
 
 const dark = computed({
-  get() {
-    return systemStore.dark
-  },
-  set(val) {
-    systemStore.setTheme('dark', val)
-    toggleDark(val)
-    setThemeColor(systemStore.theme, systemStore.dark ? 'dark' : 'light')
-  },
+    get () {
+        return systemStore.dark
+    },
+    set (val) {
+        systemStore.setTheme('dark', val)
+        toggleDark(val)
+        setThemeColor(systemStore.theme, systemStore.dark ? 'dark' : 'light')
+    }
 })
 
 const theme = computed({
-  get() {
-    return systemStore.theme
-  },
-  set(val) {
-    systemStore.setTheme('theme', val)
-    setThemeColor(systemStore.theme, systemStore.dark ? 'dark' : 'light')
-  },
+    get () {
+        return systemStore.theme
+    },
+    set (val) {
+        systemStore.setTheme('theme', val)
+        setThemeColor(systemStore.theme, systemStore.dark ? 'dark' : 'light')
+    }
 })
+
 </script>
 
 <style lang="scss" scoped>
 :deep(.el-drawer__header) {
-  margin-bottom: 0 !important;
+    margin-bottom: 0 !important;
 }
 
 .layout-style {
-  & > div:nth-child(2n + 2) {
-    margin-right: 0;
-  }
+    &>div:nth-child(2n+2) {
+        margin-right: 0;
+    }
 }
 </style>
diff --git a/admin/src/layout/major/components/header/switch-lang.vue b/admin/src/layout/major/components/header/switch-lang.vue
index a0180ba1..811aa68e 100644
--- a/admin/src/layout/major/components/header/switch-lang.vue
+++ b/admin/src/layout/major/components/header/switch-lang.vue
@@ -1,19 +1,13 @@
 <template>
-  <el-dropdown @command="switchLang" :tabindex="1">
-    <icon name="iconfont iconfanyi" />
-    <template #dropdown>
-      <el-dropdown-menu>
-        <el-dropdown-item
-          command="zh-cn"
-          :disabled="systemStore.lang == 'zh-cn'"
-          >简体中文</el-dropdown-item
-        >
-        <el-dropdown-item command="en" :disabled="systemStore.lang == 'en'"
-          >English</el-dropdown-item
-        >
-      </el-dropdown-menu>
-    </template>
-  </el-dropdown>
+    <el-dropdown @command="switchLang" :tabindex="1">
+        <icon name="iconfont iconfanyi" />
+        <template #dropdown>
+            <el-dropdown-menu>
+                <el-dropdown-item command="zh-cn" :disabled="systemStore.lang == 'zh-cn'">简体中文</el-dropdown-item>
+                <el-dropdown-item command="en" :disabled="systemStore.lang == 'en'">English</el-dropdown-item>
+            </el-dropdown-menu>
+        </template>
+    </el-dropdown>
 </template>
 
 <script lang="ts" setup>
@@ -26,12 +20,12 @@ const route = useRoute()
 const systemStore = useSystemStore()
 
 const switchLang = (command: string) => {
-  systemStore.$patch((state) => {
-    state.lang = command
-    storage.set({ key: 'lang', data: command })
-  })
-  language.loadLocaleMessages(route.path, systemStore.lang)
-  location.reload()
+    systemStore.$patch((state) => {
+        state.lang = command
+        storage.set({ key: 'lang', data: command })
+    })
+    language.loadLocaleMessages(route.path, systemStore.lang)
+    location.reload()
 }
 </script>
 
diff --git a/admin/src/layout/major/components/header/user-info.vue b/admin/src/layout/major/components/header/user-info.vue
index 248aa7a2..2b1eebe6 100644
--- a/admin/src/layout/major/components/header/user-info.vue
+++ b/admin/src/layout/major/components/header/user-info.vue
@@ -1,102 +1,58 @@
 <template>
-  <div>
-    <el-dropdown @command="clickEvent" :tabindex="1">
-      <div class="userinfo flex h-full items-center">
-        <el-avatar
-          v-if="userStore.userInfo.head_img"
-          :size="25"
-          :icon="UserFilled"
-          :src="img(userStore.userInfo.head_img)"
-        />
-        <div class="user-name pl-[8px]">{{ userStore.userInfo.username }}</div>
-        <icon name="element ArrowDown" class="ml-[5px]" />
-      </div>
-      <template #dropdown>
-        <el-dropdown-menu>
-          <el-dropdown-item @click="toLink('/user/center')">
-            <div class="flex items-center leading-[1] py-[5px]">
-              <span
-                class="iconfont iconshezhi1 ml-[4px] !text-[14px] mr-[10px]"
-              ></span>
-              <span class="text-[14px]">账号设置</span>
+    <div>
+        <el-dropdown @command="clickEvent" :tabindex="1">
+            <div class="userinfo flex h-full items-center">
+                <el-avatar v-if="userStore.userInfo.head_img" :size="25" :icon="UserFilled" :src="img(userStore.userInfo.head_img)"/>
+                <div class="user-name pl-[8px]">{{ userStore.userInfo.username }}</div>
+                <icon name="element ArrowDown" class="ml-[5px]" />
             </div>
-          </el-dropdown-item>
-          <el-dropdown-item @click="changePasswordDialog = true">
-            <div class="flex items-center leading-[1] py-[5px]">
-              <span
-                class="iconfont iconxiugai ml-[4px] !text-[14px] mr-[10px]"
-              ></span>
-              <span class="text-[14px]">修改密码</span>
-            </div>
-          </el-dropdown-item>
-          <el-dropdown-item command="logout">
-            <div class="flex items-center leading-[1] py-[2px]">
-              <span
-                class="iconfont icontuichudenglu !text-[21px] mr-[8px]"
-              ></span>
-              <span class="text-[14px]">退出登录</span>
-            </div>
-          </el-dropdown-item>
-        </el-dropdown-menu>
-      </template>
-    </el-dropdown>
+            <template #dropdown>
+                <el-dropdown-menu>
+                    <el-dropdown-item @click="toLink('/user/center')">
+                        <div class="flex items-center leading-[1] py-[5px]">
+                            <span class="iconfont iconshezhi1 ml-[4px] !text-[14px] mr-[10px]"></span>
+                            <span class="text-[14px]">账号设置</span>
+                        </div>
+                    </el-dropdown-item>
+                    <el-dropdown-item @click="changePasswordDialog=true">
+                        <div class="flex items-center leading-[1] py-[5px]">
+                            <span class="iconfont iconxiugai ml-[4px] !text-[14px] mr-[10px]"></span>
+                            <span class="text-[14px]">修改密码</span>
+                        </div>
+                    </el-dropdown-item>
+                    <el-dropdown-item command="logout">
+                        <div class="flex items-center leading-[1] py-[2px]">
+                            <span class="iconfont icontuichudenglu !text-[21px] mr-[8px]"></span>
+                            <span class="text-[14px]">退出登录</span>
+                        </div>
+                    </el-dropdown-item>
+                </el-dropdown-menu>
+            </template>
+        </el-dropdown>
 
-    <el-dialog
-      v-model="changePasswordDialog"
-      width="450px"
-      title="修改密码"
-      :before-close="handleClose"
-    >
-      <div>
-        <el-form
-          :model="saveInfo"
-          label-width="90px"
-          ref="formRef"
-          :rules="formRules"
-          class="page-form"
-        >
-          <el-form-item :label="t('originalPassword')" prop="original_password">
-            <el-input
-              v-model="saveInfo.original_password"
-              type="password"
-              :placeholder="t('originalPasswordPlaceholder')"
-              clearable
-              class="input-width"
-            />
-          </el-form-item>
-          <el-form-item :label="t('newPassword')" prop="password">
-            <el-input
-              v-model="saveInfo.password"
-              type="password"
-              :placeholder="t('passwordPlaceholder')"
-              clearable
-              class="input-width"
-            />
-            <div class="form-tip">{{ t('passwordTip') }}</div>
-          </el-form-item>
-          <el-form-item :label="t('passwordCopy')" prop="password_copy">
-            <el-input
-              v-model="saveInfo.password_copy"
-              type="password"
-              :placeholder="t('passwordPlaceholder')"
-              clearable
-              class="input-width"
-            />
-          </el-form-item>
-        </el-form>
-      </div>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="changePasswordDialog = false">{{
-            t('cancel')
-          }}</el-button>
-          <el-button type="primary" @click="submitForm(formRef)">{{
-            t('save')
-          }}</el-button>
-        </span>
-      </template>
-    </el-dialog>
-  </div>
+        <el-dialog v-model="changePasswordDialog" width="450px" title="修改密码" :before-close="handleClose">
+            <div>
+                <el-form :model="saveInfo" label-width="90px" ref="formRef" :rules="formRules" class="page-form">
+                    <el-form-item :label="t('originalPassword')" prop="original_password">
+                        <el-input v-model="saveInfo.original_password" type="password" :placeholder="t('originalPasswordPlaceholder')" clearable class="input-width" />
+                    </el-form-item>
+                    <el-form-item :label="t('newPassword')" prop="password">
+                        <el-input v-model="saveInfo.password" type="password" :placeholder="t('passwordPlaceholder')" clearable class="input-width" />
+                        <div class="form-tip">{{t('passwordTip')}}</div>
+                    </el-form-item>
+                    <el-form-item :label="t('passwordCopy')" prop="password_copy">
+                        <el-input v-model="saveInfo.password_copy" type="password" :placeholder="t('passwordPlaceholder')" clearable class="input-width" />
+                    </el-form-item>
+                </el-form>
+            </div>
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="changePasswordDialog = false">{{t('cancel')}}</el-button>
+                    <el-button type="primary" @click="submitForm(formRef)">{{t('save')}}</el-button>
+                </span>
+            </template>
+        </el-dialog>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -107,21 +63,21 @@ import type { FormInstance, FormRules, ElNotification } from 'element-plus'
 import useUserStore from '@/stores/modules/user'
 import { setUserInfo } from '@/app/api/personal'
 import { t } from '@/lang'
-import { img } from '@/utils/common'
+import { img } from "@/utils/common";
 
 const userStore = useUserStore()
 const router = useRouter()
 
 const clickEvent = (command: string) => {
-  switch (command) {
-    case 'logout':
-      userStore.logout()
-      break
-  }
+    switch (command) {
+        case 'logout':
+            userStore.logout()
+            break
+    }
 }
 
 const toLink = (link) => {
-  router.push(link)
+    router.push(link)
 }
 
 // 修改密码 --- start
@@ -129,67 +85,51 @@ const changePasswordDialog = ref(false)
 const formRef = ref<FormInstance>()
 // 提交信息
 const saveInfo = reactive({
-  original_password: '',
-  password: '',
-  password_copy: '',
+    original_password: '',
+    password: '',
+    password_copy: ''
 })
 // 表单验证规则
 const formRules = reactive<FormRules>({
-  original_password: [
-    {
-      required: true,
-      message: t('originalPasswordPlaceholder'),
-      trigger: 'blur',
-    },
-  ],
-  password: [
-    { required: true, message: t('passwordPlaceholder'), trigger: 'blur' },
-  ],
-  password_copy: [
-    { required: true, message: t('passwordPlaceholder'), trigger: 'blur' },
-  ],
+    original_password: [
+        { required: true, message: t('originalPasswordPlaceholder'), trigger: 'blur' }
+    ],
+    password: [
+        { required: true, message: t('passwordPlaceholder'), trigger: 'blur' }
+    ],
+    password_copy: [
+        { required: true, message: t('passwordPlaceholder'), trigger: 'blur' }
+    ]
 })
 const submitForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.validate((valid) => {
-    if (valid) {
-      let msg = ''
-      if (saveInfo.password && !saveInfo.original_password)
-        msg = t('originalPasswordHint')
-      if (
-        saveInfo.password &&
-        saveInfo.original_password &&
-        !saveInfo.password_copy
-      )
-        msg = t('newPasswordHint')
-      if (
-        saveInfo.password &&
-        saveInfo.original_password &&
-        saveInfo.password_copy &&
-        saveInfo.password != saveInfo.password_copy
-      )
-        msg = t('doubleCipherHint')
-      if (msg) {
-        ElNotification({
-          type: 'error',
-          message: msg,
-        })
-        return
-      }
+    if (!formEl) return
+    formEl.validate((valid) => {
+        if (valid) {
+            let msg = ''
+            if (saveInfo.password && !saveInfo.original_password) msg = t('originalPasswordHint')
+            if (saveInfo.password && saveInfo.original_password && !saveInfo.password_copy) msg = t('newPasswordHint')
+            if (saveInfo.password && saveInfo.original_password && saveInfo.password_copy && saveInfo.password != saveInfo.password_copy) msg = t('doubleCipherHint')
+            if (msg) {
+                ElNotification({
+                    type: 'error',
+                    message: msg
+                })
+                return
+            }
 
-      setUserInfo(saveInfo).then((res: any) => {
-        changePasswordDialog.value = false
-      })
-    } else {
-      return false
-    }
-  })
+            setUserInfo(saveInfo).then((res: any) => {
+                changePasswordDialog.value = false
+            })
+        } else {
+            return false
+        }
+    })
 }
 // 修改密码 --- end
 </script>
 
 <style lang="scss" scoped>
-.el-popper .el-dropdown-menu {
-  width: 150px;
+.el-popper .el-dropdown-menu{
+    width: 150px;
 }
 </style>
diff --git a/admin/src/layout/major/components/tabs.vue b/admin/src/layout/major/components/tabs.vue
index c9f58d8d..d58f79a4 100644
--- a/admin/src/layout/major/components/tabs.vue
+++ b/admin/src/layout/major/components/tabs.vue
@@ -1,50 +1,23 @@
 <template>
-  <div class="tab-wrap w-full px-[16px]">
-    <el-tabs
-      :closable="tabbarStore.tabLength > 1"
-      :model-value="route.path"
-      @tab-click="tabClick"
-      @tab-remove="removeTab"
-    >
-      <el-tab-pane
-        v-for="(tab, key, index) in tabbarStore.tabs"
-        :name="tab.path"
-        :key="index"
-      >
-        <template #label>
-          <el-dropdown trigger="contextmenu" placement="bottom-start">
-            <span
-              :class="{ 'text-primary': route.path == tab.path }"
-              class="tab-name"
-              >{{ tab.title }}</span
-            >
-            <template #dropdown>
-              <el-dropdown-menu>
-                <el-dropdown-item
-                  icon="Back"
-                  :disabled="index == 0"
-                  @click="closeLeft(tab.path)"
-                  >{{ t('tabs.closeLeft') }}</el-dropdown-item
-                >
-                <el-dropdown-item
-                  icon="Right"
-                  :disabled="index == tabbarStore.tabLength - 1"
-                  @click="closeRight(tab.path)"
-                  >{{ t('tabs.closeRight') }}</el-dropdown-item
-                >
-                <el-dropdown-item
-                  icon="Close"
-                  :disabled="tabbarStore.tabLength == 1"
-                  @click="closeOther(tab.path)"
-                  >{{ t('tabs.closeOther') }}</el-dropdown-item
-                >
-              </el-dropdown-menu>
-            </template>
-          </el-dropdown>
-        </template>
-      </el-tab-pane>
-    </el-tabs>
-  </div>
+    <div class="tab-wrap w-full px-[16px]">
+        <el-tabs :closable="tabbarStore.tabLength > 1" :model-value="route.path" @tab-click="tabClick"
+            @tab-remove="removeTab">
+            <el-tab-pane v-for="(tab, key, index) in tabbarStore.tabs" :name="tab.path" :key="index">
+                <template #label>
+                    <el-dropdown trigger="contextmenu" placement="bottom-start">
+                        <span :class="{ 'text-primary': route.path == tab.path }" class="tab-name">{{ tab.title }}</span>
+                        <template #dropdown>
+                            <el-dropdown-menu>
+                                <el-dropdown-item icon="Back" :disabled="index == 0" @click="closeLeft(tab.path)">{{t('tabs.closeLeft') }}</el-dropdown-item>
+                                <el-dropdown-item icon="Right" :disabled="index == (tabbarStore.tabLength - 1)" @click="closeRight(tab.path)">{{t('tabs.closeRight') }}</el-dropdown-item>
+                                <el-dropdown-item icon="Close" :disabled="tabbarStore.tabLength == 1" @click="closeOther(tab.path)">{{t('tabs.closeOther') }}</el-dropdown-item>
+                            </el-dropdown-menu>
+                        </template>
+                    </el-dropdown>
+                </template>
+            </el-tab-pane>
+        </el-tabs>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -58,11 +31,11 @@ const route = useRoute()
 const router = useRouter()
 
 onMounted(() => {
-  tabbarStore.addTab(route)
+    tabbarStore.addTab(route)
 })
 
 watch(route, (nval: any) => {
-  tabbarStore.addTab(nval)
+    tabbarStore.addTab(nval)
 })
 
 /**
@@ -70,8 +43,8 @@ watch(route, (nval: any) => {
  * @param content
  */
 const tabClick = (content: any) => {
-  const tabRoute = tabbarStore.tabs[content.props.name]
-  router.push({ path: tabRoute.path, query: tabRoute.query })
+    const tabRoute = tabbarStore.tabs[content.props.name]
+    router.push({ path: tabRoute.path, query: tabRoute.query })
 }
 
 /**
@@ -79,11 +52,11 @@ const tabClick = (content: any) => {
  * @param content
  */
 const removeTab = (content: any) => {
-  if (route.path == content) {
-    const tabs = Object.keys(tabbarStore.tabs)
-    router.push({ path: tabs[tabs.indexOf(content) - 1] })
-  }
-  tabbarStore.removeTab(content)
+    if (route.path == content) {
+        const tabs = Object.keys(tabbarStore.tabs)
+        router.push({ path: tabs[tabs.indexOf(content) - 1] })
+    }
+    tabbarStore.removeTab(content)
 }
 
 /**
@@ -91,11 +64,11 @@ const removeTab = (content: any) => {
  * @param path
  */
 const closeLeft = (path: string) => {
-  const tabs = Object.keys(tabbarStore.tabs)
-  for (let i = tabs.indexOf(path) - 1; i >= 0; i--) {
-    delete tabbarStore.tabs[tabs[i]]
-  }
-  router.push({ path })
+    const tabs = Object.keys(tabbarStore.tabs)
+    for (let i = tabs.indexOf(path) - 1; i >= 0; i--) {
+        delete tabbarStore.tabs[tabs[i]]
+    }
+    router.push({ path })
 }
 
 /**
@@ -103,11 +76,11 @@ const closeLeft = (path: string) => {
  * @param path
  */
 const closeRight = (path: string) => {
-  const tabs = Object.keys(tabbarStore.tabs)
-  for (let i = tabs.indexOf(path) + 1; i < tabs.length; i++) {
-    delete tabbarStore.tabs[tabs[i]]
-  }
-  router.push({ path })
+    const tabs = Object.keys(tabbarStore.tabs)
+    for (let i = tabs.indexOf(path) + 1; i < tabs.length; i++) {
+        delete tabbarStore.tabs[tabs[i]]
+    }
+    router.push({ path })
 }
 
 /**
@@ -115,52 +88,50 @@ const closeRight = (path: string) => {
  * @param path
  */
 const closeOther = (path: string) => {
-  const tabs = Object.keys(tabbarStore.tabs)
-  tabs.forEach((key: string) => {
-    key != path && delete tabbarStore.tabs[key]
-  })
-  router.push({ path })
+    const tabs = Object.keys(tabbarStore.tabs)
+    tabs.forEach((key: string) => { key != path && delete tabbarStore.tabs[key] })
+    router.push({ path })
 }
 </script>
 
 <style lang="scss" scoped>
 :deep(.el-tabs) {
-  .el-tabs--border-card {
-    border: none;
-  }
+    .el-tabs--border-card {
+        border: none;
+    }
 
-  .el-tabs__header {
-    margin: 0;
-  }
+    .el-tabs__header {
+        margin: 0;
+    }
 
-  .el-tabs__nav-wrap {
-    margin-bottom: 0;
+    .el-tabs__nav-wrap {
+        margin-bottom: 0;
 
-    &::after {
-      display: none;
+        &::after {
+            display: none;
+        }
     }
-  }
 
-  .el-tabs__content {
-    display: none;
-  }
+    .el-tabs__content {
+        display: none;
+    }
 
-  .el-tabs__item {
-    display: inline-flex !important;
-    padding: 0 20px !important;
-    align-items: center;
+    .el-tabs__item {
+        display: inline-flex !important;
+        padding: 0 20px !important;
+        align-items: center;
 
-    .tab-name:focus {
-      outline: none !important;
+        .tab-name:focus {
+            outline: none !important;
+        }
     }
-  }
 
-  .el-tabs__active-bar {
-    display: none;
-  }
+    .el-tabs__active-bar {
+        display: none;
+    }
 
-  .el-tabs__item.is-active {
-    background-color: var(--el-color-primary-light-9);
-  }
+    .el-tabs__item.is-active {
+        background-color: var(--el-color-primary-light-9);
+    }
 }
 </style>
diff --git a/admin/src/layout/major/index.vue b/admin/src/layout/major/index.vue
index 2ebf77bf..3180d914 100644
--- a/admin/src/layout/major/index.vue
+++ b/admin/src/layout/major/index.vue
@@ -1,30 +1,28 @@
 <template>
-  <div class="common-layout min-w-[1200px]">
-    <el-container class="w-100 h-screen">
-      <layout-aside></layout-aside>
+    <div class="common-layout min-w-[1200px]" >
+        <el-container class="w-100 h-screen">
+            <layout-aside></layout-aside>
 
-      <el-container>
-        <el-header>
-          <layout-header></layout-header>
-        </el-header>
+            <el-container>
+                <el-header>
+                    <layout-header></layout-header>
+                </el-header>
 
-        <el-main :class="['main-wrap h-full p-0', { 'bg-page': dark }]">
-          <el-scrollbar>
-            <div>
-              <router-view
-                v-slot="{ Component, route }"
-                v-if="appStore.routeRefreshTag"
-              >
-                <keep-alive :include="tabbarStore.tabNames">
-                  <component :is="Component" :key="route.fullPath" />
-                </keep-alive>
-              </router-view>
-            </div>
-          </el-scrollbar>
-        </el-main>
-      </el-container>
-    </el-container>
-  </div>
+                <el-main :class="['main-wrap h-full p-0',{'bg-page': dark}]">
+                    <el-scrollbar>
+                        <div>
+                            <router-view v-slot="{ Component, route }" v-if="appStore.routeRefreshTag">
+                                <keep-alive :include="tabbarStore.tabNames">
+                                    <component :is="Component" :key="route.fullPath" />
+                                </keep-alive>
+                            </router-view>
+                        </div>
+                    </el-scrollbar>
+                </el-main>
+
+            </el-container>
+        </el-container>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -39,7 +37,7 @@ const appStore = useAppStore()
 const tabbarStore = useTabbarStore()
 const systemStore = useSystemStore()
 const dark = computed(() => {
-  return systemStore.dark
+    return systemStore.dark
 })
 </script>
 
diff --git a/admin/src/main.ts b/admin/src/main.ts
index f537e7c6..01600bda 100644
--- a/admin/src/main.ts
+++ b/admin/src/main.ts
@@ -6,7 +6,7 @@ import pinia from './stores'
 import lang from './lang'
 import '@/styles/index.scss'
 import { useElementIcon } from './utils/common'
-import 'highlight.js/styles/stackoverflow-light.css'
+import 'highlight.js/styles/stackoverflow-light.css';
 import hljs from 'highlight.js/lib/common'
 import hljsVuePlugin from '@highlightjs/vue-plugin'
 import VueUeditorWrap from 'vue-ueditor-wrap'
@@ -14,15 +14,15 @@ import VueUeditorWrap from 'vue-ueditor-wrap'
 window.hl = hljs
 
 async function run() {
-  const app = createApp(App)
-  app.use(pinia)
-  app.use(lang)
-  app.use(roter)
-  app.use(ElementPlus)
-  app.use(hljsVuePlugin)
-  app.use(VueUeditorWrap)
-  useElementIcon(app)
-  app.mount('#app')
+    const app = createApp(App)
+    app.use(pinia)
+    app.use(lang)
+    app.use(roter)
+    app.use(ElementPlus)
+    app.use(hljsVuePlugin)
+    app.use(VueUeditorWrap)
+    useElementIcon(app)
+    app.mount('#app')
 }
 
 run()
diff --git a/admin/src/router/index.ts b/admin/src/router/index.ts
index c1925455..c19c1bbc 100644
--- a/admin/src/router/index.ts
+++ b/admin/src/router/index.ts
@@ -1,26 +1,15 @@
-import {
-  createRouter,
-  createWebHistory,
-  RouteLocationRaw,
-  RouteLocationNormalizedLoaded,
-} from 'vue-router'
+import { createRouter, createWebHistory, RouteLocationRaw, RouteLocationNormalizedLoaded } from 'vue-router'
 import NProgress from 'nprogress'
 import 'nprogress/nprogress.css'
-import {
-  STATIC_ROUTES,
-  NO_LOGIN_ROUTES,
-  ROOT_ROUTER,
-  ADMIN_ROUTE,
-  findFirstValidRoute,
-} from './routers'
+import { STATIC_ROUTES, NO_LOGIN_ROUTES, ROOT_ROUTER, ADMIN_ROUTE, findFirstValidRoute } from './routers'
 import { language } from '@/lang'
 import useSystemStore from '@/stores/modules/system'
 import useUserStore from '@/stores/modules/user'
 import { setWindowTitle, getAppType, urlToRouteRaw } from '@/utils/common'
 
 const router = createRouter({
-  history: createWebHistory(import.meta.env.BASE_URL),
-  routes: [ADMIN_ROUTE, ...STATIC_ROUTES],
+    history: createWebHistory(import.meta.env.BASE_URL),
+    routes: [ADMIN_ROUTE, ...STATIC_ROUTES]
 })
 
 /**
@@ -28,125 +17,107 @@ const router = createRouter({
  */
 const originPush = router.push
 router.push = (to: RouteLocationRaw) => {
-  const route: any = typeof to == 'string' ? urlToRouteRaw(to) : to
-  if (route.path) {
-    const paths = route.path.split('/').filter((item: string) => {
-      return item
-    })
-    route.path =
-      ['admin'].indexOf(paths[0]) == -1
-        ? `/${getAppType()}${route.path}`
-        : route.path
-  }
-  return originPush(route)
+    const route: any = typeof to == 'string' ? urlToRouteRaw(to) : to
+    if (route.path) {
+        const paths = route.path.split('/').filter((item: string) => { return item })
+        route.path = ['admin'].indexOf(paths[0]) == -1 ? `/${getAppType()}${route.path}` : route.path
+    }
+    return originPush(route)
 }
 
 /**
  * 重写resolve方法
  */
 const originResolve = router.resolve
-router.resolve = (
-  to: RouteLocationRaw,
-  currentLocation?: RouteLocationNormalizedLoaded
-) => {
-  const route: any = typeof to == 'string' ? urlToRouteRaw(to) : to
-  if (route.path) {
-    const paths = route.path.split('/').filter((item: string) => {
-      return item
-    })
-    route.path =
-      ['admin'].indexOf(paths[0]) == -1
-        ? `/${getAppType()}${route.path}`
-        : route.path
-  }
-  return originResolve(route, currentLocation)
+router.resolve = (to: RouteLocationRaw, currentLocation?: RouteLocationNormalizedLoaded) => {
+    const route: any = typeof to == 'string' ? urlToRouteRaw(to) : to
+    if (route.path) {
+        const paths = route.path.split('/').filter((item: string) => { return item })
+        route.path = ['admin'].indexOf(paths[0]) == -1 ? `/${getAppType()}${route.path}` : route.path
+    }
+    return originResolve(route, currentLocation)
 }
 
 // 全局前置守卫
 router.beforeEach(async (to: any, from, next) => {
-  NProgress.configure({ showSpinner: false })
-  NProgress.start()
+    NProgress.configure({ showSpinner: false })
+    NProgress.start()
 
-  to.redirectedFrom && (to.query = to.redirectedFrom.query)
+    to.redirectedFrom && (to.query = to.redirectedFrom.query)
 
-  const userStore = useUserStore()
-  const systemStore = useSystemStore()
+    const userStore = useUserStore()
+    const systemStore = useSystemStore()
 
-  let title: string = to.meta.title ?? ''
+    let title: string = to.meta.title ?? ''
 
-  // 设置网站标题
-  setWindowTitle(title)
 
-  // 加载语言包
-  await language.loadLocaleMessages(
-    to.meta.addon || '',
-    to.meta.view || to.path,
-    systemStore.lang
-  )
+    // 设置网站标题
+    setWindowTitle(title)
 
-  const loginPath = '/admin/login'
+    // 加载语言包
+    await language.loadLocaleMessages(to.meta.addon || '', (to.meta.view || to.path), systemStore.lang);
 
-  // 判断是否需登录
-  if (NO_LOGIN_ROUTES.includes(to.path)) {
-    next()
-  } else if (userStore.token) {
-    // 如果已加载路由
-    if (userStore.routers.length) {
-      if (to.path === loginPath) {
-        next(`/${getAppType()}`)
-      } else {
+    const loginPath = '/admin/login'
+
+    // 判断是否需登录
+    if (NO_LOGIN_ROUTES.includes(to.path)) {
         next()
-      }
-    } else {
-      try {
-        if (!systemStore.apps.length) {
-          await systemStore.getInstallAddons()
+    } else if (userStore.token) {
+        // 如果已加载路由
+        if (userStore.routers.length) {
+            if (to.path === loginPath) {
+                next(`/${getAppType()}`)
+            } else {
+                next()
+            }
+        } else {
+            try {
+                if (!systemStore.apps.length) {
+                    await systemStore.getInstallAddons()
+                }
+                await userStore.getAuthMenusFn()
+
+                // 设置首页路由
+                let firstRoute: symbol | string | undefined = findFirstValidRoute(userStore.routers)
+                if (systemStore.apps[0]) {
+                    firstRoute = userStore.addonIndexRoute[ systemStore.apps[0].key ]
+                }
+
+                ROOT_ROUTER.redirect = { name: firstRoute }
+                router.addRoute(ROOT_ROUTER)
+
+                // 设置应用首页路由
+                ADMIN_ROUTE.children[0].redirect = { name: firstRoute }
+                router.addRoute(ADMIN_ROUTE)
+
+                // 添加动态路由
+                userStore.routers.forEach(route => {
+                    if (!route.children) {
+                        router.addRoute(ADMIN_ROUTE.name, route)
+                        return
+                    }
+
+                    // 动态添加可访问路由表
+                    router.addRoute(ADMIN_ROUTE.name, route)
+                })
+                next(to)
+            } catch (err) {
+                console.log(err)
+                next({ path: loginPath, query: { redirect: to.fullPath } })
+            }
         }
-        await userStore.getAuthMenusFn()
-
-        // 设置首页路由
-        let firstRoute: symbol | string | undefined = findFirstValidRoute(
-          userStore.routers
-        )
-        if (systemStore.apps[0]) {
-          firstRoute = userStore.addonIndexRoute[systemStore.apps[0].key]
-        }
-
-        ROOT_ROUTER.redirect = { name: firstRoute }
-        router.addRoute(ROOT_ROUTER)
-
-        // 设置应用首页路由
-        ADMIN_ROUTE.children[0].redirect = { name: firstRoute }
-        router.addRoute(ADMIN_ROUTE)
-
-        // 添加动态路由
-        userStore.routers.forEach((route) => {
-          if (!route.children) {
-            router.addRoute(ADMIN_ROUTE.name, route)
-            return
-          }
-
-          // 动态添加可访问路由表
-          router.addRoute(ADMIN_ROUTE.name, route)
-        })
-        next(to)
-      } catch (err) {
-        console.log(err)
-        next({ path: loginPath, query: { redirect: to.fullPath } })
-      }
-    }
-  } else {
-    if (to.path === loginPath) {
-      next()
     } else {
-      next({ path: loginPath, query: { redirect: to.fullPath } })
+        if (to.path === loginPath) {
+            next()
+        } else {
+            next({ path: loginPath, query: { redirect: to.fullPath } })
+        }
     }
-  }
 })
 
 // 全局后置钩子
 router.afterEach(() => {
-  NProgress.done()
+    NProgress.done()
 })
 
 export default router
diff --git a/admin/src/router/routers.ts b/admin/src/router/routers.ts
index 35afdb97..2999dd84 100644
--- a/admin/src/router/routers.ts
+++ b/admin/src/router/routers.ts
@@ -4,75 +4,77 @@ import Decorate from '@/layout/decorate/index.vue'
 
 // 静态路由
 export const STATIC_ROUTES: Array<RouteRecordRaw> = [
-  {
-    path: '/:pathMatch(.*)*',
-    component: () => import('@/app/views/error/404.vue'),
-  },
+    {
+        path: '/:pathMatch(.*)*',
+        component: () => import('@/app/views/error/404.vue')
+    }
 ]
 
 // 免登录路由
-export const NO_LOGIN_ROUTES: string[] = ['/404']
+export const NO_LOGIN_ROUTES: string[] = [
+    '/404'
+]
 
 // 根路由
 export const ROOT_ROUTER: RouteRecordRaw = {
-  path: '/',
-  component: Default,
-  name: Symbol(),
+    path: '/',
+    component: Default,
+    name: Symbol()
 }
 
 // 平台端根路由
 export const ADMIN_ROUTE: RouteRecordRaw = {
-  path: '/admin',
-  name: Symbol('admin'),
-  component: Default,
-  children: [
-    {
-      path: '',
-      name: Symbol('adminRoot'),
-      component: Default,
-    },
-    {
-      path: 'login',
-      component: () => import('@/app/views/login/index.vue'),
-    },
-    {
-      path: 'user/center',
-      meta: {
-        type: 1,
-        title: '个人中心',
-        show: false,
-      },
-      component: () => import('@/app/views/index/edit_personal.vue'),
-    },
-  ],
+    path: '/admin',
+    name: Symbol('admin'),
+    component: Default,
+    children: [
+        {
+            path: '',
+            name: Symbol('adminRoot'),
+            component: Default
+        },
+        {
+            path: 'login',
+            component: () => import('@/app/views/login/index.vue')
+        },
+        {
+            path: 'user/center',
+            meta: {
+                type: 1,
+                title: '个人中心',
+                show: false
+            },
+            component: () => import('@/app/views/index/edit_personal.vue')
+        }
+    ]
 }
 
 export const DECORATE_ROUTER: RouteRecordRaw = {
-  path: '/decorate',
-  component: Decorate,
-  name: Symbol('decorate'),
-  children: [],
+    path: '/decorate',
+    component: Decorate,
+    name: Symbol('decorate'),
+    children: []
 }
 
 const modules = import.meta.glob('@/app/views/**/*.vue')
 const addonModules = import.meta.glob('@/addon/**/views/**/*.vue')
 
 interface Route {
-  menu_name: string
-  menu_short_name: string
-  router_path: string
-  view_path: string
-  menu_type: number
-  menu_key: string
-  icon?: {
-    name: string
-    type: string
-  }
-  children?: []
-  is_show: boolean
-  app_type: string
-  addon: string
-  menu_attr?: String
+    menu_name: string,
+    menu_short_name: string,
+    router_path: string,
+    view_path: string
+    menu_type: number,
+    menu_key: string,
+    icon?: {
+        name: string,
+        type: string
+    },
+    children?: [],
+    is_show: boolean,
+    app_type: string,
+    addon: string,
+    menu_attr ?:  String
 }
 
 /**
@@ -80,34 +82,29 @@ interface Route {
  * @param route
  * @param parentRoute
  */
-const createRoute = function (
-  route: Route,
-  parentRoute: RouteRecordRaw | null = null
-): RouteRecordRaw {
-  const record: RouteRecordRaw = {
-    path: `/${route.app_type}/${route.router_path}`,
-    name: route.menu_key,
-    meta: {
-      title: route.menu_name,
-      short_title: route.menu_short_name,
-      icon: route.icon,
-      type: route.menu_type,
-      show: route.is_show,
-      app: route.app_type,
-      view: route.view_path,
-      addon: route.addon,
-      attr: route.menu_attr,
-      parent_route: parentRoute ? parentRoute.meta : parentRoute,
-    },
-  }
-  if (route.menu_type == 0) {
-    record.component = RouterView
-  } else {
-    record.component = route.addon
-      ? addonModules[`/src/addon/${route.addon}/views/${route.view_path}.vue`]
-      : modules[`/src/app/views/${route.view_path}.vue`]
-  }
-  return record
+const createRoute = function (route: Route, parentRoute: RouteRecordRaw | null = null): RouteRecordRaw {
+    const record: RouteRecordRaw = {
+        path: `/${ route.app_type }/${ route.router_path }`,
+        name: route.menu_key,
+        meta: {
+            title: route.menu_name,
+            short_title: route.menu_short_name,
+            icon: route.icon,
+            type: route.menu_type,
+            show: route.is_show,
+            app: route.app_type,
+            view: route.view_path,
+            addon: route.addon,
+            attr: route.menu_attr,
+            parent_route: parentRoute ? parentRoute.meta : parentRoute
+        }
+    }
+    if (route.menu_type == 0) {
+        record.component = RouterView
+    } else {
+        record.component = route.addon ? addonModules[`/src/addon/${ route.addon }/views/${ route.view_path }.vue`] : modules[`/src/app/views/${ route.view_path }.vue`]
+    }
+    return record
 }
 
 /**
@@ -115,17 +112,14 @@ const createRoute = function (
  * @param routes
  * @param parentRoute
  */
-export function formatRouters(
-  routes: Route[],
-  parentRoute: RouteRecordRaw | null = null
-) {
-  return routes.map((route) => {
-    const routeRecord = createRoute(route, parentRoute)
-    if (route.children != null && route.children && route.children.length) {
-      routeRecord.children = formatRouters(route.children, routeRecord)
-    }
-    return routeRecord
-  })
+export function formatRouters(routes: Route[], parentRoute: RouteRecordRaw | null = null) {
+    return routes.map((route) => {
+        const routeRecord = createRoute(route, parentRoute)
+        if (route.children != null && route.children && route.children.length) {
+            routeRecord.children = formatRouters(route.children, routeRecord)
+        }
+        return routeRecord
+    })
 }
 
 /**
@@ -133,18 +127,16 @@ export function formatRouters(
  * @param routes
  * @returns
  */
-export function findFirstValidRoute(
-  routes: RouteRecordRaw[]
-): string | undefined {
-  for (const route of routes) {
-    if (route.meta?.type == 1 && route.meta?.show) {
-      return route.name as string
-    }
-    if (route.children) {
-      const name = findFirstValidRoute(route.children)
-      if (name) {
-        return name
-      }
+export function findFirstValidRoute(routes: RouteRecordRaw[]): string | undefined {
+    for (const route of routes) {
+        if (route.meta?.type == 1 && route.meta?.show) {
+            return route.name as string
+        }
+        if (route.children) {
+            const name = findFirstValidRoute(route.children)
+            if (name) {
+                return name
+            }
+        }
     }
-  }
 }
diff --git a/admin/src/stores/index.ts b/admin/src/stores/index.ts
index 94e2432d..f55eb908 100644
--- a/admin/src/stores/index.ts
+++ b/admin/src/stores/index.ts
@@ -2,4 +2,4 @@ import { createPinia } from 'pinia'
 
 const store = createPinia()
 
-export default store
+export default store
\ No newline at end of file
diff --git a/admin/src/stores/modules/app.ts b/admin/src/stores/modules/app.ts
index ac8f9ad3..d9d5b1cd 100644
--- a/admin/src/stores/modules/app.ts
+++ b/admin/src/stores/modules/app.ts
@@ -4,30 +4,30 @@ import NProgress from 'nprogress'
 import { RouteRecordRaw } from 'vue-router'
 
 interface App {
-  route: RouteRecordRaw | object
-  routeRefreshTag: boolean
-  pageReturn: boolean
+    route: RouteRecordRaw | object,
+    routeRefreshTag: boolean,
+    pageReturn: boolean
 }
 
 const useAppStore = defineStore('app', {
-  state: (): App => {
-    return {
-      route: {},
-      routeRefreshTag: true,
-      pageReturn: false,
-    }
-  },
-  actions: {
-    refreshRouterView() {
-      this.routeRefreshTag = false
-      NProgress.start()
-
-      nextTick(() => {
-        this.routeRefreshTag = true
-        NProgress.done()
-      })
+    state: (): App => {
+        return {
+            route: {},
+            routeRefreshTag: true,
+            pageReturn: false
+        }
     },
-  },
+    actions: {
+        refreshRouterView() {
+            this.routeRefreshTag = false
+            NProgress.start()
+
+            nextTick(() => {
+                this.routeRefreshTag = true
+                NProgress.done()
+            })
+        }
+    }
 })
 
 export default useAppStore
diff --git a/admin/src/stores/modules/diy.ts b/admin/src/stores/modules/diy.ts
index 34d3735b..8df1e1b6 100644
--- a/admin/src/stores/modules/diy.ts
+++ b/admin/src/stores/modules/diy.ts
@@ -5,540 +5,532 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 import { cloneDeep } from 'lodash-es'
 
 const useDiyStore = defineStore('diy', {
-  state: () => {
-    return {
-      id: 0,
-      load: false, // 加载状态
-      currentIndex: -99, // 当前正在编辑的组件下标
-      currentComponent: 'edit-page', // 当前正在编辑的组件名称
-      pageMode: 'diy',
-      editTab: 'content', // 编辑页面
-      pageTitle: '', // 页面名称（用于后台展示）
-      name: '', // 页面标识
-      type: '', // 页面模板
-      typeName: '', // 页面模板名称
-      templateName: '', // 页面模板标识
-      isDefault: 0, // 是否默认页面
-      predefineColors: [
-        '#F4391c',
-        '#ff4500',
-        '#ff8c00',
-        '#FFD009',
-        '#ffd700',
-        '#19C650',
-        '#90ee90',
-        '#00ced1',
-        '#1e90ff',
-        '#c71585',
-        '#FF407E',
-        '#CFAF70',
-        '#A253FF',
-        'rgba(255, 69, 0, 0.68)',
-        'rgb(255, 120, 0)',
-        'hsl(181, 100%, 37%)',
-        'hsla(209, 100%, 56%, 0.73)',
-        '#c7158577',
-      ],
-      components: <any>[], // 组件集合
-      position: [
-        'top_fixed',
-        'right_fixed',
-        'bottom_fixed',
-        'left_fixed',
-        'fixed',
-      ],
-      global: {
-        title: '页面', // 页面标题（用于前台展示）
-        completeLayout: 'style-1', // 整体布局，目前万能表单用到，表单布局，排版风格，style-1：单列平铺‌，style-2：左右排列‌
-        completeAlign: 'left', // 左右布局 对齐方式，left：左对齐，right：右对齐
-        borderControl: true, // 控制表单组件左右布局时，边框是否显示
-
-        pageStartBgColor: '', // 页面背景颜色（开始）
-        pageEndBgColor: '', // 页面背景颜色（结束）
-        pageGradientAngle: 'to bottom', // 渐变角度，从上到下（to bottom）、从左到右（to right）
-        bgUrl: '', // 页面背景图片
-        bgHeightScale: 0, // 页面背景高度比例，单位%，0为高度自适应
-        imgWidth: '', // 页面背景图片宽度
-        imgHeight: '', // 页面背景图片高度
-
-        // 顶部导航栏
-        topStatusBar: {
-          isShow: true, // 是否显示
-          bgColor: '#ffffff', // 头部背景颜色
-          rollBgColor: '#ffffff', // 滚动时，头部背景颜色
-          style: 'style-1', // 导航栏风格样式（style-1：文字，style-2：图片+文字，style-3：图片+搜索，style-4：定位）
-          styleName: '风格1',
-          textColor: '#333333', // 文字颜色
-          rollTextColor: '#333333', // 滚动时，头部文字颜色
-          textAlign: 'center', // 文字对齐方式
-          inputPlaceholder: '请输入搜索关键词',
-          imgUrl: '', // 图片
-          link: {
-            // 跳转链接
-            name: '',
-          },
+    state: () => {
+        return {
+            id: 0,
+            load: false, // 加载状态
+            currentIndex: -99, // 当前正在编辑的组件下标
+            currentComponent: 'edit-page', // 当前正在编辑的组件名称
+            pageMode: 'diy',
+            editTab: 'content',// 编辑页面
+            pageTitle: '', // 页面名称（用于后台展示）
+            name: '', // 页面标识
+            type: '', // 页面模板
+            typeName: '',  // 页面模板名称
+            templateName: '', // 页面模板标识
+            isDefault: 0, // 是否默认页面
+            predefineColors: [
+                '#F4391c',
+                '#ff4500',
+                '#ff8c00',
+                '#FFD009',
+                '#ffd700',
+                '#19C650',
+                '#90ee90',
+                '#00ced1',
+                '#1e90ff',
+                '#c71585',
+                '#FF407E',
+                '#CFAF70',
+                '#A253FF',
+                'rgba(255, 69, 0, 0.68)',
+                'rgb(255, 120, 0)',
+                'hsl(181, 100%, 37%)',
+                'hsla(209, 100%, 56%, 0.73)',
+                '#c7158577'
+            ],
+            components: <any>[], // 组件集合
+            position: ['top_fixed', 'right_fixed', 'bottom_fixed', 'left_fixed', 'fixed'],
+            global: {
+                title: "页面", // 页面标题（用于前台展示）
+                completeLayout: 'style-1', // 整体布局，目前万能表单用到，表单布局，排版风格，style-1：单列平铺‌，style-2：左右排列‌
+                completeAlign: 'left', // 左右布局 对齐方式，left：左对齐，right：右对齐
+                borderControl: true, // 控制表单组件左右布局时，边框是否显示
+
+                pageStartBgColor: "", // 页面背景颜色（开始）
+                pageEndBgColor: "", // 页面背景颜色（结束）
+                pageGradientAngle: 'to bottom', // 渐变角度，从上到下（to bottom）、从左到右（to right）
+                bgUrl: '', // 页面背景图片
+                bgHeightScale: 0, // 页面背景高度比例，单位%，0为高度自适应
+                imgWidth: '',  // 页面背景图片宽度
+                imgHeight: '', // 页面背景图片高度
+
+                // 顶部导航栏
+                topStatusBar: {
+                    isShow: true, // 是否显示
+                    bgColor: "#ffffff", // 头部背景颜色
+                    rollBgColor: "#ffffff", // 滚动时，头部背景颜色
+                    style: 'style-1', // 导航栏风格样式（style-1：文字，style-2：图片+文字，style-3：图片+搜索，style-4：定位）
+                    styleName: '风格1',
+                    textColor: "#333333", // 文字颜色
+                    rollTextColor: "#333333", // 滚动时，头部文字颜色
+                    textAlign: 'center', // 文字对齐方式
+                    inputPlaceholder: '请输入搜索关键词',
+                    imgUrl: '', // 图片
+                    link: { // 跳转链接
+                        name: ""
+                    }
+                },
+
+                bottomTabBarSwitch: true, // 底部导航开关
+
+                // 弹框 count：不弹出 -1，首次弹出 1，每次弹出 0
+                popWindow: {
+                    imgUrl: "",
+                    imgWidth: '',
+                    imgHeight: '',
+                    count: -1,
+                    show: 0,
+                    link: {
+                        name: ""
+                    },
+                },
+
+                // 公共模板属性，所有组件都继承，无需重复定义，组件内部根据业务自行调用
+                template: {
+                    textColor: "#303133", // 文字颜色
+                    pageStartBgColor: "", // 组件底部背景颜色（开始）
+                    pageEndBgColor: "", // 组件底部背景颜色（结束）
+                    pageGradientAngle: 'to bottom', // 渐变角度，从上到下（to bottom）、从左到右（to right）
+
+                    componentBgUrl: '', // 组件背景图片
+                    componentBgAlpha: 2, // 组件背景图片的透明度，0~10
+                    componentStartBgColor: '', // 组件背景颜色（开始）
+                    componentEndBgColor: '', // 组件背景颜色（结束）
+                    componentGradientAngle: 'to bottom', // 渐变角度，从上到下（to bottom）、从左到右（to right）
+                    topRounded: 0, // 组件上圆角
+                    bottomRounded: 0, // 组件下圆角
+
+                    elementBgColor: '', // 元素背景颜色
+                    topElementRounded: 0, // 元素上圆角
+                    bottomElementRounded: 0, // 元素下圆角
+
+                    margin: {
+                        top: 0, // 上边距
+                        bottom: 0, // 下边距
+                        both: 0, // 左右边距
+                    },
+                    isHidden: false // 是否隐藏该组件 true：是，false：否，增加问号说明：勾选后该组件将隐藏，适用于你不希望看到该组件字段又不希望删除的情况；
+                }
+
+            },
+            // 组件集合
+            value: <any>[]
+        }
+    },
+    getters: {
+        editComponent: (state) => {
+            if (state.currentIndex == -99) {
+                return state.global;
+            } else {
+                return state.value[state.currentIndex];
+            }
         },
-
-        bottomTabBarSwitch: true, // 底部导航开关
-
-        // 弹框 count：不弹出 -1，首次弹出 1，每次弹出 0
-        popWindow: {
-          imgUrl: '',
-          imgWidth: '',
-          imgHeight: '',
-          count: -1,
-          show: 0,
-          link: {
-            name: '',
-          },
+    },
+    actions: {
+        // 初始化数据
+        init() {
+            this.global = {
+                title: "页面", // 页面标题
+                completeLayout: 'style-1',
+                completeAlign: 'left',
+                borderControl: true,
+
+                pageStartBgColor: "", // 页面背景颜色（开始）
+                pageEndBgColor: "", // 页面背景颜色（结束）
+                pageGradientAngle: 'to bottom', // 渐变角度，从上到下（to bottom）、从左到右（to right）
+                bgUrl: '', // 页面背景图片
+                bgHeightScale: 100, // 页面背景高度比例，单位%
+                imgWidth: '',  // 页面背景图片宽度
+                imgHeight: '', // 页面背景图片高度
+
+                // 顶部导航栏
+                topStatusBar: {
+                    isShow: true, // 是否显示
+                    bgColor: "#ffffff", // 头部背景颜色
+                    rollBgColor: "#ffffff", // 滚动时，头部背景颜色
+                    style: 'style-1', // 导航栏风格样式（style-1：文字，style-2：图片+文字，style-3：图片+搜索，style-4：定位）
+                    styleName: '风格1',
+                    textColor: "#333333", // 文字颜色
+                    rollTextColor: "#333333", // 滚动时，头部文字颜色
+                    textAlign: 'center', // 文字对齐方式
+                    inputPlaceholder: '请输入搜索关键词',
+                    imgUrl: '', // 图片
+                    link: { // 跳转链接
+                        name: ""
+                    }
+                },
+
+                bottomTabBarSwitch: true, // 底部导航开关
+
+                // 弹框 count：不弹出 -1，首次弹出 1，每次弹出 0
+                popWindow: {
+                    imgUrl: "",
+                    imgWidth: '',
+                    imgHeight: '',
+                    count: -1,
+                    show: 0,
+                    link: {
+                        name: ""
+                    },
+                },
+
+                // 公共模板属性，所有组件都继承，无需重复定义，组件内部根据业务自行调用
+                template: {
+                    textColor: "#303133", // 文字颜色
+                    pageStartBgColor: "", // 组件底部背景颜色（开始）
+                    pageEndBgColor: "", // 组件底部背景颜色（结束）
+                    pageGradientAngle: 'to bottom', // 渐变角度，从上到下（to bottom）、从左到右（to right）
+
+                    componentBgUrl: '', // 组件背景图片
+                    componentBgAlpha: 2, // 组件背景图片的透明度
+                    componentStartBgColor: '', // 组件背景颜色（开始）
+                    componentEndBgColor: '', // 组件背景颜色（结束）
+                    componentGradientAngle: 'to bottom', // 渐变角度，从上到下（to bottom）、从左到右（to right）
+                    topRounded: 0, // 组件上圆角
+                    bottomRounded: 0, // 组件下圆角
+
+                    elementBgColor: '', // 元素背景颜色
+                    topElementRounded: 0, // 元素上圆角
+                    bottomElementRounded: 0, // 元素下圆角
+
+                    margin: {
+                        top: 0, // 上边距
+                        bottom: 0, // 下边距
+                        both: 0, // 左右边距
+                    },
+                    isHidden: false // 是否隐藏该组件 true：是，false：否，增加问号说明：勾选后该组件将隐藏，适用于你不希望看到该组件字段又不希望删除的情况；
+                }
+
+            };
+            this.value = [];
         },
+        // 添加组件
+        addComponent(key: string, data: any) {
+            // 加载完才能添加组件
+            if (!this.load) return;
+
+            // 删除不用的字段
+            let component = cloneDeep(data);
+
+            component.id = this.generateRandom();
+            component.componentName = key;
+            component.componentTitle = component.title;
+            component.ignore = []; // 忽略公共属性
+
+            Object.assign(component, component.value);
+            delete component.title;
+            delete component.value;
+            // delete component.type;  // todo 考虑删除，没用到
+            delete component.icon;
+            delete component.render; // 渲染值，万能表单用到了
+
+            // 默认继承全局属性
+            let template = cloneDeep(this.global.template);
+            Object.assign(component, template);
+
+            if (component.template) {
+                // 按照组件初始的属性覆盖默认值
+                Object.assign(component, component.template);
+                delete component.template;
+            }
 
-        // 公共模板属性，所有组件都继承，无需重复定义，组件内部根据业务自行调用
-        template: {
-          textColor: '#303133', // 文字颜色
-          pageStartBgColor: '', // 组件底部背景颜色（开始）
-          pageEndBgColor: '', // 组件底部背景颜色（结束）
-          pageGradientAngle: 'to bottom', // 渐变角度，从上到下（to bottom）、从左到右（to right）
-
-          componentBgUrl: '', // 组件背景图片
-          componentBgAlpha: 2, // 组件背景图片的透明度，0~10
-          componentStartBgColor: '', // 组件背景颜色（开始）
-          componentEndBgColor: '', // 组件背景颜色（结束）
-          componentGradientAngle: 'to bottom', // 渐变角度，从上到下（to bottom）、从左到右（to right）
-          topRounded: 0, // 组件上圆角
-          bottomRounded: 0, // 组件下圆角
-
-          elementBgColor: '', // 元素背景颜色
-          topElementRounded: 0, // 元素上圆角
-          bottomElementRounded: 0, // 元素下圆角
-
-          margin: {
-            top: 0, // 上边距
-            bottom: 0, // 下边距
-            both: 0, // 左右边距
-          },
-          isHidden: false, // 是否隐藏该组件 true：是，false：否，增加问号说明：勾选后该组件将隐藏，适用于你不希望看到该组件字段又不希望删除的情况；
+            if (!this.checkComponentIsAdd(component)) {
+                // 组件最多只能添加n个
+                ElMessage({
+                    type: 'warning',
+                    message: `${ component.componentTitle }${ t('componentCanOnlyAdd') }${ component.uses }${ t('piece') }`,
+                });
+                return;
+            }
+
+            // 置顶组件，只能在第一个位置中添加
+            if (component.position && this.position.indexOf(component.position) != -1) {
+
+                if (component.position == 'top_fixed') {
+                    // 顶部置顶
+
+                    this.currentIndex = 0;
+                    // 指定位置添加组件
+                    this.value.splice(0, 0, component);
+
+                } else if (component.position == 'bottom_fixed') {
+                    // 底部置顶
+
+                    // 指定位置添加组件
+                    this.value.splice(this.value.length, 0, component);
+                    this.currentIndex = this.value.length - 1;
+                }else{
+
+                    this.currentIndex = 0;
+                    // 指定位置添加组件
+                    this.value.splice(0, 0, component);
+                }
+
+            } else if (this.currentIndex === -99) {
+                let index = this.currentIndex;
+                for (let i = this.value.length - 1; i >= 0; i--) {
+                    if (this.value[i].position) {
+                        index = i; // 在定位组件之前添加
+                        break;
+                    }
+                }
+
+                if (index == -99) {
+                    this.value.push(component);
+                    // 添加组件后（不是编辑调用的），选择最后一个
+                    this.currentIndex = this.value.length - 1;
+                } else {
+
+                    // 指定位置添加组件
+                    this.value.splice(index, 0, component);
+                    this.currentIndex = index;
+                }
+
+            } else {
+                let index = -1;
+                for (let i = this.value.length - 1; i >= 0; i--) {
+                    if (this.value[i].position && this.value[i].position == 'bottom_fixed') {
+                        index = i; // 在定位组件之前添加
+                        break;
+                    }
+                }
+
+                // 判断当前添加的位置跟定位组件是否相邻
+                if (index != -1 && (index == this.currentIndex || (index - this.currentIndex) == 1)) {
+
+                    // 未找到定位组件，在当前下标之后添加组件
+                    if (index == -1) {
+                        this.value.splice(++this.currentIndex, 0, component);
+                    } else {
+                        // 指定位置添加组件
+                        this.value.splice(index, 0, component);
+                        this.currentIndex = index;
+                    }
+                } else {
+                    this.value.splice(++this.currentIndex, 0, component);
+                }
+
+            }
+
+            this.currentComponent = component.path;
         },
-      },
-      // 组件集合
-      value: <any>[],
-    }
-  },
-  getters: {
-    editComponent: (state) => {
-      if (state.currentIndex == -99) {
-        return state.global
-      } else {
-        return state.value[state.currentIndex]
-      }
-    },
-  },
-  actions: {
-    // 初始化数据
-    init() {
-      this.global = {
-        title: '页面', // 页面标题
-        completeLayout: 'style-1',
-        completeAlign: 'left',
-        borderControl: true,
-
-        pageStartBgColor: '', // 页面背景颜色（开始）
-        pageEndBgColor: '', // 页面背景颜色（结束）
-        pageGradientAngle: 'to bottom', // 渐变角度，从上到下（to bottom）、从左到右（to right）
-        bgUrl: '', // 页面背景图片
-        bgHeightScale: 100, // 页面背景高度比例，单位%
-        imgWidth: '', // 页面背景图片宽度
-        imgHeight: '', // 页面背景图片高度
-
-        // 顶部导航栏
-        topStatusBar: {
-          isShow: true, // 是否显示
-          bgColor: '#ffffff', // 头部背景颜色
-          rollBgColor: '#ffffff', // 滚动时，头部背景颜色
-          style: 'style-1', // 导航栏风格样式（style-1：文字，style-2：图片+文字，style-3：图片+搜索，style-4：定位）
-          styleName: '风格1',
-          textColor: '#333333', // 文字颜色
-          rollTextColor: '#333333', // 滚动时，头部文字颜色
-          textAlign: 'center', // 文字对齐方式
-          inputPlaceholder: '请输入搜索关键词',
-          imgUrl: '', // 图片
-          link: {
-            // 跳转链接
-            name: '',
-          },
+        generateRandom(len: number = 5) {
+            return Number(Math.random().toString().substr(3, len) + Date.now()).toString(36);
+        },
+        // 将数据发送到uniapp
+        postMessage() {
+            var diyData = JSON.stringify({
+                pageMode: this.pageMode,
+                currentIndex: this.currentIndex,
+                global: toRaw(this.global),
+                value: toRaw(this.value)
+            });
+            window.previewIframe.contentWindow.postMessage(diyData, '*');
+        },
+        // 选中正在编辑的组件
+        changeCurrentIndex(index: number, component: any = null) {
+            this.currentIndex = index;
+            if (this.currentIndex == -99) {
+                this.currentComponent = 'edit-page';
+            } else if (component) {
+                this.currentComponent = component.path;
+            }
         },
+        // 删除组件
+        delComponent() {
+            if (this.currentIndex == -99) return;
+
+            ElMessageBox.confirm(
+                t('delComponentTips'),
+                t('warning'),
+                {
+                    confirmButtonText: t('confirm'),
+                    cancelButtonText: t('cancel'),
+                    type: 'warning',
+                    autofocus: false
+                }
+            ).then(() => {
+                this.value.splice(this.currentIndex, 1);
+
+                // 如果组件全部删除，则选中页面设置
+                if (this.value.length === 0) {
+                    this.currentIndex = -99;
+                }
+
+                // 如果当前选中的组件不存在，则选择上一个
+                if (this.currentIndex === this.value.length) {
+                    this.currentIndex--;
+                }
+                let component = cloneDeep(this.value[this.currentIndex]);
+
+                this.changeCurrentIndex(this.currentIndex, component)
+
+            }).catch(() => {
+            })
 
-        bottomTabBarSwitch: true, // 底部导航开关
-
-        // 弹框 count：不弹出 -1，首次弹出 1，每次弹出 0
-        popWindow: {
-          imgUrl: '',
-          imgWidth: '',
-          imgHeight: '',
-          count: -1,
-          show: 0,
-          link: {
-            name: '',
-          },
         },
+        // 上移组件
+        moveUpComponent() {
+            var temp = cloneDeep(this.value[this.currentIndex]); // 当前选中组件
+            let prevIndex = this.currentIndex - 1;
+            var temp2 = cloneDeep(this.value[prevIndex]); // 上个组件
+
+            if ((this.currentIndex - 1) < 0 || temp2.position && this.position.indexOf(temp2.position) != -1) return; // 从0开始
+
+            temp.id = this.generateRandom(); // 更新id，刷新组件数据
+            temp2.id = this.generateRandom(); // 更新id，刷新组件数据
+
+            if (temp.position && this.position.indexOf(temp.position) != -1) {
+                ElMessage({
+                    type: 'warning',
+                    message: `${ t('componentNotMoved') }`,
+                });
+                return;
+            }
+
+            this.value[this.currentIndex] = temp2;
+            this.value[prevIndex] = temp;
 
-        // 公共模板属性，所有组件都继承，无需重复定义，组件内部根据业务自行调用
-        template: {
-          textColor: '#303133', // 文字颜色
-          pageStartBgColor: '', // 组件底部背景颜色（开始）
-          pageEndBgColor: '', // 组件底部背景颜色（结束）
-          pageGradientAngle: 'to bottom', // 渐变角度，从上到下（to bottom）、从左到右（to right）
-
-          componentBgUrl: '', // 组件背景图片
-          componentBgAlpha: 2, // 组件背景图片的透明度
-          componentStartBgColor: '', // 组件背景颜色（开始）
-          componentEndBgColor: '', // 组件背景颜色（结束）
-          componentGradientAngle: 'to bottom', // 渐变角度，从上到下（to bottom）、从左到右（to right）
-          topRounded: 0, // 组件上圆角
-          bottomRounded: 0, // 组件下圆角
-
-          elementBgColor: '', // 元素背景颜色
-          topElementRounded: 0, // 元素上圆角
-          bottomElementRounded: 0, // 元素下圆角
-
-          margin: {
-            top: 0, // 上边距
-            bottom: 0, // 下边距
-            both: 0, // 左右边距
-          },
-          isHidden: false, // 是否隐藏该组件 true：是，false：否，增加问号说明：勾选后该组件将隐藏，适用于你不希望看到该组件字段又不希望删除的情况；
+            this.changeCurrentIndex(prevIndex, temp);
         },
-      }
-      this.value = []
-    },
-    // 添加组件
-    addComponent(key: string, data: any) {
-      // 加载完才能添加组件
-      if (!this.load) return
-
-      // 删除不用的字段
-      let component = cloneDeep(data)
-
-      component.id = this.generateRandom()
-      component.componentName = key
-      component.componentTitle = component.title
-      component.ignore = [] // 忽略公共属性
-
-      Object.assign(component, component.value)
-      delete component.title
-      delete component.value
-      // delete component.type;  // todo 考虑删除，没用到
-      delete component.icon
-      delete component.render // 渲染值，万能表单用到了
-
-      // 默认继承全局属性
-      let template = cloneDeep(this.global.template)
-      Object.assign(component, template)
-
-      if (component.template) {
-        // 按照组件初始的属性覆盖默认值
-        Object.assign(component, component.template)
-        delete component.template
-      }
-
-      if (!this.checkComponentIsAdd(component)) {
-        // 组件最多只能添加n个
-        ElMessage({
-          type: 'warning',
-          message: `${component.componentTitle}${t('componentCanOnlyAdd')}${component.uses}${t('piece')}`,
-        })
-        return
-      }
-
-      // 置顶组件，只能在第一个位置中添加
-      if (
-        component.position &&
-        this.position.indexOf(component.position) != -1
-      ) {
-        if (component.position == 'top_fixed') {
-          // 顶部置顶
-
-          this.currentIndex = 0
-          // 指定位置添加组件
-          this.value.splice(0, 0, component)
-        } else if (component.position == 'bottom_fixed') {
-          // 底部置顶
-
-          // 指定位置添加组件
-          this.value.splice(this.value.length, 0, component)
-          this.currentIndex = this.value.length - 1
-        } else {
-          this.currentIndex = 0
-          // 指定位置添加组件
-          this.value.splice(0, 0, component)
-        }
-      } else if (this.currentIndex === -99) {
-        let index = this.currentIndex
-        for (let i = this.value.length - 1; i >= 0; i--) {
-          if (this.value[i].position) {
-            index = i // 在定位组件之前添加
-            break
-          }
-        }
+        // 下移组件
+        moveDownComponent() {
+            if (this.currentIndex < -1 || (this.currentIndex + 1) >= this.value.length) return; // 最后一个不能下移
 
-        if (index == -99) {
-          this.value.push(component)
-          // 添加组件后（不是编辑调用的），选择最后一个
-          this.currentIndex = this.value.length - 1
-        } else {
-          // 指定位置添加组件
-          this.value.splice(index, 0, component)
-          this.currentIndex = index
-        }
-      } else {
-        let index = -1
-        for (let i = this.value.length - 1; i >= 0; i--) {
-          if (
-            this.value[i].position &&
-            this.value[i].position == 'bottom_fixed'
-          ) {
-            index = i // 在定位组件之前添加
-            break
-          }
-        }
+            var nextIndex = this.currentIndex + 1;
 
-        // 判断当前添加的位置跟定位组件是否相邻
-        if (
-          index != -1 &&
-          (index == this.currentIndex || index - this.currentIndex == 1)
-        ) {
-          // 未找到定位组件，在当前下标之后添加组件
-          if (index == -1) {
-            this.value.splice(++this.currentIndex, 0, component)
-          } else {
-            // 指定位置添加组件
-            this.value.splice(index, 0, component)
-            this.currentIndex = index
-          }
-        } else {
-          this.value.splice(++this.currentIndex, 0, component)
-        }
-      }
+            var temp = cloneDeep(this.value[this.currentIndex]); // 当前选中组件
+            temp.id = this.generateRandom(); // 更新id，刷新组件数据
 
-      this.currentComponent = component.path
-    },
-    generateRandom(len: number = 5) {
-      return Number(
-        Math.random().toString().substr(3, len) + Date.now()
-      ).toString(36)
-    },
-    // 将数据发送到uniapp
-    postMessage() {
-      var diyData = JSON.stringify({
-        pageMode: this.pageMode,
-        currentIndex: this.currentIndex,
-        global: toRaw(this.global),
-        value: toRaw(this.value),
-      })
-      window.previewIframe.contentWindow.postMessage(diyData, '*')
-    },
-    // 选中正在编辑的组件
-    changeCurrentIndex(index: number, component: any = null) {
-      this.currentIndex = index
-      if (this.currentIndex == -99) {
-        this.currentComponent = 'edit-page'
-      } else if (component) {
-        this.currentComponent = component.path
-      }
-    },
-    // 删除组件
-    delComponent() {
-      if (this.currentIndex == -99) return
-
-      ElMessageBox.confirm(t('delComponentTips'), t('warning'), {
-        confirmButtonText: t('confirm'),
-        cancelButtonText: t('cancel'),
-        type: 'warning',
-        autofocus: false,
-      })
-        .then(() => {
-          this.value.splice(this.currentIndex, 1)
-
-          // 如果组件全部删除，则选中页面设置
-          if (this.value.length === 0) {
-            this.currentIndex = -99
-          }
-
-          // 如果当前选中的组件不存在，则选择上一个
-          if (this.currentIndex === this.value.length) {
-            this.currentIndex--
-          }
-          let component = cloneDeep(this.value[this.currentIndex])
-
-          this.changeCurrentIndex(this.currentIndex, component)
-        })
-        .catch(() => {})
-    },
-    // 上移组件
-    moveUpComponent() {
-      var temp = cloneDeep(this.value[this.currentIndex]) // 当前选中组件
-      let prevIndex = this.currentIndex - 1
-      var temp2 = cloneDeep(this.value[prevIndex]) // 上个组件
-
-      if (
-        this.currentIndex - 1 < 0 ||
-        (temp2.position && this.position.indexOf(temp2.position) != -1)
-      )
-        return // 从0开始
-
-      temp.id = this.generateRandom() // 更新id，刷新组件数据
-      temp2.id = this.generateRandom() // 更新id，刷新组件数据
-
-      if (temp.position && this.position.indexOf(temp.position) != -1) {
-        ElMessage({
-          type: 'warning',
-          message: `${t('componentNotMoved')}`,
-        })
-        return
-      }
-
-      this.value[this.currentIndex] = temp2
-      this.value[prevIndex] = temp
-
-      this.changeCurrentIndex(prevIndex, temp)
-    },
-    // 下移组件
-    moveDownComponent() {
-      if (this.currentIndex < -1 || this.currentIndex + 1 >= this.value.length)
-        return // 最后一个不能下移
+            var temp2 = cloneDeep(this.value[nextIndex]); // 下个组件
+            temp2.id = this.generateRandom(); // 更新id，刷新组件数据
 
-      var nextIndex = this.currentIndex + 1
+            if (temp2.position && this.position.indexOf(temp2.position) != -1) return;
 
-      var temp = cloneDeep(this.value[this.currentIndex]) // 当前选中组件
-      temp.id = this.generateRandom() // 更新id，刷新组件数据
+            if (temp.position && this.position.indexOf(temp.position) != -1) {
+                ElMessage({
+                    type: 'warning',
+                    message: `${ t('componentNotMoved') }`,
+                });
+                return;
+            }
 
-      var temp2 = cloneDeep(this.value[nextIndex]) // 下个组件
-      temp2.id = this.generateRandom() // 更新id，刷新组件数据
+            this.value[this.currentIndex] = temp2;
+            this.value[nextIndex] = temp;
 
-      if (temp2.position && this.position.indexOf(temp2.position) != -1) return
+            this.changeCurrentIndex(nextIndex, temp);
 
-      if (temp.position && this.position.indexOf(temp.position) != -1) {
-        ElMessage({
-          type: 'warning',
-          message: `${t('componentNotMoved')}`,
-        })
-        return
-      }
+        },
+        // 复制组件
+        copyComponent() {
+            if (this.currentIndex < 0) return; // 从0开始
+
+            let component = cloneDeep(this.value[this.currentIndex]); // 当前选中组件
+            component.id = this.generateRandom(); // 更新id，刷新组件数据
+
+            if (!this.checkComponentIsAdd(component)) {
+                ElMessage({
+                    type: 'warning',
+                    message: `${ t('notCopy') }，${ component.componentTitle }${ t('componentCanOnlyAdd') }${ component.uses }${ t('piece') }`,
+                });
+                return;
+            }
 
-      this.value[this.currentIndex] = temp2
-      this.value[nextIndex] = temp
+            if (component.position && this.position.indexOf(component.position) != -1) {
+                ElMessage({
+                    type: 'warning',
+                    message: `${ t('notCopy') }，${ component.componentTitle }${ t('componentCanOnlyAdd') }1${ t('piece') }`,
+                });
+                return;
+            }
 
-      this.changeCurrentIndex(nextIndex, temp)
-    },
-    // 复制组件
-    copyComponent() {
-      if (this.currentIndex < 0) return // 从0开始
-
-      let component = cloneDeep(this.value[this.currentIndex]) // 当前选中组件
-      component.id = this.generateRandom() // 更新id，刷新组件数据
-
-      if (!this.checkComponentIsAdd(component)) {
-        ElMessage({
-          type: 'warning',
-          message: `${t('notCopy')}，${component.componentTitle}${t('componentCanOnlyAdd')}${component.uses}${t('piece')}`,
-        })
-        return
-      }
-
-      if (
-        component.position &&
-        this.position.indexOf(component.position) != -1
-      ) {
-        ElMessage({
-          type: 'warning',
-          message: `${t('notCopy')}，${component.componentTitle}${t('componentCanOnlyAdd')}1${t('piece')}`,
-        })
-        return
-      }
-
-      var index = this.currentIndex + 1
-      this.value.splice(index, 0, component)
-
-      this.changeCurrentIndex(index, component)
-    },
-    // 检测组件是否允许添加，true：允许 false：不允许
-    checkComponentIsAdd(component: any) {
-      //为0时不处理
-      if (component.uses === 0) return true
+            var index = this.currentIndex + 1;
+            this.value.splice(index, 0, component);
 
-      var count = 0
+            this.changeCurrentIndex(index, component);
 
-      //遍历已添加的自定义组件，检测是否超出数量
-      for (var i in this.value)
-        if (this.value[i].componentName === component.componentName) count++
+        },
+        // 检测组件是否允许添加，true：允许 false：不允许
+        checkComponentIsAdd(component: any) {
 
-      if (count >= component.uses) return false
-      else return true
-    },
-    // 重置当前组件数据
-    resetComponent() {
-      if (this.currentIndex < 0) return // 从0开始
-
-      ElMessageBox.confirm(t('resetComponentTips'), t('warning'), {
-        confirmButtonText: t('confirm'),
-        cancelButtonText: t('cancel'),
-        type: 'warning',
-        autofocus: false,
-      })
-        .then(() => {
-          // 重置当前选中的组件数据
-          for (let i = 0; i < this.components.length; i++) {
-            if (
-              this.components[i].componentName ==
-              this.editComponent.componentName
-            ) {
-              Object.assign(this.editComponent, this.components[i])
-              break
+            //为0时不处理
+            if (component.uses === 0) return true;
+
+            var count = 0;
+
+            //遍历已添加的自定义组件，检测是否超出数量
+            for (var i in this.value) if (this.value[i].componentName === component.componentName) count++;
+
+            if (count >= component.uses) return false;
+            else return true;
+        },
+        // 重置当前组件数据
+        resetComponent() {
+            if (this.currentIndex < 0) return; // 从0开始
+
+            ElMessageBox.confirm(
+                t('resetComponentTips'),
+                t('warning'),
+                {
+                    confirmButtonText: t('confirm'),
+                    cancelButtonText: t('cancel'),
+                    type: 'warning',
+                    autofocus: false
+                }
+            ).then(() => {
+                // 重置当前选中的组件数据
+                for (let i = 0; i < this.components.length; i++) {
+                    if (this.components[i].componentName == this.editComponent.componentName) {
+                        Object.assign(this.editComponent, this.components[i]);
+                        break;
+                    }
+                }
+
+            }).catch(() => {
+            })
+
+        },
+        // 组件验证
+        verify() {
+            if (this.pageTitle === "") {
+                ElMessage({
+                    message: t('diyPageTitlePlaceholder'),
+                    type: 'warning'
+                })
+                this.changeCurrentIndex(-99);
+                return false;
             }
-          }
-        })
-        .catch(() => {})
-    },
-    // 组件验证
-    verify() {
-      if (this.pageTitle === '') {
-        ElMessage({
-          message: t('diyPageTitlePlaceholder'),
-          type: 'warning',
-        })
-        this.changeCurrentIndex(-99)
-        return false
-      }
-
-      // if (this.global.title === "") {
-      //     ElMessage({
-      //         message: t('diyTitlePlaceholder'),
-      //         type: 'warning'
-      //     })
-      //     this.changeCurrentIndex(-99);
-      //     return false;
-      // }
-
-      for (var i = 0; i < this.value.length; i++) {
-        try {
-          if (this.value[i].verify) {
-            var res = this.value[i].verify(i)
-            if (!res.code) {
-              this.changeCurrentIndex(i, this.value[i])
-              ElMessage({
-                message: res.message,
-                type: 'warning',
-              })
-              return false
+
+            // if (this.global.title === "") {
+            //     ElMessage({
+            //         message: t('diyTitlePlaceholder'),
+            //         type: 'warning'
+            //     })
+            //     this.changeCurrentIndex(-99);
+            //     return false;
+            // }
+
+            for (var i = 0; i < this.value.length; i++) {
+                try {
+                    if (this.value[i].verify) {
+                        var res = this.value[i].verify(i);
+                        if (!res.code) {
+                            this.changeCurrentIndex(i, this.value[i])
+                            ElMessage({
+                                message: res.message,
+                                type: 'warning'
+                            })
+                            return false;
+                        }
+                    }
+                } catch (e) {
+                    console.log("verify Error:", e, i, this.value[i]);
+                }
             }
-          }
-        } catch (e) {
-          console.log('verify Error:', e, i, this.value[i])
+            return true;
         }
-      }
-      return true
-    },
-  },
+    }
 })
 
 export default useDiyStore
diff --git a/admin/src/stores/modules/poster.ts b/admin/src/stores/modules/poster.ts
index 2aa94e9e..c1e2be89 100644
--- a/admin/src/stores/modules/poster.ts
+++ b/admin/src/stores/modules/poster.ts
@@ -1,813 +1,809 @@
-import { defineStore } from 'pinia'
-import { t } from '@/lang'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { cloneDeep } from 'lodash-es'
-import { img } from '@/utils/common'
+import {defineStore} from 'pinia'
+import {t} from '@/lang'
+import {ElMessage, ElMessageBox} from 'element-plus'
+import {cloneDeep} from 'lodash-es'
+import {img} from '@/utils/common'
 
 const usePosterStore = defineStore('poster', {
-  state: () => {
-    return {
-      contentBoxWidth: 720, // 360*2=720
-      contentBoxHeight: 1280, //  640*2=1280
-
-      id: 0,
-      name: '', // 页面名称
-      type: '', // 海报类型
-      typeName: '',
-      channel: '', // 海报支持的渠道
-      status: 1, // 是否启用
-      isDefault: 0, // 是否默认
-      addon: '', // 海报所属插件
-
-      currentIndex: -99, // 当前正在编辑的组件下标
-      currentComponent: 'edit-page', // 当前正在编辑的组件名称
-      predefineColors: [
-        '#F4391c',
-        '#ff4500',
-        '#ff8c00',
-        '#FFD009',
-        '#ffd700',
-        '#19C650',
-        '#90ee90',
-        '#00ced1',
-        '#1e90ff',
-        '#c71585',
-        '#FF407E',
-        '#CFAF70',
-        '#A253FF',
-        'rgba(255, 69, 0, 0.68)',
-        'rgb(255, 120, 0)',
-        'hsl(181, 100%, 37%)',
-        'hsla(209, 100%, 56%, 0.73)',
-        '#c7158577',
-      ],
-      components: <any>[], // 组件集合
-      global: {
-        width: 720, // 海报宽度
-        height: 1280, //  海报高度
-        bgType: 'url',
-        bgColor: '#ffffff', // 背景颜色
-        bgUrl: '', // 背景图片
-      },
-      // 组件类型，文本：text，image：图片，qrcode：二维码
-      template: {
-        width: 200, // 宽度
-        height: 200, // 高度
-        minWidth: 60, // 最小宽度
-        minHeight: 60, // 最小高度
-        x: 0, // 横向坐标 →
-        y: 0, // 纵向坐标 ↑
-        angle: 0, // 旋转角度 0~360
-        zIndex: 0, // 层级
-      },
-      // 各组件类型的默认值
-      templateType: {
-        text: {
-          height: 60,
-          minWidth: 120,
-          minHeight: 44,
-          fontFamily: 'static/font/SourceHanSansCN-Regular.ttf',
-          fontSize: 40,
-          weight: false,
-          lineHeight: 10,
-          fontColor: '#303133',
-        },
-        image: {
-          shape: 'normal', // 圆形 circle 方形  normal
-        },
-        qrcode: {},
-        // 绘画
-        draw: {
-          draw_type: 'Polygon',
-          points: [
-            [0, 1210],
-            [720, 1210],
-            [720, 1280],
-            [0, 1280],
-          ],
-          bgColor: '#eeeeee',
-        },
-      },
-      // 组件集合
-      value: <any>[],
-    }
-  },
-  getters: {
-    editComponent: (state) => {
-      if (state.currentIndex == -99) {
-        return state.global
-      } else {
-        return state.value[state.currentIndex]
-      }
-    },
-  },
-  actions: {
-    // 初始化数据
-    init() {
-      this.global = {
-        width: 720, // 海报宽度
-        height: 1280, //  海报高度
-        bgType: 'url',
-        bgColor: '#ffffff', // 页面背景颜色（开始）
-        bgUrl: '', // 页面背景图片
-      }
-      this.value = []
-    },
-    // 添加组件
-    addComponent(key: string, data: any) {
-      // 删除不用的字段
-      let component = cloneDeep(data)
-
-      component.id = this.generateRandom()
-      component.componentName = key
-      component.componentTitle = component.title
-
-      delete component.title
-      delete component.icon
-
-      // 继承默认属性
-      let template: any = cloneDeep(this.template)
-      Object.assign(component, template)
-
-      let templateType: any = cloneDeep(this.templateType)
-      Object.assign(component, templateType[component.type])
-
-      if (component.template) {
-        // 按照组件初始的属性覆盖默认值
-        Object.assign(component, component.template)
-        delete component.template
-      }
-
-      if (!this.checkComponentIsAdd(component)) {
-        // 组件最多只能添加n个
-        ElMessage({
-          type: 'warning',
-          message: `${component.componentTitle}${t('componentCanOnlyAdd')}${component.uses}${t('piece')}`,
-        })
-        return
-      }
-
-      component.zIndex = this.value.length + 1
-      this.value.push(component)
-      // 添加组件后（不是编辑调用的），选择最后一个
-      this.currentIndex = this.value.length - 1
-
-      this.currentComponent = 'edit-' + component.path
-    },
-    // 生成随机数
-    generateRandom(len: number = 5) {
-      return Number(
-        Math.random().toString().substr(3, len) + Date.now()
-      ).toString(36)
-    },
-    // 选中正在编辑的组件
-    changeCurrentIndex(index: number, component: any = null) {
-      this.currentIndex = index
-      if (this.currentIndex == -99) {
-        this.currentComponent = 'edit-page'
-      } else if (component) {
-        this.currentComponent = 'edit-' + component.path
-      }
-    },
-    // 删除组件
-    delComponent() {
-      if (this.currentIndex == -99) return
-
-      ElMessageBox.confirm(t('delComponentTips'), t('warning'), {
-        confirmButtonText: t('confirm'),
-        cancelButtonText: t('cancel'),
-        type: 'warning',
-        autofocus: false,
-      })
-        .then(() => {
-          this.value.splice(this.currentIndex, 1)
-
-          // 如果组件全部删除，则选中页面设置
-          if (this.value.length === 0) {
-            this.currentIndex = -99
-          }
-
-          // 如果当前选中的组件不存在，则选择上一个
-          if (this.currentIndex === this.value.length) {
-            this.currentIndex--
-          }
-
-          let component = cloneDeep(this.value[this.currentIndex])
-          this.changeCurrentIndex(this.currentIndex, component)
-        })
-        .catch(() => {})
+    state: () => {
+        return {
+
+            contentBoxWidth: 720, // 360*2=720
+            contentBoxHeight: 1280, //  640*2=1280
+
+            id: 0,
+            name: '', // 页面名称
+            type: '', // 海报类型
+            typeName: '',
+            channel: '', // 海报支持的渠道
+            status: 1, // 是否启用
+            isDefault: 0, // 是否默认
+            addon: '', // 海报所属插件
+
+            currentIndex: -99, // 当前正在编辑的组件下标
+            currentComponent: 'edit-page', // 当前正在编辑的组件名称
+            predefineColors: [
+                '#F4391c',
+                '#ff4500',
+                '#ff8c00',
+                '#FFD009',
+                '#ffd700',
+                '#19C650',
+                '#90ee90',
+                '#00ced1',
+                '#1e90ff',
+                '#c71585',
+                '#FF407E',
+                '#CFAF70',
+                '#A253FF',
+                'rgba(255, 69, 0, 0.68)',
+                'rgb(255, 120, 0)',
+                'hsl(181, 100%, 37%)',
+                'hsla(209, 100%, 56%, 0.73)',
+                '#c7158577'
+            ],
+            components: <any>[], // 组件集合
+            global: {
+                width: 720, // 海报宽度
+                height: 1280, //  海报高度
+                bgType: 'url',
+                bgColor: "#ffffff", // 背景颜色
+                bgUrl: '', // 背景图片
+            },
+            // 组件类型，文本：text，image：图片，qrcode：二维码
+            template: {
+                width: 200, // 宽度
+                height: 200, // 高度
+                minWidth: 60, // 最小宽度
+                minHeight: 60, // 最小高度
+                x: 0, // 横向坐标 → 
+                y: 0, // 纵向坐标 ↑
+                angle: 0, // 旋转角度 0~360
+                zIndex: 0 // 层级
+            },
+            // 各组件类型的默认值
+            templateType: {
+                text: {
+                    height: 60,
+                    minWidth: 120,
+                    minHeight: 44,
+                    fontFamily: 'static/font/SourceHanSansCN-Regular.ttf',
+                    fontSize: 40,
+                    weight: false,
+                    lineHeight: 10,
+                    fontColor: '#303133'
+                },
+                image: {
+                    shape: 'normal' // 圆形 circle 方形  normal
+                },
+                qrcode: {},
+                // 绘画
+                draw: {
+                    draw_type: 'Polygon',
+                    points: [[0, 1210], [720, 1210], [720, 1280], [0, 1280]],
+                    bgColor: '#eeeeee'
+                }
+            },
+            // 组件集合
+            value: <any>[]
+        }
     },
-    // 上移一层组件
-    moveUpComponent() {
-      if (this.currentIndex < -1) return // 从0开始
-
-      this.value[this.currentIndex].zIndex++
-      if (this.value[this.currentIndex].zIndex >= this.value.length) {
-        this.value[this.currentIndex].zIndex = this.value.length
-      }
+    getters: {
+        editComponent: (state) => {
+            if (state.currentIndex == -99) {
+                return state.global;
+            } else {
+                return state.value[state.currentIndex];
+            }
+        },
     },
-    // 下移一层组件
-    moveDownComponent() {
-      if (this.currentIndex < -1) return // 从0开始
+    actions: {
+        // 初始化数据
+        init() {
+            this.global = {
+                width: 720, // 海报宽度
+                height: 1280, //  海报高度
+                bgType: 'url',
+                bgColor: "#ffffff", // 页面背景颜色（开始）
+                bgUrl: '' // 页面背景图片
+            };
+            this.value = [];
+        },
+        // 添加组件
+        addComponent(key: string, data: any) {
 
-      this.value[this.currentIndex].zIndex--
+            // 删除不用的字段
+            let component = cloneDeep(data);
 
-      if (this.value[this.currentIndex].zIndex < 0) {
-        this.value[this.currentIndex].zIndex = 0
-      }
-    },
-    // 复制组件
-    copyComponent() {
-      if (this.currentIndex < 0) return // 从0开始
-
-      let component = cloneDeep(this.value[this.currentIndex]) // 当前选中组件
-
-      component.id = this.generateRandom() // 更新id，刷新组件数据
-      component.x = 0 // 重置坐标
-      component.y = 0 // 重置坐标
-
-      // 暂不复制宽高
-      // let box: any = document.getElementById(this.value[this.currentIndex].id)
-      // component.width = box.offsetWidth
-      // component.height = box.offsetHeight
-      // component.auto = false;
-
-      if (!this.checkComponentIsAdd(component)) {
-        ElMessage({
-          type: 'warning',
-          message: `${t('notCopy')}，${component.componentTitle}${t('componentCanOnlyAdd')}${component.uses}${t('piece')}`,
-        })
-        return
-      }
-
-      var index = this.currentIndex + 1
-      this.value.splice(index, 0, component)
-
-      this.changeCurrentIndex(index, component)
-    },
-    // 检测组件是否允许添加，true：允许 false：不允许
-    checkComponentIsAdd(component: any) {
-      //为0时不处理
-      if (component.uses === 0) return true
+            component.id = this.generateRandom();
+            component.componentName = key;
+            component.componentTitle = component.title;
 
-      var count = 0
+            delete component.title;
+            delete component.icon;
 
-      //遍历已添加的自定义组件，检测是否超出数量
-      for (var i in this.value)
-        if (this.value[i].componentName === component.componentName) count++
+            // 继承默认属性
+            let template: any = cloneDeep(this.template);
+            Object.assign(component, template);
 
-      if (count >= component.uses) return false
-      else return true
-    },
-    // 重置当前组件数据
-    resetComponent() {
-      if (this.currentIndex < 0) return // 从0开始
-
-      ElMessageBox.confirm(t('resetComponentTips'), t('warning'), {
-        confirmButtonText: t('confirm'),
-        cancelButtonText: t('cancel'),
-        type: 'warning',
-        autofocus: false,
-      })
-        .then(() => {
-          // 重置当前选中的组件数据
-          for (let i = 0; i < this.components.length; i++) {
-            if (
-              this.components[i].componentName ==
-              this.editComponent.componentName
-            ) {
-              Object.assign(this.editComponent, this.components[i])
-
-              let templateType: any = cloneDeep(this.templateType)
-              Object.assign(
-                this.editComponent,
-                templateType[this.editComponent.type]
-              )
-              this.editComponent.angle = 0
-              break
+            let templateType: any = cloneDeep(this.templateType);
+            Object.assign(component, templateType[component.type]);
+
+            if (component.template) {
+                // 按照组件初始的属性覆盖默认值
+                Object.assign(component, component.template);
+                delete component.template;
             }
-          }
-        })
-        .catch(() => {})
-    },
-    // 组件验证
-    verify() {
-      if (this.name === '') {
-        ElMessage({
-          message: t('posterNamePlaceholder'),
-          type: 'warning',
-        })
-        this.changeCurrentIndex(-99)
-        return false
-      }
-
-      if (this.value.length == 0) {
-        ElMessage({
-          message: t('diyPosterValueEmptyTips'),
-          type: 'warning',
-        })
-        this.changeCurrentIndex(-99)
-        return false
-      }
-
-      for (var i = 0; i < this.value.length; i++) {
-        try {
-          if (this.value[i].verify) {
-            var res = this.value[i].verify(i)
-            if (!res.code) {
-              this.changeCurrentIndex(i, this.value[i])
-              ElMessage({
-                message: res.message,
-                type: 'warning',
-              })
-              return false
+
+            if (!this.checkComponentIsAdd(component)) {
+                // 组件最多只能添加n个
+                ElMessage({
+                    type: 'warning',
+                    message: `${component.componentTitle}${t('componentCanOnlyAdd')}${component.uses}${t('piece')}`,
+                });
+                return;
             }
-          }
-        } catch (e) {
-          console.log('verify Error:', e, i, this.value[i])
-        }
-      }
-      return true
-    },
-    // 移动事件
-    mouseDown(e: any, id: any, index: any) {
-      const box: any = document.getElementById(id)
-      const disX = e.clientX * 2 - box.offsetLeft
-      const disY = e.clientY * 2 - box.offsetTop
-
-      // 鼠标移动时
-      document.onmousemove = (e) => {
-        let clientX = e.clientX * 2
-        let clientY = e.clientY * 2
-
-        if (this.contentBoxWidth == box.offsetWidth) {
-          box.style.left = 0
-        } else {
-          box.style.left = clientX - disX + 'px'
-        }
-        box.style.top = clientY - disY + 'px'
 
-        // 边界判断
-        if (clientX - disX < 0) {
-          box.style.left = 0
-        }
+            component.zIndex = this.value.length + 1;
+            this.value.push(component);
+            // 添加组件后（不是编辑调用的），选择最后一个
+            this.currentIndex = this.value.length - 1;
 
-        if (clientX - disX > this.contentBoxWidth - box.offsetWidth) {
-          box.style.left = this.contentBoxWidth - box.offsetWidth + 'px'
-        }
+            this.currentComponent = 'edit-' + component.path;
+        },
+        // 生成随机数
+        generateRandom(len: number = 5) {
+            return Number(Math.random().toString().substr(3, len) + Date.now()).toString(36);
+        },
+        // 选中正在编辑的组件
+        changeCurrentIndex(index: number, component: any = null) {
+            this.currentIndex = index;
+            if (this.currentIndex == -99) {
+                this.currentComponent = 'edit-page';
+            } else if (component) {
+                this.currentComponent = 'edit-' + component.path;
+            }
+        },
+        // 删除组件
+        delComponent() {
+            if (this.currentIndex == -99) return;
+
+            ElMessageBox.confirm(
+                t('delComponentTips'),
+                t('warning'),
+                {
+                    confirmButtonText: t('confirm'),
+                    cancelButtonText: t('cancel'),
+                    type: 'warning',
+                    autofocus: false
+                }
+            ).then(() => {
+                this.value.splice(this.currentIndex, 1);
+
+                // 如果组件全部删除，则选中页面设置
+                if (this.value.length === 0) {
+                    this.currentIndex = -99;
+                }
+
+                // 如果当前选中的组件不存在，则选择上一个
+                if (this.currentIndex === this.value.length) {
+                    this.currentIndex--;
+                }
+
+                let component = cloneDeep(this.value[this.currentIndex]);
+                this.changeCurrentIndex(this.currentIndex, component)
+
+            }).catch(() => {
+            })
 
-        if (clientY - disY < 0) {
-          box.style.top = 0
-        }
+        },
+        // 上移一层组件
+        moveUpComponent() {
+            if (this.currentIndex < -1) return; // 从0开始
 
-        if (clientY - disY > this.contentBoxHeight - box.offsetHeight) {
-          box.style.top = this.contentBoxHeight - box.offsetHeight + 'px'
-        }
+            this.value[this.currentIndex].zIndex++;
+            if (this.value[this.currentIndex].zIndex >= this.value.length) {
+                this.value[this.currentIndex].zIndex = this.value.length;
+            }
 
-        this.value[index].x = box.offsetLeft
-        this.value[index].y = box.offsetTop
-      }
+        },
+        // 下移一层组件
+        moveDownComponent() {
+            if (this.currentIndex < -1) return; // 从0开始
 
-      // 鼠标抬起时
-      document.onmouseup = (e) => {
-        document.onmousemove = null
-      }
-    },
-    // 拖拽缩放事件
-    resizeMouseDown(e: any, item: any, index: any) {
-      const oEv = e
-      oEv.stopPropagation()
-      const box: any = document.getElementById(item.id)
-      const className = e.target.className
-
-      // 获取移动前盒子的宽高，
-      const oldWidth = box.offsetWidth
-      const oldHeight = box.offsetHeight
-
-      // 获取鼠标距离屏幕的left和top值
-      const oldX = oEv.clientX
-      const oldY = oEv.clientY
-
-      // 元素相对于最近的父级定位
-      const oldLeft = box.offsetLeft
-      const oldTop = box.offsetTop
-
-      // 设置最小的宽度
-      let minWidth = 100
-      let minHeight = 100
-
-      if (item.type == 'text') {
-        // 文本类型
-        minWidth = 60
-        minHeight = 22
-      } else if (item.type == 'image' || item.type == 'qrcode') {
-        // 图片类型
-        minWidth = 30
-        minHeight = 30
-      } else if (item.type == 'draw') {
-        // 绘画类型
-        minWidth = 20
-        minHeight = 20
-      }
-
-      document.onmousemove = (e) => {
-        const oEv = e
-        // console.log('move', "width：" + oldWidth,
-        //     '，oldLeft: ' + oldLeft, '，oldTop: ' + oldTop,
-        //     '，oldX：clientX-- ' + oldX + '：' + oEv.clientX,
-        //     '，oldY：clientY-- ' + oldY + '：' + oEv.clientY,
-        // )
-
-        // 左上角
-        if (className == 'box1') {
-          let width = oldWidth - (oEv.clientX - oldX)
-          const maxWidth = this.contentBoxWidth
-
-          let height = oldHeight - (oEv.clientY - oldY)
-          const maxHeight = this.contentBoxHeight - oldTop
-
-          let left = oldLeft + (oEv.clientX - oldX)
-          let top = oldTop + (oEv.clientY - oldY)
-
-          if (width < minWidth) {
-            width = minWidth
-          }
-          if (width > maxWidth) {
-            width = maxWidth
-          }
-
-          if (height < minHeight) {
-            height = minHeight
-          }
-          if (height > maxHeight) {
-            height = maxHeight
-          }
-
-          if (oldLeft == 0 && oldTop == 0) {
-            // 坐标：left = 0，top = 0
-
-            if (width == minWidth && height == minHeight) {
-              // 宽高 = 最小值，left = 最小宽度，top = 最小高度
-              left = minWidth
-              top = minHeight
-            } else if (width == minWidth && height > minHeight) {
-              // 宽 = 最小值，高 > 最小值，left = 最小宽度，top = 不予处理
-              left = minWidth
-            } else if (width > minWidth && height == minHeight) {
-              // 宽 > 最小值，高 = 最小值，left = 不予处理，top = 最小高度
-              top = minHeight
-            } else if (width > minWidth && height > minHeight) {
-              // 宽 > 最小值，高 > 最小值，left = 不予处理，top = 不予处理
-            }
-          } else if (oldLeft == 0 && oldTop > 0) {
-            // 坐标：left = 0，top > 0
-
-            if (width == minWidth && height == minHeight) {
-              // 宽高 = 最小值，left = 最小宽度，top = 元素上偏移位置
-              left = minWidth
-              top = box.offsetTop
-            } else if (width == minWidth && height > minHeight) {
-              // 宽 = 最小值，高 > 最小值，left = 最小宽度，top = 元素上偏移位置
-              left = minWidth
-              top = box.offsetTop
-            } else if (width > minWidth && height == minHeight) {
-              // 宽 > 最小值，高 = 最小值，left = 不予处理，top = 元素上偏移位置
-              top = box.offsetTop
-            } else if (width > minWidth && height > minHeight) {
-              // 宽 > 最小值，高 > 最小值，left = 不予处理，top = 不予处理
+            this.value[this.currentIndex].zIndex--;
+
+            if (this.value[this.currentIndex].zIndex < 0) {
+                this.value[this.currentIndex].zIndex = 0;
             }
-          } else if (oldLeft > 0 && oldTop == 0) {
-            // 坐标：left > 0，top = 0
-
-            if (width == minWidth && height == minHeight) {
-              // 宽高 = 最小值，left = 元素左偏移位置，top = 元素上偏移位置
-              left = box.offsetLeft
-              top = box.offsetTop
-            } else if (width == minWidth && height > minHeight) {
-              // 宽 = 最小值，高 > 最小值，left = 元素左偏移位置，top = 0
-              left = box.offsetLeft
-              top = 0
-            } else if (width > minWidth && height == minHeight) {
-              // 宽 > 最小值，高 = 最小值，left = 不予处理，top = 元素上偏移位置
-              top = box.offsetTop
-            } else if (width > minWidth && height > minHeight) {
-              // 宽 > 最小值，高 > 最小值，left = 不予处理，top = 不予处理
+        },
+        // 复制组件
+        copyComponent() {
+            if (this.currentIndex < 0) return; // 从0开始
+
+            let component = cloneDeep(this.value[this.currentIndex]); // 当前选中组件
+
+            component.id = this.generateRandom(); // 更新id，刷新组件数据
+            component.x = 0; // 重置坐标
+            component.y = 0; // 重置坐标
+
+            // 暂不复制宽高
+            // let box: any = document.getElementById(this.value[this.currentIndex].id)
+            // component.width = box.offsetWidth
+            // component.height = box.offsetHeight
+            // component.auto = false;
+
+            if (!this.checkComponentIsAdd(component)) {
+                ElMessage({
+                    type: 'warning',
+                    message: `${t('notCopy')}，${component.componentTitle}${t('componentCanOnlyAdd')}${component.uses}${t('piece')}`,
+                });
+                return;
             }
-          } else if (oldLeft > 0 && oldTop > 0) {
-            // 坐标：left > 0，top > 0
-
-            if (width == minWidth && height == minHeight) {
-              // 宽高 = 最小值，left = 元素左偏移位置，top = 元素上偏移位置
-              left = box.offsetLeft
-              top = box.offsetTop
-            } else if (width == minWidth && height > minHeight) {
-              // 宽 = 最小值，高 > 最小值，left = 元素左偏移位置，top = 元素上偏移位置
-              left = box.offsetLeft
-              top = box.offsetTop
-            } else if (width > minWidth && height == minHeight) {
-              // 宽 > 最小值，高 = 最小值，left = 不予处理，top = 元素上偏移位置
-              top = box.offsetTop
-            } else if (width > minWidth && height > minHeight) {
-              // 宽 > 最小值，高 > 最小值，left = 不予处理，top = 不予处理
+
+            var index = this.currentIndex + 1;
+            this.value.splice(index, 0, component);
+
+            this.changeCurrentIndex(index, component);
+        },
+        // 检测组件是否允许添加，true：允许 false：不允许
+        checkComponentIsAdd(component: any) {
+
+            //为0时不处理
+            if (component.uses === 0) return true;
+
+            var count = 0;
+
+            //遍历已添加的自定义组件，检测是否超出数量
+            for (var i in this.value) if (this.value[i].componentName === component.componentName) count++;
+
+            if (count >= component.uses) return false;
+            else return true;
+        },
+        // 重置当前组件数据
+        resetComponent() {
+            if (this.currentIndex < 0) return; // 从0开始
+
+            ElMessageBox.confirm(
+                t('resetComponentTips'),
+                t('warning'),
+                {
+                    confirmButtonText: t('confirm'),
+                    cancelButtonText: t('cancel'),
+                    type: 'warning',
+                    autofocus: false
+                }
+            ).then(() => {
+                // 重置当前选中的组件数据
+                for (let i = 0; i < this.components.length; i++) {
+                    if (this.components[i].componentName == this.editComponent.componentName) {
+                        Object.assign(this.editComponent, this.components[i]);
+
+                        let templateType: any = cloneDeep(this.templateType);
+                        Object.assign(this.editComponent, templateType[this.editComponent.type]);
+                        this.editComponent.angle = 0;
+                        break;
+                    }
+                }
+
+            }).catch(() => {
+            })
+
+        },
+        // 组件验证
+        verify() {
+            if (this.name === "") {
+                ElMessage({
+                    message: t('posterNamePlaceholder'),
+                    type: 'warning'
+                });
+                this.changeCurrentIndex(-99);
+                return false;
             }
-          }
-
-          // 左上宽
-          if (left < 0) {
-            left = 0
-            width =
-              oldWidth - (oEv.clientX - oldX) + (oldLeft + (oEv.clientX - oldX))
-          }
-
-          // 左上 高
-          if (top < 0) {
-            top = 0
-            height =
-              oldTop + (oEv.clientY - oldY) + (oldHeight - (oEv.clientY - oldY))
-          }
-
-          box.children[0].style.width = width + 'px'
-
-          // 文本设置高度，图片自适应 无需设置
-          if (item.type == 'text' || item.type == 'draw') {
-            box.children[0].style.height = height + 'px'
-          }
-          box.style.left = left + 'px'
-          box.style.top = top + 'px'
-        } else if (className == 'box2') {
-          // 右上角
-
-          let width = oldWidth + (oEv.clientX - oldX)
-          const maxWidth = this.contentBoxWidth - oldLeft
-
-          let height = oldHeight - (oEv.clientY - oldY)
-          const maxHeight = this.contentBoxHeight - oldTop
-
-          let top = oldTop + (oEv.clientY - oldY)
-
-          if (width < minWidth) {
-            width = minWidth
-          }
-          if (width > maxWidth) {
-            width = maxWidth
-          }
-
-          if (height < minHeight) {
-            height = minHeight
-          }
-          if (height > maxHeight) {
-            height = maxHeight
-          }
-
-          if (oldLeft == 0 && oldTop == 0) {
-            // 坐标：left = 0，top = 0
-
-            if (width == minWidth && height == minHeight) {
-              // 宽高 = 最小值，top = 最小高度
-              top = minHeight
-            } else if (width == minWidth && height > minHeight) {
-              // 宽 = 最小值，高 > 最小值，不予处理
-            } else if (width > minWidth && height == minHeight) {
-              // 宽 > 最小值，高 = 最小值，top = 最小高度
-              top = minHeight
-            } else if (width > minWidth && height > minHeight) {
-              // 宽 > 最小值，高 > 最小值，不予处理
+
+            if (this.value.length == 0) {
+                ElMessage({
+                    message: t('diyPosterValueEmptyTips'),
+                    type: 'warning'
+                });
+                this.changeCurrentIndex(-99);
+                return false;
             }
-          } else if (oldLeft == 0 && oldTop > 0) {
-            // 坐标：left = 0，top > 0
-
-            if (width == minWidth && height == minHeight) {
-              // 宽高 = 最小值，top = 元素上偏移位置
-              top = box.offsetTop
-            } else if (width == minWidth && height > minHeight) {
-              // 宽 = 最小值，高 > 最小值，top = 元素上偏移位置
-              top = box.offsetTop
-            } else if (width > minWidth && height == minHeight) {
-              // 宽 > 最小值，高 = 最小值，top = 元素上偏移位置
-              top = box.offsetTop
-            } else if (width > minWidth && height > minHeight) {
-              // 宽 > 最小值，高 > 最小值，不予处理
+
+            for (var i = 0; i < this.value.length; i++) {
+                try {
+                    if (this.value[i].verify) {
+                        var res = this.value[i].verify(i);
+                        if (!res.code) {
+                            this.changeCurrentIndex(i, this.value[i]);
+                            ElMessage({
+                                message: res.message,
+                                type: 'warning'
+                            });
+                            return false;
+                        }
+                    }
+                } catch (e) {
+                    console.log("verify Error:", e, i, this.value[i]);
+                }
             }
-          } else if (oldLeft > 0 && oldTop == 0) {
-            // 坐标：left = 0，top = 0
-
-            if (width == minWidth && height == minHeight) {
-              // 宽高 = 最小值，top = 元素上偏移位置
-              top = box.offsetTop
-            } else if (width == minWidth && height > minHeight) {
-              // 宽 = 最小值，高 > 最小值，top = 0
-              top = 0
-            } else if (width > minWidth && height == minHeight) {
-              // 宽 > 最小值，高 = 最小值，top = 元素上偏移位置
-              top = box.offsetTop
-            } else if (width > minWidth && height > minHeight) {
-              // 宽 > 最小值，高 > 最小值，不予处理
+            return true;
+        },
+        // 移动事件
+        mouseDown(e: any, id: any, index: any) {
+            const box: any = document.getElementById(id);
+            const disX = (e.clientX * 2 ) - box.offsetLeft;
+            const disY = (e.clientY * 2 ) - box.offsetTop;
+
+            // 鼠标移动时
+            document.onmousemove = (e) => {
+                let clientX = e.clientX * 2;
+                let clientY = e.clientY * 2;
+                
+                if (this.contentBoxWidth == box.offsetWidth) {
+                    box.style.left = 0
+                } else {
+                    box.style.left = (clientX - disX)  + 'px'
+                }
+                box.style.top = (clientY - disY)  + 'px';
+
+                // 边界判断
+                if (clientX - disX < 0) {
+                    box.style.left = 0
+                }
+
+                if (clientX - disX > this.contentBoxWidth - box.offsetWidth) {
+                    box.style.left = this.contentBoxWidth - box.offsetWidth + 'px'
+                }
+
+                if (clientY - disY < 0) {
+                    box.style.top = 0
+                }
+
+                if (clientY - disY > this.contentBoxHeight - box.offsetHeight) {
+                    box.style.top = this.contentBoxHeight - box.offsetHeight + 'px'
+                }
+                
+                this.value[index].x = box.offsetLeft;
+                this.value[index].y = box.offsetTop;
+
+            };
+
+            // 鼠标抬起时
+            document.onmouseup = (e) => {
+                document.onmousemove = null
             }
-          } else if (oldLeft > 0 && oldTop > 0) {
-            // 坐标：left > 0，top > 0
-
-            if (width == minWidth && height == minHeight) {
-              // 宽高 = 最小值，top = 元素上偏移位置
-              top = box.offsetTop
-            } else if (width == minWidth && height > minHeight) {
-              // 宽 = 最小值，高 > 最小值，top = 元素上偏移位置
-              top = box.offsetTop
-            } else if (width > minWidth && height == minHeight) {
-              // 宽 > 最小值，高 = 最小值，top = 元素上偏移位置
-              top = box.offsetTop
-            } else if (width > minWidth && height > minHeight) {
-              // 宽 > 最小值，高 > 最小值，不予处理
+        },
+        // 拖拽缩放事件
+        resizeMouseDown(e: any, item: any, index: any) {
+            const oEv = e;
+            oEv.stopPropagation();
+            const box: any = document.getElementById(item.id);
+            const className = e.target.className;
+
+            // 获取移动前盒子的宽高，
+            const oldWidth = box.offsetWidth;
+            const oldHeight = box.offsetHeight;
+
+            // 获取鼠标距离屏幕的left和top值
+            const oldX = oEv.clientX;
+            const oldY = oEv.clientY;
+
+            // 元素相对于最近的父级定位
+            const oldLeft = box.offsetLeft;
+            const oldTop = box.offsetTop;
+
+            // 设置最小的宽度
+            let minWidth = 100;
+            let minHeight = 100;
+
+            if (item.type == 'text') {
+                // 文本类型
+                minWidth = 60;
+                minHeight = 22;
+            } else if (item.type == 'image' || item.type == 'qrcode') {
+                // 图片类型
+                minWidth = 30;
+                minHeight = 30;
+            } else if (item.type == 'draw') {
+                // 绘画类型
+                minWidth = 20;
+                minHeight = 20;
             }
-          }
-
-          // 右上高
-          if (top < 0) {
-            top = 0
-            height =
-              oldTop + (oEv.clientY - oldY) + (oldHeight - (oEv.clientY - oldY))
-          }
-
-          box.children[0].style.width = width + 'px'
-
-          // 文本设置高度，图片自适应 无需设置
-          if (item.type == 'text' || item.type == 'draw') {
-            box.children[0].style.height = height + 'px'
-          }
-          box.style.top = top + 'px'
-        } else if (className == 'box3') {
-          // 左下角
-
-          let width = oldWidth - (oEv.clientX - oldX)
-          const maxWidth = this.contentBoxWidth
-
-          let height = oldHeight + (oEv.clientY - oldY)
-          const maxHeight = this.contentBoxHeight - oldTop
-
-          let left = oldLeft + (oEv.clientX - oldX)
-
-          if (width < minWidth) {
-            width = minWidth
-          }
-          if (width > maxWidth) {
-            width = maxWidth
-          }
-
-          if (height < minHeight) {
-            height = minHeight
-          }
-          if (height > maxHeight) {
-            height = maxHeight
-          }
-
-          if (oldLeft == 0 && oldTop == 0) {
-            // 坐标：left = 0，top = 0
-
-            if (width == minWidth && height == minHeight) {
-              // 宽高 = 最小值，left = 最小宽度
-              left = minWidth
-            } else if (width == minWidth && height > minHeight) {
-              // 宽 = 最小值，高 > 最小值，left = 最小宽度
-              left = minWidth
-            } else if (width > minWidth && height == minHeight) {
-              // 宽 > 最小值，高 = 最小值，不予处理
-            } else if (width > minWidth && height > minHeight) {
-              // 宽 > 最小值，高 > 最小值，不予处理
+
+            document.onmousemove = (e) => {
+                const oEv = e;
+                // console.log('move', "width：" + oldWidth,
+                //     '，oldLeft: ' + oldLeft, '，oldTop: ' + oldTop,
+                //     '，oldX：clientX-- ' + oldX + '：' + oEv.clientX,
+                //     '，oldY：clientY-- ' + oldY + '：' + oEv.clientY,
+                // )
+
+                // 左上角
+                if (className == 'box1') {
+                    let width = oldWidth - (oEv.clientX - oldX);
+                    const maxWidth = this.contentBoxWidth;
+
+                    let height = oldHeight - (oEv.clientY - oldY);
+                    const maxHeight = this.contentBoxHeight - oldTop;
+
+                    let left = oldLeft + (oEv.clientX - oldX);
+                    let top = oldTop + (oEv.clientY - oldY);
+
+                    if (width < minWidth) {
+                        width = minWidth
+                    }
+                    if (width > maxWidth) {
+                        width = maxWidth
+                    }
+
+                    if (height < minHeight) {
+                        height = minHeight
+                    }
+                    if (height > maxHeight) {
+                        height = maxHeight
+                    }
+
+                    if (oldLeft == 0 && oldTop == 0) {
+                        // 坐标：left = 0，top = 0
+
+                        if (width == minWidth && height == minHeight) {
+                            // 宽高 = 最小值，left = 最小宽度，top = 最小高度
+                            left = minWidth;
+                            top = minHeight;
+                        } else if (width == minWidth && height > minHeight) {
+                            // 宽 = 最小值，高 > 最小值，left = 最小宽度，top = 不予处理
+                            left = minWidth;
+                        } else if (width > minWidth && height == minHeight) {
+                            // 宽 > 最小值，高 = 最小值，left = 不予处理，top = 最小高度
+                            top = minHeight;
+                        } else if (width > minWidth && height > minHeight) {
+                            // 宽 > 最小值，高 > 最小值，left = 不予处理，top = 不予处理
+                        }
+                    } else if (oldLeft == 0 && oldTop > 0) {
+                        // 坐标：left = 0，top > 0
+
+                        if (width == minWidth && height == minHeight) {
+                            // 宽高 = 最小值，left = 最小宽度，top = 元素上偏移位置
+                            left = minWidth;
+                            top = box.offsetTop;
+                        } else if (width == minWidth && height > minHeight) {
+                            // 宽 = 最小值，高 > 最小值，left = 最小宽度，top = 元素上偏移位置
+                            left = minWidth;
+                            top = box.offsetTop;
+                        } else if (width > minWidth && height == minHeight) {
+                            // 宽 > 最小值，高 = 最小值，left = 不予处理，top = 元素上偏移位置
+                            top = box.offsetTop;
+                        } else if (width > minWidth && height > minHeight) {
+                            // 宽 > 最小值，高 > 最小值，left = 不予处理，top = 不予处理
+                        }
+                    } else if (oldLeft > 0 && oldTop == 0) {
+                        // 坐标：left > 0，top = 0
+
+                        if (width == minWidth && height == minHeight) {
+                            // 宽高 = 最小值，left = 元素左偏移位置，top = 元素上偏移位置
+                            left = box.offsetLeft;
+                            top = box.offsetTop;
+                        } else if (width == minWidth && height > minHeight) {
+                            // 宽 = 最小值，高 > 最小值，left = 元素左偏移位置，top = 0
+                            left = box.offsetLeft;
+                            top = 0;
+                        } else if (width > minWidth && height == minHeight) {
+                            // 宽 > 最小值，高 = 最小值，left = 不予处理，top = 元素上偏移位置
+                            top = box.offsetTop;
+                        } else if (width > minWidth && height > minHeight) {
+                            // 宽 > 最小值，高 > 最小值，left = 不予处理，top = 不予处理
+                        }
+                    } else if (oldLeft > 0 && oldTop > 0) {
+                        // 坐标：left > 0，top > 0
+
+                        if (width == minWidth && height == minHeight) {
+                            // 宽高 = 最小值，left = 元素左偏移位置，top = 元素上偏移位置
+                            left = box.offsetLeft;
+                            top = box.offsetTop;
+                        } else if (width == minWidth && height > minHeight) {
+                            // 宽 = 最小值，高 > 最小值，left = 元素左偏移位置，top = 元素上偏移位置
+                            left = box.offsetLeft;
+                            top = box.offsetTop;
+                        } else if (width > minWidth && height == minHeight) {
+                            // 宽 > 最小值，高 = 最小值，left = 不予处理，top = 元素上偏移位置
+                            top = box.offsetTop;
+                        } else if (width > minWidth && height > minHeight) {
+                            // 宽 > 最小值，高 > 最小值，left = 不予处理，top = 不予处理
+                        }
+                    }
+
+                    // 左上宽
+                    if (left < 0) {
+                        left = 0;
+                        width = oldWidth - (oEv.clientX - oldX) + (oldLeft + (oEv.clientX - oldX));
+                    }
+
+                    // 左上 高
+                    if (top < 0) {
+                        top = 0;
+                        height = oldTop + (oEv.clientY - oldY) + (oldHeight - (oEv.clientY - oldY));
+                    }
+
+                    box.children[0].style.width = width + 'px';
+
+                    // 文本设置高度，图片自适应 无需设置
+                    if (item.type == 'text' || item.type == 'draw') {
+                        box.children[0].style.height = height + 'px';
+                    }
+                    box.style.left = left + 'px';
+                    box.style.top = top + 'px';
+                } else if (className == 'box2') {
+                    // 右上角
+
+                    let width = oldWidth + (oEv.clientX - oldX);
+                    const maxWidth = this.contentBoxWidth - oldLeft;
+
+                    let height = oldHeight - (oEv.clientY - oldY);
+                    const maxHeight = this.contentBoxHeight - oldTop;
+
+                    let top = oldTop + (oEv.clientY - oldY);
+
+                    if (width < minWidth) {
+                        width = minWidth
+                    }
+                    if (width > maxWidth) {
+                        width = maxWidth
+                    }
+
+                    if (height < minHeight) {
+                        height = minHeight
+                    }
+                    if (height > maxHeight) {
+                        height = maxHeight
+                    }
+
+                    if (oldLeft == 0 && oldTop == 0) {
+                        // 坐标：left = 0，top = 0
+
+                        if (width == minWidth && height == minHeight) {
+                            // 宽高 = 最小值，top = 最小高度
+                            top = minHeight
+                        } else if (width == minWidth && height > minHeight) {
+                            // 宽 = 最小值，高 > 最小值，不予处理
+                        } else if (width > minWidth && height == minHeight) {
+                            // 宽 > 最小值，高 = 最小值，top = 最小高度
+                            top = minHeight
+                        } else if (width > minWidth && height > minHeight) {
+                            // 宽 > 最小值，高 > 最小值，不予处理
+                        }
+                    } else if (oldLeft == 0 && oldTop > 0) {
+                        // 坐标：left = 0，top > 0
+
+                        if (width == minWidth && height == minHeight) {
+                            // 宽高 = 最小值，top = 元素上偏移位置
+                            top = box.offsetTop
+                        } else if (width == minWidth && height > minHeight) {
+                            // 宽 = 最小值，高 > 最小值，top = 元素上偏移位置
+                            top = box.offsetTop
+                        } else if (width > minWidth && height == minHeight) {
+                            // 宽 > 最小值，高 = 最小值，top = 元素上偏移位置
+                            top = box.offsetTop
+                        } else if (width > minWidth && height > minHeight) {
+                            // 宽 > 最小值，高 > 最小值，不予处理
+                        }
+                    } else if (oldLeft > 0 && oldTop == 0) {
+                        // 坐标：left = 0，top = 0
+
+                        if (width == minWidth && height == minHeight) {
+                            // 宽高 = 最小值，top = 元素上偏移位置
+                            top = box.offsetTop
+                        } else if (width == minWidth && height > minHeight) {
+                            // 宽 = 最小值，高 > 最小值，top = 0
+                            top = 0
+                        } else if (width > minWidth && height == minHeight) {
+                            // 宽 > 最小值，高 = 最小值，top = 元素上偏移位置
+                            top = box.offsetTop
+                        } else if (width > minWidth && height > minHeight) {
+                            // 宽 > 最小值，高 > 最小值，不予处理
+                        }
+                    } else if (oldLeft > 0 && oldTop > 0) {
+                        // 坐标：left > 0，top > 0
+
+                        if (width == minWidth && height == minHeight) {
+                            // 宽高 = 最小值，top = 元素上偏移位置
+                            top = box.offsetTop
+                        } else if (width == minWidth && height > minHeight) {
+                            // 宽 = 最小值，高 > 最小值，top = 元素上偏移位置
+                            top = box.offsetTop
+                        } else if (width > minWidth && height == minHeight) {
+                            // 宽 > 最小值，高 = 最小值，top = 元素上偏移位置
+                            top = box.offsetTop
+                        } else if (width > minWidth && height > minHeight) {
+                            // 宽 > 最小值，高 > 最小值，不予处理
+                        }
+                    }
+
+                    // 右上高
+                    if (top < 0) {
+                        top = 0;
+                        height = oldTop + (oEv.clientY - oldY) + (oldHeight - (oEv.clientY - oldY))
+                    }
+
+                    box.children[0].style.width = width + 'px';
+
+                    // 文本设置高度，图片自适应 无需设置
+                    if (item.type == 'text' || item.type == 'draw') {
+                        box.children[0].style.height = height + 'px'
+                    }
+                    box.style.top = top + 'px'
+                } else if (className == 'box3') {
+                    // 左下角
+
+                    let width = oldWidth - (oEv.clientX - oldX);
+                    const maxWidth = this.contentBoxWidth;
+
+                    let height = oldHeight + (oEv.clientY - oldY);
+                    const maxHeight = this.contentBoxHeight - oldTop;
+
+                    let left = oldLeft + (oEv.clientX - oldX);
+
+                    if (width < minWidth) {
+                        width = minWidth
+                    }
+                    if (width > maxWidth) {
+                        width = maxWidth
+                    }
+
+                    if (height < minHeight) {
+                        height = minHeight
+                    }
+                    if (height > maxHeight) {
+                        height = maxHeight
+                    }
+
+                    if (oldLeft == 0 && oldTop == 0) {
+                        // 坐标：left = 0，top = 0
+
+                        if (width == minWidth && height == minHeight) {
+                            // 宽高 = 最小值，left = 最小宽度
+                            left = minWidth
+                        } else if (width == minWidth && height > minHeight) {
+                            // 宽 = 最小值，高 > 最小值，left = 最小宽度
+                            left = minWidth
+                        } else if (width > minWidth && height == minHeight) {
+                            // 宽 > 最小值，高 = 最小值，不予处理
+                        } else if (width > minWidth && height > minHeight) {
+                            // 宽 > 最小值，高 > 最小值，不予处理
+                        }
+                    } else if (oldLeft == 0 && oldTop > 0) {
+                        // 坐标：left = 0，top > 0
+
+                        if (width == minWidth && height == minHeight) {
+                            // 宽高 = 最小值，left = 最小宽度
+                            left = minWidth
+                        } else if (width == minWidth && height > minHeight) {
+                            // 宽 = 最小值，高 > 最小值，left = 最小宽度
+                            left = minWidth
+                        } else if (width > minWidth && height == minHeight) {
+                            // 宽 > 最小值，高 = 最小值，不予处理
+                        } else if (width > minWidth && height > minHeight) {
+                            // 宽 > 最小值，高 > 最小值，不予处理
+                        }
+                    } else if (oldLeft > 0 && oldTop == 0) {
+                        // 坐标：left > 0，top = 0
+
+                        if (width == minWidth && height == minHeight) {
+                            // 宽高 = 最小值，left = 元素左偏移位置
+                            left = box.offsetLeft
+                        } else if (width == minWidth && height > minHeight) {
+                            // 宽 = 最小值，高 > 最小值，left = 元素左偏移位置
+                            left = box.offsetLeft
+                        } else if (width > minWidth && height == minHeight) {
+                            // 宽 > 最小值，高 = 最小值，不予处理
+                        } else if (width > minWidth && height > minHeight) {
+                            // 宽 > 最小值，高 > 最小值，不予处理
+                        }
+                    } else if (oldLeft > 0 && oldTop > 0) {
+                        // 坐标：left > 0，top > 0
+
+                        if (width == minWidth && height == minHeight) {
+                            // 宽高 = 最小值，left = 元素左偏移位置
+                            left = box.offsetLeft
+                        } else if (width == minWidth && height > minHeight) {
+                            // 宽 = 最小值，高 > 最小值，left = 元素左偏移位置
+                            left = box.offsetLeft
+                        } else if (width > minWidth && height == minHeight) {
+                            // 宽 > 最小值，高 = 最小值，不予处理
+                        } else if (width > minWidth && height > minHeight) {
+                            // 宽 > 最小值，高 > 最小值，不予处理
+                        }
+                    }
+
+                    if (left < 0) {
+                        left = 0;
+                        width = oldWidth - (oEv.clientX - oldX) + (oldLeft + (oEv.clientX - oldX))
+                    }
+
+                    box.children[0].style.width = width + 'px';
+
+                    // 文本设置高度，图片自适应 无需设置
+                    if (item.type == 'text' || item.type == 'draw') {
+                        box.children[0].style.height = height + 'px'
+                    }
+                    box.style.left = left + 'px'
+                } else if (className == 'box4') {
+                    // 右下角
+
+                    let width = oldWidth + (oEv.clientX - oldX);
+                    const maxWidth = this.contentBoxWidth - oldLeft;
+
+                    let height = oldHeight + (oEv.clientY - oldY);
+                    const maxHeight = this.contentBoxHeight - oldTop;
+
+                    if (width < minWidth) {
+                        width = minWidth
+                    }
+                    if (width > maxWidth) {
+                        width = maxWidth
+                    }
+
+                    if (height < minHeight) {
+                        height = minHeight
+                    }
+                    if (height > maxHeight) {
+                        height = maxHeight
+                    }
+
+                    box.children[0].style.width = width + 'px';
+
+                    // 文本设置高度，图片自适应 无需设置
+                    if (item.type == 'text' || item.type == 'draw') {
+                        box.children[0].style.height = height + 'px'
+                    }
+                }
+
+                this.value[index].x = box.offsetLeft;
+                this.value[index].y = box.offsetTop;
+
+                this.value[index].width = parseInt(box.children[0].style.width.replace('px', ''));
+
+            };
+
+            // 鼠标抬起时
+            document.onmouseup = () => {
+                document.onmousemove = null;
+                document.onmouseup = null
             }
-          } else if (oldLeft == 0 && oldTop > 0) {
-            // 坐标：left = 0，top > 0
-
-            if (width == minWidth && height == minHeight) {
-              // 宽高 = 最小值，left = 最小宽度
-              left = minWidth
-            } else if (width == minWidth && height > minHeight) {
-              // 宽 = 最小值，高 > 最小值，left = 最小宽度
-              left = minWidth
-            } else if (width > minWidth && height == minHeight) {
-              // 宽 > 最小值，高 = 最小值，不予处理
-            } else if (width > minWidth && height > minHeight) {
-              // 宽 > 最小值，高 > 最小值，不予处理
+        },
+        getGlobalStyle() {
+            let style = '';
+            if (this.global.bgType == 'color') {
+                style += `background-color:${this.global.bgColor};`;
+            } else if (this.global.bgType == 'url') {
+                if (this.global.bgUrl) {
+                    style += `background-image:url("${img(this.global.bgUrl)}")`;
+                }
             }
-          } else if (oldLeft > 0 && oldTop == 0) {
-            // 坐标：left > 0，top = 0
-
-            if (width == minWidth && height == minHeight) {
-              // 宽高 = 最小值，left = 元素左偏移位置
-              left = box.offsetLeft
-            } else if (width == minWidth && height > minHeight) {
-              // 宽 = 最小值，高 > 最小值，left = 元素左偏移位置
-              left = box.offsetLeft
-            } else if (width > minWidth && height == minHeight) {
-              // 宽 > 最小值，高 = 最小值，不予处理
-            } else if (width > minWidth && height > minHeight) {
-              // 宽 > 最小值，高 > 最小值，不予处理
+            return style;
+        },
+        getMaxX() {
+            const box: any = document.getElementById(this.editComponent.id);
+            let x = this.contentBoxWidth;
+            if (box) {
+                x -= box.offsetWidth;
             }
-          } else if (oldLeft > 0 && oldTop > 0) {
-            // 坐标：left > 0，top > 0
-
-            if (width == minWidth && height == minHeight) {
-              // 宽高 = 最小值，left = 元素左偏移位置
-              left = box.offsetLeft
-            } else if (width == minWidth && height > minHeight) {
-              // 宽 = 最小值，高 > 最小值，left = 元素左偏移位置
-              left = box.offsetLeft
-            } else if (width > minWidth && height == minHeight) {
-              // 宽 > 最小值，高 = 最小值，不予处理
-            } else if (width > minWidth && height > minHeight) {
-              // 宽 > 最小值，高 > 最小值，不予处理
+            return x;
+        },
+        getMaxY() {
+            const box: any = document.getElementById(this.editComponent.id);
+            let y = this.contentBoxHeight;
+            if (box) {
+                y -= box.offsetHeight;
             }
-          }
-
-          if (left < 0) {
-            left = 0
-            width =
-              oldWidth - (oEv.clientX - oldX) + (oldLeft + (oEv.clientX - oldX))
-          }
-
-          box.children[0].style.width = width + 'px'
-
-          // 文本设置高度，图片自适应 无需设置
-          if (item.type == 'text' || item.type == 'draw') {
-            box.children[0].style.height = height + 'px'
-          }
-          box.style.left = left + 'px'
-        } else if (className == 'box4') {
-          // 右下角
-
-          let width = oldWidth + (oEv.clientX - oldX)
-          const maxWidth = this.contentBoxWidth - oldLeft
-
-          let height = oldHeight + (oEv.clientY - oldY)
-          const maxHeight = this.contentBoxHeight - oldTop
-
-          if (width < minWidth) {
-            width = minWidth
-          }
-          if (width > maxWidth) {
-            width = maxWidth
-          }
-
-          if (height < minHeight) {
-            height = minHeight
-          }
-          if (height > maxHeight) {
-            height = maxHeight
-          }
-
-          box.children[0].style.width = width + 'px'
-
-          // 文本设置高度，图片自适应 无需设置
-          if (item.type == 'text' || item.type == 'draw') {
-            box.children[0].style.height = height + 'px'
-          }
-        }
-
-        this.value[index].x = box.offsetLeft
-        this.value[index].y = box.offsetTop
-
-        this.value[index].width = parseInt(
-          box.children[0].style.width.replace('px', '')
-        )
-      }
-
-      // 鼠标抬起时
-      document.onmouseup = () => {
-        document.onmousemove = null
-        document.onmouseup = null
-      }
-    },
-    getGlobalStyle() {
-      let style = ''
-      if (this.global.bgType == 'color') {
-        style += `background-color:${this.global.bgColor};`
-      } else if (this.global.bgType == 'url') {
-        if (this.global.bgUrl) {
-          style += `background-image:url("${img(this.global.bgUrl)}")`
-        }
-      }
-      return style
-    },
-    getMaxX() {
-      const box: any = document.getElementById(this.editComponent.id)
-      let x = this.contentBoxWidth
-      if (box) {
-        x -= box.offsetWidth
-      }
-      return x
-    },
-    getMaxY() {
-      const box: any = document.getElementById(this.editComponent.id)
-      let y = this.contentBoxHeight
-      if (box) {
-        y -= box.offsetHeight
-      }
-      return y
-    },
-    getMaxWidth() {
-      let width = this.contentBoxWidth
-      width -= this.editComponent.x
-      return width
-    },
-  },
-})
+            return y;
+        },
+        getMaxWidth() {
+            let width = this.contentBoxWidth;
+            width -= this.editComponent.x;
+            return width;
+        },
+    }
+});
 
-export default usePosterStore
+export default usePosterStore
\ No newline at end of file
diff --git a/admin/src/stores/modules/style.ts b/admin/src/stores/modules/style.ts
index 104972c5..f684f47b 100644
--- a/admin/src/stores/modules/style.ts
+++ b/admin/src/stores/modules/style.ts
@@ -1,18 +1,18 @@
 import { defineStore } from 'pinia'
 const useStyleStore = defineStore('style', {
-  state: () => {
-    return {
-      flag: true,
-    }
-  },
-  actions: {
-    changeStyle() {
-      this.flag = false
-    },
-    changeBlack() {
-      this.flag = true
+    state: () => {
+        return {
+            flag : true
+        }
     },
-  },
+    actions: {
+        changeStyle() {
+            this. flag = false
+        },
+        changeBlack() {
+            this. flag = true
+        }
+    }
 })
 
-export default useStyleStore
+export default useStyleStore
\ No newline at end of file
diff --git a/admin/src/stores/modules/system.ts b/admin/src/stores/modules/system.ts
index 653a815c..9bb691ff 100644
--- a/admin/src/stores/modules/system.ts
+++ b/admin/src/stores/modules/system.ts
@@ -4,59 +4,55 @@ import { useCssVar } from '@vueuse/core'
 import { useCssVar } from '@vueuse/core'
 import { getInstalledAddonList } from '@/app/api/addon'
 
+
 interface System {
-  menuIsCollapse: boolean
-  dark: boolean
-  theme: string
-  lang: string
-  apps: Record<string, any>[]
-  addons: Record<string, any>[]
+    menuIsCollapse: boolean,
+    dark: boolean,
+    theme: string,
+    lang: string,
+    apps: Record<string, any>[],
+    addons: Record<string, any>[]
 }
 
 const theme = storage.get('theme') ?? {}
 
 const useSystemStore = defineStore('system', {
-  state: (): System => {
-    return {
-      menuIsCollapse: false,
-      dark: theme.dark ?? false,
-      theme: theme.theme ?? '#273de3',
-      lang: storage.get('lang') ?? 'zh-cn',
-      apps: [],
-      addons: [],
-    }
-  },
-  actions: {
-    setTheme(state: string, value: any) {
-      this[state] = value
-      theme[state] = value
-      storage.set({ key: 'theme', data: theme })
-    },
-    toggleMenuCollapse(value: boolean) {
-      this.menuIsCollapse = value
-      storage.set({ key: 'menuiscollapse', data: value })
-      useCssVar('--aside-width').value = value
-        ? 'calc(var(--el-menu-icon-width) + var(--el-menu-base-level-padding) * 2)'
-        : '210px'
+    state: (): System => {
+        return {
+            menuIsCollapse: false,
+            dark: theme.dark ?? false,
+            theme: theme.theme ?? '#273de3',
+            lang: storage.get('lang') ?? 'zh-cn',
+            apps: [],
+            addons: []
+        }
     },
-    /**
-     * 获取已安装的插件和应用
-     */
-    async getInstallAddons() {
-      await getInstalledAddonList()
-        .then(({ data }) => {
-          const apps = [],
-            addons = []
-          Object.keys(data).forEach((key) => {
-            const item = data[key]
-            item.type == 'app' ? apps.push(item) : addons.push(item)
-          })
-          this.addons = addons
-          this.apps = apps
-        })
-        .catch()
-    },
-  },
+    actions: {
+        setTheme(state: string, value: any) {
+            this[state] = value
+            theme[state] = value
+            storage.set({ key: 'theme', data: theme })
+        },
+        toggleMenuCollapse(value: boolean) {
+            this.menuIsCollapse = value
+            storage.set({ key: 'menuiscollapse', data: value })
+            useCssVar('--aside-width').value = value ? 'calc(var(--el-menu-icon-width) + var(--el-menu-base-level-padding) * 2)' : '210px'
+        },
+        /**
+         * 获取已安装的插件和应用
+         */
+        async getInstallAddons() {
+            await getInstalledAddonList().then(({ data }) => {
+                const apps = [], addons = []
+                Object.keys(data).forEach(key => {
+                    const item = data[key]
+                    item.type == 'app' ? apps.push(item) : addons.push(item)
+                })
+                this.addons = addons
+                this.apps = apps
+            }).catch()
+        }
+    }
 })
 
 export default useSystemStore
diff --git a/admin/src/stores/modules/tabbar.ts b/admin/src/stores/modules/tabbar.ts
index 591f40b2..3397b7d6 100644
--- a/admin/src/stores/modules/tabbar.ts
+++ b/admin/src/stores/modules/tabbar.ts
@@ -2,50 +2,50 @@ import { defineStore } from 'pinia'
 import type { RouteLocationNormalizedLoaded } from 'vue-router'
 
 interface Tabbar {
-  curr: string
-  tabs: {
-    [key: string]: any
-  }
+    curr: string,
+    tabs: {
+        [key: string]: any
+    }
 }
 
 const useTabbarStore = defineStore('tabbar', {
-  state: (): Tabbar => {
-    return {
-      curr: '',
-      tabs: {},
-    }
-  },
-  actions: {
-    addTab(roter: RouteLocationNormalizedLoaded) {
-      if (roter.meta && roter.meta.type != 1) return
-      if (this.tabs[roter.path]) {
-        this.tabs[roter.path].query = roter.query || {}
-        return
-      }
-      this.tabs[roter.path] = {
-        path: roter.path,
-        title: roter.meta ? roter.meta.title : '',
-        name: roter.name,
-        query: roter.query || {},
-      }
-    },
-    removeTab(path: string) {
-      delete this.tabs[path]
+    state: (): Tabbar => {
+        return {
+            curr: '',
+            tabs: {}
+        }
     },
-    clearTab() {
-      this.tabs = {}
+    actions: {
+        addTab(roter: RouteLocationNormalizedLoaded) {
+            if (roter.meta && roter.meta.type != 1) return
+            if (this.tabs[roter.path]) {
+                this.tabs[roter.path].query = roter.query || {}
+                return
+            }
+            this.tabs[roter.path] = {
+                path: roter.path,
+                title: roter.meta ? roter.meta.title : '',
+                name: roter.name,
+                query: roter.query || {}
+            }
+        },
+        removeTab(path: string) {
+            delete this.tabs[path]
+        },
+        clearTab() {
+            this.tabs = {}
+        }
     },
-  },
-  getters: {
-    tabLength: (state) => Object.keys(state.tabs).length,
-    tabNames: (state) => {
-      const name: any[] = []
-      Object.keys(state.tabs).forEach((key) => {
-        name.push(state.tabs[key].name)
-      })
-      return name
-    },
-  },
+    getters: {
+        tabLength: (state) => Object.keys(state.tabs).length,
+        tabNames: (state) => {
+            const name: any[] = []
+            Object.keys(state.tabs).forEach(key => {
+                name.push(state.tabs[key].name)
+            })
+            return name
+        }
+    }
 })
 
-export default useTabbarStore
+export default useTabbarStore
\ No newline at end of file
diff --git a/admin/src/stores/modules/user.ts b/admin/src/stores/modules/user.ts
index b50294fb..9c9d9e0c 100644
--- a/admin/src/stores/modules/user.ts
+++ b/admin/src/stores/modules/user.ts
@@ -7,84 +7,78 @@ import { formatRouters, findFirstValidRoute } from '@/router/routers'
 import useTabbarStore from './tabbar'
 
 interface User {
-  token: string
-  userInfo: object
-  routers: any[]
-  addonIndexRoute: Record<string, symbol>
-  rules: any[]
+    token: string,
+    userInfo: object,
+    routers: any[],
+    addonIndexRoute: Record<string, symbol>,
+    rules: any[]
 }
 
 const useUserStore = defineStore('user', {
-  state: (): User => {
-    return {
-      token: getToken() || '',
-      userInfo: storage.get('userinfo') || {},
-      routers: [],
-      addonIndexRoute: {},
-      rules: [],
-    }
-  },
-  actions: {
-    login(form: object) {
-      return new Promise((resolve, reject) => {
-        login(form)
-          .then((res) => {
-            this.token = res.data.token
-            this.userInfo = res.data.userinfo
-            setToken(res.data.token)
-            storage.set({ key: 'userinfo', data: res.data.userinfo })
-            storage.set({ key: 'comparisonTokenStorage', data: res.data.token })
-            resolve(res)
-          })
-          .catch((error) => {
-            reject(error)
-          })
-      })
-    },
-    clearRouters() {
-      this.routers = []
+    state: (): User => {
+        return {
+            token: getToken() || '',
+            userInfo: storage.get('userinfo') || {},
+            routers: [],
+            addonIndexRoute: {},
+            rules: []
+        }
     },
-    logout() {
-      if (!this.token) return
-      this.token = ''
-      this.userInfo = {}
-      removeToken()
-      storage.remove(['userinfo'])
-      this.routers = []
-      this.rules = []
-      // 清除tabbar
-      useTabbarStore().clearTab()
-      router.push('/login')
-    },
-    getAuthMenusFn() {
-      return new Promise((resolve, reject) => {
-        getAuthMenus({})
-          .then((res) => {
-            this.routers = formatRouters(res.data)
-            // 获取插件的首个菜单
-            this.routers.forEach((item, index) => {
-              if (item.meta.app !== '') {
-                if (item.children && item.children.length) {
-                  this.addonIndexRoute[item.meta.addon] = findFirstValidRoute(
-                    item.children
-                  )
-                } else {
-                  this.addonIndexRoute[item.meta.addon] = item.name
-                }
-              }
+    actions: {
+        login(form: object) {
+            return new Promise((resolve, reject) => {
+                login(form).then((res) => {
+                    this.token = res.data.token
+                    this.userInfo = res.data.userinfo
+                    setToken(res.data.token)
+                    storage.set({ key: 'userinfo', data: res.data.userinfo })
+                    storage.set({ key: 'comparisonTokenStorage', data: res.data.token })
+                    resolve(res)
+                }).catch((error) => {
+                    reject(error)
+                })
             })
-            resolve(res)
-          })
-          .catch((error) => {
-            reject(error)
-          })
-      })
-    },
-    setUserInfo(data: any) {
-      this.userInfo = data
-      storage.set({ key: 'userinfo', data: data })
-    },
-  },
+        },
+        clearRouters() {
+            this.routers = []
+        },
+        logout() {
+            if (!this.token) return
+            this.token = ''
+            this.userInfo = {}
+            removeToken()
+            storage.remove(['userinfo'])
+            this.routers = []
+            this.rules = []
+            // 清除tabbar
+            useTabbarStore().clearTab()
+            router.push('/login')
+        },
+        getAuthMenusFn() {
+            return new Promise((resolve, reject) => {
+                getAuthMenus({}).then((res) => {
+                    this.routers = formatRouters(res.data)
+                    // 获取插件的首个菜单
+                    this.routers.forEach((item, index) => {
+                        if (item.meta.app !== '') {
+                            if (item.children && item.children.length) {
+                                this.addonIndexRoute[item.meta.addon] = findFirstValidRoute(item.children)
+                            } else {
+                                this.addonIndexRoute[item.meta.addon] = item.name
+                            }
+                        }
+                    })
+                    resolve(res)
+                }).catch((error) => {
+                    reject(error)
+                })
+            })
+        },
+        setUserInfo(data: any) {
+            this.userInfo = data
+            storage.set({ key: 'userinfo', data: data })
+        }
+    }
 })
 
 export default useUserStore
diff --git a/admin/src/styles/icon/official-iconfont.json b/admin/src/styles/icon/official-iconfont.json
index 5b9a1ef0..46b39bcd 100644
--- a/admin/src/styles/icon/official-iconfont.json
+++ b/admin/src/styles/icon/official-iconfont.json
@@ -4,7 +4,7 @@
   "font_family": "nc-iconfont",
   "css_prefix_text": "nc-icon-",
   "description": "系统图标",
-  "glyphs": [
+  "glyphs":  [
     {
       "icon_id": "40606187",
       "name": "会员等级V6xx",
diff --git a/admin/src/types/global.d.ts b/admin/src/types/global.d.ts
index e9ff0f0f..255c9404 100644
--- a/admin/src/types/global.d.ts
+++ b/admin/src/types/global.d.ts
@@ -1,18 +1,18 @@
 import { SlateDescendant, SlateElement, SlateText } from '@wangeditor/editor'
 
 declare module '@wangeditor/editor' {
-  // 扩展 Text
-  interface SlateText {
-    text: string
-  }
+    // 扩展 Text
+    interface SlateText {
+        text: string
+    }
 
-  // 扩展 Element
-  interface SlateElement {
-    type: string
-    children: SlateDescendant[]
-  }
+    // 扩展 Element
+    interface SlateElement {
+        type: string
+        children: SlateDescendant[]
+    }
 }
 
 declare interface AnyObject {
-  [key: string]: any
-}
+    [key: string]: any;
+}
\ No newline at end of file
diff --git a/admin/src/utils/common.ts b/admin/src/utils/common.ts
index 2bf8d053..7a153d9b 100644
--- a/admin/src/utils/common.ts
+++ b/admin/src/utils/common.ts
@@ -9,55 +9,54 @@ import storage from './storage'
  * @param app
  */
 export function useElementIcon(app: App): void {
-  for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
-    app.component(key, component)
-  }
+    for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
+        app.component(key, component)
+    }
 }
 
 /**
  * 设置主题色
  */
 export function setThemeColor(color: string, mode: string = 'light'): void {
-  useCssVar('--el-color-primary', null).value = color
-
-  const colors: any = {
-    dark: {
-      'light-3': 'shade(20%)',
-      'light-5': 'shade(30%)',
-      'light-7': 'shade(50%)',
-      'light-8': 'shade(60%)',
-      'light-9': 'shade(70%)',
-      'dark-2': 'tint(20%)',
-    },
-    light: {
-      'dark-2': 'shade(20%)',
-      'light-3': 'tint(30%)',
-      'light-5': 'tint(50%)',
-      'light-7': 'tint(70%)',
-      'light-8': 'tint(80%)',
-      'light-9': 'tint(90%)',
-    },
-  }
-
-  Object.keys(colors[mode]).forEach((key) => {
-    useCssVar('--el-color-primary' + '-' + key, null).value =
-      colorFunction.convert(`color(${color} ${colors[mode][key]})`)
-  })
+    useCssVar('--el-color-primary', null).value = color
+
+    const colors: any = {
+        dark: {
+            'light-3': 'shade(20%)',
+            'light-5': 'shade(30%)',
+            'light-7': 'shade(50%)',
+            'light-8': 'shade(60%)',
+            'light-9': 'shade(70%)',
+            'dark-2': 'tint(20%)'
+        },
+        light: {
+            'dark-2': 'shade(20%)',
+            'light-3': 'tint(30%)',
+            'light-5': 'tint(50%)',
+            'light-7': 'tint(70%)',
+            'light-8': 'tint(80%)',
+            'light-9': 'tint(90%)'
+        }
+    }
+
+    Object.keys(colors[mode]).forEach((key) => {
+        useCssVar('--el-color-primary' + '-' + key, null).value = colorFunction.convert(`color(${ color } ${ colors[mode][key] })`)
+    })
 }
 
 /**
  * 获取当前访问应用类型
  */
 export function getAppType() {
-  const path = location.pathname.split('/').filter((val) => {
-    return val
-  })
-
-  if (!path.length) {
-    return 'admin'
-  } else {
-    return path[0]
-  }
+    const path = location.pathname.split('/').filter((val) => {
+        return val
+    })
+
+    if (!path.length) {
+        return 'admin'
+    } else {
+        return path[0]
+    }
 }
 
 /**
@@ -65,8 +64,8 @@ export function getAppType() {
  * @param value
  */
 export function setWindowTitle(value: string = ''): void {
-  const title = useTitle()
-  title.value = value ? value : import.meta.env.VITE_DETAULT_TITLE
+    const title = useTitle()
+    title.value = value ? value : import.meta.env.VITE_DETAULT_TITLE
 }
 
 /**
@@ -74,7 +73,7 @@ export function setWindowTitle(value: string = ''): void {
  * @returns
  */
 export function getToken(): null | string {
-  return storage.get('token')
+    return storage.get('token')
 }
 
 /**
@@ -83,7 +82,7 @@ export function getToken(): null | string {
  * @returns
  */
 export function setToken(token: string): void {
-  storage.set({ key: 'token', data: token })
+    storage.set({ key: 'token', data: token })
 }
 
 /**
@@ -91,7 +90,7 @@ export function setToken(token: string): void {
  * @returns
  */
 export function removeToken(): void {
-  storage.remove('token')
+    storage.remove('token')
 }
 
 /**
@@ -101,16 +100,16 @@ export function removeToken(): void {
  * @returns
  */
 export function debounce(fn: (args?: any) => any, delay: number = 300) {
-  let timer: null | number = null
-  return function (...args) {
-    if (timer != null) {
-      clearTimeout(timer)
-      timer = null
+    let timer: null | number = null
+    return function (...args) {
+        if (timer != null) {
+            clearTimeout(timer)
+            timer = null
+        }
+        timer = setTimeout(() => {
+            fn.call(this, ...args)
+        }, delay);
     }
-    timer = setTimeout(() => {
-      fn.call(this, ...args)
-    }, delay)
-  }
 }
 
 /**
@@ -119,7 +118,7 @@ export function debounce(fn: (args?: any) => any, delay: number = 300) {
  * @returns
  */
 export function isUrl(str: string): boolean {
-  return str.indexOf('http://') != -1 || str.indexOf('https://') != -1
+    return str.indexOf('http://') != -1 || str.indexOf('https://') != -1
 }
 
 /**
@@ -128,9 +127,7 @@ export function isUrl(str: string): boolean {
  * @returns
  */
 export function img(path: string): string {
-  return isUrl(path)
-    ? path
-    : `${import.meta.env.VITE_IMG_DOMAIN || location.origin}/${path}`
+    return isUrl(path) ? path : `${ import.meta.env.VITE_IMG_DOMAIN || location.origin }/${ path }`
 }
 
 /**
@@ -139,7 +136,7 @@ export function img(path: string): string {
  * @returns
  */
 export function assetImg(path: string) {
-  return new URL('@/', import.meta.url) + path
+    return new URL('@/', import.meta.url) + path
 }
 
 /**
@@ -148,15 +145,15 @@ export function assetImg(path: string) {
  * @returns
  */
 export function strByteLength(str: string = ''): number {
-  let len = 0
-  for (let i = 0; i < str.length; i++) {
-    if (str.charCodeAt(i) > 127 || str.charCodeAt(i) == 94) {
-      len += 2
-    } else {
-      len++
+    let len = 0;
+    for (let i = 0; i < str.length; i++) {
+        if (str.charCodeAt(i) > 127 || str.charCodeAt(i) == 94) {
+            len += 2;
+        } else {
+            len++;
+        }
     }
-  }
-  return len
+    return len;
 }
 
 /**
@@ -164,23 +161,22 @@ export function strByteLength(str: string = ''): number {
  * @param url
  */
 export function urlToRouteRaw(url: string) {
-  const query: any = {}
-  const [path, param] = url.split('?')
+    const query: any = {}
+    const [path, param] = url.split('?')
 
-  param &&
-    param.split('&').forEach((str: string) => {
-      let [name, value] = str.split('=')
-      query[name] = value
+    param && param.split('&').forEach((str: string) => {
+        let [name, value] = str.split('=')
+        query[name] = value
     })
 
-  return { path, query }
+    return { path, query }
 }
 
 const isArray = (value: any) => {
-  if (typeof Array.isArray === 'function') {
-    return Array.isArray(value)
-  }
-  return Object.prototype.toString.call(value) === '[object Array]'
+    if (typeof Array.isArray === 'function') {
+        return Array.isArray(value)
+    }
+    return Object.prototype.toString.call(value) === '[object Array]'
 }
 
 /**
@@ -189,19 +185,19 @@ const isArray = (value: any) => {
  * @returns {*} 克隆后的对象或者原值（不是对象）
  */
 export function deepClone(obj: object) {
-  // 对常见的“非”值，直接返回原来值
-  if ([null, undefined, NaN, false].includes(obj)) return obj
-  if (typeof obj !== 'object' && typeof obj !== 'function') {
-    // 原始类型直接返回
-    return obj
-  }
-  const o = isArray(obj) ? [] : {}
-  for (const i in obj) {
-    if (obj.hasOwnProperty(i)) {
-      o[i] = typeof obj[i] === 'object' ? deepClone(obj[i]) : obj[i]
+    // 对常见的“非”值，直接返回原来值
+    if ([null, undefined, NaN, false].includes(obj)) return obj
+    if (typeof obj !== 'object' && typeof obj !== 'function') {
+        // 原始类型直接返回
+        return obj
+    }
+    const o = isArray(obj) ? [] : {}
+    for (const i in obj) {
+        if (obj.hasOwnProperty(i)) {
+            o[i] = typeof obj[i] === 'object' ? deepClone(obj[i]) : obj[i]
+        }
     }
-  }
-  return o
+    return o
 }
 
 /**
@@ -211,71 +207,72 @@ export function deepClone(obj: object) {
  * @param {Number} radix
  */
 export function guid(len = 10, firstU = true, radix: any = null) {
-  const chars =
-    '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('')
-  const uuid = []
-  radix = radix || chars.length
-
-  if (len) {
-    // 如果指定uuid长度,只是取随机的字符,0|x为位运算,能去掉x的小数位,返回整数位
-    for (let i = 0; i < len; i++) uuid[i] = chars[0 | (Math.random() * radix)]
-  } else {
-    let r
-    // rfc4122标准要求返回的uuid中,某些位为固定的字符
-    uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-'
-    uuid[14] = '4'
-
-    for (let i = 0; i < 36; i++) {
-      if (!uuid[i]) {
-        r = 0 | (Math.random() * 16)
-        uuid[i] = chars[i == 19 ? (r & 0x3) | 0x8 : r]
-      }
+    const chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('')
+    const uuid = []
+    radix = radix || chars.length
+
+    if (len) {
+        // 如果指定uuid长度,只是取随机的字符,0|x为位运算,能去掉x的小数位,返回整数位
+        for (let i = 0; i < len; i++) uuid[i] = chars[0 | Math.random() * radix]
+    } else {
+        let r
+        // rfc4122标准要求返回的uuid中,某些位为固定的字符
+        uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-'
+        uuid[14] = '4'
+
+        for (let i = 0; i < 36; i++) {
+            if (!uuid[i]) {
+                r = 0 | Math.random() * 16
+                uuid[i] = chars[(i == 19) ? (r & 0x3) | 0x8 : r]
+            }
+        }
+    }
+    // 移除第一个字符,并用u替代,因为第一个字符为数值时,该guuid不能用作id或者class
+    if (firstU) {
+        uuid.shift()
+        return `u${ uuid.join('') }`
     }
-  }
-  // 移除第一个字符,并用u替代,因为第一个字符为数值时,该guuid不能用作id或者class
-  if (firstU) {
-    uuid.shift()
-    return `u${uuid.join('')}`
-  }
-  return uuid.join('')
+    return uuid.join('')
 }
 
 /**
  * 金额格式化
  */
 export function moneyFormat(money: string): string {
-  return isNaN(parseFloat(money)) ? money : parseFloat(money).toFixed(2)
+    return isNaN(parseFloat(money)) ? money : parseFloat(money).toFixed(2)
 }
 
+
 /**
  * 时间戳转日期格式
  */
-export function timeStampTurnTime(timeStamp: any, type = '') {
-  if (timeStamp != undefined && timeStamp != '' && timeStamp > 0) {
-    var date = new Date()
-    date.setTime(timeStamp * 1000)
-    var y: any = date.getFullYear()
-    var m: any = date.getMonth() + 1
-    m = m < 10 ? '0' + m : m
-    var d: any = date.getDate()
-    d = d < 10 ? '0' + d : d
-    var h: any = date.getHours()
-    h = h < 10 ? '0' + h : h
-    var minute: any = date.getMinutes()
-    var second: any = date.getSeconds()
-    minute = minute < 10 ? '0' + minute : minute
-    second = second < 10 ? '0' + second : second
-    if (type) {
-      if (type == 'yearMonthDay') {
-        return y + '年' + m + '月' + d + '日'
-      }
-      return y + '-' + m + '-' + d
+export function timeStampTurnTime(timeStamp: any, type = "") {
+    if (timeStamp != undefined && timeStamp != "" && timeStamp > 0) {
+        var date = new Date();
+        date.setTime(timeStamp * 1000);
+        var y: any = date.getFullYear();
+        var m: any = date.getMonth() + 1;
+        m = m < 10 ? ('0' + m) : m;
+        var d: any = date.getDate();
+        d = d < 10 ? ('0' + d) : d;
+        var h: any = date.getHours();
+        h = h < 10 ? ('0' + h) : h;
+        var minute: any = date.getMinutes();
+        var second: any = date.getSeconds();
+        minute = minute < 10 ? ('0' + minute) : minute;
+        second = second < 10 ? ('0' + second) : second;
+        if (type) {
+            if (type == 'yearMonthDay') {
+                return y + '年' + m + '月' + d + '日';
+            }
+            return y + '-' + m + '-' + d;
+        } else {
+            return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + second;
+        }
+
     } else {
-      return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + second
+        return "";
     }
-  } else {
-    return ''
-  }
 }
 
 /**
@@ -283,19 +280,17 @@ export function timeStampTurnTime(timeStamp: any, type = '') {
  * @param {Object} date
  */
 export function timeTurnTimeStamp(date: string) {
-  var f = date.split(' ', 2)
-  var d = (f[0] ? f[0] : '').split('-', 3)
-  var t = (f[1] ? f[1] : '').split(':', 3)
-  return (
-    new Date(
-      parseInt(d[0], 10) || null,
-      (parseInt(d[1], 10) || 1) - 1,
-      parseInt(d[2], 10) || null,
-      parseInt(t[0], 10) || null,
-      parseInt(t[1], 10) || null,
-      parseInt(t[2], 10) || null
-    ).getTime() / 1000
-  )
+    var f = date.split(' ', 2);
+    var d = (f[0] ? f[0] : '').split('-', 3);
+    var t = (f[1] ? f[1] : '').split(':', 3);
+    return (new Date(
+        parseInt(d[0], 10) || null,
+        (parseInt(d[1], 10) || 1) - 1,
+        parseInt(d[2], 10) || null,
+        parseInt(t[0], 10) || null,
+        parseInt(t[1], 10) || null,
+        parseInt(t[2], 10) || null
+    )).getTime() / 1000;
 }
 
 /**
@@ -303,15 +298,15 @@ export function timeTurnTimeStamp(date: string) {
  * @param event
  */
 export function filterDigit(event: any) {
-  event.target.value = event.target.value.replace(/[^\d\.]/g, '')
-  event.target.value = event.target.value.replace(/^\./g, '')
-  event.target.value = event.target.value.replace(/\.{2,}/g, '.')
-  // 限制最多两位小数
-  const decimalParts = event.target.value.split('.')
-  if (decimalParts.length > 1 && decimalParts[1].length > 2) {
-    // 如果有小数部分且超过两位，则截取前两位
-    event.target.value = `${decimalParts[0]}.${decimalParts[1].slice(0, 2)}`
-  }
+    event.target.value = event.target.value.replace(/[^\d\.]/g, '');
+    event.target.value = event.target.value.replace(/^\./g, '');
+    event.target.value = event.target.value.replace(/\.{2,}/g, '.');
+    // 限制最多两位小数
+    const decimalParts = event.target.value.split('.');
+    if (decimalParts.length > 1 && decimalParts[1].length > 2) {
+        // 如果有小数部分且超过两位，则截取前两位
+        event.target.value = `${ decimalParts[0] }.${ decimalParts[1].slice(0, 2) }`;
+    }
 }
 
 /**
@@ -319,7 +314,7 @@ export function filterDigit(event: any) {
  * @param event
  */
 export function filterNumber(event: any) {
-  event.target.value = event.target.value.replace(/[^\d]/g, '')
+    event.target.value = event.target.value.replace(/[^\d]/g, '');
 }
 
 /**
@@ -327,14 +322,8 @@ export function filterNumber(event: any) {
  * @param event
  */
 export function filterSpecial(event: any) {
-  event.target.value = event.target.value.replace(
-    /[^\u4e00-\u9fa5a-zA-Z0-9]/g,
-    ''
-  )
-  event.target.value = event.target.value.replace(
-    /[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]/g,
-    ''
-  )
+    event.target.value = event.target.value.replace(/[^\u4e00-\u9fa5a-zA-Z0-9]/g, '')
+    event.target.value = event.target.value.replace(/[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]/g, '')
 }
 
 /**
@@ -342,50 +331,50 @@ export function filterSpecial(event: any) {
  * @param event
  */
 export function filterBlank(event: any) {
-  event.target.value = event.target.value.replace(/\s/g, '')
+    event.target.value = event.target.value.replace(/\s/g, '');
 }
 export function importIconFontCss() {
-  // const modulesFiles = {}; // import.meta.glob('@/styles/icon/official-iconfont.css', { eager: true })
-  // const modulesFiles = import.meta.glob('@/addon/**/assets/icon/*.css', { eager: true })
-  // // console.log('modulesFiles',modulesFiles)
-  //
-  // const modules:any = {}
-  // for (const [key, value] of Object.entries(modulesFiles)) {
-  //     const moduleName:any = key.split('/').pop()
-  //     const name = moduleName.split('.')[0]
-  //     modules[name] = value.default
-  // }
-  //
-  // // console.log('modules',modules)
-  //
-  // for(let key in modules) {
-  //     // console.log('modules[key]',modules[key])
-  //     import(modules[key]).then((module) => {
-  //         // console.log('module', module.default);
-  //     }).catch((e) => {
-  //         // console.log('caca', e)
-  //     });
-  // }
+    // const modulesFiles = {}; // import.meta.glob('@/styles/icon/official-iconfont.css', { eager: true })
+    // const modulesFiles = import.meta.glob('@/addon/**/assets/icon/*.css', { eager: true })
+    // // console.log('modulesFiles',modulesFiles)
+    //
+    // const modules:any = {}
+    // for (const [key, value] of Object.entries(modulesFiles)) {
+    //     const moduleName:any = key.split('/').pop()
+    //     const name = moduleName.split('.')[0]
+    //     modules[name] = value.default
+    // }
+    //
+    // // console.log('modules',modules)
+    //
+    // for(let key in modules) {
+    //     // console.log('modules[key]',modules[key])
+    //     import(modules[key]).then((module) => {
+    //         // console.log('module', module.default);
+    //     }).catch((e) => {
+    //         // console.log('caca', e)
+    //     });
+    // }
 }
 
 export function getIcon() {
-  // const modulesFiles = import.meta.glob('@/styles/icon/*.json', { eager: true })
-  // const addonModulesFiles = import.meta.glob('@/addon/**/assets/icon/*.json', { eager: true })
-  // addonModulesFiles && Object.assign(modulesFiles, addonModulesFiles)
-  //
-  // // const modulesFiles = {}; // import.meta.glob('@/styles/icon/official-iconfont.css', { eager: true })
-  // // const modulesFiles = import.meta.glob('@/styles/icon/*.json', { eager: true })
-  // console.log('modulesFiles', modulesFiles)
-  //
-  // const modules = {}
-  // for (const [key, value] of Object.entries(modulesFiles)) {
-  //     const moduleName = key.split('/').pop()
-  //     console.log('moduleName',moduleName)
-  //     const name = moduleName.split('.')[0]
-  //     modules[name] = value.default
-  // }
-  // console.log('modules', modules)
-  // // const addonModulesFiles = import.meta.glob('@/addon/**/assets/icon/*.json', { eager: true })
+    // const modulesFiles = import.meta.glob('@/styles/icon/*.json', { eager: true })
+    // const addonModulesFiles = import.meta.glob('@/addon/**/assets/icon/*.json', { eager: true })
+    // addonModulesFiles && Object.assign(modulesFiles, addonModulesFiles)
+    //
+    // // const modulesFiles = {}; // import.meta.glob('@/styles/icon/official-iconfont.css', { eager: true })
+    // // const modulesFiles = import.meta.glob('@/styles/icon/*.json', { eager: true })
+    // console.log('modulesFiles', modulesFiles)
+    //
+    // const modules = {}
+    // for (const [key, value] of Object.entries(modulesFiles)) {
+    //     const moduleName = key.split('/').pop()
+    //     console.log('moduleName',moduleName)
+    //     const name = moduleName.split('.')[0]
+    //     modules[name] = value.default
+    // }
+    // console.log('modules', modules)
+    // // const addonModulesFiles = import.meta.glob('@/addon/**/assets/icon/*.json', { eager: true })
 }
 
 /**
@@ -394,28 +383,24 @@ export function getIcon() {
  * @param limit
  * @param where
  */
-export function setTablePageStorage(
-  page: any = 1,
-  limit: any = 10,
-  where: any = {}
-) {
-  var data = storage.get('tablePageStorage')
-  if (!data) {
-    data = {}
-  }
-
-  var key = location.pathname + JSON.stringify(where)
-  data[key] = {
-    page,
-    limit,
-  }
-
-  var MAX_COUNT = 5 // 最多存储 5 个页面的分页缓存，超出则删除最开始的第一个页面
-  if (Object.keys(data).length > MAX_COUNT) {
-    delete data[Object.keys(data)[0]]
-  }
-
-  storage.set({ key: 'tablePageStorage', data })
+export function setTablePageStorage(page: any = 1, limit: any = 10, where: any = {}) {
+    var data = storage.get('tablePageStorage');
+    if (!data) {
+        data = {};
+    }
+
+    var key = location.pathname + JSON.stringify(where);
+    data[key] = {
+        page,
+        limit
+    };
+
+    var MAX_COUNT = 5; // 最多存储 5 个页面的分页缓存，超出则删除最开始的第一个页面
+    if (Object.keys(data).length > MAX_COUNT) {
+        delete data[Object.keys(data)[0]];
+    }
+
+    storage.set({ key: 'tablePageStorage', data });
 }
 
 /**
@@ -423,15 +408,15 @@ export function setTablePageStorage(
  * @param where
  */
 export function getTablePageStorage(where: any = {}) {
-  var data = storage.get('tablePageStorage')
-  var key = location.pathname + JSON.stringify(where)
-  if (!data || !data[key]) {
-    data = {
-      page: 1,
-      limit: 10,
+    var data = storage.get('tablePageStorage');
+    var key = location.pathname + JSON.stringify(where);
+    if (!data || !data[key]) {
+        data = {
+            page: 1,
+            limit: 10
+        };
+    } else {
+        data = data[key];
     }
-  } else {
-    data = data[key]
-  }
-  return data
+    return data;
 }
diff --git a/admin/src/utils/lodop.ts b/admin/src/utils/lodop.ts
index 52da50f4..8f46739d 100644
--- a/admin/src/utils/lodop.ts
+++ b/admin/src/utils/lodop.ts
@@ -4,263 +4,221 @@ import { ref } from 'vue'
 // Web打印服务CLodop/Lodop7
 
 // 用双端口加载主JS文件Lodop.js(或CLodopfuncs.js兼容老版本)以防其中某端口被占:
-const MainJS = 'CLodopfuncs.js'
-const URL_WS1: any = ref('ws://localhost:{port}/' + MainJS) // ws用8000/18000
-const URL_WS2: any = ref('ws://localhost:{port}/' + MainJS)
-const URL_HTTP1: any = ref('http://localhost:{port}/' + MainJS) // http用8000/18000
-const URL_HTTP2: any = ref('http://localhost:{port}/' + MainJS)
-const URL_HTTP3: any = ref('https://localhost.lodop.net:{port}/' + MainJS) // https用8000/8443
+const MainJS = "CLodopfuncs.js";
+const URL_WS1: any = ref("ws://localhost:{port}/" + MainJS); // ws用8000/18000
+const URL_WS2: any = ref("ws://localhost:{port}/" + MainJS);
+const URL_HTTP1: any = ref("http://localhost:{port}/" + MainJS); // http用8000/18000
+const URL_HTTP2: any = ref("http://localhost:{port}/" + MainJS);
+const URL_HTTP3: any = ref("https://localhost.lodop.net:{port}/" + MainJS); // https用8000/8443
 
-const CreatedOKLodopObject: any = ref(null)
-const CLodopIsLocal: any = ref(null)
-const LoadJsState: any = ref('')
+const CreatedOKLodopObject: any = ref(null);
+const CLodopIsLocal: any = ref(null);
+const LoadJsState: any = ref('');
 
 const initPort = (paramas: any) => {
-  if (!paramas) {
-    paramas = {
-      server_port1: 8000,
-      server_port2: 18000,
-      https_port: 8443,
+    if (!paramas) {
+        paramas = {
+            server_port1: 8000,
+            server_port2: 18000,
+            https_port: 8443
+        };
     }
-  }
-  URL_WS1.value = URL_WS1.value.replace('{port}', paramas.server_port1)
-  URL_WS2.value = URL_WS2.value.replace('{port}', paramas.server_port2)
+    URL_WS1.value = URL_WS1.value.replace('{port}', paramas.server_port1);
+    URL_WS2.value = URL_WS2.value.replace('{port}', paramas.server_port2);
 
-  URL_HTTP1.value = URL_HTTP1.value.replace('{port}', paramas.server_port1)
-  URL_HTTP2.value = URL_HTTP2.value.replace('{port}', paramas.server_port2)
+    URL_HTTP1.value = URL_HTTP1.value.replace('{port}', paramas.server_port1);
+    URL_HTTP2.value = URL_HTTP2.value.replace('{port}', paramas.server_port2);
+
+    URL_HTTP3.value = URL_HTTP2.value.replace('{port}', paramas.https_port);
 
-  URL_HTTP3.value = URL_HTTP2.value.replace('{port}', paramas.https_port)
 }
 
 //==判断是否需要CLodop(那些不支持插件的浏览器):==
 const needCLodop = () => {
-  try {
-    let ua = navigator.userAgent
-    if (
-      ua.match(/Windows\sPhone/i) ||
-      ua.match(/iPhone|iPod|iPad/i) ||
-      ua.match(/Android/i) ||
-      ua.match(/Edge\D?\d+/i)
-    )
-      return true
-    let verTrident = ua.match(/Trident\D?\d+/i)
-    let verIE = ua.match(/MSIE\D?\d+/i)
-    let verOPR: any = ua.match(/OPR\D?\d+/i)
-    let verFF: any = ua.match(/Firefox\D?\d+/i)
-    let x64 = ua.match(/x64/i)
-    if (!verTrident && !verIE && x64) return true
-    else if (verFF) {
-      verFF = verFF[0].match(/\d+/)
-      if (verFF[0] >= 41 || x64) return true
-    } else if (verOPR) {
-      verOPR = verOPR[0].match(/\d+/)
-      if (verOPR[0] >= 32) return true
-    } else if (!verTrident && !verIE) {
-      let verChrome: any = ua.match(/Chrome\D?\d+/i)
-      if (verChrome) {
-        verChrome = verChrome[0].match(/\d+/)
-        if (verChrome[0] >= 41) return true
-      }
+    try {
+        let ua = navigator.userAgent;
+        if (ua.match(/Windows\sPhone/i) ||
+            ua.match(/iPhone|iPod|iPad/i) ||
+            ua.match(/Android/i) ||
+            ua.match(/Edge\D?\d+/i))
+            return true;
+        let verTrident = ua.match(/Trident\D?\d+/i);
+        let verIE = ua.match(/MSIE\D?\d+/i);
+        let verOPR: any = ua.match(/OPR\D?\d+/i);
+        let verFF: any = ua.match(/Firefox\D?\d+/i);
+        let x64 = ua.match(/x64/i);
+        if ((!verTrident) && (!verIE) && (x64)) return true;
+        else if (verFF) {
+            verFF = verFF[0].match(/\d+/);
+            if ((verFF[0] >= 41) || (x64)) return true;
+        } else if (verOPR) {
+            verOPR = verOPR[0].match(/\d+/);
+            if (verOPR[0] >= 32) return true;
+        } else if ((!verTrident) && (!verIE)) {
+            let verChrome: any = ua.match(/Chrome\D?\d+/i);
+            if (verChrome) {
+                verChrome = verChrome[0].match(/\d+/);
+                if (verChrome[0] >= 41) return true;
+            }
+        }
+        return false;
+    } catch (err) {
+        return true;
     }
-    return false
-  } catch (err) {
-    return true
-  }
-}
+};
 
 // ==检查加载成功与否，如没成功则用http(s)再试==
 // ==低版本CLODOP6.561/Lodop7.043及前)用本方法==
 function checkOrTryHttp() {
-  if (window.getCLodop) {
-    LoadJsState.value = 'complete'
-    return true
-  }
-  if (LoadJsState.value == 'loadingB' || LoadJsState.value == 'complete') return
-  LoadJsState.value = 'loadingB'
-  let head =
-    document.head ||
-    document.getElementsByTagName('head')[0] ||
-    document.documentElement
-  let JS1 = document.createElement('script'),
-    JS2 = document.createElement('script'),
-    JS3 = document.createElement('script')
-  JS1.src = URL_HTTP1.value
-  JS2.src = URL_HTTP2.value
-  JS3.src = URL_HTTP3.value
-  JS1.onload =
-    JS2.onload =
-    JS3.onload =
-    JS2.onerror =
-    JS3.onerror =
-      function () {
-        LoadJsState.value = 'complete'
-      }
-  JS1.onerror = function (e) {
-    if (window.location.protocol !== 'https:') {
-      head.insertBefore(JS2, head.firstChild)
-    } else {
-      head.insertBefore(JS3, head.firstChild)
+    if (window.getCLodop) {
+        LoadJsState.value = "complete";
+        return true;
     }
-  }
-  head.insertBefore(JS1, head.firstChild)
+    if (LoadJsState.value == "loadingB" || LoadJsState.value == "complete") return;
+    LoadJsState.value = "loadingB";
+    let head = document.head || document.getElementsByTagName("head")[0] || document.documentElement;
+    let JS1 = document.createElement("script")
+        , JS2 = document.createElement("script")
+        , JS3 = document.createElement("script");
+    JS1.src = URL_HTTP1.value;
+    JS2.src = URL_HTTP2.value;
+    JS3.src = URL_HTTP3.value;
+    JS1.onload = JS2.onload = JS3.onload = JS2.onerror = JS3.onerror = function () {
+        LoadJsState.value = "complete";
+    };
+    JS1.onerror = function (e) {
+        if (window.location.protocol !== 'https:') {
+            head.insertBefore(JS2, head.firstChild);
+        } else {
+            head.insertBefore(JS3, head.firstChild);
+        }
+    };
+    head.insertBefore(JS1, head.firstChild);
 }
 
 // ==加载Lodop对象的主过程:==
 const loadCLodop = (paramas: any = null) => {
-  if (!needCLodop()) return
-
-  initPort(paramas)
-
-  CLodopIsLocal.value = !!(URL_WS1.value + URL_WS2.value).match(
-    /\/\/localho|\/\/127.0.0./i
-  )
-  LoadJsState.value = 'loadingA'
-  if (!window.WebSocket && window.MozWebSocket)
-    window.WebSocket = window.MozWebSocket
-  //ws方式速度快(小于200ms)且可避免CORS错误,但要求Lodop版本足够新:
-  try {
-    let WSK1 = new WebSocket(URL_WS1.value)
-    WSK1.onopen = function (e) {
-      setTimeout(checkOrTryHttp, 200)
-    }
-    WSK1.onmessage = function (e) {
-      if (!window.getCLodop) eval(e.data)
-    }
-    WSK1.onerror = function (e) {
-      let WSK2 = new WebSocket(URL_WS2.value)
-      WSK2.onopen = function (e) {
-        setTimeout(checkOrTryHttp, 200)
-      }
-      WSK2.onmessage = function (e) {
-        if (!window.getCLodop) eval(e.data)
-      }
-      WSK2.onerror = function (e) {
-        checkOrTryHttp()
-      }
+    if (!needCLodop()) return;
+
+    initPort(paramas);
+
+    CLodopIsLocal.value = !!((URL_WS1.value + URL_WS2.value).match(/\/\/localho|\/\/127.0.0./i));
+    LoadJsState.value = "loadingA";
+    if (!window.WebSocket && window.MozWebSocket) window.WebSocket = window.MozWebSocket;
+    //ws方式速度快(小于200ms)且可避免CORS错误,但要求Lodop版本足够新:
+    try {
+        let WSK1 = new WebSocket(URL_WS1.value);
+        WSK1.onopen = function (e) {
+            setTimeout(checkOrTryHttp, 200);
+        };
+        WSK1.onmessage = function (e) {
+            if (!window.getCLodop) eval(e.data);
+        };
+        WSK1.onerror = function (e) {
+            let WSK2 = new WebSocket(URL_WS2.value);
+            WSK2.onopen = function (e) {
+                setTimeout(checkOrTryHttp, 200);
+            };
+            WSK2.onmessage = function (e) {
+                if (!window.getCLodop) eval(e.data);
+            };
+            WSK2.onerror = function (e) {
+                checkOrTryHttp();
+            }
+        }
+    } catch (e) {
+        checkOrTryHttp();
     }
-  } catch (e) {
-    checkOrTryHttp()
-  }
-}
+};
 
 //==获取LODOP对象主过程,判断是否安装、需否升级:==
 const getLodop = (oOBJECT = null, oEMBED = null) => {
-  let strFontTag = '<br>打印控件'
-  let strLodopInstall =
-    strFontTag +
-    "未安装!点击这里<a href='http://www.lodop.net/download.html' target='_blank' class='text-primary'>执行安装</a>"
-  let strLodopUpdate =
-    strFontTag +
-    "需要升级!点击这里<a href='http://www.lodop.net/download.html' target='_blank' class='text-primary'>执行升级</a>"
-  let strCLodopInstallA =
-    "<br>Web打印服务CLodop未安装启动，点击这里<a href='http://www.lodop.net/download.html' target='_blank' class='text-primary'>下载执行安装</a>"
-  let strCLodopInstallB =
-    "<br>（若此前已安装过，可<a href='CLodop.protocol:setup' target='_blank' class='text-primary'>点这里直接再次启动</a>）"
-  let strCLodopUpdate =
-    "<br>Web打印服务CLodop需升级!点击这里<a href='http://www.lodop.net/download.html' target='_blank' class='text-primary'>执行升级</a>"
-  let strLodop7FontTag = '<br>Web打印服务Lodop7'
-  let strLodop7HrefX86 =
-    "点击这里<a href='http://www.lodop.net/download.html' target='_blank' class='text-primary'>下载安装</a>(下载后解压，点击lodop文件开始执行)"
-  let strLodop7Install_X86 =
-    strLodop7FontTag + '未安装启动，' + strLodop7HrefX86
-  let strLodop7Update_X86 = strLodop7FontTag + '需升级，' + strLodop7HrefX86
-  let strInstallOK = '，成功后请刷新本页面或重启浏览器。'
-  let LODOP
-  try {
-    let isWinIE =
-      /MSIE/i.test(navigator.userAgent) || /Trident/i.test(navigator.userAgent)
-    let isLinuxX86 =
-      /Linux/i.test(navigator.platform) && /x86/i.test(navigator.platform)
-    let isLinuxARM =
-      /Linux/i.test(navigator.platform) && /aarch/i.test(navigator.platform)
-
-    if (needCLodop() || isLinuxX86 || isLinuxARM) {
-      try {
-        LODOP = window.getCLodop()
-      } catch (err) {}
-      if (!LODOP && LoadJsState.value !== 'complete') {
-        if (!LoadJsState.value) {
-          ElMessageBox.alert(
-            '未曾加载Lodop主JS文件，请先调用loadCLodop过程',
-            '提示',
-            { dangerouslyUseHTMLString: true }
-          )
+    let strFontTag = "<br>打印控件";
+    let strLodopInstall = strFontTag + "未安装!点击这里<a href='http://www.lodop.net/download.html' target='_blank' class='text-primary'>执行安装</a>";
+    let strLodopUpdate = strFontTag + "需要升级!点击这里<a href='http://www.lodop.net/download.html' target='_blank' class='text-primary'>执行升级</a>";
+    let strCLodopInstallA = "<br>Web打印服务CLodop未安装启动，点击这里<a href='http://www.lodop.net/download.html' target='_blank' class='text-primary'>下载执行安装</a>";
+    let strCLodopInstallB = "<br>（若此前已安装过，可<a href='CLodop.protocol:setup' target='_blank' class='text-primary'>点这里直接再次启动</a>）";
+    let strCLodopUpdate = "<br>Web打印服务CLodop需升级!点击这里<a href='http://www.lodop.net/download.html' target='_blank' class='text-primary'>执行升级</a>";
+    let strLodop7FontTag = "<br>Web打印服务Lodop7";
+    let strLodop7HrefX86 = "点击这里<a href='http://www.lodop.net/download.html' target='_blank' class='text-primary'>下载安装</a>(下载后解压，点击lodop文件开始执行)";
+    let strLodop7Install_X86 = strLodop7FontTag + "未安装启动，" + strLodop7HrefX86;
+    let strLodop7Update_X86 = strLodop7FontTag + "需升级，" + strLodop7HrefX86;
+    let strInstallOK = "，成功后请刷新本页面或重启浏览器。";
+    let LODOP;
+    try {
+        let isWinIE = (/MSIE/i.test(navigator.userAgent)) || (/Trident/i.test(navigator.userAgent));
+        let isLinuxX86 = (/Linux/i.test(navigator.platform)) && (/x86/i.test(navigator.platform));
+        let isLinuxARM = (/Linux/i.test(navigator.platform)) && (/aarch/i.test(navigator.platform));
+
+        if (needCLodop() || isLinuxX86 || isLinuxARM) {
+            try {
+                LODOP = window.getCLodop();
+            } catch (err) {
+            }
+            if (!LODOP && LoadJsState.value !== "complete") {
+                if (!LoadJsState.value) {
+                    ElMessageBox.alert('未曾加载Lodop主JS文件，请先调用loadCLodop过程', '提示', { dangerouslyUseHTMLString: true, })
+                } else {
+                    ElMessageBox.alert('网页还没下载完毕，请稍等一下再操作', '提示', { dangerouslyUseHTMLString: true, })
+                }
+                return;
+            }
+            let strAlertMessage;
+            if (!LODOP) {
+                if (isLinuxX86 || isLinuxARM)
+                    strAlertMessage = strLodop7Install_X86;
+                else
+                    strAlertMessage = strCLodopInstallA + (CLodopIsLocal.value ? strCLodopInstallB : "");
+
+                ElMessageBox.alert(strAlertMessage + strInstallOK, '提示', { dangerouslyUseHTMLString: true, })
+                return;
+            } else {
+                if ((isLinuxX86 || isLinuxARM) && LODOP.CVERSION < "7.0.7.5")
+                    strAlertMessage = strLodop7Update_X86;
+                else if (CLODOP.CVERSION < "6.5.9.8")
+                    strAlertMessage = strCLodopUpdate;
+
+                if (strAlertMessage) {
+                    ElMessageBox.alert(strAlertMessage + strInstallOK, '提示', { dangerouslyUseHTMLString: true, })
+                }
+            }
         } else {
-          ElMessageBox.alert('网页还没下载完毕，请稍等一下再操作', '提示', {
-            dangerouslyUseHTMLString: true,
-          })
+            //==如果页面有Lodop插件就直接使用,否则新建:==
+            if (oOBJECT || oEMBED) {
+                if (isWinIE) LODOP = oOBJECT;
+                else LODOP = oEMBED;
+            } else if (!CreatedOKLodopObject.value) {
+                LODOP = document.createElement("object");
+                LODOP.setAttribute("width", 0);
+                LODOP.setAttribute("height", 0);
+                LODOP.setAttribute("style", "position:absolute;left:0px;top:-100px;width:0px;height:0px;");
+                if (isWinIE) LODOP.setAttribute("classid", "clsid:2105C259-1E0C-4534-8141-A753534CB4CA");
+                else LODOP.setAttribute("type", "application/x-print-lodop");
+                document.documentElement.appendChild(LODOP);
+                CreatedOKLodopObject.value = LODOP;
+            } else
+                LODOP = CreatedOKLodopObject.value;
+            //==Lodop插件未安装时提示下载地址:==
+            if ((!LODOP) || (!LODOP.VERSION)) {
+                ElMessageBox.alert(strLodopInstall + strInstallOK, '提示', { dangerouslyUseHTMLString: true, })
+                return LODOP;
+            }
+            if (LODOP.VERSION < "6.2.2.6") {
+                ElMessageBox.alert(strLodopUpdate + strInstallOK, '提示', { dangerouslyUseHTMLString: true, })
+            }
         }
-        return
-      }
-      let strAlertMessage
-      if (!LODOP) {
-        if (isLinuxX86 || isLinuxARM) strAlertMessage = strLodop7Install_X86
-        else
-          strAlertMessage =
-            strCLodopInstallA + (CLodopIsLocal.value ? strCLodopInstallB : '')
 
-        ElMessageBox.alert(strAlertMessage + strInstallOK, '提示', {
-          dangerouslyUseHTMLString: true,
-        })
-        return
-      } else {
-        if ((isLinuxX86 || isLinuxARM) && LODOP.CVERSION < '7.0.7.5')
-          strAlertMessage = strLodop7Update_X86
-        else if (CLODOP.CVERSION < '6.5.9.8') strAlertMessage = strCLodopUpdate
+        //===如下空白位置适合调用统一功能(如注册语句、语言选择等):=======================
 
-        if (strAlertMessage) {
-          ElMessageBox.alert(strAlertMessage + strInstallOK, '提示', {
-            dangerouslyUseHTMLString: true,
-          })
-        }
-      }
-    } else {
-      //==如果页面有Lodop插件就直接使用,否则新建:==
-      if (oOBJECT || oEMBED) {
-        if (isWinIE) LODOP = oOBJECT
-        else LODOP = oEMBED
-      } else if (!CreatedOKLodopObject.value) {
-        LODOP = document.createElement('object')
-        LODOP.setAttribute('width', 0)
-        LODOP.setAttribute('height', 0)
-        LODOP.setAttribute(
-          'style',
-          'position:absolute;left:0px;top:-100px;width:0px;height:0px;'
-        )
-        if (isWinIE)
-          LODOP.setAttribute(
-            'classid',
-            'clsid:2105C259-1E0C-4534-8141-A753534CB4CA'
-          )
-        else LODOP.setAttribute('type', 'application/x-print-lodop')
-        document.documentElement.appendChild(LODOP)
-        CreatedOKLodopObject.value = LODOP
-      } else LODOP = CreatedOKLodopObject.value
-      //==Lodop插件未安装时提示下载地址:==
-      if (!LODOP || !LODOP.VERSION) {
-        ElMessageBox.alert(strLodopInstall + strInstallOK, '提示', {
-          dangerouslyUseHTMLString: true,
+        //===============================================================================
+        return LODOP;
+    } catch (err) {
+        ElMessage({
+            message: "getLodop出错:" + err,
+            type: 'error',
+            duration: 5000
         })
-        return LODOP
-      }
-      if (LODOP.VERSION < '6.2.2.6') {
-        ElMessageBox.alert(strLodopUpdate + strInstallOK, '提示', {
-          dangerouslyUseHTMLString: true,
-        })
-      }
     }
-
-    //===如下空白位置适合调用统一功能(如注册语句、语言选择等):=======================
-
-    //===============================================================================
-    return LODOP
-  } catch (err) {
-    ElMessage({
-      message: 'getLodop出错:' + err,
-      type: 'error',
-      duration: 5000,
-    })
-  }
-}
+};
 
 export { loadCLodop, getLodop }
diff --git a/admin/src/utils/qqmap.ts b/admin/src/utils/qqmap.ts
index ecf0ddc9..225719e4 100644
--- a/admin/src/utils/qqmap.ts
+++ b/admin/src/utils/qqmap.ts
@@ -6,67 +6,60 @@ const geometry: any = {}
  * 在地图上创建一个圆形
  */
 export const createCircle = (map: any, geometriesData: any) => {
-  const TMap = (window as any).TMap
-  const LatLng = TMap.LatLng
-
-  geometriesData.radius = geometriesData.radius ?? 1000
-  geometriesData.center = geometriesData.center ?? {
-    lat: map.getCenter().lat,
-    lng: map.getCenter().lng,
-  }
-
-  const color = [
-    Math.floor(Math.random() * 255),
-    Math.floor(Math.random() * 255),
-    Math.floor(Math.random() * 255),
-  ]
-
-  // 创建图形
-  const multiCircle = new TMap.MultiCircle({
-    map,
-    styles: {
-      // 设置圆形样式
-      circle: new TMap.CircleStyle({
-        color: `rgba(${color.toString()}, .4)`,
-        showBorder: true,
-        borderColor: `rgb(${color.toString()})`,
-        borderWidth: 2,
-      }),
-    },
-    geometries: [
-      {
-        styleId: 'circle',
-        center: new LatLng(
-          geometriesData.center.lat,
-          geometriesData.center.lng
-        ),
-        radius: parseInt(geometriesData.radius),
-        id: geometriesData.key,
-      },
-    ],
-  })
-  geometry[geometriesData.key] = { graphical: multiCircle }
-
-  // 创建图形编辑器
-  const editor = new TMap.tools.GeometryEditor({
-    map: map,
-    overlayList: [
-      {
-        overlay: multiCircle,
-        id: geometriesData.key,
-      },
-    ],
-    actionMode: TMap.tools.constants.EDITOR_ACTION.INTERACT,
-    activeOverlayId: geometriesData.key, // 激活图层
-    selectable: true, // 开启点选功能
-  })
-
-  editor.on('adjust_complete', (data: any) => {
-    geometriesData.center = { lat: data.center.lat, lng: data.center.lng }
-    geometriesData.radius = parseInt(data.radius)
-  })
-
-  geometry[geometriesData.key] = { graphical: multiCircle, editor }
+    const TMap = (window as any).TMap
+    const LatLng = TMap.LatLng
+
+    geometriesData.radius = geometriesData.radius ?? 1000
+    geometriesData.center = geometriesData.center ?? { lat: map.getCenter().lat, lng: map.getCenter().lng }
+
+    const color = [
+        Math.floor(Math.random() * 255),
+        Math.floor(Math.random() * 255),
+        Math.floor(Math.random() * 255)
+    ]
+
+    // 创建图形
+    const multiCircle = new TMap.MultiCircle({
+        map,
+        styles: { // 设置圆形样式
+            circle: new TMap.CircleStyle({
+                color: `rgba(${color.toString()}, .4)`,
+                showBorder: true,
+                borderColor: `rgb(${color.toString()})`,
+                borderWidth: 2
+            })
+        },
+        geometries: [
+            {
+                styleId: 'circle',
+                center: new LatLng(geometriesData.center.lat, geometriesData.center.lng),
+                radius: parseInt(geometriesData.radius),
+                id: geometriesData.key
+            }
+        ]
+    })
+    geometry[geometriesData.key] = { graphical: multiCircle }
+
+    // 创建图形编辑器
+    const editor = new TMap.tools.GeometryEditor({
+        map: map,
+        overlayList: [
+            {
+                overlay: multiCircle,
+                id: geometriesData.key,
+            }
+        ],
+        actionMode: TMap.tools.constants.EDITOR_ACTION.INTERACT,
+        activeOverlayId: geometriesData.key, // 激活图层
+        selectable: true // 开启点选功能
+    })
+
+    editor.on('adjust_complete', (data: any) => {
+        geometriesData.center = { lat: data.center.lat, lng: data.center.lng }
+        geometriesData.radius = parseInt(data.radius)
+    })
+
+    geometry[geometriesData.key] = { graphical: multiCircle, editor }
 }
 
 /**
@@ -75,65 +68,65 @@ export const createCircle = (map: any, geometriesData: any) => {
  * @param geometriesData
  */
 export const createPolygon = (map: any, geometriesData: any) => {
-  const TMap = (window as any).TMap
-  const LatLng = TMap.LatLng
-
-  const { lat, lng } = map.getCenter()
-
-  geometriesData.paths = geometriesData.paths ?? [
-    { lat: lat + 0.01, lng: lng + 0.01 },
-    { lat: lat - 0.01, lng: lng + 0.01 },
-    { lat: lat - 0.01, lng: lng - 0.01 },
-    { lat: lat + 0.01, lng: lng - 0.01 },
-  ]
-
-  const color = [
-    Math.floor(Math.random() * 255),
-    Math.floor(Math.random() * 255),
-    Math.floor(Math.random() * 255),
-  ]
-
-  const multiPolygon = new TMap.MultiPolygon({
-    map: map,
-    styles: {
-      polygon: new TMap.PolygonStyle({
-        color: `rgba(${color.toString()}, .4)`,
-        showBorder: true,
-        borderColor: `rgb(${color.toString()})`,
-        borderWidth: 2,
-      }),
-    },
-    geometries: [
-      {
-        id: geometriesData.key,
-        styleId: 'polygon',
-        paths: geometriesData.paths.map((item: any) => {
-          return new LatLng(item.lat, item.lng)
-        }),
-      },
-    ],
-  })
-
-  const editor = new TMap.tools.GeometryEditor({
-    map: map,
-    overlayList: [
-      {
-        overlay: multiPolygon,
-        id: geometriesData.key,
-      },
-    ],
-    actionMode: TMap.tools.constants.EDITOR_ACTION.INTERACT,
-    activeOverlayId: geometriesData.key, // 激活图层
-    selectable: true, // 开启点选功能
-  })
-
-  editor.on('adjust_complete', (data: any) => {
-    geometriesData.paths = data.paths.map((item) => {
-      return { lat: item.lat, lng: item.lng }
+    const TMap = (window as any).TMap
+    const LatLng = TMap.LatLng
+
+    const { lat, lng } = map.getCenter();
+
+    geometriesData.paths = geometriesData.paths ?? [
+        { lat: lat + 0.01, lng: lng + 0.01 },
+        { lat: lat - 0.01, lng: lng + 0.01 },
+        { lat: lat - 0.01, lng: lng - 0.01 },
+        { lat: lat + 0.01, lng: lng - 0.01 }
+    ]
+
+    const color = [
+        Math.floor(Math.random() * 255),
+        Math.floor(Math.random() * 255),
+        Math.floor(Math.random() * 255)
+    ]
+
+    const multiPolygon = new TMap.MultiPolygon({
+        map: map,
+        styles: {
+            polygon: new TMap.PolygonStyle({
+                color: `rgba(${color.toString()}, .4)`,
+                showBorder: true,
+                borderColor: `rgb(${color.toString()})`,
+                borderWidth: 2
+            })
+        },
+        geometries: [
+            {
+                id: geometriesData.key,
+                styleId: 'polygon',
+                paths: geometriesData.paths.map((item: any) => {
+                    return new LatLng(item.lat, item.lng)
+                })
+            }
+        ]
+    });
+
+    const editor = new TMap.tools.GeometryEditor({
+        map: map,
+        overlayList: [
+            {
+                overlay: multiPolygon,
+                id: geometriesData.key,
+            }
+        ],
+        actionMode: TMap.tools.constants.EDITOR_ACTION.INTERACT,
+        activeOverlayId: geometriesData.key, // 激活图层
+        selectable: true, // 开启点选功能
+    })
+
+    editor.on('adjust_complete', (data: any) => {
+        geometriesData.paths = data.paths.map(item => {
+            return { lat: item.lat, lng: item.lng}
+        })
     })
-  })
 
-  geometry[geometriesData.key] = { graphical: multiPolygon, editor }
+    geometry[geometriesData.key] = { graphical: multiPolygon, editor }
 }
 
 /**
@@ -141,8 +134,8 @@ export const createPolygon = (map: any, geometriesData: any) => {
  * @param key
  */
 export const deleteGeometry = (key: string) => {
-  geometry[key].graphical.remove(key)
-  geometry[key].editor.delete()
+    geometry[key].graphical.remove(key)
+    geometry[key].editor.delete()
 }
 
 /**
@@ -150,7 +143,7 @@ export const deleteGeometry = (key: string) => {
  * @param key
  */
 export const selectGeometry = (key: string) => {
-  geometry[key].editor.select([key])
+    geometry[key].editor.select([key])
 }
 
 /**
@@ -159,18 +152,18 @@ export const selectGeometry = (key: string) => {
  * @returns
  */
 export const createMarker = (map: any) => {
-  const TMap = (window as any).TMap
-  const LatLng = TMap.LatLng
-
-  return new TMap.MultiMarker({
-    map,
-    geometries: [
-      {
-        id: 'center',
-        position: map.getCenter(),
-      },
-    ],
-  })
+    const TMap = (window as any).TMap
+    const LatLng = TMap.LatLng
+
+    return new TMap.MultiMarker({
+        map,
+        geometries: [
+            {
+                id: 'center',
+                position: map.getCenter(),
+            }
+        ]
+    });
 }
 
 /**
@@ -178,18 +171,12 @@ export const createMarker = (map: any) => {
  * @param params
  */
 export const latLngToAddress = (params: any) => {
-  return jsonp(
-    `https://apis.map.qq.com/ws/geocoder/v1/?key=${params.mapKey}&location=${params.lat},${params.lng}&output=jsonp&callback=latLngToAddress`,
-    { callbackName: 'latLngToAddress' }
-  )
+    return jsonp(`https://apis.map.qq.com/ws/geocoder/v1/?key=${params.mapKey}&location=${params.lat},${params.lng}&output=jsonp&callback=latLngToAddress`, { callbackName: 'latLngToAddress' })
 }
 
 /**
  * 地址解析
  */
 export const addressToLatLng = (params: any) => {
-  return jsonp(
-    `https://apis.map.qq.com/ws/geocoder/v1/?key=${params.mapKey}&address=${params.address}&output=jsonp&callback=addressToLatLng`,
-    { callbackName: 'addressToLatLng' }
-  )
+    return jsonp(`https://apis.map.qq.com/ws/geocoder/v1/?key=${params.mapKey}&address=${params.address}&output=jsonp&callback=addressToLatLng`, { callbackName: 'addressToLatLng' })
 }
diff --git a/admin/src/utils/request.ts b/admin/src/utils/request.ts
index 8c71559f..751b62de 100644
--- a/admin/src/utils/request.ts
+++ b/admin/src/utils/request.ts
@@ -1,11 +1,6 @@
 import axios, { HttpStatusCode } from 'axios'
-import type {
-  AxiosInstance,
-  InternalAxiosRequestConfig,
-  AxiosResponse,
-  AxiosRequestConfig,
-} from 'axios'
-import { getToken, isUrl } from './common'
+import type { AxiosInstance, InternalAxiosRequestConfig, AxiosResponse, AxiosRequestConfig } from 'axios'
+import { getToken, isUrl } from './common';
 import { ElMessage } from 'element-plus'
 import type { MessageParams } from 'element-plus'
 import { t } from '@/lang'
@@ -13,224 +8,188 @@ import useUserStore from '@/stores/modules/user'
 import storage from '@/utils/storage'
 
 interface RequestConfig extends AxiosRequestConfig {
-  showErrorMessage?: boolean
-  showSuccessMessage?: boolean
+    showErrorMessage?: boolean
+    showSuccessMessage?: boolean
 }
 
 interface InternalRequestConfig extends InternalAxiosRequestConfig {
-  showErrorMessage?: boolean
-  showSuccessMessage?: boolean
+    showErrorMessage?: boolean
+    showSuccessMessage?: boolean
 }
 
 interface requestResponse extends AxiosResponse {
-  config: InternalRequestConfig
+    config: InternalRequestConfig
 }
 
 class Request {
-  private instance: AxiosInstance
-
-  constructor() {
-    this.instance = axios.create({
-      baseURL:
-        import.meta.env.VITE_APP_BASE_URL.substr(-1) == '/'
-          ? import.meta.env.VITE_APP_BASE_URL
-          : `${import.meta.env.VITE_APP_BASE_URL}/`,
-      timeout: 0,
-      headers: {
-        'Content-Type': 'application/json',
-        lang: storage.get('lang') ?? 'zh-cn',
-      },
-    })
-
-    // 全局请求拦截器
-    this.instance.interceptors.request.use(
-      (config: InternalRequestConfig) => {
-        // 携带token
-        if (getToken()) {
-          config.headers[import.meta.env.VITE_REQUEST_HEADER_TOKEN_KEY] =
-            getToken()
+    private instance: AxiosInstance;
+
+    constructor() {
+        this.instance = axios.create({
+            baseURL: import.meta.env.VITE_APP_BASE_URL.substr(-1) == '/' ? import.meta.env.VITE_APP_BASE_URL : `${import.meta.env.VITE_APP_BASE_URL}/`,
+            timeout: 0,
+            headers: {
+                'Content-Type': 'application/json',
+                'lang': storage.get('lang') ?? 'zh-cn'
+            }
+        });
+
+        // 全局请求拦截器
+        this.instance.interceptors.request.use(
+            (config: InternalRequestConfig) => {
+                // 携带token
+                if (getToken()) {
+                    config.headers[import.meta.env.VITE_REQUEST_HEADER_TOKEN_KEY] = getToken()
+                }
+                return config
+            },
+            (err: any) => {
+                return Promise.reject(err)
+            }
+        )
+
+        // 全局响应拦截器
+        this.instance.interceptors.response.use(
+            (response: requestResponse) => {
+				if (response.request.responseType != 'blob') {
+					const res = response.data
+					if (res.code != 1) {
+					    this.handleAuthError(res.code)
+					    if (res.code != 401 && response.config.showErrorMessage !== false) this.showElMessage({ message: res.msg, type: 'error', dangerouslyUseHTMLString: true, duration: 5000 })
+					    return Promise.reject(new Error(res.msg || 'Error'))
+					} else {
+					    if (response.config.showSuccessMessage) ElMessage({ message: res.msg, type: 'success' })
+					    return res
+					}
+				}
+				return response.data
+            },
+            (err: any) => {
+                this.handleNetworkError(err)
+                return Promise.reject(err)
+            }
+        )
+    }
+
+    /**
+     * 发送get请求
+     * @param url
+     * @param config
+     * @returns
+     */
+    public get<T = any, R = AxiosResponse<T>>(url: string, config?: RequestConfig): Promise<R> {
+        return this.instance.get(url, config)
+    }
+
+    /**
+     * 发送get请求
+     * @param url
+     * @param config
+     * @returns
+     */
+    public post<T = any, R = AxiosResponse<T>, D = any>(url: string, data?: D, config?: RequestConfig): Promise<R> {
+        return this.instance.post(url, data, config)
+    }
+
+    /**
+     * 发送get请求
+     * @param url
+     * @param config
+     * @returns
+     */
+    public put<T = any, R = AxiosResponse<T>, D = any>(url: string, data?: D, config?: RequestConfig): Promise<R> {
+        return this.instance.put(url, data, config)
+    }
+
+    /**
+     * 发送get请求
+     * @param url
+     * @param config
+     * @returns
+     */
+    public delete<T = any, R = AxiosResponse<T>>(url: string, config?: RequestConfig): Promise<R> {
+        return this.instance.delete(url, config)
+    }
+
+    /**
+     * 处理网络请求错误
+     * @param err
+     */
+    private handleNetworkError(err: any) {
+        let errMessage = ''
+
+        if (err.response && err.response.status) {
+            const errStatus = err.response.status
+            switch (errStatus) {
+                case 400:
+                    errMessage = t('axios.400')
+                    break
+                case 401:
+                    errMessage = t('axios.401')
+                    break
+                case 403:
+                    errMessage = t('axios.403')
+                    break
+                case 404:
+                    const baseURL = isUrl(err.response.config.baseURL) ? err.response.config.baseURL : `${location.origin}${err.response.config.baseURL}`
+                    errMessage = baseURL + t('axios.baseUrlError')
+                    break
+                case 405:
+                    errMessage = t('axios.405')
+                    break
+                case 408:
+                    errMessage = t('axios.408')
+                    break
+                case 409:
+                    errMessage = t('axios.409')
+                    break
+                case 500:
+                    errMessage = t('axios.500')
+                    break
+                case 501:
+                    errMessage = t('axios.501')
+                    break
+                case 502:
+                    errMessage = t('axios.502')
+                    break
+                case 503:
+                    errMessage = t('axios.503')
+                    break
+                case 504:
+                    errMessage = t('axios.504')
+                    break
+                case 505:
+                    errMessage = t('axios.505')
+                    break
+            }
         }
-        return config
-      },
-      (err: any) => {
-        return Promise.reject(err)
-      }
-    )
-
-    // 全局响应拦截器
-    this.instance.interceptors.response.use(
-      (response: requestResponse) => {
-        if (response.request.responseType != 'blob') {
-          const res = response.data
-          if (res.code != 1) {
-            this.handleAuthError(res.code)
-            if (res.code != 401 && response.config.showErrorMessage !== false)
-              this.showElMessage({
-                message: res.msg,
-                type: 'error',
-                dangerouslyUseHTMLString: true,
-                duration: 5000,
-              })
-            return Promise.reject(new Error(res.msg || 'Error'))
-          } else {
-            if (response.config.showSuccessMessage)
-              ElMessage({ message: res.msg, type: 'success' })
-            return res
-          }
+        err.message.includes('timeout') && (errMessage = t('axios.timeout'))
+        if (err.code == 'ERR_NETWORK') {
+            const baseURL = isUrl(err.config.baseURL) ? err.config.baseURL : `${location.origin}${err.config.baseURL}`
+            errMessage = baseURL + t('axios.baseUrlError')
         }
-        return response.data
-      },
-      (err: any) => {
-        this.handleNetworkError(err)
-        return Promise.reject(err)
-      }
-    )
-  }
-
-  /**
-   * 发送get请求
-   * @param url
-   * @param config
-   * @returns
-   */
-  public get<T = any, R = AxiosResponse<T>>(
-    url: string,
-    config?: RequestConfig
-  ): Promise<R> {
-    return this.instance.get(url, config)
-  }
-
-  /**
-   * 发送get请求
-   * @param url
-   * @param config
-   * @returns
-   */
-  public post<T = any, R = AxiosResponse<T>, D = any>(
-    url: string,
-    data?: D,
-    config?: RequestConfig
-  ): Promise<R> {
-    return this.instance.post(url, data, config)
-  }
-
-  /**
-   * 发送get请求
-   * @param url
-   * @param config
-   * @returns
-   */
-  public put<T = any, R = AxiosResponse<T>, D = any>(
-    url: string,
-    data?: D,
-    config?: RequestConfig
-  ): Promise<R> {
-    return this.instance.put(url, data, config)
-  }
-
-  /**
-   * 发送get请求
-   * @param url
-   * @param config
-   * @returns
-   */
-  public delete<T = any, R = AxiosResponse<T>>(
-    url: string,
-    config?: RequestConfig
-  ): Promise<R> {
-    return this.instance.delete(url, config)
-  }
-
-  /**
-   * 处理网络请求错误
-   * @param err
-   */
-  private handleNetworkError(err: any) {
-    let errMessage = ''
-
-    if (err.response && err.response.status) {
-      const errStatus = err.response.status
-      switch (errStatus) {
-        case 400:
-          errMessage = t('axios.400')
-          break
-        case 401:
-          errMessage = t('axios.401')
-          break
-        case 403:
-          errMessage = t('axios.403')
-          break
-        case 404:
-          const baseURL = isUrl(err.response.config.baseURL)
-            ? err.response.config.baseURL
-            : `${location.origin}${err.response.config.baseURL}`
-          errMessage = baseURL + t('axios.baseUrlError')
-          break
-        case 405:
-          errMessage = t('axios.405')
-          break
-        case 408:
-          errMessage = t('axios.408')
-          break
-        case 409:
-          errMessage = t('axios.409')
-          break
-        case 500:
-          errMessage = t('axios.500')
-          break
-        case 501:
-          errMessage = t('axios.501')
-          break
-        case 502:
-          errMessage = t('axios.502')
-          break
-        case 503:
-          errMessage = t('axios.503')
-          break
-        case 504:
-          errMessage = t('axios.504')
-          break
-        case 505:
-          errMessage = t('axios.505')
-          break
-      }
-    }
-    err.message.includes('timeout') && (errMessage = t('axios.timeout'))
-    if (err.code == 'ERR_NETWORK') {
-      const baseURL = isUrl(err.config.baseURL)
-        ? err.config.baseURL
-        : `${location.origin}${err.config.baseURL}`
-      errMessage = baseURL + t('axios.baseUrlError')
+        errMessage && this.showElMessage({ dangerouslyUseHTMLString: true, duration: 5000, message: errMessage, type: 'error' })
     }
-    errMessage &&
-      this.showElMessage({
-        dangerouslyUseHTMLString: true,
-        duration: 5000,
-        message: errMessage,
-        type: 'error',
-      })
-  }
-
-  private handleAuthError(code: number) {
-    switch (code) {
-      case 401:
-        useUserStore().logout()
-        break
+
+    private handleAuthError(code: number) {
+        switch (code) {
+            case 401:
+                useUserStore().logout()
+                break;
+        }
     }
-  }
 
-  private messageCache = new Map()
+    private messageCache = new Map();
 
-  private showElMessage(options: MessageParams) {
-    const cacheKey = options.message
-    const cachedMessage = this.messageCache.get(cacheKey)
+    private showElMessage(options: MessageParams) {
+        const cacheKey = options.message
+        const cachedMessage = this.messageCache.get(cacheKey);
 
-    if (!cachedMessage || Date.now() - cachedMessage.timestamp > 5000) {
-      // 5秒内重复内容不再弹出，可自定义过期时间
-      this.messageCache.set(cacheKey, { timestamp: Date.now() })
-      ElMessage(options)
+        if (!cachedMessage || Date.now() - cachedMessage.timestamp > 5000) { // 5秒内重复内容不再弹出，可自定义过期时间
+            this.messageCache.set(cacheKey, { timestamp: Date.now() });
+            ElMessage(options)
+        }
     }
-  }
 }
 
 export default new Request()
diff --git a/admin/src/utils/storage.ts b/admin/src/utils/storage.ts
index a29b5409..999e0291 100644
--- a/admin/src/utils/storage.ts
+++ b/admin/src/utils/storage.ts
@@ -1,68 +1,61 @@
 import { getAppType } from './common'
 
 interface setParam {
-  key: string
-  data: any
-  success?: () => {}
-  fail?: (err: any) => {}
+    key: string,
+    data: any,
+    success?: () => {},
+    fail?: (err: any) => {}
 }
 
 class Storage {
-  private prefix = ''
+    private prefix = ''
 
-  public constructor() {
-    this.prefix = 'admin'
-  }
+    public constructor() {
+        this.prefix = 'admin'
+    }
 
-  /**
-   * 设置缓存
-   * @param param
-   */
-  public set(param: setParam) {
-    try {
-      window.localStorage.setItem(
-        `${this.prefix}.${param.key}`,
-        JSON.stringify(param.data)
-      )
-      typeof param.success == 'function' && param.success()
-    } catch (error) {
-      typeof param.fail == 'function' && param.fail(error)
+    /**
+     * 设置缓存
+     * @param param
+     */
+    public set(param: setParam) {
+        try {
+            window.localStorage.setItem(`${this.prefix}.${param.key}`, JSON.stringify(param.data))
+            typeof param.success == 'function' && param.success()
+        } catch (error) {
+            typeof param.fail == 'function' && param.fail(error)
+        }
     }
-  }
 
-  /**
-   * 获取缓存
-   * @param key
-   * @returns
-   */
-  public get(key: string) {
-    try {
-      const json: any = window.localStorage.getItem(`${this.prefix}.${key}`)
-      return JSON.parse(json)
-    } catch (error) {
-      return window.localStorage.getItem(`${this.prefix}.${key}`)
+    /**
+     * 获取缓存
+     * @param key
+     * @returns
+     */
+    public get(key: string) {
+        try {
+            const json: any = window.localStorage.getItem(`${this.prefix}.${key}`)
+            return JSON.parse(json)
+        } catch (error) {
+            return window.localStorage.getItem(`${this.prefix}.${key}`)
+        }
     }
-  }
 
-  /**
-   * 移除指定缓存
-   * @param key
-   */
-  public remove(key: string | string[]) {
-    if (typeof key == 'string')
-      window.localStorage.removeItem(`${this.prefix}.${key}`)
-    else
-      key.forEach((item) => {
-        window.localStorage.removeItem(`${this.prefix}.${item}`)
-      })
-  }
+    /**
+     * 移除指定缓存
+     * @param key
+     */
+    public remove(key: string | string[]) {
+        if (typeof key == 'string') window.localStorage.removeItem(`${this.prefix}.${key}`)
+        else key.forEach(item => { window.localStorage.removeItem(`${this.prefix}.${item}`) })
+    }
 
-  /**
-   * 清理缓存
-   */
-  public clear() {
-    window.localStorage.clear()
-  }
+    /**
+     * 清理缓存
+     */
+    public clear() {
+        window.localStorage.clear()
+    }
 }
 
 const storage = new Storage()
diff --git a/admin/src/utils/test.ts b/admin/src/utils/test.ts
index 1c3fdef7..64a1e1b1 100644
--- a/admin/src/utils/test.ts
+++ b/admin/src/utils/test.ts
@@ -1,255 +1,246 @@
 const test = {
-  /**
-   * 验证电子邮箱格式
-   */
-  email(value: string) {
-    return /^\w+((-\w+)|(\.\w+))*\@[A-Za-z0-9]+((\.|-)[A-Za-z0-9]+)*\.[A-Za-z0-9]+$/.test(
-      value
-    )
-  },
-  /**
-   * 验证手机格式
-   */
-  mobile(value: string) {
-    return /^1[23456789]\d{9}$/.test(value)
-  },
-  /**
-   * 验证URL格式
-   */
-  url(value: string) {
-    return /^((https|http|ftp|rtsp|mms):\/\/)(([0-9a-zA-Z_!~*'().&=+$%-]+: )?[0-9a-zA-Z_!~*'().&=+$%-]+@)?(([0-9]{1,3}.){3}[0-9]{1,3}|([0-9a-zA-Z_!~*'()-]+.)*([0-9a-zA-Z][0-9a-zA-Z-]{0,61})?[0-9a-zA-Z].[a-zA-Z]{2,6})(:[0-9]{1,4})?((\/?)|(\/[0-9a-zA-Z_!~*'().;?:@&=+$,%#-]+)+\/?)$/.test(
-      value
-    )
-  },
-  /**
-   * 验证日期格式
-   */
-  date(value: any) {
-    if (!value) return false
-    // 判断是否数值或者字符串数值(意味着为时间戳)，转为数值，否则new Date无法识别字符串时间戳
-    if (this.number(value)) value = +value
-    return !/Invalid|NaN/.test(new Date(value).toString())
-  },
-  /**
-   * 验证ISO类型的日期格式
-   */
-  dateISO(value: string) {
-    return /^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$/.test(
-      value
-    )
-  },
-  /**
-   * 验证十进制数字
-   */
-  number(value: string) {
-    return /^[\+-]?(\d+\.?\d*|\.\d+|\d\.\d+e\+\d+)$/.test(value)
-  },
-  /**
-   * 验证字符串
-   */
-  string(value: string) {
-    return typeof value === 'string'
-  },
-  /**
-   * 验证整数
-   */
-  digits(value: string) {
-    return /^\d+$/.test(value)
-  },
-  /**
-   * 验证身份证号码
-   */
-  idCard(value: string) {
-    return /^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(
-      value
-    )
-  },
-  /**
-   * 是否车牌号
-   */
-  carNo(value: string) {
-    // 新能源车牌
-    const xreg =
-      /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}(([0-9]{5}[DF]$)|([DF][A-HJ-NP-Z0-9][0-9]{4}$))/
-    // 旧车牌
-    const creg =
-      /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-HJ-NP-Z0-9]{4}[A-HJ-NP-Z0-9挂学警港澳]{1}$/
-    if (value.length === 7) {
-      return creg.test(value)
-    }
-    if (value.length === 8) {
-      return xreg.test(value)
-    }
-    return false
-  },
-  /**
-   * 金额,只允许2位小数
-   */
-  amount(value: string) {
-    // 金额，只允许保留两位小数
-    return /^[1-9]\d*(,\d{3})*(\.\d{1,2})?$|^0\.\d{1,2}$/.test(value)
-  },
-  /**
-   * 验证小数
-   */
-  decimal(value: string, digit: number) {
-    const regexPattern = `^\\d+(?:\\.\\d{1,${digit}})?$`
-    // 金额，只允许保留两位小数
-    return new RegExp(regexPattern).test(value)
-  },
-  /**
-   * 中文
-   */
-  chinese(value: string) {
-    const reg = /^[\u4e00-\u9fa5]+$/gi
-    return reg.test(value)
-  },
-  /**
-   * 只能输入字母
-   */
-  letter(value: string) {
-    return /^[a-zA-Z]*$/.test(value)
-  },
-  /**
-   * 只能是字母或者数字
-   */
-  enOrNum(value: string) {
-    // 英文或者数字
-    const reg = /^[0-9a-zA-Z]*$/g
-    return reg.test(value)
-  },
-  /**
-   * 验证是否包含某个值
-   */
-  contains(value: string, param: string) {
-    return value.indexOf(param) >= 0
-  },
-  /**
-   * 验证一个值范围[min, max]
-   */
-  range(value: number, param: number[]) {
-    return value >= param[0] && value <= param[1]
-  },
-  /**
-   * 验证一个长度范围[min, max]
-   */
-  rangeLength(value: string, param: number[]) {
-    return value.length >= param[0] && value.length <= param[1]
-  },
-  /**
-   * 是否固定电话
-   */
-  landline(value: string) {
-    const reg = /^\d{3,4}-\d{7,8}(-\d{3,4})?$/
-    return reg.test(value)
-  },
-  /**
-   * 判断是否为空
-   */
-  empty(value: any) {
-    switch (typeof value) {
-      case 'undefined':
-        return true
-      case 'string':
-        if (value.replace(/(^[ \t\n\r]*)|([ \t\n\r]*$)/g, '').length == 0)
-          return true
-        break
-      case 'boolean':
-        if (!value) return true
-        break
-      case 'number':
-        if (value === 0 || isNaN(value)) return true
-        break
-      case 'object':
-        if (value === null || value.length === 0) return true
-        for (const i in value) {
-          return false
+    /**
+     * 验证电子邮箱格式
+     */
+    email(value: string) {
+        return /^\w+((-\w+)|(\.\w+))*\@[A-Za-z0-9]+((\.|-)[A-Za-z0-9]+)*\.[A-Za-z0-9]+$/.test(value)
+    },
+    /**
+     * 验证手机格式
+     */
+    mobile(value: string) {
+        return /^1[23456789]\d{9}$/.test(value)
+    },
+    /**
+     * 验证URL格式
+     */
+    url(value: string) {
+        return /^((https|http|ftp|rtsp|mms):\/\/)(([0-9a-zA-Z_!~*'().&=+$%-]+: )?[0-9a-zA-Z_!~*'().&=+$%-]+@)?(([0-9]{1,3}.){3}[0-9]{1,3}|([0-9a-zA-Z_!~*'()-]+.)*([0-9a-zA-Z][0-9a-zA-Z-]{0,61})?[0-9a-zA-Z].[a-zA-Z]{2,6})(:[0-9]{1,4})?((\/?)|(\/[0-9a-zA-Z_!~*'().;?:@&=+$,%#-]+)+\/?)$/
+        .test(value)
+    },
+    /**
+     * 验证日期格式
+     */
+    date(value: any) {
+        if (!value) return false
+        // 判断是否数值或者字符串数值(意味着为时间戳)，转为数值，否则new Date无法识别字符串时间戳
+        if (this.number(value)) value = +value
+        return !/Invalid|NaN/.test(new Date(value).toString())
+    },
+    /**
+     * 验证ISO类型的日期格式
+     */
+    dateISO(value: string) {
+        return /^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$/.test(value)
+    },
+    /**
+     * 验证十进制数字
+     */
+    number(value: string) {
+        return /^[\+-]?(\d+\.?\d*|\.\d+|\d\.\d+e\+\d+)$/.test(value)
+    },
+    /**
+     * 验证字符串
+     */
+    string(value: string) {
+        return typeof value === 'string'
+    },
+    /**
+     * 验证整数
+     */
+    digits(value: string) {
+        return /^\d+$/.test(value)
+    },
+    /**
+     * 验证身份证号码
+     */
+    idCard(value: string) {
+        return /^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(
+            value
+        )
+    },
+    /**
+     * 是否车牌号
+     */
+    carNo(value: string) {
+        // 新能源车牌
+        const xreg = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}(([0-9]{5}[DF]$)|([DF][A-HJ-NP-Z0-9][0-9]{4}$))/
+        // 旧车牌
+        const creg = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-HJ-NP-Z0-9]{4}[A-HJ-NP-Z0-9挂学警港澳]{1}$/
+        if (value.length === 7) {
+            return creg.test(value)
         }
-        return true
-    }
-    return false
-  },
-  /**
-   * 是否json字符串
-   */
-  jsonString(value: object) {
-    if (typeof value === 'string') {
-      try {
-        const obj = JSON.parse(value)
-        if (typeof obj === 'object' && obj) {
-          return true
+        if (value.length === 8) {
+            return xreg.test(value)
+        }
+        return false
+    },
+    /**
+     * 金额,只允许2位小数
+     */
+    amount(value: string) {
+        // 金额，只允许保留两位小数
+        return /^[1-9]\d*(,\d{3})*(\.\d{1,2})?$|^0\.\d{1,2}$/.test(value)
+    },
+    /**
+     * 验证小数
+     */
+    decimal(value: string, digit: number) {
+        const regexPattern = `^\\d+(?:\\.\\d{1,${ digit }})?$`
+        // 金额，只允许保留两位小数
+        return new RegExp(regexPattern).test(value)
+    },
+    /**
+     * 中文
+     */
+    chinese(value: string) {
+        const reg = /^[\u4e00-\u9fa5]+$/gi
+        return reg.test(value)
+    },
+    /**
+     * 只能输入字母
+     */
+    letter(value: string) {
+        return /^[a-zA-Z]*$/.test(value)
+    },
+    /**
+     * 只能是字母或者数字
+     */
+    enOrNum(value: string) {
+        // 英文或者数字
+        const reg = /^[0-9a-zA-Z]*$/g
+        return reg.test(value)
+    },
+    /**
+     * 验证是否包含某个值
+     */
+    contains(value: string, param: string) {
+        return value.indexOf(param) >= 0
+    },
+    /**
+     * 验证一个值范围[min, max]
+     */
+    range(value: number, param: number[]) {
+        return value >= param[0] && value <= param[1]
+    },
+    /**
+     * 验证一个长度范围[min, max]
+     */
+    rangeLength(value: string, param: number[]) {
+        return value.length >= param[0] && value.length <= param[1]
+    },
+    /**
+     * 是否固定电话
+     */
+    landline(value: string) {
+        const reg = /^\d{3,4}-\d{7,8}(-\d{3,4})?$/
+        return reg.test(value)
+    },
+    /**
+     * 判断是否为空
+     */
+    empty(value: any) {
+        switch (typeof value) {
+            case 'undefined':
+                return true
+            case 'string':
+                if (value.replace(/(^[ \t\n\r]*)|([ \t\n\r]*$)/g, '').length == 0) return true
+                break
+            case 'boolean':
+                if (!value) return true
+                break
+            case 'number':
+                if (value === 0 || isNaN(value)) return true
+                break
+            case 'object':
+                if (value === null || value.length === 0) return true
+                for (const i in value) {
+                    return false
+                }
+                return true
         }
         return false
-      } catch (e) {
+    },
+    /**
+     * 是否json字符串
+     */
+    jsonString(value: object) {
+        if (typeof value === 'string') {
+            try {
+                const obj = JSON.parse(value)
+                if (typeof obj === 'object' && obj) {
+                    return true
+                }
+                return false
+            } catch (e) {
+                return false
+            }
+        }
         return false
-      }
-    }
-    return false
-  },
-  /**
-   * 是否数组
-   */
-  array(value: []) {
-    if (typeof Array.isArray === 'function') {
-      return Array.isArray(value)
+    },
+    /**
+     * 是否数组
+     */
+    array(value: []) {
+        if (typeof Array.isArray === 'function') {
+            return Array.isArray(value)
+        }
+        return Object.prototype.toString.call(value) === '[object Array]'
+    },
+    /**
+     * 是否对象
+     */
+    object(value: object) {
+        return Object.prototype.toString.call(value) === '[object Object]'
+    },
+    /**
+     * 是否短信验证码
+     */
+    code(value: string, len = 6) {
+        return new RegExp(`^\\d{${ len }}$`).test(value)
+    },
+    /**
+     * 是否函数方法
+     * @param {Object} value
+     */
+    func(value: string) {
+        return typeof value === 'function'
+    },
+    /**
+     * 是否promise对象
+     * @param {Object} value
+     */
+    promise(value: Promise<any>) {
+        return this.object(value) && this.func(value.then) && this.func(value.catch)
+    },
+    /** 是否图片格式
+     * @param {Object} value
+     */
+    image(value: string) {
+        const newValue = value.split('?')[0]
+        const IMAGE_REGEXP = /\.(jpeg|jpg|gif|png|svg|jfif|bmp|dpg)/i // todo 暂不支持webp格式
+        return IMAGE_REGEXP.test(newValue)
+    },
+    /**
+     * 是否视频格式
+     * @param {Object} value
+     */
+    video(value: string) {
+        const VIDEO_REGEXP = /\.(mp4|mpg|mpeg|dat|asf|avi|rm|rmvb|mov|wmv|flv|mkv|m3u8)/i
+        return VIDEO_REGEXP.test(value)
+    },
+    /**
+     * 是否为正则对象
+     */
+    regExp(o) {
+        return o && Object.prototype.toString.call(o) === '[object RegExp]'
+    },
+    /**
+     * 验证必填
+     */
+    require(value: string) {
+        return /^\s*$/.test(value)
     }
-    return Object.prototype.toString.call(value) === '[object Array]'
-  },
-  /**
-   * 是否对象
-   */
-  object(value: object) {
-    return Object.prototype.toString.call(value) === '[object Object]'
-  },
-  /**
-   * 是否短信验证码
-   */
-  code(value: string, len = 6) {
-    return new RegExp(`^\\d{${len}}$`).test(value)
-  },
-  /**
-   * 是否函数方法
-   * @param {Object} value
-   */
-  func(value: string) {
-    return typeof value === 'function'
-  },
-  /**
-   * 是否promise对象
-   * @param {Object} value
-   */
-  promise(value: Promise<any>) {
-    return this.object(value) && this.func(value.then) && this.func(value.catch)
-  },
-  /** 是否图片格式
-   * @param {Object} value
-   */
-  image(value: string) {
-    const newValue = value.split('?')[0]
-    const IMAGE_REGEXP = /\.(jpeg|jpg|gif|png|svg|jfif|bmp|dpg)/i // todo 暂不支持webp格式
-    return IMAGE_REGEXP.test(newValue)
-  },
-  /**
-   * 是否视频格式
-   * @param {Object} value
-   */
-  video(value: string) {
-    const VIDEO_REGEXP =
-      /\.(mp4|mpg|mpeg|dat|asf|avi|rm|rmvb|mov|wmv|flv|mkv|m3u8)/i
-    return VIDEO_REGEXP.test(value)
-  },
-  /**
-   * 是否为正则对象
-   */
-  regExp(o) {
-    return o && Object.prototype.toString.call(o) === '[object RegExp]'
-  },
-  /**
-   * 验证必填
-   */
-  require(value: string) {
-    return /^\s*$/.test(value)
-  },
 }
 
 export default test
diff --git a/admin/vite.config.ts b/admin/vite.config.ts
index 2c87bec4..406fdfc2 100644
--- a/admin/vite.config.ts
+++ b/admin/vite.config.ts
@@ -5,7 +5,6 @@ import AutoImport from 'unplugin-auto-import/vite'
 import Components from 'unplugin-vue-components/vite'
 import { ElementPlusResolver } from 'unplugin-vue-components/resolvers'
 
-
 // https://vitejs.dev/config/
 export default defineConfig({
     base: '',